npm package diff
Package: @forge/manifest
Versions: 10.1.0-next.8 - 10.0.1-next.7-experimental-effab31
Modified: package/out/interpolator/environment-variable-interpolator.js
Index: package/out/interpolator/environment-variable-interpolator.js
===================================================================
--- package/out/interpolator/environment-variable-interpolator.js
+++ package/out/interpolator/environment-variable-interpolator.js
@@ -22,36 +22,20 @@
this.envVarsRecord = envVarsRecord;
this.envVarsToReplace = [];
}
interpolate({ manifest }) {
- 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
- };
- }
- });
- }
+ this.envVarsToReplace = manifest.environment?.variables ?? [];
return (0, yaml_1.parse)(JSON.stringify(manifest), this.environmentVariableReviver);
}
environmentVariableReviver = (_, value) => {
if (!(typeof value == 'string')) {
return value;
}
value = value.replace(this.POSSIBLE_ENVIRONMENT_VARIABLE, (original, envVarName) => {
- const envVarToReplace = this.envVarsToReplace.find((envVar) => envVar.key === envVarName);
- if (!envVarToReplace) {
+ if (!this.envVarsToReplace.includes(envVarName)) {
return original;
}
- const envVar = this.envVarsRecord[envVarName] ?? envVarToReplace.default;
+ const envVar = this.envVarsRecord[envVarName];
if (envVar === undefined) {
throw new EnvironmentVariableInterpolatorError(text_1.errors.schema.missingEnvironmentVariable(envVarName));
}
Sentry.captureMessage('replaced environment variable');Modified: package/out/validators/resources-validator.js
Index: package/out/validators/resources-validator.js
===================================================================
--- package/out/validators/resources-validator.js
+++ package/out/validators/resources-validator.js
@@ -3,9 +3,9 @@
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 = tslib_1.__importDefault(require("cheerio"));
+const cheerio_1 = require("cheerio");
const utils_1 = require("../utils");
const text_1 = require("../text");
const utils_2 = require("../utils");
exports.MAX_RESOURCE_COUNT = 50;
@@ -87,9 +87,9 @@
if (!path)
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 $ = cheerio_1.default.load(content);
+ const $ = (0, cheerio_1.load)(content, { xml: { xmlMode: false } });
const cspContent = $('meta[http-equiv="Content-Security-Policy"]').attr('content');
if (cspContent) {
const cspStyleSrc = cspContent.split(';').find((s) => s.startsWith('style-src'));
if (cspStyleSrc?.includes("'unsafe-inline'")) {Modified: package/out/schema/manifest-schema.json
Large diffs are not rendered by default.
Modified: package/package.json
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/manifest",
- "version": "10.1.0-next.8",
+ "version": "10.0.1-next.7-experimental-effab31",
"description": "Definitions and validations of the Forge manifest",
"main": "out/index.js",
"scripts": {
"build": "yarn run compile",
@@ -23,13 +23,13 @@
},
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"dependencies": {
- "@forge/i18n": "0.0.7-next.0",
+ "@forge/i18n": "0.0.7-next.0-experimental-effab31",
"@sentry/node": "7.106.0",
"ajv": "^8.12.0",
"ajv-formats": "2.1.1",
- "cheerio": "^0.22.0",
+ "cheerio": "^1.1.0",
"glob": "^10.3.10",
"lodash": "^4.17.21",
"mime-types": "^2.1.35",
"yaml": "^2.3.4"Modified: package/out/interpolator/environment-variable-interpolator.d.ts.map
Index: package/out/interpolator/environment-variable-interpolator.d.ts.map
===================================================================
--- package/out/interpolator/environment-variable-interpolator.d.ts.map
+++ package/out/interpolator/environment-variable-interpolator.d.ts.map
@@ -1,1 +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;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"}
\ No newline at end of file
+{"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"}
\ No newline at end of fileModified: package/CHANGELOG.md
Index: package/CHANGELOG.md
===================================================================
--- package/CHANGELOG.md
+++ package/CHANGELOG.md
@@ -1,12 +1,26 @@
# @forge/manifest
-## 10.1.0-next.8
+## 10.0.1-next.7-experimental-effab31
### Minor Changes
-- 46daa27: Added support for default environment variable declaration in the manifest
+- 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/[email protected]
+
## 10.0.1-next.7
### Patch ChangesModified: package/out/schema/manifest.d.ts
Large diffs are not rendered by default.