@shopify/cli 3.84.0 → 3.84.1

package/dist/index.js

@@ -129,7 +129,7 @@ import {
   supressNodeExperimentalWarnings,
   unsetStorefront,
   waitForJob
-} from "./chunk-HNKVF23P.js";
+} from "./chunk-FUWTEDP2.js";
 import {
   require_fs,
   require_glob,
@@ -144,37 +144,37 @@ import {
 } from "./chunk-3GXB4ZRP.js";
 import {
   List
-} from "./chunk-K4PSDTA7.js";
+} from "./chunk-ES5N6OQW.js";
 import {
   Search
-} from "./chunk-L3FIMPVS.js";
+} from "./chunk-QO4ILPU2.js";
 import {
   Upgrade
-} from "./chunk-CW4CYMWP.js";
-import "./chunk-LV6TZ6RO.js";
+} from "./chunk-4JIM2QT7.js";
+import "./chunk-7AEOEVGT.js";
 import {
   Version
-} from "./chunk-N3EU6FVY.js";
-import "./chunk-B6R3QPZT.js";
-import "./chunk-XMFLKI5L.js";
+} from "./chunk-Y4JV2C2F.js";
+import "./chunk-R3FZ7BFA.js";
+import "./chunk-JB4IBM6F.js";
 import {
   KitchenSinkAll
-} from "./chunk-6JDW32IQ.js";
+} from "./chunk-KS7CKFXX.js";
 import {
   KitchenSinkPrompts
-} from "./chunk-WGLEUSG3.js";
-import "./chunk-JTM64JML.js";
+} from "./chunk-2M63OZ6L.js";
+import "./chunk-DNXNKHZO.js";
 import {
   KitchenSinkStatic
-} from "./chunk-VM6ZV5T3.js";
-import "./chunk-4R4BTRMH.js";
+} from "./chunk-NBOUUR2C.js";
+import "./chunk-IM2PF4V5.js";
 import {
   Generate
-} from "./chunk-3R5F566Q.js";
-import "./chunk-KV6ENNDU.js";
+} from "./chunk-JNDSQA4U.js";
+import "./chunk-DSKW7GLZ.js";
 import {
   Logout
-} from "./chunk-5YF6CRHK.js";
+} from "./chunk-MQQ5ZTSK.js";
 import {
   ensureAuthenticatedAdmin,
   ensureAuthenticatedAppManagementAndBusinessPlatform,
@@ -182,32 +182,32 @@ import {
   ensureAuthenticatedPartners,
   ensureAuthenticatedStorefront,
   ensureAuthenticatedThemes
-} from "./chunk-N367MT6A.js";
+} from "./chunk-YQVYH3XF.js";
 import {
   ClearCache,
   globalFlags,
   jsonFlag,
   runCLI
-} from "./chunk-WHQB5G4I.js";
+} from "./chunk-PQCWFPSI.js";
 import {
   CommandFlags
-} from "./chunk-XGZDNZUX.js";
+} from "./chunk-42TDSAFO.js";
 import {
   DocsGenerate
-} from "./chunk-V5KWQR65.js";
+} from "./chunk-MCEP4L5M.js";
 import {
   HelpCommand
-} from "./chunk-ESWT7BGC.js";
+} from "./chunk-N2463ZYG.js";
 import {
   KitchenSinkAsync
-} from "./chunk-UMDZGSHP.js";
-import "./chunk-TA4C3I5Z.js";
+} from "./chunk-77NCO4UD.js";
+import "./chunk-57KJCVB5.js";
 import {
   base_command_default,
   decodeToml,
   encodeToml,
   loadEnvironment
-} from "./chunk-PJ7QP3SS.js";
+} from "./chunk-TW3OHW6H.js";
 import {
   require_byline,
   require_end_of_stream,
@@ -215,7 +215,7 @@ import {
   require_iserror,
   require_pump,
   require_stack_generator
-} from "./chunk-TP3H2NVV.js";
+} from "./chunk-5G56F2K6.js";
 import {
   require_once
 } from "./chunk-SHWOPMLQ.js";
@@ -223,7 +223,7 @@ import {
   fanoutHooks,
   getListOfTunnelPlugins,
   reportAnalyticsEvent
-} from "./chunk-7KO7T466.js";
+} from "./chunk-K5XXB73S.js";
 import {
   DevServerCore,
   adminFqdn,
@@ -236,10 +236,10 @@ import {
   normalizeStoreFqdn,
   ok,
   partnersFqdn
-} from "./chunk-SGRODM6N.js";
+} from "./chunk-T4K4LRMO.js";
 import {
   showNotificationsIfNeeded
-} from "./chunk-YXCYRXKK.js";
+} from "./chunk-GWETXJR2.js";
 import {
   ClientError,
   FetchError,
@@ -267,11 +267,11 @@ import {
   require_type,
   shopifyFetch,
   z
-} from "./chunk-M5CMNHPW.js";
+} from "./chunk-DVZ22YSP.js";
 import "./chunk-25IMI7TH.js";
 import {
   CLI_KIT_VERSION
-} from "./chunk-B26QDYDN.js";
+} from "./chunk-FYGQPHYH.js";
 import {
   LocalStorage,
   UnknownPackageManagerError,
@@ -295,7 +295,7 @@ import {
   usesWorkspaces,
   versionSatisfies,
   writePackageJSON
-} from "./chunk-HVPPS5EU.js";
+} from "./chunk-IRF44N7J.js";
 import {
   AbortController as AbortController2,
   AbortError,
@@ -513,7 +513,7 @@ import {
   username,
   writeFile,
   writeFileSync
-} from "./chunk-F7CACVY7.js";
+} from "./chunk-SKEV2KRG.js";
 import {
   require_graceful_fs
 } from "./chunk-75LV6AQS.js";
@@ -191449,12 +191449,7 @@ var themeFlags = {
   }),
   password: import_core.Flags.string({
     description: "Password generated from the Theme Access app.",
-    env: "SHOPIFY_CLI_THEME_TOKEN",
-    parse: async (input) => {
-      if (input.startsWith("shptka_"))
-        return input;
-      throw new AbortError("Invalid password. Please generate a new password from the Theme Access app.");
-    }
+    env: "SHOPIFY_CLI_THEME_TOKEN"
   }),
   store: import_core.Flags.string({
     char: "s",
@@ -195291,10 +195286,19 @@ async function initializeRepl(adminSession, themeId, url, themeAccessPassword, s
   return replLoop(session, themeId, url);
 }
 
+// ../theme/dist/cli/services/flags-validation.js
+init_cjs_shims();
+function validateThemePassword(password) {
+  if (password && !password.startsWith("shptka_"))
+    throw new AbortError("Invalid password. Please generate a new password from the Theme Access app.");
+}
+
 // ../theme/dist/cli/commands/theme/console.js
 var import_core3 = __toESM(require_lib(), 1), _a2, Console = class extends ThemeCommand {
   async run() {
-    let { flags } = await this.parse(_a2), store = ensureThemeStore(flags), { url, password: themeAccessPassword } = flags, adminSession = await ensureAuthenticatedThemes(store, themeAccessPassword), { themeId, storePassword } = await ensureReplEnv(adminSession, flags["store-password"]);
+    let { flags } = await this.parse(_a2);
+    validateThemePassword(flags.password);
+    let store = ensureThemeStore(flags), { url, password: themeAccessPassword } = flags, adminSession = await ensureAuthenticatedThemes(store, themeAccessPassword), { themeId, storePassword } = await ensureReplEnv(adminSession, flags["store-password"]);
     await initializeRepl(adminSession, themeId, url, themeAccessPassword, storePassword);
   }
 };
@@ -198177,7 +198181,9 @@ async function writeMetafieldDefinitionsToFile(path4, content) {
 var import_core5 = __toESM(require_lib(), 1);
 var _a4, Dev = class extends ThemeCommand {
   async run() {
-    let flags = (await this.parse(_a4)).flags, { ignore: ignore3 = [], only = [] } = flags, store = ensureThemeStore(flags), adminSession = await ensureAuthenticatedThemes(store, flags.password), theme;
+    let flags = (await this.parse(_a4)).flags, { ignore: ignore3 = [], only = [] } = flags;
+    validateThemePassword(flags.password);
+    let store = ensureThemeStore(flags), adminSession = await ensureAuthenticatedThemes(store, flags.password), theme;
     if (flags.theme) {
       let filter = { filter: { theme: flags.theme } };
       theme = await findOrSelectTheme(adminSession, filter), flags = { ...flags, theme: theme.id.toString() };
@@ -199106,7 +199112,9 @@ async function openProfile(profileJson) {
 var import_core11 = __toESM(require_lib(), 1);
 var _a11, Profile = class extends ThemeCommand {
   async run() {
-    let { flags } = await this.parse(_a11), store = ensureThemeStore(flags), { password: themeAccessPassword } = flags, adminSession = await ensureAuthenticatedThemes(store, themeAccessPassword), filter;
+    let { flags } = await this.parse(_a11);
+    validateThemePassword(flags.password);
+    let store = ensureThemeStore(flags), { password: themeAccessPassword } = flags, adminSession = await ensureAuthenticatedThemes(store, themeAccessPassword), filter;
     flags.theme ? filter = { filter: { theme: flags.theme } } : filter = { filter: { live: !0 } };
     let theme = await findOrSelectTheme(adminSession, filter), tasks = [
       {
@@ -206546,7 +206554,7 @@ var import_core29 = __toESM(require_lib(), 1);
 // ../../node_modules/.pnpm/@shopify+cli-hydrogen@11.1.3_@graphql-codegen+cli@5.0.4_@parcel+watcher@2.5.1_@types+no_571e6f0170478bea3c59260825bed3cb/node_modules/@shopify/cli-hydrogen/dist/lib/mini-oxygen/index.js
 init_cjs_shims();
 async function startMiniOxygen(options) {
-  let { startWorkerdServer } = await import("./workerd-Y6MJ3FZI.js");
+  let { startWorkerdServer } = await import("./workerd-PHNPZMMV.js");
   return startWorkerdServer(options);
 }
 
@@ -216069,7 +216077,8 @@ function numberFromGid(gid) {
   return gid.startsWith("gid://") ? Number(gid.match(/^gid.*\/(\d+)$/)[1]) : Number(gid);
 }
 async function appDeepLink({ id, organizationId }) {
-  return `https://${await developerDashboardFqdn()}/dashboard/${organizationId}/apps/${numberFromGid(id)}`;
+  let orgId = numberFromGid(organizationId).toString();
+  return `https://${await developerDashboardFqdn()}/dashboard/${orgId}/apps/${numberFromGid(id)}`;
 }
 async function versionDeepLink(organizationId, appId, versionId) {
   return `${await appDeepLink({ organizationId, id: appId })}/versions/${numberFromGid(versionId)}`;
@@ -216318,7 +216327,7 @@ function partition(collection, callback) {
 }
 
 // ../app/dist/cli/services/context/id-matching.js
-var sameTypeAndName = (local, remote) => remote.type.toLowerCase() === local.graphQLType.toLowerCase() && slugify(remote.title) === slugify(local.handle);
+var sameTypeAndName = (local, remote) => (remote.type.toLowerCase() === local.graphQLType.toLowerCase() || remote.type.toLowerCase() === local.externalType.toLowerCase() || remote.type.toLowerCase() === local.type.toLowerCase()) && slugify(remote.title) === slugify(local.handle);
 function matchByNameAndType(local, remote) {
   let uniqueLocal = uniqBy(local, (elem) => [elem.graphQLType, elem.handle]), uniqueRemote = uniqBy(remote, (elem) => [elem.type, elem.title]), matched = {};
   uniqueLocal.forEach((localSource) => {
@@ -218605,32 +218614,6 @@ async function bundleAndBuildExtensions(options) {
 // ../app/dist/cli/services/import-extensions.js
 init_cjs_shims();
 
-// ../app/dist/cli/services/extensions/common.js
-init_cjs_shims();
-async function ensureDownloadedExtensionFlavorExists(extensionFlavor, templateDownloadDir) {
-  let templatePath = extensionFlavor?.path || "", origin = joinPath(templateDownloadDir, templatePath);
-  if (!await fileExists(origin))
-    throw new AbortError(`
-The extension is not available for ${extensionFlavor?.value}`);
-  return origin;
-}
-async function ensureExtensionDirectoryExists({ name, app }) {
-  let hyphenizedName = hyphenate(name), extensionDirectory = joinPath(app.directory, blocks.extensions.directoryName, hyphenizedName);
-  if (await fileExists(extensionDirectory))
-    throw new AbortError(`
-A directory with this name (${hyphenizedName}) already exists.
-Choose a new name for your extension.`);
-  return await mkdir(extensionDirectory), await touchFile(joinPath(extensionDirectory, configurationFileNames.lockFile)), extensionDirectory;
-}
-async function canEnablePreviewMode({ localApp, developerPlatformClient, apiKey, organizationId }) {
-  let { dashboardManagedExtensionRegistrations } = (await developerPlatformClient.appExtensionRegistrations({
-    id: apiKey,
-    apiKey,
-    organizationId
-  })).app;
-  return dashboardManagedExtensionRegistrations.length > 0 || localApp.allExtensions.filter((ext) => ext.isThemeExtension).length > 0 || localApp.allExtensions.length > 0;
-}
-
 // ../app/dist/cli/prompts/import-extensions.js
 init_cjs_shims();
 
@@ -218958,7 +218941,27 @@ async function selectMigrationChoice(migrationChoices) {
 }
 
 // ../app/dist/cli/services/import-extensions.js
-var allExtensionTypes = allMigrationChoices.flatMap((choice) => choice.extensionTypes);
+var allExtensionTypes = allMigrationChoices.flatMap((choice) => choice.extensionTypes), DirectoryAction;
+(function(DirectoryAction2) {
+  DirectoryAction2.Write = "write", DirectoryAction2.Skip = "skip", DirectoryAction2.Cancel = "cancel";
+})(DirectoryAction || (DirectoryAction = {}));
+async function handleExtensionDirectory({ name, app }) {
+  let hyphenizedName = hyphenate(name), extensionDirectory = joinPath(app.directory, blocks.extensions.directoryName, hyphenizedName);
+  if (await fileExists(extensionDirectory)) {
+    let choices = [
+      { label: "Overwrite local TOML with remote configuration", value: DirectoryAction.Write },
+      { label: "Keep local TOML", value: DirectoryAction.Skip },
+      { label: "Cancel", value: DirectoryAction.Cancel }
+    ], action = await renderSelectPrompt({
+      message: `Directory "${hyphenizedName}" already exists. What would you like to do?`,
+      choices
+    });
+    if (action === DirectoryAction.Cancel)
+      throw new AbortSilentError();
+    return { directory: extensionDirectory, action };
+  }
+  return await mkdir(extensionDirectory), await touchFile(joinPath(extensionDirectory, configurationFileNames.lockFile)), { directory: extensionDirectory, action: DirectoryAction.Write };
+}
 async function importExtensions(options) {
   let { app, remoteApp, developerPlatformClient, extensionTypes, extensions, buildTomlObject: buildTomlObject6, all } = options, extensionsToMigrate = extensions.filter((ext) => extensionTypes.includes(ext.type.toLowerCase()));
   if (extensionsToMigrate = filterOutImportedExtensions(app, extensionsToMigrate), extensionsToMigrate.length === 0)
@@ -218970,12 +218973,14 @@ async function importExtensions(options) {
     promptAnswer !== "All" && (extensionsToMigrate = [extensionsToMigrate.find((ext) => ext?.uuid === promptAnswer)]);
   }
   let extensionUuids = {}, importPromises = extensionsToMigrate.map(async (ext) => {
-    let directory = await ensureExtensionDirectoryExists({ app, name: ext.title }), tomlObject = buildTomlObject6(ext, extensions, app.configuration), path4 = joinPath(directory, "shopify.extension.toml");
-    await writeFile(path4, tomlObject);
-    let handle = slugify(ext.title.substring(0, MAX_EXTENSION_HANDLE_LENGTH));
-    extensionUuids[handle] = ext.uuid;
-    let lockFilePath = joinPath(directory, configurationFileNames.lockFile);
-    return await removeFile(lockFilePath), { extension: ext, directory: joinPath("extensions", basename(directory)) };
+    let { directory, action } = await handleExtensionDirectory({ app, name: ext.title }), handle = slugify(ext.title.substring(0, MAX_EXTENSION_HANDLE_LENGTH));
+    if (extensionUuids[handle] = ext.uuid, action === DirectoryAction.Write) {
+      let tomlObject = buildTomlObject6(ext, extensions, app.configuration), path4 = joinPath(directory, "shopify.extension.toml");
+      await writeFile(path4, tomlObject);
+      let lockFilePath = joinPath(directory, configurationFileNames.lockFile);
+      await removeFile(lockFilePath);
+    }
+    return { extension: ext, directory: joinPath("extensions", basename(directory)) };
   }), generatedExtensions = await Promise.all(importPromises);
   renderSuccessMessages(generatedExtensions), await updateAppIdentifiers({
     app,
@@ -219146,7 +219151,7 @@ async function deploy(options) {
           }), await updateAppIdentifiers({ app, identifiers, command: "deploy", developerPlatformClient });
         }
       }
-    ]), didMigrateExtensionsToDevDash && uploadExtensionsBundleResult.versionTag && await deleteEnvFile(app), await outputCompletionMessage({
+    ]), await outputCompletionMessage({
       app,
       release: release2,
       uploadExtensionsBundleResult,
@@ -219157,9 +219162,6 @@ async function deploy(options) {
   }
   return { app };
 }
-async function deleteEnvFile(app) {
-  app.dotenv && fileExistsSync(app.dotenv.path) && await removeFile(app.dotenv.path);
-}
 async function outputCompletionMessage({ app, release: release2, uploadExtensionsBundleResult, didMigrateExtensionsToDevDash }) {
   let linkAndMessage = [
     { link: { label: uploadExtensionsBundleResult.versionTag ?? "version", url: uploadExtensionsBundleResult.location } },
@@ -223228,6 +223230,32 @@ function isEditionWeek() {
   return now >= editionStart && now <= editionWeekEnd;
 }
 
+// ../app/dist/cli/services/extensions/common.js
+init_cjs_shims();
+async function ensureDownloadedExtensionFlavorExists(extensionFlavor, templateDownloadDir) {
+  let templatePath = extensionFlavor?.path || "", origin = joinPath(templateDownloadDir, templatePath);
+  if (!await fileExists(origin))
+    throw new AbortError(`
+The extension is not available for ${extensionFlavor?.value}`);
+  return origin;
+}
+async function ensureExtensionDirectoryExists({ name, app }) {
+  let hyphenizedName = hyphenate(name), extensionDirectory = joinPath(app.directory, blocks.extensions.directoryName, hyphenizedName);
+  if (await fileExists(extensionDirectory))
+    throw new AbortError(`
+A directory with this name (${hyphenizedName}) already exists.
+Choose a new name for your extension.`);
+  return await mkdir(extensionDirectory), await touchFile(joinPath(extensionDirectory, configurationFileNames.lockFile)), extensionDirectory;
+}
+async function canEnablePreviewMode({ localApp, developerPlatformClient, apiKey, organizationId }) {
+  let { dashboardManagedExtensionRegistrations } = (await developerPlatformClient.appExtensionRegistrations({
+    id: apiKey,
+    apiKey,
+    organizationId
+  })).app;
+  return dashboardManagedExtensionRegistrations.length > 0 || localApp.allExtensions.filter((ext) => ext.isThemeExtension).length > 0 || localApp.allExtensions.length > 0;
+}
+
 // ../app/dist/cli/services/dev/port-warnings.js
 init_cjs_shims();
 function renderPortWarnings(portDetails) {
@@ -225278,14 +225306,13 @@ function getTemplateLanguage(flavor) {
   }
 }
 async function generateExtensionTemplate(options) {
-  let extensionName = options.extensionChoices.name, extensionFlavorValue = options.extensionChoices.flavor, extensionFlavor = options.extensionTemplate.supportedFlavors.find((flavor) => flavor.value === extensionFlavorValue), directory = await ensureExtensionDirectoryExists({ app: options.app, name: extensionName }), url = options.cloneUrl ?? options.extensionTemplate.url, uid = options.developerPlatformClient.supportsAtomicDeployments ? randomUUID() : void 0, initOptions = {
+  let extensionName = options.extensionChoices.name, extensionFlavorValue = options.extensionChoices.flavor, extensionFlavor = options.extensionTemplate.supportedFlavors.find((flavor) => flavor.value === extensionFlavorValue), directory = await ensureExtensionDirectoryExists({ app: options.app, name: extensionName }), url = options.cloneUrl ?? options.extensionTemplate.url, initOptions = {
     directory,
     url,
     app: options.app,
     type: options.extensionTemplate.type,
     name: extensionName,
     extensionFlavor,
-    uid,
     onGetTemplateRepository: options.onGetTemplateRepository ?? (async (url2, destination) => {
       await downloadGitRepository({ repoUrl: url2, destination, shallow: !0 });
     })
@@ -225311,13 +225338,13 @@ async function extensionInit(options) {
     throw await removeFile(options.directory), error;
   }
 }
-async function themeExtensionInit({ directory, url, type, name, extensionFlavor, uid, onGetTemplateRepository }) {
+async function themeExtensionInit({ directory, url, type, name, extensionFlavor, onGetTemplateRepository }) {
   return inTemporaryDirectory(async (tmpDir) => {
     let templateDirectory = await downloadOrFindTemplateDirectory(url, extensionFlavor, tmpDir, onGetTemplateRepository);
-    await recursiveLiquidTemplateCopy(templateDirectory, directory, { name, type, uid });
+    await recursiveLiquidTemplateCopy(templateDirectory, directory, { name, type, uid: nonRandomUUID(slugify(name)) });
   });
 }
-async function functionExtensionInit({ directory, url, app, name, extensionFlavor, uid, onGetTemplateRepository }) {
+async function functionExtensionInit({ directory, url, app, name, extensionFlavor, onGetTemplateRepository }) {
   let templateLanguage = getTemplateLanguage(extensionFlavor?.value), taskList = [];
   taskList.push({
     title: "Generating function extension",
@@ -225328,7 +225355,7 @@ async function functionExtensionInit({ directory, url, app, name, extensionFlavo
           name,
           handle: slugify(name),
           flavor: extensionFlavor?.value,
-          uid
+          uid: nonRandomUUID(slugify(name))
         });
       }), templateLanguage === "javascript") {
         let srcFileExtension = getSrcFileExtension(extensionFlavor?.value ?? "rust");
@@ -225353,7 +225380,7 @@ async function functionExtensionInit({ directory, url, app, name, extensionFlavo
     }
   }), await renderTasks(taskList);
 }
-async function uiExtensionInit({ directory, url, app, name, extensionFlavor, uid, onGetTemplateRepository }) {
+async function uiExtensionInit({ directory, url, app, name, extensionFlavor, onGetTemplateRepository }) {
   let templateLanguage = getTemplateLanguage(extensionFlavor?.value), tasks = [
     {
       title: "Generating extension",
@@ -225366,7 +225393,7 @@ async function uiExtensionInit({ directory, url, app, name, extensionFlavor, uid
             name,
             handle: slugify(name),
             flavor: extensionFlavor?.value ?? "",
-            uid
+            uid: nonRandomUUID(slugify(name))
           });
         }), templateLanguage === "javascript" && (await changeIndexFileExtension(directory, srcFileExtension), await removeUnwantedTemplateFilesPerFlavor(directory, extensionFlavor.value));
       }

package/dist/{local-L7K7ZZ6L.js → local-76WZCPFM.js}

@@ -20,7 +20,7 @@ import {
   macAddress,
   opentelemetryDomain,
   themeToken
-} from "./chunk-F7CACVY7.js";
+} from "./chunk-SKEV2KRG.js";
 import "./chunk-75LV6AQS.js";
 import "./chunk-EG6MBBEN.js";
 import "./chunk-3FBDJEGD.js";
@@ -55,4 +55,4 @@ export {
   opentelemetryDomain,
   themeToken
 };
-//# sourceMappingURL=local-L7K7ZZ6L.js.map
+//# sourceMappingURL=local-76WZCPFM.js.map

package/dist/{node-package-manager-TSNDPDHE.js → node-package-manager-OCGFQDFC.js}

@@ -29,8 +29,8 @@ import {
   versionSatisfies,
   writePackageJSON,
   yarnLockfile
-} from "./chunk-HVPPS5EU.js";
-import "./chunk-F7CACVY7.js";
+} from "./chunk-IRF44N7J.js";
+import "./chunk-SKEV2KRG.js";
 import "./chunk-75LV6AQS.js";
 import "./chunk-EG6MBBEN.js";
 import "./chunk-3FBDJEGD.js";
@@ -74,4 +74,4 @@ export {
   writePackageJSON,
   yarnLockfile
 };
-//# sourceMappingURL=node-package-manager-TSNDPDHE.js.map
+//# sourceMappingURL=node-package-manager-OCGFQDFC.js.map