fix(build): ensure that dependencies get in the correct bundle

fixes #342

lib/build/bundle.js

@@ -89,6 +89,17 @@ exports.Bundle = class {
     return Promise.resolve();
   }
 
+  getDependencyLocations() {
+    return this.includes.filter(inclusion => inclusion.description)
+      .map(inclusion => {
+        let normalizedLocation = path.posix.normalize(inclusion.description.location).replace(/\\/g,'\/');
+        return { 
+          location: normalizedLocation,
+          inclusion: inclusion
+        }
+      });
+  }
+
   getBundledModuleIds() {
     return unique(this.includes.reduce((a, b) => a.concat(b.getAllModuleIds()), []));
   }

lib/build/bundled-source.js

@@ -102,7 +102,7 @@ exports.BundledSource = class {
               bundler.addFile({
                 path: location,
                 contents: contents
-              }, that.includedBy);
+              }, that.getInclusion(location));
             } catch(e) {
               console.log(`File not found or not accessible: ${location}. Requested by ${modulePath}`);
             }
@@ -144,14 +144,26 @@ exports.BundledSource = class {
           let newItem = bundler.addFile({
                           path: result.path,
                           contents: result.contents
-                        }, this.includedBy);
+                        }, this.getInclusion(result.path));
 
           newItem.deps = result.deps;
         }
       }
     });
   }
 
+  getInclusion(filePath) {
+    let dir = path.dirname(path.posix.normalize(filePath).replace(/\\/g,'\/'));
+    let dependencyLocations = this.bundler.getAllDependencyLocations();
+    let dependencyLocation = dependencyLocations.find(x => dir.indexOf(x.location) === 0);
+
+    if (dependencyLocation) {
+      return dependencyLocation.inclusion;
+    }
+
+    return this.includedBy;
+  }
+
   calculateModuleId(rootDir, loaderConfig) {
     if (this.file.description) {
       return this.file.description.name;

lib/build/bundler.js

@@ -199,6 +199,10 @@ exports.Bundler = class {
   write() {
     return Promise.all(this.bundles.map(x => x.write(this.project.build.targets[0])));
   }
+
+  getAllDependencyLocations() {
+    return this.bundles.reduce((a, b) => a.concat(b.getDependencyLocations()), [])
+  }
 }
 
 function analyzeDependency(packageAnalyzer, dependency) {