Merge pull request #21 from vegarringdal/new_loader

fix(loader) path check if resources is ending the same

Author: vegarringdal

dist/commonjs/fuse-box-aurelia-loader.js

@@ -262,6 +262,10 @@ var FuseBoxAureliaLoader = (function (_super) {
                             var resources = Object.keys(FuseBox.packages[moduleId].f);
                             var resourceName_1 = path.replace(moduleId + "/", '');
                             var resourceEntry = resources.find(function (r) { return r.endsWith(resourceName_1 + '.js'); });
+                            var resourceEntryCheck = resources.find(function (r) { return r.endsWith('/' + resourceName_1 + '.js'); });
+                            if (resourceEntry !== resourceEntryCheck) {
+                                resourceEntry = resourceEntryCheck;
+                            }
                             retunValue = moduleId + "/" + resourceEntry;
                         }
                         if (!this.fuseBoxExist(retunValue)) {

src/fuse-box-aurelia-loader.ts

@@ -348,6 +348,13 @@ export class FuseBoxAureliaLoader extends Loader {
               let resources = Object.keys(FuseBox.packages[moduleId].f);
               let resourceName = path.replace(`${moduleId}/`, '');
               let resourceEntry = resources.find(r => r.endsWith(resourceName + '.js'));
+
+              // fix for if resources is ending the same... this will fail if many sub folders and same file name
+              // todo: improve, get root of package commonjs file to be sure.
+              let resourceEntryCheck = resources.find(r => r.endsWith('/' + resourceName + '.js'));
+              if (resourceEntry !== resourceEntryCheck) {
+                resourceEntry = resourceEntryCheck;
+              }
               retunValue = `${moduleId}/${resourceEntry}`;
             }