Merge pull request #1 from jsleuth/feature/windows_support

feat(build): add support for windows filesystem
aurelia · Jun 14, 2018 · 5571733 · 5571733
2 parents 965222f + 493ddd3
commit 5571733
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/AureliaDependenciesPlugin.ts b/src/AureliaDependenciesPlugin.ts
@@ -44,7 +44,7 @@ class ParserPlugin {
     parser.plugin("evaluate Identifier imported var.moduleName", (expr: Webpack.MemberExpression) => {
       if (expr.property.name === "moduleName" &&
           expr.object.name === "PLATFORM" &&
-          expr.object.type === "Identifier") {
+          String(expr.object.type) === "Identifier") {
         return new BasicEvaluatedExpression().setIdentifier("PLATFORM.moduleName").setRange(expr.range);
       }
       return undefined;
@@ -58,8 +58,8 @@ class ParserPlugin {
     //    PLATFORM.moduleName("id");
     parser.plugin("evaluate MemberExpression", (expr: Webpack.MemberExpression) => {
       if (expr.property.name === "moduleName" &&
-         (expr.object.type === "MemberExpression" && expr.object.property.name === "PLATFORM" ||
-          expr.object.type === "Identifier" && expr.object.name === "PLATFORM")) {
+         (String(expr.object.type) === "MemberExpression" && expr.object.property.name === "PLATFORM" ||
+          String(expr.object.type) === "Identifier" && expr.object.name === "PLATFORM")) {
         return new BasicEvaluatedExpression().setIdentifier("PLATFORM.moduleName").setRange(expr.range);
       }
       return undefined;

diff --git a/src/PreserveModuleNamePlugin.ts b/src/PreserveModuleNamePlugin.ts
@@ -56,6 +56,7 @@ export class PreserveModuleNamePlugin {
           }
 
           // Metadata?
+          moduleId = moduleId.replace(/\\/g, '/');
           if (module.meta) {
             module.meta['aurelia-id'] = moduleId;
           }