@shopify/cli-kit 3.0.21 → 3.0.22

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @shopify/cli-kit
 
+## 3.0.22
+
+### Patch Changes
+
+- 7f32e9ac: Add an interface to delete the global store
+- 7f32e9ac: Make sure the user has a partner organization associated to the session
+
 ## 3.0.21
 
 ## 3.0.20

package/dist/{index-21b8e2fe.js → index-12e22439.js}

@@ -7156,7 +7156,7 @@ var path$w = /*#__PURE__*/Object.freeze({
 });
 
 var name = "@shopify/cli-kit";
-var version$2 = "3.0.21";
+var version$2 = "3.0.22";
 var description$1 = "A set of utilities, interfaces, and models that are common across all the platform features";
 var keywords = [
 	"shopify",
@@ -7207,13 +7207,13 @@ var os$7 = [
 var dependencies$1 = {
 	"@oclif/core": "^1.0",
 	envfile: "^6.17.0",
+	fastify: "^4.0.0-rc.4",
 	inquirer: "^8.2.4",
 	keytar: "^7.9.0",
 	open: "^8.4.0",
 	prettier: "^2.6.2",
 	"source-map-support": "^0.5.21",
-	stacktracey: "^2.1.8",
-	fastify: "^4.0.0-rc.4"
+	stacktracey: "^2.1.8"
 };
 var devDependencies = {
 	"@iarna/toml": "^2.2.5",
@@ -7254,6 +7254,7 @@ var devDependencies = {
 	tempy: "^2.0.0",
 	"term-size": "^3.0.1",
 	"terminal-link": "^3.0.0",
+	"ts-error": "^1.0.6",
 	vitest: "^0.15.1",
 	zod: "^3.17.3"
 };
@@ -8389,6 +8390,45 @@ var utilities = /*#__PURE__*/Object.freeze({
 	isTruthy: isTruthy$1
 });
 
+class ExtendableError extends Error {
+  constructor(...params) {
+    super(...params);
+    var message =
+      params.length > 0 && typeof params[0] === "string" ? params[0] : "";
+
+    // Replace Error with ClassName of the constructor, if it has not been overwritten already
+    if (this.name === undefined || this.name === "Error") {
+      Object.defineProperty(this, "name", {
+        configurable: true,
+        enumerable: false,
+        value: this.constructor.name,
+        writable: true,
+      });
+    }
+
+    Object.defineProperty(this, "message", {
+      configurable: true,
+      enumerable: false,
+      value: message,
+      writable: true,
+    });
+
+    Object.defineProperty(this, "stack", {
+      configurable: true,
+      enumerable: false,
+      value: "",
+      writable: true,
+    });
+
+    // Maintains proper stack trace for where our error was thrown (only available on V8)
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    } else if (this.stack === "") {
+      this.stack = new Error(message).stack;
+    }
+  }
+}
+
 sourceMapSupport.install();
 class CancelExecution extends Error {
 }
@@ -8460,6 +8500,7 @@ var error$k = /*#__PURE__*/Object.freeze({
 	mapper: mapper$1,
 	isFatal: isFatal,
 	shouldReport: shouldReport,
+	ExtendableError: ExtendableError,
 	AbortSignal: AbortSignal
 });
 
@@ -10530,7 +10571,7 @@ const fs$t = gracefulFs$1;
 const u$7 = universalify$1.fromCallback;
 const rimraf$2 = rimraf_1$1;
 
-function remove$7 (path, callback) {
+function remove$8 (path, callback) {
   // Node 14.14.0+
   if (fs$t.rm) return fs$t.rm(path, { recursive: true, force: true }, callback)
   rimraf$2(path, callback);
@@ -10543,7 +10584,7 @@ function removeSync$1 (path) {
 }
 
 var remove_1 = {
-  remove: u$7(remove$7),
+  remove: u$7(remove$8),
   removeSync: removeSync$1
 };
 
@@ -10551,7 +10592,7 @@ const u$6 = universalify$1.fromPromise;
 const fs$s = fs$C;
 const path$q = require$$0$2;
 const mkdir$4 = mkdirs$2;
-const remove$6 = remove_1;
+const remove$7 = remove_1;
 
 const emptyDir = u$6(async function emptyDir (dir) {
   let items;
@@ -10561,7 +10602,7 @@ const emptyDir = u$6(async function emptyDir (dir) {
     return mkdir$4.mkdirs(dir)
   }
 
-  return Promise.all(items.map(item => remove$6.remove(path$q.join(dir, item))))
+  return Promise.all(items.map(item => remove$7.remove(path$q.join(dir, item))))
 });
 
 function emptyDirSync (dir) {
@@ -10574,7 +10615,7 @@ function emptyDirSync (dir) {
 
   items.forEach(item => {
     item = path$q.join(dir, item);
-    remove$6.removeSync(item);
+    remove$7.removeSync(item);
   });
 }
 
@@ -11140,7 +11181,7 @@ var json$2 = jsonFile;
 const fs$l = gracefulFs$1;
 const path$k = require$$0$2;
 const copy$1 = copy$2.copy;
-const remove$5 = remove_1.remove;
+const remove$6 = remove_1.remove;
 const mkdirp = mkdirs$2.mkdirp;
 const pathExists$2 = pathExists_1.pathExists;
 const stat$1 = stat$4;
@@ -11178,7 +11219,7 @@ function isParentRoot$1 (dest) {
 function doRename$1 (src, dest, overwrite, isChangingCase, cb) {
   if (isChangingCase) return rename$1(src, dest, overwrite, cb)
   if (overwrite) {
-    return remove$5(dest, err => {
+    return remove$6(dest, err => {
       if (err) return cb(err)
       return rename$1(src, dest, overwrite, cb)
     })
@@ -11205,7 +11246,7 @@ function moveAcrossDevice$1 (src, dest, overwrite, cb) {
   };
   copy$1(src, dest, opts, err => {
     if (err) return cb(err)
-    return remove$5(src, cb)
+    return remove$6(src, cb)
   });
 }
 
@@ -13395,7 +13436,7 @@ function mkdirSync(path) {
   debug$5(content`Sync-reating directory at ${token.path(path)}...`);
   fs$j.mkdirpSync(path);
 }
-async function remove$4(path) {
+async function remove$5(path) {
   debug$5(content`Removing file at ${token.path(path)}...`);
   await fs$j.remove(path);
 }
@@ -13471,7 +13512,7 @@ var file$1 = /*#__PURE__*/Object.freeze({
 	append: append$2,
 	mkdir: mkdir,
 	mkdirSync: mkdirSync,
-	remove: remove$4,
+	remove: remove$5,
 	rmdir: rmdir,
 	mkTmpDir: mkTmpDir,
 	isDirectory: isDirectory,
@@ -14326,7 +14367,7 @@ function content(strings, ...keys) {
           output += colors$9.bold(colors$9.yellow(stringifyMessage(enumToken.value)));
           break;
         case 3 /* Path */:
-          output += colors$9.cyan(relativize(stringifyMessage(enumToken.value)));
+          output += relativize(stringifyMessage(enumToken.value));
           break;
         case 2 /* Json */:
           try {
@@ -14461,7 +14502,8 @@ ${padding}${colors$9.bold("What to try:")}
 ${padding}${colors$9.bold("Stack trace:")}`;
       const stackLines = stack.asTable({}).split("\n");
       for (const stackLine of stackLines) {
-        outputString += `${padding}${stackLine}`;
+        outputString += `${padding}${stackLine}
+`;
       }
     }
   }
@@ -16815,6 +16857,11 @@ async function page(filename) {
   const [command, ...args] = [...executable.split(" "), filename];
   await exec$2(command, args, { stdout: "inherit", stdin: "inherit" });
 }
+async function sleep(seconds) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, 1e3 * seconds);
+  });
+}
 
 var system = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -16822,7 +16869,8 @@ var system = /*#__PURE__*/Object.freeze({
 	captureOutput: captureOutput,
 	exec: exec$2,
 	concurrentExec: concurrentExec,
-	page: page
+	page: page,
+	sleep: sleep
 });
 
 const SpinInstanceNotFound = (spinInstance, error) => {
@@ -21876,7 +21924,7 @@ class Body$1 {
 			return formData;
 		}
 
-		const {toFormData} = await import('./multipart-parser-6958f711.js');
+		const {toFormData} = await import('./multipart-parser-7996d1f9.js');
 		return toFormData(this.body, ct);
 	}
 
@@ -45576,7 +45624,7 @@ async function nonEmptyDirectoryPrompt(directory) {
     if (choice.value === "abort") {
       throw new AbortSilent();
     }
-    remove$4(directory);
+    remove$5(directory);
   }
 }
 const keypress = async () => {
@@ -57647,6 +57695,9 @@ const cliKit = new Conf({
   projectName: "shopify-cli-kit",
   projectVersion: cliKitPackageJson.version
 });
+function remove$4() {
+  cliKit.clear();
+}
 function getAppInfo(directory) {
   debug$5(content`Reading cached app information for directory ${token.path(directory)}...`);
   const apps = cliKit.get("appInfo") ?? [];
@@ -57693,6 +57744,7 @@ function setThemeStore(store) {
 var store$2 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	cliKit: cliKit,
+	remove: remove$4,
 	getAppInfo: getAppInfo,
 	setAppInfo: setAppInfo,
 	clearAppInfo: clearAppInfo,
@@ -154316,6 +154368,12 @@ var index = /*#__PURE__*/Object.freeze({
 	FindOrganizationBasicQuery: FindOrganizationBasicQuery
 });
 
+class RequestClientError extends ExtendableError {
+  constructor(message, statusCode) {
+    super(message);
+    this.statusCode = statusCode;
+  }
+}
 async function request(query, token$1, variables) {
   const fqdn = await partners$1();
   const url = `https://${fqdn}/api/cli/graphql`;
@@ -154335,14 +154393,14 @@ ${sanitizedHeadersOutput(headers)}
     return response;
   } catch (error) {
     if (error instanceof dist$3.ClientError) {
-      const errorMessage = content`
+      const errorMessage = stringifyMessage(content`
 The Partners GraphQL API responded unsuccessfully with the HTTP status ${`${error.response.status}`} and errors:
 
 ${token.json(error.response.errors)}
-      `;
-      const abortError = new Abort(errorMessage);
-      abortError.stack = error.stack;
-      throw abortError;
+      `);
+      const mappedError = new RequestClientError(errorMessage, error.response.status);
+      mappedError.stack = error.stack;
+      throw mappedError;
     } else {
       throw error;
     }
@@ -154385,6 +154443,7 @@ async function functionProxyRequest(apiKey, query, token, variables) {
 
 var partners = /*#__PURE__*/Object.freeze({
 	__proto__: null,
+	RequestClientError: RequestClientError,
 	request: request,
 	checkIfTokenIsRevoked: checkIfTokenIsRevoked,
 	functionProxyRequest: functionProxyRequest
@@ -164598,6 +164657,9 @@ const NoSessionError = new Bug("No session found after ensuring authenticated");
 const MissingPartnerTokenError = new Bug("No partners token found after ensuring authenticated");
 const MissingAdminTokenError = new Bug("No admin token found after ensuring authenticated");
 const MissingStorefrontTokenError = new Bug("No storefront token found after ensuring authenticated");
+const PartnerOrganizationNotFoundError = () => {
+  return new Abort(`Couldn't find your Shopify Partners organization`, `Have you confirmed your accounts from the emails you received?`);
+};
 async function ensureAuthenticatedPartners(scopes = [], env = process.env) {
   debug$5(content`Ensuring that the user is authenticated with the Partners API with the following scopes:
 ${token.json(scopes)}
@@ -164669,8 +164731,47 @@ ${token.json(applications)}
   if (envToken && applications.partnersApi) {
     tokens.partners = (await exchangeCustomPartnerToken(envToken)).accessToken;
   }
+  if (!envToken && tokens.partners) {
+    await ensureUserHasPartnerAccount(tokens.partners);
+  }
   return tokens;
 }
+async function hasPartnerAccount(partnersToken) {
+  try {
+    await request(dist$3.gql`
+        {
+          organizations(first: 1) {
+            nodes {
+              id
+            }
+          }
+        }
+      `, partnersToken);
+    return true;
+  } catch (error) {
+    if (error instanceof RequestClientError && error.statusCode === 404) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+}
+async function ensureUserHasPartnerAccount(partnersToken) {
+  debug$5(content`Verifying that the user has a Partner organization`);
+  if (!await hasPartnerAccount(partnersToken)) {
+    info(`
+A Shopify Partners organization is needed to proceed.`);
+    info(`\u{1F449} Press any key to create one`);
+    await keypress();
+    open(`https://partners.shopify.com/signup`);
+    info(content`👉 Press any key when you have ${token.cyan("created the organization")}`);
+    warn(content`Make sure you've confirmed your Shopify and the Partner organization from the email`);
+    await keypress();
+    if (!await hasPartnerAccount(partnersToken)) {
+      throw PartnerOrganizationNotFoundError();
+    }
+  }
+}
 async function executeCompleteFlow(applications, identityFqdn2) {
   const scopes = getFlattenScopes(applications);
   const exchangeScopes = getExchangeScopes(applications);
@@ -164748,10 +164849,13 @@ function logout() {
 
 var session = /*#__PURE__*/Object.freeze({
 	__proto__: null,
+	PartnerOrganizationNotFoundError: PartnerOrganizationNotFoundError,
 	ensureAuthenticatedPartners: ensureAuthenticatedPartners,
 	ensureAuthenticatedStorefront: ensureAuthenticatedStorefront,
 	ensureAuthenticatedAdmin: ensureAuthenticatedAdmin,
 	ensureAuthenticated: ensureAuthenticated,
+	hasPartnerAccount: hasPartnerAccount,
+	ensureUserHasPartnerAccount: ensureUserHasPartnerAccount,
 	logout: logout
 });
 
@@ -175187,4 +175291,4 @@ var yaml = /*#__PURE__*/Object.freeze({
 });
 
 export { semver$2 as A, session as B, store$2 as C, string as D, system as E, FormData$3 as F, template as G, temporary as H, toml as I, ui as J, version as K, vscode as L, yaml as M, File$1 as a, abort$3 as b, constants$2 as c, analytics as d, api as e, archiver as f, checksum as g, cli as h, dependency as i, dotEnv as j, environment as k, error$k as l, file$1 as m, git as n, github as o, haiku as p, http$2 as q, id as r, npm as s, os$3 as t, output as u, path$w as v, plugins as w, port as x, ruby as y, schema$1 as z };
-//# sourceMappingURL=index-21b8e2fe.js.map
+//# sourceMappingURL=index-12e22439.js.map