Update config.packages on location rewrite

montagejs · Feb 7, 2019 · aaff8e9 · aaff8e9
1 parent 7888981
commit aaff8e9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/require.js b/require.js
@@ -1018,7 +1018,14 @@
                 loadingPackages[location] = Require.loadPackageDescription(dependency, config)
                 .then(function (packageDescription) {
                     // loadPackageDescription may have mutated dependency.location
-                    return Require.injectLoadedPackageDescription(dependency.location, packageDescription, config);
+                    var pkg = Require.injectLoadedPackageDescription(dependency.location, packageDescription, config);
+                    var rewriteLocation = location !== dependency.location;
+                    if (rewriteLocation) {
+                        loadingPackages[dependency.location] = loadingPackages[location];
+                        // config.packages[dependency.location] is set by injectLoadedPackageDescription
+                        config.packages[location] = config.packages[dependency.location];
+                    }
+                    return pkg;
                 });
             }
             return loadingPackages[location];