Merge branch 'fix/windows-paths' into develop

Author: Dennis Kuduzovic

lib/renderer/renderer-webpack.js

@@ -223,7 +223,7 @@ class Renderer {
             memoryParsed = path.parse(filePath.split(this.pagesPath)[1]);
         }
 
-        const memoryBase = path.join(path.sep === '/' ? '/' : 'C:\\', `${this.baseUrl}/expressvue/bundles`, memoryParsed.dir);
+        const memoryBase = path.resolve(path.join(`/${this.baseUrl}`, '/expressvue/bundles', memoryParsed.dir)); // add C: for memory file system for windows machines
         const memoryPath = path.join(memoryBase, memoryParsed.name);
 
         return {
@@ -359,7 +359,7 @@ class Renderer {
         //Check if the bundle exists if not make a new one
         try {
             const bundlePath = this.getBundleFilePath(filePath);
-            context.script = bundlePath.memory.filename.client;
+            context.script = path.join('/', path.relative(path.resolve('/'), bundlePath.memory.filename.client)); // strip drive letter for windows systems
             const layout = buildLayoutWebpack(context);
 
             const clientBundle = this.mfs.readFileSync(bundlePath.memory.filename.client, "utf-8");
@@ -382,7 +382,7 @@ class Renderer {
             //Make Bundle
             const webpackConfig = await this._buildConfig(filePath);
             const bundle = await this._makeBundle(webpackConfig, filePath);
-            context.script = bundle.clientBundlePath;
+            context.script = path.join('/', path.relative(path.resolve('/'), bundle.clientBundlePath)); // strip drive letter for windows systems
             const layout = buildLayoutWebpack(context);
 
             const rendererOptions = {
@@ -487,10 +487,11 @@ class Renderer {
      * @returns {string} bundle
      */
     getBundleFile(bundleFileName) {
-        if (bundleFileName.endsWith("server.bundle.js")) {
+        const fullFileName = path.resolve(bundleFileName); // add C: for memory file system for windows machines
+        if (fullFileName.endsWith("server.bundle.js")) {
             return "";
         } else {
-            return this.mfs.readFileSync(bundleFileName, "utf-8");
+            return this.mfs.readFileSync(fullFileName, "utf-8");
         }
     }
 }