@forge/manifest 10.0.1-next.7-experimental-effab31 → 10.1.0-next.8

package/CHANGELOG.md

@@ -1,24 +1,10 @@
 # @forge/manifest
 
-## 10.0.1-next.7-experimental-effab31
+## 10.1.0-next.8
 
 ### Minor Changes
 
-- effab31: Bumped cheerio from 0.22 to 1.1
-
-### Patch Changes
-
-- 5d07fbf: Update the default value for inScopeEUD of egress entries by the linter
-- 4b15e26: Rename some Confluence events from 'removed' to 'deleted' events for consistency with other products. Neither of the renamed events are active yet.
-- 634d7b9: Bump max resource limit from 10 to 50
-- b9574d4: Limit number of automation actions per app
-- 195411c: patch dependencies
-- d97a252: Add new Forge events and update scopes for unreleased Forge events
-- 1479d2d: Update manifest definitions
-- ca7e661: Update manifest definitions
-- 5ab2c49: Update manifest definitions
-- Updated dependencies [195411c]
-  - @forge/i18n@0.0.7-next.0-experimental-effab31
+- 46daa27: Added support for default environment variable declaration in the manifest
 
 ## 10.0.1-next.7
 

package/out/interpolator/environment-variable-interpolator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment-variable-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/environment-variable-interpolator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,qBAAa,oCAAqC,SAAQ,yBAAyB;gBACrE,OAAO,EAAE,MAAM;CAI5B;AAKD,qBAAa,+BAAgC,YAAW,oBAAoB;IAS9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAR1C,IAAI,EAAE,gBAAgB,CAAyC;IAI/D,6BAA6B,SAAqC;IAElE,OAAO,CAAC,gBAAgB,CAAW;gBAEN,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAM;IAInF,WAAW,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,cAAc;IAKjE,OAAO,CAAC,0BAA0B,CAkBhC;CACH"}
+{"version":3,"file":"environment-variable-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/environment-variable-interpolator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,qBAAa,oCAAqC,SAAQ,yBAAyB;gBACrE,OAAO,EAAE,MAAM;CAI5B;AAUD,qBAAa,+BAAgC,YAAW,oBAAoB;IAS9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAR1C,IAAI,EAAE,gBAAgB,CAAyC;IAI/D,6BAA6B,SAAqC;IAElE,OAAO,CAAC,gBAAgB,CAAsB;gBAEjB,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAM;IAInF,WAAW,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,cAAc;IAmBjE,OAAO,CAAC,0BAA0B,CAoBhC;CACH"}

package/out/interpolator/environment-variable-interpolator.js

@@ -23,7 +23,22 @@ class EnvironmentVariableInterpolator {
         this.envVarsToReplace = [];
     }
     interpolate({ manifest }) {
-        this.envVarsToReplace = manifest.environment?.variables ?? [];
+        this.envVarsToReplace = [];
+        if (manifest.environment && manifest.environment.variables) {
+            this.envVarsToReplace = manifest.environment.variables.map((manifestEnvVar) => {
+                if (typeof manifestEnvVar === 'string') {
+                    return {
+                        key: manifestEnvVar
+                    };
+                }
+                else {
+                    return {
+                        key: manifestEnvVar.key,
+                        default: manifestEnvVar.default
+                    };
+                }
+            });
+        }
         return (0, yaml_1.parse)(JSON.stringify(manifest), this.environmentVariableReviver);
     }
     environmentVariableReviver = (_, value) => {
@@ -31,10 +46,11 @@ class EnvironmentVariableInterpolator {
             return value;
         }
         value = value.replace(this.POSSIBLE_ENVIRONMENT_VARIABLE, (original, envVarName) => {
-            if (!this.envVarsToReplace.includes(envVarName)) {
+            const envVarToReplace = this.envVarsToReplace.find((envVar) => envVar.key === envVarName);
+            if (!envVarToReplace) {
                 return original;
             }
-            const envVar = this.envVarsRecord[envVarName];
+            const envVar = this.envVarsRecord[envVarName] ?? envVarToReplace.default;
             if (envVar === undefined) {
                 throw new EnvironmentVariableInterpolatorError(text_1.errors.schema.missingEnvironmentVariable(envVarName));
             }

package/out/schema/manifest-schema.json

@@ -27676,8 +27676,16 @@
                     "title": "variables",
                     "description": "Manifest environment variables",
                     "items": {
-                        "type": "string",
-                        "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$"
+                        "oneOf": [
+                            {
+                                "$ref": "#/definitions/EnvVarString",
+                                "title": "EnvVarString"
+                            },
+                            {
+                                "$ref": "#/definitions/EnvVarObject",
+                                "title": "EnvVarObject"
+                            }
+                        ]
                     }
                 }
             }
@@ -27835,6 +27843,28 @@
                 }
             }
         },
+        "EnvVarString": {
+            "type": "string",
+            "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$",
+            "description": "An environment variable name, which can be used in the manifest"
+        },
+        "EnvVarObject": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": [
+                "key", "default"
+            ],
+            "properties": {
+                "key": {
+                    "$ref": "#/definitions/EnvVarString",
+                    "description": "The name of the environment variable"
+                },
+                "default": {
+                    "type": "string",
+                    "description": "The default value of the environment variable"
+                }
+            }
+        },
         "AuthProviderPredefined": {
             "type": "object",
             "additionalProperties": false,

package/out/schema/manifest.d.ts

@@ -721,10 +721,14 @@ export type OAuth2ScopeName = string;
  * External authentication providers
  */
 export type Auth = (AuthProviderCustom | AuthProviderPredefined)[];
+/**
+ * An environment variable name, which can be used in the manifest
+ */
+export type EnvVarString = string;
 /**
  * Manifest environment variables
  */
-export type Variables = string[];
+export type Variables = (EnvVarString | EnvVarObject)[];
 export type TranslationsResources = [
   {
     key: ForgeSupportedLocaleCode;
@@ -72678,6 +72682,16 @@ export interface AuthProviderPredefined {
 export interface Environment {
   variables?: Variables;
 }
+export interface EnvVarObject {
+  /**
+   * The name of the environment variable
+   */
+  key: string;
+  /**
+   * The default value of the environment variable
+   */
+  default: string;
+}
 export interface Translations {
   resources: TranslationsResources;
   fallback: TranslationsFallback;

package/out/validators/resources-validator.js

@@ -4,7 +4,7 @@ exports.ResourcesValidator = exports.MAX_RESOURCE_COUNT = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = require("path");
-const cheerio_1 = require("cheerio");
+const cheerio_1 = tslib_1.__importDefault(require("cheerio"));
 const utils_1 = require("../utils");
 const text_1 = require("../text");
 const utils_2 = require("../utils");
@@ -88,7 +88,7 @@ class ResourcesValidator {
                         return;
                     if (fs_1.default.existsSync((0, path_1.resolve)(manifestDir, path, 'index.html'))) {
                         const content = fs_1.default.readFileSync((0, path_1.resolve)(manifestDir, path, 'index.html'));
-                        const $ = (0, cheerio_1.load)(content, { xml: { xmlMode: false } });
+                        const $ = cheerio_1.default.load(content);
                         const cspContent = $('meta[http-equiv="Content-Security-Policy"]').attr('content');
                         if (cspContent) {
                             const cspStyleSrc = cspContent.split(';').find((s) => s.startsWith('style-src'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/manifest",
-  "version": "10.0.1-next.7-experimental-effab31",
+  "version": "10.1.0-next.8",
   "description": "Definitions and validations of the Forge manifest",
   "main": "out/index.js",
   "scripts": {
@@ -24,11 +24,11 @@
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
   "dependencies": {
-    "@forge/i18n": "0.0.7-next.0-experimental-effab31",
+    "@forge/i18n": "0.0.7-next.0",
     "@sentry/node": "7.106.0",
     "ajv": "^8.12.0",
     "ajv-formats": "2.1.1",
-    "cheerio": "^1.1.0",
+    "cheerio": "^0.22.0",
     "glob": "^10.3.10",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",