From 198b4a0fbd809c218603d3c54d122c769b2b18ff Mon Sep 17 00:00:00 2001
From: Micah Zoltu <micah@zoltu.net>
Date: Wed, 30 Oct 2019 05:19:49 +0800
Subject: [PATCH] =?UTF-8?q?Changes=20UMD=20callsite=20to=20be=20more=20lik?=
 =?UTF-8?q?ely=20to=20pass=20in=20the=20intended=E2=80=A6=20(#10477)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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
---
 .../export-default-arrow-renaming-module-umd/output.js      | 2 +-
 packages/babel-plugin-transform-modules-umd/src/index.js    | 6 +++++-
 .../test/fixtures/loose/export-default-10/output.js         | 2 +-
 .../test/fixtures/loose/export-default-11/output.js         | 2 +-
 .../test/fixtures/loose/export-default-2/output.js          | 2 +-
 .../test/fixtures/loose/export-default-3/output.js          | 2 +-
 .../test/fixtures/loose/export-default-4/output.js          | 2 +-
 .../test/fixtures/loose/export-default-5/output.js          | 2 +-
 .../test/fixtures/loose/export-default-6/output.js          | 2 +-
 .../test/fixtures/loose/export-default-7/output.js          | 2 +-
 .../test/fixtures/loose/export-default-8/output.js          | 2 +-
 .../test/fixtures/loose/export-default-9/output.js          | 2 +-
 .../test/fixtures/loose/export-default/output.js            | 2 +-
 .../test/fixtures/loose/export-from-2/output.js             | 2 +-
 .../test/fixtures/loose/export-from-3/output.js             | 2 +-
 .../test/fixtures/loose/export-from-4/output.js             | 2 +-
 .../test/fixtures/loose/export-from-5/output.js             | 2 +-
 .../test/fixtures/loose/export-from-6/output.js             | 2 +-
 .../test/fixtures/loose/export-from/output.js               | 2 +-
 .../test/fixtures/loose/export-named-2/output.js            | 2 +-
 .../test/fixtures/loose/export-named-3/output.js            | 2 +-
 .../test/fixtures/loose/export-named-4/output.js            | 2 +-
 .../test/fixtures/loose/export-named-5/output.js            | 2 +-
 .../test/fixtures/loose/export-named/output.js              | 2 +-
 .../test/fixtures/loose/exports-variable/output.js          | 2 +-
 .../test/fixtures/loose/get-module-name-option/output.js    | 2 +-
 .../test/fixtures/loose/hoist-function-exports/output.js    | 2 +-
 .../test/fixtures/loose/imports-default/output.js           | 2 +-
 .../imports-exact-globals-false-with-overrides/output.js    | 2 +-
 .../fixtures/loose/imports-exact-globals-false/output.js    | 2 +-
 .../imports-exact-globals-true-with-overrides/output.js     | 2 +-
 .../fixtures/loose/imports-exact-globals-true/output.js     | 2 +-
 .../test/fixtures/loose/imports-glob/output.js              | 2 +-
 .../test/fixtures/loose/imports-mixing/output.js            | 2 +-
 .../test/fixtures/loose/imports-named/output.js             | 2 +-
 .../test/fixtures/loose/imports/output.js                   | 2 +-
 .../module-id-with-overridden-global-in-namespace/output.js | 2 +-
 .../output.js                                               | 2 +-
 .../loose/module-id-with-overridden-global/output.js        | 2 +-
 .../test/fixtures/loose/module-id/output.js                 | 2 +-
 .../loose/module-name-with-overridden-global/output.js      | 2 +-
 .../test/fixtures/loose/module-name/output.js               | 2 +-
 .../test/fixtures/loose/non-default-imports/output.js       | 2 +-
 .../test/fixtures/loose/override-export-name/output.js      | 2 +-
 .../test/fixtures/loose/override-import-name/output.js      | 2 +-
 .../test/fixtures/loose/overview/output.js                  | 2 +-
 .../test/fixtures/loose/remap/output.js                     | 2 +-
 .../test/fixtures/regression/4192/output.js                 | 2 +-
 .../test/fixtures/umd/export-default-10/output.js           | 2 +-
 .../test/fixtures/umd/export-default-11/output.js           | 2 +-
 .../test/fixtures/umd/export-default-2/output.js            | 2 +-
 .../test/fixtures/umd/export-default-3/output.js            | 2 +-
 .../test/fixtures/umd/export-default-4/output.js            | 2 +-
 .../test/fixtures/umd/export-default-5/output.js            | 2 +-
 .../test/fixtures/umd/export-default-6/output.js            | 2 +-
 .../test/fixtures/umd/export-default-7/output.js            | 2 +-
 .../test/fixtures/umd/export-default-8/output.js            | 2 +-
 .../test/fixtures/umd/export-default-9/output.js            | 2 +-
 .../test/fixtures/umd/export-default/output.js              | 2 +-
 .../test/fixtures/umd/export-from-2/output.js               | 2 +-
 .../test/fixtures/umd/export-from-3/output.js               | 2 +-
 .../test/fixtures/umd/export-from-4/output.js               | 2 +-
 .../test/fixtures/umd/export-from-5/output.js               | 2 +-
 .../test/fixtures/umd/export-from-6/output.js               | 2 +-
 .../test/fixtures/umd/export-from/output.js                 | 2 +-
 .../test/fixtures/umd/export-named-2/output.js              | 2 +-
 .../test/fixtures/umd/export-named-3/output.js              | 2 +-
 .../test/fixtures/umd/export-named-4/output.js              | 2 +-
 .../test/fixtures/umd/export-named-5/output.js              | 2 +-
 .../test/fixtures/umd/export-named/output.js                | 2 +-
 .../test/fixtures/umd/exports-variable/output.js            | 2 +-
 .../test/fixtures/umd/get-module-name-option/output.js      | 2 +-
 .../test/fixtures/umd/hoist-function-exports/output.js      | 2 +-
 .../test/fixtures/umd/imports-default/output.js             | 2 +-
 .../imports-exact-globals-false-with-overrides/output.js    | 2 +-
 .../test/fixtures/umd/imports-exact-globals-false/output.js | 2 +-
 .../umd/imports-exact-globals-true-with-overrides/output.js | 2 +-
 .../test/fixtures/umd/imports-exact-globals-true/output.js  | 2 +-
 .../test/fixtures/umd/imports-glob/output.js                | 2 +-
 .../test/fixtures/umd/imports-mixing/output.js              | 2 +-
 .../test/fixtures/umd/imports-named/output.js               | 2 +-
 .../test/fixtures/umd/imports/output.js                     | 2 +-
 .../module-id-with-overridden-global-in-namespace/output.js | 2 +-
 .../output.js                                               | 2 +-
 .../fixtures/umd/module-id-with-overridden-global/output.js | 2 +-
 .../test/fixtures/umd/module-id/output.js                   | 2 +-
 .../umd/module-name-with-overridden-global/output.js        | 2 +-
 .../test/fixtures/umd/module-name/output.js                 | 2 +-
 .../test/fixtures/umd/non-default-imports/output.js         | 2 +-
 .../test/fixtures/umd/override-export-name/output.js        | 2 +-
 .../test/fixtures/umd/override-import-name/output.js        | 2 +-
 .../test/fixtures/umd/overview/output.js                    | 2 +-
 .../test/fixtures/umd/remap/output.js                       | 2 +-
 .../test/fixtures/dynamic-import/modules-umd/output.js      | 4 +++-
 .../test/fixtures/modules/modules-umd/output.js             | 4 +++-
 95 files changed, 103 insertions(+), 95 deletions(-)

diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-module-umd/output.js b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-module-umd/output.js
index 318c2544cd52..aca80143342e 100644
--- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-module-umd/output.js
+++ b/packages/babel-plugin-transform-function-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
index cd8000febb85..037c70f2b45b 100644
--- 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
index f8e0cb66efbf..32501cb4319b 100644
--- 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
index 44e4e41f1697..0633fe90d0a0 100644
--- 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
index 690c27a48c25..34e8e2fa3d82 100644
--- 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
index 956a4b228e56..aa3b89c8d714 100644
--- 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
index dcc999f2fb2b..7e144092f4e7 100644
--- 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
index 255345ddc41e..6766df086135 100644
--- 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
index c10daf42709d..4fd6be58e8d3 100644
--- 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
index 7cfc99ccd16c..fa009a30d6df 100644
--- 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
index 605b6c2762f8..f221e56a8ccd 100644
--- 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
index 493509da29c4..f840c25e6f78 100644
--- 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
index 406ad75ef7dc..5b666da90d2f 100644
--- 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
index b03b7b38d0f8..14961ba262e8 100644
--- 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
index 99cc2cff28f4..fb7da87c3f20 100644
--- 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
index 36925b451778..dc7a24f5f4c5 100644
--- 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
index eaa85ea93a42..2e900d34ed1a 100644
--- 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
index b7d54d8219b9..feaf9c4c81a1 100644
--- 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
index cde17ba82168..c9634daa1bc9 100644
--- 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
index 493509da29c4..f840c25e6f78 100644
--- 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
index c0e16dfcdfd3..d8434b638462 100644
--- 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
index b612eb59ae64..9f6a74975f35 100644
--- 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
index 37b7013b6631..60d36f6a310e 100644
--- 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
index e1e04041f87f..e12b16c662f8 100644
--- 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
index 5606fe898c1a..34f0969295f0 100644
--- 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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/output.js
index d5c94066201a..9ef9726b81db 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/output.js
+++ b/packages/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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js
index 87e3e0226890..3894e1d6357b 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js
+++ b/packages/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
index bdc895976fd3..733966a5af62 100644
--- 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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/output.js
index 79531c289ced..9d38e1ce05a6 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/output.js
+++ b/packages/babel-plugin-transform-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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false/output.js
index 72d8bf864d29..18307048ec1b 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false/output.js
+++ b/packages/babel-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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/output.js
index bd083836e425..05b85cc76366 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/output.js
+++ b/packages/babel-plugin-transform-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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/output.js
index c16c74d6d69c..baea395d1471 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/output.js
+++ b/packages/babel-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
index 3f403ba8ad4a..2820bf461f2a 100644
--- 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
index f51c2d99aefa..37b9f152bef7 100644
--- 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
index d0629b1666d4..f8fb2a0217cb 100644
--- 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
index c625f2ad0f13..0e773a28c17e 100644
--- 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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/output.js
index b1b88602b1d5..5c79efde0967 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/output.js
+++ b/packages/babel-plugin-transform-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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/output.js
index bcae91ef8031..55ebfb1b8c30 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/output.js
+++ b/packages/babel-plugin-transform-modules-umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/output.js
index e643ca1729cf..0085a705c53a 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/output.js
+++ b/packages/babel-plugin-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
index 2e8e731219b9..7dc12234cdb4 100644
--- 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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js
index 516c1e9a10c0..db9e9b200d7c 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js
+++ b/packages/babel-plugin-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
index 37b367916622..01c2ce86f9d3 100644
--- 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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/non-default-imports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/non-default-imports/output.js
index a9273b54d4ba..10c4c15c9b6a 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/non-default-imports/output.js
+++ b/packages/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/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/output.js
index 406ad75ef7dc..5b666da90d2f 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/output.js
+++ b/packages/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;
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/output.js
index 21f8cbe8bd64..c6850dc1ab1a 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/output.js
@@ -10,6 +10,6 @@
     factory(global.Promise);
     global.input = mod.exports;
   }
-})(this, function (_es6Promise) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_es6Promise) {
   "use strict";
 });
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js
index b66382de9469..0ec5e6cb6d88 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo, global.fooBar, global.fooBar);
     global.input = mod.exports;
   }
-})(this, function (_exports, foo2, _fooBar, _fooBar2) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, foo2, _fooBar, _fooBar2) {
   "use strict";
 
   _exports.__esModule = true;
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/output.js
index 32e24f80c89b..a8503bc29b96 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/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/regression/4192/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/regression/4192/output.js
index 83495f9586e8..f0c22802cb37 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/regression/4192/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/regression/4192/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/test/fixtures/umd/export-default-10/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-10/output.js
index b4d81f7d48c9..49e75d5bc965 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-10/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-11/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-11/output.js
index 053cce392d75..5447cc116b68 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-11/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-2/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-2/output.js
index 91736c0197c2..04d3f90de328 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-2/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-3/output.js
index 3ca1ff7d7423..6579e72a0bdd 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-3/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-4/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-4/output.js
index 006b7c28772a..5478384d3bde 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-4/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-5/output.js
index e9d30703b26f..ae92ef86e76d 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-5/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-6/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-6/output.js
index 7fdc39f6adf3..38bb552b8f92 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-6/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-7/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-7/output.js
index 15cad508a21a..b5b988ee2090 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-7/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-8/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-8/output.js
index c92a85338f1b..a9d3a15498cd 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-8/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-9/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-9/output.js
index b6a052ac6671..e0c54835f5f6 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default-9/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default/output.js
index 3f5a188475c0..3650a0e70afd 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-default/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-2/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-2/output.js
index fe946f300c70..24f7b0cac307 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-2/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-3/output.js
index 126e1be461b0..5d59222a6acc 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-3/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-4/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-4/output.js
index dc6f562b4e3a..a71a3dc3afa1 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-4/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-5/output.js
index f0381a2ddba0..c5806681062b 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-5/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-6/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-6/output.js
index ec9180133584..69ed1878b92c 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-6/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from/output.js
index 116bc257736a..3f4e37cb955c 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-2/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-2/output.js
index b6a052ac6671..e0c54835f5f6 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-2/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-3/output.js
index 7263e5f91f48..0174dbf05c23 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-3/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-4/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-4/output.js
index 14c4273fdc06..b39c6551907e 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-4/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-5/output.js
index 0ac1f5a990cc..ea7c9ea47720 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-5/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named/output.js
index 009aedbfef27..ba76f746df69 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/exports-variable/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/exports-variable/output.js
index 90292c4609f7..116ca5633a54 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/exports-variable/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/output.js
index d5c94066201a..9ef9726b81db 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/hoist-function-exports/output.js
index f5427d448fd1..6b33b55fddfb 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/hoist-function-exports/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-default/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-default/output.js
index bdc895976fd3..733966a5af62 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-default/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false-with-overrides/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false-with-overrides/output.js
index 79531c289ced..9d38e1ce05a6 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false-with-overrides/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false/output.js
index 72d8bf864d29..18307048ec1b 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true-with-overrides/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true-with-overrides/output.js
index bd083836e425..05b85cc76366 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true-with-overrides/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true/output.js
index c16c74d6d69c..baea395d1471 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/umd/imports-glob/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-glob/output.js
index 3f403ba8ad4a..2820bf461f2a 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-glob/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/umd/imports-mixing/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-mixing/output.js
index f51c2d99aefa..37b9f152bef7 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-mixing/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/umd/imports-named/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-named/output.js
index d0629b1666d4..f8fb2a0217cb 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-named/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/umd/imports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports/output.js
index c625f2ad0f13..0e773a28c17e 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-namespace/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-namespace/output.js
index 3f43c9478122..b45744b06497 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-namespace/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-very-nested-namespace/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-very-nested-namespace/output.js
index 1ddcae34725f..0b358a9b2079 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-very-nested-namespace/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global/output.js
index a9feedf65627..3a3fb1a0cb30 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id/output.js
index 2e8e731219b9..7dc12234cdb4 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js
index b17d582429ed..1d76a5b0d621 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports);
     global.umdModuleNameWithOverriddenGlobalInput = 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/test/fixtures/umd/module-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/output.js
index 3967f520001c..07c787a92f28 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/output.js
@@ -10,7 +10,7 @@
     factory();
     global.umdModuleNameInput = mod.exports;
   }
-})(this, function () {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function () {
   "use strict";
 
   foobar();
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/non-default-imports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/non-default-imports/output.js
index a9273b54d4ba..10c4c15c9b6a 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/non-default-imports/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-export-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-export-name/output.js
index 3f5a188475c0..3650a0e70afd 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-export-name/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/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";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/output.js
index 21f8cbe8bd64..c6850dc1ab1a 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/output.js
@@ -10,6 +10,6 @@
     factory(global.Promise);
     global.input = mod.exports;
   }
-})(this, function (_es6Promise) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_es6Promise) {
   "use strict";
 });
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js
index e60dd5dcb0e2..4d7a91b32231 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js
@@ -10,7 +10,7 @@
     factory(mod.exports, global.foo, global.fooBar, global.fooBar);
     global.input = mod.exports;
   }
-})(this, function (_exports, foo2, _fooBar, _fooBar2) {
+})(typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : this, function (_exports, foo2, _fooBar, _fooBar2) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/output.js
index e5d904ca9981..c374f3aa7925 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/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-preset-env/test/fixtures/dynamic-import/modules-umd/output.js b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/output.js
index f66adb1fb317..8e25ad450629 100644
--- a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/output.js
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/output.js
@@ -1,3 +1,5 @@
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define([], factory);
@@ -10,7 +12,7 @@
     factory();
     global.input = mod.exports;
   }
-})(this, function () {
+})((typeof globalThis === "undefined" ? "undefined" : _typeof(globalThis)) === "object" ? globalThis : (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" ? self : this, function () {
   "use strict";
 
   import("foo"); // warns
diff --git a/packages/babel-preset-env/test/fixtures/modules/modules-umd/output.js b/packages/babel-preset-env/test/fixtures/modules/modules-umd/output.js
index 231614902dde..5f1d193f306f 100644
--- a/packages/babel-preset-env/test/fixtures/modules/modules-umd/output.js
+++ b/packages/babel-preset-env/test/fixtures/modules/modules-umd/output.js
@@ -1,3 +1,5 @@
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
     define(["a"], factory);
@@ -10,7 +12,7 @@
     factory(global.a);
     global.input = mod.exports;
   }
-})(this, function (_a) {
+})((typeof globalThis === "undefined" ? "undefined" : _typeof(globalThis)) === "object" ? globalThis : (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" ? self : this, function (_a) {
   "use strict";
 
   _a = _interopRequireDefault(_a);