Merge branch 'main' into drop-cross-env

Author: gonzaloriestra

.changeset/lemon-eggs-exist.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Improve error message in function replay command when log directory doesnt exist

.changeset/witty-planes-crash.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': patch
+---
+
+Bump cli-hydrogen to 9.0.5

packages/app/src/cli/commands/app/init.ts

@@ -7,6 +7,7 @@ import {validateFlavorValue, validateTemplateValue} from '../../services/init/va
 import {MinimalOrganizationApp, Organization, OrganizationApp} from '../../models/organization.js'
 import {appNamePrompt, createAsNewAppPrompt, selectAppPrompt} from '../../prompts/dev.js'
 import {searchForAppsByNameFactory} from '../../services/dev/prompt-helpers.js'
+import {isValidName} from '../../models/app/validation/common.js'
 import {Flags} from '@oclif/core'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
 import {resolvePath, cwd} from '@shopify/cli-kit/node/path'
@@ -72,7 +73,7 @@ export default class Init extends AppCommand {
     validateFlavorValue(flags.template, flags.flavor)
 
     const inferredPackageManager = inferPackageManager(flags['package-manager'])
-    const name = flags.name ?? (await generateRandomNameForSubdirectory({suffix: 'app', directory: flags.path}))
+    const name = flags.name ?? (await getAppName(flags.path))
 
     // Force user authentication before prompting.
     let developerPlatformClient = selectDeveloperPlatformClient()
@@ -126,6 +127,15 @@ export default class Init extends AppCommand {
   }
 }
 
+async function getAppName(directory: string): Promise<string> {
+  for (let i = 0; i < 3; i++) {
+    // eslint-disable-next-line no-await-in-loop
+    const name = await generateRandomNameForSubdirectory({suffix: 'app', directory})
+    if (isValidName(name)) return name
+  }
+  return ''
+}
+
 export type SelectAppOrNewAppNameResult =
   | {
       result: 'new'

packages/app/src/cli/models/app/validation/common.ts

@@ -20,3 +20,9 @@ function isValidUrl(input: string, httpsOnly: boolean) {
 export function ensurePathStartsWithSlash(arg: unknown) {
   return typeof arg === 'string' && !arg.startsWith('/') ? `/${arg}` : arg
 }
+
+export const APP_NAME_MAX_LENGTH = 30
+
+export function isValidName(name: string): boolean {
+  return name.length <= APP_NAME_MAX_LENGTH
+}

packages/app/src/cli/prompts/dev.ts

@@ -3,6 +3,7 @@ import {Organization, MinimalOrganizationApp, OrganizationStore, MinimalAppIdent
 import {getTomls} from '../utilities/app/config/getTomls.js'
 import {setCachedCommandTomlMap} from '../services/local-storage.js'
 import {Paginateable} from '../utilities/developer-platform-client.js'
+import {APP_NAME_MAX_LENGTH} from '../models/app/validation/common.js'
 import {
   RenderAutocompleteOptions,
   renderAutocompletePrompt,
@@ -129,8 +130,8 @@ export async function appNamePrompt(currentName: string): Promise<string> {
       if (value.length === 0) {
         return "App name can't be empty"
       }
-      if (value.length > 30) {
-        return 'Enter a shorter name (30 character max.)'
+      if (value.length > APP_NAME_MAX_LENGTH) {
+        return `Enter a shorter name (${APP_NAME_MAX_LENGTH} character max.)`
       }
       if (value.includes('shopify')) {
         return 'Name can\'t contain "shopify." Enter another name.'

packages/app/src/cli/services/function/replay.test.ts

@@ -10,7 +10,9 @@ import {readFile} from '@shopify/cli-kit/node/fs'
 import {describe, expect, beforeAll, test, vi} from 'vitest'
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {outputInfo} from '@shopify/cli-kit/node/output'
-import {readdirSync} from 'fs'
+import {getLogsDir} from '@shopify/cli-kit/node/logs'
+
+import {existsSync, readdirSync} from 'fs'
 
 vi.mock('fs')
 vi.mock('@shopify/cli-kit/node/fs')
@@ -111,6 +113,24 @@ describe('replay', () => {
 
   test('throws error if no logs available', async () => {
     // Given
+    mockFileOperations([])
+
+    // When/Then
+    await expect(async () => {
+      await replay({
+        app: testAppLinked(),
+        extension,
+        stdout: false,
+        path: 'test-path',
+        json: true,
+        watch: false,
+      })
+    }).rejects.toThrow(new AbortError(`No logs found in ${getLogsDir()}`))
+  })
+
+  test('throws error if log directory does not exist', async () => {
+    // Given
+    vi.mocked(existsSync).mockReturnValue(false)
 
     // When/Then
     await expect(async () => {
@@ -122,7 +142,7 @@ describe('replay', () => {
         json: true,
         watch: false,
       })
-    }).rejects.toThrow()
+    }).rejects.toThrow(new AbortError(`No logs found in ${getLogsDir()}`))
   })
 
   test('delegates to renderReplay when watch is true', async () => {
@@ -285,6 +305,7 @@ function expectFunctionRun(functionExtension: ExtensionInstance<FunctionConfigTy
 }
 
 function mockFileOperations(data: {run: FunctionRunData; path: string}[]) {
+  vi.mocked(existsSync).mockReturnValue(true)
   vi.mocked(readdirSync).mockReturnValue([...data].reverse().map(({path}) => path) as any)
   vi.mocked(readFile).mockImplementation((path) => {
     const run = data.find((file) => path.endsWith(file.path))

packages/app/src/cli/services/function/replay.ts

@@ -12,7 +12,7 @@ import {getLogsDir} from '@shopify/cli-kit/node/logs'
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {AbortController} from '@shopify/cli-kit/node/abort'
 
-import {readdirSync} from 'fs'
+import {existsSync, readdirSync} from 'fs'
 
 const LOG_SELECTOR_LIMIT = 100
 
@@ -124,7 +124,7 @@ async function findFunctionRun(
   functionHandle: string,
   identifier: string,
 ): Promise<string | undefined> {
-  const fileName = readdirSync(functionRunsDir).find((filename) => {
+  const fileName = getAllFunctionRunFileNames(functionRunsDir).find((filename) => {
     const fileMetadata = parseLogFilename(filename)
     return (
       fileMetadata?.namespace === 'extensions' &&
@@ -147,7 +147,7 @@ async function getRunFromSelector(functionRunsDir: string, functionHandle: strin
 }
 
 async function getFunctionRunData(functionRunsDir: string, functionHandle: string): Promise<FunctionRunData[]> {
-  const allFunctionRunFileNames = readdirSync(functionRunsDir)
+  const allFunctionRunFileNames = getAllFunctionRunFileNames(functionRunsDir)
     .filter((filename) => {
       // Expected format: 20240522_150641_827Z_extensions_my-function_abcdef.json
       const fileMetadata = parseLogFilename(filename)
@@ -191,3 +191,7 @@ async function getFunctionRunData(functionRunsDir: string, functionHandle: strin
 function getIdentifierFromFilename(fileName: string): string {
   return fileName.split('_').pop()!.substring(0, 6)
 }
+
+function getAllFunctionRunFileNames(functionRunsDir: string): string[] {
+  return existsSync(functionRunsDir) ? readdirSync(functionRunsDir) : []
+}

packages/app/src/cli/utilities/developer-platform-client.ts

@@ -56,6 +56,8 @@ import {DevSessionCreateMutation} from '../api/graphql/app-dev/generated/dev-ses
 import {DevSessionUpdateMutation} from '../api/graphql/app-dev/generated/dev-session-update.js'
 import {DevSessionDeleteMutation} from '../api/graphql/app-dev/generated/dev-session-delete.js'
 import {isAppManagementDisabled} from '@shopify/cli-kit/node/context/local'
+import {blockPartnersAccess} from '@shopify/cli-kit/node/environment'
+import {AbortError} from '@shopify/cli-kit/node/error'
 
 export enum ClientName {
   AppManagement = 'app-management',
@@ -77,7 +79,17 @@ export interface AppVersionIdentifiers {
 }
 
 export function allDeveloperPlatformClients(): DeveloperPlatformClient[] {
-  return isAppManagementDisabled() ? [new PartnersClient()] : [new PartnersClient(), new AppManagementClient()]
+  const clients: DeveloperPlatformClient[] = []
+  if (!blockPartnersAccess()) {
+    clients.push(new PartnersClient())
+  }
+  if (!isAppManagementDisabled()) {
+    clients.push(new AppManagementClient())
+  }
+  if (clients.length === 0) {
+    throw new AbortError('Both Partners and App Management APIs are deactivated.')
+  }
+  return clients
 }
 
 /**

packages/cli-kit/src/private/node/constants.ts

@@ -45,6 +45,7 @@ export const environmentVariables = {
   otelURL: 'SHOPIFY_CLI_OTEL_EXPORTER_OTLP_ENDPOINT',
   themeKitAccessDomain: 'SHOPIFY_CLI_THEME_KIT_ACCESS_DOMAIN',
   json: 'SHOPIFY_FLAG_JSON',
+  neverUsePartnersApi: 'SHOPIFY_CLI_NEVER_USE_PARTNERS_API',
 }
 
 export const defaultThemeKitAccessDomain = 'theme-kit-access.shopifyapps.com'

packages/cli-kit/src/public/common/string.ts

@@ -110,7 +110,6 @@ const SAFE_RANDOM_BUSINESS_NOUNS = [
   'franchise',
   'subsidiary',
   'logistics',
-  'infrastructure',
   'sponsorship',
   'partnership',
   'tax',