Merge branch 'main' into fix-741

Author: karreiro

.changeset/dull-cycles-brush.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+No longer raise password errors when users use custom app passwords on `shopify theme pull/push` commands

.changeset/flat-schools-dance.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli-kit': patch
+---
+
+Remove redundant calls to normalizeStoreFqdn in requests

.changeset/rotten-ties-flash.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Better handling on import-extensions with existing folder

.changeset/selfish-wombats-smoke.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli-kit': patch
+---
+
+Fix theme event reporting for monorail

.changeset/wild-moles-help.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Fix deeplink URL after a deploy

package.json

@@ -76,7 +76,7 @@
     "pin-github-action": "^3.3.1",
     "react": "17.0.2",
     "rimraf": "^3.0.2",
-    "tmp": "^0.2.1",
+    "tmp": "^0.2.4",
     "ts-node": "^10.9.1",
     "typescript": "5.8.3",
     "vitest": "^3.1.4",

packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts

@@ -48,6 +48,8 @@ export type Scalars = {
   OrganizationID: {input: any; output: any}
   /** The ID for a OrganizationUser. */
   OrganizationUserID: {input: any; output: any}
+  /** The ID for a PersonAlias. */
+  PersonAliasID: {input: any; output: any}
   /** The ID for a Person. */
   PersonID: {input: any; output: any}
   /** The ID for a Principal. */

packages/app/src/cli/services/generate/extension.test.ts

@@ -264,6 +264,7 @@ describe('initialize a extension', async () => {
           name,
           handle: slugify(name),
           flavor,
+          uid: 'ba7c20a9-578d-6fee-8cd2-044af992dabd92d8bbfe',
         })
       })
     },

packages/app/src/cli/services/generate/extension.ts

@@ -19,7 +19,7 @@ import {downloadGitRepository} from '@shopify/cli-kit/node/git'
 import {fileExists, inTemporaryDirectory, mkdir, moveFile, removeFile, glob} from '@shopify/cli-kit/node/fs'
 import {joinPath, relativizePath} from '@shopify/cli-kit/node/path'
 import {slugify} from '@shopify/cli-kit/common/string'
-import {randomUUID} from '@shopify/cli-kit/node/crypto'
+import {nonRandomUUID} from '@shopify/cli-kit/node/crypto'
 
 export interface GenerateExtensionTemplateOptions {
   app: AppLinkedInterface
@@ -72,7 +72,6 @@ interface ExtensionInitOptions {
   type: string
   name: string
   extensionFlavor: ExtensionFlavor | undefined
-  uid: string | undefined
   onGetTemplateRepository: (url: string, destination: string) => Promise<void>
 }
 
@@ -87,15 +86,13 @@ export async function generateExtensionTemplate(
   const directory = await ensureExtensionDirectoryExists({app: options.app, name: extensionName})
   const url = options.cloneUrl ?? options.extensionTemplate.url
 
-  const uid = options.developerPlatformClient.supportsAtomicDeployments ? randomUUID() : undefined
   const initOptions: ExtensionInitOptions = {
     directory,
     url,
     app: options.app,
     type: options.extensionTemplate.type,
     name: extensionName,
     extensionFlavor,
-    uid,
     onGetTemplateRepository:
       options.onGetTemplateRepository ??
       (async (url, destination) => {
@@ -133,7 +130,6 @@ async function themeExtensionInit({
   type,
   name,
   extensionFlavor,
-  uid,
   onGetTemplateRepository,
 }: ExtensionInitOptions) {
   return inTemporaryDirectory(async (tmpDir) => {
@@ -143,7 +139,7 @@ async function themeExtensionInit({
       tmpDir,
       onGetTemplateRepository,
     )
-    await recursiveLiquidTemplateCopy(templateDirectory, directory, {name, type, uid})
+    await recursiveLiquidTemplateCopy(templateDirectory, directory, {name, type, uid: nonRandomUUID(slugify(name))})
   })
 }
 
@@ -153,7 +149,6 @@ async function functionExtensionInit({
   app,
   name,
   extensionFlavor,
-  uid,
   onGetTemplateRepository,
 }: ExtensionInitOptions) {
   const templateLanguage = getTemplateLanguage(extensionFlavor?.value)
@@ -173,7 +168,7 @@ async function functionExtensionInit({
           name,
           handle: slugify(name),
           flavor: extensionFlavor?.value,
-          uid,
+          uid: nonRandomUUID(slugify(name)),
         })
       })
 
@@ -221,7 +216,6 @@ async function uiExtensionInit({
   app,
   name,
   extensionFlavor,
-  uid,
   onGetTemplateRepository,
 }: ExtensionInitOptions) {
   const templateLanguage = getTemplateLanguage(extensionFlavor?.value)
@@ -244,7 +238,7 @@ async function uiExtensionInit({
             name,
             handle: slugify(name),
             flavor: extensionFlavor?.value ?? '',
-            uid,
+            uid: nonRandomUUID(slugify(name)),
           })
         })
 

packages/app/src/cli/services/import-extensions.test.ts

@@ -4,9 +4,10 @@ import {testAppLinked, testDeveloperPlatformClient, testUIExtension} from '../mo
 import {OrganizationApp} from '../models/organization.js'
 import {ExtensionRegistration} from '../api/graphql/all_app_extension_registrations.js'
 import {describe, expect, test, vi, beforeEach} from 'vitest'
-import {fileExistsSync, inTemporaryDirectory} from '@shopify/cli-kit/node/fs'
+import {fileExistsSync, inTemporaryDirectory, mkdir} from '@shopify/cli-kit/node/fs'
 import {renderSelectPrompt, renderSuccess} from '@shopify/cli-kit/node/ui'
 import {joinPath} from '@shopify/cli-kit/node/path'
+import {AbortSilentError} from '@shopify/cli-kit/node/error'
 
 vi.mock('@shopify/cli-kit/node/ui')
 vi.mock('./context.js')
@@ -135,6 +136,141 @@ describe('import-extensions', () => {
     })
   })
 
+  test('handles existing directory with user prompt - skip', async () => {
+    // Given
+    const extensions = [flowExtensionA]
+
+    // When
+    await inTemporaryDirectory(async (tmpDir) => {
+      const app = testAppLinked({directory: tmpDir})
+
+      // Create the extensions directory
+      const extensionsDir = joinPath(tmpDir, 'extensions')
+      await mkdir(extensionsDir)
+
+      // Create the specific extension directory
+      const extensionDir = joinPath(extensionsDir, 'title-a')
+      await mkdir(extensionDir)
+
+      // Mock prompts:
+      // 1. First prompt: select which extension to migrate (select flowExtensionA by its UUID)
+      // 2. Second prompt: what to do with existing directory (select skip)
+      vi.mocked(renderSelectPrompt)
+        // Select flowExtensionA
+        .mockResolvedValueOnce('uuidA')
+        // Skip existing directory
+        .mockResolvedValueOnce('skip')
+
+      await importExtensions({
+        app,
+        remoteApp: organizationApp,
+        developerPlatformClient: testDeveloperPlatformClient(),
+        extensionTypes: ['flow_action_definition'],
+        extensions,
+        buildTomlObject,
+      })
+
+      // Then - expect the success message to be shown (even for skipped extensions)
+      expect(renderSuccess).toHaveBeenCalledWith({
+        headline: ['Imported the following extensions from the dashboard:'],
+        body: '• "titleA" at: extensions/title-a',
+      })
+
+      // The toml file should not be created since we skipped
+      const tomlPathA = joinPath(tmpDir, 'extensions', 'title-a', 'shopify.extension.toml')
+      expect(fileExistsSync(tomlPathA)).toBe(false)
+    })
+  })
+
+  test('handles existing directory with write option', async () => {
+    // Given
+    const extensions = [flowExtensionA]
+
+    // When
+    await inTemporaryDirectory(async (tmpDir) => {
+      const app = testAppLinked({directory: tmpDir})
+
+      // Create the extensions directory
+      const extensionsDir = joinPath(tmpDir, 'extensions')
+      await mkdir(extensionsDir)
+
+      // Create the specific extension directory
+      const extensionDir = joinPath(extensionsDir, 'title-a')
+      await mkdir(extensionDir)
+
+      // Mock prompts:
+      // 1. First prompt: select which extension to migrate (select flowExtensionA by its UUID)
+      // 2. Second prompt: what to do with existing directory (select write)
+      vi.mocked(renderSelectPrompt)
+        // Select flowExtensionA
+        .mockResolvedValueOnce('uuidA')
+        // Write/overwrite existing directory
+        .mockResolvedValueOnce('write')
+
+      await importExtensions({
+        app,
+        remoteApp: organizationApp,
+        developerPlatformClient: testDeveloperPlatformClient(),
+        extensionTypes: ['flow_action_definition'],
+        extensions,
+        buildTomlObject,
+      })
+
+      // Then - expect the success message to be shown
+      expect(renderSuccess).toHaveBeenCalledWith({
+        headline: ['Imported the following extensions from the dashboard:'],
+        body: '• "titleA" at: extensions/title-a',
+      })
+
+      // The toml file should be created since we wrote/overwrote
+      const tomlPathA = joinPath(tmpDir, 'extensions', 'title-a', 'shopify.extension.toml')
+      expect(fileExistsSync(tomlPathA)).toBe(true)
+    })
+  })
+
+  test('handles existing directory with cancel option', async () => {
+    // Given
+    const extensions = [flowExtensionA]
+
+    // When
+    await inTemporaryDirectory(async (tmpDir) => {
+      const app = testAppLinked({directory: tmpDir})
+
+      // Create the extensions directory
+      const extensionsDir = joinPath(tmpDir, 'extensions')
+      await mkdir(extensionsDir)
+
+      // Create the specific extension directory
+      const extensionDir = joinPath(extensionsDir, 'title-a')
+      await mkdir(extensionDir)
+
+      // Mock prompts:
+      // 1. First prompt: select which extension to migrate (select flowExtensionA by its UUID)
+      // 2. Second prompt: what to do with existing directory (select cancel)
+      vi.mocked(renderSelectPrompt)
+        // Select flowExtensionA
+        .mockResolvedValueOnce('uuidA')
+        // Cancel the operation
+        .mockResolvedValueOnce('cancel')
+
+      // Then - expect the function to throw an AbortSilentError
+      await expect(
+        importExtensions({
+          app,
+          remoteApp: organizationApp,
+          developerPlatformClient: testDeveloperPlatformClient(),
+          extensionTypes: ['flow_action_definition'],
+          extensions,
+          buildTomlObject,
+        }),
+      ).rejects.toThrow(AbortSilentError)
+
+      // The toml file should not be created since we cancelled
+      const tomlPathA = joinPath(tmpDir, 'extensions', 'title-a', 'shopify.extension.toml')
+      expect(fileExistsSync(tomlPathA)).toBe(false)
+    })
+  })
+
   test('selecting All imports all extensions', async () => {
     // Given
     const extensions = [