@forge/cli 12.3.0-next.0-experimental-47556b0 → 12.3.0-next.0-experimental-8a53773

package/out/deploy/packager/runtime-bundler.js

@@ -20,7 +20,7 @@ class RuntimeBundler {
         this.configReader = configReader;
     }
     async packageCode(archiver, entryPoints, i18nResourceBundle) {
-        const moduleList = [];
+        let combinedMetadata = (0, bundler_1.emptyMetadata)();
         if (entryPoints.length > 0) {
             let bundlerResponse;
             try {
@@ -31,16 +31,14 @@ class RuntimeBundler {
             }
             const { outputDir, metadata } = bundlerResponse;
             if (metadata) {
-                if (metadata.modules) {
-                    moduleList.push(...metadata.modules);
-                }
+                combinedMetadata = (0, bundler_1.mergeMetadata)(combinedMetadata, metadata);
             }
             this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
             for (const name of await this.fileSystemReader.getFileGlobList([`${outputDir}/**`])) {
                 archiver.addFileFrom(path_1.default.relative(outputDir, name), name);
             }
         }
-        return moduleList;
+        return combinedMetadata;
     }
     async packageDependencies(archiver) {
         const manifest = JSON.stringify(await this.configReader.readConfig());
@@ -54,13 +52,13 @@ class RuntimeBundler {
     }
     async packageAll(archiver, handlers, packageConfig, i18nResourceBundle) {
         const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
-        const moduleList = await this.packageCode(archiver, entryPoints, i18nResourceBundle);
+        const metadata = await this.packageCode(archiver, entryPoints, i18nResourceBundle);
         await this.packageDependencies(archiver);
         const files = await this.fileSystemReader.getFileGlobList(packageConfig?.extraFiles ?? []);
         for (const fileName of files) {
             archiver.addFileFrom(fileName, fileName);
         }
-        return moduleList;
+        return metadata;
     }
     packageI18nResources(archiver, i18nResourceBundle) {
         (0, cli_shared_1.listFilesInI18nResourceBundle)(i18nResourceBundle).forEach(([fileName, filePath]) => {
@@ -69,13 +67,13 @@ class RuntimeBundler {
     }
     async bundle(handlers, i18nResourceBundle, packageConfig) {
         const archiver = this.archiverFactory();
-        const moduleList = await this.packageAll(archiver, handlers, packageConfig, i18nResourceBundle);
+        const metadata = await this.packageAll(archiver, handlers, packageConfig, i18nResourceBundle);
         if (handlers.length === 0) {
             this.packageI18nResources(archiver, i18nResourceBundle);
         }
         const archivePath = await archiver.finalise();
         this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
-        return { runtimeArchivePath: archivePath, moduleList };
+        return { runtimeArchivePath: archivePath, metadata };
     }
 }
 exports.RuntimeBundler = RuntimeBundler;

package/out/deploy/packager/runtime-bundler.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,10 @@
-import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
+import { CLIDetails } from '@forge/cli-shared';
 import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
 export declare class TunnelAnalyticsService {
     private readonly analyticsClientReporter;
     private readonly cliDetails;
     constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
-    reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
+    reportTunnelFailure(errorName: string, attributes: {
         [key: string]: any;
     }): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,mBAAmB,CAC9B,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;CAgBrC"}
+{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;CAevF"}

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

@@ -9,7 +9,7 @@ class TunnelAnalyticsService {
         this.analyticsClientReporter = analyticsClientReporter;
         this.cliDetails = cliDetails;
     }
-    async reportTunnelFailure(creds, errorName, attributes) {
+    async reportTunnelFailure(errorName, attributes) {
         attributes = {
             error: errorName,
             version: this.cliDetails?.version,
@@ -21,7 +21,7 @@ class TunnelAnalyticsService {
         if (attributes.isUserError === undefined) {
             attributes = { ...attributes, isUserError: false };
         }
-        this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
+        await this.analyticsClientReporter.reportInvokeFailure('tunnel', attributes);
     }
 }
 exports.TunnelAnalyticsService = TunnelAnalyticsService;

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AAGpG,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAC9B,KAAsC,EACtC,SAAiB,EACjB,UAAkC;QAElC,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAChF,CAAC;CACF;AAzBD,wDAyBC"}
+{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAmE;AAGnE,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,UAAkC;QACpF,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,MAAM,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/E,CAAC;CACF;AArBD,wDAqBC"}

package/out/service/tunnel-service.js

@@ -54,7 +54,7 @@ class InProcessTunnelService extends TunnelServiceBase {
             await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor, manifestFileWatcher);
         }
         catch (e) {
-            await this.analyticsService.reportTunnelFailure(creds, e.constructor.name, (0, cli_shared_1.getErrorAttributes)(e));
+            await this.analyticsService.reportTunnelFailure(e.constructor.name, (0, cli_shared_1.getErrorAttributes)(e));
             if (onError) {
                 await onError(e);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAQ2B;AAgB3B,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAe,iBAAiB;IACC;IAA/B,YAA+B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;CAQ5E;AAaD,MAAa,sBAAuB,SAAQ,iBAAiB;IAExC;IACA;IACA;IACA;IAEA;IANnB,YACmB,EAAM,EACN,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D,EAC3E,mBAAwC,EACvB,gBAAwC;QAEzD,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAPV,OAAE,GAAF,EAAE,CAAI;QACN,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAE1D,qBAAgB,GAAhB,gBAAgB,CAAwB;IAG3D,CAAC;IAEM,KAAK,CAAC,GAAG,CACd,aAA4B,EAC5B,KAAsC,EACtC,YAAqB,EACrB,OAAuC;QAEvC,IAAI;YACF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;YAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACnD,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;gBACrF,eAAe;gBACf,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;YAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;SACpG;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;YAClG,IAAI,OAAO,EAAE;gBACX,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;aAClB;iBAAM;gBACL,MAAM,IAAA,wBAAW,EAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAC/B;SACF;IACH,CAAC;CACF;AAvCD,wDAuCC"}
+{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAQ2B;AAgB3B,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAe,iBAAiB;IACC;IAA/B,YAA+B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;CAQ5E;AAaD,MAAa,sBAAuB,SAAQ,iBAAiB;IAExC;IACA;IACA;IACA;IAEA;IANnB,YACmB,EAAM,EACN,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D,EAC3E,mBAAwC,EACvB,gBAAwC;QAEzD,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAPV,OAAE,GAAF,EAAE,CAAI;QACN,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAE1D,qBAAgB,GAAhB,gBAAgB,CAAwB;IAG3D,CAAC;IAEM,KAAK,CAAC,GAAG,CACd,aAA4B,EAC5B,KAAsC,EACtC,YAAqB,EACrB,OAAuC;QAEvC,IAAI;YACF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;YAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACnD,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;gBACrF,eAAe;gBACf,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;YAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;SACpG;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;YAC3F,IAAI,OAAO,EAAE;gBACX,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;aAClB;iBAAM;gBACL,MAAM,IAAA,wBAAW,EAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAC/B;SACF;IACH,CAAC;CACF;AAvCD,wDAuCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "12.3.0-next.0-experimental-47556b0",
+  "version": "12.3.0-next.0-experimental-8a53773",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -18,14 +18,14 @@
     "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "6.1.2-next.0-experimental-47556b0",
-    "@forge/cli-shared": "8.3.0-next.0-experimental-47556b0",
-    "@forge/egress": "2.0.2-next.0-experimental-47556b0",
-    "@forge/lint": "5.10.1-next.0-experimental-47556b0",
-    "@forge/manifest": "10.2.1-next.0-experimental-47556b0",
+    "@forge/bundler": "6.1.2-next.0-experimental-8a53773",
+    "@forge/cli-shared": "8.3.0-next.0-experimental-8a53773",
+    "@forge/egress": "2.0.2-next.0-experimental-8a53773",
+    "@forge/lint": "5.10.1-next.0-experimental-8a53773",
+    "@forge/manifest": "10.2.1-next.0-experimental-8a53773",
     "@forge/i18n": "0.0.7",
     "@forge/runtime": "6.0.2",
-    "@forge/tunnel": "6.0.3-next.0-experimental-47556b0",
+    "@forge/tunnel": "6.0.3-next.0-experimental-8a53773",
     "@forge/util": "2.0.0",
     "@sentry/node": "7.106.0",
     "ajv": "^8.12.0",

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

@@ -1,9 +0,0 @@
-import { GraphQLClient } from '@forge/cli-shared';
-import { Deployment, DeploymentFilterOptions, IntervalInput, ListAppDeploymentsClient } from '../service/deployment-service';
-export declare class DeploymentsGraphqlClient implements ListAppDeploymentsClient {
-    private readonly graphqlClient;
-    constructor(graphqlClient: GraphQLClient);
-    listDeployments(appId: string, interval: IntervalInput, filter?: DeploymentFilterOptions): Promise<Deployment[]>;
-    private getAllDeployments;
-}
-//# sourceMappingURL=deployments-graphql-client.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"deployments-graphql-client.d.ts","sourceRoot":"","sources":["../../src/deployments/deployments-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EACL,UAAU,EACV,uBAAuB,EACvB,aAAa,EACb,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,wBAAyB,YAAW,wBAAwB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,eAAe,CAC1B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,aAAa,EACvB,MAAM,CAAC,EAAE,uBAAuB,GAC/B,OAAO,CAAC,UAAU,EAAE,CAAC;YAKV,iBAAiB;CAqEhC"}

package/out/deployments/deployments-graphql-client.js

@@ -1,73 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeploymentsGraphqlClient = void 0;
-class DeploymentsGraphqlClient {
-    graphqlClient;
-    constructor(graphqlClient) {
-        this.graphqlClient = graphqlClient;
-    }
-    async listDeployments(appId, interval, filter) {
-        const deployments = await this.getAllDeployments(appId, interval, filter);
-        return deployments;
-    }
-    async getAllDeployments(appId, interval, filter) {
-        const query = `
-      query getAppDeployments($appId: ID!, $interval: IntervalInput!, $first: Int, $after: String) {
-        app(id: $appId) {
-          deployments(interval: $interval, first: $first, after: $after) @optIn(to: ["xls-deployments-by-interval", "xls-deployments-major-version"]) {
-            nodes {
-              status
-              environmentKey
-              buildTag
-              majorVersion {
-                version
-              }
-              createdBy {
-                accountId
-                accountStatus
-                name
-              }
-              createdAt
-            }
-            pageInfo {
-              hasNextPage
-              endCursor
-            }
-          }
-        }
-      }
-    `;
-        const output = [];
-        let cursor = filter?.after;
-        let hasNext = true;
-        do {
-            const { app } = await this.graphqlClient.query(query, {
-                appId,
-                interval,
-                first: filter?.first || 100,
-                after: cursor
-            });
-            if (!app?.deployments?.nodes) {
-                break;
-            }
-            const { nodes, pageInfo } = app.deployments;
-            for (const node of nodes) {
-                if (node) {
-                    output.push({
-                        environmentKey: node.environmentKey,
-                        status: node.status,
-                        buildTag: node.buildTag,
-                        majorVersion: node.majorVersion,
-                        createdBy: node.createdBy,
-                        createdAt: node.createdAt
-                    });
-                }
-            }
-            cursor = pageInfo.endCursor;
-            hasNext = pageInfo.hasNextPage;
-        } while (hasNext && cursor);
-        return output;
-    }
-}
-exports.DeploymentsGraphqlClient = DeploymentsGraphqlClient;
-//# sourceMappingURL=deployments-graphql-client.js.map

package/out/deployments/deployments-graphql-client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deployments-graphql-client.js","sourceRoot":"","sources":["../../src/deployments/deployments-graphql-client.ts"],"names":[],"mappings":";;;AASA,MAAa,wBAAwB;IACN;IAA7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEtD,KAAK,CAAC,eAAe,CAC1B,KAAa,EACb,QAAuB,EACvB,MAAgC;QAEhC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC1E,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,KAAa,EACb,QAAuB,EACvB,MAAgC;QAEhC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;KAyBb,CAAC;QAEF,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,IAAI,MAAM,GAAG,MAAM,EAAE,KAAK,CAAC;QAC3B,IAAI,OAAO,GAAG,IAAI,CAAC;QAEnB,GAAG;YACD,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE;gBACpD,KAAK;gBACL,QAAQ;gBACR,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG;gBAC3B,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE;gBAC5B,MAAM;aACP;YAED,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,WAAW,CAAC;YAE5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,IAAI,IAAI,EAAE;oBACR,MAAM,CAAC,IAAI,CAAC;wBACV,cAAc,EAAE,IAAI,CAAC,cAAc;wBACnC,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,YAAY,EAAE,IAAI,CAAC,YAAY;wBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS,EAAE,IAAI,CAAC,SAAS;qBAC1B,CAAC,CAAC;iBACJ;aACF;YAED,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC;YAC5B,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC;SAChC,QAAQ,OAAO,IAAI,MAAM,EAAE;QAE5B,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAjFD,4DAiFC"}

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

@@ -1,37 +0,0 @@
-import { AppConfigProvider } from '@forge/cli-shared';
-export interface Deployment {
-    environmentKey: string;
-    status: string;
-    buildTag?: string;
-    majorVersion?: {
-        version: string;
-    };
-    createdBy?: {
-        accountId: string;
-        accountStatus: string;
-        name: string;
-    };
-    createdAt: string;
-}
-export interface AppDeploymentsList {
-    deployments: Deployment[];
-}
-export interface DeploymentFilterOptions {
-    environmentKey?: string;
-    first?: number;
-    after?: string;
-}
-export interface ListAppDeploymentsClient {
-    listDeployments(appId: string, interval: IntervalInput, filter?: DeploymentFilterOptions): Promise<Deployment[]>;
-}
-export interface IntervalInput {
-    startTime?: string;
-    endTime?: string;
-}
-export declare class DeploymentService {
-    private readonly getAppConfig;
-    private readonly listDeploymentsClient;
-    constructor(getAppConfig: AppConfigProvider, listDeploymentsClient: ListAppDeploymentsClient);
-    listAppDeployments(interval?: IntervalInput, filter?: DeploymentFilterOptions): Promise<AppDeploymentsList>;
-}
-//# sourceMappingURL=deployment-service.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"deployment-service.d.ts","sourceRoot":"","sources":["../../src/service/deployment-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE;QACb,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,SAAS,CAAC,EAAE;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;CAClH;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBADrB,YAAY,EAAE,iBAAiB,EAC/B,qBAAqB,EAAE,wBAAwB;IAGrD,kBAAkB,CAC7B,QAAQ,CAAC,EAAE,aAAa,EACxB,MAAM,CAAC,EAAE,uBAAuB,GAC/B,OAAO,CAAC,kBAAkB,CAAC;CAe/B"}

package/out/service/deployment-service.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeploymentService = void 0;
-class DeploymentService {
-    getAppConfig;
-    listDeploymentsClient;
-    constructor(getAppConfig, listDeploymentsClient) {
-        this.getAppConfig = getAppConfig;
-        this.listDeploymentsClient = listDeploymentsClient;
-    }
-    async listAppDeployments(interval, filter) {
-        const { id: appId } = await this.getAppConfig();
-        const defaultInterval = interval
-            ? interval
-            : {
-                startTime: new Date(Date.now() - 30 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
-                endTime: new Date().toISOString().split('T')[0]
-            };
-        const deployments = await this.listDeploymentsClient.listDeployments(appId, defaultInterval, filter);
-        return { deployments };
-    }
-}
-exports.DeploymentService = DeploymentService;
-//# sourceMappingURL=deployment-service.js.map

package/out/service/deployment-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deployment-service.js","sourceRoot":"","sources":["../../src/service/deployment-service.ts"],"names":[],"mappings":";;;AAoCA,MAAa,iBAAiB;IAET;IACA;IAFnB,YACmB,YAA+B,EAC/B,qBAA+C;QAD/C,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,0BAAqB,GAArB,qBAAqB,CAA0B;IAC/D,CAAC;IAEG,KAAK,CAAC,kBAAkB,CAC7B,QAAwB,EACxB,MAAgC;QAEhC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAGhD,MAAM,eAAe,GAAkB,QAAQ;YAC7C,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC;gBACE,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAChD,CAAC;QAEN,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;QAErG,OAAO,EAAE,WAAW,EAAE,CAAC;IACzB,CAAC;CACF;AAxBD,8CAwBC"}