@swell/cli 2.9.10 → 2.9.12

package/dist/commands/app/release.js

@@ -1,6 +1,5 @@
 import { confirm } from '@inquirer/prompts';
-import { Args, Flags } from '@oclif/core';
-import { CLIError } from '@oclif/errors';
+import { Args, Errors, Flags } from '@oclif/core';
 import * as fs from 'node:fs/promises';
 import ora from 'ora';
 import * as semver from 'semver';
@@ -15,7 +14,7 @@ export default class AppRelease extends PushAppCommand {
                 if (parsedInput) {
                     return parsedInput;
                 }
-                throw new CLIError(`Invalid version: ${input}`);
+                throw new Errors.CLIError(`Invalid version: ${input}`);
             },
         }),
     };

package/dist/commands/app/version.js

@@ -1,7 +1,6 @@
 import { confirm, input } from '@inquirer/prompts';
 import git from '@npmcli/git';
-import { Args, Flags } from '@oclif/core';
-import { CLIError } from '@oclif/errors';
+import { Args, Errors, Flags } from '@oclif/core';
 import ora from 'ora';
 import * as semver from 'semver';
 import style from '../../lib/style.js';
@@ -30,7 +29,7 @@ export default class AppVersion extends PushAppCommand {
                 if (parsedInput) {
                     return parsedInput;
                 }
-                throw new CLIError(`Invalid version: ${input}`);
+                throw new Errors.CLIError(`Invalid version: ${input}`);
             },
         }),
     };

package/dist/commands/switch.js

@@ -1,5 +1,4 @@
-import { Args } from '@oclif/core';
-import { CLIError } from '@oclif/errors';
+import { Args, Errors } from '@oclif/core';
 import config from '../lib/config.js';
 import { selectLoggedInStoreId } from '../lib/stores.js';
 import style from '../lib/style.js';
@@ -35,7 +34,7 @@ define the store that all other commands will apply to by default.
             this.log(`Current store is now ${style.storeId(config.getDefaultStore())}.`);
         }
         else {
-            throw new CLIError('Could not switch stores.');
+            throw new Errors.CLIError('Could not switch stores.');
         }
     }
 }

package/dist/lib/proxy.d.ts

@@ -3,4 +3,12 @@ export interface ProxyContext {
     storeId?: string;
     storefrontId?: string;
 }
+/**
+ * Stop the active tunnel (if any) so the process can exit on its own.
+ * The 'exit' handler below never fires while the tunnel's child process is
+ * keeping the event loop alive, so callers must stop it explicitly.
+ *
+ * @returns void
+ */
+export declare function stopProxy(): void;
 export declare function getProxyUrl(port: number, context?: ProxyContext): Promise<string>;

package/dist/lib/proxy.js

@@ -4,7 +4,21 @@ import * as fs from 'node:fs/promises';
 import ora from 'ora';
 import { LOCAL_PROXY_PROVIDER } from './constants.js';
 let activeTunnel = null;
+let activeLocaltunnel = null;
 let cleanupRegistered = false;
+/**
+ * Stop the active tunnel (if any) so the process can exit on its own.
+ * The 'exit' handler below never fires while the tunnel's child process is
+ * keeping the event loop alive, so callers must stop it explicitly.
+ *
+ * @returns void
+ */
+export function stopProxy() {
+    activeTunnel?.stop();
+    activeTunnel = null;
+    activeLocaltunnel?.close();
+    activeLocaltunnel = null;
+}
 async function startCloudflaredTunnel(port) {
     // Stop existing tunnel if called again
     if (activeTunnel) {
@@ -72,6 +86,7 @@ export async function getProxyUrl(port, context) {
             }
             case 'localtunnel': {
                 const tunnel = await localtunnel({ port });
+                activeLocaltunnel = tunnel;
                 return tunnel.url;
             }
             // eslint-disable-next-line unicorn/no-useless-switch-case

package/dist/lib/sessions.js

@@ -2,7 +2,7 @@ import { ux } from '@oclif/core';
 import * as http from 'node:http';
 import open from 'open';
 import { getLoginHost } from './constants.js';
-import { getProxyUrl } from './proxy.js';
+import { getProxyUrl, stopProxy } from './proxy.js';
 import style from './style.js';
 /**
  * Get the session id for the passed in store. If the session is not found,
@@ -100,6 +100,8 @@ function serverForLogin({ onPost, onStart, storeId, }) {
     });
     const closeInterval = setInterval(() => {
         if (postHandled) {
+            // stop the tunnel, otherwise its child process keeps the CLI alive
+            stopProxy();
             server.close(() => {
                 clearInterval(closeInterval);
             });

package/dist/lib/stores.d.ts

@@ -38,7 +38,7 @@ export declare function selectStoreId({ authorizations, currentStoreId, force, }
  *
  * @param message Store selection message
  * @returns The store ID to switch to
- * @throws CLIError - If there are no stores to switch to
+ * @throws Errors.CLIError - If there are no stores to switch to
  */
 export declare function selectLoggedInStoreId(message?: string): Promise<string>;
 /**
@@ -46,7 +46,7 @@ export declare function selectLoggedInStoreId(message?: string): Promise<string>
  *
  * @param message Environment selection message
  * @returns Environment to switch to
- * @throws CLIError - If there are no stores to switch to
+ * @throws Errors.CLIError - If there are no stores to switch to
  */
 export declare function selectEnvironmentId(message?: string): Promise<string>;
 /**

package/dist/lib/stores.js

@@ -1,5 +1,5 @@
 import { Separator, confirm, select } from '@inquirer/prompts';
-import { CLIError } from '@oclif/errors';
+import { Errors } from '@oclif/core';
 import config from './config.js';
 import style from './style.js';
 /**
@@ -18,7 +18,7 @@ import style from './style.js';
  */
 export function showStores(stores, currentStoreId) {
     if (stores.length === 0) {
-        throw new CLIError('You are not logged in to any store.');
+        throw new Errors.CLIError('You are not logged in to any store.');
     }
     function currentStoreLabel(store) {
         if (stores.length === 1 || store.storeId !== currentStoreId) {
@@ -103,13 +103,13 @@ export async function selectStoreId({ authorizations, currentStoreId, force = fa
  *
  * @param message Store selection message
  * @returns The store ID to switch to
- * @throws CLIError - If there are no stores to switch to
+ * @throws Errors.CLIError - If there are no stores to switch to
  */
 export async function selectLoggedInStoreId(message) {
     const currentStoreId = config.getDefaultStore();
     const loggedInStores = config.get('stores') || [];
     if (loggedInStores.length === 0) {
-        throw new CLIError(`You are not logged in. Run ${style.command('swell login')} to continue.`);
+        throw new Errors.CLIError(`You are not logged in. Run ${style.command('swell login')} to continue.`);
     }
     const selectStoreChoices = loggedInStores.map((store) => ({
         name: `${store.name} (${store.storeId})` +
@@ -134,7 +134,7 @@ export async function selectLoggedInStoreId(message) {
  *
  * @param message Environment selection message
  * @returns Environment to switch to
- * @throws CLIError - If there are no stores to switch to
+ * @throws Errors.CLIError - If there are no stores to switch to
  */
 export async function selectEnvironmentId(message) {
     return select({

package/oclif.manifest.json

@@ -3594,5 +3594,5 @@
       ]
     }
   },
-  "version": "2.9.10"
+  "version": "2.9.12"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.9.10",
+  "version": "2.9.12",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [
@@ -29,9 +29,7 @@
     "@inquirer/prompts": "3.2.0",
     "@npmcli/git": "5.0.3",
     "@oclif/core": "3.7.1",
-    "@oclif/errors": "1.3.6",
     "@oclif/plugin-help": "6.0.4",
-    "@oclif/plugin-plugins": "3.9.4",
     "ajv": "8.20.0",
     "ajv-errors": "3.0.0",
     "ajv-formats": "3.0.1",
@@ -49,18 +47,17 @@
     "inflection": "3.0.0",
     "istextorbinary": "9.5.0",
     "localtunnel": "2.0.2",
-    "lodash": "4.17.21",
+    "lodash": "4.18.1",
     "mime-detect": "1.2.0",
     "node-fetch": "3.3.2",
-    "oclif": "4.0.3",
     "open": "9.1.0",
     "ora": "7.0.1",
     "parse-json": "8.3.0",
-    "qs": "6.12.3",
+    "qs": "6.15.3",
     "semver": "7.5.4",
     "table": "6.8.1",
     "typescript": "5.2.2",
-    "ws": "8.18.1"
+    "ws": "8.21.3"
   },
   "devDependencies": {
     "@inquirer/testing": "2.1.8",