Merge pull request #6112 from Shopify/do-not-abort-theme-requests

No longer abort theme GraphQL requests on the client side

Author: karreiro

.changeset/gorgeous-colts-retire.md

@@ -0,0 +1,6 @@
+---
+'@shopify/cli-kit': patch
+'@shopify/theme': patch
+---
+
+No longer abort theme GraphQL requests on the client side

packages/cli-kit/src/public/node/themes/api.test.ts

@@ -38,8 +38,7 @@ const themeAccessSession = {...session, token: 'shptka_token'}
 const sessions = {CLI: session, 'Theme Access': themeAccessSession}
 const expectedApiOptions = expect.objectContaining({
   maxRetryTimeMs: 90000,
-  timeoutMs: 90000,
-  useAbortSignal: true,
+  useAbortSignal: false,
   useNetworkLevelRetry: true,
 })
 
@@ -58,6 +57,7 @@ describe('fetchTheme', () => {
       session,
       variables: {id: 'gid://shopify/OnlineStoreTheme/123'},
       responseOptions: {handleErrors: false},
+      requestBehaviour: expectedApiOptions,
     })
 
     expect(theme).not.toBeNull()
@@ -83,6 +83,7 @@ describe('fetchTheme', () => {
       session,
       variables: {id: 'gid://shopify/OnlineStoreTheme/123'},
       responseOptions: {handleErrors: false},
+      requestBehaviour: expectedApiOptions,
     })
   })
 })
@@ -109,6 +110,7 @@ describe('fetchThemes', () => {
       session,
       variables: {after: null},
       responseOptions: {handleErrors: false},
+      requestBehaviour: expectedApiOptions,
     })
     expect(themes).toHaveLength(2)
 
@@ -541,8 +543,7 @@ describe('bulkUploadThemeAssets', async () => {
       },
       requestBehaviour: expect.objectContaining({
         maxRetryTimeMs: 90000,
-        timeoutMs: 90000,
-        useAbortSignal: true,
+        useAbortSignal: false,
         useNetworkLevelRetry: true,
       }),
     })
@@ -603,8 +604,7 @@ describe('bulkUploadThemeAssets', async () => {
       },
       requestBehaviour: expect.objectContaining({
         maxRetryTimeMs: 90000,
-        timeoutMs: 90000,
-        useAbortSignal: true,
+        useAbortSignal: false,
         useNetworkLevelRetry: true,
       }),
     })

packages/cli-kit/src/public/node/themes/api.ts

@@ -34,8 +34,7 @@ export type AssetParams = Pick<ThemeAsset, 'key'> & Partial<Pick<ThemeAsset, 'va
 const SkeletonThemeCdn = 'https://cdn.shopify.com/static/online-store/theme-skeleton.zip'
 const THEME_API_NETWORK_BEHAVIOUR: RequestModeInput = {
   useNetworkLevelRetry: true,
-  useAbortSignal: true,
-  timeoutMs: 90 * 1000,
+  useAbortSignal: false,
   maxRetryTimeMs: 90 * 1000,
 }
 
@@ -48,6 +47,7 @@ export async function fetchTheme(id: number, session: AdminSession): Promise<The
       session,
       variables: {id: gid},
       responseOptions: {handleErrors: false},
+      requestBehaviour: THEME_API_NETWORK_BEHAVIOUR,
     })
 
     if (theme) {
@@ -83,6 +83,7 @@ export async function fetchThemes(session: AdminSession): Promise<Theme[]> {
       session,
       variables: {after},
       responseOptions: {handleErrors: false},
+      requestBehaviour: THEME_API_NETWORK_BEHAVIOUR,
     })
     if (!response.themes) {
       unexpectedGraphQLError('Failed to fetch themes')