@forge/cli 9.3.0 → 10.0.0-next.11

package/out/service/lite-lint-service.js

@@ -4,6 +4,8 @@ exports.LiteLintService = void 0;
 const lint_1 = require("@forge/lint");
 const manifest_1 = require("@forge/manifest");
 class LiteLintService {
+    lintService;
+    problemCounter;
     constructor(lintService = lint_1.litelint, problemCounter = lint_1.problemCount) {
         this.lintService = lintService;
         this.problemCounter = problemCounter;

package/out/service/migration-keys-service.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationKeysService = void 0;
 class MigrationKeysService {
+    migrationKeysClient;
+    getAppConfig;
     constructor(migrationKeysClient, getAppConfig) {
         this.migrationKeysClient = migrationKeysClient;
         this.getAppConfig = getAppConfig;

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

@@ -5,6 +5,7 @@ const portfinder_1 = require("portfinder");
 const util_1 = require("util");
 const getPortsPromise = (0, util_1.promisify)(portfinder_1.getPorts);
 class ConfigFilePortFindingService {
+    configFile;
     constructor(configFile) {
         this.configFile = configFile;
     }

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

@@ -42,6 +42,11 @@ class DetailedMalformedHtmlEntrypointError extends cli_shared_1.UserError {
 }
 exports.DetailedMalformedHtmlEntrypointError = DetailedMalformedHtmlEntrypointError;
 class ResourcePackagingService {
+    archiverFactory;
+    fileSystemReader;
+    appDir;
+    bridgeScriptService;
+    iframeResizerScriptService;
     constructor(archiverFactory, fileSystemReader, appDir, bridgeScriptService, iframeResizerScriptService) {
         this.archiverFactory = archiverFactory;
         this.fileSystemReader = fileSystemReader;

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

@@ -6,6 +6,7 @@ const cli_shared_1 = require("@forge/cli-shared");
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 class ResourceUploadError extends cli_shared_1.BaseError {
+    userError;
     constructor(userError = false, requestId) {
         super(requestId, 'Failed to upload resource to S3');
         this.userError = userError;
@@ -15,6 +16,7 @@ class ResourceUploadError extends cli_shared_1.BaseError {
     }
 }
 class ResourcesUploaderService {
+    fileSystemReader;
     constructor(fileSystemReader) {
         this.fileSystemReader = fileSystemReader;
     }

package/out/service/tunnel-analytics-service.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TunnelAnalyticsService = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 class TunnelAnalyticsService {
+    analyticsClientReporter;
+    cliDetails;
     constructor(analyticsClientReporter, cliDetails) {
         this.analyticsClientReporter = analyticsClientReporter;
         this.cliDetails = cliDetails;
@@ -16,10 +18,15 @@ class TunnelAnalyticsService {
         this.analyticsClientReporter.reportSuccess('close tunnel', creds, {});
     }
     reportTunnelFailure(creds, errorName, attributes) {
-        var _a, _b;
-        attributes = Object.assign({ error: errorName, version: (_a = this.cliDetails) === null || _a === void 0 ? void 0 : _a.version, latest: (_b = this.cliDetails) === null || _b === void 0 ? void 0 : _b.latest, isLatest: (0, cli_shared_1.isLatestCLIVersion)(this.cliDetails) }, attributes);
+        attributes = {
+            error: errorName,
+            version: this.cliDetails?.version,
+            latest: this.cliDetails?.latest,
+            isLatest: (0, cli_shared_1.isLatestCLIVersion)(this.cliDetails),
+            ...attributes
+        };
         if (attributes.isUserError === undefined) {
-            attributes = Object.assign(Object.assign({}, attributes), { isUserError: false });
+            attributes = { ...attributes, isUserError: false };
         }
         this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
     }

package/out/service/tunnel-service.js

@@ -14,7 +14,7 @@ exports.CONTAINER_NAME = `forge-tunnel-docker-${process.pid}`;
 const PATH_DOCKER_NGROK_CONFIG = '/opt/provided-ngrok-config.yml';
 const cliDetails = (0, version_info_1.getCLIDetails)();
 let versionTags;
-if ((cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version) !== undefined) {
+if (cliDetails?.version !== undefined) {
     if (process.env.FORGE_IN_LOCAL_E2E === 'true') {
         versionTags = ['e2e'];
     }
@@ -41,6 +41,7 @@ class InvalidDebugStartingPortNumber extends cli_shared_1.UserError {
 }
 exports.InvalidDebugStartingPortNumber = InvalidDebugStartingPortNumber;
 class TunnelServiceBase {
+    cachedConfigService;
     constructor(cachedConfigService) {
         this.cachedConfigService = cachedConfigService;
     }
@@ -53,6 +54,11 @@ class TunnelServiceBase {
     }
 }
 class InProcessTunnelService extends TunnelServiceBase {
+    ui;
+    startTunnelCommand;
+    tunnelInteractor;
+    configFilePortFindingService;
+    analyticsService;
     constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, analyticsService) {
         super(cachedConfigService);
         this.ui = ui;
@@ -86,19 +92,20 @@ class InProcessTunnelService extends TunnelServiceBase {
 }
 exports.InProcessTunnelService = InProcessTunnelService;
 class SandboxTunnelServiceBase extends TunnelServiceBase {
+    configFilePortFindingService;
+    cachedConfigService;
     constructor(configFilePortFindingService, cachedConfigService) {
         super(cachedConfigService);
         this.configFilePortFindingService = configFilePortFindingService;
         this.cachedConfigService = cachedConfigService;
     }
     async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
-        var _a;
         const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
         return [
             { 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: 'ENVIRONMENT_KEY', value: tunnelOptions.environment ?? 'default' },
             { key: 'TUNNEL_INSPECTOR_ENABLED', value: (!!tunnelOptions.debug).toString() },
             { key: 'FORGE_GRAPHQL_GATEWAY', value: graphqlGateway },
             { key: 'VERBOSE_MODE', value: `${debugEnabled}` },
@@ -130,8 +137,7 @@ class SandboxTunnelServiceBase extends TunnelServiceBase {
         Object.keys(process.env)
             .filter((variable) => variable.startsWith('FORGE_USER_VAR_'))
             .forEach((name) => {
-            var _a;
-            vars.push({ key: name, value: (_a = process.env[name]) !== null && _a !== void 0 ? _a : 'undefined' });
+            vars.push({ key: name, value: process.env[name] ?? 'undefined' });
         });
         return vars;
     }
@@ -145,7 +151,10 @@ class LocalTunnelService extends SandboxTunnelServiceBase {
         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' })
+            env: {
+                ...env,
+                FORGE_DEV_TUNNEL: 'true'
+            }
         });
         if (onError) {
             process.on('error', onError);
@@ -160,13 +169,14 @@ class LocalTunnelService extends SandboxTunnelServiceBase {
 }
 exports.LocalTunnelService = LocalTunnelService;
 class DockerTunnelService extends SandboxTunnelServiceBase {
+    dockerService;
+    analyticsService;
     constructor(configFilePortFindingService, cachedConfigService, dockerService, analyticsService) {
         super(configFilePortFindingService, cachedConfigService);
         this.dockerService = dockerService;
         this.analyticsService = analyticsService;
     }
     async run(tunnelOptions, creds, debugEnabled) {
-        var _a;
         await this.validateDockerVersion(creds, debugEnabled);
         const startPort = 8000 + Math.round(Math.random() * 100);
         const port = await (0, portfinder_1.getPortPromise)({ port: startPort });
@@ -187,8 +197,7 @@ class DockerTunnelService extends SandboxTunnelServiceBase {
             exports.IMAGE_NAME
         ]);
         docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
-        (_a = docker.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (error) => {
-            var _a;
+        docker.stderr?.on('data', (error) => {
             const errorMessage = error;
             let errorJson;
             try {
@@ -201,7 +210,7 @@ class DockerTunnelService extends SandboxTunnelServiceBase {
                 this.analyticsService.reportTunnelFailure(creds, tunnelErrorDetails.name, tunnelErrorDetails.attributes);
             }
             else {
-                (_a = process.stderr) === null || _a === void 0 ? void 0 : _a.write(errorMessage);
+                process.stderr?.write(errorMessage);
             }
         });
         this.dockerService.startCleanupWorker([docker.pid], exports.CONTAINER_NAME);

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

@@ -7,6 +7,8 @@ const fs = tslib_1.__importStar(require("fs"));
 const env_paths_1 = tslib_1.__importDefault(require("env-paths"));
 const fs_extra_1 = require("fs-extra");
 class LocalFileStorage {
+    static STORAGE_PATHS = (0, env_paths_1.default)('forge-cli');
+    static FOLDER = LocalFileStorage.STORAGE_PATHS.data;
     constructor() {
         if (!fs.existsSync(LocalFileStorage.FOLDER)) {
             (0, fs_extra_1.mkdirpSync)(LocalFileStorage.FOLDER);
@@ -49,5 +51,3 @@ class LocalFileStorage {
     }
 }
 exports.LocalFileStorage = LocalFileStorage;
-LocalFileStorage.STORAGE_PATHS = (0, env_paths_1.default)('forge-cli');
-LocalFileStorage.FOLDER = LocalFileStorage.STORAGE_PATHS.data;

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

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetWebTriggerURLCommand = void 0;
 const ari_1 = require("@forge/util/packages/ari");
 class GetWebTriggerURLCommand {
+    getAppConfig;
+    webTriggerClient;
+    appEnvironmentClient;
+    webTriggerGraphqlClient;
     constructor(getAppConfig, webTriggerClient, appEnvironmentClient, webTriggerGraphqlClient) {
         this.getAppConfig = getAppConfig;
         this.webTriggerClient = webTriggerClient;

package/out/webtrigger/graphql-client.js

@@ -10,11 +10,12 @@ class WebTriggerCreationError extends cli_shared_1.GraphQlMutationError {
 exports.WebTriggerCreationError = WebTriggerCreationError;
 class MissingWebTriggerUrlError extends cli_shared_1.GraphQlMutationError {
     constructor(requestId) {
-        super(cli_shared_1.Text.webtrigger.error.creationError(`Web Trigger URL not found after successful creation, requestId: ${requestId !== null && requestId !== void 0 ? requestId : 'N/A'}`), { requestId });
+        super(cli_shared_1.Text.webtrigger.error.creationError(`Web Trigger URL not found after successful creation, requestId: ${requestId ?? 'N/A'}`), { requestId });
     }
 }
 exports.MissingWebTriggerUrlError = MissingWebTriggerUrlError;
 class WebTriggerGraphQLClient {
+    graphQLClient;
     constructor(graphQLClient) {
         this.graphQLClient = graphQLClient;
     }

package/out/workers/analytics-message-worker.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticsMessageWorker = void 0;
 class AnalyticsMessageWorker {
+    storage;
+    messageHandler;
+    cachedConfigService;
     constructor(storage, messageHandler, cachedConfigService) {
         this.storage = storage;
         this.messageHandler = messageHandler;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionCheckWorker = void 0;
 const version_info_1 = require("../command-line/version-info");
 class VersionCheckWorker {
+    workerInfo;
     constructor(workerInfo) {
         this.workerInfo = workerInfo;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "9.3.0",
+  "version": "10.0.0-next.11",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,13 +18,13 @@
     "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "4.16.1",
-    "@forge/cli-shared": "4.2.0",
+    "@forge/bundler": "4.16.2-next.8",
+    "@forge/cli-shared": "5.0.0-next.7",
     "@forge/egress": "1.2.13",
-    "@forge/lint": "5.1.0",
-    "@forge/manifest": "7.2.2",
+    "@forge/lint": "5.1.1-next.7",
+    "@forge/manifest": "7.3.0-next.6",
     "@forge/runtime": "5.8.0",
-    "@forge/tunnel": "5.2.0",
+    "@forge/tunnel": "5.2.1-next.9",
     "@forge/util": "1.4.3",
     "@sentry/node": "7.100.1",
     "ajv": "^8.12.0",
@@ -39,6 +39,7 @@
     "dayjs": "^1.11.10",
     "didyoumean": "^1.2.2",
     "env-paths": "^2.2.1",
+    "exponential-backoff": "^3.1.1",
     "form-data": "^4.0.0",
     "fs-extra": "^11.2.0",
     "hidefile": "^3.0.0",