fix: handle static file glob on Windows (#778)

ascorbic · web-flow · commit 1cc222a866c2 · 2021-11-08T11:38:26.000Z
Release-As: 4.0.0-beta.6
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "@vercel/node": "^1.11.2-canary.4",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
+    "globby": "^11.0.4",
     "moize": "^6.1.0",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
diff --git a/src/helpers/files.js b/src/helpers/files.js
@@ -2,10 +2,10 @@
 const { cpus } = require('os')
 
 const { existsSync, readJson, move, cpSync, copy, writeJson } = require('fs-extra')
+const globby = require('globby')
 const pLimit = require('p-limit')
 const { join } = require('pathe')
 const slash = require('slash')
-const glob = require('tiny-glob')
 
 const TEST_ROUTE = /(|\/)\[[^/]+?](\/|\.html|$)/
 
@@ -24,7 +24,7 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n, failBuild }) =>
     await move(source, dest)
   }
   // Move all static files, except error documents and nft manifests
-  const pages = await glob('**/!(500|404|*.js.nft).{html,json}', {
+  const pages = await globby(['**/*.{html,json}', '!**/(500|404|*.js.nft).{html,json}'], {
     cwd: root,
     dot: true,
   })
diff --git a/test/index.js b/test/index.js
@@ -208,7 +208,7 @@ describe('onBuild()', () => {
     process.env.EXPERIMENTAL_MOVE_STATIC_PAGES = 'true'
     await plugin.onBuild(defaultArgs)
     expect(existsSync(path.resolve('.next/static-manifest.json'))).toBeTruthy()
-    const data = JSON.parse(readFileSync(path.resolve('.next/static-manifest.json'), 'utf8'))
+    const data = JSON.parse(readFileSync(path.resolve('.next/static-manifest.json'), 'utf8')).sort()
     expect(data).toMatchSnapshot()
     delete process.env.EXPERIMENTAL_MOVE_STATIC_PAGES
   })
