Merge pull request #5200 from Shopify/fix-5192

Fix `shopify theme dev` to no longer fail when development themes expire in internationalized stores

Author: karreiro

.changeset/lemon-pants-add.md

@@ -0,0 +1,6 @@
+---
+'@shopify/cli-kit': patch
+'@shopify/theme': patch
+---
+
+Fix `shopify theme dev` to no longer fail when development themes expire in internationalized stores

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

@@ -59,7 +59,7 @@ describe('fetchTheme', () => {
   test('returns undefined when a theme is not found', async () => {
     const errorResponse = {
       status: 200,
-      errors: [{message: 'Theme does not exist'} as any],
+      errors: [{message: 'Tema não existe'} as any],
     }
     vi.mocked(adminRequestDoc).mockRejectedValue(new ClientError(errorResponse, {query: ''}))
 

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

@@ -25,33 +25,36 @@ import {buildTheme} from '@shopify/cli-kit/node/themes/factories'
 import {Result, Checksum, Key, Theme, ThemeAsset, Operation} from '@shopify/cli-kit/node/themes/types'
 import {outputDebug} from '@shopify/cli-kit/node/output'
 import {sleep} from '@shopify/cli-kit/node/system'
-import {ClientError} from 'graphql-request'
 
 export type ThemeParams = Partial<Pick<Theme, 'name' | 'role' | 'processing' | 'src'>>
 export type AssetParams = Pick<ThemeAsset, 'key'> & Partial<Pick<ThemeAsset, 'value' | 'attachment'>>
 
 export async function fetchTheme(id: number, session: AdminSession): Promise<Theme | undefined> {
+  const gid = composeThemeGid(id)
+
   try {
-    const response = await adminRequestDoc(GetTheme, session, {id: composeThemeGid(id)}, undefined, {
+    const {theme} = await adminRequestDoc(GetTheme, session, {id: gid}, undefined, {
       handleErrors: false,
     })
-    const {theme} = response
-    if (!theme) {
-      return undefined
-    }
-    return buildTheme({
-      id: parseGid(theme.id),
-      processing: theme.processing,
-      role: theme.role.toLowerCase(),
-      name: theme.name,
-    })
-  } catch (error) {
-    if (error instanceof ClientError) {
-      if (error.response?.errors?.[0]?.message === 'Theme does not exist') {
-        return undefined
-      }
+
+    if (theme) {
+      return buildTheme({
+        id: parseGid(theme.id),
+        processing: theme.processing,
+        role: theme.role.toLowerCase(),
+        name: theme.name,
+      })
     }
-    throw new AbortError(`Failed to fetch theme: ${id}`)
+
+    // eslint-disable-next-line no-catch-all/no-catch-all
+  } catch (_error) {
+    /**
+     * Consumers of this and other theme APIs in this file expect either a theme
+     * or `undefined`.
+     *
+     * Error handlers should not inspect GraphQL error messages directly, as
+     * they are internationalized.
+     */
   }
 }