Fixes #1577, plugin normalize called too many times

requirejs · Feb 19, 2017 · a838655 · a838655
1 parent 3e55417
commit a838655
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 2 deletions.
diff --git a/require.js b/require.js
@@ -440,7 +440,9 @@ var requirejs, require, define;
             //Account for relative paths if there is a base name.
             if (name) {
                 if (prefix) {
-                    if (pluginModule && pluginModule.normalize) {
+                    if (isNormalized) {
+                        normalizedName = name;
+                    } else if (pluginModule && pluginModule.normalize) {
                         //Plugin is loaded, use its normalize method.
                         normalizedName = pluginModule.normalize(name, function (name) {
                             return normalize(name, parentName, applyMap);
@@ -972,7 +974,8 @@ var requirejs, require, define;
                         //prefix and name should already be normalized, no need
                         //for applying map config again either.
                         normalizedMap = makeModuleMap(map.prefix + '!' + name,
-                                                      this.map.parentMap);
+                                                      this.map.parentMap,
+                                                      true);
                         on(normalizedMap,
                             'defined', bind(this, function (value) {
                                 this.map.normalizedMap = normalizedMap;

diff --git a/tests/all.js b/tests/all.js
@@ -140,6 +140,8 @@ doh.registerUrl("pluginsSync", "../plugins/sync.html");
 doh.registerUrl("pluginsOnError", "../plugins/onerror/onerror.html");
 doh.registerUrl("doublePluginCall", "../plugins/double.html");
 doh.registerUrl("pluginsNameOnly", "../plugins/nameOnly.html");
+doh.registerUrl("pluginNormalize", "../pluginNormalize/pluginNormalize.html");
+doh.registerUrl("pluginNormalizeLoad", "../pluginNormalizeLoad/pluginNormalizeLoad.html");
 doh.registerUrl("pluginsDelegated", "../plugins/delegated/delegated.html");
 doh.registerUrl("pluginsFromText", "../plugins/fromText/fromText.html");
 doh.registerUrl("pluginsFromTextEvalError", "../plugins/fromTextEvalError/fromTextEvalError.html");

diff --git a/tests/pluginNormalize/pluginNormalize.html b/tests/pluginNormalize/pluginNormalize.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: Remote URL Test</title>
+    <script type="text/javascript" src="../../require.js"></script>
+    <script type="text/javascript" src="../doh/runner.js"></script>
+    <script type="text/javascript" src="../doh/_browserRunner.js"></script>
+    <script type="text/javascript">
+
+        define("Plugin", function() {
+            return {
+                load: function(name, parentRequire, onload, config) {
+                    onload(name);
+                },
+                normalize: function(name, normalize) {
+                    return name + '.xyz';
+                }
+            }
+        });
+
+		require({
+		        baseUrl: "./"
+		    },
+		    ["Plugin!hello", "Plugin!world"],
+		    function(hello, world) {
+		        doh.register(
+		            "pluginNormalize",
+		            [
+		                function pluginNormalize(t){
+		                    t.is("hello.xyz", hello);
+		                    t.is("world.xyz", world);
+		                }
+		            ]
+		        );
+
+		        doh.run();
+		    }
+		);
+
+
+    </script>
+</head>
+<body>
+    <h1>require.js: Plugin Normalize Test</h1>
+    <p>Check console for messages</p>
+</body>
+</html>
diff --git a/tests/pluginNormalizeLoad/Plugin.js b/tests/pluginNormalizeLoad/Plugin.js
@@ -0,0 +1,10 @@
+define(function() {
+    return {
+        load: function(name, parentRequire, onload, config) {
+            onload(name);
+        },
+        normalize: function(name, normalize) {
+            return name + '.xyz';
+        }
+    }
+});
diff --git a/tests/pluginNormalizeLoad/pluginNormalizeLoad.html b/tests/pluginNormalizeLoad/pluginNormalizeLoad.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: Remote URL Test</title>
+    <script type="text/javascript" src="../../require.js"></script>
+    <script type="text/javascript" src="../doh/runner.js"></script>
+    <script type="text/javascript" src="../doh/_browserRunner.js"></script>
+    <script type="text/javascript">
+		require({
+		        baseUrl: "./"
+		    },
+		    ["Plugin!hello", "Plugin!world"],
+		    function(hello, world) {
+		        doh.register(
+		            "pluginNormalizeLoad",
+		            [
+		                function pluginNormalizeLoad(t){
+		                    t.is("hello.xyz", hello);
+		                    t.is("world.xyz", world);
+		                }
+		            ]
+		        );
+
+		        doh.run();
+		    }
+		);
+
+
+    </script>
+</head>
+<body>
+    <h1>require.js: Plugin Normalize Test</h1>
+    <p>Check console for messages</p>
+</body>
+</html>