Remove glob dependency

Author: ncave

build.fsx

@@ -52,12 +52,18 @@ module Util =
     let runNpx command args =
         run ("npx " + command + " " + (String.concat " " args))
 
+    let runNpmScript script args =
+        run ("npm run " + script + " -- " + (String.concat " " args))
+
     let runNpmScriptAsync script args =
         runAsync ("npm run " + script + " -- " + (String.concat " " args))
 
     let runFable projectDir =
         runFableWithArgs projectDir []
 
+    let runMocha testDir =
+        runNpmScript "mocha" [$"{testDir} -r esm --reporter dot -t 10000"]
+
     let resolveDir dir =
         __SOURCE_DIRECTORY__ </> dir
 
@@ -180,7 +186,7 @@ let testJsFast() =
     let testProj = "tests/Main/Fable.Tests.fsproj"
     let buildDir = "build/tests-js"
     run $"node --eval \"require('esm')(module)('{fableJs}')\" {fableJs} {testProj} {buildDir}"
-    run $"npx mocha {buildDir} -r esm --reporter dot -t 10000"
+    runMocha buildDir
 
 
 let buildStandalone (opts: {| minify: bool; watch: bool |}) =
@@ -230,19 +236,19 @@ let buildStandalone (opts: {| minify: bool; watch: bool |}) =
     ]
 
     // make standalone bundle dist
-    runNpx "rollup" rollupArgs
+    runNpmScript "rollup" rollupArgs
     if opts.minify then
-        runNpx "terser" [
+        runNpmScript "terser" [
             buildDir </> "bundle.js"
             "-o " + distDir </> "bundle.min.js"
             "--mangle"
             "--compress"
         ]
 
     // make standalone worker dist
-    runNpx "rollup" [$"{buildDir}/worker/Worker.js -o {buildDir}/worker.js --format iife"]
+    runNpmScript "rollup" [$"{buildDir}/worker/Worker.js -o {buildDir}/worker.js --format iife"]
     // runNpx "webpack" [sprintf "--entry ./%s/worker.js --output ./%s/worker.min.js --config ./%s/../worker.config.js" buildDir distDir projectDir]
-    runNpx "terser" [$"{buildDir}/worker.js -o {distDir}/worker.min.js --mangle --compress"]
+    runNpmScript "terser" [$"{buildDir}/worker.js -o {distDir}/worker.min.js --mangle --compress"]
 
     // print bundle size
     fileSizeInBytes (distDir </> "bundle.min.js") / 1000. |> printfn "Bundle size: %fKB"
@@ -312,8 +318,8 @@ let testJs(minify) =
     runInDir fableDir "npm link ../fable-standalone"
 
     // Test fable-compiler-js locally
-    run ("node " + fableDir + " tests/Main/Fable.Tests.fsproj " + buildDir)
-    run ("npx mocha " + buildDir + " -r esm --reporter dot -t 10000")
+    run $"node {fableDir} tests/Main/Fable.Tests.fsproj {buildDir}"
+    runMocha buildDir
 
     // // Another local fable-compiler-js test
     // runInDir (fableDir </> "test") "node .. test_script.fsx"
@@ -342,7 +348,7 @@ let test() =
         "--exclude Fable.Core"
     ]
 
-    run $"npx mocha {buildDir} -r esm --reporter dot -t 10000"
+    runMocha buildDir
 
     runInDir projectDir "dotnet run"
 

package.json

@@ -2,6 +2,9 @@
   "private": true,
   "scripts": {
     "tsc": "tsc",
+    "mocha": "mocha",
+    "rollup": "rollup",
+    "terser": "terser",
     "tslint": "tslint",
     "build": "dotnet fsi build.fsx",
     "publish": "dotnet fsi build.fsx publish",

src/fable-compiler-js/RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+### 3.0.1
+
+* Reduced package dependencies
+
 ### 3.0.0
 
 * Nagareyama official release

src/fable-compiler-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable-compiler-js",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "main": "index.js",
   "bin": {
     "fable": "index.js"
@@ -23,7 +23,6 @@
   "homepage": "https://github.com/fable-compiler/Fable#readme",
   "dependencies": {
     "fable-metadata": "^2.0.0",
-    "fable-standalone": "^3.0.0-nagareyama-rc-008",
-    "glob": "^7.1.6"
+    "fable-standalone": "^3.0.0"
   }
 }

src/fable-compiler-js/src/Platform.fs

@@ -34,8 +34,8 @@ module JS =
         abstract resolve: string -> string
         abstract relative: string * string -> string
 
-    type IGlob =
-        abstract sync: pattern: string * ?options: obj -> array<string>
+    // type IGlob =
+    //     abstract sync: pattern: string * ?options: obj -> array<string>
 
     type IUtil =
         abstract getDirFiles: dir: string -> string[]
@@ -48,7 +48,7 @@ module JS =
     let os: IOperSystem = importAll "os"
     let proc: IProcess = importAll "process"
     let path: IPath = importAll "path"
-    let glob: IGlob = importAll "glob"
+    // let glob: IGlob = importAll "glob"
     let util: IUtil = importAll "./util.js"
 
 let readAllBytes (filePath: string) = JS.fs.readFileSync(filePath)
@@ -88,8 +88,14 @@ let getDirFiles (path: string) (extension: string) =
     |> Array.sort
 
 let getGlobFiles (path: string) =
-    if path.Contains("*") || path.Contains("?")
-    then JS.glob.sync(path)
+    if path.Contains("*") || path.Contains("?") then
+        // JS.glob.sync(path) // commented to remove dependency
+        // replaced with fixed globbing pattern (*.fs)
+        let dirPath =
+            let normPath = path.Replace('\\', '/')
+            let i = normPath.LastIndexOf('/')
+            if i < 0 then "" else normPath.Substring(0, i)
+        getDirFiles dirPath ".fs"
     else [| path |]
 
 module Path =

src/fable-standalone/test/bench-compiler/Platform.fs

@@ -87,8 +87,8 @@ module JS =
         abstract resolve: string -> string
         abstract relative: string * string -> string
 
-    type IGlob =
-        abstract sync: pattern: string * ?options: obj -> array<string>
+    // type IGlob =
+    //     abstract sync: pattern: string * ?options: obj -> array<string>
 
     type IUtil =
         abstract getDirFiles: dir: string -> string[]
@@ -150,10 +150,10 @@ let getGlobFiles (path: string) =
     if path.Contains("*") || path.Contains("?") then
         // JS.glob.sync(path) // commented to remove dependency
         // replaced with fixed globbing pattern (*.fs)
-        let normPath = path.Replace('\\', '/')
-        let i = normPath.LastIndexOf('/')
-        // let pattern = normPath.Substring(i + 1) // ignored
-        let dirPath = if i < 0 then "" else normPath.Substring(0, i)
+        let dirPath =
+            let normPath = path.Replace('\\', '/')
+            let i = normPath.LastIndexOf('/')
+            if i < 0 then "" else normPath.Substring(0, i)
         getDirFiles dirPath ".fs"
     else [| path |]