Use normalize-path so tests pass on windows (#2908)

* Use normalize-path so tests pass on windows * Format * Fix last test * Almost got them all...
gatsbyjs · Nov 13, 2017 · 6cd114f · 6cd114f
1 parent 3267d6e
commit 6cd114f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/packages/gatsby-remark-code-repls/package.json b/packages/gatsby-remark-code-repls/package.json
@@ -6,6 +6,7 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "lz-string": "^1.4.4",
+    "normalize-path": "^2.1.1",
     "recursive-readdir-synchronous": "^0.0.3",
     "unist-util-map": "^1.0.3"
   },

diff --git a/packages/gatsby-remark-code-repls/src/constants.js b/packages/gatsby-remark-code-repls/src/constants.js
@@ -1,12 +1,12 @@
 "use strict"
 
 const { join } = require(`path`)
+const normalizePath = require(`normalize-path`)
 
 module.exports = {
   OPTION_DEFAULT_LINK_TEXT: `REPL`,
-  OPTION_DEFAULT_REDIRECT_TEMPLATE_PATH: join(
-    __dirname,
-    `default-redirect-template.js`
+  OPTION_DEFAULT_REDIRECT_TEMPLATE_PATH: normalizePath(
+    join(__dirname, `default-redirect-template.js`)
   ),
   PROTOCOL_BABEL: `babel://`,
   PROTOCOL_CODEPEN: `codepen://`,

diff --git a/packages/gatsby-remark-code-repls/src/gatsby-node.js b/packages/gatsby-remark-code-repls/src/gatsby-node.js
@@ -3,6 +3,7 @@
 const fs = require(`fs`)
 const { extname, resolve } = require(`path`)
 const recursiveReaddir = require(`recursive-readdir-synchronous`)
+const normalizePath = require(`normalize-path`)
 
 const {
   OPTION_DEFAULT_LINK_TEXT,
@@ -65,7 +66,8 @@ exports.createPages = (
 
       createPage({
         path: slug,
-        component: resolve(redirectTemplate),
+        // Normalize the path so tests pass on Linux + Windows
+        component: normalizePath(resolve(redirectTemplate)),
         context: {
           action,
           payload,

diff --git a/packages/gatsby-remark-code-repls/src/index.js b/packages/gatsby-remark-code-repls/src/index.js
@@ -4,6 +4,7 @@ const fs = require(`fs`)
 const LZString = require(`lz-string`)
 const { join } = require(`path`)
 const map = require(`unist-util-map`)
+const normalizePath = require(`normalize-path`)
 
 const {
   OPTION_DEFAULT_LINK_TEXT,
@@ -48,7 +49,7 @@ module.exports = (
     if (!filePath.endsWith(`.js`)) {
       filePath += `.js`
     }
-    filePath = join(directory, filePath)
+    filePath = normalizePath(join(directory, filePath))
     return filePath
   }