- changed browserify version to 1.13.5

- fixed global var injection in the browser

Author: Johannes

lib/__set__.js

@@ -25,9 +25,10 @@ function __set__() {
         if (!arguments.env || Array.isArray(arguments.env)) {
             throw new TypeError("__set__ expects an object as env");
         }
-        for (arguments.key in arguments.env) {
-            if (arguments.env.hasOwnProperty(arguments.key)) {
-                arguments.src += arguments.checkExistsSrc(arguments.key) + arguments.key + " = arguments.env." + arguments.key + ";";
+        for (arguments.varName in arguments.env) {
+            if (arguments.env.hasOwnProperty(arguments.varName)) {
+                arguments.varValue = arguments.env[arguments.varName];
+                arguments.src += arguments.checkExistsSrc(arguments.varName, arguments.varValue) + arguments.varName + " = arguments.env." + arguments.varName + ";";
             }
         }
     } else if (typeof arguments.varName === "string") {

lib/browser/shims.js

@@ -0,0 +1,48 @@
+// Taken from https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf#Compatibility
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+        "use strict";
+        if (this == null) {
+            throw new TypeError();
+        }
+        var t = Object(this);
+        var len = t.length >>> 0;
+        if (len === 0) {
+            return -1;
+        }
+        var n = 0;
+        if (arguments.length > 0) {
+            n = Number(arguments[1]);
+            if (n != n) { // shortcut for verifying if it's NaN
+                n = 0;
+            } else if (n != 0 && n != Infinity && n != -Infinity) {
+                n = (n > 0 || -1) * Math.floor(Math.abs(n));
+            }
+        }
+        if (n >= len) {
+            return -1;
+        }
+        var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
+        for (; k < len; k++) {
+            if (k in t && t[k] === searchElement) {
+                return k;
+            }
+        }
+        return -1;
+    }
+}
+
+
+// Taken from https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/trim#Compatibility
+if(!String.prototype.trim) {
+  String.prototype.trim = function () {
+    return this.replace(/^\s+|\s+$/g,'');
+  };
+}
+
+// Taken from https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray#Compatibility
+if(!Array.isArray) {
+  Array.isArray = function (vArg) {
+    return Object.prototype.toString.call(vArg) === "[object Array]";
+  };
+}

lib/browserify/browserInit.js

@@ -2,43 +2,11 @@
  * This code gets injected at the end of the browserify bundle via b.append().
  */
 
-if (typeof window.browserifyRequire !== "undefined") {
-    throw new Error("Naming collision detected: window.browserifyRequire seems to be occupied.");
+if (typeof window.browserifyRequire === "undefined") {
+    // Saves the browserifyRequire under a new name. Necessary to call the original browserifyRequire within
+    // a module where the variable name "require" is overridden by the module's internal require.
+    window.browserifyRequire = require;
+} else {
+    throw new Error("(rewire/browserify) Naming collision detected: window.browserifyRequire seems to be occupied.");
 }
 
-// Saves the browserifyRequire under a new name. Necessary to call the original browserifyRequire within
-// a module where the variable name "require" is overridden by the module's internal require.
-window.browserifyRequire = require;
-
-/**
- * Provides a special require-proxy. Every module calls window.browserifyRequire.getProxy(require, __filename) at the
- * beginning and overrides its own require with this proxy.
- *
- * This is necessary to call rewire() with the original __filename. Thus you can use rewire() like require().
- *
- * @param {!Function} internalRequire the module's own require
- * @param {String} filename the __filename of the module
- * @return {Function} requireProxy
- */
-window.browserifyRequire.getProxy = function (internalRequire, filename) {
-    var rewireModule = internalRequire("rewire"),
-        key;
-
-    function rewireProxy(path, cache) {
-        return rewireModule(filename, path, cache);
-    }
-
-    for (key in rewireModule) {
-        if (rewireModule.hasOwnProperty(key)) {
-            rewireProxy[key] = rewireModule[key];
-        }
-    }
-
-    return function requireProxy(path) {
-        if (path === "rewire") {
-            return rewireProxy;
-        } else {
-            return internalRequire(path);
-        }
-    };
-};

lib/browserify/browserifyMiddleware.js

@@ -7,7 +7,6 @@ var setterSrc = require("../__set__.js").toString(),
     detectStrictMode = require("../detectStrictMode.js"),
 
     browserInit = fs.readFileSync(__dirname + "/browserInit.js", "utf8"),
-    importGlobalsSrc = getImportGlobalsSrc(),
     injectionSrc = getInjectionSrc().replace(/\s+/g, " ");   // strip out unnecessary spaces to be unobtrusive in the debug view
 
 /**
@@ -19,18 +18,20 @@ var setterSrc = require("../__set__.js").toString(),
  * @return {String}
  */
 function getInjectionSrc() {
-    // Registers the setters and getters of every module according to their filename. The setters and getters must be
-    // injected as string here to gain access to the private scope of the module.
-    return  'require("rewire").register(__filename, ' + setterSrc + ', ' + getterSrc + ');' +
-    // Overrides the module internal require with a require proxy. This proxy is necessary to call rewire with the
-    // module's filename at the first parameter to resolve the path. This way rewire() works exactly like require().
-            'require = window.browserifyRequire.getProxy(require, __filename);';
+    return 'var rewire = require("rewire"); ' +
+        // Registers the setters and getters of every module according to their filename. The setters and getters must be
+        // injected as string here to gain access to the private scope of the module.
+        'rewire.register(__filename, module, ' + setterSrc + ', ' + getterSrc + ');' +
+        // Overrides the module internal require with a require proxy. This proxy is necessary to call rewire with the
+        // module's filename at the first parameter to resolve the path. This way rewire() works exactly like require().
+        'require = rewire.getProxy(require, __dirname);' +
+        // Cleaning up
+        'rewire = undefined;';
 }
 
 function browserifyMiddleware(b) {
     function injectRewire(src, filename) {
-        var rewireRequires,
-            strictMode = "";
+        var rewireRequires;
 
         // Search for all rewire() statements an return the required path.
         rewireRequires = getRewireRequires(src);
@@ -45,24 +46,39 @@ function browserifyMiddleware(b) {
             b.require(requirePath);
         });
 
-        // If the module uses strict mode we must ensure that "use strict" stays at the beginning of the module.
-        if (detectStrictMode(src) === true) {
-            strictMode = ' "use strict"; ';
+        // Convert back slashes to normal slashes on windows.
+        if (process.platform.indexOf("win") === 0) {
+            filename = filename.replace(/\\/g, "/");
         }
 
-        // Convert back slashes to normal slashes.
-        filename = filename.replace(/\\/g, "/");
-
         // We don't want to inject this code at the beginning of a rewire/lib-module. Otherwise
         // it would cause a black hole that devours our universe.
         if (filename.indexOf("/rewire/lib") === -1) {
             src =
-                strictMode +    // either '' or ' "use strict"; '
-                "/* this line was injected by rewire() */" +
-                "var global = window; " +   // window is our new global object
-                importGlobalsSrc +
+                // Trying to hide the injected line in the debug view with extra whitespaces.
+                '                                                                                                                                                ' +
+                '/* this line was injected by rewire() */ ' +   // Comment for the curious developer
+
+                // Now all global variables are declared with a var statement so they can be changed via __set__()
+                // without influencing global objects.
+                'var global = window; ' +   // window is our new global object
+                'eval(require("rewire").getImportGlobalsSrc()); ' +
+
+                // The module src is wrapped inside a self-executing function.
+                // This is necessary to separate the module src from the preceding eval(importGlobalsSrc),
+                // because the module src can be in strict mode.
+                // In strict mode eval() can only declare vars the current scope. In this case our setters
+                // and getters won't work.
+                // @see https://developer.mozilla.org/en/JavaScript/Strict_mode#Making_eval_and_arguments_simpler
+                "(function () {" +
+
+                // If the module uses strict mode we must ensure that "use strict" stays at the beginning of the module.
+                (detectStrictMode(src)? ' "use strict"; ': ' ') +
+
                 injectionSrc + "\n" +
-                src;
+                src +
+
+                "})();";
         }
 
         return src;