@o3r/workspace 13.2.0-prerelease.8 → 13.2.0-rc.1
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 +47 -34
- package/schematics/application/templates/package.json.template +2 -1
- package/schematics/library/rules/rules.ng.js +4 -4
- package/schematics/library/rules/rules.ng.js.map +1 -1
- package/schematics/library/rules/shared.d.ts +2 -2
- package/schematics/library/rules/shared.d.ts.map +1 -1
- package/schematics/library/rules/shared.js +21 -20
- package/schematics/library/rules/shared.js.map +1 -1
- package/schematics/library/templates/ng/common/tsconfig.json.template +3 -0
- package/schematics/ng-add/helpers/npm-workspace.d.ts +5 -0
- package/schematics/ng-add/helpers/npm-workspace.d.ts.map +1 -1
- package/schematics/ng-add/helpers/npm-workspace.js +26 -0
- package/schematics/ng-add/helpers/npm-workspace.js.map +1 -1
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +1 -0
- package/schematics/ng-add/project-setup.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "13.2.0-
|
|
3
|
+
"version": "13.2.0-rc.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -41,12 +41,12 @@
|
|
|
41
41
|
"@angular/common": "^20.0.0",
|
|
42
42
|
"@angular/compiler-cli": "^20.0.0",
|
|
43
43
|
"@angular/core": "^20.0.0",
|
|
44
|
-
"@o3r/schematics": "^13.2.0-
|
|
45
|
-
"@o3r/telemetry": "^13.2.0-
|
|
44
|
+
"@o3r/schematics": "^13.2.0-rc.1",
|
|
45
|
+
"@o3r/telemetry": "^13.2.0-rc.1",
|
|
46
46
|
"@schematics/angular": "^20.0.0",
|
|
47
47
|
"ts-node": "~10.9.2",
|
|
48
48
|
"type-fest": "^4.30.1",
|
|
49
|
-
"typescript": "^5.
|
|
49
|
+
"typescript": "^5.9.0"
|
|
50
50
|
},
|
|
51
51
|
"peerDependenciesMeta": {
|
|
52
52
|
"@angular/cli": {
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
}
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@o3r/schematics": "^13.2.0-
|
|
66
|
+
"@o3r/schematics": "^13.2.0-rc.1",
|
|
67
67
|
"commander": "^14.0.0",
|
|
68
68
|
"globby": "^11.1.0",
|
|
69
69
|
"semver": "^7.5.2",
|
|
@@ -72,44 +72,44 @@
|
|
|
72
72
|
"winston": "^3.8.2"
|
|
73
73
|
},
|
|
74
74
|
"devDependencies": {
|
|
75
|
-
"@angular-devkit/architect": "~0.
|
|
76
|
-
"@angular-devkit/build-angular": "~20.
|
|
77
|
-
"@angular-devkit/core": "~20.
|
|
78
|
-
"@angular-devkit/schematics": "~20.
|
|
79
|
-
"@angular/animations": "~20.
|
|
80
|
-
"@angular/cli": "~20.
|
|
81
|
-
"@angular/common": "~20.
|
|
82
|
-
"@angular/compiler": "~20.
|
|
83
|
-
"@angular/compiler-cli": "~20.
|
|
84
|
-
"@angular/core": "~20.
|
|
85
|
-
"@angular/platform-browser": "~20.
|
|
86
|
-
"@angular/platform-browser-dynamic": "~20.
|
|
87
|
-
"@angular/router": "~20.
|
|
75
|
+
"@angular-devkit/architect": "~0.2003.0",
|
|
76
|
+
"@angular-devkit/build-angular": "~20.3.0",
|
|
77
|
+
"@angular-devkit/core": "~20.3.0",
|
|
78
|
+
"@angular-devkit/schematics": "~20.3.0",
|
|
79
|
+
"@angular/animations": "~20.3.0",
|
|
80
|
+
"@angular/cli": "~20.3.0",
|
|
81
|
+
"@angular/common": "~20.3.0",
|
|
82
|
+
"@angular/compiler": "~20.3.0",
|
|
83
|
+
"@angular/compiler-cli": "~20.3.0",
|
|
84
|
+
"@angular/core": "~20.3.0",
|
|
85
|
+
"@angular/platform-browser": "~20.3.0",
|
|
86
|
+
"@angular/platform-browser-dynamic": "~20.3.0",
|
|
87
|
+
"@angular/router": "~20.3.0",
|
|
88
88
|
"@babel/core": "~7.28.0",
|
|
89
89
|
"@babel/preset-typescript": "~7.27.0",
|
|
90
90
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
91
91
|
"@ngrx/entity": "~20.0.0",
|
|
92
92
|
"@ngrx/store": "~20.0.0",
|
|
93
|
-
"@nx/angular": "~21.
|
|
94
|
-
"@nx/eslint": "~21.
|
|
95
|
-
"@nx/eslint-plugin": "~21.
|
|
96
|
-
"@nx/jest": "~21.
|
|
97
|
-
"@nx/js": "~21.
|
|
98
|
-
"@nx/workspace": "~21.
|
|
99
|
-
"@o3r/build-helpers": "^13.2.0-
|
|
100
|
-
"@o3r/core": "^13.2.0-
|
|
101
|
-
"@o3r/eslint-plugin": "^13.2.0-
|
|
102
|
-
"@o3r/telemetry": "^13.2.0-
|
|
103
|
-
"@o3r/test-helpers": "^13.2.0-
|
|
104
|
-
"@schematics/angular": "~20.
|
|
93
|
+
"@nx/angular": "~21.6.0",
|
|
94
|
+
"@nx/eslint": "~21.6.0",
|
|
95
|
+
"@nx/eslint-plugin": "~21.6.0",
|
|
96
|
+
"@nx/jest": "~21.6.0",
|
|
97
|
+
"@nx/js": "~21.6.0",
|
|
98
|
+
"@nx/workspace": "~21.6.0",
|
|
99
|
+
"@o3r/build-helpers": "^13.2.0-rc.1",
|
|
100
|
+
"@o3r/core": "^13.2.0-rc.1",
|
|
101
|
+
"@o3r/eslint-plugin": "^13.2.0-rc.1",
|
|
102
|
+
"@o3r/telemetry": "^13.2.0-rc.1",
|
|
103
|
+
"@o3r/test-helpers": "^13.2.0-rc.1",
|
|
104
|
+
"@schematics/angular": "~20.3.0",
|
|
105
105
|
"@stylistic/eslint-plugin": "~5.3.0",
|
|
106
106
|
"@types/jest": "~29.5.2",
|
|
107
107
|
"@types/minimist": "^1.2.2",
|
|
108
|
-
"@types/node": "
|
|
108
|
+
"@types/node": "~22.18.0",
|
|
109
109
|
"@types/pid-from-port": "^1.1.0",
|
|
110
110
|
"@types/semver": "^7.3.13",
|
|
111
111
|
"@typescript-eslint/parser": "~8.43.0",
|
|
112
|
-
"angular-eslint": "~20.
|
|
112
|
+
"angular-eslint": "~20.3.0",
|
|
113
113
|
"cpy-cli": "^6.0.0",
|
|
114
114
|
"eslint": "~9.35.0",
|
|
115
115
|
"eslint-import-resolver-node": "~0.3.9",
|
|
@@ -129,7 +129,7 @@
|
|
|
129
129
|
"jest-util": "~29.7.0",
|
|
130
130
|
"jsonc-eslint-parser": "~2.4.0",
|
|
131
131
|
"minimist": "^1.2.6",
|
|
132
|
-
"nx": "~21.
|
|
132
|
+
"nx": "~21.6.0",
|
|
133
133
|
"pid-from-port": "^1.1.3",
|
|
134
134
|
"rxjs": "^7.8.1",
|
|
135
135
|
"ts-jest": "~29.4.0",
|
|
@@ -141,14 +141,27 @@
|
|
|
141
141
|
},
|
|
142
142
|
"generatorDependencies": {
|
|
143
143
|
"@angular-builders/jest": "~20.0.0",
|
|
144
|
+
"@angular-devkit/build-angular": "~20.3.0",
|
|
145
|
+
"@angular-devkit/core": "~20.3.0",
|
|
146
|
+
"@angular-eslint/eslint-plugin": "~20.0.0",
|
|
144
147
|
"@commitlint/cli": "^19.0.0",
|
|
145
148
|
"@commitlint/config-angular": "^19.0.0",
|
|
146
149
|
"@commitlint/config-conventional": "^19.0.0",
|
|
147
150
|
"@commitlint/types": "^19.0.0",
|
|
151
|
+
"@schematics/angular": "~20.3.0",
|
|
152
|
+
"@types/jasmine": "~5.1.0",
|
|
153
|
+
"@types/jest": "~29.5.2",
|
|
154
|
+
"@types/node": "~22.18.0",
|
|
155
|
+
"cpy-cli": "^6.0.0",
|
|
148
156
|
"editorconfig-checker": "^6.0.1",
|
|
149
157
|
"husky": "~9.1.0",
|
|
158
|
+
"jest": "~29.7.0",
|
|
159
|
+
"jest-environment-jsdom": "~29.7.0",
|
|
160
|
+
"jest-junit": "~16.0.0",
|
|
161
|
+
"jest-preset-angular": "~14.6.0",
|
|
150
162
|
"lerna": "^8.1.7",
|
|
151
|
-
"lint-staged": "^16.0.0"
|
|
163
|
+
"lint-staged": "^16.0.0",
|
|
164
|
+
"ts-jest": "~29.4.0"
|
|
152
165
|
},
|
|
153
166
|
"engines": {
|
|
154
167
|
"node": "^20.19.0 || ^22.17.0 || ^24.0.0"
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@angular/cli": "<%= rootDependencies['@angular/cli'] || 'latest' %>",
|
|
26
26
|
"@angular/compiler-cli": "<%= rootDependencies['@angular/compiler-cli'] || rootDependencies['@angular/cli'] || 'latest' %>",
|
|
27
|
-
"
|
|
27
|
+
<% if (rootDependencies['@types/jasmine']) { %>"@types/jasmine": "<%= rootDependencies['@types/jasmine'] %>",
|
|
28
|
+
<% } %>"typescript": "<%= enforceTildeRange(rootDependencies['typescript'] || 'latest') %>"
|
|
28
29
|
}
|
|
29
30
|
}
|
|
@@ -55,9 +55,9 @@ function ngGenerateModule(options) {
|
|
|
55
55
|
* @param context Context of the schematics
|
|
56
56
|
*/
|
|
57
57
|
const updateNgTemplate = (tree, context) => {
|
|
58
|
-
const
|
|
59
|
-
const
|
|
60
|
-
const otterVersion =
|
|
58
|
+
const o3rWorkspacePackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
|
|
59
|
+
const o3rWorkspacePackageJson = JSON.parse((0, node_fs_1.readFileSync)(o3rWorkspacePackageJsonPath).toString());
|
|
60
|
+
const otterVersion = o3rWorkspacePackageJson.dependencies['@o3r/schematics'];
|
|
61
61
|
const templateNg = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng/common'), [
|
|
62
62
|
(0, schematics_1.template)({
|
|
63
63
|
...options,
|
|
@@ -98,7 +98,7 @@ function ngGenerateModule(options) {
|
|
|
98
98
|
: [
|
|
99
99
|
setUpAngularTestPackageJson(options)
|
|
100
100
|
],
|
|
101
|
-
(0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion,
|
|
101
|
+
(0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rWorkspacePackageJson, { ...options, useJest: !!hasJestInstalled }),
|
|
102
102
|
(0, shared_1.updateNgPackagrFactory)(options.targetPath),
|
|
103
103
|
(t) => {
|
|
104
104
|
const genPackageJsonPath = path.posix.join(options.targetPath, 'package.json');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":";;AAgFA,4CAqIC;AArND,qCAEiB;AACjB,kCAAkC;AAClC,2DAWoC;AAIpC,gDAEyB;AAKzB,sDAEoC;AAIpC,qCAGkB;AAElB;;;GAGG;AACH,SAAS,2BAA2B,CAAC,OAAwD;IAC3F,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACtE,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAgB,CAAC;QACzE,kBAAkB,CAAC,OAAO,KAAK,EAAE,CAAC;QAClC,kBAAkB,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9D,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAC,OAAwD;IACvF,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAsB,CAAC;QACxE,MAAM,OAAO,GAAQ,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,CAAC,SAAS,KAAK,EAAE,CAAC;QACzB,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG;YACvB,OAAO,EAAE,4BAA4B;YACrC,OAAO,EAAE;gBACP,QAAQ,EAAE,oBAAoB;gBAC9B,UAAU,EAAE,gBAAgB;gBAC5B,kBAAkB,EAAE,yBAAyB;aAC9C;SACF,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,OAAiF;IAChH,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,MAAM,gBAAgB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC/C,MAAM,
|
|
1
|
+
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,10 @@ import { NgGenerateModuleSchema } from '../schema';
|
|
|
5
5
|
* Generate rule to update generated package.json file
|
|
6
6
|
* @param targetPath Path of the generated files
|
|
7
7
|
* @param otterVersion Current version of otter
|
|
8
|
-
* @param
|
|
8
|
+
* @param o3rWorkspacePackageJson Content of @o3r/workspace package.json
|
|
9
9
|
* @param options Option of the schematic
|
|
10
10
|
*/
|
|
11
|
-
export declare function updatePackageDependenciesFactory(targetPath: string, otterVersion: string,
|
|
11
|
+
export declare function updatePackageDependenciesFactory(targetPath: string, otterVersion: string, o3rWorkspacePackageJson: PackageJson & {
|
|
12
12
|
generatorDependencies?: Record<string, string>;
|
|
13
13
|
}, options: NgGenerateModuleSchema & {
|
|
14
14
|
useJest?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAEnB;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAEnB;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,uBAAuB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACzF,OAAO,EAAE,sBAAsB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAsDjE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAa/D"}
|
|
@@ -8,10 +8,10 @@ const schematics_1 = require("@o3r/schematics");
|
|
|
8
8
|
* Generate rule to update generated package.json file
|
|
9
9
|
* @param targetPath Path of the generated files
|
|
10
10
|
* @param otterVersion Current version of otter
|
|
11
|
-
* @param
|
|
11
|
+
* @param o3rWorkspacePackageJson Content of @o3r/workspace package.json
|
|
12
12
|
* @param options Option of the schematic
|
|
13
13
|
*/
|
|
14
|
-
function updatePackageDependenciesFactory(targetPath, otterVersion,
|
|
14
|
+
function updatePackageDependenciesFactory(targetPath, otterVersion, o3rWorkspacePackageJson, options) {
|
|
15
15
|
return (tree) => {
|
|
16
16
|
const packageJson = tree.readJson(path.posix.join(targetPath, 'package.json'));
|
|
17
17
|
const runner = (0, schematics_1.getPackageManagerRunner)((0, schematics_1.getWorkspaceConfig)(tree));
|
|
@@ -31,9 +31,9 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
|
|
|
31
31
|
packageJson.devDependencies = {
|
|
32
32
|
...packageJson.devDependencies,
|
|
33
33
|
...Object.fromEntries(Object.entries({
|
|
34
|
-
'@angular-devkit/build-angular':
|
|
35
|
-
'@angular-devkit/core':
|
|
36
|
-
'@angular-eslint/eslint-plugin':
|
|
34
|
+
'@angular-devkit/build-angular': o3rWorkspacePackageJson.generatorDependencies['@angular-devkit/build-angular'],
|
|
35
|
+
'@angular-devkit/core': o3rWorkspacePackageJson.generatorDependencies['@angular-devkit/core'],
|
|
36
|
+
'@angular-eslint/eslint-plugin': o3rWorkspacePackageJson.generatorDependencies['@angular-eslint/eslint-plugin'],
|
|
37
37
|
'@angular/cli': packageJson.peerDependencies['@angular/common'],
|
|
38
38
|
'@angular/common': packageJson.peerDependencies['@angular/common'],
|
|
39
39
|
'@angular/compiler': packageJson.peerDependencies['@angular/common'],
|
|
@@ -41,24 +41,25 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
|
|
|
41
41
|
'@angular/core': packageJson.peerDependencies['@angular/common'],
|
|
42
42
|
'@angular/platform-browser': packageJson.peerDependencies['@angular/common'],
|
|
43
43
|
'@angular/platform-browser-dynamic': packageJson.peerDependencies['@angular/common'],
|
|
44
|
-
'@schematics/angular':
|
|
45
|
-
'cpy-cli':
|
|
46
|
-
'@types/node':
|
|
44
|
+
'@schematics/angular': o3rWorkspacePackageJson.generatorDependencies['@schematics/angular'],
|
|
45
|
+
'cpy-cli': o3rWorkspacePackageJson.generatorDependencies['cpy-cli'],
|
|
46
|
+
'@types/node': o3rWorkspacePackageJson.generatorDependencies['@types/node'],
|
|
47
47
|
...options.useJest
|
|
48
48
|
? {
|
|
49
|
-
'@angular-builders/jest':
|
|
50
|
-
'@
|
|
51
|
-
|
|
52
|
-
jest:
|
|
53
|
-
'jest-
|
|
54
|
-
'jest-
|
|
55
|
-
'jest
|
|
56
|
-
'ts-jest': o3rCorePackageJson.devDependencies['ts-jest']
|
|
49
|
+
'@angular-builders/jest': o3rWorkspacePackageJson.generatorDependencies['@angular-builders/jest'],
|
|
50
|
+
'@types/jest': o3rWorkspacePackageJson.generatorDependencies['@types/jest'],
|
|
51
|
+
jest: o3rWorkspacePackageJson.generatorDependencies.jest,
|
|
52
|
+
'jest-environment-jsdom': o3rWorkspacePackageJson.generatorDependencies['jest-environment-jsdom'],
|
|
53
|
+
'jest-junit': o3rWorkspacePackageJson.generatorDependencies['jest-junit'],
|
|
54
|
+
'jest-preset-angular': o3rWorkspacePackageJson.generatorDependencies['jest-preset-angular'],
|
|
55
|
+
'ts-jest': o3rWorkspacePackageJson.generatorDependencies['ts-jest']
|
|
57
56
|
}
|
|
58
|
-
: {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
57
|
+
: {
|
|
58
|
+
'@types/jasmine': o3rWorkspacePackageJson.generatorDependencies['@types/jasmine']
|
|
59
|
+
},
|
|
60
|
+
rxjs: o3rWorkspacePackageJson.peerDependencies.rxjs,
|
|
61
|
+
typescript: o3rWorkspacePackageJson.peerDependencies.typescript,
|
|
62
|
+
'zone.js': o3rWorkspacePackageJson.generatorDependencies['zone.js']
|
|
62
63
|
}).map(([key, range]) => ([key, (0, schematics_1.enforceTildeRange)(range)])))
|
|
63
64
|
};
|
|
64
65
|
tree.overwrite(path.posix.join(targetPath, 'package.json'), JSON.stringify(packageJson, null, 2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":";;AAwBA,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,4 +23,9 @@ export declare function filterPackageJsonScripts(tree: Tree, _context: Schematic
|
|
|
23
23
|
export declare function addMonorepoManager(o3rWorkspacePackageJson: PackageJson & {
|
|
24
24
|
generatorDependencies: Record<string, string>;
|
|
25
25
|
}, manager: MonorepoManager): Rule;
|
|
26
|
+
/**
|
|
27
|
+
* Patch the root tsconfig.json to remove the "files" property if empty
|
|
28
|
+
* This is to ensure compatibility with eslint projectService: true mode.
|
|
29
|
+
*/
|
|
30
|
+
export declare function patchAngularRootTsconfig(): (tree: Tree, context: SchematicContext) => void;
|
|
26
31
|
//# sourceMappingURL=npm-workspace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-workspace.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACJ,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAKL,eAAe,EAEhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"npm-workspace.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACJ,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAKL,eAAe,EAEhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AAInB,OAAO,KAAK,EACV,eAAe,EAChB,MAAM,WAAW,CAAC;AAEnB;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,GAAE,eAAsC,GAAG,IAAI,CAiChG;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,gEAoB9E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,uBAAuB,EAAE,WAAW,GAAG;IAAE,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI,CAiC3J;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,KAC9B,MAAM,IAAI,EAAE,SAAS,gBAAgB,UAkB9C"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addWorkspacesToProject = addWorkspacesToProject;
|
|
4
4
|
exports.filterPackageJsonScripts = filterPackageJsonScripts;
|
|
5
5
|
exports.addMonorepoManager = addMonorepoManager;
|
|
6
|
+
exports.patchAngularRootTsconfig = patchAngularRootTsconfig;
|
|
6
7
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
8
|
const schematics_2 = require("@o3r/schematics");
|
|
8
9
|
/**
|
|
@@ -96,4 +97,29 @@ function addMonorepoManager(o3rWorkspacePackageJson, manager) {
|
|
|
96
97
|
return tree;
|
|
97
98
|
};
|
|
98
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* Patch the root tsconfig.json to remove the "files" property if empty
|
|
102
|
+
* This is to ensure compatibility with eslint projectService: true mode.
|
|
103
|
+
*/
|
|
104
|
+
function patchAngularRootTsconfig() {
|
|
105
|
+
return (tree, context) => {
|
|
106
|
+
const tsconfigPath = '/tsconfig.json';
|
|
107
|
+
if (tree.exists(tsconfigPath)) {
|
|
108
|
+
const tsconfig = tree.readJson(tsconfigPath);
|
|
109
|
+
if (tsconfig.files && tsconfig.files.length === 0) {
|
|
110
|
+
delete tsconfig.files;
|
|
111
|
+
tree.overwrite(tsconfigPath, JSON.stringify(tsconfig, null, 2));
|
|
112
|
+
}
|
|
113
|
+
else if (tsconfig.files && tsconfig.files.length > 0) {
|
|
114
|
+
context.logger.warn(`
|
|
115
|
+
Root tsconfig.json contains "files" property. This is not fully compliant with the Otter architecture, you may encounter some
|
|
116
|
+
disruptions.
|
|
117
|
+
|
|
118
|
+
Otter CLI will not modify it to ensure no disruption to your setup.
|
|
119
|
+
|
|
120
|
+
Consider removing the "files" property.`);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
}
|
|
99
125
|
//# sourceMappingURL=npm-workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":";;AAiCA,wDAiCC;AAOD,4DAoBC;AAOD,gDAiCC;AAMD,4DAmBC;AA9JD,2DAGoC;AAMpC,gDAOyB;AAWzB;;;;;GAKG;AACH,SAAgB,sBAAsB,CAAC,cAA+B,iCAAoB;IACxF,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QACnE,MAAM,mBAAmB,GAAG,eAAe,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,gCAAmB,CAAC,kCAAkC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAgB,CAAC;QAChF,qBAAqB,CAAC,OAAO,GAAG,mBAAmB,CAAC;QAEpD,qBAAqB,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,UAAsB,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE5J,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,IAAA,4CAA+B,EAAC,EAAE,KAAK,EAAE,WAAW,EAAyB,CAAC,CAAC;IAEzG,MAAM,uBAAuB,GAAG,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QACzE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAQ,CAAC;QAChD,MAAM,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9B,MAAM,CAAC,eAAe,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;QACrD,MAAM,CAAC,eAAe,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;QACrD,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,OAAO,IAAA,kBAAK,EAAC;YACX,iBAAiB;YACjB,IAAA,wBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,iBAAiB;SAChE,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,IAAU,EAAE,QAA0B;IAC7E,MAAM,mBAAmB,GAAG,eAAe,CAAC;IAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,gCAAmB,CAAC,kCAAkC,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,qBAAqB,GAA2B;QACpD,KAAK,EAAE,UAAU;QACjB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,UAAU;QACjB,KAAK,EAAE,8CAA8C;KACtD,CAAC;IAEF,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAgB,CAAC;IAChF,qBAAqB,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAChD,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,WAAW,KAAK,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAC7I,CAAC;IAEF,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACpF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,uBAAwF,EAAE,OAAwB;IACnJ,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACvD,MAAM,mBAAmB,GAAG,eAAe,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,gCAAmB,CAAC,kCAAkC,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAgB,CAAC;YAChF,qBAAqB,CAAC,eAAe,GAAG;gBACtC,GAAG,qBAAqB,CAAC,eAAe;gBACxC,KAAK,EAAE,uBAAuB,CAAC,qBAAqB,CAAC,KAAK;aAC3D,CAAC;YACF,qBAAqB,CAAC,OAAO,GAAG;gBAC9B,GAAG,qBAAqB,CAAC,OAAO;gBAChC,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,gBAAgB;aACvB,CAAC;YAEF,MAAM,SAAS,GAA6D;gBAC1E,OAAO,EAAE,mFAAmF;gBAC5F,OAAO,EAAE,qBAAqB,CAAC,OAAO,IAAI,mBAAmB;aAC9D,CAAC;YACF,IAAI,IAAA,8BAAiB,GAAE,KAAK,MAAM,EAAE,CAAC;gBACnC,SAAS,CAAC,SAAS,GAAG,MAAM,CAAC;YAC/B,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAE/D,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAgB,wBAAwB;IACtC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,YAAY,GAAG,gBAAgB,CAAC;QACtC,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAiB,CAAC;YAC7D,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClD,OAAO,QAAQ,CAAC,KAAK,CAAC;gBACtB,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAClE,CAAC;iBAAM,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;;;;;;gDAMoB,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAoCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA8BlB;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,qBAAqB,KAAG,IA+F/D,CAAC"}
|
|
@@ -118,6 +118,7 @@ const prepareProject = (options) => {
|
|
|
118
118
|
!options.skipLinter && hasEslint ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
|
|
119
119
|
(0, npm_workspace_1.addWorkspacesToProject)(),
|
|
120
120
|
(0, npm_workspace_1.addMonorepoManager)(ownPackageJsonContent, options.monorepoManager),
|
|
121
|
+
(0, npm_workspace_1.patchAngularRootTsconfig)(),
|
|
121
122
|
options.skipEditorConfigSetup ? (0, schematics_1.noop)() : (0, editorconfig_1.generateEditorConfig)(),
|
|
122
123
|
options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
|
|
123
124
|
])(tree, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAIoC;AACpC,gDASyB;AACzB,2EAEkD;AAIlD,yDAGgC;AAChC,yDAEgC;AAChC,iEAEoC;AACpC,
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
|