@swell/cli 2.9.8 → 2.9.9

package/dist/commands/app/push.js

@@ -17,7 +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) and swell.json.
+  This includes the app icon (assets/icon.png), cover image (assets/image.png),
+  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/release.d.ts

@@ -11,6 +11,5 @@ export default class AppRelease extends PushAppCommand {
     };
     static summary: string;
     run(): Promise<void>;
-    validateReleaseDetails(): void;
     private validateCreateVersion;
 }

package/dist/commands/app/release.js

@@ -53,7 +53,7 @@ The app must be connected to a partner account with access to publish.`;
         }),
         yes: Flags.boolean({
             char: 'y',
-            description: 'skip confirmation prompt',
+            description: 'skip confirmation prompts, including unstaging another staged version',
         }),
     };
     static orientation = {
@@ -82,6 +82,20 @@ The app must be connected to a partner account with access to publish.`;
         if (appVersion.released && !amend) {
             throw new Error(`Version ${appVersion.version} has already been released. Use --amend to update version details.`);
         }
+        const stagedVersion = this.app.staged_props?.version;
+        const hasOtherStagedVersion = !amend && stagedVersion && stagedVersion !== appVersion.version;
+        if (hasOtherStagedVersion) {
+            this.log(style.funcWarn(`Version ${stagedVersion} is currently staged. Releasing version ${appVersion.version} will unstage it.`));
+            if (!yes) {
+                const continueUnstage = await confirm({
+                    default: false,
+                    message: `Continue?`,
+                });
+                if (!continueUnstage) {
+                    return;
+                }
+            }
+        }
         const releaseData = {
             description: message || appVersion.description,
             release_notes: releaseNotesFile ? releaseNotes : appVersion.release_notes,
@@ -108,22 +122,6 @@ The app must be connected to a partner account with access to publish.`;
         }, spinner);
         spinner.succeed(`${style.appConfigValue(this.app.name)} release ${appVersion.version} ${amend ? 'updated' : 'released'}.`);
     }
-    validateReleaseDetails() {
-        if (!this.app.description) {
-            throw new Error('App must have a description');
-        }
-        const requiresPreviewImages = this.app.type === 'storefront' &&
-            (!this.app.kind || this.app.kind === 'shop') &&
-            this.app.storefront?.theme.provider !== 'app';
-        if (requiresPreviewImages) {
-            if (!this.app.preview_image) {
-                throw new Error('Storefront app must have a preview image to release');
-            }
-        }
-        else if (this.app.type !== 'theme' && !this.app.logo_icon) {
-            throw new Error('App must have a logo icon to release');
-        }
-    }
     async validateCreateVersion(inputVersion, flags) {
         let version = inputVersion;
         if (!version) {
@@ -132,7 +130,7 @@ The app must be connected to a partner account with access to publish.`;
                 throw new Error('No version specified');
             }
         }
-        this.validateReleaseDetails();
+        // Mandatory app details are validated server-side when the version is released.
         let appVersion = await this.getVersion(version);
         if (!appVersion) {
             if (flags.amend) {

package/dist/lib/app-config.js

@@ -12,6 +12,9 @@ const schema = {
     integrations: { type: 'array' },
     name: { type: 'string' },
     permissions: { type: 'array' },
+    price: { type: 'number', minimum: 0 },
+    price_external: { type: 'boolean' },
+    price_interval: { type: 'string', enum: ['once', 'monthly'] },
     storefront: { type: 'object' },
     theme: { type: 'object' },
     type: { type: 'string' },

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

@@ -16,9 +16,12 @@ export interface App {
         [key: string]: string;
     };
     configs?: AppConfig[];
+    cover_image?: unknown;
     date_created?: string;
     date_updated?: string;
+    demo_url?: string;
     description?: string;
+    documentation_url?: string;
     extensions?: any[];
     features?: string[];
     frontend?: {
@@ -29,6 +32,7 @@ export interface App {
         service?: string;
         url?: string;
     };
+    full_description?: string;
     highlights?: Array<{
         id: string;
         image_src?: unknown;
@@ -45,10 +49,19 @@ export interface App {
     owned?: boolean;
     preview_image?: unknown;
     preview_mobile_image?: unknown;
+    price?: number;
+    price_external?: boolean;
+    price_interval?: 'once' | 'monthly';
+    preview_video_url?: string;
     private_id?: string;
     public_id?: string;
     published?: boolean;
     purchase_options?: string[];
+    repository_url?: string;
+    staged_props?: {
+        [key: string]: any;
+        version?: string;
+    };
     storefront?: {
         [key: string]: any;
     };
@@ -60,6 +73,8 @@ export interface App {
         preview_image?: unknown;
         preview_mobile_image?: unknown;
     }>;
+    support_email?: string;
+    support_url?: string;
     theme?: {
         [key: string]: any;
     };
@@ -74,6 +89,9 @@ export declare enum SwellJsonFields {
     KIND = "kind",
     NAME = "name",
     PERMISSIONS = "permissions",
+    PRICE = "price",
+    PRICE_EXTERNAL = "price_external",
+    PRICE_INTERVAL = "price_interval",
     STOREFRONT = "storefront",
     THEME = "theme",
     TYPE = "type",

package/dist/lib/apps/index.js

@@ -15,6 +15,9 @@ export var SwellJsonFields;
     SwellJsonFields["KIND"] = "kind";
     SwellJsonFields["NAME"] = "name";
     SwellJsonFields["PERMISSIONS"] = "permissions";
+    SwellJsonFields["PRICE"] = "price";
+    SwellJsonFields["PRICE_EXTERNAL"] = "price_external";
+    SwellJsonFields["PRICE_INTERVAL"] = "price_interval";
     SwellJsonFields["STOREFRONT"] = "storefront";
     SwellJsonFields["THEME"] = "theme";
     SwellJsonFields["TYPE"] = "type";

package/dist/push-app-command.d.ts

@@ -26,7 +26,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     createAppStorefront(hasOtherStorefronts?: boolean, nonInteractive?: boolean): Promise<any>;
     deployAppFrontend(force?: boolean, log?: boolean): Promise<void>;
     deployFrontend(projectType: FrontendProjectType): Promise<string>;
-    ensureAppExists(file?: string, shouldCreate?: boolean): Promise<boolean>;
+    ensureAppExists(file?: string, shouldCreate?: boolean, force?: boolean): Promise<boolean>;
     ensureLoggedIn(): Promise<void>;
     exec(command: string, cwd?: string, onOutput?: (string: string) => any | false): Promise<void>;
     execFrontend(command: string, onOutput?: (string: string) => any | false): Promise<void>;

package/dist/push-app-command.js

@@ -282,7 +282,7 @@ export class PushAppCommand extends RemoteAppCommand {
             this.error(`Error deploying frontend: ${error.message}`);
         }
     }
-    async ensureAppExists(file, shouldCreate = true) {
+    async ensureAppExists(file, shouldCreate = true, force = false) {
         const klass = this.ctor;
         const currentStore = localConfig.getDefaultStore();
         await this.ensureLoggedIn();
@@ -311,14 +311,14 @@ export class PushAppCommand extends RemoteAppCommand {
         // If app exists but owned by another client, create a new instance
         if (app?.client_id && app.client_id !== currentStore) {
             // Create a new app
-            this.app = await this.getCreateUpdateApp();
+            this.app = await this.getCreateUpdateApp(undefined, force);
             if (!this.app) {
                 return false;
             }
         }
         else if (!file) {
             // Update existing app if not targeting a file
-            this.app = await this.getCreateUpdateApp(app);
+            this.app = await this.getCreateUpdateApp(app, force);
         }
         return true;
     }

package/dist/remote-app-command.d.ts

@@ -24,7 +24,7 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     protected getApp(id?: string): Promise<App>;
     protected getAppWithConfig(id?: string): Promise<App>;
     getConfigData(configId: string): Promise<any>;
-    protected getCreateUpdateApp(updateApp?: App | null): Promise<App>;
+    protected getCreateUpdateApp(updateApp?: App | null, force?: boolean): Promise<App>;
     protected getInstalledApp(): Promise<any>;
     protected getLocalAppConfigs(): Promise<AppConfig[]>;
     protected getVersion(version?: null | string | undefined): Promise<AppVersion>;

package/dist/remote-app-command.js

@@ -172,7 +172,7 @@ export class RemoteAppCommand extends AppCommand {
             adminPath: `/apps/${this.app.id}/configs/${configId}/data`,
         }, { query: { ...(themeId ? { theme_id: themeId } : undefined) } });
     }
-    async getCreateUpdateApp(updateApp) {
+    async getCreateUpdateApp(updateApp, force = false) {
         const spinner = ora();
         let sourceApp;
         try {
@@ -195,6 +195,9 @@ export class RemoteAppCommand extends AppCommand {
                 ? { private_id: this.swellConfig.store.id }
                 : undefined),
             ...(sourceApp?.id ? { source_id: sourceApp.id } : undefined),
+            // Overwrite name/description/logo_icon on the server
+            // instead of only filling them in when empty
+            ...(force ? { $force_meta: true } : undefined),
         };
         const appLabel = this.app.type === 'theme' ? 'theme' : 'app';
         let app = updateApp || {};

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) 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), 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/",
       "examples": [
         "swell app push",
         "swell app push content",
@@ -1285,7 +1285,7 @@
         },
         "yes": {
           "char": "y",
-          "description": "skip confirmation prompt",
+          "description": "skip confirmation prompts, including unstaging another staged version",
           "name": "yes",
           "allowNo": false,
           "type": "boolean"
@@ -3594,5 +3594,5 @@
       ]
     }
   },
-  "version": "2.9.8"
+  "version": "2.9.9"
 }

package/package.json

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