Changes UMD callsite to be more likely to pass in the intended… (#10477)

* Changes UMD callsite to be more likely to pass in the intended object. Fixes #10476 Note: This PR should be considered pseudocode and used as an illustration of the proposed fix. I do not know nearly enough about this project to know if this is an appropriate solution to the problem, nor do I have the confidence to update the tests appropriately. * Update tests
babel · Oct 29, 2019 · 198b4a0 · 198b4a0
1 parent 143d159
commit 198b4a0
Show file tree

Hide file tree

Showing 95 changed files with 103 additions and 95 deletions.
diff --git a/...ction-name/test/fixtures/function-name/export-default-arrow-renaming-module-umd/output.js b/...ction-name/test/fixtures/function-name/export-default-arrow-renaming-module-umd/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {

diff --git a/packages/babel-plugin-transform-modules-umd/src/index.js b/packages/babel-plugin-transform-modules-umd/src/index.js
@@ -27,7 +27,11 @@ const buildWrapper = template(`
 
       GLOBAL_TO_ASSIGN;
     }
-  })(this, function(IMPORT_NAMES) {
+  })(
+    typeof globalThis === "object" ? globalThis
+      : typeof self === "object" ? self
+      : this,
+    function(IMPORT_NAMES) {
   })
 `);
 

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-10/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-10/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-11/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-11/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-2/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-2/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-3/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-4/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-4/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-5/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-6/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-6/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-7/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-7/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-8/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-8/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-9/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default-9/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-default/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-2/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-2/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo);
     global.input = mod.exports;
   }
-})(this, function (_exports, _foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, _foo) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-3/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo);
     global.input = mod.exports;
   }
-})(this, function (_exports, _foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, _foo) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-4/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-4/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo);
     global.input = mod.exports;
   }
-})(this, function (_exports, _foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, _foo) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-5/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo);
     global.input = mod.exports;
   }
-})(this, function (_exports, _foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, _foo) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-6/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-6/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo);
     global.input = mod.exports;
   }
-})(this, function (_exports, _foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, _foo) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo);
     global.input = mod.exports;
   }
-})(this, function (_exports, _foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, _foo) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-2/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-2/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-3/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-4/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-4/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-5/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/exports-variable/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/exports-variable/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/...s/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/output.js b/...s/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/output.js
@@ -10,6 +10,6 @@
     factory();
     global.myCustomModuleName = mod.exports;
   }
-})(this, function () {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function () {
   "use strict";
 });
diff --git a/...s/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js b/...s/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.evens);
     global.input = mod.exports;
   }
-})(this, function (_exports, _evens) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, _evens) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-default/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-default/output.js
@@ -10,7 +10,7 @@
     factory(global.foo);
     global.input = mod.exports;
   }
-})(this, function (_foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_foo) {
   "use strict";
 
   _foo = babelHelpers.interopRequireDefault(_foo);

diff --git a/...form-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/output.js b/...form-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/output.js
@@ -10,7 +10,7 @@
     factory(global.fooBAR, global.fooBAR, global.fizzBuzz);
     global.input = mod.exports;
   }
-})(this, function (_fooBar, _fooBar2, _fizzbuzz) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_fooBar, _fooBar2, _fizzbuzz) {
   "use strict";
 
   _fooBar = babelHelpers.interopRequireDefault(_fooBar);

diff --git a/...el-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false/output.js b/...el-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false/output.js
@@ -10,7 +10,7 @@
     factory(global.fooBar, global.fooBar, global.fizzbuzz);
     global.input = mod.exports;
   }
-})(this, function (_fooBar, _fooBar2, _fizzbuzz) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_fooBar, _fooBar2, _fizzbuzz) {
   "use strict";
 
   _fooBar = babelHelpers.interopRequireDefault(_fooBar);

diff --git a/...sform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/output.js b/...sform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/output.js
@@ -10,7 +10,7 @@
     factory(global.fooBAR, global.mylib.fooBar, global.fizz.buzz);
     global.input = mod.exports;
   }
-})(this, function (_fooBar, _fooBar2, _fizzbuzz) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_fooBar, _fooBar2, _fizzbuzz) {
   "use strict";
 
   _fooBar = babelHelpers.interopRequireDefault(_fooBar);

diff --git a/...bel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/output.js b/...bel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/output.js
@@ -10,7 +10,7 @@
     factory(global.fooBar, global.mylibFooBar, global.fizzbuzz);
     global.input = mod.exports;
   }
-})(this, function (_fooBar, _fooBar2, _fizzbuzz) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_fooBar, _fooBar2, _fizzbuzz) {
   "use strict";
 
   _fooBar = babelHelpers.interopRequireDefault(_fooBar);

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-glob/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-glob/output.js
@@ -10,7 +10,7 @@
     factory(global.foo);
     global.input = mod.exports;
   }
-})(this, function (foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (foo) {
   "use strict";
 
   foo = babelHelpers.interopRequireWildcard(foo);

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-mixing/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-mixing/output.js
@@ -10,7 +10,7 @@
     factory(global.foo);
     global.input = mod.exports;
   }
-})(this, function (_foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_foo) {
   "use strict";
 
   _foo = babelHelpers.interopRequireWildcard(_foo);

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-named/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-named/output.js
@@ -10,7 +10,7 @@
     factory(global.foo);
     global.input = mod.exports;
   }
-})(this, function (_foo) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_foo) {
   "use strict";
 
   _foo.bar;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports/output.js
@@ -10,6 +10,6 @@
     factory(global.foo, global.fooBar, global.fooBar);
     global.input = mod.exports;
   }
-})(this, function (_foo, _fooBar, _fooBar2) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_foo, _fooBar, _fooBar2) {
   "use strict";
 });
diff --git a/...m-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/output.js b/...m-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/output.js
@@ -11,7 +11,7 @@
     global.foo = global.foo || {};
     global.foo.bar = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/...d/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/output.js b/...d/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/output.js
@@ -13,7 +13,7 @@
     global.foo.bar.baz = global.foo.bar.baz || {};
     global.foo.bar.baz.qux = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/...ugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/output.js b/...ugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.baz = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id/output.js
@@ -10,7 +10,7 @@
     factory();
     global.MyLib = mod.exports;
   }
-})(this, function () {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function () {
   "use strict";
 
   foobar();

diff --git a/...in-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js b/...in-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.looseModuleNameWithOverriddenGlobalInput = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;

diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/output.js
@@ -10,7 +10,7 @@
     factory();
     global.looseModuleNameInput = mod.exports;
   }
-})(this, function () {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function () {
   "use strict";
 
   foobar();

diff --git a/...ages/babel-plugin-transform-modules-umd/test/fixtures/loose/non-default-imports/output.js b/...ages/babel-plugin-transform-modules-umd/test/fixtures/loose/non-default-imports/output.js
@@ -10,6 +10,6 @@
     factory(global.render);
     global.input = mod.exports;
   }
-})(this, function (_render) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_render) {
   "use strict";
 });
diff --git a/...ges/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/output.js b/...ges/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.input = mod.exports;
   }
-})(this, function (_exports) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports) {
   "use strict";
 
   _exports.__esModule = true;