@shopify/cli-kit 1.0.5 → 1.0.9

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @shopify/cli-kit
 
+## 1.0.9
+
+### Patch Changes
+
+- df1c523: Re-authenticate if Identity returns an invalid grant error
+
+## 1.0.8
+
+### Patch Changes
+
+- 8e2c3d3: Improve the error handling to not treat invalid commands as bug errors
+
+## 1.0.6
+
+### Patch Changes
+
+- Add deploy command
+
 ## 1.0.5
 
 ### Patch Changes

package/dist/{index-ade2d028.js → index-73f2dc55.js}

@@ -5,7 +5,9 @@ import require$$1$2, { EOL, constants as constants$8 } from 'os';
 import require$$0$5, { Readable as Readable$3 } from 'stream';
 import * as tty$1 from 'tty';
 import tty__default from 'tty';
+import crypto$1, { randomUUID } from 'crypto';
 import Stream$4, { Writable as Writable$1, PassThrough as PassThrough$6, pipeline as pipeline$2 } from 'node:stream';
+import { Errors } from '@oclif/core';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import path$E from 'node:path';
 import childProcess from 'node:child_process';
@@ -20,7 +22,6 @@ import require$$0$9, { promisify as promisify$6 } from 'util';
 import fs$H, { promises } from 'node:fs';
 import require$$0$b from 'constants';
 import { promisify as promisify$7, types as types$6, deprecate } from 'node:util';
-import crypto$1, { randomUUID } from 'crypto';
 import http$3 from 'http';
 import require$$1$4 from 'https';
 import Url from 'url';
@@ -10492,14 +10493,14 @@ var Listr = class {
 };
 
 const prompt = async (questions) => {
-  const mappedQuestions = questions.map(mapper);
+  const mappedQuestions = questions.map(mapper$1);
   const value = {};
   for (const question of mappedQuestions) {
     value[question.name] = await question.run();
   }
   return value;
 };
-function mapper(question) {
+function mapper$1(question) {
   if (question.type === "input") {
     return new Input(question);
   } else if (question.type === "select") {
@@ -10514,6 +10515,112 @@ var ui = /*#__PURE__*/Object.freeze({
 	Listr: Listr
 });
 
+/**
+ * Source: ftp://ftp.unicode.org/Public/UCD/latest/ucd/SpecialCasing.txt
+ */
+/**
+ * Lower case as a function.
+ */
+function lowerCase(str) {
+    return str.toLowerCase();
+}
+
+// Support camel case ("camelCase" -> "camel Case" and "CAMELCase" -> "CAMEL Case").
+var DEFAULT_SPLIT_REGEXP = [/([a-z0-9])([A-Z])/g, /([A-Z])([A-Z][a-z])/g];
+// Remove all non-word characters.
+var DEFAULT_STRIP_REGEXP = /[^A-Z0-9]+/gi;
+/**
+ * Normalize the string into something other libraries can manipulate easier.
+ */
+function noCase(input, options) {
+    if (options === void 0) { options = {}; }
+    var _a = options.splitRegexp, splitRegexp = _a === void 0 ? DEFAULT_SPLIT_REGEXP : _a, _b = options.stripRegexp, stripRegexp = _b === void 0 ? DEFAULT_STRIP_REGEXP : _b, _c = options.transform, transform = _c === void 0 ? lowerCase : _c, _d = options.delimiter, delimiter = _d === void 0 ? " " : _d;
+    var result = replace$1(replace$1(input, splitRegexp, "$1\0$2"), stripRegexp, "\0");
+    var start = 0;
+    var end = result.length;
+    // Trim the delimiter from around the output string.
+    while (result.charAt(start) === "\0")
+        start++;
+    while (result.charAt(end - 1) === "\0")
+        end--;
+    // Transform each token independently.
+    return result.slice(start, end).split("\0").map(transform).join(delimiter);
+}
+/**
+ * Replace `re` in the input string with the replacement value.
+ */
+function replace$1(input, re, value) {
+    if (re instanceof RegExp)
+        return input.replace(re, value);
+    return re.reduce(function (input, re) { return input.replace(re, value); }, input);
+}
+
+function pascalCaseTransform(input, index) {
+    var firstChar = input.charAt(0);
+    var lowerChars = input.substr(1).toLowerCase();
+    if (index > 0 && firstChar >= "0" && firstChar <= "9") {
+        return "_" + firstChar + lowerChars;
+    }
+    return "" + firstChar.toUpperCase() + lowerChars;
+}
+function pascalCase(input, options) {
+    if (options === void 0) { options = {}; }
+    return noCase(input, __assign$1({ delimiter: "", transform: pascalCaseTransform }, options));
+}
+
+function camelCaseTransform(input, index) {
+    if (index === 0)
+        return input.toLowerCase();
+    return pascalCaseTransform(input, index);
+}
+function camelCase(input, options) {
+    if (options === void 0) { options = {}; }
+    return pascalCase(input, __assign$1({ transform: camelCaseTransform }, options));
+}
+
+function dotCase(input, options) {
+    if (options === void 0) { options = {}; }
+    return noCase(input, __assign$1({ delimiter: "." }, options));
+}
+
+function paramCase(input, options) {
+    if (options === void 0) { options = {}; }
+    return dotCase(input, __assign$1({ delimiter: "-" }, options));
+}
+
+function snakeCase$1(input, options) {
+    if (options === void 0) { options = {}; }
+    return dotCase(input, __assign$1({ delimiter: "_" }, options));
+}
+
+function randomHex(size) {
+  return crypto$1.randomBytes(size).toString("hex");
+}
+function generateRandomChallengePair() {
+  const codeVerifier = base64URLEncode(crypto$1.randomBytes(32));
+  const codeChallenge = base64URLEncode(sha256(codeVerifier));
+  return { codeVerifier, codeChallenge };
+}
+function base64URLEncode(str) {
+  return str.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/[=]/g, "");
+}
+function sha256(str) {
+  return crypto$1.createHash("sha256").update(str).digest();
+}
+function capitalize$1(string) {
+  return string.substring(0, 1).toUpperCase() + string.substring(1);
+}
+
+var string$2 = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	randomHex: randomHex,
+	generateRandomChallengePair: generateRandomChallengePair,
+	capitalize: capitalize$1,
+	camelize: camelCase,
+	hyphenize: paramCase,
+	underscore: snakeCase$1
+});
+
 const ESC = '\u001B[';
 const OSC = '\u001B]';
 const BEL = '\u0007';
@@ -11053,7 +11160,7 @@ const error$l = (content2) => {
 `);
     const footer = colors$9.redBright("\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n");
     console.error(header);
-    console.error(padding + stringifyMessage(message2));
+    console.error(padding + capitalize$1(stringifyMessage(message2)));
     if (content2.tryMessage) {
       console.error(`
 ${padding}${colors$9.bold("What to try:")}`);
@@ -11077,7 +11184,7 @@ const message = (content2, level = "info") => {
     console.log(stringifyMessage(content2));
   }
 };
-async function concurrent(index, prefix, callback) {
+async function concurrent(index, prefix, action) {
   const colors2 = [token.yellow, token.cyan, token.magenta, token.green];
   function linePrefix() {
     const color = colors2[colors2.length % (index + 1)];
@@ -11102,7 +11209,7 @@ async function concurrent(index, prefix, callback) {
       next();
     }
   });
-  await callback(stdout, stderr);
+  await action(stdout, stderr);
 }
 
 var output$1 = /*#__PURE__*/Object.freeze({
@@ -11141,6 +11248,15 @@ function handler(error) {
   error$l(fatal);
   return Promise.resolve(error);
 }
+function mapper(error) {
+  if (error instanceof Errors.CLIError) {
+    const mappedError = new Abort(error.message);
+    mappedError.stack = error.stack;
+    return Promise.resolve(mappedError);
+  } else {
+    return Promise.resolve(error);
+  }
+}
 
 var error$k = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -11148,7 +11264,8 @@ var error$k = /*#__PURE__*/Object.freeze({
 	Abort: Abort,
 	AbortSilent: AbortSilent,
 	Bug: Bug,
-	handler: handler
+	handler: handler,
+	mapper: mapper
 });
 
 var crossSpawn$1 = {exports: {}};
@@ -18068,18 +18185,18 @@ function propagateCloseEventToSources(streams) {
     streams.forEach((stream) => stream.emit('close'));
 }
 
-var string$2 = {};
+var string$1 = {};
 
-Object.defineProperty(string$2, "__esModule", { value: true });
-string$2.isEmpty = string$2.isString = void 0;
+Object.defineProperty(string$1, "__esModule", { value: true });
+string$1.isEmpty = string$1.isString = void 0;
 function isString$2(input) {
     return typeof input === 'string';
 }
-string$2.isString = isString$2;
+string$1.isString = isString$2;
 function isEmpty(input) {
     return input === '';
 }
-string$2.isEmpty = isEmpty;
+string$1.isEmpty = isEmpty;
 
 Object.defineProperty(utils$o, "__esModule", { value: true });
 utils$o.string = utils$o.stream = utils$o.pattern = utils$o.path = utils$o.fs = utils$o.errno = utils$o.array = void 0;
@@ -18095,8 +18212,8 @@ const pattern$1 = pattern$2;
 utils$o.pattern = pattern$1;
 const stream$4 = stream$5;
 utils$o.stream = stream$4;
-const string$1 = string$2;
-utils$o.string = string$1;
+const string = string$1;
+utils$o.string = string;
 
 Object.defineProperty(tasks, "__esModule", { value: true });
 tasks.convertPatternGroupToTask = tasks.convertPatternGroupsToTasks = tasks.groupPatternsByBaseDirectory = tasks.getNegativePatternsAsPositive = tasks.getPositivePatterns = tasks.convertPatternsToTasks = tasks.generate = void 0;
@@ -24999,7 +25116,7 @@ function pad(str, length, ch, add) {
 function identify(val) {
     return val;
 }
-function snakeCase$1(str) {
+function snakeCase(str) {
     return str.replace(/(\w?)([A-Z])/g, function (_, a, b) { return (a ? a + '_' : '') + b.toLowerCase(); });
 }
 function changeCase(str) {
@@ -27733,7 +27850,7 @@ function capitalize(str) {
     str = stringify$3(str);
     return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
 }
-function replace$1(v, pattern, replacement) {
+function replace(v, pattern, replacement) {
     return stringify$3(v).split(String(pattern)).join(replacement);
 }
 function replaceFirst(v, arg1, arg2) {
@@ -27804,7 +27921,7 @@ var builtinFilters = /*#__PURE__*/Object.freeze({
     strip: strip,
     stripNewlines: stripNewlines,
     capitalize: capitalize,
-    replace: replace$1,
+    replace: replace,
     replaceFirst: replaceFirst,
     truncate: truncate,
     truncatewords: truncatewords
@@ -29057,8 +29174,8 @@ var Liquid = /** @class */ (function () {
         this.renderer = new Render();
         this.filters = new FilterMap(this.options.strictFilters, this);
         this.tags = new TagMap();
-        forOwn(tags, function (conf, name) { return _this.registerTag(snakeCase$1(name), conf); });
-        forOwn(builtinFilters, function (handler, name) { return _this.registerFilter(snakeCase$1(name), handler); });
+        forOwn(tags, function (conf, name) { return _this.registerTag(snakeCase(name), conf); });
+        forOwn(builtinFilters, function (handler, name) { return _this.registerFilter(snakeCase(name), handler); });
     }
     Liquid.prototype.parse = function (html, filepath) {
         return this.parser.parse(html, filepath);
@@ -29219,108 +29336,6 @@ var template = /*#__PURE__*/Object.freeze({
 	recursiveDirectoryCopy: recursiveDirectoryCopy
 });
 
-/**
- * Source: ftp://ftp.unicode.org/Public/UCD/latest/ucd/SpecialCasing.txt
- */
-/**
- * Lower case as a function.
- */
-function lowerCase(str) {
-    return str.toLowerCase();
-}
-
-// Support camel case ("camelCase" -> "camel Case" and "CAMELCase" -> "CAMEL Case").
-var DEFAULT_SPLIT_REGEXP = [/([a-z0-9])([A-Z])/g, /([A-Z])([A-Z][a-z])/g];
-// Remove all non-word characters.
-var DEFAULT_STRIP_REGEXP = /[^A-Z0-9]+/gi;
-/**
- * Normalize the string into something other libraries can manipulate easier.
- */
-function noCase(input, options) {
-    if (options === void 0) { options = {}; }
-    var _a = options.splitRegexp, splitRegexp = _a === void 0 ? DEFAULT_SPLIT_REGEXP : _a, _b = options.stripRegexp, stripRegexp = _b === void 0 ? DEFAULT_STRIP_REGEXP : _b, _c = options.transform, transform = _c === void 0 ? lowerCase : _c, _d = options.delimiter, delimiter = _d === void 0 ? " " : _d;
-    var result = replace(replace(input, splitRegexp, "$1\0$2"), stripRegexp, "\0");
-    var start = 0;
-    var end = result.length;
-    // Trim the delimiter from around the output string.
-    while (result.charAt(start) === "\0")
-        start++;
-    while (result.charAt(end - 1) === "\0")
-        end--;
-    // Transform each token independently.
-    return result.slice(start, end).split("\0").map(transform).join(delimiter);
-}
-/**
- * Replace `re` in the input string with the replacement value.
- */
-function replace(input, re, value) {
-    if (re instanceof RegExp)
-        return input.replace(re, value);
-    return re.reduce(function (input, re) { return input.replace(re, value); }, input);
-}
-
-function pascalCaseTransform(input, index) {
-    var firstChar = input.charAt(0);
-    var lowerChars = input.substr(1).toLowerCase();
-    if (index > 0 && firstChar >= "0" && firstChar <= "9") {
-        return "_" + firstChar + lowerChars;
-    }
-    return "" + firstChar.toUpperCase() + lowerChars;
-}
-function pascalCase(input, options) {
-    if (options === void 0) { options = {}; }
-    return noCase(input, __assign$1({ delimiter: "", transform: pascalCaseTransform }, options));
-}
-
-function camelCaseTransform(input, index) {
-    if (index === 0)
-        return input.toLowerCase();
-    return pascalCaseTransform(input, index);
-}
-function camelCase(input, options) {
-    if (options === void 0) { options = {}; }
-    return pascalCase(input, __assign$1({ transform: camelCaseTransform }, options));
-}
-
-function dotCase(input, options) {
-    if (options === void 0) { options = {}; }
-    return noCase(input, __assign$1({ delimiter: "." }, options));
-}
-
-function paramCase(input, options) {
-    if (options === void 0) { options = {}; }
-    return dotCase(input, __assign$1({ delimiter: "-" }, options));
-}
-
-function snakeCase(input, options) {
-    if (options === void 0) { options = {}; }
-    return dotCase(input, __assign$1({ delimiter: "_" }, options));
-}
-
-function randomHex(size) {
-  return crypto$1.randomBytes(size).toString("hex");
-}
-function generateRandomChallengePair() {
-  const codeVerifier = base64URLEncode(crypto$1.randomBytes(32));
-  const codeChallenge = base64URLEncode(sha256(codeVerifier));
-  return { codeVerifier, codeChallenge };
-}
-function base64URLEncode(str) {
-  return str.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/[=]/g, "");
-}
-function sha256(str) {
-  return crypto$1.createHash("sha256").update(str).digest();
-}
-
-var string = /*#__PURE__*/Object.freeze({
-	__proto__: null,
-	randomHex: randomHex,
-	generateRandomChallengePair: generateRandomChallengePair,
-	camelize: camelCase,
-	hyphenize: paramCase,
-	underscore: snakeCase
-});
-
 var dist$5 = {};
 
 var src$5 = {};
@@ -45461,7 +45476,7 @@ function isTruthy(variable) {
 }
 
 var name = "@shopify/cli-kit";
-var version$2 = "1.0.5";
+var version$2 = "1.0.9";
 var description$1 = "A set of utilities, interfaces, and models that are common across all the platform features";
 var keywords = [
 	"shopify",
@@ -45509,6 +45524,7 @@ var os$1 = [
 	"win32"
 ];
 var dependencies$1 = {
+	"@oclif/core": "1.3.6",
 	open: "^8.4.0",
 	ngrok: "^4.3.1",
 	keytar: "^7.9.0"
@@ -45562,9 +45578,9 @@ var cliKitPackageJson = {
 	devDependencies: devDependencies
 };
 
-var version$1 = "1.0.5";
+var version$1 = "1.0.9";
 
-var version = "1.0.5";
+var version = "1.0.9";
 
 const constants = {
   environmentVariables: {
@@ -50721,7 +50737,7 @@ class Body$1 {
 			return formData;
 		}
 
-		const {toFormData} = await import('./multipart-parser-5ca14c7b.js');
+		const {toFormData} = await import('./multipart-parser-305a2ce9.js');
 		return toFormData(this.body, ct);
 	}
 
@@ -52479,6 +52495,8 @@ var http$1 = /*#__PURE__*/Object.freeze({
 	fetch: fetch$3
 });
 
+class InvalidGrantError extends Error {
+}
 async function exchangeCodeForAccessToken(codeData) {
   const clientId$1 = await clientId();
   const params = {
@@ -52544,10 +52562,15 @@ async function tokenRequest(params) {
   const url = new URL(`https://${fqdn}/oauth/token`);
   url.search = new URLSearchParams(Object.entries(params)).toString();
   const res = await fetch$3(url.href, { method: "POST" });
+  const payload = await res.json();
   if (!res.ok) {
-    throw new Abort(`HTTP ${res.status}`);
+    if (payload.error === "invalid_grant") {
+      throw new InvalidGrantError(payload.error_description);
+    } else {
+      throw new Abort(payload.error_description);
+    }
   }
-  return res.json();
+  return payload;
 }
 function buildIdentityToken(result) {
   return {
@@ -55654,7 +55677,15 @@ async function ensureAuthenticated(applications, env = process.env) {
   if (needFullAuth) {
     newSession = await executeCompleteFlow(applications, fqdn);
   } else if (sessionIsInvalid) {
-    newSession = await refreshTokens(fqdnSession.identity, applications, fqdn);
+    try {
+      newSession = await refreshTokens(fqdnSession.identity, applications, fqdn);
+    } catch (error) {
+      if (error instanceof InvalidGrantError) {
+        newSession = await executeCompleteFlow(applications, fqdn);
+      } else {
+        throw error;
+      }
+    }
   }
   const completeSession = { ...currentSession, ...newSession };
   await store$1(completeSession);
@@ -165696,5 +165727,5 @@ var checksum = /*#__PURE__*/Object.freeze({
 	validateMD5: validateMD5
 });
 
-export { FormData$2 as F, File$1 as a, string as b, os$2 as c, dependency as d, error$k as e, file$1 as f, git as g, environment as h, session as i, schema$1 as j, toml as k, tunnel as l, store as m, api as n, output$1 as o, path$q as p, http$1 as q, checksum as r, system as s, template as t, ui as u, version$3 as v, constants as w };
-//# sourceMappingURL=index-ade2d028.js.map
+export { FormData$2 as F, File$1 as a, string$2 as b, os$2 as c, dependency as d, error$k as e, file$1 as f, git as g, environment as h, session as i, schema$1 as j, toml as k, tunnel as l, store as m, api as n, output$1 as o, path$q as p, http$1 as q, checksum as r, system as s, template as t, ui as u, version$3 as v, constants as w };
+//# sourceMappingURL=index-73f2dc55.js.map