@shopify/cli-kit 3.0.14 → 3.0.15

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @shopify/cli-kit
 
+## 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-f32e5d27.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';
@@ -12321,7 +12321,7 @@ var path$w = /*#__PURE__*/Object.freeze({
 });
 
 var name = "@shopify/cli-kit";
-var version$2 = "3.0.14";
+var version$2 = "3.0.15";
 var description$1 = "A set of utilities, interfaces, and models that are common across all the platform features";
 var keywords = [
 	"shopify",
@@ -14774,7 +14774,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 +14864,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) {
@@ -25088,12 +25088,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 +25107,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,
@@ -40840,7 +40844,7 @@ class Body$1 {
 			return formData;
 		}
 
-		const {toFormData} = await import('./multipart-parser-31f44703.js');
+		const {toFormData} = await import('./multipart-parser-ac67c8ac.js');
 		return toFormData(this.body, ct);
 	}
 
@@ -42291,7 +42295,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 +54770,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 +67419,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 +67440,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")],
@@ -67496,6 +67536,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 +67590,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 +67619,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,7 +67644,7 @@ 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";
@@ -155201,6 +155248,17 @@ const AllOrganizationsQuery = dist$3.gql`
         businessName
         website
         appsNext
+        apps {
+          nodes {
+            id
+            title
+            apiKey
+            apiSecretKeys {
+              secret
+            }
+            appType
+          }
+        }
       }
     }
   }
@@ -155300,7 +155358,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
@@ -174244,6 +174302,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 +174383,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 isValid = version2?.compare(MinRubyVersion);
+  if (isValid === -1 || isValid === void 0) {
+    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}`);
   }
-  const bundlerVersion = await getBundlerVersion();
-  const isValid = bundlerVersion?.compare(MinBundlerVersion);
+}
+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(`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(`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 getBundlerVersion() {
+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 +174808,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-f32e5d27.js.map