From 3560cbcd79f0d3e24885bf617262c60c15801106 Mon Sep 17 00:00:00 2001 From: Nathan Smith Date: Tue, 23 Feb 2016 15:09:08 -0600 Subject: [PATCH 1/2] add slash dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 47bd3313e4b1e..5019782a26caf 100644 --- 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", From 80d6888894108c91a2ae8e25f1ace6620b0ba931 Mon Sep 17 00:00:00 2001 From: Nathan Smith Date: Tue, 23 Feb 2016 15:09:53 -0600 Subject: [PATCH 2/2] fix path slashes on windows' --- lib/utils/glob-pages.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/utils/glob-pages.js b/lib/utils/glob-pages.js index 3576c2277a8e4..a60c827d3d771 100644 --- 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