@shopify/create-app 3.69.4 → 3.71.0

package/dist/{chunk-MX4RJDBM.js → chunk-KYB6A4PE.js}

@@ -2579,7 +2579,6 @@ var require_out4 = __commonJS({
 
 export {
   require_merge2,
-  require_micromatch,
   require_out4 as require_out
 };
 /*! Bundled license information:
@@ -2598,4 +2597,4 @@ queue-microtask/index.js:
 run-parallel/index.js:
   (*! run-parallel. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> *)
 */
-//# sourceMappingURL=chunk-MX4RJDBM.js.map
+//# sourceMappingURL=chunk-KYB6A4PE.js.map

package/dist/{chunk-A7RFWXE2.js → chunk-PATNPZAL.js}

@@ -3,6 +3,7 @@ import {
   AbortError,
   BugError,
   captureOutput,
+  envPaths,
   exec,
   fileExists,
   findPathUp,
@@ -17,14 +18,11 @@ import {
   require_get_stream,
   runWithTimer,
   writeFile
-} from "./chunk-CZRFEKLZ.js";
-import {
-  envPaths
-} from "./chunk-G6AY2JW5.js";
+} from "./chunk-JPPYUT6M.js";
 import {
   dirname,
   joinPath
-} from "./chunk-BB6N2XSA.js";
+} from "./chunk-X36SPRUS.js";
 import {
   __commonJS,
   __require,
@@ -11303,14 +11301,18 @@ function removeSession(config = cliKitStore()) {
   outputDebug(outputContent`Removing session store...`), config.delete("sessionStore");
 }
 async function cacheRetrieveOrRepopulate(key, fn, timeout, config = cliKitStore()) {
-  let cache = config.get("cache") || {}, cached = cache[key];
+  let cached = cacheRetrieve(key, config);
   if (cached?.value !== void 0 && (timeout === void 0 || Date.now() - cached.timestamp < timeout))
     return cached.value;
   let value = await fn();
-  return cache[key] = { value, timestamp: Date.now() }, config.set("cache", cache), value;
+  return cacheStore(key, value, config), value;
+}
+function cacheStore(key, value, config = cliKitStore()) {
+  let cache = config.get("cache") || {};
+  cache[key] = { value, timestamp: Date.now() }, config.set("cache", cache);
 }
 function cacheRetrieve(key, config = cliKitStore()) {
-  return (config.get("cache") || {})[key]?.value;
+  return (config.get("cache") || {})[key];
 }
 function timeIntervalToMilliseconds({ days = 0, hours = 0, minutes = 0, seconds = 0 }) {
   return (days * 24 * 60 * 60 + hours * 60 * 60 + minutes * 60 + seconds) * 1e3;
@@ -15168,7 +15170,7 @@ async function checkForNewVersion(dependency, currentVersion, { cacheExpiryInHou
     return lastVersion;
 }
 function checkForCachedNewVersion(dependency, currentVersion) {
-  let cacheKey = `npm-package-${dependency}`, lastVersion = cacheRetrieve(cacheKey);
+  let cacheKey = `npm-package-${dependency}`, lastVersion = cacheRetrieve(cacheKey)?.value;
   if (lastVersion && new import_semver3.SemVer(currentVersion).compare(lastVersion) < 0)
     return lastVersion;
 }
@@ -15313,13 +15315,14 @@ function inferPackageManager(optionsPackageManager, env = process.env) {
 }
 
 export {
-  require_semver2 as require_semver,
   require_ajv,
   LocalStorage,
   getSession,
   setSession,
   removeSession,
   cacheRetrieveOrRepopulate,
+  cacheStore,
+  cacheRetrieve,
   runAtMinimumInterval,
   runWithRateLimit,
   getCachedPartnerAccountStatus,
@@ -15387,4 +15390,4 @@ deep-extend/lib/deep-extend.js:
    * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    *)
 */
-//# sourceMappingURL=chunk-A7RFWXE2.js.map
+//# sourceMappingURL=chunk-PATNPZAL.js.map

package/dist/{chunk-BB4M6AYQ.js → chunk-PGUENKZG.js}

@@ -2,56 +2,29 @@ import {
   CLI_KIT_VERSION,
   fetch,
   getEnvironmentData,
-  getEnvironmentVariables,
   getLastSeenUserIdAfterAuth,
-  getSensitiveEnvironmentData,
-  platformAndArch
-} from "./chunk-ZYFGLOXH.js";
+  getSensitiveEnvironmentData
+} from "./chunk-PUMOQDXS.js";
 import {
-  require_semver,
   runWithRateLimit
-} from "./chunk-A7RFWXE2.js";
+} from "./chunk-PATNPZAL.js";
 import {
-  AbortError,
-  AbortSilentError,
   alwaysLogAnalytics,
   alwaysLogMetrics,
   analyticsDisabled,
-  appendFile,
-  captureOutput,
-  exec,
-  fileExists,
-  findPathUp,
-  firstPartyDev,
   getAllPublicMetadata,
   getAllSensitiveMetadata,
   getArrayContainsDuplicates,
   getArrayRejectingUndefined,
   isShopify,
   isSpinEnvironment,
-  isTruthy,
   isUnitTest,
-  mkdir,
   opentelemetryDomain,
   outputContent,
   outputDebug,
   outputToken,
-  readFile,
-  runWithTimer,
-  spinFqdn,
-  touchFile,
-  useEmbeddedThemeCLI
-} from "./chunk-CZRFEKLZ.js";
-import {
-  envPaths,
-  pathConstants,
   reportingRateLimit
-} from "./chunk-G6AY2JW5.js";
-import {
-  cwd,
-  dirname,
-  joinPath
-} from "./chunk-BB6N2XSA.js";
+} from "./chunk-JPPYUT6M.js";
 import {
   __commonJS,
   __require,
@@ -150,7 +123,7 @@ var require_version = __commonJS({
 });
 
 // ../../node_modules/.pnpm/@opentelemetry+api@1.6.0/node_modules/@opentelemetry/api/build/src/internal/semver.js
-var require_semver2 = __commonJS({
+var require_semver = __commonJS({
   "../../node_modules/.pnpm/@opentelemetry+api@1.6.0/node_modules/@opentelemetry/api/build/src/internal/semver.js"(exports) {
     "use strict";
     init_cjs_shims();
@@ -206,7 +179,7 @@ var require_global_utils = __commonJS({
     init_cjs_shims();
     Object.defineProperty(exports, "__esModule", { value: !0 });
     exports.unregisterGlobal = exports.getGlobal = exports.registerGlobal = void 0;
-    var platform_1 = require_platform(), version_1 = require_version(), semver_1 = require_semver2(), major = version_1.VERSION.split(".")[0], GLOBAL_OPENTELEMETRY_API_KEY = Symbol.for(`opentelemetry.js.api.${major}`), _global = platform_1._globalThis;
+    var platform_1 = require_platform(), version_1 = require_version(), semver_1 = require_semver(), major = version_1.VERSION.split(".")[0], GLOBAL_OPENTELEMETRY_API_KEY = Symbol.for(`opentelemetry.js.api.${major}`), _global = platform_1._globalThis;
     function registerGlobal(type, instance, diag4, allowOverride = !1) {
       var _a;
       let api = _global[GLOBAL_OPENTELEMETRY_API_KEY] = (_a = _global[GLOBAL_OPENTELEMETRY_API_KEY]) !== null && _a !== void 0 ? _a : {
@@ -922,8 +895,8 @@ var require_ProxyTracer = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: !0 });
     exports.ProxyTracer = void 0;
     var NoopTracer_1 = require_NoopTracer(), NOOP_TRACER = new NoopTracer_1.NoopTracer(), ProxyTracer = class {
-      constructor(_provider, name, version2, options) {
-        this._provider = _provider, this.name = name, this.version = version2, this.options = options;
+      constructor(_provider, name, version, options) {
+        this._provider = _provider, this.name = name, this.version = version, this.options = options;
       }
       startSpan(name, options, context) {
         return this._getTracer().startSpan(name, options, context);
@@ -974,9 +947,9 @@ var require_ProxyTracerProvider = __commonJS({
       /**
        * Get a {@link ProxyTracer}
        */
-      getTracer(name, version2, options) {
+      getTracer(name, version, options) {
         var _a;
-        return (_a = this.getDelegateTracer(name, version2, options)) !== null && _a !== void 0 ? _a : new ProxyTracer_1.ProxyTracer(this, name, version2, options);
+        return (_a = this.getDelegateTracer(name, version, options)) !== null && _a !== void 0 ? _a : new ProxyTracer_1.ProxyTracer(this, name, version, options);
       }
       getDelegate() {
         var _a;
@@ -988,9 +961,9 @@ var require_ProxyTracerProvider = __commonJS({
       setDelegate(delegate) {
         this._delegate = delegate;
       }
-      getDelegateTracer(name, version2, options) {
+      getDelegateTracer(name, version, options) {
         var _a;
-        return (_a = this._delegate) === null || _a === void 0 ? void 0 : _a.getTracer(name, version2, options);
+        return (_a = this._delegate) === null || _a === void 0 ? void 0 : _a.getTracer(name, version, options);
       }
     };
     exports.ProxyTracerProvider = ProxyTracerProvider;
@@ -1192,8 +1165,8 @@ var require_metrics = __commonJS({
       /**
        * Returns a meter from the global meter provider.
        */
-      getMeter(name, version2, options) {
-        return this.getMeterProvider().getMeter(name, version2, options);
+      getMeter(name, version, options) {
+        return this.getMeterProvider().getMeter(name, version, options);
       }
       /** Remove the global meter provider */
       disable() {
@@ -1374,8 +1347,8 @@ var require_trace = __commonJS({
       /**
        * Returns a tracer from the global tracer provider.
        */
-      getTracer(name, version2) {
-        return this.getTracerProvider().getTracer(name, version2);
+      getTracer(name, version) {
+        return this.getTracerProvider().getTracer(name, version);
       }
       /** Remove the global tracer provider */
       disable() {
@@ -7561,10 +7534,10 @@ var require_MeterProvider = __commonJS({
       /**
        * Get a meter with the configuration of the MeterProvider.
        */
-      getMeter(name, version2 = "", options = {}) {
+      getMeter(name, version = "", options = {}) {
         return this._shutdown ? (api_1.diag.warn("A shutdown MeterProvider cannot provide a Meter"), (0, api_1.createNoopMeter)()) : this._sharedState.getMeterSharedState({
           name,
-          version: version2,
+          version,
           schemaUrl: options.schemaUrl
         }).meter;
       }
@@ -13916,10 +13889,10 @@ var require_MeterProvider2 = __commonJS({
       /**
        * Get a meter with the configuration of the MeterProvider.
        */
-      getMeter(name, version2 = "", options = {}) {
+      getMeter(name, version = "", options = {}) {
         return this._shutdown ? (api_1.diag.warn("A shutdown MeterProvider cannot provide a Meter"), (0, api_1.createNoopMeter)()) : this._sharedState.getMeterSharedState({
           name,
-          version: version2,
+          version,
           schemaUrl: options.schemaUrl
         }).meter;
       }
@@ -14980,9 +14953,9 @@ var require_trace4 = __commonJS({
         for (; !ilmEntry.done; ) {
           let scopeSpans = ilmEntry.value;
           if (scopeSpans.length > 0) {
-            let { name, version: version2, schemaUrl } = scopeSpans[0].instrumentationLibrary, spans = scopeSpans.map((readableSpan) => (0, internal_2.sdkSpanToOtlpSpan)(readableSpan, useHex));
+            let { name, version, schemaUrl } = scopeSpans[0].instrumentationLibrary, spans = scopeSpans.map((readableSpan) => (0, internal_2.sdkSpanToOtlpSpan)(readableSpan, useHex));
             scopeResourceSpans.push({
-              scope: { name, version: version2 },
+              scope: { name, version },
               spans,
               schemaUrl
             });
@@ -15173,9 +15146,9 @@ var require_logs = __commonJS({
     function createResourceMap(logRecords) {
       let resourceMap = /* @__PURE__ */ new Map();
       for (let record of logRecords) {
-        let { resource, instrumentationScope: { name, version: version2 = "", schemaUrl = "" } } = record, ismMap = resourceMap.get(resource);
+        let { resource, instrumentationScope: { name, version = "", schemaUrl = "" } } = record, ismMap = resourceMap.get(resource);
         ismMap || (ismMap = /* @__PURE__ */ new Map(), resourceMap.set(resource, ismMap));
-        let ismKey = `${name}@${version2}:${schemaUrl}`, records = ismMap.get(ismKey);
+        let ismKey = `${name}@${version}:${schemaUrl}`, records = ismMap.get(ismKey);
         records || (records = [], ismMap.set(ismKey, records)), records.push(record);
       }
       return resourceMap;
@@ -15188,9 +15161,9 @@ var require_logs = __commonJS({
           droppedAttributesCount: 0
         },
         scopeLogs: Array.from(ismMap, ([, scopeLogs]) => {
-          let { instrumentationScope: { name, version: version2, schemaUrl } } = scopeLogs[0];
+          let { instrumentationScope: { name, version, schemaUrl } } = scopeLogs[0];
           return {
-            scope: { name, version: version2 },
+            scope: { name, version },
             logRecords: scopeLogs.map((log) => toLogRecord(log, useHex)),
             schemaUrl
           };
@@ -15376,161 +15349,6 @@ async function getListOfTunnelPlugins(config) {
 // ../cli-kit/dist/public/node/analytics.js
 init_cjs_shims();
 
-// ../cli-kit/dist/public/node/ruby.js
-init_cjs_shims();
-var import_semver = __toESM(require_semver(), 1);
-import { fileURLToPath } from "url";
-var RubyCLIVersion = "2.35.0", MinBundlerVersion = "2.3.11", MinRubyVersion = "2.7.5", MinWdmWindowsVersion = "0.1.0";
-async function execCLI2(args, options = {}) {
-  let currentEnv = getEnvironmentVariables(), embedded = useEmbeddedThemeCLI(currentEnv) && !currentEnv.SHOPIFY_CLI_2_0_DIRECTORY;
-  await installCLIDependencies(options.stdout ?? process.stdout, embedded);
-  let env = {
-    ...currentEnv,
-    SHOPIFY_CLI_STOREFRONT_RENDERER_AUTH_TOKEN: options.storefrontToken,
-    SHOPIFY_CLI_ADMIN_AUTH_TOKEN: options.adminToken,
-    SHOPIFY_SHOP: options.store,
-    SHOPIFY_CLI_AUTH_TOKEN: options.token,
-    SHOPIFY_CLI_RUN_AS_SUBPROCESS: "true",
-    SHOPIFY_CLI_RUBY_BIN: rubyExecutable(),
-    // Bundler uses this Gemfile to understand which gems are available in the
-    // environment. We use this to specify our own Gemfile for CLI2, which exists
-    // outside the user's project directory.
-    BUNDLE_GEMFILE: joinPath(await shopifyCLIDirectory(embedded), "Gemfile"),
-    ...await getSpinEnvironmentVariables(),
-    SHOPIFY_CLI_1P_DEV: firstPartyDev() ? "1" : "0",
-    SHOPIFY_CLI_VERSION: CLI_KIT_VERSION
-  };
-  try {
-    let shopifyExecutable = embedded ? [rubyExecutable(), await embeddedCLIExecutable()] : ["shopify"];
-    await runBundler(["exec", ...shopifyExecutable, ...args], {
-      ...options.stdout === void 0 && { stdio: "inherit" },
-      cwd: options.directory ?? cwd(),
-      env,
-      ...options.stdout !== void 0 && { stdout: options.stdout, stderr: options.stderr },
-      signal: options.signal
-    });
-  } catch {
-    throw new AbortSilentError();
-  }
-}
-async function installCLIDependencies(stdout, embedded = !1) {
-  let localCLI = await shopifyCLIDirectory(embedded), exists = await fileExists(localCLI);
-  exists || stdout.write("Installing theme dependencies...");
-  let usingLocalCLI2 = embedded || isTruthy(getEnvironmentVariables().SHOPIFY_CLI_2_0_DIRECTORY);
-  await validateRubyEnv(), usingLocalCLI2 ? await bundleInstallLocalShopifyCLI(localCLI) : (await createShopifyCLIWorkingDirectory(), await createShopifyCLIGemfile(), await bundleInstallShopifyCLI()), exists || stdout.write("Installed theme dependencies!");
-}
-async function validateRubyEnv() {
-  await validateRuby(), await validateBundler();
-}
-async function validateRuby() {
-  let version2;
-  try {
-    let stdout = await captureOutput(rubyExecutable(), ["-v"]);
-    version2 = (0, import_semver.coerce)(stdout);
-  } catch {
-    throw new AbortError("Ruby environment not found", `Make sure you have Ruby installed on your system. ${outputContent`${outputToken.link("Documentation.", "https://www.ruby-lang.org/en/documentation/installation/")}`.value}`);
-  }
-  let isValid = version2?.compare(MinRubyVersion);
-  if (isValid === -1 || isValid === void 0)
-    throw new AbortError(`Ruby version ${outputContent`${outputToken.yellow(version2?.raw ?? "unknown")}`.value} is not supported`, `Make sure you have at least Ruby ${outputContent`${outputToken.yellow(MinRubyVersion)}`.value} installed on your system. ${outputContent`${outputToken.link("Documentation.", "https://www.ruby-lang.org/en/documentation/installation/")}`.value}`);
-}
-async function validateBundler() {
-  let version2;
-  try {
-    let stdout = await captureOutput(bundleExecutable(), ["-v"], { env: { BUNDLE_USER_HOME: bundleUserHome() } });
-    version2 = (0, import_semver.coerce)(stdout);
-  } catch {
-    throw new AbortError("Bundler not found", `To install the latest version of Bundler, run ${outputContent`${outputToken.genericShellCommand(`${gemExecutable()} install bundler`)}`.value}`);
-  }
-  let isValid = version2?.compare(MinBundlerVersion);
-  if (isValid === -1 || isValid === void 0)
-    throw new AbortError(`Bundler version ${outputContent`${outputToken.yellow(version2?.raw ?? "unknown")}`.value} is not supported`, `To update to the latest version of Bundler, run ${outputContent`${outputToken.genericShellCommand(`${gemExecutable()} install bundler`)}`.value}`);
-}
-async function createShopifyCLIWorkingDirectory() {
-  return mkdir(await shopifyCLIDirectory());
-}
-async function createShopifyCLIGemfile() {
-  let directory = await shopifyCLIDirectory(), gemfileContent = getBaseGemfileContent().concat(getWindowsDependencies());
-  await addContentToGemfile(directory, gemfileContent);
-}
-async function bundleInstallLocalShopifyCLI(directory) {
-  await addContentToGemfile(directory, getWindowsDependencies()), await shopifyBundleInstall(directory);
-}
-function getBaseGemfileContent() {
-  return ["source 'https://rubygems.org'", `gem 'shopify-cli', '${RubyCLIVersion}'`];
-}
-function getWindowsDependencies() {
-  return platformAndArch().platform === "windows" ? [`gem 'wdm', '>= ${MinWdmWindowsVersion}'`] : [];
-}
-async function addContentToGemfile(gemfileDirectory, content) {
-  let gemfilePath = joinPath(gemfileDirectory, "Gemfile");
-  await fileExists(gemfilePath) || await touchFile(gemfilePath);
-  let gemContent = await readFile(gemfilePath, { encoding: "utf8" }), contentNoExisting = content.filter((line) => !gemContent.includes(line)).join(`
-`);
-  contentNoExisting && await appendFile(gemfilePath, contentNoExisting.concat(`
-`));
-}
-async function bundleInstallShopifyCLI() {
-  await shopifyBundleInstall(await shopifyCLIDirectory());
-}
-async function shopifyCLIDirectory(embedded = !1) {
-  let embeddedDirectory = await findPathUp("assets/cli-ruby", {
-    type: "directory",
-    cwd: dirname(fileURLToPath(import.meta.url))
-  }), bundledDirectory = joinPath(pathConstants.directories.cache.vendor.path(), "ruby-cli", RubyCLIVersion);
-  return embedded ? embeddedDirectory : getEnvironmentVariables().SHOPIFY_CLI_2_0_DIRECTORY ?? bundledDirectory;
-}
-async function version() {
-  let parseOutput = (version2) => version2.match(/ruby (\d+\.\d+\.\d+)/)?.[1];
-  return captureOutput(rubyExecutable(), ["-v"]).then(parseOutput).catch(() => {
-  });
-}
-function getRubyBinDir() {
-  return getEnvironmentVariables().SHOPIFY_RUBY_BINDIR;
-}
-function rubyExecutable() {
-  let rubyBinDir = getRubyBinDir();
-  return rubyBinDir ? joinPath(rubyBinDir, "ruby") : "ruby";
-}
-function bundleExecutable() {
-  let rubyBinDir = getRubyBinDir();
-  return rubyBinDir ? joinPath(rubyBinDir, "bundle") : "bundle";
-}
-function gemExecutable() {
-  let rubyBinDir = getRubyBinDir();
-  return rubyBinDir ? joinPath(rubyBinDir, "gem") : "gem";
-}
-async function embeddedCLIExecutable() {
-  let cliDirectory = await shopifyCLIDirectory(!0);
-  return joinPath(cliDirectory, "bin", "shopify");
-}
-async function getSpinEnvironmentVariables() {
-  return isSpinEnvironment() ? {
-    SPIN_FQDN: await spinFqdn(),
-    SPIN: "1"
-  } : {};
-}
-async function shopifyBundleInstall(directory) {
-  return runWithTimer("cmd_all_timing_network_ms")(async () => {
-    await runBundler(["install"], { cwd: directory });
-  });
-}
-function bundleUserHome() {
-  if (platformAndArch().platform === "windows" && process.env.PUBLIC)
-    return joinPath(process.env.PUBLIC, "AppData", "Local", "shopify-bundler-nodejs", "Cache");
-}
-async function runBundler(args, options) {
-  return exec(bundleExecutable(), args, {
-    ...options,
-    env: {
-      ...options.env,
-      BUNDLE_USER_HOME: bundleUserHome(),
-      BUNDLE_WITHOUT: "development:test",
-      BUNDLE_PATH: envPaths("shopify-gems").cache
-    }
-  });
-}
-
 // ../cli-kit/dist/public/node/monorail.js
 init_cjs_shims();
 var url = "https://monorail-edge.shopifysvc.com/v1/produce", MONORAIL_COMMAND_TOPIC = "app_cli3_command/1.15", publishedCommandNames = /* @__PURE__ */ new Set();
@@ -15908,7 +15726,7 @@ async function buildPayload({ config, errorMessage, exitMode }) {
       total_time: wallClockElapsed,
       success: exitMode === "ok" && errorMessage === void 0,
       cli_version: CLI_KIT_VERSION,
-      ruby_version: await version() || "",
+      ruby_version: "",
       node_version: process.version.replace("v", ""),
       is_employee: await isShopify(),
       ...environmentData,
@@ -15944,10 +15762,8 @@ function sanitizePayload2(payload) {
 }
 
 export {
-  execCLI2,
-  version,
   fanoutHooks,
   getListOfTunnelPlugins,
   reportAnalyticsEvent
 };
-//# sourceMappingURL=chunk-BB4M6AYQ.js.map
+//# sourceMappingURL=chunk-PGUENKZG.js.map