@forge/cli 6.17.0 → 6.18.0-next.33

package/out/autocomplete/autocomplete-config.json

@@ -185,6 +185,9 @@
       "--debug": {
         "requireUserArg": false
       },
+      "--ngrok-config": {
+        "requireUserArg": true
+      },
       "--help": {
         "requireUserArg": false
       }

package/out/command-line/register-tunnel-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAU/F,CAAC"}
+{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAW/F,CAAC"}

package/out/command-line/register-tunnel-commands.js

@@ -9,6 +9,7 @@ const registerCommands = ({ cmd, ui, controllers: { tunnelController } }) => {
         .description(cli_shared_1.Text.tunnel.cmd)
         .environmentOption()
         .option('-d, --debug', cli_shared_1.Text.tunnel.optionDebugger)
+        .option('-c, --ngrok-config <path>', cli_shared_1.Text.tunnel.optionNgrokConfig)
         .action(async (options) => {
         await tunnelController.run(options, ui);
     });

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

@@ -13,7 +13,7 @@ export declare class LintService {
     private readonly configFile;
     private readonly fileSystemReader;
     constructor(configFile: ConfigFile, fileSystemReader: FileSystemReader);
-    run(environment: string, { fix }: LintOptions, logger: LintLogger, directory?: string, lintFunction?: (filesToLint: string[], manifest: import("@forge/manifest").ManifestSchema, environment: string, logger: LintLogger, parseFunction?: ((filepath: string, parser: (code: string, filepath: string, parseOptions?: Partial<import("@forge/lint").ParseOptions> | undefined) => Promise<import("@forge/lint").ASTParseResult>, readFilePromise?: typeof import("fs").readFile.__promisify__ | undefined) => Promise<import("@forge/lint").LintInput>) | undefined, linters?: import("@forge/lint").LinterInterface[] | undefined) => Promise<LintResult[]>): Promise<RunResult>;
+    run(environment: string, { fix }: LintOptions, logger: LintLogger, directory?: string, lintFunction?: (filesToLint: string[], manifest: import("@forge/manifest").ManifestSchema, environment: string, logger: LintLogger, parseFunction?: ((filepath: string, parser: (code: string, filepath: string, parseOptions?: Partial<import("@forge/lint").ParseOptions> | undefined) => Promise<import("@forge/lint").ASTParseResult>, readFilePromise?: typeof import("node:fs").readFile.__promisify__ | undefined) => Promise<import("@forge/lint").LintInput>) | undefined, linters?: import("@forge/lint").LinterInterface[] | undefined) => Promise<LintResult[]>): Promise<RunResult>;
     private fix;
     problemCount(lintResults: LintResult[]): ProblemCount;
     private failedScopesFromLintResult;

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

@@ -1 +1 @@
-{"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAEL,YAAY,EACZ,UAAU,EAGV,UAAU,EACV,YAAY,EACb,MAAM,aAAa,CAAC;AAGrB,UAAU,WAAW;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,SAAS;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBADhB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAGxC,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,SAAS,SAAoB,EAC7B,YAAY,0hBAAO,GAClB,OAAO,CAAC,SAAS,CAAC;YA4BP,GAAG;IASV,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,YAAY;IAI5D,OAAO,CAAC,0BAA0B;IAI3B,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE;CAOzD"}
+{"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAEL,YAAY,EACZ,UAAU,EAGV,UAAU,EACV,YAAY,EACb,MAAM,aAAa,CAAC;AAGrB,UAAU,WAAW;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,SAAS;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBADhB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAGxC,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,SAAS,SAAoB,EAC7B,YAAY,+hBAAO,GAClB,OAAO,CAAC,SAAS,CAAC;YA4BP,GAAG;IASV,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,YAAY;IAI5D,OAAO,CAAC,0BAA0B;IAI3B,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE;CAOzD"}

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

@@ -7,8 +7,9 @@ import { TunnelAnalyticsService } from './tunnel-analytics-service';
 export interface TunnelOptions {
     debug?: boolean;
     environment?: string;
+    ngrokConfig?: string;
 }
-export declare const CONTAINER_NAME = "forge-tunnel-docker";
+export declare const CONTAINER_NAME: string;
 export declare const IMAGE_NAME: string;
 export declare class HiddenDockerTunnelError extends HiddenError {
     private readonly userError;
@@ -30,25 +31,24 @@ export declare class InProcessTunnelService implements TunnelService {
     constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, 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 {
     protected readonly configFilePortFindingService: ConfigFilePortFindingService;
     constructor(configFilePortFindingService: ConfigFilePortFindingService);
     abstract run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
-    protected getDockerOptions(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials): Promise<string[]>;
-    protected getPortOptions(port: number, resourcePorts: Record<string, number>, cspReporterPort: number | undefined): string[];
-    protected getResourcePortEnvVarOption(resourcePorts: Record<string, number>): string[];
-    protected getUserEnvironmentVariablesOptions(): string[];
-    protected addEnvVarsForLocalTunnel(env: {
-        [key: string]: string;
-    }): Record<string, string>;
-    protected transformDockerOptionsToEnvVars(options: string[]): {
-        [key: string]: string;
-    };
-    protected getInteractiveOptions(): string[];
-    protected getVolumeOptions(): string[];
+    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[];
+    private getCspReporterPortEnvironment;
+    private getResourcePortEnvironment;
+    private getUserEnvironmentVariables;
 }
 export declare class LocalTunnelService extends TunnelServiceBase {
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
+    private formatEnvForLocalTunnel;
 }
 export declare class DockerTunnelService extends TunnelServiceBase {
     private readonly dockerService;
@@ -57,6 +57,11 @@ export declare class DockerTunnelService extends TunnelServiceBase {
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
     bootstrapDocker(): Promise<ReturnType<typeof spawn>>;
     private validateDockerVersion;
+    private getDockerPortOptions;
+    private formatEnvForDocker;
+    private getInteractiveOptions;
+    private getVolumeOptions;
+    private getDockerOptions;
 }
 export {};
 //# sourceMappingURL=tunnel-service.d.ts.map

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":"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"}
+{"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

@@ -10,7 +10,7 @@ const semver_1 = require("semver");
 const cli_shared_1 = require("@forge/cli-shared");
 const version_info_1 = require("../command-line/version-info");
 const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
-exports.CONTAINER_NAME = 'forge-tunnel-docker';
+exports.CONTAINER_NAME = `forge-tunnel-docker-${process.pid}`;
 const cliDetails = (0, version_info_1.getCLIDetails)();
 let versionTags;
 if ((cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version) !== undefined) {
@@ -60,7 +60,8 @@ class InProcessTunnelService {
             const tunnel = await this.startTunnelCommand.execute({
                 environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
                 resourcePortMap,
-                host: 'localhost'
+                host: 'localhost',
+                ngrokConfig: tunnelOptions.ngrokConfig
             });
             const monitor = await this.tunnelInteractor.watchApp(tunnel);
             await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor);
@@ -81,120 +82,66 @@ class TunnelServiceBase {
     constructor(configFilePortFindingService) {
         this.configFilePortFindingService = configFilePortFindingService;
     }
-    async getDockerOptions(tunnelOptions, debugEnabled, { email, token }) {
+    async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
+        var _a;
         try {
             const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
             return [
-                '--rm',
-                `--name`,
-                exports.CONTAINER_NAME,
-                '--platform',
-                'linux/amd64',
-                `--env`,
-                `APP_FOLDER=/app`,
-                `--env`,
-                `FORGE_EMAIL=${email}`,
-                `--env`,
-                `FORGE_API_TOKEN=${token}`,
-                `--env`,
-                `ENVIRONMENT_KEY=${tunnelOptions.environment || 'default'}`,
-                `--env`,
-                `TUNNEL_INSPECTOR_ENABLED=${!!tunnelOptions.debug}`,
-                `--env`,
-                `FORGE_GRAPHQL_GATEWAY=${graphqlGateway}`,
-                `--env`,
-                `VERBOSE_MODE=${debugEnabled}`,
-                `--env`,
-                `CLI_DETAILS=${JSON.stringify(cliDetails)}`,
-                `${exports.IMAGE_NAME}`
+                { key: 'APP_FOLDER', value: '/app' },
+                { key: 'FORGE_EMAIL', value: email },
+                { key: 'FORGE_API_TOKEN', value: token },
+                { key: 'ENVIRONMENT_KEY', value: (_a = tunnelOptions.environment) !== null && _a !== void 0 ? _a : 'default' },
+                { key: 'TUNNEL_INSPECTOR_ENABLED', value: (!!tunnelOptions.debug).toString() },
+                { key: 'FORGE_GRAPHQL_GATEWAY', value: graphqlGateway },
+                { key: 'VERBOSE_MODE', value: `${debugEnabled}` },
+                { key: 'CLI_DETAILS', value: JSON.stringify(cliDetails) },
+                ...this.getInspectorPortEnvironment(port),
+                ...this.getCspReporterPortEnvironment(cspReporterPort),
+                ...this.getResourcePortEnvironment(resourcePorts),
+                ...this.getUserEnvironmentVariables(),
+                ...this.getNgrokConfigEnvironment(tunnelOptions.ngrokConfig)
             ];
         }
         catch (e) {
             throw new HiddenDockerTunnelError(false, "Couldn't populate docker options for tunneling");
         }
     }
-    getPortOptions(port, resourcePorts, cspReporterPort) {
-        const resourcePortOptions = (0, cli_shared_1.flatMap)(Object.values(resourcePorts), (resourcePort) => [
-            '-p',
-            `${resourcePort}:${resourcePort}`
-        ]);
-        const cspReporterPortOption = cspReporterPort
-            ? ['-p', `${cspReporterPort}:${cspReporterPort}`, '--env', `CSP_REPORTER_PORT=${cspReporterPort}`]
-            : [];
-        const addHostOption = os_1.default.platform() === 'linux' ? ['--add-host', 'host.docker.internal:host-gateway'] : [];
-        return [
-            `-p`,
-            `${port}:${port}`,
-            ...resourcePortOptions,
-            ...addHostOption,
-            ...cspReporterPortOption,
-            `--env`,
-            `TUNNEL_INSPECTOR_PORT=${port}`
-        ];
+    getInspectorPortEnvironment(port) {
+        return [{ key: 'TUNNEL_INSPECTOR_PORT', value: port.toString() }];
+    }
+    getNgrokConfigEnvironment(ngrokConfigPath) {
+        if (ngrokConfigPath) {
+            return [{ key: 'NGROK_CONFIG', value: ngrokConfigPath }];
+        }
+        return [];
+    }
+    getCspReporterPortEnvironment(cspReporterPort) {
+        if (cspReporterPort) {
+            return [{ key: 'CSP_REPORTER_PORT', value: cspReporterPort.toString() }];
+        }
+        return [];
     }
-    getResourcePortEnvVarOption(resourcePorts) {
-        return ['--env', `RESOURCE_PORT_MAP=${JSON.stringify(resourcePorts)}`];
+    getResourcePortEnvironment(resourcePorts) {
+        return [{ key: `RESOURCE_PORT_MAP`, value: JSON.stringify(resourcePorts) }];
     }
-    getUserEnvironmentVariablesOptions() {
-        const options = [];
+    getUserEnvironmentVariables() {
+        const vars = [];
         Object.keys(process.env)
             .filter((variable) => variable.startsWith('FORGE_USER_VAR_'))
             .forEach((name) => {
-            options.push('--env', `${name}=${process.env[name]}`);
-        });
-        return options;
-    }
-    addEnvVarsForLocalTunnel(env) {
-        return Object.assign(Object.assign({}, env), { PATH: process.env.PATH || '', FORCE_COLOR: '1' });
-    }
-    transformDockerOptionsToEnvVars(options) {
-        const envVarRegex = new RegExp('^(\\w+)=(.+)$', 'g');
-        const envVars = options.filter((opt) => envVarRegex.test(opt));
-        const envVarObj = {};
-        envVars.forEach((envVar) => {
-            envVarRegex.lastIndex = 0;
-            const [, key, val] = envVarRegex.exec(envVar);
-            envVarObj[key] = val;
+            var _a;
+            vars.push({ key: name, value: (_a = process.env[name]) !== null && _a !== void 0 ? _a : 'undefined' });
         });
-        return envVarObj;
-    }
-    getInteractiveOptions() {
-        if (DISABLE_TTY) {
-            return [`-i`];
-        }
-        return [`-it`];
-    }
-    getVolumeOptions() {
-        const options = [`-v=${process.cwd()}:/app:cached`];
-        if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
-            const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
-            options.push(`-v=${monorepoRoot}:/monorepo:cached`);
-            options.push(`-v=${monorepoRoot}/node_modules/ngrok/docker-bin:/monorepo/node_modules/ngrok/bin`);
-        }
-        if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
-            const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');
-            mounts.forEach((mount) => {
-                options.push(`-v=${mount}:cached`);
-            });
-        }
-        return options;
+        return vars;
     }
 }
 class LocalTunnelService extends TunnelServiceBase {
     async run(tunnelOptions, creds, debugEnabled, onError) {
-        const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
         const port = await (0, portfinder_1.getPortPromise)();
         const resourcePorts = await this.configFilePortFindingService.findPorts();
         const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
-        const portOptions = this.getPortOptions(port, resourcePorts, cspReporterPort);
-        const envVariablesOptions = this.getUserEnvironmentVariablesOptions();
-        const resourcePortEnvVarOption = this.getResourcePortEnvVarOption(resourcePorts);
-        const env = this.addEnvVarsForLocalTunnel(this.transformDockerOptionsToEnvVars([
-            ...dockerOptions,
-            ...portOptions,
-            ...envVariablesOptions,
-            ...resourcePortEnvVarOption
-        ]));
+        const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
+        const env = this.formatEnvForLocalTunnel(environment);
         const process = (0, cross_spawn_1.spawn)('forge-tunnel', [], {
             stdio: 'inherit',
             env: Object.assign(Object.assign({}, env), { FORGE_DEV_TUNNEL: 'true' })
@@ -203,6 +150,12 @@ class LocalTunnelService extends TunnelServiceBase {
             process.on('error', onError);
         }
     }
+    formatEnvForLocalTunnel(environment) {
+        return Object.assign({}, {
+            PATH: process.env.PATH || '',
+            FORCE_COLOR: '1'
+        }, ...environment.map(({ key, value }) => ({ [key]: value })));
+    }
 }
 exports.LocalTunnelService = LocalTunnelService;
 class DockerTunnelService extends TunnelServiceBase {
@@ -214,22 +167,22 @@ class DockerTunnelService extends TunnelServiceBase {
     async run(tunnelOptions, creds, debugEnabled) {
         var _a;
         await this.validateDockerVersion(creds, debugEnabled);
-        const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
+        const dockerOptions = await this.getDockerOptions();
         const port = await (0, portfinder_1.getPortPromise)();
         const resourcePorts = await this.configFilePortFindingService.findPorts(port);
         const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
-        const portOptions = this.getPortOptions(port, resourcePorts, cspReporterPort);
+        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();
-        const envVariablesOptions = this.getUserEnvironmentVariablesOptions();
-        const resourcePortEnvVarOption = this.getResourcePortEnvVarOption(resourcePorts);
+        const volumeOptions = this.getVolumeOptions(tunnelOptions);
+        const env = this.formatEnvForDocker(environment);
         const docker = this.dockerService.runContainer([
             ...interactiveOptions,
             ...volumeOptions,
             ...portOptions,
-            ...envVariablesOptions,
-            ...resourcePortEnvVarOption,
-            ...dockerOptions
+            ...dockerOptions,
+            ...env,
+            exports.IMAGE_NAME
         ]);
         docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
         (_a = docker.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (error) => {
@@ -262,5 +215,52 @@ class DockerTunnelService extends TunnelServiceBase {
             throw new HiddenDockerTunnelError(true);
         }
     }
+    getDockerPortOptions(port, resourcePorts, cspReporterPort) {
+        const resourcePortOptions = (0, cli_shared_1.flatMap)(Object.values(resourcePorts), (resourcePort) => [
+            '-p',
+            `${resourcePort}:${resourcePort}`
+        ]);
+        const cspReporterPortOption = [];
+        if (cspReporterPort) {
+            cspReporterPortOption.push('-p', `${cspReporterPort}:${cspReporterPort}`);
+        }
+        const addHostOption = os_1.default.platform() === 'linux' ? ['--add-host', 'host.docker.internal:host-gateway'] : [];
+        return [`-p`, `${port}:${port}`, ...resourcePortOptions, ...addHostOption, ...cspReporterPortOption];
+    }
+    formatEnvForDocker(environment) {
+        return (0, cli_shared_1.flatMap)(environment, ({ key, value }) => ['--env', `${key}=${value}`]);
+    }
+    getInteractiveOptions() {
+        if (DISABLE_TTY) {
+            return [`-i`];
+        }
+        return [`-it`];
+    }
+    getVolumeOptions({ ngrokConfig }) {
+        const options = [`-v=${process.cwd()}:/app:cached`];
+        if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
+            const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
+            options.push(`-v=${monorepoRoot}:/monorepo:cached`);
+            options.push(`-v=${monorepoRoot}/node_modules/ngrok/docker-bin:/monorepo/node_modules/ngrok/bin`);
+        }
+        if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
+            const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');
+            mounts.forEach((mount) => {
+                options.push(`-v=${mount}:cached`);
+            });
+        }
+        if (ngrokConfig) {
+            options.push(`-v=${ngrokConfig}`);
+        }
+        return options;
+    }
+    async getDockerOptions() {
+        try {
+            return ['--rm', `--name`, exports.CONTAINER_NAME, '--platform', 'linux/amd64'];
+        }
+        catch (e) {
+            throw new HiddenDockerTunnelError(false, "Couldn't populate docker options for tunneling");
+        }
+    }
 }
 exports.DockerTunnelService = DockerTunnelService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "6.17.0",
+  "version": "6.18.0-next.33",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -15,33 +15,33 @@
     "dev": "NODE_ENV=development ts-node src/bin/cli.ts",
     "inspect": "node -r ts-node/register --inspect-brk src/bin/cli.ts",
     "postbuild": "chmod +x out/bin/*.js && ts-node scripts/configureAutocomplete.ts",
-    "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
+    "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "4.12.0",
-    "@forge/cli-shared": "3.18.0",
-    "@forge/egress": "1.2.4",
-    "@forge/lint": "3.6.6",
-    "@forge/manifest": "4.20.0",
-    "@forge/node-runtime": "0.1.2",
-    "@forge/runtime": "5.0.1",
-    "@forge/tunnel": "3.7.0",
+    "@forge/bundler": "4.12.1-next.27",
+    "@forge/cli-shared": "3.19.0-next.21",
+    "@forge/egress": "1.2.5-next.2",
+    "@forge/lint": "3.6.7-next.21",
+    "@forge/manifest": "4.20.1-next.10",
+    "@forge/node-runtime": "0.2.0-next.8",
+    "@forge/runtime": "5.1.0-next.7",
+    "@forge/tunnel": "3.8.0-next.28",
     "@forge/util": "1.3.1",
-    "@sentry/node": "^7.66.0",
+    "@sentry/node": "^7.70.0",
     "ajv": "^8.12.0",
     "archiver": "^6.0.1",
     "case": "^1.6.3",
-    "chalk": "^2.4.2",
+    "chalk": "^4.1.2",
     "cheerio": "^0.22.0",
     "cli-table3": "^0.6.3",
     "command-exists": "^1.2.9",
     "commander": "^11.0.0",
     "cross-spawn": "^7.0.3",
-    "dayjs": "^1.11.9",
+    "dayjs": "^1.11.10",
     "didyoumean": "^1.2.2",
     "env-paths": "^2.2.1",
-    "form-data": "^3.0.1",
-    "fs-extra": "^8.1.0",
+    "form-data": "^4.0.0",
+    "fs-extra": "^11.1.1",
     "hidefile": "^3.0.0",
     "latest-version": "^6.0.0",
     "lodash": "^4.17.21",
@@ -58,25 +58,25 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "@types/archiver": "^5.3.2",
+    "@types/archiver": "^5.3.3",
     "@types/cheerio": "^0.22.32",
     "@types/command-exists": "^1.2.1",
     "@types/cross-spawn": "^6.0.3",
     "@types/didyoumean": "^1.2.0",
-    "@types/fs-extra": "^8.1.2",
-    "@types/hidefile": "^3.0.0",
+    "@types/fs-extra": "^11.0.2",
+    "@types/hidefile": "^3.0.1",
     "@types/inquirer": "^8.2.6",
-    "@types/jest": "^29.5.4",
-    "@types/js-yaml": "^3.12.7",
+    "@types/jest": "^29.5.5",
+    "@types/js-yaml": "^3.12.8",
     "@types/minimatch": "^3.0.5",
     "@types/mkdirp": "^1.0.2",
-    "@types/node": "14.18.58",
-    "@types/node-fetch": "^2.6.4",
+    "@types/node": "14.18.61",
+    "@types/node-fetch": "^2.6.5",
     "@types/omelette": "^0.4.2",
-    "@types/semver": "^7.5.1",
-    "@types/tmp": "^0.2.3",
+    "@types/semver": "^7.5.2",
+    "@types/tmp": "^0.2.4",
     "@types/uuid": "^3.4.11",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "jest-fixtures": "^0.6.0",
     "jest-matcher-specific-error": "^1.0.0",
     "jest-when": "^3.6.0",