Merge pull request #2175 from sinonjs/upgrade-nise-and-browserify

Upgrade nise and browserify
sinonjs · Dec 19, 2019 · 6438640 · 6438640
2 parents 673c3f1 + d6ba8ae
commit 6438640
Show file tree

Hide file tree

Showing 14 changed files with 2,009 additions and 3,075 deletions.
diff --git a/build.js b/build.js
@@ -34,29 +34,47 @@ makeBundle(
         // Add inline source maps to the default bundle
         debug: true,
         // Create a UMD wrapper and install the "sinon" global:
-        standalone: "sinon"
+        standalone: "sinon",
+        // Do not detect and insert globals:
+        detectGlobals: false
     },
     function(bundle) {
         var script = preamble + bundle;
         fs.writeFileSync("pkg/sinon.js", script);
     }
 );
 
-makeBundle("./lib/sinon.js", {}, function(bundle) {
-    var script = preamble + bundle;
-    fs.writeFileSync("pkg/sinon-no-sourcemaps.js", script);
-});
-
-makeBundle("./lib/sinon-esm.js", {}, function(bundle) {
-    var intro = "let sinon;";
-    var outro =
-        "\nexport default sinon;\n" +
-        Object.keys(sinon)
-            .map(function(key) {
-                return "const _" + key + " = sinon." + key + ";\nexport { _" + key + " as " + key + " };";
-            })
-            .join("\n");
-
-    var script = preamble + intro + bundle + outro;
-    fs.writeFileSync("pkg/sinon-esm.js", script);
-});
+makeBundle(
+    "./lib/sinon.js",
+    {
+        // Create a UMD wrapper and install the "sinon" global:
+        standalone: "sinon",
+        // Do not detect and insert globals:
+        detectGlobals: false
+    },
+    function(bundle) {
+        var script = preamble + bundle;
+        fs.writeFileSync("pkg/sinon-no-sourcemaps.js", script);
+    }
+);
+
+makeBundle(
+    "./lib/sinon-esm.js",
+    {
+        // Do not detect and insert globals:
+        detectGlobals: false
+    },
+    function(bundle) {
+        var intro = "let sinon;";
+        var outro =
+            "\nexport default sinon;\n" +
+            Object.keys(sinon)
+                .map(function(key) {
+                    return "const _" + key + " = sinon." + key + ";\nexport { _" + key + " as " + key + " };";
+                })
+                .join("\n");
+
+        var script = preamble + intro + bundle + outro;
+        fs.writeFileSync("pkg/sinon-esm.js", script);
+    }
+);
diff --git a/lib/sinon/assert.js b/lib/sinon/assert.js
@@ -7,6 +7,7 @@ var orderByFirstCall = require("@sinonjs/commons").orderByFirstCall;
 var timesInWords = require("./util/core/times-in-words");
 var format = require("./util/core/format");
 var stringSlice = require("@sinonjs/commons").prototypes.string.slice;
+var globalObject = require("@sinonjs/commons").global;
 
 var arraySlice = arrayProto.slice;
 var concat = arrayProto.concat;
@@ -60,7 +61,7 @@ function verifyIsValidAssertion(assertionMethod, assertionArgs) {
 }
 
 function failAssertion(object, msg) {
-    var obj = object || global;
+    var obj = object || globalObject;
     var failMethod = obj.fail || assert.fail;
     failMethod.call(obj, msg);
 }

diff --git a/lib/sinon/util/core/next-tick.js b/lib/sinon/util/core/next-tick.js
@@ -1,8 +1,6 @@
 "use strict";
 
+var globalObject = require("@sinonjs/commons").global;
 var getNextTick = require("./get-next-tick");
 
-/* istanbul ignore next */
-var root = typeof window !== "undefined" ? window : global;
-
-module.exports = getNextTick(root.process, root.setImmediate);
+module.exports = getNextTick(globalObject.process, globalObject.setImmediate);
diff --git a/lib/sinon/util/fake-timers.js b/lib/sinon/util/fake-timers.js
@@ -2,6 +2,7 @@
 
 var extend = require("./core/extend");
 var llx = require("lolex");
+var globalObject = require("@sinonjs/commons").global;
 
 function createClock(config, globalCtx) {
     var llxCtx = llx;
@@ -14,7 +15,7 @@ function createClock(config, globalCtx) {
 }
 
 function addIfDefined(obj, globalPropName) {
-    var globalProp = global[globalPropName];
+    var globalProp = globalObject[globalPropName];
     if (typeof globalProp !== "undefined") {
         obj[globalPropName] = globalProp;
     }