Dont override global if already exists

jackocnr · Apr 20, 2024 · 585e0d7 · 585e0d7
1 parent e53e846
commit 585e0d7
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/build/js/intlTelInput.js b/build/js/intlTelInput.js
@@ -2868,7 +2868,7 @@ var factoryOutput = (() => {
     }
     return null;
   };
-  if (typeof window === "object") {
+  if (typeof window === "object" && !window.intlTelInputGlobals) {
     const intlTelInputGlobals = {
       defaults,
       //* Using a global like this allows us to mock it in the tests.

diff --git a/build/js/intlTelInput.min.js b/build/js/intlTelInput.min.js
diff --git a/react/build/IntlTelInput.cjs b/react/build/IntlTelInput.cjs
diff --git a/react/build/IntlTelInput.js b/react/build/IntlTelInput.js
diff --git a/react/demo/simple-bundle.js b/react/demo/simple-bundle.js
@@ -26343,7 +26343,7 @@
     }
     return null;
   };
-  if (typeof window === "object") {
+  if (typeof window === "object" && !window.intlTelInputGlobals) {
     const intlTelInputGlobals = {
       defaults,
       //* Using a global like this allows us to mock it in the tests.

diff --git a/react/demo/validation-bundle.js b/react/demo/validation-bundle.js
@@ -26343,7 +26343,7 @@
     }
     return null;
   };
-  if (typeof window === "object") {
+  if (typeof window === "object" && !window.intlTelInputGlobals) {
     const intlTelInputGlobals = {
       defaults,
       //* Using a global like this allows us to mock it in the tests.

diff --git a/src/js/intl-tel-input.ts b/src/js/intl-tel-input.ts
@@ -2365,7 +2365,8 @@ const loadUtils = (path: string): Promise<unknown> | null => {
   return null;
 };
 
-if (typeof window === "object") {
+//* Temp workaround to support the plugin being loaded onto the same page twice (e.g. you use it, and one of your bundled dependencies happens to use it as well) - basically, just don't override window.intlTelInputGlobals if it already exists. Then everything should work fine as long as both plugin scripts are using the same version (meaning the utils and globals APIs are compatible).
+if (typeof window === "object" && !window.intlTelInputGlobals) {
   const intlTelInputGlobals: ItiGlobals = {
     defaults,
     //* Using a global like this allows us to mock it in the tests.