@shopify/cli 3.78.0 → 3.78.1

package/dist/index.js

@@ -136,7 +136,7 @@ import {
   supressNodeExperimentalWarnings,
   unsetStorefront,
   waitForJob
-} from "./chunk-NCYK3NPS.js";
+} from "./chunk-H73PDGHM.js";
 import {
   require_ms,
   require_src
@@ -155,69 +155,69 @@ import {
 } from "./chunk-MW7RWHY5.js";
 import {
   List
-} from "./chunk-TQMZLUGH.js";
+} from "./chunk-AV64MUSE.js";
 import {
   Search
-} from "./chunk-35A3HBTL.js";
+} from "./chunk-WWOE2EFZ.js";
 import {
   Upgrade
-} from "./chunk-VAMD3FV3.js";
-import "./chunk-2YVR2YAE.js";
+} from "./chunk-3COQLGRL.js";
+import "./chunk-HRT2J6AZ.js";
 import {
   Version
-} from "./chunk-QVDCZMPL.js";
-import "./chunk-WM4XS6OG.js";
-import "./chunk-35XDICNP.js";
+} from "./chunk-F23MB6TB.js";
+import "./chunk-FHYKRLSA.js";
+import "./chunk-GA5Q2G7N.js";
 import {
   KitchenSinkAll
-} from "./chunk-HLFLQFAO.js";
+} from "./chunk-O6JLOWUE.js";
 import {
   KitchenSinkPrompts
-} from "./chunk-K6OZPDRE.js";
-import "./chunk-XSNERQSV.js";
+} from "./chunk-F3SJ7GH2.js";
+import "./chunk-TJUGCRWY.js";
 import {
   KitchenSinkStatic
-} from "./chunk-KKK42SBP.js";
-import "./chunk-IJLYOQTB.js";
+} from "./chunk-6GQF27II.js";
+import "./chunk-FZI742QM.js";
 import {
   Generate
-} from "./chunk-UDNM674J.js";
-import "./chunk-VNCW4T6F.js";
+} from "./chunk-ZJ2IPVO4.js";
+import "./chunk-LE26CN2H.js";
 import {
   Logout
-} from "./chunk-GEAXCEGF.js";
+} from "./chunk-QYA3TD2H.js";
 import {
   ensureAuthenticatedAdmin,
   ensureAuthenticatedAppManagementAndBusinessPlatform,
   ensureAuthenticatedPartners,
   ensureAuthenticatedStorefront,
   ensureAuthenticatedThemes
-} from "./chunk-VTV2W43J.js";
+} from "./chunk-FEYZLXHI.js";
 import {
   ClearCache,
   globalFlags,
   jsonFlag,
   runCLI
-} from "./chunk-S6ZWGAX6.js";
+} from "./chunk-TFCMG5O2.js";
 import {
   CommandFlags
-} from "./chunk-FIH2SHBE.js";
+} from "./chunk-RH2XRA3A.js";
 import {
   DocsGenerate
-} from "./chunk-C3Q6M5C3.js";
+} from "./chunk-VE4ESNRH.js";
 import {
   HelpCommand
-} from "./chunk-A5LK333I.js";
+} from "./chunk-TIMWAEJ5.js";
 import {
   KitchenSinkAsync
-} from "./chunk-RYZBD47F.js";
-import "./chunk-WVISX7R6.js";
+} from "./chunk-QTRXKFCW.js";
+import "./chunk-6IPFYNHW.js";
 import {
   base_command_default,
   decodeToml,
   encodeToml,
   loadEnvironment
-} from "./chunk-VNKMVUTV.js";
+} from "./chunk-PT5BDLIN.js";
 import {
   require_byline,
   require_end_of_stream,
@@ -225,7 +225,7 @@ import {
   require_iserror,
   require_pump,
   require_stack_generator
-} from "./chunk-5LKOKELK.js";
+} from "./chunk-EBRJEUGC.js";
 import {
   require_once
 } from "./chunk-SHWOPMLQ.js";
@@ -233,7 +233,7 @@ import {
   fanoutHooks,
   getListOfTunnelPlugins,
   reportAnalyticsEvent
-} from "./chunk-D2R3AM3S.js";
+} from "./chunk-HO5XX2LU.js";
 import {
   appDevFqdn,
   appManagementFqdn,
@@ -243,10 +243,10 @@ import {
   normalizeStoreFqdn,
   ok,
   partnersFqdn
-} from "./chunk-N2GQBM45.js";
+} from "./chunk-HGD26EDV.js";
 import {
   showNotificationsIfNeeded
-} from "./chunk-HQF3OQCV.js";
+} from "./chunk-DNGCAQBF.js";
 import {
   ClientError,
   FetchError,
@@ -259,11 +259,11 @@ import {
   require_mime_types,
   shopifyFetch,
   z
-} from "./chunk-KJNPOPZU.js";
+} from "./chunk-HE3BDMSQ.js";
 import "./chunk-25IMI7TH.js";
 import {
   CLI_KIT_VERSION
-} from "./chunk-MLQTLKNQ.js";
+} from "./chunk-UGX6DGR4.js";
 import {
   LocalStorage,
   UnknownPackageManagerError,
@@ -286,7 +286,7 @@ import {
   usesWorkspaces,
   versionSatisfies,
   writePackageJSON
-} from "./chunk-ICGAJSRH.js";
+} from "./chunk-5DXEBIVF.js";
 import {
   require_semver
 } from "./chunk-HMDWNGIV.js";
@@ -404,6 +404,7 @@ import {
   readFile,
   readFileSync,
   removeFile,
+  removeFileSync,
   renameFile,
   render,
   renderAutocompletePrompt,
@@ -503,7 +504,7 @@ import {
   username,
   writeFile,
   writeFileSync
-} from "./chunk-R2JN4S25.js";
+} from "./chunk-OAZABGFS.js";
 import {
   require_lib as require_lib2
 } from "./chunk-B5EXYCV3.js";
@@ -214537,10 +214538,10 @@ async function buildAssetsUrl(port, root) {
 async function startMiniOxygen(options, useNodeRuntime = !1) {
   if (useNodeRuntime) {
     process.env.MINIFLARE_SUBREQUEST_LIMIT = 100;
-    let { startNodeServer } = await import("./node-4XPDXMES.js");
+    let { startNodeServer } = await import("./node-RJ5OAO2M.js");
     return startNodeServer(options);
   }
-  let { startWorkerdServer } = await import("./workerd-RCIF7HOL.js");
+  let { startWorkerdServer } = await import("./workerd-KUHMQGDX.js");
   return startWorkerdServer(options);
 }
 
@@ -218428,17 +218429,18 @@ var WebConfigurationAuthCallbackPathSchema = z.preprocess(ensurePathStartsWithSl
     this.realExtensions = this.realExtensions.filter((ext) => ext.uid !== extensionUid);
   }
   async generateExtensionTypes() {
-    let typeFilePath = joinPath(this.directory, "shopify.d.ts"), firstImport = "", sharedTypes = await Promise.all(this.allExtensions.map((extension) => extension.contributeToSharedTypeFile(typeFilePath))), combinedDefinitions = /* @__PURE__ */ new Set();
-    if (sharedTypes.forEach((shared) => {
-      shared.forEach(({ libraryRoot, definition }) => {
-        firstImport || (firstImport = `import './${relativePath(this.directory, libraryRoot)}';
-`), combinedDefinitions.add(definition);
-      });
-    }), combinedDefinitions.size === 0)
-      return;
-    let originalContent = fileExistsSync(typeFilePath) ? readFileSync(typeFilePath).toString() : "", typeContent = [firstImport, ...Array.from(combinedDefinitions)].join(`
+    let typeDefinitionsByFile = /* @__PURE__ */ new Map();
+    await Promise.all(this.allExtensions.map((extension) => extension.contributeToSharedTypeFile(typeDefinitionsByFile))), typeDefinitionsByFile.forEach((types, typeFilePath) => {
+      let exists = fileExistsSync(typeFilePath);
+      if (types.size === 0) {
+        exists && removeFileSync(typeFilePath);
+        return;
+      }
+      let originalContent = exists ? readFileSync(typeFilePath).toString() : "", typeContent = [`import '@shopify/ui-extension';
+`, ...Array.from(types)].join(`
 `);
-    originalContent !== typeContent && writeFileSync(typeFilePath, typeContent);
+      originalContent !== typeContent && writeFileSync(typeFilePath, typeContent);
+    });
   }
   get includeConfigOnDeploy() {
     return isLegacyAppSchema(this.configuration) ? !1 : this.appManagementApiEnabled ? !0 : this.configuration.build?.include_config_on_deploy;
@@ -219301,8 +219303,8 @@ var CONFIG_EXTENSION_IDS = [
   patchWithAppDevURLs(urls) {
     this.specification.patchWithAppDevURLs && this.specification.patchWithAppDevURLs(this.configuration, urls);
   }
-  async contributeToSharedTypeFile(typeFilePath) {
-    return this.specification.contributeToSharedTypeFile?.(this, typeFilePath) ?? [];
+  async contributeToSharedTypeFile(typeDefinitionsByFile) {
+    await this.specification.contributeToSharedTypeFile?.(this, typeDefinitionsByFile);
   }
   buildHandle() {
     switch (this.specification.uidStrategy) {
@@ -220601,22 +220603,33 @@ var require2 = createRequire4(import.meta.url), dependency5 = "@shopify/checkout
     };
   },
   hasExtensionPointTarget: (config2, requestedTarget) => config2.extension_points.find((extensionPoint) => extensionPoint.target === requestedTarget) !== void 0,
-  contributeToSharedTypeFile: async (extension, typeFilePath) => {
-    let sharedTypes = [];
+  contributeToSharedTypeFile: async (extension, typeDefinitionsByFile) => {
     if (!isRemoteDomExtension(extension.configuration))
-      return sharedTypes;
+      return;
     let { configuration } = extension;
     for await (let extensionPoint of configuration.extension_points) {
-      let fullPath = joinPath(extension.directory, extensionPoint.module), fileExtension = fullPath.split(".").pop(), exists = await fileExists(fullPath);
-      if (!fileExtension || !exists)
+      let fullPath = joinPath(extension.directory, extensionPoint.module);
+      if (!await fileExists(fullPath))
+        continue;
+      let mainTsConfigDir = await findNearestTsConfigDir(fullPath, extension.directory);
+      if (!mainTsConfigDir)
         continue;
-      let mainTypes = getSharedTypeDefinition(fullPath, typeFilePath, extensionPoint.target, configuration.api_version);
-      if (mainTypes && sharedTypes.push(mainTypes), extensionPoint.build_manifest.assets[AssetIdentifier.ShouldRender]?.module) {
-        let shouldRenderTypes = getSharedTypeDefinition(joinPath(extension.directory, extensionPoint.build_manifest.assets[AssetIdentifier.ShouldRender].module), typeFilePath, getShouldRenderTarget(extensionPoint.target), configuration.api_version);
-        shouldRenderTypes && sharedTypes.push(shouldRenderTypes);
+      let mainTypeFilePath = joinPath(mainTsConfigDir, "shopify.d.ts"), mainTypes = getSharedTypeDefinition(fullPath, mainTypeFilePath, extensionPoint.target, configuration.api_version);
+      if (mainTypes) {
+        let currentTypes = typeDefinitionsByFile.get(mainTypeFilePath) ?? /* @__PURE__ */ new Set();
+        currentTypes.add(mainTypes), typeDefinitionsByFile.set(mainTypeFilePath, currentTypes);
+      }
+      if (extensionPoint.build_manifest.assets[AssetIdentifier.ShouldRender]?.module) {
+        let shouldRenderTsConfigDir = await findNearestTsConfigDir(joinPath(extension.directory, extensionPoint.build_manifest.assets[AssetIdentifier.ShouldRender].module), extension.directory);
+        if (!shouldRenderTsConfigDir)
+          continue;
+        let shouldRenderTypeFilePath = joinPath(shouldRenderTsConfigDir, "shopify.d.ts"), shouldRenderTypes = getSharedTypeDefinition(joinPath(extension.directory, extensionPoint.build_manifest.assets[AssetIdentifier.ShouldRender].module), shouldRenderTypeFilePath, getShouldRenderTarget(extensionPoint.target), configuration.api_version);
+        if (shouldRenderTypes) {
+          let currentTypes = typeDefinitionsByFile.get(shouldRenderTypeFilePath) ?? /* @__PURE__ */ new Set();
+          currentTypes.add(shouldRenderTypes), typeDefinitionsByFile.set(shouldRenderTypeFilePath, currentTypes);
+        }
       }
     }
-    return sharedTypes;
   }
 });
 function addDistPathToAssets(extP) {
@@ -220656,34 +220669,25 @@ function isRemoteDomExtension(config2) {
   let apiVersion = config2.api_version, [year, month] = apiVersion?.split("-").map((part) => parseInt(part, 10)) ?? [];
   return !year || !month ? !1 : year > 2025 || year === 2025 && month >= 7;
 }
-var TYPE_REF_REGEX = /^\/\/\/ <reference types="(?:[.\/]*)shopify\.d\.ts" \/>\n/;
-function updateTypeReference({ fullPath, template, shouldAddTypeReference }) {
-  let originalContent = readFileSync(fullPath).toString(), fileContent = originalContent, match2;
-  for (; match2 = TYPE_REF_REGEX.exec(fileContent); )
-    fileContent = fileContent.replace(match2[0], "");
-  shouldAddTypeReference && (fileContent = template.concat(fileContent)), originalContent !== fileContent && writeFileSync(fullPath, fileContent);
-}
 function getShouldRenderTarget(target) {
   return target.replace(/\.render$/, ".should-render");
 }
 function getSharedTypeDefinition(fullPath, typeFilePath, target, apiVersion) {
-  let template = `/// <reference types="${relativePath(dirname(fullPath), typeFilePath)}" />
-`, types;
   try {
-    let fullTypePath = require2.resolve(`@shopify/ui-extensions/${target}`, { paths: [fullPath, typeFilePath] }), libraryRoot = require2.resolve("@shopify/ui-extensions", { paths: [fullPath, typeFilePath] }), importPath = `./${relativizePath(fullTypePath, dirname(typeFilePath))}`;
-    types = {
-      libraryRoot,
-      definition: `//@ts-ignore
+    return require2.resolve(`@shopify/ui-extensions/${target}`, { paths: [fullPath, typeFilePath] }), `//@ts-ignore
 declare module './${relativizePath(fullPath, dirname(typeFilePath))}' {
-  const shopify: import('${importPath}').Api;
+  const shopify: import('@shopify/ui-extensions/${target}').Api;
   const globalThis: { shopify: typeof shopify };
 }
-`
-    };
+`;
   } catch {
-    throw updateTypeReference({ fullPath, template, shouldAddTypeReference: !1 }), new Error(`Type reference for ${target} could not be found. You might be using the wrong @shopify/ui-extensions version. Fix the error by ensuring you install @shopify/ui-extensions@${apiVersion} in your dependencies.`);
+    throw new Error(`Type reference for ${target} could not be found. You might be using the wrong @shopify/ui-extensions version. Fix the error by ensuring you install @shopify/ui-extensions@${apiVersion} in your dependencies.`);
   }
-  return updateTypeReference({ fullPath, template, shouldAddTypeReference: !0 }), types;
+}
+async function findNearestTsConfigDir(fromFile, extensionDirectory) {
+  let fromDirectory = dirname(fromFile), tsconfigPath = await findPathUp("tsconfig.json", { cwd: fromDirectory, type: "file", stopAt: extensionDirectory });
+  if (tsconfigPath)
+    return dirname(tsconfigPath);
 }
 var ui_extension_default = uiExtensionSpec;
 

package/dist/{local-VNB4TMEI.js → local-UX2FKODS.js}

@@ -23,7 +23,7 @@ import {
   themeToken,
   useEmbeddedThemeCLI,
   useThemebundling
-} from "./chunk-R2JN4S25.js";
+} from "./chunk-OAZABGFS.js";
 import "./chunk-B5EXYCV3.js";
 import "./chunk-75LV6AQS.js";
 import "./chunk-57Q6OQG4.js";
@@ -63,4 +63,4 @@ export {
   useEmbeddedThemeCLI,
   useThemebundling
 };
-//# sourceMappingURL=local-VNB4TMEI.js.map
+//# sourceMappingURL=local-UX2FKODS.js.map

package/dist/{node-4XPDXMES.js → node-RJ5OAO2M.js}

@@ -12,20 +12,20 @@ import {
   importLocal,
   logRequestLine,
   setConstructors
-} from "./chunk-NCYK3NPS.js";
+} from "./chunk-H73PDGHM.js";
 import "./chunk-LQ2ZKVR6.js";
 import "./chunk-CP3BRHWK.js";
-import "./chunk-VTV2W43J.js";
-import "./chunk-VNKMVUTV.js";
-import "./chunk-5LKOKELK.js";
+import "./chunk-FEYZLXHI.js";
+import "./chunk-PT5BDLIN.js";
+import "./chunk-EBRJEUGC.js";
 import "./chunk-SHWOPMLQ.js";
-import "./chunk-D2R3AM3S.js";
-import "./chunk-N2GQBM45.js";
-import "./chunk-HQF3OQCV.js";
-import "./chunk-KJNPOPZU.js";
+import "./chunk-HO5XX2LU.js";
+import "./chunk-HGD26EDV.js";
+import "./chunk-DNGCAQBF.js";
+import "./chunk-HE3BDMSQ.js";
 import "./chunk-25IMI7TH.js";
-import "./chunk-MLQTLKNQ.js";
-import "./chunk-ICGAJSRH.js";
+import "./chunk-UGX6DGR4.js";
+import "./chunk-5DXEBIVF.js";
 import "./chunk-HMDWNGIV.js";
 import {
   AbortError,
@@ -33,7 +33,7 @@ import {
   readFile,
   renderSuccess,
   source_default
-} from "./chunk-R2JN4S25.js";
+} from "./chunk-OAZABGFS.js";
 import "./chunk-B5EXYCV3.js";
 import "./chunk-75LV6AQS.js";
 import "./chunk-57Q6OQG4.js";
@@ -163,4 +163,4 @@ async function startNodeServer({
 export {
   startNodeServer
 };
-//# sourceMappingURL=node-4XPDXMES.js.map
+//# sourceMappingURL=node-RJ5OAO2M.js.map

package/dist/{node-package-manager-GL4PGGZJ.js → node-package-manager-NS6MYGUI.js}

@@ -29,9 +29,9 @@ import {
   versionSatisfies,
   writePackageJSON,
   yarnLockfile
-} from "./chunk-ICGAJSRH.js";
+} from "./chunk-5DXEBIVF.js";
 import "./chunk-HMDWNGIV.js";
-import "./chunk-R2JN4S25.js";
+import "./chunk-OAZABGFS.js";
 import "./chunk-B5EXYCV3.js";
 import "./chunk-75LV6AQS.js";
 import "./chunk-57Q6OQG4.js";
@@ -77,4 +77,4 @@ export {
   writePackageJSON,
   yarnLockfile
 };
-//# sourceMappingURL=node-package-manager-GL4PGGZJ.js.map
+//# sourceMappingURL=node-package-manager-NS6MYGUI.js.map