@o3r/workspace 10.2.0-prerelease.7 → 10.2.0-prerelease.71
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/README.md +3 -0
- package/migration.json +5 -1
- package/package.json +49 -49
- package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template +5 -32
- package/schematics/ng-update/index.d.ts +5 -1
- package/schematics/ng-update/index.d.ts.map +1 -1
- package/schematics/ng-update/index.js +19 -0
- package/schematics/ng-update/index.js.map +1 -1
- package/schematics/ng-update/v10.1/add-presets-renovate.d.ts +3 -0
- package/schematics/ng-update/v10.1/add-presets-renovate.d.ts.map +1 -0
- package/schematics/ng-update/v10.1/add-presets-renovate.js +24 -0
- package/schematics/ng-update/v10.1/add-presets-renovate.js.map +1 -0
package/README.md
CHANGED
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
|
|
6
6
|
## Description
|
|
7
7
|
|
|
8
|
+
[](https://www.npmjs.com/package/@o3r/workspace)
|
|
9
|
+
[](https://www.npmjs.com/package/@o3r/workspace)
|
|
10
|
+
|
|
8
11
|
This package is an [Otter Framework](https://github.com/AmadeusITGroup/otter) Module providing tools at workspace level.
|
|
9
12
|
|
|
10
13
|
This packages provides several [Schematics](#schematics) and [CLIs](#scripts) used to accelerate the development and support maintenance of workspace's packages.
|
package/migration.json
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://raw.githubusercontent.com/angular/angular-cli/master/packages/angular_devkit/schematics/collection-schema.json",
|
|
3
3
|
"schematics": {
|
|
4
|
-
|
|
4
|
+
"migration-v10_0": {
|
|
5
|
+
"version": "10.1.0-alpha.0",
|
|
6
|
+
"description": "Updates of @o3r/workspace to v10.1.*",
|
|
7
|
+
"factory": "./schematics/ng-update/index#updateV10_1"
|
|
8
|
+
}
|
|
5
9
|
}
|
|
6
10
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "10.2.0-prerelease.
|
|
3
|
+
"version": "10.2.0-prerelease.71",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -22,15 +22,15 @@
|
|
|
22
22
|
"main": "./src/public_api.js",
|
|
23
23
|
"types": "./src/public_api.d.ts",
|
|
24
24
|
"peerDependencies": {
|
|
25
|
-
"@angular-devkit/architect": "~0.
|
|
26
|
-
"@angular-devkit/core": "~17.
|
|
27
|
-
"@angular-devkit/schematics": "~17.
|
|
28
|
-
"@angular/cli": "~17.
|
|
29
|
-
"@angular/common": "~17.
|
|
30
|
-
"@angular/compiler-cli": "~17.
|
|
31
|
-
"@angular/core": "~17.
|
|
32
|
-
"@schematics/angular": "~17.
|
|
33
|
-
"typescript": "~5.
|
|
25
|
+
"@angular-devkit/architect": "~0.1703.0",
|
|
26
|
+
"@angular-devkit/core": "~17.3.0",
|
|
27
|
+
"@angular-devkit/schematics": "~17.3.0",
|
|
28
|
+
"@angular/cli": "~17.3.0",
|
|
29
|
+
"@angular/common": "~17.3.0",
|
|
30
|
+
"@angular/compiler-cli": "~17.3.0",
|
|
31
|
+
"@angular/core": "~17.3.0",
|
|
32
|
+
"@schematics/angular": "~17.3.0",
|
|
33
|
+
"typescript": "~5.4.2"
|
|
34
34
|
},
|
|
35
35
|
"peerDependenciesMeta": {
|
|
36
36
|
"@angular/cli": {
|
|
@@ -38,43 +38,43 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^10.2.0-prerelease.
|
|
41
|
+
"@o3r/schematics": "^10.2.0-prerelease.71",
|
|
42
42
|
"commander": "^12.0.0",
|
|
43
43
|
"globby": "^11.1.0",
|
|
44
44
|
"semver": "^7.5.2",
|
|
45
|
-
"tslib": "^2.
|
|
45
|
+
"tslib": "^2.6.2",
|
|
46
46
|
"uuid": "^9.0.0",
|
|
47
47
|
"winston": "^3.8.2"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@angular-devkit/architect": "~0.
|
|
51
|
-
"@angular-devkit/build-angular": "~17.
|
|
52
|
-
"@angular-devkit/core": "~17.
|
|
53
|
-
"@angular-devkit/schematics": "~17.
|
|
54
|
-
"@angular-eslint/eslint-plugin": "~17.
|
|
55
|
-
"@angular/animations": "~17.
|
|
56
|
-
"@angular/cli": "~17.
|
|
57
|
-
"@angular/common": "~17.
|
|
58
|
-
"@angular/compiler": "~17.
|
|
59
|
-
"@angular/compiler-cli": "~17.
|
|
60
|
-
"@angular/core": "~17.
|
|
61
|
-
"@angular/platform-browser": "~17.
|
|
62
|
-
"@angular/platform-browser-dynamic": "~17.
|
|
63
|
-
"@angular/router": "~17.
|
|
50
|
+
"@angular-devkit/architect": "~0.1703.0",
|
|
51
|
+
"@angular-devkit/build-angular": "~17.3.0",
|
|
52
|
+
"@angular-devkit/core": "~17.3.0",
|
|
53
|
+
"@angular-devkit/schematics": "~17.3.0",
|
|
54
|
+
"@angular-eslint/eslint-plugin": "~17.3.0",
|
|
55
|
+
"@angular/animations": "~17.3.0",
|
|
56
|
+
"@angular/cli": "~17.3.0",
|
|
57
|
+
"@angular/common": "~17.3.0",
|
|
58
|
+
"@angular/compiler": "~17.3.0",
|
|
59
|
+
"@angular/compiler-cli": "~17.3.0",
|
|
60
|
+
"@angular/core": "~17.3.0",
|
|
61
|
+
"@angular/platform-browser": "~17.3.0",
|
|
62
|
+
"@angular/platform-browser-dynamic": "~17.3.0",
|
|
63
|
+
"@angular/router": "~17.3.0",
|
|
64
64
|
"@babel/core": "~7.24.0",
|
|
65
|
-
"@babel/preset-typescript": "~7.
|
|
65
|
+
"@babel/preset-typescript": "~7.24.0",
|
|
66
66
|
"@ngrx/entity": "~17.1.0",
|
|
67
67
|
"@ngrx/store": "~17.1.0",
|
|
68
|
-
"@nx/eslint": "~18.0
|
|
69
|
-
"@nx/eslint-plugin": "~18.0
|
|
70
|
-
"@nx/jest": "~18.0
|
|
71
|
-
"@nx/js": "~18.0
|
|
72
|
-
"@o3r/build-helpers": "^10.2.0-prerelease.
|
|
73
|
-
"@o3r/core": "^10.2.0-prerelease.
|
|
74
|
-
"@o3r/eslint-plugin": "^10.2.0-prerelease.
|
|
75
|
-
"@o3r/schematics": "^10.2.0-prerelease.
|
|
76
|
-
"@o3r/test-helpers": "^10.2.0-prerelease.
|
|
77
|
-
"@schematics/angular": "~17.
|
|
68
|
+
"@nx/eslint": "~18.2.0",
|
|
69
|
+
"@nx/eslint-plugin": "~18.2.0",
|
|
70
|
+
"@nx/jest": "~18.2.0",
|
|
71
|
+
"@nx/js": "~18.2.0",
|
|
72
|
+
"@o3r/build-helpers": "^10.2.0-prerelease.71",
|
|
73
|
+
"@o3r/core": "^10.2.0-prerelease.71",
|
|
74
|
+
"@o3r/eslint-plugin": "^10.2.0-prerelease.71",
|
|
75
|
+
"@o3r/schematics": "^10.2.0-prerelease.71",
|
|
76
|
+
"@o3r/test-helpers": "^10.2.0-prerelease.71",
|
|
77
|
+
"@schematics/angular": "~17.3.0",
|
|
78
78
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
79
79
|
"@types/jest": "~29.5.2",
|
|
80
80
|
"@types/minimist": "^1.2.2",
|
|
@@ -82,31 +82,31 @@
|
|
|
82
82
|
"@types/pid-from-port": "^1.1.0",
|
|
83
83
|
"@types/semver": "^7.3.13",
|
|
84
84
|
"@types/uuid": "^9.0.0",
|
|
85
|
-
"@typescript-eslint/eslint-plugin": "^7.0
|
|
86
|
-
"@typescript-eslint/parser": "^7.0
|
|
85
|
+
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
|
86
|
+
"@typescript-eslint/parser": "^7.2.0",
|
|
87
87
|
"cpy-cli": "^5.0.0",
|
|
88
|
-
"eslint": "^8.
|
|
89
|
-
"eslint-import-resolver-node": "^0.3.
|
|
88
|
+
"eslint": "^8.57.0",
|
|
89
|
+
"eslint-import-resolver-node": "^0.3.9",
|
|
90
90
|
"eslint-plugin-jest": "~27.9.0",
|
|
91
|
-
"eslint-plugin-jsdoc": "~48.2.
|
|
91
|
+
"eslint-plugin-jsdoc": "~48.2.1",
|
|
92
92
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
93
|
-
"eslint-plugin-unicorn": "^51.0.
|
|
93
|
+
"eslint-plugin-unicorn": "^51.0.1",
|
|
94
94
|
"jest": "~29.7.0",
|
|
95
95
|
"jest-environment-jsdom": "~29.7.0",
|
|
96
96
|
"jest-junit": "~16.0.0",
|
|
97
|
-
"jest-preset-angular": "~14.0.
|
|
97
|
+
"jest-preset-angular": "~14.0.3",
|
|
98
98
|
"minimist": "^1.2.6",
|
|
99
|
-
"nx": "~18.0
|
|
99
|
+
"nx": "~18.2.0",
|
|
100
100
|
"pid-from-port": "^1.1.3",
|
|
101
101
|
"rxjs": "^7.8.1",
|
|
102
|
-
"ts-jest": "~29.1.
|
|
103
|
-
"ts-node": "~10.9.
|
|
102
|
+
"ts-jest": "~29.1.2",
|
|
103
|
+
"ts-node": "~10.9.2",
|
|
104
104
|
"type-fest": "^4.10.2",
|
|
105
|
-
"typescript": "~5.
|
|
105
|
+
"typescript": "~5.4.2",
|
|
106
106
|
"zone.js": "~0.14.2"
|
|
107
107
|
},
|
|
108
108
|
"generatorDependencies": {
|
|
109
|
-
"@angular/material": "~17.
|
|
109
|
+
"@angular/material": "~17.3.0",
|
|
110
110
|
"@ngrx/router-store": "~17.1.0",
|
|
111
111
|
"@ngrx/effects": "~17.1.0",
|
|
112
112
|
"@ngrx/store-devtools": "~17.1.0"
|
|
@@ -2,15 +2,13 @@
|
|
|
2
2
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
3
3
|
"extends": [
|
|
4
4
|
"config:base",
|
|
5
|
-
"
|
|
6
|
-
"
|
|
7
|
-
"group:recommended",
|
|
8
|
-
"group:test"
|
|
5
|
+
"github>AmadeusITGroup/otter//tools/renovate/base",
|
|
6
|
+
"github>AmadeusITGroup/otter//tools/renovate/otter-project"
|
|
9
7
|
],
|
|
10
8
|
"prConcurrentLimit": 0,
|
|
11
9
|
"prHourlyLimit": 0,
|
|
12
10
|
"baseBranches": [
|
|
13
|
-
"
|
|
11
|
+
"main"
|
|
14
12
|
],
|
|
15
13
|
"platform": "azure",
|
|
16
14
|
"enabledManagers": [
|
|
@@ -28,34 +26,9 @@
|
|
|
28
26
|
"packageRules": [
|
|
29
27
|
{
|
|
30
28
|
"matchPackageNames": [
|
|
31
|
-
"@o3r
|
|
29
|
+
"@o3r/*"
|
|
32
30
|
],
|
|
33
|
-
"
|
|
34
|
-
"commands": [
|
|
35
|
-
"npm install",
|
|
36
|
-
"npm run ng update {{{depName}}} --from={{{currentVersion}}} --to={{{newVersion}}} --migrate-only --allow-dirty --force"
|
|
37
|
-
],
|
|
38
|
-
"fileFilters": [
|
|
39
|
-
"**"
|
|
40
|
-
],
|
|
41
|
-
"executionMode": "branch"
|
|
42
|
-
}
|
|
43
|
-
},
|
|
44
|
-
{
|
|
45
|
-
"matchPackagePrefixes": [
|
|
46
|
-
"@otter",
|
|
47
|
-
"@o3r",
|
|
48
|
-
"@ama-sdk",
|
|
49
|
-
"@ama-terasu"
|
|
50
|
-
],
|
|
51
|
-
"groupName": "Otter dependencies",
|
|
52
|
-
"groupSlug": "otter-dependencies"
|
|
53
|
-
},
|
|
54
|
-
{
|
|
55
|
-
"matchPackagePatterns": [
|
|
56
|
-
"*"
|
|
57
|
-
],
|
|
58
|
-
"rangeStrategy": "replace"
|
|
31
|
+
"automergeType": "patch"
|
|
59
32
|
}
|
|
60
33
|
]
|
|
61
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc9D;;GAEG;AACH,eAAO,MAAM,WAAW,4BAAuD,CAAC"}
|
|
@@ -1,3 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/* eslint-disable @typescript-eslint/naming-convention */
|
|
3
|
+
/* eslint-disable camelcase */
|
|
2
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.updateV10_1 = void 0;
|
|
6
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
|
+
const schematics_2 = require("@o3r/schematics");
|
|
8
|
+
const add_presets_renovate_1 = require("./v10.1/add-presets-renovate");
|
|
9
|
+
/**
|
|
10
|
+
* Update of Otter Workspace V10.1
|
|
11
|
+
*/
|
|
12
|
+
function updateV10_1Fn() {
|
|
13
|
+
const updateRules = [
|
|
14
|
+
(0, add_presets_renovate_1.addPresetsRenovate)()
|
|
15
|
+
];
|
|
16
|
+
return (0, schematics_1.chain)(updateRules);
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Update of Otter Workspace V10.1
|
|
20
|
+
*/
|
|
21
|
+
exports.updateV10_1 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV10_1Fn);
|
|
3
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAE9B,2DAA8D;AAC9D,gDAAwE;AACxE,uEAAkE;AAElE;;GAEG;AACH,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,kDAAqC,EAAC,aAAa,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-presets-renovate.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.1/add-presets-renovate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAOvD,eAAO,MAAM,kBAAkB,QAAO,IAarC,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addPresetsRenovate = void 0;
|
|
4
|
+
const renovatePresets = [
|
|
5
|
+
'github>AmadeusITGroup/otter//tools/renovate/base',
|
|
6
|
+
'github>AmadeusITGroup/otter//tools/renovate/otter-project'
|
|
7
|
+
];
|
|
8
|
+
const addPresetsRenovate = () => {
|
|
9
|
+
return (tree, context) => {
|
|
10
|
+
if (tree.exists('.renovaterc.json')) {
|
|
11
|
+
const renovateConfig = tree.readJson('.renovaterc.json');
|
|
12
|
+
renovateConfig.extends ||= [];
|
|
13
|
+
renovatePresets
|
|
14
|
+
.filter((preset) => !renovateConfig.extends.includes(preset))
|
|
15
|
+
.forEach((preset) => renovateConfig.extends.push(preset));
|
|
16
|
+
tree.overwrite('renovate.json', JSON.stringify(renovateConfig, null, 2));
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
context.logger.info('renovate.json not found, skipping preset addition');
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
};
|
|
23
|
+
exports.addPresetsRenovate = addPresetsRenovate;
|
|
24
|
+
//# sourceMappingURL=add-presets-renovate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-presets-renovate.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.1/add-presets-renovate.ts"],"names":[],"mappings":";;;AAEA,MAAM,eAAe,GAAG;IACtB,kDAAkD;IAClD,2DAA2D;CAC5D,CAAC;AAEK,MAAM,kBAAkB,GAAG,GAAS,EAAE;IAC3C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpC,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAQ,CAAC;YAChE,cAAc,CAAC,OAAO,KAAK,EAAE,CAAC;YAC9B,eAAe;iBACZ,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;iBAC5D,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B"}
|