@shopify/cli-kit 3.0.14 → 3.0.17

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @shopify/cli-kit
 
+## 3.0.17
+
+### Patch Changes
+
+- df0d0347: Use inquirer with SHOPIFY_USE_INQUIRER
+- 6657a57c: Stop passing configuration when deploying a function
+
+## 3.0.16
+
+### Patch Changes
+
+- eb915dee: Loose version requirements to help dependency managers dedupe dependencies
+- 85ee088d: Add a utility function to know whether Git is present in the environment
+- 2ecbff43: Fix issues with windows being reported as unsuported platform
+- a750e67c: Improve dependency upgrade messages to leverage new shopify upgrade command
+
+## 3.0.15
+
+### Patch Changes
+
+- c3b711ec: Improve Ruby Bundler upgrade message
+- 99378ca0: Push dependency manager detection into cli-kit
+
 ## 3.0.14
 
 ### Patch Changes

package/dist/{index-3f46deaa.js → index-3f7f30b9.js}

@@ -4,7 +4,7 @@ import require$$0$2 from 'readline';
 import require$$0$5, { sep as sep$1, extname as extname$1, resolve as resolve$4, dirname as dirname$2 } from 'path';
 import path$I from 'node:path';
 import url$1, { fileURLToPath, pathToFileURL, format as format$6 } from 'node:url';
-import process$2, { platform as platform$1 } from 'node:process';
+import process$2, { platform as platform$2 } from 'node:process';
 import fs$L, { promises } from 'node:fs';
 import require$$1$2, { constants as constants$8, EOL, networkInterfaces } from 'os';
 import require$$0$6, { promisify as promisify$7 } from 'util';
@@ -25,6 +25,7 @@ import tty__default from 'tty';
 import StackTracey from 'stacktracey';
 import { Errors, Flags } from '@oclif/core';
 import sourceMapSupport from 'source-map-support';
+import inquirer from 'inquirer';
 import { createRequire } from 'module';
 import http$4 from 'node:http';
 import https$3 from 'node:https';
@@ -12321,7 +12322,7 @@ var path$w = /*#__PURE__*/Object.freeze({
 });
 
 var name = "@shopify/cli-kit";
-var version$2 = "3.0.14";
+var version$2 = "3.0.17";
 var description$1 = "A set of utilities, interfaces, and models that are common across all the platform features";
 var keywords = [
 	"shopify",
@@ -12369,8 +12370,9 @@ var os$7 = [
 	"win32"
 ];
 var dependencies$1 = {
-	"@oclif/core": "1.9.0",
+	"@oclif/core": "^1.0",
 	envfile: "^6.17.0",
+	inquirer: "^8.2.4",
 	keytar: "^7.9.0",
 	open: "^8.4.0",
 	prettier: "^2.6.2",
@@ -12380,6 +12382,7 @@ var dependencies$1 = {
 var devDependencies = {
 	"@iarna/toml": "^2.2.5",
 	"@types/cross-zip": "^4.0.0",
+	"@types/inquirer": "^8.2.1",
 	"@types/js-yaml": "^4.0.5",
 	"@types/semver": "^7.3.9",
 	"abort-controller": "^3.0.0",
@@ -14774,7 +14777,7 @@ var constants$1 = require$$0$b;
 var origCwd = process.cwd;
 var cwd = null;
 
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform;
+var platform$1 = process.env.GRACEFUL_FS_PLATFORM || process.platform;
 
 process.cwd = function() {
   if (!cwd)
@@ -14864,7 +14867,7 @@ function patch$2 (fs) {
   // failures. Also, take care to yield the scheduler. Windows scheduling gives
   // CPU to a busy looping process, which can cause the program causing the lock
   // contention to be starved of CPU by node, so the contention doesn't resolve.
-  if (platform === "win32") {
+  if (platform$1 === "win32") {
     fs.rename = typeof fs.rename !== 'function' ? fs.rename
     : (function (fs$rename) {
       function rename (from, to, cb) {
@@ -19637,8 +19640,8 @@ function stripUp(path, strip) {
 async function inTemporaryDirectory(callback) {
   return tempy.directory.task(callback);
 }
-async function read$1(path) {
-  const content = await fs$g.readFile(path, { encoding: "utf-8" });
+async function read$1(path, options = { encoding: "utf-8" }) {
+  const content = await fs$g.readFile(path, options);
   return content;
 }
 async function copy(from, to) {
@@ -19669,6 +19672,9 @@ async function mkTmpDir() {
 async function isDirectory(path) {
   return (await fs$g.promises.lstat(path)).isDirectory();
 }
+async function size$1(path) {
+  return (await fs$g.stat(path)).size;
+}
 async function move(src, dest, options = {}) {
   await fs$g.move(src, dest, options);
 }
@@ -19721,6 +19727,7 @@ var file$1 = /*#__PURE__*/Object.freeze({
 	rmdir: rmdir,
 	mkTmpDir: mkTmpDir,
 	isDirectory: isDirectory,
+	size: size$1,
 	move: move,
 	chmod: chmod,
 	hasExecutablePermissions: hasExecutablePermissions,
@@ -19762,6 +19769,14 @@ function isUnitTest(env = process.env) {
 function analyticsDisabled(env = process.env) {
   return isTruthy$1(env[constants$2.environmentVariables.noAnalytics]);
 }
+async function hasGit() {
+  try {
+    await exec$2("git", ["--version"]);
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 var local = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -19771,7 +19786,8 @@ var local = /*#__PURE__*/Object.freeze({
 	isVerbose: isVerbose,
 	isShopify: isShopify,
 	isUnitTest: isUnitTest,
-	analyticsDisabled: analyticsDisabled
+	analyticsDisabled: analyticsDisabled,
+	hasGit: hasGit
 });
 
 const ESC = '\u001B[';
@@ -21566,7 +21582,7 @@ class Abort extends Fatal {
     super(message, 0 /* Abort */, tryMessage);
   }
 }
-class AbortSilent$1 extends Fatal {
+class AbortSilent extends Fatal {
   constructor() {
     super("", 1 /* AbortSilent */);
   }
@@ -21616,7 +21632,7 @@ var error$j = /*#__PURE__*/Object.freeze({
 	CancelExecution: CancelExecution,
 	Fatal: Fatal,
 	Abort: Abort,
-	AbortSilent: AbortSilent$1,
+	AbortSilent: AbortSilent,
 	Bug: Bug,
 	handler: handler,
 	mapper: mapper$1,
@@ -25088,12 +25104,15 @@ var wrapAnsi_1 = (string, columns, options) => {
 		.join('\n');
 };
 
-const env$1 = process.env || {};
-const argv = process.argv || [];
+const {
+  env: env$1 = {},
+  argv = [],
+  platform = "",
+} = typeof process === "undefined" ? {} : process;
 
 const isDisabled = "NO_COLOR" in env$1 || argv.includes("--no-color");
 const isForced = "FORCE_COLOR" in env$1 || argv.includes("--color");
-const isWindows = process.platform === "win32";
+const isWindows = platform === "win32";
 const isDumbTerminal = env$1.TERM === "dumb";
 
 const isCompatibleTerminal =
@@ -25104,7 +25123,8 @@ const isCI =
   ("GITHUB_ACTIONS" in env$1 || "GITLAB_CI" in env$1 || "CIRCLECI" in env$1);
 
 const isColorSupported =
-  !isDisabled && (isForced || (isWindows && !isDumbTerminal) || isCompatibleTerminal || isCI);
+  !isDisabled &&
+  (isForced || (isWindows && !isDumbTerminal) || isCompatibleTerminal || isCI);
 
 const replaceClose = (
   index,
@@ -26485,22 +26505,35 @@ var Listr = class {
   }
 };
 
-const prompt = async (questions) => {
+const prompt = async (questions, debugForceInquirer = false) => {
   if (!isTerminalInteractive() && questions.length !== 0) {
     throw new Bug(content`
 The CLI prompted in a non-interactive terminal with the following questions:
 ${token.json(questions)}
     `);
   }
-  const mappedQuestions = questions.map(mapper);
-  const value = {};
-  for (const question of mappedQuestions) {
-    if (question.preface) {
-      info(question.preface);
+  if (debugForceInquirer || isTruthy$1(process.env.SHOPIFY_USE_INQUIRER)) {
+    const results = [];
+    for (const question of questions) {
+      if (question.preface) {
+        info(question.preface);
+      }
+      const questionName = question.name;
+      const answer = (await inquirer.prompt([convertQuestionForInquirer(question)]))[questionName];
+      results.push([questionName, answer]);
+    }
+    return Object.fromEntries(results);
+  } else {
+    const mappedQuestions = questions.map(mapper);
+    const value = {};
+    for (const question of mappedQuestions) {
+      if (question.preface) {
+        info(question.preface);
+      }
+      value[question.name] = await question.run();
     }
-    value[question.name] = await question.run();
+    return value;
   }
-  return value;
 };
 async function nonEmptyDirectoryPrompt(directory) {
   if (await exists$1(directory)) {
@@ -26522,6 +26555,19 @@ async function nonEmptyDirectoryPrompt(directory) {
     remove$4(directory);
   }
 }
+function convertQuestionForInquirer(question) {
+  switch (question.type) {
+    case "input":
+    case "password":
+      return question;
+    case "select":
+    case "autocomplete":
+      return {
+        ...question,
+        type: "list"
+      };
+  }
+}
 function mapper(question) {
   switch (question.type) {
     case "input":
@@ -35949,10 +35995,15 @@ init_git_response_error();
 var esm_default = gitInstanceFactory;
 
 const factory = esm_default;
+const GitNotPresentError = () => {
+  return new Abort(`Git is necessary in the environment to continue`, content`Install ${token.link("git", "https://git-scm.com/book/en/v2/Getting-Started-Installing-Git")}`);
+};
 async function initializeRepository(directory) {
+  await ensurePresentOrAbort();
   await esm_default(directory).init();
 }
 async function downloadRepository({ repoUrl, destination }) {
+  await ensurePresentOrAbort();
   const [repository, branch] = repoUrl.split("#");
   const options = { "--recurse-submodules": null };
   if (branch) {
@@ -35960,16 +36011,25 @@ async function downloadRepository({ repoUrl, destination }) {
   }
   await esm_default().clone(repository, destination, options, (err) => {
     if (err) {
-      throw new Abort(err.message);
+      const abortError = new Abort(err.message);
+      abortError.stack = err.stack;
+      throw abortError;
     }
   });
 }
+async function ensurePresentOrAbort() {
+  if (!await hasGit()) {
+    throw GitNotPresentError();
+  }
+}
 
 var git = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	factory: factory,
+	GitNotPresentError: GitNotPresentError,
 	initializeRepository: initializeRepository,
-	downloadRepository: downloadRepository
+	downloadRepository: downloadRepository,
+	ensurePresentOrAbort: ensurePresentOrAbort
 });
 
 /**
@@ -40840,7 +40900,7 @@ class Body$1 {
 			return formData;
 		}
 
-		const {toFormData} = await import('./multipart-parser-31f44703.js');
+		const {toFormData} = await import('./multipart-parser-cc9089c4.js');
 		return toFormData(this.body, ct);
 	}
 
@@ -42291,7 +42351,9 @@ async function fetch$4(url, options_) {
 		});
 
 		fixResponseChunkedTransferBadEnding(request_, error => {
-			response.body.destroy(error);
+			if (response && response.body) {
+				response.body.destroy(error);
+			}
 		});
 
 		/* c8 ignore next 18 */
@@ -54764,11 +54826,26 @@ function parseRepoUrl(src) {
   const http = `https://${normalizedSite}/${user}/${name}`;
   return { site: normalizedSite, user, name, ref, subDirectory, ssh, http };
 }
+function parseGithubRepoReference(src) {
+  const url = new URL(src);
+  if (url.origin !== "https://github.com") {
+    throw new Abort("Only GitHub repository references are supported.");
+  }
+  const branch = url.hash ? url.hash.slice(1) : void 0;
+  const [_, user, repo, ...repoPath] = url.pathname.split("/");
+  const filePath = repoPath.length > 0 ? repoPath.join("/") : void 0;
+  return {
+    repoBaseUrl: `${url.origin}/${user}/${repo}`,
+    branch,
+    filePath
+  };
+}
 
 var github = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	getLatestRelease: getLatestRelease,
-	parseRepoUrl: parseRepoUrl
+	parseRepoUrl: parseRepoUrl,
+	parseGithubRepoReference: parseGithubRepoReference
 });
 
 var distWeb = {exports: {}};
@@ -67398,6 +67475,14 @@ var semver = /*#__PURE__*/Object.freeze({
 	coerce: coerce_1
 });
 
+const genericConfigurationFileNames = {
+  yarn: {
+    lockfile: "yarn.lock"
+  },
+  pnpm: {
+    lockfile: "pnpm-lock.yaml"
+  }
+};
 const dependencyManager = ["yarn", "npm", "pnpm"];
 const PackageJsonNotFoundError = (directory) => {
   return new Abort(`The directory ${directory} doesn't have a package.json.`);
@@ -67411,6 +67496,17 @@ function dependencyManagerUsedForCreating(env = process.env) {
     return "npm";
   }
 }
+async function getDependencyManager(directory) {
+  const yarnLockPath = join$3(directory, genericConfigurationFileNames.yarn.lockfile);
+  const pnpmLockPath = join$3(directory, genericConfigurationFileNames.pnpm.lockfile);
+  if (await exists$1(yarnLockPath)) {
+    return "yarn";
+  } else if (await exists$1(pnpmLockPath)) {
+    return "pnpm";
+  } else {
+    return "npm";
+  }
+}
 async function installNPMDependenciesRecursively(options) {
   const packageJsons = await out(join$3(options.directory, "**/package.json"), {
     ignore: [join$3(options.directory, "node_modules/**/package.json")],
@@ -67455,9 +67551,9 @@ async function checkForNewVersion(dependency, currentVersion) {
     return void 0;
   }
 }
-function getOutputUpdateCLIReminder(dependencyManager2, packages) {
-  const updateCommand = dependencyManager2 === "yarn" ? "upgrade" : "update";
-  return content`To update to the latest version of the Shopify CLI, run ${token.genericShellCommand(`${dependencyManager2} ${updateCommand}${packages === void 0 ? "" : ` ${packages.join(", ")}`}`)}`.value;
+function getOutputUpdateCLIReminder(dependencyManager2, version) {
+  const updateCommand = token.packagejsonScript(dependencyManager2, "shopify", "upgrade");
+  return content`💡 Version ${version} available! Run ${updateCommand}`.value;
 }
 async function packageJSONContents(packageJsonPath) {
   if (!await exists$1(packageJsonPath)) {
@@ -67496,6 +67592,9 @@ async function addNPMDependenciesIfNeeded(dependencies, options) {
     signal: options.signal
   });
 }
+async function addLatestNPMDependencies(dependencies, options) {
+  await addNPMDependenciesIfNeeded(dependencies.map((dependency) => `${dependency}@latest`), options);
+}
 function argumentsToAddDependenciesWithNPM(dependencies, type) {
   let command = ["install"];
   command = command.concat(dependencies);
@@ -67547,16 +67646,20 @@ function argumentsToAddDependenciesWithPNPM(dependencies, type) {
 
 var dependency = /*#__PURE__*/Object.freeze({
 	__proto__: null,
+	genericConfigurationFileNames: genericConfigurationFileNames,
 	dependencyManager: dependencyManager,
 	PackageJsonNotFoundError: PackageJsonNotFoundError,
 	dependencyManagerUsedForCreating: dependencyManagerUsedForCreating,
+	getDependencyManager: getDependencyManager,
 	installNPMDependenciesRecursively: installNPMDependenciesRecursively,
 	install: install,
 	getPackageName: getPackageName,
 	getDependencies: getDependencies,
 	checkForNewVersion: checkForNewVersion,
 	getOutputUpdateCLIReminder: getOutputUpdateCLIReminder,
-	addNPMDependenciesIfNeeded: addNPMDependenciesIfNeeded
+	packageJSONContents: packageJSONContents,
+	addNPMDependenciesIfNeeded: addNPMDependenciesIfNeeded,
+	addLatestNPMDependencies: addLatestNPMDependencies
 });
 
 const getEnvironmentVariable = () => {
@@ -67572,7 +67675,7 @@ const getUsernameFromOsUserInfo = () => {
 };
 const cleanWindowsCommand = (value) => value.replace(/^.*\\/, "");
 const makeUsernameFromId = (userId) => `no-username-${userId}`;
-const username = async (platform = platform$1) => {
+const username = async (platform = platform$2) => {
   const environmentVariable = getEnvironmentVariable();
   if (environmentVariable) {
     return environmentVariable;
@@ -67597,12 +67700,16 @@ const username = async (platform = platform$1) => {
     return null;
   }
 };
-const platformAndArch = (platform = platform$1) => {
+const platformAndArch = (platform = platform$2) => {
   let arch$1 = arch();
   if (arch$1 === "x64") {
     arch$1 = "amd64";
   }
-  return { platform, arch: arch$1 };
+  let platformString = platform;
+  if (platform.match(/^win.+/)) {
+    platformString = "windows";
+  }
+  return { platform: platformString, arch: arch$1 };
 };
 
 var os$2 = /*#__PURE__*/Object.freeze({
@@ -155201,6 +155308,17 @@ const AllOrganizationsQuery = dist$3.gql`
         businessName
         website
         appsNext
+        apps {
+          nodes {
+            id
+            title
+            apiKey
+            apiSecretKeys {
+              secret
+            }
+            appType
+          }
+        }
       }
     }
   }
@@ -155262,7 +155380,7 @@ const FindAppQuery = dist$3.gql`
   }
 `;
 
-const UpdateDraftMutation = dist$3.gql`
+const ExtensionUpdateDraftMutation = dist$3.gql`
   mutation ExtensionUpdateDraft($apiKey: String!, $registrationId: ID!, $config: JSON!, $context: String) {
     extensionUpdateDraft(
       input: {apiKey: $apiKey, registrationId: $registrationId, config: $config, context: $context}
@@ -155300,7 +155418,7 @@ const GenerateSignedUploadUrl = dist$3.gql`
 `;
 
 const CreateDeployment = dist$3.gql`
-  mutation CreateDeployment($apiKey: String!, $uuid: String!, $bundleUrl: String!, $extensions: [ExtensionSettings!]) {
+  mutation CreateDeployment($apiKey: String!, $uuid: String!, $bundleUrl: String!, $extensions: [ExtensionSettings!]!) {
     deploymentCreate(input: {apiKey: $apiKey, uuid: $uuid, bundleUrl: $bundleUrl, extensions: $extensions}) {
       deployment {
         uuid
@@ -155459,9 +155577,9 @@ const AppFunctionSetMutation = dist$3.gql`
     $force: Boolean
     $schemaMajorVersion: String
     $schemaMinorVersion: String
-    $scriptConfigVersion: String!
+    $scriptConfigVersion: String
     $configurationUi: Boolean!
-    $configurationDefinition: String!
+    $configurationDefinition: String
     $moduleUploadUrl: String!
     $library: LibraryInput
     $inputQuery: String
@@ -155504,7 +155622,7 @@ var index = /*#__PURE__*/Object.freeze({
 	CreateAppQuery: CreateAppQuery,
 	UpdateURLsQuery: UpdateURLsQuery,
 	FindAppQuery: FindAppQuery,
-	UpdateDraftMutation: UpdateDraftMutation,
+	ExtensionUpdateDraftMutation: ExtensionUpdateDraftMutation,
 	GenerateSignedUploadUrl: GenerateSignedUploadUrl,
 	CreateDeployment: CreateDeployment,
 	AllStoresByOrganizationQuery: AllStoresByOrganizationQuery,
@@ -174244,6 +174362,8 @@ var checksum = /*#__PURE__*/Object.freeze({
 const RubyCLIVersion = "2.16.0";
 const ThemeCheckVersion = "1.10.2";
 const MinBundlerVersion = "2.3.8";
+const MinRubyVersion = "2.3.0";
+const MinRubyGemVersion = "2.5.0";
 async function execCLI(args, adminSession) {
   await installCLIDependencies();
   const env = {
@@ -174323,23 +174443,42 @@ async function installCLIDependencies() {
   await list.run();
 }
 async function validateRubyEnv() {
+  await validateRuby();
+  await validateRubyGems();
+  await validateBundler();
+}
+async function validateRuby() {
+  let version2;
   try {
-    await exec$2("ruby", ["-v"]);
+    const stdout = await captureOutput("ruby", ["-v"]);
+    version2 = coerce_1(stdout);
   } catch {
-    throw new Abort("Ruby environment not found", "Make sure you have ruby installed on your system: https://www.ruby-lang.org/en/documentation/installation/");
+    throw new Abort("Ruby environment not found", `Make sure you have Ruby installed on your system: ${content`${token.link("", "https://www.ruby-lang.org/en/documentation/installation/")}`.value}`);
   }
-  const bundlerVersion = await getBundlerVersion();
-  const isValid = bundlerVersion?.compare(MinBundlerVersion);
+  const isValid = version2?.compare(MinRubyVersion);
   if (isValid === -1 || isValid === void 0) {
-    throw new Abort(`Bundler version ${bundlerVersion} is not supported`, `Make sure you have Bundler version ${MinBundlerVersion} or higher installed on your system: https://bundler.io/`);
+    throw new Abort(`Ruby version ${content`${token.yellow(version2.raw)}`.value} is not supported`, `Make sure you have at least Ruby ${content`${token.yellow(MinRubyVersion)}`.value} installed on your system: ${content`${token.link("", "https://www.ruby-lang.org/en/documentation/installation/")}`.value}`);
   }
 }
-async function getBundlerVersion() {
+async function validateRubyGems() {
+  const stdout = await captureOutput("gem", ["-v"]);
+  const version2 = coerce_1(stdout);
+  const isValid = version2?.compare(MinRubyGemVersion);
+  if (isValid === -1 || isValid === void 0) {
+    throw new Abort(`RubyGems version ${content`${token.yellow(version2.raw)}`.value} is not supported`, `To update to the latest version of RubyGems, run ${content`${token.genericShellCommand("gem update --system")}`.value}`);
+  }
+}
+async function validateBundler() {
+  let version2;
   try {
     const stdout = await captureOutput("bundler", ["-v"]);
-    return coerce_1(stdout);
+    version2 = coerce_1(stdout);
   } catch {
-    throw new Abort("Bundler not found", "Make sure you have Bundler installed on your system: https://bundler.io/");
+    throw new Abort("Bundler not found", `To install the latest version of Bundler, run ${content`${token.genericShellCommand("gem install bundler")}`.value}`);
+  }
+  const isValid = version2?.compare(MinBundlerVersion);
+  if (isValid === -1 || isValid === void 0) {
+    throw new Abort(`Bundler version ${content`${token.yellow(version2.raw)}`.value} is not supported`, `To update to the latest version of Bundler, run ${content`${token.genericShellCommand("gem install bundler")}`.value}`);
   }
 }
 function createShopifyCLIWorkingDirectory() {
@@ -174729,4 +174868,4 @@ var vscode = /*#__PURE__*/Object.freeze({
 });
 
 export { semver as A, npm as B, port as C, cli as D, id as E, FormData$3 as F, temporary as G, dotEnv as H, abort as I, constants$2 as J, plugins as K, vscode as L, File$1 as a, string as b, github as c, dependency as d, error$j as e, file$1 as f, git as g, haiku as h, os$2 as i, environment as j, session as k, schema$2 as l, toml as m, store as n, output as o, path$w as p, api as q, http$2 as r, system as s, template as t, ui as u, version$1 as v, archiver as w, checksum as x, yaml as y, ruby as z };
-//# sourceMappingURL=index-3f46deaa.js.map
+//# sourceMappingURL=index-3f7f30b9.js.map