@forge/cli 6.8.3-next.9 → 6.9.0

package/out/installations/graphql-client.js

@@ -45,8 +45,8 @@ class MissingTaskIdError extends Error {
 }
 exports.MissingTaskIdError = MissingTaskIdError;
 class InstallationRequestFailedError extends cli_shared_1.BaseError {
-    constructor(userError, code, message) {
-        super(message);
+    constructor(userError, code, message, requestId) {
+        super(requestId, message);
         this.userError = userError;
         this.code = code;
     }
@@ -186,14 +186,14 @@ class InstallationsGraphqlClient {
         var _a, _b, _c, _d;
         let status = cli_shared_1.AppTaskState.Pending;
         while (status !== cli_shared_1.AppTaskState.Complete) {
-            const { state, errors } = await this.getAppInstallationTask(taskId);
+            const { state, errors, requestId } = await this.getAppInstallationTask(taskId);
             status = state;
             if (status === cli_shared_1.AppTaskState.Failed) {
                 const error = errors === null || errors === void 0 ? void 0 : errors[0];
                 const statusCode = (_a = error === null || error === void 0 ? void 0 : error.extensions) === null || _a === void 0 ? void 0 : _a.statusCode;
                 const isUserError = statusCode && statusCode >= 400 && statusCode < 500 ? true : false;
                 const code = (_c = (_b = error === null || error === void 0 ? void 0 : error.extensions) === null || _b === void 0 ? void 0 : _b.errorType) !== null && _c !== void 0 ? _c : undefined;
-                throw new InstallationRequestFailedError(isUserError, code, (_d = error === null || error === void 0 ? void 0 : error.message) !== null && _d !== void 0 ? _d : undefined);
+                throw new InstallationRequestFailedError(isUserError, code, (_d = error === null || error === void 0 ? void 0 : error.message) !== null && _d !== void 0 ? _d : undefined, requestId);
             }
             if (status !== cli_shared_1.AppTaskState.Complete)
                 await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);
@@ -267,7 +267,7 @@ class InstallationsGraphqlClient {
         }
       }
     `;
-        const { appInstallationTask } = await this.graphqlClient.query(query, {
+        const { appInstallationTask, requestId } = await this.graphqlClient.query(query, {
             id: taskId
         });
         if (!appInstallationTask) {
@@ -276,7 +276,8 @@ class InstallationsGraphqlClient {
         const { state, errors } = appInstallationTask;
         return {
             errors,
-            state
+            state,
+            requestId
         };
     }
     async monitorUninstallApp(taskId) {
@@ -326,7 +327,7 @@ class InstallationsGraphqlClient {
                 environmentType,
                 context: installation.installationContext,
                 site,
-                version: installation.version || {
+                version: installation.appEnvironmentVersion || {
                     isLatest: false
                 }
             };
@@ -341,13 +342,13 @@ class InstallationsGraphqlClient {
             nodes {
               id
               installationContext
-              version {
-                isLatest
-              }
               appEnvironment {
                 key
                 type
               }
+              appEnvironmentVersion {
+                isLatest
+              }
             }
             pageInfo {
               hasNextPage

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

@@ -6,12 +6,12 @@ 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 {
-    constructor(userError) {
-        super('Failed to upload resource to S3');
+    constructor(userError = false, requestId) {
+        super(requestId, 'Failed to upload resource to S3');
         this.userError = userError;
     }
     isUserError() {
-        return Boolean(this.userError);
+        return this.userError;
     }
 }
 class ResourcesUploaderService {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "6.8.3-next.9",
+  "version": "6.9.0",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,13 +18,13 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "4.6.6-next.6",
-    "@forge/cli-shared": "3.11.0-next.4",
-    "@forge/egress": "1.1.3-next.0",
-    "@forge/lint": "3.3.0-next.6",
-    "@forge/manifest": "4.10.0-next.2",
+    "@forge/bundler": "4.6.6",
+    "@forge/cli-shared": "3.11.0",
+    "@forge/egress": "1.2.0",
+    "@forge/lint": "3.3.0",
+    "@forge/manifest": "4.10.0",
     "@forge/runtime": "4.3.2",
-    "@forge/tunnel": "3.3.5-next.6",
+    "@forge/tunnel": "3.3.5",
     "@forge/util": "1.2.3",
     "@sentry/node": "^7.29.0",
     "ajv": "^6.12.6",
@@ -49,7 +49,7 @@
     "node-machine-id": "^1.1.12",
     "omelette": "^0.4.17",
     "ora": "^4.0.3",
-    "portfinder": "^1.0.25",
+    "portfinder": "^1.0.32",
     "sanitize-filename": "^1.6.3",
     "semver": "^6.3.0",
     "tmp": "^0.1.0",
@@ -74,7 +74,7 @@
     "@types/omelette": "^0.4.2",
     "@types/semver": "^6.0.1",
     "@types/tmp": "^0.1.0",
-    "@types/unzipper": "^0.10.1",
+    "@types/unzipper": "^0.10.5",
     "@types/uuid": "^3.4.10",
     "jest": "^29.1.2",
     "jest-fixtures": "^0.6.0",