@swell/cli 2.3.1 → 2.3.2

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

@@ -16,7 +16,10 @@ export default class AppDev extends PushAppCommand {
     functionErrors: Map<string, string>;
     functionPorts: Map<string, number>;
     tmpDir: string;
+    frontendPort: number | null;
+    isCleaningUp: boolean;
     run(): Promise<void>;
+    private cleanupOnExit;
     runAppFrontendDevIfApplicable(frontendPort?: number): Promise<number | void>;
     private createFunctionRouter;
     private createTmpDirectory;

package/dist/commands/app/dev.js

@@ -46,6 +46,10 @@ export default class AppDev extends PushAppCommand {
     functionPorts = new Map();
     // Directory for compiled function files and wrangler context
     tmpDir = '';
+    // Port for frontend dev server (used for routing non-function requests)
+    frontendPort = null;
+    // Guard against multiple cleanup calls
+    isCleaningUp = false;
     async run() {
         const { flags } = await this.parse(AppDev);
         const { port, 'frontend-port': frontendPort } = flags;
@@ -62,6 +66,21 @@ export default class AppDev extends PushAppCommand {
         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));
+    }
+    async cleanupOnExit() {
+        if (this.isCleaningUp)
+            return;
+        this.isCleaningUp = true;
+        try {
+            await this.updateLocalProxy(null, this.storefront?.id);
+        }
+        catch {
+            // Ignore errors during cleanup
+        }
+        // Note: proxy.ts signal handlers will call process.exit()
     }
     async runAppFrontendDevIfApplicable(frontendPort) {
         const projectType = this.getFrontendProjectType(false);
@@ -70,6 +89,8 @@ export default class AppDev extends PushAppCommand {
             this.argv.push('--app-dev');
             // add proxy-port flag (use provided port or auto-detect)
             const proxyPort = frontendPort || (await getPort({ port: portNumbers(4000, 4100) }));
+            // 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);
             return proxyPort;
@@ -111,6 +132,24 @@ export default class AppDev extends PushAppCommand {
                 });
                 req.pipe(proxyReq);
             }
+            else if (this.frontendPort) {
+                // Proxy non-function requests to frontend dev server
+                const proxyReq = http.request({
+                    hostname: 'localhost',
+                    port: this.frontendPort,
+                    path: req.url,
+                    method: req.method,
+                    headers: req.headers,
+                }, (proxyRes) => {
+                    res.writeHead(proxyRes.statusCode, proxyRes.headers);
+                    proxyRes.pipe(res);
+                });
+                proxyReq.on('error', (error) => {
+                    res.writeHead(502);
+                    res.end(`Frontend dev server error: ${error.message}`);
+                });
+                req.pipe(proxyReq);
+            }
             else {
                 res.writeHead(404);
                 const functionError = this.functionErrors.get(functionName);

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

@@ -26,7 +26,7 @@ export default class AppFrontendDev extends PushAppCommand {
         }),
         'app-dev': Flags.boolean({
             description: 'indicates frontend app is running in app dev mode',
-            default: true,
+            default: false,
         }),
     };
     static orientation = {
@@ -57,7 +57,11 @@ export default class AppFrontendDev extends PushAppCommand {
         if (!isAppDev) {
             this.log(`Starting app dev server...\n`);
         }
-        const serverPort = await this.startProxyServer(proxyPort || port);
+        // When running as child of `swell app dev`, don't create a new tunnel.
+        // The parent command already created the tunnel and handles routing.
+        const serverPort = isAppDev && proxyPort
+            ? proxyPort
+            : await this.startProxyServer(proxyPort || port);
         await this.execFrontendProject(serverPort, isAppDev);
     }
     async execFrontendProject(serverPort, isAppDev) {

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

@@ -80,7 +80,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     setWatchingFiles(): Promise<void>;
     startProxyServer(port?: number): Promise<number>;
     updateFrontendDeployment(currentStore: string, projectType: FrontendProjectType, deploymentUrl: string, deploymentHash: string): Promise<void>;
-    updateLocalProxy(proxyUrl: string, storefrontId?: string): Promise<void>;
+    updateLocalProxy(proxyUrl: string | null, storefrontId?: string): Promise<void>;
     watchForChanges({ logChanges, onChange, syncAll, }?: {
         logChanges?: boolean;
         onChange?: (appConfig?: AppConfig, result?: any) => void;

package/oclif.manifest.json

@@ -2875,5 +2875,5 @@
       ]
     }
   },
-  "version": "2.3.1"
+  "version": "2.3.2"
 }

package/package.json

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