@forge/cli 5.2.1 → 6.0.0-next.3

package/out/installations/site-translation/bitbucket.js

@@ -22,9 +22,10 @@ const DEFAULT_BITBUCKET_ENDPOINT = 'https://api.bitbucket.org';
 const BITBUCKET_URL = new url_1.URL('https://bitbucket.org');
 const RESOURCE_TYPE = 'workspace';
 const RESOURCE_OWNER = 'bitbucket';
-exports.getBitbucketEndpoint = () => {
+const getBitbucketEndpoint = () => {
     return process.env.BITBUCKET_ENDPOINT || DEFAULT_BITBUCKET_ENDPOINT;
 };
+exports.getBitbucketEndpoint = getBitbucketEndpoint;
 class BitbucketTranslator {
     ariBelongsToProduct(ari) {
         return ari.resourceOwner === RESOURCE_OWNER;
@@ -51,7 +52,7 @@ class BitbucketTranslator {
     async getWorkspaceId(site) {
         const workspaceName = this.extractWorkspaceName(site);
         const url = this.buildFetchUrl(workspaceName);
-        const res = await node_fetch_1.default(url);
+        const res = await (0, node_fetch_1.default)(url);
         if (!res.ok) {
             throw new InvalidWorkspaceError(site);
         }
@@ -69,7 +70,7 @@ class BitbucketTranslator {
     }
     async getWorkspaceUrl(workspaceId) {
         const url = this.buildFetchUrl(this.decorateWorkspaceId(workspaceId));
-        const res = await node_fetch_1.default(url);
+        const res = await (0, node_fetch_1.default)(url);
         if (!res.ok) {
             return null;
         }
@@ -92,7 +93,7 @@ class BitbucketTranslator {
         return workspaceIdWithBraces.replace(/\{|\}/gi, '');
     }
     buildFetchUrl(workspaceNameOrId) {
-        const urlObj = new url_1.URL(`${exports.getBitbucketEndpoint()}/2.0/workspaces/${workspaceNameOrId}`);
+        const urlObj = new url_1.URL(`${(0, exports.getBitbucketEndpoint)()}/2.0/workspaces/${workspaceNameOrId}`);
         return urlObj.toString();
     }
     extractWorkspaceName(workspaceURL) {

package/out/providers/graphql-client.js

@@ -38,7 +38,7 @@ class GraphqlClient {
                 }
             }
         });
-        const error = cli_shared_1.getError(errors);
+        const error = (0, cli_shared_1.getError)(errors);
         if (!success) {
             throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }

package/out/service/command-suggestion-service.js

@@ -6,7 +6,7 @@ class CommandSuggestionService {
     getSuggestions(input, list) {
         const set = [...list, ...list.map((item) => item.split(':')[0])];
         let result = set.filter((search) => search.includes(input));
-        const dym = didyoumean_1.default(input, set);
+        const dym = (0, didyoumean_1.default)(input, set);
         if (dym) {
             result.push(dym);
             result = [...result, ...set.filter((search) => search.includes(dym))];

package/out/service/docker-service.js

@@ -22,7 +22,7 @@ var DockerErrorCode;
 })(DockerErrorCode = exports.DockerErrorCode || (exports.DockerErrorCode = {}));
 class DockerService {
     runContainer(args) {
-        return cross_spawn_1.spawn('docker', ['run', ...args], { stdio: 'inherit' });
+        return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: 'inherit' });
     }
     async getDockerVersion(debugEnabled) {
         if (!command_exists_1.default.sync('docker')) {
@@ -46,10 +46,10 @@ class DockerService {
         await this.execPromise(`docker rm -f ${containerName}`);
     }
     downloadImage(imageName) {
-        return cross_spawn_1.spawn('docker', ['pull', imageName]);
+        return (0, cross_spawn_1.spawn)('docker', ['pull', imageName]);
     }
     startCleanupWorker(pids, containerName) {
-        const dockerCleanUp = cross_spawn_1.spawn(process.env.NODE_ENV === 'development' ? 'ts-node' : 'node', [path_1.default.join(__dirname, '../workers/tunnel-cleanup-worker')], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
+        const dockerCleanUp = (0, cross_spawn_1.spawn)(process.env.NODE_ENV === 'development' ? 'ts-node' : 'node', [path_1.default.join(__dirname, '../workers/tunnel-cleanup-worker')], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
         const message = {
             pids,
             containers: [containerName]
@@ -58,7 +58,7 @@ class DockerService {
     }
     execPromise(cmd) {
         return new Promise((resolve) => {
-            child_process_1.exec(cmd, (err, stdout, stderr) => {
+            (0, child_process_1.exec)(cmd, (err, stdout, stderr) => {
                 resolve({
                     err: err,
                     stdout: stdout,

package/out/service/installation-service.js

@@ -14,12 +14,12 @@ class InstallationService {
         this.upgradeAppInstallationsClient = upgradeAppInstallationsClient;
     }
     filterInstallations(installations, { site: filterSite, product: filterProduct, environment: filterEnvironment }) {
-        const isDefaultEnvironment = (env) => env === cli_shared_1.optionToEnvironment(cli_shared_1.DEFAULT_ENVIRONMENT_OPTION);
+        const isDefaultEnvironment = (env) => env === (0, cli_shared_1.optionToEnvironment)(cli_shared_1.DEFAULT_ENVIRONMENT_OPTION);
         return installations.filter(({ product, site, environmentKey }) => {
-            const matchProduct = !filterProduct || filterProduct === cli_shared_1.capitalizeProduct(product);
+            const matchProduct = !filterProduct || filterProduct === (0, cli_shared_1.capitalizeProduct)(product);
             const matchSite = !filterSite || filterSite === site;
             const matchEnvironment = filterEnvironment
-                ? isDefaultEnvironment(filterEnvironment) || filterEnvironment === cli_shared_1.environmentToOption(environmentKey)
+                ? isDefaultEnvironment(filterEnvironment) || filterEnvironment === (0, cli_shared_1.environmentToOption)(environmentKey)
                 : true;
             return matchProduct && matchSite && matchEnvironment;
         });
@@ -66,7 +66,7 @@ class InstallationService {
             return { scopes: [], egressAddresses: [] };
         }
         const scopes = permissions.scopes.map((s) => s.key);
-        const egressAddresses = (permissions === null || permissions === void 0 ? void 0 : permissions.egress) ? cli_shared_1.flatMap(permissions.egress, ({ addresses }) => addresses !== null && addresses !== void 0 ? addresses : []) : [];
+        const egressAddresses = (permissions === null || permissions === void 0 ? void 0 : permissions.egress) ? (0, cli_shared_1.flatMap)(permissions.egress, ({ addresses }) => addresses !== null && addresses !== void 0 ? addresses : []) : [];
         return { scopes, egressAddresses };
     }
     async getAppEnvironmentPermissions(appId, environmentKey) {
@@ -75,7 +75,7 @@ class InstallationService {
         if (!versions || versions.length === 0)
             return;
         const [{ scopes, egressAddresses }, oldVersion] = versions.map((appEnvironmentVersion) => this.getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion));
-        const groupedEgressAddresses = egress_1.sortAndGroupEgressPermissionsByDomain(egressAddresses);
+        const groupedEgressAddresses = (0, egress_1.sortAndGroupEgressPermissionsByDomain)(egressAddresses);
         if (!oldVersion) {
             return {
                 scopes,
@@ -84,7 +84,7 @@ class InstallationService {
             };
         }
         const { scopes: oldScopes } = oldVersion;
-        const addedScopes = lodash_1.difference(scopes, oldScopes);
+        const addedScopes = (0, lodash_1.difference)(scopes, oldScopes);
         return { scopes, egressAddresses: groupedEgressAddresses, addedScopes };
     }
 }

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: Pick<import("@forge/cli-shared/src").Logger, "info">, 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("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;AAErB,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;AAEzC,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAc,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAzD,UAAU,EAAE,UAAU,EAAmB,gBAAgB,EAAE,gBAAgB;IAE3F,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,SAAS,SAAoB,EAC7B,YAAY,okBAAO,GAClB,OAAO,CAAC,SAAS,CAAC;YAYP,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;AAErB,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;AAEzC,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAc,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAzD,UAAU,EAAE,UAAU,EAAmB,gBAAgB,EAAE,gBAAgB;IAE3F,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;YAYP,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/lint-service.js

@@ -10,7 +10,7 @@ class LintService {
         this.fileSystemReader = fileSystemReader;
     }
     async run(environment, { fix }, logger, directory = exports.DEFAULT_DIRECTORY, lintFunction = lint_1.lint) {
-        const exclude = [...(await cli_shared_1.listGitIgnoreFiles(this.fileSystemReader)), '.git', 'node_modules'];
+        const exclude = [...(await (0, cli_shared_1.listGitIgnoreFiles)(this.fileSystemReader)), '.git', 'node_modules'];
         const filesToLint = await this.fileSystemReader.recursiveReadDir(directory, exclude);
         const lintResults = await lintFunction(filesToLint, await this.configFile.readConfig(), environment, logger);
         if (fix) {
@@ -23,10 +23,10 @@ class LintService {
         return lintResults.reduce((promiseChain, nextResult) => promiseChain.then((state) => nextResult.runFixer(state)), Promise.resolve(initialState));
     }
     problemCount(lintResults) {
-        return lint_1.problemCount(lintResults);
+        return (0, lint_1.problemCount)(lintResults);
     }
     failedScopesFromLintResult({ errors, warnings }) {
-        return Array.from(lint_1.findMissingPermissions(errors, warnings, 'missingPermission'));
+        return Array.from((0, lint_1.findMissingPermissions)(errors, warnings, 'missingPermission'));
     }
     failedScopes(lintResults) {
         return lintResults.reduce((acc, lintResult) => {

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

@@ -2,7 +2,7 @@ import { LintLogger, LintResult } from '@forge/lint';
 export declare class LiteLintService {
     private readonly lintService;
     private readonly problemCounter;
-    constructor(lintService?: (logger: Pick<import("@forge/cli-shared/src").Logger, "info">, linter?: import("@forge/lint").LinterInterface | undefined) => Promise<LintResult[]>, problemCounter?: (lintResults: LintResult[]) => import("@forge/lint").ProblemCount);
+    constructor(lintService?: (logger: LintLogger, linter?: import("@forge/lint").LinterInterface | undefined) => Promise<LintResult[]>, problemCounter?: (lintResults: LintResult[]) => import("@forge/lint").ProblemCount);
     run(checkSchema: boolean, logger: LintLogger): Promise<LintResult[]>;
     private filterResults;
     hasErrors(report: LintResult[]): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"lite-lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG7E,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,WAAW;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAvD,WAAW,sJAAW,EAAmB,cAAc,oEAAe;IAEtF,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAKjF,OAAO,CAAC,aAAa;IASd,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO;CAGhD"}
+{"version":3,"file":"lite-lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG7E,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,WAAW;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAvD,WAAW,4GAAW,EAAmB,cAAc,oEAAe;IAEtF,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAKjF,OAAO,CAAC,aAAa;IASd,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO;CAGhD"}

package/out/service/migration-keys-service.d.ts

@@ -1,4 +1,4 @@
-import { AppConfigProvider } from 'packages/forge-cli-shared/src/apps';
+import { AppConfigProvider } from '@forge/cli-shared';
 export declare type MigrationKeys = {
     jira?: string;
     confluence?: string;

package/out/service/migration-keys-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration-keys-service.d.ts","sourceRoot":"","sources":["../../src/service/migration-keys-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,oBAAY,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,MAAM,WAAW,2BAA2B;IAC1C,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AACD,MAAM,WAAW,sBAAsB;IACrC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACrG;AAED,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,mBAAmB,EAAE,sBAAsB,EAC3C,YAAY,EAAE,iBAAiB;IAGrC,iCAAiC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAI7G"}
+{"version":3,"file":"migration-keys-service.d.ts","sourceRoot":"","sources":["../../src/service/migration-keys-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,oBAAY,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,MAAM,WAAW,2BAA2B;IAC1C,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AACD,MAAM,WAAW,sBAAsB;IACrC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACrG;AAED,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,mBAAmB,EAAE,sBAAsB,EAC3C,YAAY,EAAE,iBAAiB;IAGrC,iCAAiC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAI7G"}

package/out/service/port-finding-service.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigFilePortFindingService = void 0;
 const portfinder_1 = require("portfinder");
 const util_1 = require("util");
-const getPortsPromise = util_1.promisify(portfinder_1.getPorts);
+const getPortsPromise = (0, util_1.promisify)(portfinder_1.getPorts);
 class ConfigFilePortFindingService {
     constructor(configFile) {
         this.configFile = configFile;

package/out/service/resource-packaging-service.js

@@ -64,7 +64,7 @@ class ResourcePackagingService {
     transformRelativeResourcePathsToAbsolute(appDir, resources) {
         return resources.map(({ key, path, resourceType }) => ({
             key,
-            directory: resourceType === 'nativeUI' ? path : path_1.join(appDir, path),
+            directory: resourceType === 'nativeUI' ? path : (0, path_1.join)(appDir, path),
             resourceType
         }));
     }
@@ -85,7 +85,7 @@ class ResourcePackagingService {
         }
     }
     assertDirectoryIncludesEntrypoint(directory, filePaths) {
-        if (!filePaths.map((path) => path_1.relative(directory, path)).includes(CUSTOM_UI_ENTRYPOINT)) {
+        if (!filePaths.map((path) => (0, path_1.relative)(directory, path)).includes(CUSTOM_UI_ENTRYPOINT)) {
             throw new MissingHtmlEntrypointError();
         }
     }
@@ -93,7 +93,7 @@ class ResourcePackagingService {
         await Promise.all(filePaths.map(async (filePath) => {
             const file = await this.fileSystemReader.readBinaryFileAsync(filePath);
             if (file) {
-                const relativePathToArchiveRoot = path_1.relative(directory, filePath);
+                const relativePathToArchiveRoot = (0, path_1.relative)(directory, filePath);
                 archiver.addFile(relativePathToArchiveRoot, this.processFile(relativePathToArchiveRoot, file));
             }
         }));
@@ -112,7 +112,7 @@ class ResourcePackagingService {
                     zipPath: archivePath,
                     rawSize: this.fileSystemReader.bytesToMb(await this.fileSystemReader.getFolderSizeAsync(directory)),
                     zipSize: this.fileSystemReader.bytesToMb(this.fileSystemReader.getSize(archivePath)),
-                    extensions: [...new Set(filePaths.map((file) => path_1.extname(file)))],
+                    extensions: [...new Set(filePaths.map((file) => (0, path_1.extname)(file)))],
                     fileCount: filePaths.length
                 };
             }

package/out/service/resources-uploader-service.js

@@ -22,7 +22,7 @@ class ResourcesUploaderService {
             formData.append(k, v);
         });
         formData.append('file', content);
-        const response = await node_fetch_1.default(preSignedUrl.uploadUrl, {
+        const response = await (0, node_fetch_1.default)(preSignedUrl.uploadUrl, {
             method: 'POST',
             body: formData
         });

package/out/service/tunnel-service.js

@@ -12,14 +12,14 @@ const version_info_1 = require("../command-line/version-info");
 const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
 const CUR_WORK_APP_DIR = process.env.CUR_WORK_APP_DIR;
 exports.CONTAINER_NAME = 'forge-tunnel-docker';
-const cliDetails = version_info_1.getCLIDetails();
+const cliDetails = (0, version_info_1.getCLIDetails)();
 let versionTags;
 if ((cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version) !== undefined) {
     if (process.env.FORGE_IN_LOCAL_E2E === 'true') {
         versionTags = ['e2e'];
     }
     else {
-        versionTags = semver_1.prerelease(cliDetails.version) || ['latest'];
+        versionTags = (0, semver_1.prerelease)(cliDetails.version) || ['latest'];
     }
 }
 else {
@@ -37,7 +37,7 @@ class TunnelService {
     }
     async getDockerOptions(tunnelOptions, debugEnabled, { email, token }) {
         try {
-            const graphqlGateway = cli_shared_1.getGraphqlGateway();
+            const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
             return [
                 '--rm',
                 `--name`,
@@ -66,7 +66,7 @@ class TunnelService {
         }
     }
     getPortOptions(port, resourcePorts, cspReporterPort) {
-        const resourcePortOptions = cli_shared_1.flatMap(Object.values(resourcePorts), (resourcePort) => [
+        const resourcePortOptions = (0, cli_shared_1.flatMap)(Object.values(resourcePorts), (resourcePort) => [
             '-p',
             `${resourcePort}:${resourcePort}`
         ]);
@@ -119,7 +119,7 @@ class TunnelService {
     getVolumeOptions() {
         const options = [`-v=${CUR_WORK_APP_DIR || process.cwd()}:/app:cached`];
         if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
-            options.push(`-v=${path_1.join(__dirname, '../../../forge-tunnel/hardcopied_node_modules/node_modules')}:/tunnel/node_modules:cached`, `-v=${path_1.join(__dirname, '../../../forge-tunnel/out')}:/tunnel/out:cached`);
+            options.push(`-v=${(0, path_1.join)(__dirname, '../../../forge-tunnel/hardcopied_node_modules/node_modules')}:/tunnel/node_modules:cached`, `-v=${(0, path_1.join)(__dirname, '../../../forge-tunnel/out')}:/tunnel/out:cached`);
         }
         if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
             const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');
@@ -134,7 +134,7 @@ exports.TunnelService = TunnelService;
 class LocalTunnelService extends TunnelService {
     async run(tunnelOptions, creds, debugEnabled, onError) {
         const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
-        const port = await portfinder_1.getPortPromise();
+        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);
@@ -146,7 +146,7 @@ class LocalTunnelService extends TunnelService {
             ...envVariablesOptions,
             ...resourcePortEnvVarOption
         ]));
-        cross_spawn_1.spawn('forge-tunnel', [], {
+        (0, cross_spawn_1.spawn)('forge-tunnel', [], {
             stdio: 'inherit',
             env: Object.assign(Object.assign({}, env), { FORGE_DEV_TUNNEL: 'true' })
         }).on('error', onError);
@@ -162,7 +162,7 @@ class DockerTunnelService extends TunnelService {
     async run(tunnelOptions, creds, debugEnabled) {
         await this.validateDockerVersion(creds, debugEnabled);
         const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
-        const port = await portfinder_1.getPortPromise();
+        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);

package/out/storage/local-file-storage.js

@@ -49,5 +49,5 @@ class LocalFileStorage {
     }
 }
 exports.LocalFileStorage = LocalFileStorage;
-LocalFileStorage.STORAGE_PATHS = env_paths_1.default('forge-cli');
+LocalFileStorage.STORAGE_PATHS = (0, env_paths_1.default)('forge-cli');
 LocalFileStorage.FOLDER = LocalFileStorage.STORAGE_PATHS.data;

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

@@ -13,8 +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 = cs_ari_1.parse(appId);
-        const appAri = cs_ari_1.parseAppAri(ari);
+        const ari = (0, cs_ari_1.parse)(appId);
+        const appAri = (0, cs_ari_1.parseAppAri)(ari);
         return await this.webTriggerGraphqlClient.createWebTriggerUrl({
             appId: appAri.appId,
             contextId: context,

package/out/workers/forge-cli-workers.js

@@ -16,6 +16,6 @@ const ALL_WORKERS = [
     new version_check_worker_1.VersionCheckWorker(workerInfo)
 ];
 const TIMEOUT = 10 * 1000;
-worker_1.handleWithTimeout(() => Promise.all(ALL_WORKERS.map((worker) => worker.doWork())), TIMEOUT)
+(0, worker_1.handleWithTimeout)(() => Promise.all(ALL_WORKERS.map((worker) => worker.doWork())), TIMEOUT)
     .finally(() => process.exit(0))
     .catch((e) => process.exit(1));

package/out/workers/tunnel-clean-up-worker.js

@@ -15,7 +15,7 @@ class TunnelCleanUpWorker {
             pids.forEach((pid) => {
                 process.kill(pid, os_1.constants.signals.SIGINT);
             });
-            cross_spawn_1.spawn('docker', ['rm', '-f', ...containers]);
+            (0, cross_spawn_1.spawn)('docker', ['rm', '-f', ...containers]);
             process.exit(0);
         };
         process.on('message', messageHandler);

package/out/workers/version-check-worker.js

@@ -11,7 +11,7 @@ class VersionCheckWorker {
             return;
         }
         try {
-            await version_info_1.cacheLatestVersion(this.workerInfo.name);
+            await (0, version_info_1.cacheLatestVersion)(this.workerInfo.name);
         }
         catch (e) {
         }

package/out/workers/worker-info.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkerInfo = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-exports.getWorkerInfo = (cliDetails) => {
+const getWorkerInfo = (cliDetails) => {
     if (!cliDetails) {
         return undefined;
     }
     return {
         name: cliDetails.name,
         checkForUpdate: cliDetails.latest === undefined,
-        environment: cli_shared_1.getEnvironment()
+        environment: (0, cli_shared_1.getEnvironment)()
     };
 };
+exports.getWorkerInfo = getWorkerInfo;

package/out/workers/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/workers/worker.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,YAAa,MAAM,KAAG,OAAO,CAAC,IAAI,CAA2D,CAAC;AAOhH,eAAO,MAAM,iBAAiB,WAAkB,MAAM,OAAO,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC,WAAW,MAAM,KAAG,OAAO,CAAC,IAAI,CAE3G,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/workers/worker.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,YAAa,MAAM,KAAG,QAAQ,IAAI,CAA2D,CAAC;AAOhH,eAAO,MAAM,iBAAiB,WAAkB,MAAM,QAAQ,IAAI,GAAG,IAAI,EAAE,CAAC,WAAW,MAAM,KAAG,QAAQ,IAAI,CAE3G,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB"}

package/out/workers/worker.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleWithTimeout = exports.timer = void 0;
-exports.timer = (timeout) => new Promise((resolve) => setTimeout(resolve, timeout));
-exports.handleWithTimeout = async (action, timeout) => {
-    await Promise.race([action(), exports.timer(timeout)]);
+const timer = (timeout) => new Promise((resolve) => setTimeout(resolve, timeout));
+exports.timer = timer;
+const handleWithTimeout = async (action, timeout) => {
+    await Promise.race([action(), (0, exports.timer)(timeout)]);
 };
+exports.handleWithTimeout = handleWithTimeout;

package/out/workers/workers-starter.js

@@ -12,7 +12,7 @@ class WorkersStarter {
             prg = 'ts-node';
             filePath = './forge-cli-workers.ts';
         }
-        const workers = cross_spawn_1.spawn(prg, [path_1.default.join(__dirname, filePath), JSON.stringify(workerInfo || '')], {
+        const workers = (0, cross_spawn_1.spawn)(prg, [path_1.default.join(__dirname, filePath), JSON.stringify(workerInfo || '')], {
             detached: true,
             stdio: 'ignore'
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "5.2.1",
+  "version": "6.0.0-next.3",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,11 +18,11 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "3.1.3",
-    "@forge/cli-shared": "3.2.1",
+    "@forge/bundler": "4.0.0-next.2",
+    "@forge/cli-shared": "3.2.2-next.1",
     "@forge/egress": "^1.1.1",
-    "@forge/lint": "3.2.7",
-    "@forge/manifest": "4.4.0",
+    "@forge/lint": "3.2.8-next.1",
+    "@forge/manifest": "4.4.1-next.0",
     "@forge/util": "1.2.0",
     "ajv": "^6.12.5",
     "archiver": "^5.2.0",
@@ -48,7 +48,7 @@
     "sanitize-filename": "^1.6.3",
     "semver": "^6.3.0",
     "tmp": "^0.1.0",
-    "tslib": "^1.11.0",
+    "tslib": "^2.4.0",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
@@ -60,7 +60,7 @@
     "@types/fs-extra": "^8.0.1",
     "@types/hidefile": "^3.0.0",
     "@types/inquirer": "^6.5.0",
-    "@types/jest": "^26.0.0",
+    "@types/jest": "^29.1.2",
     "@types/js-yaml": "^3.12.2",
     "@types/minimatch": "^3.0.3",
     "@types/mkdirp": "^1.0.0",
@@ -72,6 +72,7 @@
     "@types/unzipper": "^0.10.1",
     "@types/uuid": "^3.4.7",
     "@types/webpack": "^5.28.0",
+    "jest": "^29.1.2",
     "jest-fixtures": "^0.6.0",
     "memfs": "^3.4.1"
   },