Small change in generated script to avoid possible collision in windo…

…w.default
shouldjs · Jun 10, 2016 · 9962013 · 9962013
1 parent b9aaa27
commit 9962013
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/browser-entry.js b/browser-entry.js
@@ -1,5 +1,5 @@
 import should from './es6/should';
-import root from 'root';
+import * as root from 'root';
 
 var defaultProto = Object.prototype;
 var defaultProperty = 'should';
@@ -12,14 +12,17 @@ try {
   //ignore errors
 }
 
+
 if (typeof define === 'function' && define.amd) {
   define([], function() { return should });
 } else if (typeof module === 'object' && module.exports) {
   module.exports = should;
 } else {
-  root.Should = should;
+  var _root = root;
+
+  _root.Should = should;
 
-  Object.defineProperty(root, 'should', {
+  Object.defineProperty(_root, 'should', {
     enumerable: false,
     configurable: true,
     value: should

diff --git a/should.js b/should.js
@@ -9,8 +9,6 @@
 (function (root) {
   'use strict';
 
-  root = 'default' in root ? root['default'] : root;
-
   var types = {
     NUMBER: 'number',
     UNDEFINED: 'undefined',
@@ -3810,14 +3808,17 @@
     //ignore errors
   }
 
+
   if (typeof define === 'function' && define.amd) {
     define([], function() { return should });
   } else if (typeof module === 'object' && module.exports) {
     module.exports = should;
   } else {
-    root.Should = should;
+    var _root = root;
+
+    _root.Should = should;
 
-    Object.defineProperty(root, 'should', {
+    Object.defineProperty(_root, 'should', {
       enumerable: false,
       configurable: true,
       value: should