Merge pull request #91 from marktaling/windows-paths-fix

fix(webpack-plugin): Windows specific paths fix
aurelia · Feb 16, 2017 · 964f8c7 · 964f8c7
2 parents 0559df5 + c3924a0
commit 964f8c7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/dist/build-resources.js b/dist/build-resources.js
@@ -639,4 +639,4 @@ function resolveTemplateResources(htmlFilePath, srcPath, externalModule) {
   });
 
   return resources;
-}
+}
diff --git a/dist/index.js b/dist/index.js
@@ -304,4 +304,4 @@ var AureliaWebpackPlugin = function () {
   return AureliaWebpackPlugin;
 }();
 
-module.exports = AureliaWebpackPlugin;
+module.exports = AureliaWebpackPlugin;
diff --git a/src/index.js b/src/index.js
@@ -213,7 +213,7 @@ class AureliaWebpackPlugin {
             let moduleId;
 
             if (options.nameLocalModules) {
-              if (module.resource.startsWith(options.src)) {
+              if (path.normalize(module.resource).startsWith(options.src)) {
                 // paths inside SRC
                 let relativeToSrc = path.relative(options.src, module.resource);
                 moduleId = relativeToSrc;
@@ -223,7 +223,7 @@ class AureliaWebpackPlugin {
               if (!moduleId && typeof module.userRequest == 'string') {
                 // paths resolved as build resources
                 let matchingModuleIds = paths
-                  .filter(originPath => contextElements[originPath].source === module.userRequest)
+                  .filter(originPath => contextElements[originPath].source === path.normalize(module.userRequest))
                   .map(originPath => path.normalize(originPath));
 
                 if (matchingModuleIds.length) {

diff --git a/test/index.js b/test/index.js
@@ -27,13 +27,12 @@ describe('Aurelia webpack plugin', function () {
     };
 
     webpack(config, function (err, stats) {
-      expect(err).to.be.falsy;
-      expect(stats.hasErrors()).to.be.falsy;
-      expect(stats.hasWarnings()).to.be.falsy;
+      expect(err).to.be.null;
+      // Do not allow any errors, warnings are ok though
+      expect(stats.hasErrors()).to.be.false;
 
-      expect(fs.existsSync(path.join(OUTPUT_DIR, '1.bundle.js'))).to.be.truthy;
-
-      // todo try to require from bundle
+      expect(fs.existsSync(path.join(OUTPUT_DIR, 'bundle.js'))).to.be.true;
+      expect(fs.existsSync(path.join(OUTPUT_DIR, '0.bundle.js'))).to.be.true;
 
       done();
     });
-Original file line number
+Diff line change
@@ Expand Up @@
       });
       return resources;
-    }
+    }