fix(gatsby): Handle special characters in windows paths (#19600)

vladar · sidharthachatterjee · commit 9929cf064378 · 2019-11-19T03:56:16.000+05:30
diff --git a/packages/gatsby-core-utils/src/__tests__/path.js b/packages/gatsby-core-utils/src/__tests__/path.js
@@ -1,4 +1,4 @@
-const { joinPath, isNodeInternalModulePath } = require(`../path`)
+const { joinPath, isNodeInternalModulePath, slash } = require(`../path`)
 const os = require(`os`)
 
 describe(`paths`, () => {
@@ -30,4 +30,24 @@ describe(`paths`, () => {
       expect(isNodeInternalModulePath(modulePath)).toBe(false)
     })
   })
+
+  describe(`slash path`, () => {
+    it(`can correctly slash path`, () => {
+      ;[
+        [`foo\\bar`, `foo/bar`],
+        [`foo/bar`, `foo/bar`],
+        [`foo\\中文`, `foo/中文`],
+        [`foo/中文`, `foo/中文`],
+        [`foo/жä`, `foo/жä`],
+        [`foo\\жä`, `foo/жä`],
+      ].forEach(([path, expectRes]) => {
+        expect(slash(path)).toBe(expectRes)
+      })
+    })
+
+    it(`does not modify extended length paths`, () => {
+      const extended = `\\\\?\\some\\path`
+      expect(slash(extended)).toBe(extended)
+    })
+  })
 })
diff --git a/packages/gatsby-core-utils/src/index.js b/packages/gatsby-core-utils/src/index.js
@@ -1,6 +1,7 @@
 exports.createContentDigest = require(`./create-content-digest`)
 exports.joinPath = require(`./path`).joinPath
 exports.isNodeInternalModulePath = require(`./path`).isNodeInternalModulePath
+exports.slash = require(`./path`).slash
 exports.cpuCoreCount = require(`./cpu-core-count`)
 exports.urlResolve = require(`./url`).resolve
 exports.isCI = require(`./ci`).isCI
diff --git a/packages/gatsby-core-utils/src/path.js b/packages/gatsby-core-utils/src/path.js
@@ -74,3 +74,22 @@ const nodePaths = [
  */
 export const isNodeInternalModulePath = fileName =>
   nodePaths.some(regTest => regTest.test(fileName))
+
+/**
+ * slash
+ * --
+ * Convert Windows backslash paths to slash paths: foo\\bar ➔ foo/bar
+ *
+ *
+ * @param  {String}          path
+ * @return {String}          slashed path
+ */
+export function slash(path) {
+  const isExtendedLengthPath = /^\\\\\?\\/.test(path)
+
+  if (isExtendedLengthPath) {
+    return path
+  }
+
+  return path.replace(/\\/g, `/`)
+}
diff --git a/packages/gatsby-page-utils/package.json b/packages/gatsby-page-utils/package.json
@@ -24,10 +24,10 @@
     "bluebird": "^3.7.1",
     "chokidar": "3.3.0",
     "fs-exists-cached": "^1.0.0",
+    "gatsby-core-utils": "^1.0.19",
     "glob": "^7.1.6",
     "lodash": "^4.17.15",
-    "micromatch": "^3.1.10",
-    "slash": "^3.0.0"
+    "micromatch": "^3.1.10"
   },
   "devDependencies": {
     "@babel/cli": "^7.7.0",
diff --git a/packages/gatsby-page-utils/src/watch-directory.js b/packages/gatsby-page-utils/src/watch-directory.js
@@ -1,6 +1,6 @@
 const Promise = require(`bluebird`)
 const chokidar = require(`chokidar`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 
 module.exports = async (path, glob, onNewFile, onRemovedFile) =>
   new Promise((resolve, reject) => {
diff --git a/packages/gatsby-plugin-mdx/loaders/mdx-loader.js b/packages/gatsby-plugin-mdx/loaders/mdx-loader.js
@@ -21,7 +21,7 @@ const genMdx = require(`../utils/gen-mdx`)
 const withDefaultOptions = require(`../utils/default-options`)
 const createMDXNode = require(`../utils/create-mdx-node`)
 const { createFileNode } = require(`../utils/create-fake-file-node`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 
 const DEFAULT_OPTIONS = {
   footnotes: true,
diff --git a/packages/gatsby-plugin-mdx/loaders/mdx-scopes.js b/packages/gatsby-plugin-mdx/loaders/mdx-scopes.js
@@ -1,6 +1,6 @@
 const fs = require(`fs`)
 const path = require(`path`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const loaderUtils = require(`loader-utils`)
 const { MDX_SCOPES_LOCATION } = require(`../constants`)
 
diff --git a/packages/gatsby-plugin-mdx/package.json b/packages/gatsby-plugin-mdx/package.json
@@ -33,6 +33,7 @@
     "escape-string-regexp": "^1.0.5",
     "eval": "^0.1.4",
     "fs-extra": "^8.1.0",
+    "gatsby-core-utils": "^1.0.19",
     "gray-matter": "^4.0.2",
     "json5": "^2.1.1",
     "loader-utils": "^1.2.3",
@@ -45,7 +46,6 @@
     "remark": "^10.0.1",
     "remark-retext": "^3.1.3",
     "retext-english": "^3.0.4",
-    "slash": "^3.0.0",
     "static-site-generator-webpack-plugin": "^3.4.2",
     "style-to-object": "^0.3.0",
     "underscore.string": "^3.3.5",
diff --git a/packages/gatsby-plugin-mdx/utils/create-fake-file-node.js b/packages/gatsby-plugin-mdx/utils/create-fake-file-node.js
@@ -1,4 +1,4 @@
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const path = require(`path`)
 const fs = require(`fs`)
 const mime = require(`mime`)
diff --git a/packages/gatsby-plugin-offline/package.json b/packages/gatsby-plugin-offline/package.json
@@ -9,10 +9,10 @@
   "dependencies": {
     "@babel/runtime": "^7.7.2",
     "cheerio": "^1.0.0-rc.3",
+    "gatsby-core-utils": "^1.0.19",
     "glob": "^7.1.6",
     "idb-keyval": "^3.2.0",
     "lodash": "^4.17.15",
-    "slash": "^3.0.0",
     "workbox-build": "^4.3.1"
   },
   "devDependencies": {
diff --git a/packages/gatsby-plugin-offline/src/gatsby-node.js b/packages/gatsby-plugin-offline/src/gatsby-node.js
@@ -2,7 +2,7 @@
 let fs = require(`fs`)
 let workboxBuild = require(`workbox-build`)
 const path = require(`path`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const glob = require(`glob`)
 const _ = require(`lodash`)
 
diff --git a/packages/gatsby-remark-images/package.json b/packages/gatsby-remark-images/package.json
@@ -10,12 +10,12 @@
     "@babel/runtime": "^7.7.2",
     "chalk": "^2.4.2",
     "cheerio": "^1.0.0-rc.3",
+    "gatsby-core-utils": "^1.0.19",
     "is-relative-url": "^3.0.0",
     "lodash": "^4.17.15",
     "mdast-util-definitions": "^1.2.5",
     "potrace": "^2.1.2",
     "query-string": "^6.8.3",
-    "slash": "^3.0.0",
     "unist-util-select": "^1.5.0",
     "unist-util-visit-parents": "^2.1.2"
   },
diff --git a/packages/gatsby-remark-images/src/index.js b/packages/gatsby-remark-images/src/index.js
@@ -13,7 +13,7 @@ const _ = require(`lodash`)
 const { fluid, stats, traceSVG } = require(`gatsby-plugin-sharp`)
 const Promise = require(`bluebird`)
 const cheerio = require(`cheerio`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const chalk = require(`chalk`)
 
 // If the image is relative (not hosted elsewhere)
diff --git a/packages/gatsby-source-filesystem/src/__tests__/utils.js b/packages/gatsby-source-filesystem/src/__tests__/utils.js
@@ -4,7 +4,6 @@ const {
   getRemoteFileExtension,
   getRemoteFileName,
   createProgress,
-  slash,
 } = require(`../utils`)
 const reporter = require(`gatsby-cli/lib/reporter`)
 const progress = require(`progress`)
@@ -62,21 +61,3 @@ describe(`createProgress`, () => {
     expect(bar).toHaveProperty(`total`)
   })
 })
-
-describe(`slash path`, () => {
-  it(`can correctly slash path`, () => {
-    ;[
-      [`foo\\bar`, `foo/bar`],
-      [`foo/bar`, `foo/bar`],
-      [`foo\\中文`, `foo/中文`],
-      [`foo/中文`, `foo/中文`],
-    ].forEach(([path, expectRes]) => {
-      expect(slash(path)).toBe(expectRes)
-    })
-  })
-
-  it(`does not modify extended length paths`, () => {
-    const extended = `\\\\?\\some\\path`
-    expect(slash(extended)).toBe(extended)
-  })
-})
diff --git a/packages/gatsby-source-filesystem/src/create-file-node.js b/packages/gatsby-source-filesystem/src/create-file-node.js
@@ -1,11 +1,10 @@
-const { slash } = require(`./utils`)
 const path = require(`path`)
 const fs = require(`fs-extra`)
 const mime = require(`mime`)
 const prettyBytes = require(`pretty-bytes`)
 
 const md5File = require(`bluebird`).promisify(require(`md5-file`))
-const { createContentDigest } = require(`gatsby-core-utils`)
+const { createContentDigest, slash } = require(`gatsby-core-utils`)
 
 exports.createFileNode = async (
   pathToFile,
diff --git a/packages/gatsby-source-filesystem/src/create-file-path.js b/packages/gatsby-source-filesystem/src/create-file-path.js
@@ -1,5 +1,5 @@
 const path = require(`path`)
-const { slash } = require(`./utils`)
+const { slash } = require(`gatsby-core-utils`)
 
 function findFileNode({ node, getNode }) {
   // Find the file node.
diff --git a/packages/gatsby-source-filesystem/src/utils.js b/packages/gatsby-source-filesystem/src/utils.js
@@ -68,25 +68,6 @@ export function createProgress(message, reporter) {
   }
 }
 
-/**
- * slash
- * --
- * Convert Windows backslash paths to slash paths: foo\\bar ➔ foo/bar
- *
- *
- * @param  {String}          path
- * @return {String}          slashed path
- */
-export function slash(path) {
-  const isExtendedLengthPath = /^\\\\\?\\/.test(path)
-
-  if (isExtendedLengthPath) {
-    return path
-  }
-
-  return path.replace(/\\/g, `/`)
-}
-
 /**
  * createFilePath
  * --
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -121,7 +121,7 @@
     "shallow-compare": "^1.2.2",
     "sift": "^5.1.0",
     "signal-exit": "^3.0.2",
-    "slash": "^3.0.0",
+    "slugify": "^1.3.6",
     "socket.io": "^2.3.0",
     "stack-trace": "^0.0.10",
     "string-similarity": "^1.2.2",
diff --git a/packages/gatsby/src/bootstrap/index.js b/packages/gatsby/src/bootstrap/index.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 const _ = require(`lodash`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const fs = require(`fs-extra`)
 const md5File = require(`md5-file/promise`)
 const crypto = require(`crypto`)
diff --git a/packages/gatsby/src/bootstrap/load-plugins/__tests__/load-plugins.js b/packages/gatsby/src/bootstrap/load-plugins/__tests__/load-plugins.js
@@ -1,5 +1,5 @@
 const loadPlugins = require(`../index`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 
 describe(`Load plugins`, () => {
   /**
diff --git a/packages/gatsby/src/bootstrap/load-plugins/load.js b/packages/gatsby/src/bootstrap/load-plugins/load.js
@@ -1,5 +1,5 @@
 const _ = require(`lodash`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const fs = require(`fs`)
 const path = require(`path`)
 const crypto = require(`crypto`)
diff --git a/packages/gatsby/src/bootstrap/requires-writer.js b/packages/gatsby/src/bootstrap/requires-writer.js
@@ -2,7 +2,7 @@ const _ = require(`lodash`)
 const path = require(`path`)
 const fs = require(`fs-extra`)
 const crypto = require(`crypto`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const { store, emitter } = require(`../redux/`)
 const reporter = require(`gatsby-cli/lib/reporter`)
 const { match } = require(`@reach/router/lib/utils`)
diff --git a/packages/gatsby/src/commands/develop.js b/packages/gatsby/src/commands/develop.js
@@ -32,7 +32,7 @@ const withResolverContext = require(`../schema/context`)
 const sourceNodes = require(`../utils/source-nodes`)
 const websocketManager = require(`../utils/websocket-manager`)
 const getSslCert = require(`../utils/get-ssl-cert`)
-const slash = require(`slash`)
+const { slash } = require(`gatsby-core-utils`)
 const { initTracer } = require(`../utils/tracer`)
 const apiRunnerNode = require(`../utils/api-runner-node`)
 const db = require(`../db`)
diff --git a/packages/gatsby/src/query/__tests__/__snapshots__/file-parser.js.snap b/packages/gatsby/src/query/__tests__/__snapshots__/file-parser.js.snap
diff --git a/packages/gatsby/src/query/__tests__/file-parser.js b/packages/gatsby/src/query/__tests__/file-parser.js
diff --git a/packages/gatsby/src/query/file-parser.js b/packages/gatsby/src/query/file-parser.js
diff --git a/packages/gatsby/src/query/query-watcher.js b/packages/gatsby/src/query/query-watcher.js
diff --git a/packages/gatsby/src/redux/actions/public.js b/packages/gatsby/src/redux/actions/public.js
diff --git a/packages/gatsby/src/schema/__tests__/kitchen-sink.js b/packages/gatsby/src/schema/__tests__/kitchen-sink.js
diff --git a/packages/gatsby/src/schema/__tests__/queries-file.js b/packages/gatsby/src/schema/__tests__/queries-file.js
diff --git a/packages/gatsby/src/schema/infer/__tests__/infer.js b/packages/gatsby/src/schema/infer/__tests__/infer.js
diff --git a/packages/gatsby/src/schema/infer/is-file.js b/packages/gatsby/src/schema/infer/is-file.js
diff --git a/packages/gatsby/src/utils/tracer/index.js b/packages/gatsby/src/utils/tracer/index.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-const slash = require(`slash`)
	`1`	+const { slash } = require(`gatsby-core-utils`)
`2`	`2`	const path = require(`path`)
`3`	`3`	const fs = require(`fs`)
`4`	`4`	const mime = require(`mime`)