Fixes #944 Plugin undef should use map config

Author: jrburke

.gitignore

@@ -69,6 +69,7 @@ build/tests/lib/packages/main-built.js
 build/tests/lib/packagesNode/main-built.js
 build/tests/lib/pathsNoCopy/js-built
 build/tests/lib/pluginBuilder/main-built.js
+build/tests/lib/pluginBuildUndef/out.js
 build/tests/lib/pluginDepExec/main-built.js
 build/tests/lib/pluginShimDep/main-built.js
 build/tests/lib/plugins/main-built.js

build/jslib/requirePatch.js

@@ -370,7 +370,8 @@ define([ 'env!env/file', 'pragma', 'parse', 'lang', 'logger', 'commonJs', 'prim'
                         lang.each(depMaps, lang.bind(this, function (depMap) {
                             if (typeof depMap === 'string') {
                                 depMap = context.makeModuleMap(depMap,
-                                               (this.map.isDefine ? this.map : this.map.parentMap));
+                                               (this.map.isDefine ? this.map : this.map.parentMap),
+                                               false, true);
                             }
 
                             if (!context.fullExec[depMap.id]) {

build/tests/builds.js

@@ -1860,6 +1860,26 @@ define(['build', 'env!env/file', 'env', 'lang'], function (build, file, env, lan
     );
     doh.run();
 
+    // When undefining a plugin to re-execute for full build execution, make
+    // sure its dependency undefs consider map config.
+    // https://github.com/requirejs/r.js/issues/944
+    doh.register("pluginBuildUndef",
+        [
+            function pluginFirstWithDeps(t) {
+                file.deleteFile("lib/pluginBuildUndef/out.js");
+
+                build(["lib/pluginBuildUndef/build.js"]);
+
+                t.is(nol(c("lib/pluginBuildUndef/expected.js")),
+                     nol(c("lib/pluginBuildUndef/out.js")));
+
+                require._buildReset();
+            }
+
+        ]
+    );
+    doh.run();
+
     //Make sure plugin dependencies that need normalization run in a build.
     //https://github.com/requirejs/r.js/issues/648
     doh.register("pluginDepExec",
@@ -2870,4 +2890,5 @@ define(['build', 'env!env/file', 'env', 'lang'], function (build, file, env, lan
         ]
     );
     doh.run();
+
 });

build/tests/lib/pluginBuildUndef/build.js

@@ -0,0 +1,11 @@
+{
+    "include": ["lib/foo", "a"],
+    "out": "out.js",
+    "baseUrl": "files/",
+    "optimize": "none",
+    "map": {
+        "lib/foo": {
+            "text": "lib/text",
+        }
+    }
+}