@forge/cli 6.3.0 → 6.4.0-next.12

package/out/providers/graphql-client.d.ts

@@ -1,9 +1,5 @@
 import { GraphQLClient } from '@forge/cli-shared';
 import { AppProviderDetails, ConfigureProviderClient } from './configure-provider';
-export declare class MissingAppError extends Error {
-}
-export declare class MissingAppEnvironmentError extends Error {
-}
 export declare class GraphqlClient implements ConfigureProviderClient {
     private readonly graphqlClient;
     constructor(graphqlClient: GraphQLClient);

package/out/providers/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/providers/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEnF,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,aAAc,YAAW,uBAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;CA8C3D"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/providers/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEnF,qBAAa,aAAc,YAAW,uBAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;CA8C3D"}

package/out/providers/graphql-client.js

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphqlClient = exports.MissingAppEnvironmentError = exports.MissingAppError = void 0;
+exports.GraphqlClient = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-class MissingAppError extends Error {
-}
-exports.MissingAppError = MissingAppError;
-class MissingAppEnvironmentError extends Error {
-}
-exports.MissingAppEnvironmentError = MissingAppEnvironmentError;
 class GraphqlClient {
     constructor(graphqlClient) {
         this.graphqlClient = graphqlClient;
@@ -40,7 +34,11 @@ class GraphqlClient {
         });
         const error = (0, cli_shared_1.getError)(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code, error.statusCode);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
+                requestId,
+                code: error.code,
+                statusCode: error.statusCode
+            });
         }
     }
 }

package/out/service/resource-packaging-service.d.ts

@@ -1,10 +1,10 @@
 import { Modules } from '@forge/manifest';
-import { FileSystemReader, ResourceDetails, BridgeScriptService, IframeResizerScriptService } from '@forge/cli-shared';
+import { FileSystemReader, ResourceDetails, BridgeScriptService, IframeResizerScriptService, UserError } from '@forge/cli-shared';
 import { Archiver } from '../deploy';
-export declare class ResourceDirectoryMissingError extends Error {
+export declare class ResourceDirectoryMissingError extends UserError {
     constructor(key: string, dir: string);
 }
-export declare class ResourceDirectoryEmptyError extends Error {
+export declare class ResourceDirectoryEmptyError extends UserError {
     constructor(key: string, dir: string);
 }
 export interface ResourceArchives {
@@ -16,16 +16,16 @@ export interface ResourceArchives {
         fileCount: number;
     };
 }
-export declare class MalformedHtmlEntrypointError extends Error {
+export declare class MalformedHtmlEntrypointError extends UserError {
     constructor();
 }
-export declare class MissingHtmlEntrypointError extends Error {
+export declare class MissingHtmlEntrypointError extends UserError {
     constructor();
 }
-export declare class DetailedMissingHtmlEntrypointError extends Error {
+export declare class DetailedMissingHtmlEntrypointError extends UserError {
     constructor(resourceKey: string, directory: string);
 }
-export declare class DetailedMalformedHtmlEntrypointError extends Error {
+export declare class DetailedMalformedHtmlEntrypointError extends UserError {
     constructor(resourceKey: string);
 }
 export declare class ResourcePackagingService {

package/out/service/resource-packaging-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,eAAe,EAGf,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,KAAK;gBACxC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAeD,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,qBAAa,4BAA6B,SAAQ,KAAK;;CAItD;AAED,qBAAa,0BAA2B,SAAQ,KAAK;;CAIpD;AAED,qBAAa,kCAAmC,SAAQ,KAAK;gBAC/C,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,KAAK;gBACjD,WAAW,EAAE,MAAM;CAGhC;AAED,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAJ1B,eAAe,EAAE,MAAM,QAAQ,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B;YAG3D,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAQhD,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,iCAAiC;YAM3B,qBAAqB;IAatB,YAAY,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiCtG"}
+{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,eAAe,EAGf,mBAAmB,EACnB,0BAA0B,EAC1B,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAeD,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,qBAAa,4BAA6B,SAAQ,SAAS;;CAI1D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,qBAAa,kCAAmC,SAAQ,SAAS;gBACnD,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,SAAS;gBACrD,WAAW,EAAE,MAAM;CAGhC;AAED,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAJ1B,eAAe,EAAE,MAAM,QAAQ,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B;YAG3D,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAQhD,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,iCAAiC;YAM3B,qBAAqB;IAatB,YAAY,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiCtG"}

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

@@ -5,37 +5,37 @@ const cli_shared_1 = require("@forge/cli-shared");
 const path_1 = require("path");
 const hidefile_1 = require("hidefile");
 const CUSTOM_UI_ENTRYPOINT = 'index.html';
-class ResourceDirectoryMissingError extends Error {
+class ResourceDirectoryMissingError extends cli_shared_1.UserError {
     constructor(key, dir) {
         super(cli_shared_1.Text.error.resourceDirectoryMissing(key, dir));
     }
 }
 exports.ResourceDirectoryMissingError = ResourceDirectoryMissingError;
-class ResourceDirectoryEmptyError extends Error {
+class ResourceDirectoryEmptyError extends cli_shared_1.UserError {
     constructor(key, dir) {
         super(cli_shared_1.Text.error.resourceDirectoryEmpty(key, dir));
     }
 }
 exports.ResourceDirectoryEmptyError = ResourceDirectoryEmptyError;
-class MalformedHtmlEntrypointError extends Error {
+class MalformedHtmlEntrypointError extends cli_shared_1.UserError {
     constructor() {
         super(cli_shared_1.Text.hostedResources.malformedEntrypoint);
     }
 }
 exports.MalformedHtmlEntrypointError = MalformedHtmlEntrypointError;
-class MissingHtmlEntrypointError extends Error {
+class MissingHtmlEntrypointError extends cli_shared_1.UserError {
     constructor() {
         super(cli_shared_1.Text.hostedResources.missingEntrypoint);
     }
 }
 exports.MissingHtmlEntrypointError = MissingHtmlEntrypointError;
-class DetailedMissingHtmlEntrypointError extends Error {
+class DetailedMissingHtmlEntrypointError extends cli_shared_1.UserError {
     constructor(resourceKey, directory) {
         super(cli_shared_1.Text.hostedResources.missingEntrypointWithResourceDetails(resourceKey, directory));
     }
 }
 exports.DetailedMissingHtmlEntrypointError = DetailedMissingHtmlEntrypointError;
-class DetailedMalformedHtmlEntrypointError extends Error {
+class DetailedMalformedHtmlEntrypointError extends cli_shared_1.UserError {
     constructor(resourceKey) {
         super(cli_shared_1.Text.hostedResources.malformedEntrypointWithKey(resourceKey));
     }

package/out/service/resources-uploader-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resources-uploader-service.d.ts","sourceRoot":"","sources":["../../src/service/resources-uploader-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAIjF,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,0BAA0B,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/F;AAQD,qBAAa,wBAAyB,YAAW,eAAe;IAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAClD,MAAM,CAAC,EAClB,OAAO,EACP,YAAY,EACb,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,0BAA0B,CAAC;KAC1C,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBlB"}
+{"version":3,"file":"resources-uploader-service.d.ts","sourceRoot":"","sources":["../../src/service/resources-uploader-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAI5F,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,0BAA0B,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/F;AAWD,qBAAa,wBAAyB,YAAW,eAAe;IAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAClD,MAAM,CAAC,EAClB,OAAO,EACP,YAAY,EACb,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,0BAA0B,CAAC;KAC1C,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBlB"}

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

@@ -2,11 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourcesUploaderService = void 0;
 const tslib_1 = require("tslib");
+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 Error {
-    constructor() {
+class ResourceUploadError extends cli_shared_1.BaseError {
+    constructor(userError) {
         super('Failed to upload resource to S3');
+        this.userError = userError;
+    }
+    isUserError() {
+        return Boolean(this.userError);
     }
 }
 class ResourcesUploaderService {
@@ -27,7 +32,7 @@ class ResourcesUploaderService {
             body: formData
         });
         if (!response.ok) {
-            throw new ResourceUploadError();
+            throw new ResourceUploadError(response.status >= 400 && response.status < 500);
         }
     }
 }

package/out/webtrigger/graphql-client.d.ts

@@ -1,7 +1,7 @@
 import { GraphQLClient, GraphQlMutationError } from '@forge/cli-shared';
 import { WebTriggerUrlDetails } from './get-webtrigger-url';
 export declare class WebTriggerCreationError extends GraphQlMutationError {
-    constructor(message: string, code: string | undefined);
+    constructor(message: string, requestId: string | undefined, code: string | undefined);
 }
 export declare class MissingWebTriggerUrlError extends GraphQlMutationError {
     constructor(requestId: string | undefined);

package/out/webtrigger/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/webtrigger/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAyC,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,qBAAa,uBAAwB,SAAQ,oBAAoB;gBACnD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,yBAA0B,SAAQ,oBAAoB;gBACrD,SAAS,EAAE,MAAM,GAAG,SAAS;CAO1C;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,mBAAmB,CAAC,EAC/B,KAAK,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACX,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;CAoC1C"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/webtrigger/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAyC,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,qBAAa,uBAAwB,SAAQ,oBAAoB;gBACnD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGrF;AAED,qBAAa,yBAA0B,SAAQ,oBAAoB;gBACrD,SAAS,EAAE,MAAM,GAAG,SAAS;CAQ1C;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,mBAAmB,CAAC,EAC/B,KAAK,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACX,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;CAoC1C"}

package/out/webtrigger/graphql-client.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebTriggerGraphQLClient = exports.MissingWebTriggerUrlError = exports.WebTriggerCreationError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 class WebTriggerCreationError extends cli_shared_1.GraphQlMutationError {
-    constructor(message, code) {
-        super(cli_shared_1.Text.webtrigger.error.creationError(message), code);
+    constructor(message, requestId, code) {
+        super(cli_shared_1.Text.webtrigger.error.creationError(message), { requestId, code });
     }
 }
 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'}`));
+        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 });
     }
 }
 exports.MissingWebTriggerUrlError = MissingWebTriggerUrlError;
@@ -39,7 +39,7 @@ class WebTriggerGraphQLClient {
         };
         const { response: { createWebTriggerUrl: { success, statusCode, message, url } }, requestId } = await this.graphQLClient.mutate(query, variables);
         if (!success) {
-            throw new WebTriggerCreationError(message, statusCode.toString());
+            throw new WebTriggerCreationError(message, requestId, statusCode.toString());
         }
         else {
             if (url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "6.3.0",
+  "version": "6.4.0-next.12",
   "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": "4.1.0",
-    "@forge/cli-shared": "3.4.0",
+    "@forge/bundler": "4.2.0-next.9",
+    "@forge/cli-shared": "3.5.0-next.5",
     "@forge/egress": "^1.1.1",
-    "@forge/lint": "3.2.11",
-    "@forge/manifest": "4.5.2",
+    "@forge/lint": "3.2.12-next.5",
+    "@forge/manifest": "4.5.3-next.1",
     "@forge/util": "1.2.0",
     "ajv": "^6.12.5",
     "archiver": "^5.2.0",
@@ -59,7 +59,7 @@
     "@types/didyoumean": "^1.2.0",
     "@types/fs-extra": "^8.0.1",
     "@types/hidefile": "^3.0.0",
-    "@types/inquirer": "^6.5.0",
+    "@types/inquirer": "^8.2.5",
     "@types/jest": "^29.1.2",
     "@types/js-yaml": "^3.12.2",
     "@types/minimatch": "^3.0.3",