@swell/cli 2.0.12 → 2.0.14

package/dist/commands/app/dev.d.ts

@@ -7,10 +7,10 @@ export default class AppDev extends PushAppCommand {
         'no-push': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         port: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
+    static summary: string;
     static delayOrientation: boolean;
     static orientation: {
         env: string;
     };
-    static summary: string;
     run(): Promise<void>;
 }

package/dist/commands/app/dev.js

@@ -17,11 +17,11 @@ export default class AppDev extends PushAppCommand {
             description: 'for storefront apps, prompt to select a storefront to preview',
         }),
     };
+    static summary = `Run an app in dev mode from your local machine.`;
     static delayOrientation = true;
     static orientation = {
         env: 'test',
     };
-    static summary = `Run an app in dev mode from your local machine.`;
     async run() {
         await this.config.runCommand('app:frontend:dev', this.argv);
     }

package/dist/commands/app/push.d.ts

@@ -6,11 +6,11 @@ export default class AppPush extends PushAppCommand {
     static description: string;
     static examples: string[];
     static flags: any;
+    static summary: string;
     static delayOrientation: boolean;
     static orientation: {
         env: string;
     };
-    static summary: string;
     resolvePushPaths(file: string): {
         filePath: string;
         relativePath: string;

package/dist/commands/app/push.js

@@ -38,11 +38,11 @@ ${Object.values(ConfigPaths)
             description: 'skip deploying app frontend',
         }),
     };
+    static summary = 'Push local files to your Swell app.';
     static delayOrientation = true;
     static orientation = {
         env: 'test',
     };
-    static summary = 'Push local files to your Swell app.';
     resolvePushPaths(file) {
         // Join the appPath and file to get the absolute filePath
         const filePath = path.resolve(process.cwd(), file);

package/dist/commands/create/app.d.ts

@@ -1,5 +1,6 @@
 import { CreateAppCommand } from '../../create-app-command.js';
 export default class CreateApp extends CreateAppCommand {
+    appType: string;
     static args: {
         id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
@@ -9,7 +10,6 @@ export default class CreateApp extends CreateAppCommand {
         description: string;
     }[];
     static flags: any;
-    appType: string;
     createSwellConfig({ allowOverwrite, inputId, inputStorefrontApp, inputType, inputYes, nestedPath, }: {
         allowOverwrite?: boolean;
         inputId: string;

package/dist/commands/create/app.js

@@ -7,6 +7,7 @@ import { newConfig, swellConfigFileExists } from '../../lib/app-config.js';
 import { toAppId, toAppName } from '../../lib/create/index.js';
 import style from '../../lib/style.js';
 export default class CreateApp extends CreateAppCommand {
+    appType = '';
     static args = {
         id: Args.string({
             default: '',
@@ -45,7 +46,6 @@ export default class CreateApp extends CreateAppCommand {
             options: ['admin', 'integration', 'storefront', 'theme'],
         }),
     };
-    appType = '';
     async createSwellConfig({ allowOverwrite = true, inputId, inputStorefrontApp, inputType, inputYes, nestedPath = true, }) {
         let confirmYes = inputYes;
         const type = inputType ||

package/dist/commands/theme/dev.d.ts

@@ -1,5 +1,6 @@
 import { PushAppCommand } from '../../push-app-command.js';
 export default class AppThemeDev extends PushAppCommand {
+    appType: string;
     static examples: string[];
     static flags: {
         bundle: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
@@ -11,7 +12,6 @@ export default class AppThemeDev extends PushAppCommand {
         env: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     static summary: string;
-    appType: string;
     logAppLocalUrl(storeId: string, sessionId: string): void;
     run(): Promise<void>;
     private findAndInstallDependencies;

package/dist/commands/theme/dev.js

@@ -10,6 +10,7 @@ import style from '../../lib/style.js';
 import { PushAppCommand } from '../../push-app-command.js';
 const FALLBACK_PORT = 3000;
 export default class AppThemeDev extends PushAppCommand {
+    appType = 'theme';
     static examples = [
         'swell theme dev',
         'swell theme dev --local',
@@ -44,7 +45,6 @@ export default class AppThemeDev extends PushAppCommand {
         }),
     };
     static summary = `Run a theme in dev mode from your local machine.`;
-    appType = 'theme';
     logAppLocalUrl(storeId, sessionId) {
         this.log(`View it at ${style.link(this.localFrontendUrl(storeId, sessionId))}\n`);
     }

package/dist/commands/theme/init.d.ts

@@ -1,9 +1,9 @@
 import InitApp from '../app/init.js';
 export default class InitTheme extends InitApp {
+    appType: string;
     static description: string;
     static examples: {
         command: string;
         description: string;
     }[];
-    appType: string;
 }

package/dist/commands/theme/init.js

@@ -1,5 +1,6 @@
 import InitApp from '../app/init.js';
 export default class InitTheme extends InitApp {
+    appType = 'theme';
     static description = 'Initialize theme swell.json in the current directory.';
     static examples = [
         {
@@ -11,5 +12,4 @@ export default class InitTheme extends InitApp {
             description: 'Initialize theme and accept all default values.',
         },
     ];
-    appType = 'theme';
 }

package/dist/commands/theme/pull.d.ts

@@ -1,5 +1,6 @@
 import AppPull from '../app/pull.js';
 export default class AppThemePull extends AppPull {
+    appType: string;
     static args: {
         appId: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
         targetPath: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
@@ -14,6 +15,6 @@ export default class AppThemePull extends AppPull {
         'sync-app': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;
-    appType: string;
+    static delayOrientation: boolean;
     run(): Promise<void>;
 }

package/dist/commands/theme/pull.js

@@ -3,6 +3,7 @@ import { ThemeConfigPaths } from '../../lib/apps/index.js';
 import style from '../../lib/style.js';
 import AppPull from '../app/pull.js';
 export default class AppThemePull extends AppPull {
+    appType = 'theme';
     static args = {
         appId: Args.string({
             default: '',
@@ -52,7 +53,7 @@ ${Object.values(ThemeConfigPaths)
         }),
     };
     static summary = 'Pull theme files from Swell to your local machine.';
-    appType = 'theme';
+    static delayOrientation = true;
     async run() {
         const { args, flags } = await this.parse(AppThemePull);
         const { force } = flags;

package/dist/commands/theme/push.d.ts

@@ -1,5 +1,6 @@
 import AppPush from '../app/push.js';
 export default class AppThemePush extends AppPush {
+    appType: string;
     static args: {
         file: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
     };
@@ -13,6 +14,5 @@ export default class AppThemePush extends AppPush {
         'sync-app': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;
-    appType: string;
     run(): Promise<void>;
 }

package/dist/commands/theme/push.js

@@ -4,6 +4,7 @@ import { default as localConfig } from '../../lib/config.js';
 import style from '../../lib/style.js';
 import AppPush from '../app/push.js';
 export default class AppThemePush extends AppPush {
+    appType = 'theme';
     static args = {
         file: Args.string({
             char: 'f',
@@ -55,7 +56,6 @@ ${Object.values(ThemeConfigPaths)
         }),
     };
     static summary = 'Push local files to your Swell theme.';
-    appType = 'theme';
     async run() {
         const { args, flags } = await this.parse(AppThemePush);
         const { file } = args;

package/dist/push-app-command.js

@@ -171,7 +171,8 @@ export class PushAppCommand extends RemoteAppCommand {
             this.error('App type not supported for storefront creation');
         }
         let name;
-        if (hasOtherStorefronts) {
+        // Leave name blank when syncing theme app to avoid blocking push
+        if (hasOtherStorefronts && !this.themeSyncApp) {
             name = await input({
                 default: this.app.name,
                 message: 'Name your storefront',
@@ -475,7 +476,9 @@ export class PushAppCommand extends RemoteAppCommand {
             const storefronts = await this.getAllAppStorefronts({
                 type: this.appType,
             });
-            if (storefronts.count > 0) {
+            // Choose storefront if multiple storefronts exist
+            // Except if we are syncing a theme app, then force create new storefront if not found
+            if (storefronts.count > 0 && !this.themeSyncApp) {
                 storefrontId = await select({
                     choices: [
                         ...storefronts.results.map((storefront) => ({
@@ -653,8 +656,8 @@ export class PushAppCommand extends RemoteAppCommand {
             isPathDirectory(path.resolve(process.cwd(), resolvedAppId))) {
             resolvedPath = resolvedAppId;
         }
-        // Reset app config and path if appId is provided
-        if (resolvedPath && this.appPath === '.') {
+        // Reset app path if appId is provided
+        if (resolvedPath && this.appPath === process.cwd()) {
             this.appPath = path.resolve(process.cwd(), resolvedPath);
         }
         return this.appPath;

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

@@ -5,11 +5,11 @@ import { App, AppConfig, AppVersion } from './lib/apps/index.js';
  * configurations.
  */
 export declare abstract class RemoteAppCommand extends AppCommand {
+    appType: string;
     static delayOrientation: boolean;
     static orientation: AppCommandOrientation;
     app: App;
     appCreated: boolean;
-    appType: string;
     storefront?: any;
     storefrontLocalUrl?: string;
     themeSyncApp?: boolean;

package/dist/remote-app-command.js

@@ -15,6 +15,7 @@ import style from './lib/style.js';
  * configurations.
  */
 export class RemoteAppCommand extends AppCommand {
+    appType = 'any';
     // allows child commands to set orientation
     static delayOrientation = false;
     // most of the times this will be the target environment
@@ -23,7 +24,6 @@ export class RemoteAppCommand extends AppCommand {
     app = {};
     // Indicates the app was created during the command execution
     appCreated = false;
-    appType = 'any';
     // API instance of the target storefront, if applicable
     storefront = null;
     // Indicates we are syncing with a local app frontend via proxy
@@ -631,7 +631,13 @@ export class RemoteAppCommand extends AppCommand {
         const orientationOutput = [];
         const currentStore = localConfig.getDefaultStore();
         const { env, store } = flags;
-        orientationOutput.push(`[${this.app.type === 'theme' ? 'theme' : 'app'}] ${style.appName(this.app.name)}${this.app.version ? ` v${this.app.version}` : ''}`);
+        if (this.app.name) {
+            // Show theme version if not syncing app
+            const version = !this.themeSyncApp && this.app.type === 'theme' && this.storefront?.theme_version
+                ? this.storefront?.theme_version
+                : this.app.version;
+            orientationOutput.push(`[${this.app.type === 'theme' ? 'theme' : 'app'}] ${style.appName(this.app.name)}${version ? ` v${version}` : ''}`);
+        }
         if (store) {
             orientationOutput.push(`[store] ${style.storeId(store)}`);
         }

package/oclif.manifest.json

@@ -1691,7 +1691,8 @@
         "commands",
         "theme",
         "pull.js"
-      ]
+      ],
+      "delayOrientation": true
     },
     "theme:push": {
       "aliases": [],
@@ -1890,5 +1891,5 @@
       ]
     }
   },
-  "version": "2.0.12"
+  "version": "2.0.14"
 }

package/package.json

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