From c8fe0679ae8da6c99c56722b7037a6f07f0d0a0e Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 19 Dec 2017 20:48:44 -0500 Subject: [PATCH] posixify import paths --- lib/utils/create_app.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/utils/create_app.js b/lib/utils/create_app.js index 0c1daa84e..09202cb12 100644 --- a/lib/utils/create_app.js +++ b/lib/utils/create_app.js @@ -3,6 +3,10 @@ const path = require('path'); const route_manager = require('../route_manager.js'); const { src, dest, server_routes, dev } = require('../config.js'); +function posixify(file) { + return file.replace(/[\/\\]/g, '/'); +} + module.exports = function create_app() { const { routes } = route_manager; @@ -17,13 +21,14 @@ module.exports = function create_app() { '{}' : `{ ${route.dynamic.map((part, i) => `${part}: match[${i + 1}]`).join(', ') } }`; - return `{ pattern: ${route.pattern}, params: match => (${params}), load: () => import(/* webpackChunkName: "${route.id}" */ '${src}/${route.file}') }` + const file = posixify(`${src}/${route.file}`); + return `{ pattern: ${route.pattern}, params: match => (${params}), load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }` }) .join(', ') }]`; let main = template - .replace(/__app__/g, path.resolve(__dirname, '../../runtime/app.js')) + .replace(/__app__/g, posixify(path.resolve(__dirname, '../../runtime/app.js'))) .replace(/__routes__/g, code) .replace(/__dev__/g, String(dev)); @@ -44,9 +49,10 @@ module.exports = function create_app() { function create_server_routes() { const imports = routes .map(route => { + const file = posixify(`${src}/${route.file}`); return route.type === 'page' ? - `import ${route.id} from '${src}/${route.file}';` : - `import * as ${route.id} from '${src}/${route.file}';`; + `import ${route.id} from '${file}';` : + `import * as ${route.id} from '${file}';`; }) .join('\n');