Fixes requirejs#291 allow stubModules per layer.

jrburke · jrburke · commit bdf7aaaef20b · 2012-11-19T20:36:49.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -59,6 +59,7 @@ build/tests/lib/removeCombined/baseUrl-built
 build/tests/lib/requireHoist/perLayer/built
 build/tests/lib/rhino-186/built
 build/tests/lib/stubModules/main-built.js
+build/tests/lib/stubModules/perModule/built
 build/tests/lib/transportBeforeMinify/www-built
 build/tests/lib/urlToEmpty/main-built.js
 build/tests/lib/wrap/outBothArray.js
diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -1052,9 +1052,11 @@ define(function (require) {
                     include: config.include,
                     exclude: config.exclude,
                     excludeShallow: config.excludeShallow,
-                    insertRequire: config.insertRequire
+                    insertRequire: config.insertRequire,
+                    stubModules: config.stubModules
                 }
             ];
+            delete config.stubModules;
         } else if (config.modules && config.out) {
             throw new Error('If the "modules" option is used, then there ' +
                             'should be a "dir" option set and "out" should ' +
@@ -1079,12 +1081,22 @@ define(function (require) {
             }
         }
 
-        //Create a hash lookup for the stubModules config to make lookup
-        //cheaper later.
-        if (config.stubModules) {
-            config.stubModules._byName = {};
-            config.stubModules.forEach(function (id) {
-                config.stubModules._byName[id] = true;
+        //Cycle through modules and combine any local stubModules with
+        //global values.
+        if (config.modules && config.modules.length) {
+            config.modules.forEach(function (mod) {
+                if (config.stubModules) {
+                    mod.stubModules = config.stubModules.concat(mod.stubModules || []);
+                }
+
+                //Create a hash lookup for the stubModules config to make lookup
+                //cheaper later.
+                if (mod.stubModules) {
+                    mod.stubModules._byName = {};
+                    mod.stubModules.forEach(function (id) {
+                        mod.stubModules._byName[id] = true;
+                    });
+                }
             });
         }
 
@@ -1360,7 +1372,7 @@ define(function (require) {
 
             namespace = config.namespace || '';
             namespaceWithDot = namespace ? namespace + '.' : '';
-            stubModulesByName = (config.stubModules && config.stubModules._byName) || {};
+            stubModulesByName = (module.stubModules && module.stubModules._byName) || {};
 
             //Start build output for the module.
             buildFileContents += "\n" +
diff --git a/build/tests/builds.js b/build/tests/builds.js
@@ -1292,6 +1292,27 @@ define(['build', 'env!env/file'], function (build, file) {
     );
     doh.run();
 
+
+    //Tests https://github.com/jrburke/r.js/issues/291 per layer stub modules
+    doh.register("stubModulesPerModule",
+        [
+            function stubModulesPerModule(t) {
+                file.deleteFile("lib/stubModules/perModule/built");
+
+                build(["lib/stubModules/perModule/build.js"]);
+
+                t.is(noSlashRn(nol(c("lib/stubModules/perModule/expected-first.js"))),
+                     noSlashRn(nol(c("lib/stubModules/perModule/built/first.js"))));
+                t.is(noSlashRn(nol(c("lib/stubModules/perModule/expected-second.js"))),
+                     noSlashRn(nol(c("lib/stubModules/perModule/built/second.js"))));
+
+                require._buildReset();
+            }
+
+        ]
+    );
+    doh.run();
+
     //Tests https://github.com/jrburke/r.js/issues/155 no copy of paths
     doh.register("pathsNoCopy",
         [
