Merge pull request #104 from express-vue/feature/fix-windows-patch-bug

Feature/fix windows patch bug

Author: nikos-fytros

package.json

@@ -83,6 +83,7 @@
     "no-case": "^2.3.2",
     "pug": "^2.0.0-rc.4",
     "require-from-string": "^2.0.1",
+    "slash": "^1.0.0",
     "string-hash": "^1.1.3",
     "vue": "^2.4.4",
     "vue-server-renderer": "^2.4.4",

src/utils/require.js

@@ -1,6 +1,7 @@
 // @flow
 const Module = require('module');
 const path = require('path');
+const slash = require('slash');
 const Utils = require('./index');
 const Renderer = require('../renderer');
 const Models = require('../models');
@@ -14,7 +15,7 @@ class Options {
     defaults: Models.Defaults;
     constructor(optsObj: Object) {
         this.vueFileRegex = /([\w/.\-@_\d]*\.vue)/igm;
-        this.requireRegex = /(require\(['"])([\w/.\-@_\d]*\.vue)(['"]\))/igm;
+        this.requireRegex = /(require\(['"])([\w:/.\-@_\d]*\.vue)(['"]\))/igm;
         this.appendPaths = optsObj.appendPaths || [];
         this.prependPaths = optsObj.prependPaths || [];
         this.rootPath = optsObj.rootPath || '';
@@ -59,25 +60,24 @@ function replaceRelativePaths(code: string, rootPath: string): string {
     const currentMatchesDouble = code.match(/(require\("\.\/)/gm);
     if (parentMatchesSingle) {
         for (const match of parentMatchesSingle) {
-            code = code.replace(match, `require('${rootPath}/../`);
+            code = code.replace(match, slash(`require('${rootPath}/../`));
         }
     }
     if (parentMatchesDouble) {
         for (const match of parentMatchesDouble) {
-            code = code.replace(match, `require("${rootPath}/../`);
+            code = code.replace(match, slash(`require("${rootPath}/../`));
         }
     }
     if (currentMatchesSingle) {
         for (const match of currentMatchesSingle) {
-            code = code.replace(match, `require('${rootPath}/./`);
+            code = code.replace(match, slash(`require('${rootPath}/./`));
         }
     }
     if (currentMatchesDouble) {
         for (const match of currentMatchesDouble) {
-            code = code.replace(match, `require("${rootPath}/./`);
+            code = code.replace(match, slash(`require("${rootPath}/./`));
         }
     }
-
     return code;
 }
 

tests/example/app.js

@@ -40,7 +40,6 @@ const options = {
     }
 };
 
-
 renderer = expressVue.init(options);
 
 const app = express();