@forge/cli 6.22.1 → 7.0.0

package/out/service/tunnel-service.d.ts

@@ -1,13 +1,13 @@
 import { spawn } from 'cross-spawn';
 import { HiddenError, PersonalApiCredentials, PersonalApiCredentialsValidated, UI, UserError } from '@forge/cli-shared';
 import { StartTunnelCommand, TunnelInteractor } from '@forge/tunnel';
+import { CachedConfigService } from './cached-config-service';
 import { DockerService } from './docker-service';
 import { ConfigFilePortFindingService } from './port-finding-service';
 import { TunnelAnalyticsService } from './tunnel-analytics-service';
 export interface TunnelOptions {
     debug?: boolean;
     environment?: string;
-    ngrokConfig?: string;
 }
 export declare const CONTAINER_NAME: string;
 export declare const IMAGE_NAME: string;
@@ -16,44 +16,50 @@ export declare class HiddenDockerTunnelError extends HiddenError {
     constructor(userError: boolean, message?: string);
     isUserError(): boolean;
 }
-export type TunnelService = {
+export declare type TunnelService = {
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
 };
 export declare class DebugNotSupportedError extends UserError {
     constructor();
 }
-export declare class InProcessTunnelService implements TunnelService {
+declare abstract class TunnelServiceBase implements TunnelService {
+    protected readonly cachedConfigService: CachedConfigService;
+    constructor(cachedConfigService: CachedConfigService);
+    abstract run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
+    protected ngrokConfigPath(): string;
+}
+export declare class InProcessTunnelService extends TunnelServiceBase {
     private readonly ui;
     private readonly startTunnelCommand;
     private readonly tunnelInteractor;
     private readonly configFilePortFindingService;
     private readonly analyticsService;
-    constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, analyticsService: TunnelAnalyticsService);
+    constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, analyticsService: TunnelAnalyticsService);
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
 }
 interface EnvironmentVariable {
     key: string;
     value: string;
 }
-declare abstract class TunnelServiceBase implements TunnelService {
+declare abstract class SandboxTunnelServiceBase extends TunnelServiceBase {
     protected readonly configFilePortFindingService: ConfigFilePortFindingService;
-    constructor(configFilePortFindingService: ConfigFilePortFindingService);
-    abstract run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
+    protected readonly cachedConfigService: CachedConfigService;
+    constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService);
     getTunnelProcessEnvironment(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials, port: number, cspReporterPort: number | undefined, resourcePorts: Record<string, number>): Promise<EnvironmentVariable[]>;
     private getInspectorPortEnvironment;
-    protected getNgrokConfigEnvironment(ngrokConfigPath: string | undefined): EnvironmentVariable[];
+    protected getNgrokConfigEnvironment(): EnvironmentVariable[];
     private getCspReporterPortEnvironment;
     private getResourcePortEnvironment;
     private getUserEnvironmentVariables;
 }
-export declare class LocalTunnelService extends TunnelServiceBase {
+export declare class LocalTunnelService extends SandboxTunnelServiceBase {
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
     private formatEnvForLocalTunnel;
 }
-export declare class DockerTunnelService extends TunnelServiceBase {
+export declare class DockerTunnelService extends SandboxTunnelServiceBase {
     private readonly dockerService;
     private readonly analyticsService;
-    constructor(configFilePortFindingService: ConfigFilePortFindingService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
+    constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
     bootstrapDocker(): Promise<ReturnType<typeof spawn>>;
     private validateDockerVersion;
@@ -61,7 +67,7 @@ export declare class DockerTunnelService extends TunnelServiceBase {
     private formatEnvForDocker;
     private getInteractiveOptions;
     private getVolumeOptions;
-    protected getNgrokConfigEnvironment(ngrokConfigPath: string | undefined): EnvironmentVariable[];
+    protected getNgrokConfigEnvironment(): EnvironmentVariable[];
     private getDockerOptions;
 }
 export {};

package/out/service/tunnel-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC,OAAO,EAIL,WAAW,EAEX,sBAAsB,EACtB,+BAA+B,EAG/B,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAID,eAAO,MAAM,cAAc,QAAuC,CAAC;AAenE,eAAO,MAAM,UAAU,QAEuB,CAAC;AAE/C,qBAAa,uBAAwB,SAAQ,WAAW;IAEpD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,OAAO,EACnC,OAAO,CAAC,EAAE,MAAM;IAKX,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,CACD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,SAAS;;CAIpD;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAJhB,EAAE,EAAE,EAAE,EACN,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B,EAC1D,gBAAgB,EAAE,sBAAsB;IAG9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CA4BjB;AAED,UAAU,mBAAmB;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,uBAAe,iBAAkB,YAAW,aAAa;IAC3C,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B;gBAA1D,4BAA4B,EAAE,4BAA4B;aAEzE,GAAG,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;IAEH,2BAA2B,CACtC,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,OAAO,EACrB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,sBAAsB,EACxC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAwBjC,OAAO,CAAC,2BAA2B;IAInC,SAAS,CAAC,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB,EAAE;IAO/F,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,2BAA2B;CASpC;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IAC1C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;IA2BhB,OAAO,CAAC,uBAAuB;CAUhC;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IAGtD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFjC,4BAA4B,EAAE,4BAA4B,EACzC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,sBAAsB;IAK9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;IA4DH,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;YAKnD,qBAAqB;IAUnC,OAAO,CAAC,oBAAoB;IAqB5B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,gBAAgB;IAwBxB,SAAS,CAAC,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB,EAAE;YAOjF,gBAAgB;CAO/B"}
+{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}

package/out/service/tunnel-service.js

@@ -44,8 +44,21 @@ class DebugNotSupportedError extends cli_shared_1.UserError {
     }
 }
 exports.DebugNotSupportedError = DebugNotSupportedError;
-class InProcessTunnelService {
-    constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, analyticsService) {
+class TunnelServiceBase {
+    constructor(cachedConfigService) {
+        this.cachedConfigService = cachedConfigService;
+    }
+    ngrokConfigPath() {
+        const path = this.cachedConfigService.getNgrokConfigPath();
+        if (!path) {
+            throw new cli_shared_1.UserError(cli_shared_1.Text.tunnel.error.noNgrokConfig);
+        }
+        return path;
+    }
+}
+class InProcessTunnelService extends TunnelServiceBase {
+    constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, analyticsService) {
+        super(cachedConfigService);
         this.ui = ui;
         this.startTunnelCommand = startTunnelCommand;
         this.tunnelInteractor = tunnelInteractor;
@@ -62,7 +75,7 @@ class InProcessTunnelService {
                 environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
                 resourcePortMap,
                 host: 'localhost',
-                ngrokConfig: tunnelOptions.ngrokConfig
+                ngrokConfig: this.ngrokConfigPath()
             });
             const monitor = await this.tunnelInteractor.watchApp(tunnel);
             await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor);
@@ -79,9 +92,11 @@ class InProcessTunnelService {
     }
 }
 exports.InProcessTunnelService = InProcessTunnelService;
-class TunnelServiceBase {
-    constructor(configFilePortFindingService) {
+class SandboxTunnelServiceBase extends TunnelServiceBase {
+    constructor(configFilePortFindingService, cachedConfigService) {
+        super(cachedConfigService);
         this.configFilePortFindingService = configFilePortFindingService;
+        this.cachedConfigService = cachedConfigService;
     }
     async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
         var _a;
@@ -100,7 +115,7 @@ class TunnelServiceBase {
                 ...this.getCspReporterPortEnvironment(cspReporterPort),
                 ...this.getResourcePortEnvironment(resourcePorts),
                 ...this.getUserEnvironmentVariables(),
-                ...this.getNgrokConfigEnvironment(tunnelOptions.ngrokConfig)
+                ...this.getNgrokConfigEnvironment()
             ];
         }
         catch (e) {
@@ -110,11 +125,8 @@ class TunnelServiceBase {
     getInspectorPortEnvironment(port) {
         return [{ key: 'TUNNEL_INSPECTOR_PORT', value: port.toString() }];
     }
-    getNgrokConfigEnvironment(ngrokConfigPath) {
-        if (ngrokConfigPath) {
-            return [{ key: 'NGROK_CONFIG', value: ngrokConfigPath }];
-        }
-        return [];
+    getNgrokConfigEnvironment() {
+        return [{ key: 'NGROK_CONFIG', value: this.ngrokConfigPath() }];
     }
     getCspReporterPortEnvironment(cspReporterPort) {
         if (cspReporterPort) {
@@ -136,7 +148,7 @@ class TunnelServiceBase {
         return vars;
     }
 }
-class LocalTunnelService extends TunnelServiceBase {
+class LocalTunnelService extends SandboxTunnelServiceBase {
     async run(tunnelOptions, creds, debugEnabled, onError) {
         const port = await (0, portfinder_1.getPortPromise)();
         const resourcePorts = await this.configFilePortFindingService.findPorts();
@@ -159,9 +171,9 @@ class LocalTunnelService extends TunnelServiceBase {
     }
 }
 exports.LocalTunnelService = LocalTunnelService;
-class DockerTunnelService extends TunnelServiceBase {
-    constructor(configFilePortFindingService, dockerService, analyticsService) {
-        super(configFilePortFindingService);
+class DockerTunnelService extends SandboxTunnelServiceBase {
+    constructor(configFilePortFindingService, cachedConfigService, dockerService, analyticsService) {
+        super(configFilePortFindingService, cachedConfigService);
         this.dockerService = dockerService;
         this.analyticsService = analyticsService;
     }
@@ -176,7 +188,7 @@ class DockerTunnelService extends TunnelServiceBase {
         const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
         const portOptions = this.getDockerPortOptions(port, resourcePorts, cspReporterPort);
         const interactiveOptions = this.getInteractiveOptions();
-        const volumeOptions = this.getVolumeOptions(tunnelOptions);
+        const volumeOptions = this.getVolumeOptions();
         const env = this.formatEnvForDocker(environment);
         const docker = this.dockerService.runContainer([
             ...interactiveOptions,
@@ -238,7 +250,7 @@ class DockerTunnelService extends TunnelServiceBase {
         }
         return [`-it`];
     }
-    getVolumeOptions({ ngrokConfig }) {
+    getVolumeOptions() {
         const options = [`-v=${process.cwd()}:/app:cached`];
         if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
             const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
@@ -251,16 +263,11 @@ class DockerTunnelService extends TunnelServiceBase {
                 options.push(`-v=${mount}:cached`);
             });
         }
-        if (ngrokConfig) {
-            options.push('--mount', `type=bind,source=${ngrokConfig},target=${PATH_DOCKER_NGROK_CONFIG}`);
-        }
+        options.push('--mount', `type=bind,source=${this.ngrokConfigPath()},target=${PATH_DOCKER_NGROK_CONFIG}`);
         return options;
     }
-    getNgrokConfigEnvironment(ngrokConfigPath) {
-        if (ngrokConfigPath) {
-            return [{ key: 'NGROK_CONFIG', value: PATH_DOCKER_NGROK_CONFIG }];
-        }
-        return [];
+    getNgrokConfigEnvironment() {
+        return [{ key: 'NGROK_CONFIG', value: PATH_DOCKER_NGROK_CONFIG }];
     }
     async getDockerOptions() {
         try {

package/out/webtrigger/get-webtrigger-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-webtrigger-url.d.ts","sourceRoot":"","sources":["../../src/webtrigger/get-webtrigger-url.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AACD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAHvB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB,EAC1C,uBAAuB,EAAE,uBAAuB;IAGtD,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAgBnF"}
+{"version":3,"file":"get-webtrigger-url.d.ts","sourceRoot":"","sources":["../../src/webtrigger/get-webtrigger-url.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AACD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAHvB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB,EAC1C,uBAAuB,EAAE,uBAAuB;IAGtD,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAcnF"}

package/out/webtrigger/get-webtrigger-url.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetWebTriggerURLCommand = void 0;
-const cs_ari_1 = require("@forge/util/packages/cs-ari");
+const ari_1 = require("@forge/util/packages/ari");
 class GetWebTriggerURLCommand {
     constructor(getAppConfig, webTriggerClient, appEnvironmentClient, webTriggerGraphqlClient) {
         this.getAppConfig = getAppConfig;
@@ -13,10 +13,8 @@ class GetWebTriggerURLCommand {
         const { id: appId } = await this.getAppConfig();
         const { environmentKey, context } = await this.webTriggerClient.getInstallation(appId, installationId);
         const environmentId = await this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey);
-        const ari = (0, cs_ari_1.parse)(appId);
-        const appAri = (0, cs_ari_1.parseAppAri)(ari);
         return await this.webTriggerGraphqlClient.createWebTriggerUrl({
-            appId: appAri.appId,
+            appId: ari_1.EcosystemAppAri.parse(appId).appId,
             contextId: context,
             environmentId: environmentId,
             triggerKey: functionKey

package/out/workers/tunnel-clean-up-worker.d.ts

@@ -1,4 +1,4 @@
-export type TunnelCleanUpMessage = {
+export declare type TunnelCleanUpMessage = {
     pids: number[];
     containers: string[];
 };

package/out/workers/tunnel-clean-up-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-clean-up-worker.d.ts","sourceRoot":"","sources":["../../src/workers/tunnel-clean-up-worker.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,qBAAa,mBAAmB;IACvB,MAAM,IAAI,IAAI;CAwBtB"}
+{"version":3,"file":"tunnel-clean-up-worker.d.ts","sourceRoot":"","sources":["../../src/workers/tunnel-clean-up-worker.ts"],"names":[],"mappings":"AAGA,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,qBAAa,mBAAmB;IACvB,MAAM,IAAI,IAAI;CAwBtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "6.22.1",
+  "version": "7.0.0",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,16 +18,16 @@
     "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "4.14.3",
-    "@forge/cli-shared": "3.22.1",
-    "@forge/egress": "1.2.11",
-    "@forge/lint": "4.0.1",
-    "@forge/manifest": "5.4.0",
-    "@forge/node-runtime": "0.4.6",
-    "@forge/runtime": "5.2.3",
-    "@forge/tunnel": "3.8.9",
-    "@forge/util": "1.3.3",
-    "@sentry/node": "^7.81.1",
+    "@forge/bundler": "4.15.0",
+    "@forge/cli-shared": "3.23.0",
+    "@forge/egress": "1.2.12",
+    "@forge/lint": "4.0.2",
+    "@forge/manifest": "5.5.0",
+    "@forge/node-runtime": "0.5.0",
+    "@forge/runtime": "5.3.0",
+    "@forge/tunnel": "4.0.0",
+    "@forge/util": "1.4.0",
+    "@sentry/node": "^7.91.0",
     "ajv": "^8.12.0",
     "archiver": "^6.0.1",
     "case": "^1.6.3",
@@ -41,7 +41,7 @@
     "didyoumean": "^1.2.2",
     "env-paths": "^2.2.1",
     "form-data": "^4.0.0",
-    "fs-extra": "^11.1.1",
+    "fs-extra": "^11.2.0",
     "hidefile": "^3.0.0",
     "latest-version": "^7.0.0",
     "lodash": "^4.17.21",
@@ -67,7 +67,7 @@
     "@types/inquirer": "^8.2.10",
     "@types/jest": "^29.5.11",
     "@types/node": "14.18.63",
-    "@types/node-fetch": "^2.6.9",
+    "@types/node-fetch": "^2.6.10",
     "@types/omelette": "^0.4.4",
     "@types/semver": "^7.5.6",
     "@types/tmp": "^0.2.6",