@swell/cli 2.0.20 → 2.2.0

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

@@ -1,12 +1,14 @@
-import { FrontendProjectType } from '../../../lib/apps/index.js';
 import { PushAppCommand } from '../../../push-app-command.js';
 export default class AppFrontendDev extends PushAppCommand {
     static examples: string[];
     static flags: {
-        '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>;
+        'proxy-port': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        'app-dev': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        '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>;
+        'frontend-port': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     static orientation: {
         env: string;
@@ -14,6 +16,5 @@ export default class AppFrontendDev extends PushAppCommand {
     static summary: string;
     logAppLocalUrl(storeId: string, sessionId: string): void;
     run(): Promise<void>;
-    startDevServer(projectType: FrontendProjectType, port?: number): Promise<void>;
-    updateLocalProxy(proxyUrl: string, spinner: any, storefrontId?: string): Promise<void>;
+    private execFrontendProject;
 }

package/dist/commands/app/frontend/dev.js

@@ -1,26 +1,21 @@
 import { Flags } from '@oclif/core';
-import getPort, { portNumbers } from 'get-port';
-import ngrok from 'ngrok';
-import ora from 'ora';
 import { default as localConfig } from '../../../lib/config.js';
 import style from '../../../lib/style.js';
 import { PushAppCommand } from '../../../push-app-command.js';
-const FALLBACK_PORT = 3000;
+import AppDev from '../dev.js';
 export default class AppFrontendDev extends PushAppCommand {
     static examples = [
         'swell app frontend dev',
         'swell app frontend dev --no-push',
-        'swell app frontend dev --port 3000',
+        'swell app frontend dev --proxy-port 3000',
         'swell app frontend dev --storefront-select',
         'swell app frontend dev --storefront-id <id>',
     ];
     static flags = {
-        'no-push': Flags.boolean({
-            description: 'skip pushing app files initially',
-        }),
-        port: Flags.integer({
-            char: 'p',
-            description: 'override the default port to run the app locally',
+        ...AppDev.flags,
+        'proxy-port': Flags.integer({
+            description: 'specify the port for an existing frontend proxy',
+            default: 3001,
         }),
         'storefront-id': Flags.string({
             description: 'identify a storefront to preview with and push theme files to',
@@ -29,6 +24,10 @@ export default class AppFrontendDev extends PushAppCommand {
             default: false,
             description: 'prompt to select a storefront to preview with',
         }),
+        'app-dev': Flags.boolean({
+            description: 'indicates frontend app is running in app dev mode',
+            default: true,
+        }),
     };
     static orientation = {
         env: 'test',
@@ -42,12 +41,12 @@ export default class AppFrontendDev extends PushAppCommand {
     }
     async run() {
         const { flags } = await this.parse(AppFrontendDev);
-        const { port } = flags;
+        const { port, 'proxy-port': proxyPort, 'app-dev': isAppDev } = flags;
         const noPush = flags['no-push'];
         if (!(await this.ensureAppExists(undefined, false))) {
             return;
         }
-        if (!noPush) {
+        if (!noPush && !isAppDev) {
             await this.pushAppConfigs();
         }
         if (this.app.type === 'storefront') {
@@ -55,54 +54,124 @@ export default class AppFrontendDev extends PushAppCommand {
             this.logStorefrontConnected();
         }
         this.saveCurrentStorefront();
-        const projectType = this.getFrontendProjectType();
-        await this.startDevServer(projectType, port);
+        if (!isAppDev) {
+            this.log(`Starting app dev server...\n`);
+        }
+        const serverPort = await this.startProxyServer(proxyPort || port);
+        await this.execFrontendProject(serverPort, isAppDev);
     }
-    async startDevServer(projectType, port) {
+    async execFrontendProject(serverPort, isAppDev) {
+        const projectType = this.getFrontendProjectType(!isAppDev);
+        if (!projectType) {
+            return;
+        }
         const currentStore = localConfig.getDefaultStore();
-        const spinner = ora();
-        // Find an open port starting at 3000
-        const freePort = port ||
-            (await getPort({ port: portNumbers(3000, 3100) })) ||
-            FALLBACK_PORT;
-        this.log(`Starting ${projectType.name} dev server...\n`);
-        // Start ngrok proxy
-        const proxyUrl = await ngrok.connect({
-            addr: freePort,
-            region: 'us', // TODO: make it configurable
-        });
-        await this.updateLocalProxy(proxyUrl, spinner, this.storefront?.id);
-        return this.exec(projectType.devCommand.replace('${PORT}', String(freePort)), (string) => {
-            // Hide useless astro warning about image optimization
-            if (string.includes('The current configuration does not support image optimization')) {
-                return false;
-            }
-            // Hide useless astro warning about .dev.vars
-            if (string.includes('There is no `.dev.vars` file')) {
-                return false;
-            }
-            // Hide astro localhost URL/network as it can confuse the user
-            if (string.includes('┃ Local') || string.includes('┃ Network')) {
-                return false;
-            }
-            // Started, show app url (TODO for nextjs)
-            if (string.includes('watching for file changes')) {
-                spinner.succeed(`Started ${projectType.name} dev server on port ${freePort}.\n`);
-                const sessionId = localConfig.getSessionId(currentStore);
-                setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
-                this.watchForChanges();
+        let serverReadyDetected = false;
+        await this.execFrontend(projectType.devCommand.replace('${PORT}', String(serverPort)), (string) => {
+            // Framework-specific output handling and ready detection
+            switch (projectType.slug) {
+                case 'nextjs': {
+                    // 1. NOISE FILTER: Hide unwanted output
+                    if (string.includes('Using vars defined in .dev.vars')) {
+                        return false;
+                    }
+                    // 2. URL FILTER: Hide localhost/network URLs (confusing - users should use Swell tunnel)
+                    if (/- local:\s+http:\/\//i.test(string) ||
+                        /- network:\s+http:\/\//i.test(string) ||
+                        /ready on http:\/\/localhost/i.test(string)) {
+                        return false;
+                    }
+                    // 3. READY DETECTION: Detect server ready, show our message
+                    if (!serverReadyDetected &&
+                        (/✓ ready in \d+/.test(string) || /✓ starting/.test(string))) {
+                        serverReadyDetected = true;
+                        this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
+                        const sessionId = localConfig.getSessionId(currentStore);
+                        setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
+                        if (!isAppDev) {
+                            this.watchForChanges();
+                        }
+                    }
+                    break;
+                }
+                case 'astro': {
+                    // 2. URL FILTER: Hide localhost/network URLs (confusing - users should use Swell tunnel)
+                    if (string.includes('┃ Local') || string.includes('┃ Network')) {
+                        return false;
+                    }
+                    // 3. READY DETECTION: Detect server ready, show our message
+                    if (!serverReadyDetected &&
+                        /watching for file changes/i.test(string)) {
+                        serverReadyDetected = true;
+                        this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
+                        const sessionId = localConfig.getSessionId(currentStore);
+                        setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
+                        if (!isAppDev) {
+                            this.watchForChanges();
+                        }
+                    }
+                    break;
+                }
+                case 'angular': {
+                    // 1. NOISE FILTER: Hide unwanted output
+                    if (string.includes('press h + enter to show help')) {
+                        return false;
+                    }
+                    // 2. URL FILTER: Hide localhost/network URLs (confusing - users should use Swell tunnel)
+                    if (/➜\s+local:\s+http:\/\//i.test(string)) {
+                        return false;
+                    }
+                    // 3. READY DETECTION: Detect server ready, show our message
+                    if (!serverReadyDetected &&
+                        (/application bundle generation complete/.test(string) ||
+                            /watch mode enabled/.test(string))) {
+                        serverReadyDetected = true;
+                        this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
+                        const sessionId = localConfig.getSessionId(currentStore);
+                        setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
+                        if (!isAppDev) {
+                            this.watchForChanges();
+                        }
+                    }
+                    break;
+                }
+                case 'hono': {
+                    // 2. URL FILTER: Hide localhost URLs (confusing - users should use Swell tunnel)
+                    // Note: For Hono, the ready signal IS the URL line, so we handle both in section 3
+                    // 3. READY DETECTION: Detect server ready, show our message, hide the URL
+                    if (!serverReadyDetected &&
+                        /ready on http:\/\/localhost:\d+/i.test(string)) {
+                        serverReadyDetected = true;
+                        this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
+                        const sessionId = localConfig.getSessionId(currentStore);
+                        setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
+                        if (!isAppDev) {
+                            this.watchForChanges();
+                        }
+                        return false; // Hide the "Ready on localhost" line
+                    }
+                    break;
+                }
+                case 'nuxt': {
+                    // 2. URL FILTER: Hide localhost/network URLs (confusing - users should use Swell tunnel)
+                    if (/➜ local:\s+http:\/\//i.test(string) ||
+                        /➜ network:/i.test(string)) {
+                        return false;
+                    }
+                    // 3. READY DETECTION: Detect server ready, show our message
+                    if (!serverReadyDetected && /nuxt \d+\.\d+\.\d+/i.test(string)) {
+                        serverReadyDetected = true;
+                        this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
+                        const sessionId = localConfig.getSessionId(currentStore);
+                        setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
+                        if (!isAppDev) {
+                            this.watchForChanges();
+                        }
+                    }
+                    break;
+                }
+                // No default
             }
         });
     }
-    async updateLocalProxy(proxyUrl, spinner, storefrontId) {
-        const storefront = this.app.type === 'storefront' &&
-            (await this.getAppStorefront({ storefront_id: storefrontId }));
-        await this.handleRequestErrors(async () => this.api.put({ adminPath: `/client/apps/${this.app.id}/local-proxy` }, {
-            body: {
-                proxy_url: proxyUrl,
-                storefront_id: storefront?.id || null,
-                storefront_slug: storefront?.slug || null,
-            },
-        }), () => spinner.fail('Error starting local proxy'));
-    }
 }

package/dist/commands/app/install.js

@@ -2,8 +2,8 @@ import { confirm } from '@inquirer/prompts';
 import { Flags } from '@oclif/core';
 import ora from 'ora';
 import * as semver from 'semver';
-import config from '../../lib/config.js';
 import { readRcFile } from '../../lib/app-config.js';
+import config from '../../lib/config.js';
 import { selectEnvironmentId, selectLoggedInStoreId, } from '../../lib/stores.js';
 import style from '../../lib/style.js';
 import { RemoteAppCommand } from '../../remote-app-command.js';
@@ -48,7 +48,7 @@ Without a store specified, install the app in the Live environment of the curren
         if (versions.length === 0) {
             this.error(`${version ? `Version ${version} not found` : 'No versions found'} for ${style.appConfigValue(this.app.name)} app. ${version
                 ? ''
-                : `Create a version with the ${style.command('swell version')} command first.`}`);
+                : `Create a version with the ${style.command('swell app version')} command first.`}`);
         }
         const versionToInstall = version
             ? versions.find((ver) => ver.version === version)?.version
@@ -129,7 +129,7 @@ Without a store specified, install the app in the Live environment of the curren
             const sourceApp = await readRcFile(this.swellRcPath());
             sourceAppId = sourceApp?.id;
         }
-        catch (error) {
+        catch {
             // noop
         }
         const existingSourcedApps = sourceAppId

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

@@ -13,6 +13,6 @@ export default class AppPull extends PushAppCommand {
         env: string;
     };
     static summary: string;
-    run(): Promise<void>;
     logPulledChanges(pulled: string[], removed: string[]): void;
+    run(): Promise<void>;
 }

package/dist/commands/app/pull.js

@@ -36,6 +36,12 @@ ${Object.values(ConfigPaths)
         env: 'test',
     };
     static summary = 'Pull app files from Swell to your local machine.';
+    logPulledChanges(pulled, removed) {
+        const typeLabel = this.appType === 'theme' ? 'theme' : 'app';
+        const changeCount = pulled.length + removed.length;
+        const pluralFiles = changeCount === 1 ? 'file' : 'files';
+        this.log(`Pulled ${changeCount} ${pluralFiles} from ${style.appConfigValue(this.app.name)} ${typeLabel} in ${style.path(path.resolve(this.appPath))}.`);
+    }
     async run() {
         const { args, flags } = await this.parse(AppPull);
         const { force } = flags;
@@ -44,10 +50,4 @@ ${Object.values(ConfigPaths)
         const { pulled, removed } = await this.pullAppConfigs(force);
         this.logPulledChanges(pulled, removed);
     }
-    logPulledChanges(pulled, removed) {
-        const typeLabel = this.appType === 'theme' ? 'theme' : 'app';
-        const changeCount = pulled.length + removed.length;
-        const pluralFiles = changeCount === 1 ? 'file' : 'files';
-        this.log(`Pulled ${changeCount} ${pluralFiles} from ${style.appConfigValue(this.app.name)} ${typeLabel} in ${style.path(path.resolve(this.appPath))}.`);
-    }
 }

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

@@ -3,15 +3,15 @@ export default class AppPush extends PushAppCommand {
     static args: {
         file: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
     };
+    static delayOrientation: boolean;
     static description: string;
     static examples: string[];
     static flags: any;
-    static summary: string;
-    static delayOrientation: boolean;
     static orientation: {
         env: string;
     };
-    resolvePushPaths(file: string): {
+    static summary: string;
+    resolvePushPaths(file: string, appPathFlag?: string): {
         filePath: string;
         relativePath: string;
     };

package/dist/commands/app/push.js

@@ -10,6 +10,7 @@ export default class AppPush extends PushAppCommand {
             description: 'relative path to a configuration file or directory to push',
         }),
     };
+    static delayOrientation = true;
     static description = `Push all app files, a specific file, or a specific configuration
 type to an app in your store's test environment.
 
@@ -38,14 +39,15 @@ ${Object.values(ConfigPaths)
             description: 'skip deploying app frontend',
         }),
     };
-    static summary = 'Push local files to your Swell app.';
-    static delayOrientation = true;
     static orientation = {
         env: 'test',
     };
-    resolvePushPaths(file) {
-        // Join the appPath and file to get the absolute filePath
-        const filePath = path.resolve(process.cwd(), file);
+    static summary = 'Push local files to your Swell app.';
+    resolvePushPaths(file, appPathFlag) {
+        // If --app-path was explicitly provided, resolve FILE relative to appPath
+        // Otherwise, resolve relative to cwd for better UX (tab completion)
+        const baseDir = appPathFlag ? this.appPath : process.cwd();
+        const filePath = path.resolve(baseDir, file);
         // Check if filePath is outside of appPath
         const relativePath = path.relative(this.appPath, filePath);
         if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
@@ -71,7 +73,7 @@ ${Object.values(ConfigPaths)
             return;
         }
         if (file) {
-            const { filePath, relativePath } = this.resolvePushPaths(file);
+            const { filePath, relativePath } = this.resolvePushPaths(file, flags['app-path']);
             // Push individual files if not referring to the whole app path
             if (filePath !== this.appPath) {
                 if (!filePathExists(filePath)) {

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

@@ -6,10 +6,10 @@ export default class AppRelease extends PushAppCommand {
     static description: string;
     static examples: string[];
     static flags: any;
-    static summary: string;
     static orientation: {
         env: string;
     };
+    static summary: string;
     run(): Promise<void>;
     validateReleaseDetails(): void;
     private validateCreateVersion;

package/dist/commands/app/release.js

@@ -56,10 +56,10 @@ The app must be connected to a partner account with access to publish.`;
             description: 'skip confirmation prompt',
         }),
     };
-    static summary = 'Release a new version of your an app for publishing to the App Store.';
     static orientation = {
         env: 'test',
     };
+    static summary = 'Release a new version of your an app for publishing to the App Store.';
     async run() {
         const { args, flags } = await this.parse(AppRelease);
         const { amend, message, 'not-supported': notSupported, 'release-notes': releaseNotesFile, yes, } = flags;

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

@@ -11,10 +11,10 @@ export default class AppVersion extends PushAppCommand {
         'no-git-tag': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
-    static summary: string;
     static orientation: {
         env: string;
     };
+    static summary: string;
     run(): Promise<void>;
     private createRemoteVersion;
     private gitCommit;

package/dist/commands/app/version.js

@@ -67,10 +67,10 @@ behavior by using the --no-git-tag option.`;
             description: 'skip confirmation prompt',
         }),
     };
-    static summary = 'Increment the version of your Swell app.';
     static orientation = {
         env: 'test',
     };
+    static summary = 'Increment the version of your Swell app.';
     async run() {
         const { args, flags } = await this.parse(AppVersion);
         const { amend, 'no-git-tag': noGitTag, yes } = flags;
@@ -96,7 +96,9 @@ behavior by using the --no-git-tag option.`;
         const latestVersion = await this.getVersion();
         const remoteVersion = latestVersion?.version;
         // Suggest the next version if not provided
-        if (!nextVersion && semver.gt(localVersion, remoteVersion)) {
+        if (!nextVersion &&
+            remoteVersion &&
+            semver.gt(localVersion, remoteVersion)) {
             nextVersion = localVersion;
         }
         // If the user didn't specify a version, show the latest one
@@ -187,7 +189,7 @@ behavior by using the --no-git-tag option.`;
             // increment the version
             version = semver.inc(localVersion, version);
         }
-        if (semver.lt(version, localVersion)) {
+        if (semver.lte(version, localVersion)) {
             this.error(`Version ${version} must be greater than the current version ${localVersion}.`);
         }
         return version;

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

@@ -1,6 +1,5 @@
 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>>;
     };
@@ -10,11 +9,18 @@ export default class CreateApp extends CreateAppCommand {
         description: string;
     }[];
     static flags: any;
-    createSwellConfig({ allowOverwrite, inputId, inputStorefrontApp, inputType, inputYes, nestedPath, }: {
+    appType: string;
+    createSwellConfig({ allowOverwrite, inputId, inputStorefrontApp, inputType, inputName, inputVersion, inputDescription, inputFrontend, inputIntegrationType, inputIntegrationId, inputYes, nestedPath, }: {
         allowOverwrite?: boolean;
+        inputDescription?: string;
+        inputFrontend?: string;
         inputId?: string;
+        inputIntegrationId?: string;
+        inputIntegrationType?: string;
+        inputName?: string;
         inputStorefrontApp?: string;
         inputType?: string;
+        inputVersion?: string;
         inputYes?: boolean;
         nestedPath?: boolean;
     }): Promise<{
@@ -22,6 +28,7 @@ export default class CreateApp extends CreateAppCommand {
         config: any;
         installedStorefrontApp: any;
         swellConfigJson: {
+            extensions?: any[] | undefined;
             theme: {
                 storefront: {
                     app: string;
@@ -33,6 +40,7 @@ export default class CreateApp extends CreateAppCommand {
             type: string;
             version: string;
         } | {
+            extensions?: any[] | undefined;
             permissions: never[];
             description: string;
             id: string;