Merge pull request #2493 from Shopify/fix-global

vividviolet · web-flow · commit fd4dd2b7203d · 2024-11-29T14:38:17.000-05:00
Fix missing global shopify type for Admin
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;
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@shopify/ui-extensions': patch
 +---
++
 +Fix shopify global declaration
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,8 @@ export interface ShopifyGlobal {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`declare global {`
`12`		`- interface WorkerGlobalScope {`
`13`		`- // conflicts with packages/checkout-ui-extensions/build/ts/globals.d.ts`
`14`		`- // eslint-disable-next-line @typescript-eslint/ban-ts-comment`
`15`		`- // @ts-ignore`
`16`		`- readonly le_shopify: ShopifyGlobal;`
`17`		`- }`
	`12`	`+ // conflicts with build/ts/globals.d.ts`
	`13`	`+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment`
	`14`	`+ // @ts-ignore`
	`15`	`+ const shopify: ShopifyGlobal;`
`18`	`16`	`}`