Merge pull request #140 from NogsMPLS/windowsSlashes

Windows slashes
gatsbyjs · Feb 24, 2016 · ea545cf · ea545cf
2 parents 930261c + 80d6888
commit ea545cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/utils/glob-pages.js b/lib/utils/glob-pages.js
@@ -1,6 +1,7 @@
 import glob from 'glob'
 import path from 'path'
 import parsePath from 'parse-filepath'
+import slash from 'slash'
 import fs from 'fs'
 import frontMatter from 'front-matter'
 import htmlFrontMatter from 'html-frontmatter'
@@ -29,7 +30,10 @@ module.exports = (directory, callback) => {
  pageData.file.ext = ext = parsed.extname.slice(1)
 
  // Determine require path
- pageData.requirePath = path.relative(`${directory}/pages`, page)
+ pageData.requirePath = slash(path.relative(`${directory}/pages`, page))
+
+ // Make sure slashes on parsed.dirname are correct for Windows
+ parsed.dirname = slash(parsed.dirname)
 
  // Load data for each file type.
  let data

diff --git a/package.json b/package.json
@@ -61,6 +61,7 @@
  "react-transform-hmr": "^1.0.0",
  "redbox-react": "^1.0.1",
  "sass-loader": "^3.1.2",
+ "slash": "^1.0.0",
  "static-site-generator-webpack-plugin": "^2.0.1",
  "style-loader": "^0.13.0",
  "toml": "^2.2.2",