Merge pull request #2493 from Shopify/fix-global

Fix missing global shopify type for Admin
Shopify · Nov 29, 2024 · fd4dd2b · fd4dd2b
2 parents 38c3f8d + 4f8ebb5
commit fd4dd2b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 18 deletions.
diff --git a/.changeset/spicy-mugs-drop.md b/.changeset/spicy-mugs-drop.md
@@ -0,0 +1,5 @@
+---
+'@shopify/ui-extensions': patch
+---
+
+Fix shopify global declaration
diff --git a/packages/ui-extensions/src/surfaces/admin.ts b/packages/ui-extensions/src/surfaces/admin.ts
@@ -3,3 +3,4 @@ export * from './admin/components';
 export * from './admin/extension-targets';
 export * from './admin/extension';
 export * from './admin/shared';
+export * from './admin/globals';
diff --git a/packages/ui-extensions/src/surfaces/admin/globals.ts b/packages/ui-extensions/src/surfaces/admin/globals.ts
@@ -6,3 +6,10 @@ export interface ShopifyGlobal {
     extend: ExtensionTargets[ExtensionTarget],
   ): void;
 }
+
+declare global {
+  // conflicts with build/ts/globals.d.ts
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const shopify: ShopifyGlobal;
+}
diff --git a/packages/ui-extensions/src/surfaces/checkout/globals.ts b/packages/ui-extensions/src/surfaces/checkout/globals.ts
@@ -9,10 +9,8 @@ export interface ShopifyGlobal {
 }
 
 declare global {
-  interface WorkerGlobalScope {
-    // conflicts with packages/checkout-ui-extensions/build/ts/globals.d.ts
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    readonly le_shopify: ShopifyGlobal;
-  }
+  // conflicts with build/ts/globals.d.ts
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const shopify: ShopifyGlobal;
 }
diff --git a/packages/ui-extensions/src/surfaces/customer-account/globals.ts b/packages/ui-extensions/src/surfaces/customer-account/globals.ts
@@ -9,10 +9,8 @@ export interface ShopifyGlobal {
 }
 
 declare global {
-  interface WorkerGlobalScope {
-    // conflicts with packages/checkout-ui-extensions/build/ts/globals.d.ts
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    readonly le_shopify: ShopifyGlobal;
-  }
+  // conflicts with build/ts/globals.d.ts
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const shopify: ShopifyGlobal;
 }
diff --git a/packages/ui-extensions/src/surfaces/point-of-sale/globals.ts b/packages/ui-extensions/src/surfaces/point-of-sale/globals.ts
@@ -9,10 +9,8 @@ export interface ShopifyGlobal {
 }
 
 declare global {
-  interface WorkerGlobalScope {
-    // conflicts with build/ts/globals.d.ts
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    readonly shopify: ShopifyGlobal;
-  }
+  // conflicts with build/ts/globals.d.ts
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const shopify: ShopifyGlobal;
 }