fix(build-resources): nested module-referencing in module build resou…

…rces
aurelia · Jun 22, 2016 · f67ba69 · f67ba69
1 parent 7c32cea
commit f67ba69
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 4 deletions.
diff --git a/src/build-resources.js b/src/build-resources.js
@@ -266,10 +266,9 @@ function getResourcesOfPackage(resources = {}, packagePath = undefined, relative
         resource = resource instanceof Object && !Array.isArray(resource) ? resource : { path: resource };
         let fromPaths = Array.isArray(resource.path) ? resource.path : [resource.path];
         for (let fromPath of fromPaths) {
-          if (externalModule) {
-            fromPath = path.join(externalModule, fromPath);
-          }
           debug(`<${externalModule || path.basename(packagePath)}> [resolving] '${fromPath}'`);
+          if (externalModule && fromPath.indexOf('.') !== 0)
+            fromPath = fixRelativeFromPath(fromPath, undefined, undefined, externalModule);
           processFromPath(resources, fromPath, resource, packagePath, relativeToDir, overrideBlock);
         }
       }

diff --git a/test/node_modules/aurelia-bootstrapper/dist/commonjs/aurelia-bootstrapper.js b/test/node_modules/aurelia-bootstrapper/dist/commonjs/aurelia-bootstrapper.js
diff --git a/test/node_modules/aurelia-bootstrapper/package.json b/test/node_modules/aurelia-bootstrapper/package.json
diff --git a/test/node_modules/aurelia-templating-resources/package.json b/test/node_modules/aurelia-templating-resources/package.json
diff --git a/test/package.json b/test/package.json
@@ -9,6 +9,7 @@
   "license": "MIT",
   "dependencies": {
     "aurelia-framework": "^1.0.0-beta.1.1.1",
+    "aurelia-bootstrapper": "^1.0.0-beta.1.0.0",
     "aurelia-templating-resources": "^1.0.0-beta.1.1.0"
   },
   "devDependencies": {