@swell/cli 2.5.2 → 2.5.4

package/dist/commands/app/dev.js

@@ -69,12 +69,12 @@ export default class AppDev extends PushAppCommand {
         this.saveCurrentStorefront();
         const spinner = ora();
         spinner.start(`Starting app dev server...\n`);
-        const serverPort = await this.startProxyServer(port);
-        await this.startAppFunctionServer(spinner, serverPort);
-        await this.runAppFrontendDevIfApplicable(frontendPort);
         // Register cleanup handlers to clear local proxy on exit
         process.on('SIGINT', this.cleanupOnExit.bind(this));
         process.on('SIGTERM', this.cleanupOnExit.bind(this));
+        const serverPort = await this.startProxyServer(port);
+        await this.startAppFunctionServer(spinner, serverPort);
+        await this.runAppFrontendDevIfApplicable(frontendPort);
     }
     async cleanupOnExit() {
         if (this.isCleaningUp)
@@ -86,7 +86,9 @@ export default class AppDev extends PushAppCommand {
         catch {
             // Ignore errors during cleanup
         }
-        // Note: proxy.ts signal handlers will call process.exit()
+        this.log();
+        // eslint-disable-next-line no-process-exit
+        process.exit();
     }
     async runAppFrontendDevIfApplicable(frontendPort) {
         const projectType = this.getFrontendProjectType(false);
@@ -98,7 +100,12 @@ export default class AppDev extends PushAppCommand {
             // Store frontend port for function router to use for fallback routing
             this.frontendPort = proxyPort;
             this.argv.push('--proxy-port', String(proxyPort));
-            this.config.runCommand('app:frontend:dev', this.argv);
+            this.config.runCommand('app:frontend:dev', this.argv).catch((error) => {
+                // SIGTERM/SIGINT during dev server shutdown is expected
+                if (error?.signal === 'SIGTERM' || error?.signal === 'SIGINT')
+                    return;
+                this.error(error);
+            });
             return proxyPort;
         }
     }
@@ -302,10 +309,24 @@ ENVIRONMENT = "development"
     async startAppFunctionServer(spinner, serverPort) {
         // Get all functions in this app
         const functions = await this.getAppFunctions();
+        const projectType = this.getFrontendProjectType(false);
+        const shouldLogPreviewUrl = this.app.type === 'storefront' && !projectType;
         if (functions.length === 0) {
+            if (!projectType && this.app.type !== 'storefront') {
+                spinner.stop();
+                this.log(`No functions or frontend detected. Exiting.\n`);
+                await this.cleanupOnExit();
+                return;
+            }
             // Create routing server to proxy requests to frontend even without functions
             await this.createFunctionRouter(serverPort);
-            spinner.stop();
+            if (shouldLogPreviewUrl) {
+                spinner.succeed(`App dev server running on port ${serverPort}\n`);
+                this.logLocalPreviewUrl();
+            }
+            else {
+                spinner.stop();
+            }
             return;
         }
         // Create TMP directory for wrangler configs and bundled functions
@@ -322,6 +343,9 @@ ENVIRONMENT = "development"
         this.log(`${style.appConfigName(`Functions:`)}`);
         await this.logAllFunctions(functions);
         this.log(`${style.success('→')} Call functions at: http://localhost:${serverPort}/<function-name>\n`);
+        if (shouldLogPreviewUrl) {
+            this.logLocalPreviewUrl();
+        }
     }
     async startFunctionServers(functions) {
         const functionStatus = new Map();

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

@@ -15,7 +15,6 @@ export default class AppFrontendDev extends PushAppCommand {
         env: string;
     };
     static summary: string;
-    logAppLocalUrl(storeId: string, sessionId: string): void;
     run(): Promise<void>;
     private execFrontendProject;
 }

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

@@ -1,7 +1,5 @@
 import { Flags } from '@oclif/core';
 import { CUSTOM_FRAMEWORK_SLUG, getManualDevHint, getProjectCommands, } from '../../../lib/apps/index.js';
-import { default as localConfig } from '../../../lib/config.js';
-import style from '../../../lib/style.js';
 import { PushAppCommand } from '../../../push-app-command.js';
 import AppDev from '../dev.js';
 export default class AppFrontendDev extends PushAppCommand {
@@ -37,12 +35,6 @@ export default class AppFrontendDev extends PushAppCommand {
         env: 'test',
     };
     static summary = `Run a frontend app in dev mode from your local machine.`;
-    logAppLocalUrl(storeId, sessionId) {
-        const frontendAppRoute = this.app.type === 'storefront' && this.app.storefront?.external
-            ? `/${this.app.private_id}`
-            : '';
-        this.log(`View it at ${style.link(`${this.localFrontendUrl(storeId, sessionId)}${frontendAppRoute}`)}\n`);
-    }
     async run() {
         const { flags } = await this.parse(AppFrontendDev);
         const { port, 'proxy-port': proxyPort, 'app-dev': isAppDev } = flags;
@@ -66,7 +58,12 @@ export default class AppFrontendDev extends PushAppCommand {
         const serverPort = isAppDev && proxyPort
             ? proxyPort
             : await this.startProxyServer(proxyPort || port);
-        await this.execFrontendProject(serverPort, isAppDev);
+        await this.execFrontendProject(serverPort, isAppDev).catch((error) => {
+            // SIGTERM/SIGINT during dev server shutdown is expected
+            if (error?.signal === 'SIGTERM' || error?.signal === 'SIGINT')
+                return;
+            throw error;
+        });
     }
     async execFrontendProject(serverPort, isAppDev) {
         const projectType = this.getFrontendProjectType(!isAppDev);
@@ -76,13 +73,11 @@ export default class AppFrontendDev extends PushAppCommand {
         // Manual mode for unrecognized frameworks
         if (projectType.slug === CUSTOM_FRAMEWORK_SLUG) {
             const hintCommand = getManualDevHint(this.appPath, serverPort);
-            const currentStore = localConfig.getDefaultStore();
-            const sessionId = localConfig.getSessionId(currentStore);
             this.log(`Detected a frontend project but could not identify the framework.`);
             this.log(`Start your dev server manually on port ${serverPort}:\n`);
             this.log(`  cd frontend && ${hintCommand}\n`);
             this.log(`The Swell tunnel is ready and will route traffic once your server is running.\n`);
-            this.logAppLocalUrl(currentStore, sessionId);
+            this.logLocalPreviewUrl();
             if (!isAppDev) {
                 this.watchForChanges();
             }
@@ -92,7 +87,6 @@ export default class AppFrontendDev extends PushAppCommand {
         }
         // Get commands transformed for the detected package manager
         const { devCommand } = getProjectCommands(this.appPath, projectType);
-        const currentStore = localConfig.getDefaultStore();
         let serverReadyDetected = false;
         await this.execFrontend(devCommand.replace('${PORT}', String(serverPort)), (string) => {
             // Shared: Hide Vite noise output common across frameworks
@@ -117,8 +111,7 @@ export default class AppFrontendDev extends PushAppCommand {
                         (/✓ ready in \d+/i.test(string) || /✓ starting/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);
+                        setTimeout(() => this.logLocalPreviewUrl(), 100);
                         if (!isAppDev) {
                             this.watchForChanges();
                         }
@@ -135,8 +128,7 @@ export default class AppFrontendDev extends PushAppCommand {
                         /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);
+                        setTimeout(() => this.logLocalPreviewUrl(), 100);
                         if (!isAppDev) {
                             this.watchForChanges();
                         }
@@ -154,8 +146,7 @@ export default class AppFrontendDev extends PushAppCommand {
                             /watch mode enabled/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);
+                        setTimeout(() => this.logLocalPreviewUrl(), 100);
                         if (!isAppDev) {
                             this.watchForChanges();
                         }
@@ -171,8 +162,7 @@ export default class AppFrontendDev extends PushAppCommand {
                         if (!serverReadyDetected) {
                             serverReadyDetected = true;
                             this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
-                            const sessionId = localConfig.getSessionId(currentStore);
-                            setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
+                            setTimeout(() => this.logLocalPreviewUrl(), 100);
                             if (!isAppDev) {
                                 this.watchForChanges();
                             }
@@ -184,8 +174,7 @@ export default class AppFrontendDev extends PushAppCommand {
                         /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);
+                        setTimeout(() => this.logLocalPreviewUrl(), 100);
                         if (!isAppDev) {
                             this.watchForChanges();
                         }
@@ -203,8 +192,7 @@ export default class AppFrontendDev extends PushAppCommand {
                     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);
+                        setTimeout(() => this.logLocalPreviewUrl(), 100);
                         if (!isAppDev) {
                             this.watchForChanges();
                         }

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

@@ -37,5 +37,14 @@ export declare abstract class CreateAppCommand extends SwellCommand {
     };
     setupPackage(name: string, config: any, pkg: PackageManager): Promise<void>;
     tryPackageSetup(name: string, config: any, pkg: PackageManager): Promise<void>;
+    /**
+     * Fix wrangler.jsonc `main` field when it points to a build artifact that
+     * doesn't exist at dev time. The @cloudflare/vite-plugin validates this path
+     * at startup and crashes during `astro dev` if it can't resolve it.
+     *
+     * Only replaces the exact legacy value that C3 currently scaffolds.
+     * Once C3 updates its template, this becomes a no-op.
+     */
+    private fixAstroWranglerEntrypoint;
     private addFrontendAllowedHosts;
 }

package/dist/create-app-command.js

@@ -14,7 +14,7 @@ import style from './lib/style.js';
 import { SwellCommand } from './swell-command.js';
 const execAsync = promisify(exec);
 /** Allowed hosts for tunnel providers used in local development */
-const TUNNEL_ALLOWED_HOSTS = ['.ngrok.app', '.loca.lt', '.trycloudflare.com'];
+const TUNNEL_ALLOWED_HOSTS = ['.trycloudflare.com', '.swell.store'];
 /**
  * Find the closing brace position for a config function call (e.g., defineConfig, defineNuxtConfig).
  * Uses brace counting to find the matching `}` for the opening `{`.
@@ -477,12 +477,37 @@ export class CreateAppCommand extends SwellCommand {
             this.log(`There was an error setting up the package manager: ${error.message}`);
         }
     }
+    /**
+     * Fix wrangler.jsonc `main` field when it points to a build artifact that
+     * doesn't exist at dev time. The @cloudflare/vite-plugin validates this path
+     * at startup and crashes during `astro dev` if it can't resolve it.
+     *
+     * Only replaces the exact legacy value that C3 currently scaffolds.
+     * Once C3 updates its template, this becomes a no-op.
+     */
+    async fixAstroWranglerEntrypoint(configPath) {
+        const filePath = path.join(configPath, 'frontend', 'wrangler.jsonc');
+        let content;
+        try {
+            content = await fs.readFile(filePath, 'utf8');
+        }
+        catch {
+            return;
+        }
+        const legacy = '"main": "./dist/_worker.js/index.js"';
+        if (!content.includes(legacy)) {
+            return;
+        }
+        const updated = content.replace(legacy, '"main": "@astrojs/cloudflare/entrypoints/server"');
+        await fs.writeFile(filePath, updated, 'utf8');
+    }
     async addFrontendAllowedHosts(projectType, configPath) {
         // Configure allowedHosts for frameworks using Vite dev server
         // This allows tunneling services (ngrok, localtunnel) to proxy requests to the local dev environment
         switch (projectType.slug) {
             case 'astro': {
                 await this.addAllowedHostsToAstro(configPath);
+                await this.fixAstroWranglerEntrypoint(configPath);
                 break;
             }
             case 'angular': {

package/dist/lib/apps/index.js

@@ -368,7 +368,9 @@ export function batchAppFilesByType(configs) {
     for (const configType of ConfigTypeBatchOrder) {
         const configsByType = sorted.filter((config) => config.type === configType);
         const label = configType === ConfigType.FILE ? 'App files' : titleize(configType);
-        const concurrency = configType === ConfigType.NOTIFICATION || configType === ConfigType.ASSET
+        const concurrency = configType === ConfigType.NOTIFICATION ||
+            configType === ConfigType.ASSET ||
+            configType === ConfigType.SETTING
             ? 1
             : PUSH_CONCURRENCY;
         batches.push({

package/dist/lib/theme-sync.js

@@ -58,18 +58,19 @@ export class ThemeSync {
                 proxyReq.setHeader('swell-request-id', `${Date.now()}`);
             });
             this.proxy.on('proxyRes', (proxyRes, req, res) => {
-                let body = Buffer.from('');
+                const chunks = [];
                 proxyRes.on('data', (chunk) => {
-                    body = Buffer.concat([body, chunk]);
+                    chunks.push(chunk);
                 });
                 // Preserve headers
                 for (let i = 0; i < proxyRes.rawHeaders.length; i += 2) {
                     const header = proxyRes.rawHeaders[i];
                     res.setHeader(header, proxyRes.rawHeaders[i + 1]);
                 }
-                // Use utf8 encoding for the response
-                res.setHeader('Content-Encoding', 'utf8');
+                res.removeHeader('Content-Encoding');
                 proxyRes.on('end', async () => {
+                    const body = Buffer.concat(chunks);
+                    chunks.length = 0;
                     const html = await this.parseRequestBody(proxyRes, body);
                     if (this.shouldInjectScript(proxyRes, html)) {
                         const modifiedHtml = this.injectScript(html, `localhost:${this.options.port}`);

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

@@ -11,6 +11,7 @@ interface WatchingChange {
 }
 export declare abstract class PushAppCommand extends RemoteAppCommand {
     frontendPath: string;
+    hasLoggedLocalPreviewUrl: boolean;
     logWatchChanges: boolean;
     onWatchChange?: (appConfig?: AppConfig, action?: string, result?: any) => void;
     watchingChangeQueue: Map<string, WatchingChange>;
@@ -78,6 +79,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     resolveAppPath(appId?: string, targetPath?: string): string;
     runWatchChangeQueue(): Promise<void>;
     saveCurrentStorefront(): void;
+    logLocalPreviewUrl(): void;
     setWatchingFiles(): Promise<void>;
     startProxyServer(port?: number): Promise<number>;
     updateFrontendDeployment(currentStore: string, projectType: FrontendProjectType, deploymentUrl: string, deploymentHash: string): Promise<void>;

package/dist/push-app-command.js

@@ -20,6 +20,7 @@ const WATCH_WINDOW_MS = 100;
 const DEV_SERVER_FALLBACK_PORT = 3000;
 export class PushAppCommand extends RemoteAppCommand {
     frontendPath = '';
+    hasLoggedLocalPreviewUrl = false;
     logWatchChanges = true;
     onWatchChange;
     watchingChangeQueue = new Map();
@@ -778,6 +779,18 @@ export class PushAppCommand extends RemoteAppCommand {
             localConfig.setDefaultStorefront(this.appPath, this.storefront.id, this.api.envId);
         }
     }
+    logLocalPreviewUrl() {
+        if (this.hasLoggedLocalPreviewUrl) {
+            return;
+        }
+        const currentStore = localConfig.getDefaultStore();
+        const sessionId = localConfig.getSessionId(currentStore);
+        const frontendAppRoute = this.app.type === 'storefront' && this.app.storefront?.external
+            ? `/${this.app.private_id}`
+            : '';
+        this.log(`View it at ${style.link(`${this.localFrontendUrl(currentStore, sessionId)}${frontendAppRoute}`)}\n`);
+        this.hasLoggedLocalPreviewUrl = true;
+    }
     async setWatchingFiles() {
         this.watchingFiles = new Set(await globAllFilesByPath(this.appPath));
     }

package/oclif.manifest.json

@@ -2969,5 +2969,5 @@
       ]
     }
   },
-  "version": "2.5.2"
+  "version": "2.5.4"
 }

package/package.json

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