@swell/cli 2.5.4 → 2.5.6

package/bin/run.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env ts-node
+#!/usr/bin/env node
 
 // eslint-disable-next-line unicorn/prefer-top-level-await, node/shebang
 (async () => {

package/dist/commands/app/dev.js

@@ -66,6 +66,10 @@ export default class AppDev extends PushAppCommand {
         if (!noPush) {
             await this.pushAppConfigs();
         }
+        // Ensure storefront is resolved for local preview URL (may not be set with --no-push)
+        if (this.app.type === 'storefront' && !this.storefront) {
+            this.storefront = await this.getAppStorefront({});
+        }
         this.saveCurrentStorefront();
         const spinner = ora();
         spinner.start(`Starting app dev server...\n`);
@@ -87,7 +91,7 @@ export default class AppDev extends PushAppCommand {
             // Ignore errors during cleanup
         }
         this.log();
-        // eslint-disable-next-line no-process-exit
+        // eslint-disable-next-line no-process-exit, unicorn/no-process-exit
         process.exit();
     }
     async runAppFrontendDevIfApplicable(frontendPort) {
@@ -100,7 +104,9 @@ 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).catch((error) => {
+            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;

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

@@ -13,7 +13,7 @@ export default class AppThemeDev extends PushAppCommand {
     };
     static summary: string;
     appType: string;
-    logAppLocalUrl(storeId: string, sessionId: string): void;
+    logAppLocalUrl(storeId: string, localId: string): void;
     run(): Promise<void>;
     private findAndInstallDependencies;
     private findAndTryScriptCommands;

package/dist/commands/theme/dev.js

@@ -48,8 +48,8 @@ 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`);
+    logAppLocalUrl(storeId, localId) {
+        this.log(`View it at ${style.link(this.localFrontendUrl(storeId, localId))}\n`);
     }
     async run() {
         const { flags } = await this.parse(AppThemeDev);
@@ -62,12 +62,11 @@ export default class AppThemeDev extends PushAppCommand {
         if (!(await this.ensureAppExists(undefined, false))) {
             return;
         }
+        await this.getStorefrontToPush(flags);
         if (local) {
             const currentStore = localConfig.getDefaultStore();
-            const sessionId = localConfig.getSessionId(currentStore);
-            this.storefrontLocalUrl = this.localFrontendUrl(currentStore, sessionId);
+            this.storefrontLocalUrl = this.localFrontendUrl(currentStore, this.storefront.id);
         }
-        await this.getStorefrontToPush(flags);
         await this.logOrientation({ env: this.api.envId || 'live' });
         this.logStorefrontConnected();
         this.saveCurrentStorefront();

package/dist/lib/constants.d.ts

@@ -6,4 +6,4 @@ export declare function getFrontendApiBaseUrl(storeId: string): any;
 export declare function getLoginHost(storeId?: string): any;
 export declare function getAppFrontendHost(storeId: string, installedAppId: string): any;
 export declare function getStorefrontFrontendHost(storefrontSlug: string, branchId?: string): any;
-export declare function getLocalFrontendHost(storeId: string, sessionId: string): any;
+export declare function getLocalFrontendHost(storeId: string, localId: string): any;

package/dist/lib/constants.js

@@ -35,8 +35,8 @@ export function getAppFrontendHost(storeId, installedAppId) {
 export function getStorefrontFrontendHost(storefrontSlug, branchId) {
     return STOREFRONT_FRONTEND_HOST.replace('${STOREFRONT_SLUG}', storefrontSlug).replace('${BRANCH_PREFIX}', branchId ? `${branchId}.` : '');
 }
-export function getLocalFrontendHost(storeId, sessionId) {
+export function getLocalFrontendHost(storeId, localId) {
     return APP_PAGES_HOST.replace('${STORE_ID}', storeId)
-        .replace('${APP_ID}', sessionId)
+        .replace('${APP_ID}', localId)
         .replace('${ENV}', 'local');
 }

package/dist/push-app-command.js

@@ -784,11 +784,13 @@ export class PushAppCommand extends RemoteAppCommand {
             return;
         }
         const currentStore = localConfig.getDefaultStore();
-        const sessionId = localConfig.getSessionId(currentStore);
+        const localId = this.app.type === 'storefront' && this.storefront?.id
+            ? this.storefront.id
+            : 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.log(`View it at ${style.link(`${this.localFrontendUrl(currentStore, localId)}${frontendAppRoute}`)}\n`);
         this.hasLoggedLocalPreviewUrl = true;
     }
     async setWatchingFiles() {

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

@@ -31,7 +31,7 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     init(): Promise<void>;
     protected installApp(version: string, spinner?: any): Promise<any>;
     isConfigDeprecated(config: AppConfig): boolean;
-    localFrontendUrl(storeId: string, sessionId: string): string;
+    localFrontendUrl(storeId: string, localId: string): string;
     logOrientation(orientation?: AppCommandOrientation): Promise<void>;
     postConfigData(configJson: any): Promise<any>;
     protected pullAppConfigs(force?: boolean, confirmRemove?: boolean): Promise<{

package/dist/remote-app-command.js

@@ -324,8 +324,8 @@ export class RemoteAppCommand extends AppCommand {
     isConfigDeprecated(config) {
         return !config.file_path;
     }
-    localFrontendUrl(storeId, sessionId) {
-        return getLocalFrontendHost(storeId, sessionId);
+    localFrontendUrl(storeId, localId) {
+        return getLocalFrontendHost(storeId, localId);
     }
     async logOrientation(orientation) {
         const klass = this.ctor;

package/oclif.manifest.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [
@@ -113,7 +113,6 @@
     }
   },
   "scripts": {
-    "preinstall": "npm i -g ts-node",
     "build": "shx rm -rf dist && shx rm -f tsconfig.tsbuildinfo && tsc -b",
     "lint": "eslint . --ext .ts --config .eslintrc",
     "postpack": "shx rm -f oclif.manifest.json",