Fixes requirejs#217, hide the module and exports for r.js from plugins and dependencies executing as part of a build.

jrburke · jrburke · commit 788e4582d587 · 2012-07-07T23:25:11.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ build/tests/lib/nestedHas/main-builtNeedB.js
 build/tests/lib/nestedHas/main-builtNeedC.js
 build/tests/lib/nestedHas/main-builtNeedD.js
 build/tests/lib/nestedHas/main-builtNested.js
+build/tests/lib/noexports/main-built.js
 build/tests/lib/nonStrict/main-built.js
 build/tests/lib/onBuildRead/main-built.js
 build/tests/lib/onBuildWrite/main-built.js
diff --git a/build/jslib/requirePatch.js b/build/jslib/requirePatch.js
@@ -30,7 +30,13 @@ function (file,           pragma,   parse,   lang,   logger,   commonJs) {
         var layer,
             pluginBuilderRegExp = /(["']?)pluginBuilder(["']?)\s*[=\:]\s*["']([^'"\s]+)["']/,
             oldNewContext = require.s.newContext,
-            oldDef;
+            oldDef,
+
+            //create local undefined values for module and exports,
+            //so that when files are evaled in this function they do not
+            //see the node values used for r.js
+            exports,
+            module;
 
         //Stored cached file contents for reuse in other layers.
         require._cachedFileContents = {};
diff --git a/build/tests/builds.js b/build/tests/builds.js
@@ -1292,4 +1292,23 @@ define(['build', 'env!env/file'], function (build, file) {
     );
     doh.run();
 
+    //Make sure evaled plugin dependencies in a build do not see the module
+    //and exports value for r.js https://github.com/jrburke/r.js/issues/217
+    doh.register("noexports",
+        [
+            function noexports(t) {
+                file.deleteFile("lib/noexports/main-built.js");
+
+                build(["lib/noexports/build.js"]);
+
+                t.is(nol(c("lib/noexports/expected.js")),
+                     nol(c("lib/noexports/main-built.js")));
+
+                require._buildReset();
+            }
+
+        ]
+    );
+    doh.run();
+
 });
diff --git a/build/tests/lib/moduleThenPlugin/expected.js b/build/tests/lib/moduleThenPlugin/expected.js
@@ -7,11 +7,11 @@ require(['sub1'], function (sub1) {});
 define("main", function(){});
 
 /**
- * @license RequireJS text 2.0.0 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS text 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/requirejs/text for details
  */
-/*jslint */
+/*jslint regexp: true */
 /*global require: false, XMLHttpRequest: false, ActiveXObject: false,
   define: false, window: false, process: false, Packages: false,
   java: false, location: false */
@@ -27,11 +27,11 @@ define('text',['module'], function (module) {
         defaultHostName = hasLocation && location.hostname,
         defaultPort = hasLocation && (location.port || undefined),
         buildMap = [],
-        masterConfig = module.config(),
+        masterConfig = (module.config && module.config()) || {},
         text, fs;
 
     text = {
-        version: '2.0.0',
+        version: '2.0.1',
 
         strip: function (content) {
             //Strips <?xml ...?> declarations so that external SVG and XML
@@ -55,16 +55,18 @@ define('text',['module'], function (module) {
                 .replace(/[\b]/g, "\\b")
                 .replace(/[\n]/g, "\\n")
                 .replace(/[\t]/g, "\\t")
-                .replace(/[\r]/g, "\\r");
+                .replace(/[\r]/g, "\\r")
+                .replace(/[\u2028]/g, "\\u2028")
+                .replace(/[\u2029]/g, "\\u2029");
         },
 
-        createXhr: function () {
+        createXhr: masterConfig.createXhr || function () {
             //Would love to dump the ActiveX crap in here. Need IE 6 to die first.
             var xhr, i, progId;
             if (typeof XMLHttpRequest !== "undefined") {
                 return new XMLHttpRequest();
             } else if (typeof ActiveXObject !== "undefined") {
-                for (i = 0; i < 3; i++) {
+                for (i = 0; i < 3; i += 1) {
                     progId = progIds[i];
                     try {
                         xhr = new ActiveXObject(progId);
@@ -132,7 +134,7 @@ define('text',['module'], function (module) {
             uHostName = uHostName[0];
 
             return (!uProtocol || uProtocol === protocol) &&
-                   (!uHostName || uHostName === hostname) &&
+                   (!uHostName || uHostName.toLowerCase() === hostname.toLowerCase()) &&
                    ((!uPort && !uHostName) || uPort === port);
         },
 
diff --git a/build/tests/lib/noexports/build.js b/build/tests/lib/noexports/build.js
@@ -0,0 +1,6 @@
+{
+    baseUrl: '.',
+    name: 'main',
+    out: 'main-built.js',
+    optimize: 'none'
+}
diff --git a/build/tests/lib/noexports/converter.js b/build/tests/lib/noexports/converter.js
@@ -0,0 +1,16 @@
+(function (factory) {
+    if (typeof exports !== 'undefined') {
+        // Node/CommonJS
+        factory(exports);
+    } else if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(['exports'], factory);
+    }
+
+
+}(function (exports) {
+    exports.version = '2';
+    exports.convert = function (text) {
+        return text.toUpperCase();
+    };
+}));
diff --git a/build/tests/lib/noexports/expected.js b/build/tests/lib/noexports/expected.js
@@ -0,0 +1,57 @@
+
+(function (factory) {
+    if (typeof exports !== 'undefined') {
+        // Node/CommonJS
+        factory(exports);
+    } else if (typeof define === 'function' && define.amd) {
+        // AMD
+        define('converter',['exports'], factory);
+    }
+
+
+}(function (exports) {
+    exports.version = '2';
+    exports.convert = function (text) {
+        return text.toUpperCase();
+    };
+}));
+
+define('plug',['converter'], function (converter) {
+    var buildMap = {};
+
+    function jsEscape(content) {
+        return content.replace(/(['\\])/g, '\\$1')
+            .replace(/[\f]/g, "\\f")
+            .replace(/[\b]/g, "\\b")
+            .replace(/[\n]/g, "\\n")
+            .replace(/[\t]/g, "\\t")
+            .replace(/[\r]/g, "\\r");
+    }
+
+    return {
+        version: '1',
+        load: function (name, require, onLoad, config) {
+            var converted = converter.convert(name);
+            buildMap[name] = converted;
+            onLoad(converted);
+        },
+
+        write: function (pluginName, moduleName, write, config) {
+            if (moduleName in buildMap) {
+                var content = jsEscape(buildMap[moduleName]);
+                write("define('" + pluginName + "!" + moduleName  +
+                      "', function () { return '" + content + "';});\n");
+            }
+        }
+    };
+});
+
+define('plug!shouldbeuppercasetext', function () { return 'SHOULDBEUPPERCASETEXT';});
+
+require(['plug', 'plug!shouldbeuppercasetext'],
+function (plug, text) {
+    console.log('plugin version: ' + plug.version);
+    console.log('converted text: ' + text);
+});
+
+define("main", function(){});
diff --git a/build/tests/lib/noexports/main.js b/build/tests/lib/noexports/main.js
@@ -0,0 +1,5 @@
+require(['plug', 'plug!shouldbeuppercasetext'],
+function (plug, text) {
+    console.log('plugin version: ' + plug.version);
+    console.log('converted text: ' + text);
+});
diff --git a/build/tests/lib/noexports/plug.js b/build/tests/lib/noexports/plug.js
@@ -0,0 +1,29 @@
+define(['converter'], function (converter) {
+    var buildMap = {};
+
+    function jsEscape(content) {
+        return content.replace(/(['\\])/g, '\\$1')
+            .replace(/[\f]/g, "\\f")
+            .replace(/[\b]/g, "\\b")
+            .replace(/[\n]/g, "\\n")
+            .replace(/[\t]/g, "\\t")
+            .replace(/[\r]/g, "\\r");
+    }
+
+    return {
+        version: '1',
+        load: function (name, require, onLoad, config) {
+            var converted = converter.convert(name);
+            buildMap[name] = converted;
+            onLoad(converted);
+        },
+
+        write: function (pluginName, moduleName, write, config) {
+            if (moduleName in buildMap) {
+                var content = jsEscape(buildMap[moduleName]);
+                write("define('" + pluginName + "!" + moduleName  +
+                      "', function () { return '" + content + "';});\n");
+            }
+        }
+    };
+});
