@swell/cli 2.9.12 → 2.9.14

package/dist/commands/app/push.js

@@ -17,8 +17,8 @@ type to an app in your store's test environment.
 If the app does not exist, it will be created and its global ID saved to a .swellrc file.
 
 - If no file is specified, all configuration files will be pushed to the store.
-  This includes the app icon (assets/icon.png), cover image (assets/image.png),
-  and swell.json.
+  This includes the app icon (assets/icon.png), screenshots (assets/screenshots/),
+  README.md, and swell.json.
 - If a file is specified, only that file will be pushed to the store.
 - If a directory is specified, only files in that directory will be pushed.
 

package/dist/commands/app/version.js

@@ -140,15 +140,26 @@ behavior by using the --no-git-tag option.`;
         spinner.start('Creating version');
         try {
             await this.createRemoteVersion(nextVersion, message, spinner, forceCreateFiles);
-            await this.gitCommit(message);
-            if (!noGitTag)
-                await this.gitTag(nextVersion);
         }
         catch (error) {
             spinner.fail(error.stderr || error.message);
             return;
         }
         spinner.succeed(`${style.appConfigValue(this.app.name)} version ${nextVersion} created.`);
+        // git is optional: commit and tag only when the app is inside a repository
+        if (await git.find({ cwd: this.appPath })) {
+            try {
+                await this.gitCommit(message);
+                if (!noGitTag)
+                    await this.gitTag(nextVersion);
+            }
+            catch (error) {
+                this.log(style.funcWarn(`Git commit/tag failed: ${(error.stderr || error.message).trim()}`));
+            }
+        }
+        else {
+            this.log(style.dim('Not a git repository, skipping git commit and tag.'));
+        }
     }
     async createRemoteVersion(nextVersion, message, spinner, forceCreateFiles = false) {
         const body = {
@@ -173,23 +184,24 @@ behavior by using the --no-git-tag option.`;
         this.swellConfig.set('version', nextVersion);
     }
     async gitCommit(message) {
+        const cwd = this.appPath;
         // check if there are changes in the app config file
         // if there are no changes, there is nothing to commit
         const configStatus = await git.spawn(['status', this.swellConfig.path], {
-            cwd: this.swellConfig.cwd,
+            cwd,
         });
         if (configStatus.stdout.includes('nothing to commit')) {
             return;
         }
         // add the app config file to commit - this will contain the new version
-        await git.spawn(['add', this.swellConfig.path]);
+        await git.spawn(['add', this.swellConfig.path], { cwd });
         // commit the version change to git. It skips the git hooks with -n
-        await git.spawn(['commit', '-n', '-m', message]);
+        await git.spawn(['commit', '-n', '-m', message], { cwd });
     }
     async gitTag(nextVersion) {
         const tag = nextVersion;
         // tag the version in git
-        await git.spawn(['tag', tag], { cwd: process.cwd() });
+        await git.spawn(['tag', tag], { cwd: this.appPath });
     }
     validateAndComputeVersion(nextVersion, localVersion) {
         let version = nextVersion;

package/dist/commands/login.js

@@ -46,6 +46,10 @@ have available for logging in to.
         const [sessionId, storeId] = await getSessionIdOrLoginInBrowser(store);
         await this.api.setStoreEnv(storeId);
         user = await this.api.get({ adminPath: 'user' }, { sessionId });
+        const authorization = user?.authorizations?.find((authorization) => authorization.client_id === storeId);
+        if (authorization?.client_inactive === true) {
+            this.error(`Store "${storeId}" has been deactivated and cannot be used with the CLI. Reactivate it in the dashboard or run \`swell login --force\` to choose another store.`, { exit: 1 });
+        }
         await this.getAndSetStoreConfig({ sessionId, storeId });
         await modifyDefaultStore({ currentStoreId, storeId }, force);
         config.setUser(user);

package/dist/lib/apps/index.d.ts

@@ -16,7 +16,6 @@ export interface App {
         [key: string]: string;
     };
     configs?: AppConfig[];
-    cover_image?: unknown;
     date_created?: string;
     date_updated?: string;
     demo_url?: string;
@@ -39,6 +38,10 @@ export interface App {
         title: string;
     }>;
     id?: string;
+    images?: Array<{
+        file?: unknown;
+        id: string;
+    }>;
     installed?: {
         date_created: string;
         id: string;

package/dist/lib/sessions.js

@@ -32,6 +32,7 @@ function createServer(onSessionId, storeId) {
         },
         async onStart(loginUrl) {
             spinner.start([
+                'Complete login in your browser. Press Ctrl+C to cancel.',
                 "Open this link if your browser doesn't launch it automatically:",
                 `${style.link(loginUrl)}`,
             ].join(' '));

package/dist/types/index.d.ts

@@ -72,6 +72,7 @@ export interface User {
 export interface UserAuthorization {
     client_id: string;
     client_name: string;
+    client_inactive?: boolean;
 }
 export interface App {
     id: string;

package/oclif.manifest.json

@@ -1180,7 +1180,7 @@
           "name": "file"
         }
       },
-      "description": "Push all app files, a specific file, or a specific configuration\ntype to an app in your store's test environment.\n\nIf the app does not exist, it will be created and its global ID saved to a .swellrc file.\n\n- If no file is specified, all configuration files will be pushed to the store.\n  This includes the app icon (assets/icon.png), cover image (assets/image.png),\n  and swell.json.\n- If a file is specified, only that file will be pushed to the store.\n- If a directory is specified, only files in that directory will be pushed.\n\nApp file directories:\nassets/\ncontent/\nfrontend/\ncomponents/\nfunctions/\nmodels/\nnotifications/\nsettings/\ntheme/\nwebhooks/",
+      "description": "Push all app files, a specific file, or a specific configuration\ntype to an app in your store's test environment.\n\nIf the app does not exist, it will be created and its global ID saved to a .swellrc file.\n\n- If no file is specified, all configuration files will be pushed to the store.\n  This includes the app icon (assets/icon.png), screenshots (assets/screenshots/),\n  README.md, and swell.json.\n- If a file is specified, only that file will be pushed to the store.\n- If a directory is specified, only files in that directory will be pushed.\n\nApp file directories:\nassets/\ncontent/\nfrontend/\ncomponents/\nfunctions/\nmodels/\nnotifications/\nsettings/\ntheme/\nwebhooks/",
       "examples": [
         "swell app push",
         "swell app push content",
@@ -3594,5 +3594,5 @@
       ]
     }
   },
-  "version": "2.9.12"
+  "version": "2.9.14"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.9.12",
+  "version": "2.9.14",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [