@o3r/azure-tools 11.6.0-prerelease.2 → 11.6.0-prerelease.20
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/package.json +23 -14
- package/schematics/ng-add/index.d.ts +0 -2
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +0 -2
- package/src/cli/comment-pr.js +8 -9
- package/src/cli/comment-pr.js.map +1 -1
- package/src/helpers/azure/pull-requests.service.d.ts.map +1 -1
- package/src/helpers/azure/pull-requests.service.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/azure-tools",
|
|
3
|
-
"version": "11.6.0-prerelease.
|
|
3
|
+
"version": "11.6.0-prerelease.20",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -28,44 +28,53 @@
|
|
|
28
28
|
"winston": "^3.8.2"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
31
|
-
"@angular-devkit/schematics": "~18.2.0"
|
|
31
|
+
"@angular-devkit/schematics": "~18.2.0",
|
|
32
|
+
"@o3r/telemetry": "^11.6.0-prerelease.20"
|
|
32
33
|
},
|
|
33
34
|
"peerDependenciesMeta": {
|
|
34
35
|
"@angular-devkit/schematics": {
|
|
35
36
|
"optional": true
|
|
37
|
+
},
|
|
38
|
+
"@o3r/telemetry": {
|
|
39
|
+
"optional": true
|
|
36
40
|
}
|
|
37
41
|
},
|
|
38
42
|
"devDependencies": {
|
|
39
43
|
"@angular-devkit/core": "~18.2.0",
|
|
40
44
|
"@angular-devkit/schematics": "~18.2.0",
|
|
41
|
-
"@angular-eslint/eslint-plugin": "~18.3.0",
|
|
42
45
|
"@babel/core": "~7.26.0",
|
|
43
46
|
"@babel/preset-typescript": "~7.26.0",
|
|
44
47
|
"@compodoc/compodoc": "^1.1.19",
|
|
48
|
+
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
45
49
|
"@nx/eslint-plugin": "~19.5.0",
|
|
46
50
|
"@nx/jest": "~19.5.0",
|
|
47
|
-
"@o3r/build-helpers": "^11.6.0-prerelease.
|
|
48
|
-
"@o3r/eslint-plugin": "^11.6.0-prerelease.
|
|
49
|
-
"@o3r/telemetry": "^11.6.0-prerelease.
|
|
50
|
-
"@stylistic/eslint-plugin-ts": "~2.
|
|
51
|
+
"@o3r/build-helpers": "^11.6.0-prerelease.20",
|
|
52
|
+
"@o3r/eslint-plugin": "^11.6.0-prerelease.20",
|
|
53
|
+
"@o3r/telemetry": "^11.6.0-prerelease.20",
|
|
54
|
+
"@stylistic/eslint-plugin-ts": "~2.7.0",
|
|
51
55
|
"@types/jest": "~29.5.2",
|
|
52
56
|
"@types/node": "^20.0.0",
|
|
53
|
-
"@typescript-eslint/
|
|
54
|
-
"
|
|
55
|
-
"@typescript-eslint/utils": "^7.14.1",
|
|
57
|
+
"@typescript-eslint/parser": "~8.16.0",
|
|
58
|
+
"angular-eslint": "~18.4.0",
|
|
56
59
|
"cpy-cli": "^5.0.0",
|
|
57
|
-
"eslint": "
|
|
60
|
+
"eslint": "~9.14.0",
|
|
58
61
|
"eslint-import-resolver-node": "^0.3.9",
|
|
62
|
+
"eslint-import-resolver-typescript": "^3.6.3",
|
|
63
|
+
"eslint-plugin-import": "^2.31.0",
|
|
64
|
+
"eslint-plugin-import-newlines": "^1.4.0",
|
|
59
65
|
"eslint-plugin-jest": "~28.8.0",
|
|
60
|
-
"eslint-plugin-jsdoc": "~
|
|
66
|
+
"eslint-plugin-jsdoc": "~50.2.0",
|
|
61
67
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
62
|
-
"eslint-plugin-unicorn": "^
|
|
68
|
+
"eslint-plugin-unicorn": "^56.0.0",
|
|
69
|
+
"eslint-plugin-unused-imports": "^4.1.4",
|
|
70
|
+
"globals": "^15.9.0",
|
|
63
71
|
"jest": "~29.7.0",
|
|
64
72
|
"jest-junit": "~16.0.0",
|
|
65
73
|
"nx": "~19.5.0",
|
|
66
74
|
"ts-jest": "~29.2.0",
|
|
67
75
|
"ts-node": "~10.9.2",
|
|
68
|
-
"typescript": "~5.5.4"
|
|
76
|
+
"typescript": "~5.5.4",
|
|
77
|
+
"typescript-eslint": "~8.16.0"
|
|
69
78
|
},
|
|
70
79
|
"engines": {
|
|
71
80
|
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;GAEG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAG5B"}
|
package/src/cli/comment-pr.js
CHANGED
|
@@ -21,7 +21,6 @@ commander_1.program
|
|
|
21
21
|
.option('-I, --threadIdentifier <threadIdentifier>', 'Thread identifier', undefined)
|
|
22
22
|
.requiredOption('-T, --accessToken <accessToken>', 'Access token')
|
|
23
23
|
.action((actionComment) => {
|
|
24
|
-
// eslint-disable-next-line no-import-assign
|
|
25
24
|
comment = actionComment;
|
|
26
25
|
})
|
|
27
26
|
.parse(process.argv);
|
|
@@ -36,19 +35,19 @@ const run = async () => {
|
|
|
36
35
|
throw new Error('A comment must be provided');
|
|
37
36
|
}
|
|
38
37
|
if (!process.env.SYSTEM_TEAMPROJECT) {
|
|
39
|
-
throw Error('System.TeamProject must be provided');
|
|
38
|
+
throw new Error('System.TeamProject must be provided');
|
|
40
39
|
}
|
|
41
40
|
if (!process.env.BUILD_REPOSITORY_NAME) {
|
|
42
|
-
throw Error('Build.Repository.Name must be provided');
|
|
41
|
+
throw new Error('Build.Repository.Name must be provided');
|
|
43
42
|
}
|
|
44
43
|
if (!process.env.SYSTEM_PULLREQUEST_PULLREQUESTID) {
|
|
45
|
-
throw Error('System.PullRequest.PullRequestId must be provided');
|
|
44
|
+
throw new Error('System.PullRequest.PullRequestId must be provided');
|
|
46
45
|
}
|
|
47
|
-
else if (isNaN(+process.env.SYSTEM_PULLREQUEST_PULLREQUESTID)) {
|
|
48
|
-
throw Error('System.PullRequest.PullRequestId must be a number');
|
|
46
|
+
else if (Number.isNaN(+process.env.SYSTEM_PULLREQUEST_PULLREQUESTID)) {
|
|
47
|
+
throw new Error('System.PullRequest.PullRequestId must be a number');
|
|
49
48
|
}
|
|
50
49
|
if (!process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) {
|
|
51
|
-
throw Error('System.TeamFoundationCollectionUri must be provided');
|
|
50
|
+
throw new Error('System.TeamFoundationCollectionUri must be provided');
|
|
52
51
|
}
|
|
53
52
|
const project = process.env.SYSTEM_TEAMPROJECT;
|
|
54
53
|
const repositoryId = process.env.BUILD_REPOSITORY_NAME;
|
|
@@ -57,9 +56,9 @@ const run = async () => {
|
|
|
57
56
|
const prService = new index_1.PullRequestService(opts.accessToken, project, orgUrl, logger);
|
|
58
57
|
const threads = opts.threadIdentifier ? await prService.findThreadsByIdentifier(repositoryId, pullRequestId, opts.threadIdentifier) : [];
|
|
59
58
|
if (opts.mode === 'Replace') {
|
|
60
|
-
await Promise.all(threads.filter(thread => !!thread.id).map((thread) => prService.deleteThread(repositoryId, pullRequestId, thread.id)));
|
|
59
|
+
await Promise.all(threads.filter((thread) => !!thread.id).map((thread) => prService.deleteThread(repositoryId, pullRequestId, thread.id)));
|
|
61
60
|
}
|
|
62
|
-
if (opts.mode === 'Replace' || threads.length
|
|
61
|
+
if (opts.mode === 'Replace' || threads.length === 0) {
|
|
63
62
|
await prService.addThread(repositoryId, pullRequestId, comment, opts.commentStatus, opts.threadIdentifier);
|
|
64
63
|
}
|
|
65
64
|
else if (opts.mode === 'Add') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment-pr.js","sourceRoot":"","sources":["../../../src/cli/comment-pr.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"comment-pr.js","sourceRoot":"","sources":["../../../src/cli/comment-pr.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-requests.service.d.ts","sourceRoot":"","sources":["../../../../src/helpers/azure/pull-requests.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pull-requests.service.d.ts","sourceRoot":"","sources":["../../../../src/helpers/azure/pull-requests.service.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,2BAA2B,EAC5B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,MAAM,EACP,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,qBAAa,kBAAkB;IAGF,OAAO,CAAC,QAAQ,CAAC,OAAO;IAA0B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFpG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,KAAK,EAAE,MAAM,EAAmB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAmB,MAAM,EAAE,MAAM;IAI5G;;;;;OAKG;IACU,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnG;;;;;;OAMG;IACU,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,2BAA2B,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBhJ;;;;;;;OAOG;IACU,SAAS,CACpB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,mBAAmB,EAC3B,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,2BAA2B,CAAC;IAgBvC;;;;;OAKG;IACU,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,EAAE,CAAC;CAKhJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-requests.service.js","sourceRoot":"","sources":["../../../../src/helpers/azure/pull-requests.service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"pull-requests.service.js","sourceRoot":"","sources":["../../../../src/helpers/azure/pull-requests.service.ts"],"names":[],"mappings":"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"}
|