@o3r/new-version 14.0.0-next.4 → 14.0.0-next.7
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 +10 -10
- package/src/index.d.ts +1 -1
- package/src/index.d.ts.map +1 -1
- package/src/index.js +1 -1
- package/src/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/new-version",
|
|
3
|
-
"version": "14.0.0-next.
|
|
3
|
+
"version": "14.0.0-next.7",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -19,13 +19,13 @@
|
|
|
19
19
|
"prepare:build:builders": "yarn cpy 'schematics/**/*.json' dist/schematics && yarn cpy 'collection.json' dist"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@o3r/schematics": "~14.0.0-next.
|
|
22
|
+
"@o3r/schematics": "~14.0.0-next.7",
|
|
23
23
|
"semver": "^7.5.2",
|
|
24
24
|
"tslib": "^2.6.2"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
27
|
"@angular-devkit/schematics": "^20.0.0",
|
|
28
|
-
"@o3r/schematics": "~14.0.0-next.
|
|
28
|
+
"@o3r/schematics": "~14.0.0-next.7"
|
|
29
29
|
},
|
|
30
30
|
"peerDependenciesMeta": {
|
|
31
31
|
"@angular-devkit/schematics": {
|
|
@@ -36,21 +36,21 @@
|
|
|
36
36
|
}
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@angular-devkit/core": "~20.3.
|
|
40
|
-
"@angular-devkit/schematics": "~20.3.
|
|
39
|
+
"@angular-devkit/core": "~20.3.13",
|
|
40
|
+
"@angular-devkit/schematics": "~20.3.13",
|
|
41
41
|
"@babel/core": "~7.28.0",
|
|
42
42
|
"@babel/preset-typescript": "~7.28.0",
|
|
43
43
|
"@compodoc/compodoc": "^1.1.32",
|
|
44
44
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
45
45
|
"@nx/eslint-plugin": "~21.6.0",
|
|
46
46
|
"@nx/jest": "~21.6.0",
|
|
47
|
-
"@o3r/build-helpers": "~14.0.0-next.
|
|
48
|
-
"@o3r/eslint-plugin": "~14.0.0-next.
|
|
49
|
-
"@o3r/test-helpers": "~14.0.0-next.
|
|
50
|
-
"@schematics/angular": "~20.3.
|
|
47
|
+
"@o3r/build-helpers": "~14.0.0-next.7",
|
|
48
|
+
"@o3r/eslint-plugin": "~14.0.0-next.7",
|
|
49
|
+
"@o3r/test-helpers": "~14.0.0-next.7",
|
|
50
|
+
"@schematics/angular": "~20.3.13",
|
|
51
51
|
"@stylistic/eslint-plugin": "~5.6.0",
|
|
52
52
|
"@types/jest": "~30.0.0",
|
|
53
|
-
"@types/node": "~
|
|
53
|
+
"@types/node": "~24.10.0",
|
|
54
54
|
"@types/semver": "^7.3.13",
|
|
55
55
|
"@typescript-eslint/parser": "~8.47.0",
|
|
56
56
|
"angular-eslint": "~20.6.0",
|
package/src/index.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export type BaseLogger = {
|
|
|
9
9
|
* Options expected by the NewVersion plug-in
|
|
10
10
|
*/
|
|
11
11
|
export interface NewVersionOptions<T extends BaseLogger> {
|
|
12
|
-
/** Logger, you can provide here core from
|
|
12
|
+
/** Logger, you can provide here core from `@actions/core` for example */
|
|
13
13
|
logger: T;
|
|
14
14
|
/** If the branching model supports a default branch on top of usual release branches, the branch name */
|
|
15
15
|
defaultBranch?: string;
|
package/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAaA,yGAAyG;AACzG,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,CAAC;AAErJ;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,UAAU;IACrD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAaA,yGAAyG;AACzG,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,CAAC;AAErJ;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,UAAU;IACrD,yEAAyE;IACzE,MAAM,EAAE,CAAC,CAAC;IAEV,yGAAyG;IACzG,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,mCAAmC;IACnC,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;;;OAIG;IACH,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAErC,4EAA4E;IAC5E,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB,oEAAoE;IACpE,mBAAmB,EAAE,MAAM,CAAC;IAE5B,8EAA8E;IAC9E,aAAa,EAAE,OAAO,CAAC;IAEvB,gFAAgF;IAChF,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,qBAAa,UAAU;IAUT,OAAO,CAAC,QAAQ,CAAC,OAAO;IATpC,8EAA8E;IACvE,qBAAqB,EAAE,OAAO,CAAC;IAEtC,uEAAuE;IAChE,eAAe,EAAE,OAAO,CAAC;IAEhC,gFAAgF;IACzE,2BAA2B,CAAC,EAAE,MAAM,CAAC;gBAEf,OAAO,EAAE,iBAAiB,CAAC,UAAU,CAAC;IAMnE;;OAEG;IACU,OAAO;IAWpB;;OAEG;IACU,eAAe;IAa5B;;;;OAIG;IACI,cAAc;IAUrB;;;;;OAKG;IACI,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM;CAgE7D"}
|
package/src/index.js
CHANGED
|
@@ -70,7 +70,7 @@ class NewVersion {
|
|
|
70
70
|
let parsedSortedTags = tags
|
|
71
71
|
.map((tag) => semver.parse(tag.replace('V', 'v')))
|
|
72
72
|
.filter((tag) => !!tag && !!regexpVersionMask.test(tag.raw))
|
|
73
|
-
.
|
|
73
|
+
.toSorted((v1, v2) => semver.compare(v2, v1));
|
|
74
74
|
this.options.logger.debug('Parsed and sorted tags:');
|
|
75
75
|
this.options.logger.debug(JSON.stringify(parsedSortedTags));
|
|
76
76
|
this.options.logger.info(`Version mask: ${versionMask}`);
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|