@forge/cli 9.1.0-next.6 → 9.1.1-next.3

package/CHANGELOG.md

@@ -1,5 +1,71 @@
 # @forge/cli
 
+## 9.1.1-next.3
+
+### Patch Changes
+
+- 937db7a: Rollback manifest env var support
+- Updated dependencies [937db7a]
+  - @forge/cli-shared@4.0.1-next.2
+  - @forge/manifest@7.2.0-next.2
+  - @forge/bundler@4.15.11-next.2
+  - @forge/lint@5.0.2-next.2
+  - @forge/tunnel@5.0.2-next.3
+
+## 9.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies [d72f638]
+  - @forge/manifest@7.2.0-next.1
+  - @forge/cli-shared@4.0.1-next.1
+  - @forge/lint@5.0.2-next.1
+  - @forge/tunnel@5.0.2-next.2
+  - @forge/bundler@4.15.11-next.1
+
+## 9.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies [9eee9ac]
+  - @forge/manifest@7.2.0-next.0
+  - @forge/cli-shared@4.0.1-next.0
+  - @forge/lint@5.0.2-next.0
+  - @forge/tunnel@5.0.2-next.1
+  - @forge/bundler@4.15.11-next.0
+
+## 9.1.1-next.0
+
+### Patch Changes
+
+- Updated dependencies [092b932]
+  - @forge/runtime@5.7.0-next.0
+  - @forge/tunnel@5.0.2-next.0
+
+## 9.1.0
+
+### Minor Changes
+
+- 83e1cd7: Add environment variable parsing in the manifest
+
+### Patch Changes
+
+- eb06eca: Break more dependencies between SDK and runtime
+- c6f6422: Use runtime options from templates correctly
+- Updated dependencies [eb06eca]
+- Updated dependencies [f8a4714]
+- Updated dependencies [2204a73]
+- Updated dependencies [83e1cd7]
+- Updated dependencies [c6f6422]
+- Updated dependencies [314d732]
+  - @forge/bundler@4.15.10
+  - @forge/runtime@5.6.1
+  - @forge/tunnel@5.0.1
+  - @forge/util@1.4.3
+  - @forge/cli-shared@4.0.0
+  - @forge/manifest@7.1.0
+  - @forge/lint@5.0.1
+
 ## 9.1.0-next.6
 
 ### Patch Changes

package/npm-shrinkwrap.json

@@ -1,23 +1,23 @@
 {
   "name": "@forge/cli",
-  "version": "9.1.0-next.6",
+  "version": "9.1.1-next.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@forge/cli",
-      "version": "9.1.0-next.6",
+      "version": "9.1.1-next.3",
       "hasInstallScript": true,
       "license": "UNLICENSED",
       "dependencies": {
-        "@forge/bundler": "4.15.10-next.5",
-        "@forge/cli-shared": "4.0.0-next.3",
+        "@forge/bundler": "4.15.11-next.2",
+        "@forge/cli-shared": "4.0.1-next.2",
         "@forge/egress": "1.2.13",
-        "@forge/lint": "5.0.1-next.3",
-        "@forge/manifest": "7.1.0-next.1",
-        "@forge/runtime": "5.6.1-next.1",
-        "@forge/tunnel": "5.0.1-next.6",
-        "@forge/util": "1.4.3-next.0",
+        "@forge/lint": "5.0.2-next.2",
+        "@forge/manifest": "7.2.0-next.2",
+        "@forge/runtime": "5.7.0-next.0",
+        "@forge/tunnel": "5.0.2-next.3",
+        "@forge/util": "1.4.3",
         "@sentry/node": "7.100.1",
         "ajv": "^8.12.0",
         "archiver": "^6.0.2",
@@ -877,9 +877,9 @@
       "integrity": "sha512-zG50ZRzbKyWHVb/XjI6iCIyyDNmSHdlclvehMjFZ/A3qpHExjSCjaszeY6gBDJKD2GORKKjQ3LS1UyRpiVVvkA=="
     },
     "node_modules/@forge/bundler": {
-      "version": "4.15.10-next.5",
-      "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.10-next.5.tgz",
-      "integrity": "sha512-JYliU4w8GMPEqJWPv/RuRayOAFc4JiwjIaEndkfuwXO1oX/ac0uPCPVMvCLLcaBTMr/LE9UQZd+X3auo61PDcQ==",
+      "version": "4.15.11-next.2",
+      "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.11-next.2.tgz",
+      "integrity": "sha512-yo1B5gr4r++/ZIXKeOJBfeFWm5IgwhfZxxqUY/AINR6YkUxloDNOlFoWUDfrQ3AUerIROflrco12uJlPgYyHfA==",
       "dependencies": {
         "@babel/core": "^7.24.0",
         "@babel/plugin-transform-class-properties": "^7.23.3",
@@ -888,11 +888,11 @@
         "@babel/plugin-transform-optional-chaining": "^7.23.4",
         "@babel/plugin-transform-react-jsx": "^7.23.4",
         "@babel/preset-typescript": "^7.23.3",
-        "@forge/api": "3.5.0-next.1",
+        "@forge/api": "3.5.0",
         "@forge/babel-plugin-transform-ui": "1.1.18",
-        "@forge/cli-shared": "4.0.0-next.3",
-        "@forge/lint": "5.0.1-next.3",
-        "@forge/util": "1.4.3-next.0",
+        "@forge/cli-shared": "4.0.1-next.2",
+        "@forge/lint": "5.0.2-next.2",
+        "@forge/util": "1.4.3",
         "assert": "^2.1.0",
         "babel-loader": "^8.3.0",
         "browserify-zlib": "^0.2.0",
@@ -930,14 +930,14 @@
       }
     },
     "node_modules/@forge/bundler/node_modules/@forge/api": {
-      "version": "3.5.0-next.1",
-      "resolved": "https://registry.npmjs.org/@forge/api/-/api-3.5.0-next.1.tgz",
-      "integrity": "sha512-pcrtOri6MQnz29Nh4zr6z8TLphjJROyYhVQCMvsgvXo5XNrXs3dTl90RwhoG5p5iURe+o8TD/thu3ypSHRn70A==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@forge/api/-/api-3.5.0.tgz",
+      "integrity": "sha512-FNEa1IgpB5P5P4rMchIoyUt4pXafyoJWu1dN4yWaYLIiOPTiVvn4ZfyYKQIEoKNDeTqBsqOGY0z2norSyrUeAA==",
       "dependencies": {
         "@forge/auth": "0.0.5",
         "@forge/egress": "1.2.13",
         "@forge/storage": "1.5.15",
-        "@forge/util": "1.4.3-next.0",
+        "@forge/util": "1.4.3",
         "@types/node-fetch": "^2.6.11",
         "node-fetch": "2.7.0"
       }
@@ -948,12 +948,12 @@
       "integrity": "sha512-n4AWXkzMA4Pv4nam+dTu7PHgDQtMwaAF2MalOWF323zGvYKS/gZJY+7efJq0DLP783iTfjvYT879EHhCrfvEXA=="
     },
     "node_modules/@forge/cli-shared": {
-      "version": "4.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-4.0.0-next.3.tgz",
-      "integrity": "sha512-ZP2UOKjlUyrE6SHuwrHvEMpNlpj8IrgF70YkP6TVUtJ+Gme7W1viD2UoUKmjaaiNamXfR8YgHvB7Qf/bqA9WEg==",
+      "version": "4.0.1-next.2",
+      "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-4.0.1-next.2.tgz",
+      "integrity": "sha512-uLQKZvzy8eH6D+zN+BKCjBLPAaRASENYh78C2bNR/QJU84hwfmqA5r5LDsMI4t5JRhHLqcxcHfXZYM1EF0cghw==",
       "dependencies": {
-        "@forge/manifest": "7.1.0-next.1",
-        "@forge/util": "1.4.3-next.0",
+        "@forge/manifest": "7.2.0-next.2",
+        "@forge/util": "1.4.3",
         "@sentry/node": "7.100.1",
         "adm-zip": "^0.5.10",
         "array.prototype.flatmap": "^1.3.2",
@@ -1003,13 +1003,13 @@
       }
     },
     "node_modules/@forge/lint": {
-      "version": "5.0.1-next.3",
-      "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.0.1-next.3.tgz",
-      "integrity": "sha512-H/gWjUgEOswgHMJJnkZ6hyLtizgJBUmtvhg+MeUQVWDFxCPtwOkUfJW+Synir/SqXyO4wVZChI7NHpqr3Fusig==",
+      "version": "5.0.2-next.2",
+      "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.0.2-next.2.tgz",
+      "integrity": "sha512-TYxSPz6VHNboTIxS0P2veExNYlwWtD5BuQ1ZgmNFuwJ3F2C0CQRM+DnMLrr1UTJiUaD9G1MIq98KY+aF2hWXCg==",
       "dependencies": {
-        "@forge/cli-shared": "4.0.0-next.3",
+        "@forge/cli-shared": "4.0.1-next.2",
         "@forge/egress": "1.2.13",
-        "@forge/manifest": "7.1.0-next.1",
+        "@forge/manifest": "7.2.0-next.2",
         "@typescript-eslint/typescript-estree": "^5.62.0",
         "array.prototype.flatmap": "^1.3.2",
         "atlassian-openapi": "^1.0.18",
@@ -1018,12 +1018,11 @@
       }
     },
     "node_modules/@forge/manifest": {
-      "version": "7.1.0-next.1",
-      "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-7.1.0-next.1.tgz",
-      "integrity": "sha512-wjgooSiiVDwQdJJwy1AhfrEpMNRqGaD4eeI7j3UYiSazXqt5Oc1KxiIpIitKJ2dNkgdnXVxeYF7sTkl7jS6T/A==",
+      "version": "7.2.0-next.2",
+      "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-7.2.0-next.2.tgz",
+      "integrity": "sha512-M/klCm3kxkQKL72HzajAwtHM8dQ6IPtHZUAQMtOz14NbYiXu0rNbe5p0DzSaErgzD29qfmxgZzV4SzWOw/Wj2w==",
       "dependencies": {
-        "@forge/util": "1.4.3-next.0",
-        "@sentry/node": "7.100.1",
+        "@forge/util": "1.4.3",
         "ajv": "^8.12.0",
         "ajv-formats": "2.1.1",
         "cheerio": "^0.22.0",
@@ -1036,11 +1035,11 @@
       }
     },
     "node_modules/@forge/runtime": {
-      "version": "5.6.1-next.1",
-      "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.6.1-next.1.tgz",
-      "integrity": "sha512-ogj/DGx++iQsZuFhrc5BcTV+3s1ym85QUx5kZwxd1BVil63/aCiI15mo3kK/SJ0RAb+9HRG5GNZAxVfYr02PSQ==",
+      "version": "5.7.0-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.7.0-next.0.tgz",
+      "integrity": "sha512-qxinW3kxHnYMSddwGQDGrJRaq0a9SJhES0vjJrIWZbG9OExexxub5kEvLYYv0W3zeeBaT9tVr0Z6KW8W/z1azA==",
       "dependencies": {
-        "@forge/util": "1.4.3-next.0",
+        "@forge/util": "1.4.3",
         "fp-ts": "^2.16.2",
         "io-ts": "^2.2.21",
         "io-ts-reporters": "^2.0.1",
@@ -1051,14 +1050,14 @@
       }
     },
     "node_modules/@forge/tunnel": {
-      "version": "5.0.1-next.6",
-      "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.0.1-next.6.tgz",
-      "integrity": "sha512-UkhQV6ek1cpSptfwzvyWcynnJe0F8xamPhEFb68BfHaCtL5QH2VJ0LiSXTmfWprvYRJfgHoH9kPvyjrfFl55rg==",
+      "version": "5.0.2-next.3",
+      "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.0.2-next.3.tgz",
+      "integrity": "sha512-UVzcA7j14Aw8rV1HH5u3zhtYzUf/Pz/kLjq+Onue8DLSCu8gNO3GKJqAiZFCahw5rWQodEx/2PpldnJE6o1utA==",
       "dependencies": {
-        "@forge/bundler": "4.15.10-next.5",
-        "@forge/cli-shared": "4.0.0-next.3",
+        "@forge/bundler": "4.15.11-next.2",
+        "@forge/cli-shared": "4.0.1-next.2",
         "@forge/csp": "3.2.1",
-        "@forge/runtime": "5.6.1-next.1",
+        "@forge/runtime": "5.7.0-next.0",
         "express": "^4.18.3",
         "express-intercept": "^1.1.0",
         "http-proxy-middleware": "^2.0.6",
@@ -1071,9 +1070,9 @@
       }
     },
     "node_modules/@forge/util": {
-      "version": "1.4.3-next.0",
-      "resolved": "https://registry.npmjs.org/@forge/util/-/util-1.4.3-next.0.tgz",
-      "integrity": "sha512-8eSloK1ELnxTcqjIFowFjCKtHfXjv7mX9oZweQuZidenNz7KuK7CMF4WPJIRB10iuvTnKpQtuVsBf+HjKNd8KA==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@forge/util/-/util-1.4.3.tgz",
+      "integrity": "sha512-CdnsuTv5cl8cifwaBkrw2l1dWHcQ08+/KSyattgucNrO4ci2cJPUQMJWo08XTLqZ2Na79xsGMjTY9bcb6h5LUA==",
       "dependencies": {
         "ts-is-present": "^1.2.2",
         "webpack": "5.90.3",

package/out/analytics-client/analytics-client.js

@@ -20,41 +20,30 @@ function appAidOrUndefined(appAri) {
     }
 }
 class AnalyticsClientReporter {
-    storage;
-    logger;
-    configService;
     constructor(storage, logger, configService) {
         this.storage = storage;
         this.logger = logger;
         this.configService = configService;
+        this.source = 'forge/cli';
     }
-    source = 'forge/cli';
     reportSuccess(cmdName, cred, attributes) {
         this.processAnalyticsEvent({
             id: (0, uuid_1.v4)(),
             eventType: analytics_message_handler_1.EventType.TRACK,
-            event: {
-                timestamp: new Date(),
-                os: {
+            event: Object.assign(Object.assign({ timestamp: new Date(), os: {
                     name: os.platform(),
                     version: os.release()
-                },
-                ...this._getUserId(cred),
-                trackEvent: {
+                } }, this._getUserId(cred)), { trackEvent: {
                     source: this.source,
                     action: 'invoked',
                     actionSubject: cmdName,
                     attributes: this._getAttributes(attributes),
                     containers: this._getContainer(attributes)
-                }
-            }
+                } })
         });
     }
     reportFailure(cmdName, cred, attributes, e) {
-        attributes = {
-            ...attributes,
-            ...this._getErrorDetails(e)
-        };
+        attributes = Object.assign(Object.assign({}, attributes), this._getErrorDetails(e));
         this.reportOperationalEvent('invoked', cmdName, cred, attributes);
     }
     reportCommandInvoke(cmdName, cred, attributes) {
@@ -62,7 +51,7 @@ class AnalyticsClientReporter {
     }
     reportInvokeFailure(cmdName, cred, attributes, e) {
         if (e) {
-            attributes = { ...attributes, ...this._getErrorListDetails(e) };
+            attributes = Object.assign(Object.assign({}, attributes), this._getErrorListDetails(e));
         }
         this.reportOperationalEvent('cmdInvokeFailed', cmdName, cred, attributes);
     }
@@ -70,23 +59,16 @@ class AnalyticsClientReporter {
         this.processAnalyticsEvent({
             id: (0, uuid_1.v4)(),
             eventType: analytics_message_handler_1.EventType.OPERATIONAL,
-            event: {
-                timestamp: new Date(),
-                os: {
+            event: Object.assign(Object.assign({ timestamp: new Date(), os: {
                     name: os.platform(),
                     version: os.release()
-                },
-                ...this._getUserId(cred),
-                operationalEvent: {
+                } }, this._getUserId(cred)), { operationalEvent: {
                     source: this.source,
                     action,
                     actionSubject,
-                    attributes: {
-                        ...this._getAttributes(attributes)
-                    },
+                    attributes: Object.assign({}, this._getAttributes(attributes)),
                     containers: this._getContainer(attributes)
-                }
-            }
+                } })
         });
     }
     processAnalyticsEvent(analyticsEvent) {
@@ -151,19 +133,10 @@ class AnalyticsClientReporter {
         return mappedValue ? { [name]: mappedValue } : {};
     }
     _getAttributes(attributes) {
-        return {
-            ...attributes,
-            ...this._asAttribute(attributes.appId, 'appId', appAidOrUndefined),
-            ...this._nodeVersion(),
-            ...this._machineId()
-        };
+        return Object.assign(Object.assign(Object.assign(Object.assign({}, attributes), this._asAttribute(attributes.appId, 'appId', appAidOrUndefined)), this._nodeVersion()), this._machineId());
     }
     _getContainer(attributes) {
-        return {
-            ...this._asContainer(attributes.appId, 'app', 'appId', appAidOrUndefined),
-            ...this._asContainer(attributes.appEnv, 'appEnv', 'environment'),
-            ...this._asContainer(attributes.product, 'product', 'product')
-        };
+        return Object.assign(Object.assign(Object.assign({}, this._asContainer(attributes.appId, 'app', 'appId', appAidOrUndefined)), this._asContainer(attributes.appEnv, 'appEnv', 'environment')), this._asContainer(attributes.product, 'product', 'product'));
     }
 }
 exports.AnalyticsClientReporter = AnalyticsClientReporter;

package/out/analytics-client/analytics-message-handler.js

@@ -9,36 +9,35 @@ var EventType;
     EventType["UI"] = "ui";
 })(EventType = exports.EventType || (exports.EventType = {}));
 class AnalyticsMessageHandler {
-    environment;
     constructor(environment) {
         this.environment = environment;
-    }
-    aClient = (0, analytics_node_client_1.analyticsClient)({
-        env: this.environment || 'prod',
-        product: 'forge',
-        subproduct: 'cli',
-        flushAt: 1,
-        flushInterval: 1
-    });
-    handleMessage = async (message) => {
-        if (!message) {
-            return;
-        }
-        try {
-            switch (message.eventType) {
-                case EventType.TRACK:
-                    await this.aClient.sendTrackEvent(message.event);
-                    break;
-                case EventType.OPERATIONAL:
-                    await this.aClient.sendOperationalEvent(message.event);
-                    break;
-                case EventType.UI:
-                    await this.aClient.sendUIEvent(message.event);
-                    break;
+        this.aClient = (0, analytics_node_client_1.analyticsClient)({
+            env: this.environment || 'prod',
+            product: 'forge',
+            subproduct: 'cli',
+            flushAt: 1,
+            flushInterval: 1
+        });
+        this.handleMessage = async (message) => {
+            if (!message) {
+                return;
+            }
+            try {
+                switch (message.eventType) {
+                    case EventType.TRACK:
+                        await this.aClient.sendTrackEvent(message.event);
+                        break;
+                    case EventType.OPERATIONAL:
+                        await this.aClient.sendOperationalEvent(message.event);
+                        break;
+                    case EventType.UI:
+                        await this.aClient.sendUIEvent(message.event);
+                        break;
+                }
             }
-        }
-        catch (e) {
-        }
-    };
+            catch (e) {
+            }
+        };
+    }
 }
 exports.AnalyticsMessageHandler = AnalyticsMessageHandler;

package/out/autocomplete/index.js

@@ -8,6 +8,7 @@ const util_1 = require("./util");
 const autocompleteConfig = autocomplete_config_json_1.default;
 const processAutocompleteFactory = (autocompleteConfig) => {
     const processAutocomplete = (_, { line, reply }) => {
+        var _a;
         const splitLine = line.split(' ');
         const numArgs = splitLine.length;
         if (numArgs === 2) {
@@ -24,7 +25,7 @@ const processAutocompleteFactory = (autocompleteConfig) => {
             }
             const commandOptions = autocompleteConfig.commands[command];
             const lastArg = splitLine.slice(-2, -1)[0];
-            if (commandOptions[lastArg]?.requireUserArg) {
+            if ((_a = commandOptions[lastArg]) === null || _a === void 0 ? void 0 : _a.requireUserArg) {
                 return;
             }
             const userOptionsSelected = (0, util_1.getUserOptionsSelectedFromSplitLine)(splitLine);

package/out/autocomplete/util.js

@@ -6,7 +6,7 @@ const getUserOptionsSelectedFromSplitLine = (splitLine) => {
 };
 exports.getUserOptionsSelectedFromSplitLine = getUserOptionsSelectedFromSplitLine;
 const getRemainingOptions = (commandOptions, userSelectedOptions) => {
-    const commandOptionsClone = { ...commandOptions };
+    const commandOptionsClone = Object.assign({}, commandOptions);
     for (const option of userSelectedOptions) {
         delete commandOptionsClone[option];
     }

package/out/bin/postinstall.js

@@ -13,7 +13,7 @@ const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_
 const configService = new cached_config_service_1.CachedConfigService(cachedConf);
 const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, configService);
 const cliDetails = (0, version_info_1.getCLIDetails)();
-const attributes = { version: cliDetails?.version };
+const attributes = { version: cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version };
 const anonId = (0, anon_user_id_1.getAnonId)(true);
 analyticsClientReporter.reportSuccess('postinstall', anonId, attributes);
 if ((0, isSupportedShell_1.isSupportedShell)()) {