Merge pull request #6320 from Shopify/08-26-fix_uid_generation_for_new_extensions

Fix uid generation for new extensions

Author: isaacroldan

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)),
           })
         })