Fixes requirejs#1131, nested plugin use mangled in normalization

jrburke · jrburke · commit 26404fe70044 · 2014-05-27T16:22:04.000-07:00
diff --git a/require.js b/require.js
@@ -444,7 +444,16 @@ var requirejs, require, define;
                             return normalize(name, parentName, applyMap);
                         });
                     } else {
-                        normalizedName = normalize(name, parentName, applyMap);
+                        // If nested plugin references, then do not try to
+                        // normalize, as it will not normalize correctly. This
+                        // places a restriction on resourceIds, and the longer
+                        // term solution is not to normalize until plugins are
+                        // loaded and all normalizations to allow for async
+                        // loading of a loader plugin. But for now, fixes the
+                        // common uses. Details in #1131
+                        normalizedName = name.indexOf('!') === -1 ?
+                                         normalize(name, parentName, applyMap) :
+                                         name;
                     }
                 } else {
                     //A regular module.
diff --git a/tests/all.js b/tests/all.js
@@ -138,6 +138,7 @@ doh.registerUrl("pluginMap", "../plugins/pluginMap/pluginMap.html");
 doh.registerUrl("pluginMapSameName", "../plugins/pluginMapSameName/pluginMapSameName.html");
 doh.registerUrl("pluginMapDynamic", "../plugins/pluginMap/dynamic/pluginMapDynamic.html");
 doh.registerUrl("pluginComplexNormalize", "../plugins/complexNormalize/complexNormalize.html");
+doh.registerUrl("pluginNormalize", "../plugins/pluginNormalize/pluginNormalize.html");
 
 doh.registerUrl("requirePluginLoad", "../requirePluginLoad/requirePluginLoad.html");
 
diff --git a/tests/plugins/pluginNormalize/modA.js b/tests/plugins/pluginNormalize/modA.js
@@ -0,0 +1,7 @@
+define(function() {
+  return {
+    load: function(name, req, onload, config) {
+      req([name + '-foo'], onload, onload.error);
+    }
+  }
+});
diff --git a/tests/plugins/pluginNormalize/modB.js b/tests/plugins/pluginNormalize/modB.js
@@ -0,0 +1,7 @@
+define(function() {
+  return {
+    load: function(name, req, onload, config) {
+      onload(name);
+    }
+  }
+});
diff --git a/tests/plugins/pluginNormalize/pluginNormalize-tests.js b/tests/plugins/pluginNormalize/pluginNormalize-tests.js
@@ -0,0 +1,17 @@
+require(['modA!modB!no-dotdot',
+         'modA!modB!../one-dotdot',
+         'modA!modB!../../two-dotdot-is-broken'], function (a, b, c) {
+
+    doh.register(
+        "pluginNormalize",
+        [
+            function pluginNormalize(t){
+                t.is('no-dotdot-foo', a);
+                t.is('../one-dotdot-foo', b);
+                t.is('../../two-dotdot-is-broken-foo', c);
+            }
+        ]
+    );
+
+    doh.run();
+});
diff --git a/tests/plugins/pluginNormalize/pluginNormalize.html b/tests/plugins/pluginNormalize/pluginNormalize.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: Nested Plugin Normalize Test</title>
+    <script type="text/javascript" src="../../doh/runner.js"></script>
+    <script type="text/javascript" src="../../doh/_browserRunner.js"></script>
+    <script type="text/javascript" data-main="pluginNormalize-tests" src="../../../require.js"></script>
+</head>
+<body>
+    <h1>require.js: Nested Plugin Normalize Test</h1>
+    <p><a href="https://github.com/jrburke/requirejs/issues/1131">More info</a></p>
+    <p>Check console for messages</p>
+</body>
+</html>
