@forge/lint 6.1.1-next.2-experimental-f4ce0ae → 6.2.0-next.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +2 -12
- package/out/lint/linters/permission-linter/permission-linter.d.ts.map +1 -1
- package/out/lint/linters/permission-linter/permission-linter.js +2 -1
- package/out/lint/linters/server-side-linter/server-side-linter.d.ts.map +1 -1
- package/out/lint/linters/server-side-linter/server-side-linter.js +8 -3
- package/package.json +7 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,20 +1,10 @@
|
|
|
1
1
|
# @forge/lint
|
|
2
2
|
|
|
3
|
-
## 6.
|
|
3
|
+
## 6.2.0-next.3
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
8
|
-
|
|
9
|
-
### Patch Changes
|
|
10
|
-
|
|
11
|
-
- Updated dependencies [93422bb]
|
|
12
|
-
- Updated dependencies [93422bb]
|
|
13
|
-
- Updated dependencies [7f4844a]
|
|
14
|
-
- Updated dependencies [dcbf516]
|
|
15
|
-
- @forge/cli-shared@9.3.1-next.2-experimental-f4ce0ae
|
|
16
|
-
- @forge/manifest@13.3.1-next.0-experimental-f4ce0ae
|
|
17
|
-
- @forge/csp@6.3.0-experimental-f4ce0ae
|
|
7
|
+
- 47fb0a1: Fix manifest validation logic when using interpolation
|
|
18
8
|
|
|
19
9
|
## 6.1.1-next.2
|
|
20
10
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AAE/E,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,WAAW,EAIZ,MAAM,aAAa,CAAC;AAarB,UAAU,aAAa;IACrB,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAKhD,eAAO,MAAM,sBAAsB,GACjC,QAAQ,cAAc,EAAE,EACxB,UAAU,cAAc,EAAE,EAC1B,iBACI,mBAAmB,GACnB,gCAAgC,GAChC,+BAA+B,GAC/B,iCAAiC,EACrC,QAAQ,YAAY,KACnB,GAAG,CAAC,MAAM,CAkBZ,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,UAAU,cAAc,EAAE,EAAE,QAAQ,YAAY,KAAG,OAI9F,CAAC;AAsCF,eAAO,MAAM,qBAAqB,GAChC,QAAQ,cAAc,EAAE,EACxB,UAAU,cAAc,EAAE,EAC1B,OAAO,YAAY,KAClB,OAAO,CAAC,YAAY,CAyEtB,CAAC;AAEF,UAAU,6BAA6B;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,YAAY,EAAE,mBAAmB,EAAE,CAAC;CACrC;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC;IAe/F,OAAO,CAAC,QAAQ;IAdlB,MAAM,CAAC,cAAc,SAAgC;IACrD,MAAM,CAAC,aAAa,SAA+B;IACnD,MAAM,CAAC,aAAa,SAA+B;IACnD,MAAM,CAAC,oBAAoB,SAAsC;IACjE,MAAM,CAAC,uBAAuB,SAAyC;IACvE,MAAM,CAAC,mBAAmB,SAAqC;IAE/D,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAC,CAA0B;IAC7C,OAAO,CAAC,SAAS,CAAC,CAA0B;IAC5C,OAAO,CAAC,KAAK,CAAC,CAAa;gBAGzB,WAAW,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAC1B,MAAM,EAAE,UAAU;IAKP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6FvC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAejD,SAAS,CAAC,QAAQ,IACd,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,GACtG,SAAS;IAIb,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAyB3D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWtE,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKrE,OAAO,CAAC,YAAY;CAarB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PermissionLinter = exports.fixMissingPermissions = exports.deprecatedEgressPermissions = exports.findMissingPermissions = exports.NON_FWD_SLASH_REGEX = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
6
|
+
const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
|
|
6
7
|
const base_linter_1 = tslib_1.__importDefault(require("../../base-linter"));
|
|
7
8
|
const api_call_interface_1 = require("./api-call-interface");
|
|
8
9
|
const verifiers_1 = require("./verifiers");
|
|
@@ -247,7 +248,7 @@ class PermissionLinter extends base_linter_1.default {
|
|
|
247
248
|
async getProductPaths(cacheKey, url) {
|
|
248
249
|
const cached = this.cache?.get(cacheKey);
|
|
249
250
|
if (!cached) {
|
|
250
|
-
const response = await
|
|
251
|
+
const response = await (0, node_fetch_1.default)(url);
|
|
251
252
|
const jsonBody = await response.json();
|
|
252
253
|
void this.cache?.set(cacheKey, jsonBody, 12 * ONE_HOUR_MS);
|
|
253
254
|
return jsonBody;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-side-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/server-side-linter/server-side-linter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"server-side-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/server-side-linter/server-side-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,UAAU,EAAkB,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAsC,MAAM,mBAAmB,CAAC;AACtH,OAAO,EAAE,aAAa,EAAqB,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,qBAAa,gBAAiB,SAAQ,cAAc;IAIhD,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAV1B,OAAO,CAAC,iBAAiB,CAAqB;gBAG3B,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,gBAAgB,EAC5B,QAAQ,EAAE,WAAW,EACrB,YAAY,EAAE,YAAY,EAC3C,MAAM,EAAE,UAAU,EACD,OAAO,EAAE;QACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;WAKU,QAAQ,CACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE;QACP,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;IAeH,OAAO,CAAC,qBAAqB;IAsBvB,gBAAgB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAmBzC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBhC,OAAO,CAAC,gBAAgB;CAIzB"}
|
|
@@ -52,11 +52,16 @@ class ServerSideLinter extends abstract_linter_1.AbstractLinter {
|
|
|
52
52
|
return [this.mapServerSideResponse(results)];
|
|
53
53
|
}
|
|
54
54
|
async bootstrap() {
|
|
55
|
-
const
|
|
56
|
-
if (!
|
|
55
|
+
const manifestRawContent = this.fileReader.readFile(cli_shared_1.manifestFileName);
|
|
56
|
+
if (!manifestRawContent) {
|
|
57
57
|
throw new Error('No Manifest content found');
|
|
58
58
|
}
|
|
59
|
-
|
|
59
|
+
const manifestParser = new manifest_1.ManifestParserBuilder().withInterpolators().build();
|
|
60
|
+
const manifestContent = manifestParser.parseManifestAsString({
|
|
61
|
+
content: manifestRawContent,
|
|
62
|
+
filePath: cli_shared_1.manifestFileName
|
|
63
|
+
});
|
|
64
|
+
this.archiver.addFile(cli_shared_1.manifestFileName, Buffer.from(manifestContent));
|
|
60
65
|
const archivePath = await this.archiver.finalise();
|
|
61
66
|
const uploadUrl = await this.client.createAppManifestUploadUrl(this.manifest.app.id, this.environment);
|
|
62
67
|
await this.fileUploader.uploadFromPath(uploadUrl, archivePath);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/lint",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0-next.3",
|
|
4
4
|
"description": "Linting for forge apps",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -11,22 +11,24 @@
|
|
|
11
11
|
},
|
|
12
12
|
"devDependencies": {
|
|
13
13
|
"@atlassian/xen-test-util": "^4.2.0",
|
|
14
|
-
"@forge/api": "^8.0.4-next.0
|
|
14
|
+
"@forge/api": "^8.0.4-next.0",
|
|
15
15
|
"@types/array.prototype.flatmap": "^1.2.6",
|
|
16
16
|
"@types/cross-spawn": "^6.0.6",
|
|
17
17
|
"@types/eslint": "8.56.12",
|
|
18
|
+
"@types/node-fetch": "^2.6.12",
|
|
18
19
|
"eslint-plugin-import": "^2.29.1"
|
|
19
20
|
},
|
|
20
21
|
"dependencies": {
|
|
21
|
-
"@forge/cli-shared": "9.3.1-next.2
|
|
22
|
-
"@forge/csp": "6.3.0
|
|
22
|
+
"@forge/cli-shared": "9.3.1-next.2",
|
|
23
|
+
"@forge/csp": "6.3.0",
|
|
23
24
|
"@forge/egress": "3.0.0",
|
|
24
|
-
"@forge/manifest": "13.3.1-next.0
|
|
25
|
+
"@forge/manifest": "13.3.1-next.0",
|
|
25
26
|
"@typescript-eslint/typescript-estree": "^5.62.0",
|
|
26
27
|
"archiver": "^8.0.0",
|
|
27
28
|
"array.prototype.flatmap": "^1.3.3",
|
|
28
29
|
"@atlassian/atlassian-openapi": "^1.0.6",
|
|
29
30
|
"cross-spawn": "^7.0.6",
|
|
31
|
+
"node-fetch": "2.7.0",
|
|
30
32
|
"tmp": "^0.2.3",
|
|
31
33
|
"typescript": "5.9.2"
|
|
32
34
|
},
|