@o3r/workspace 11.7.0-prerelease.31 → 11.7.0-prerelease.33
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.7.0-prerelease.
|
|
3
|
+
"version": "11.7.0-prerelease.33",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@angular/common": "^18.2.0",
|
|
30
30
|
"@angular/compiler-cli": "^18.2.0",
|
|
31
31
|
"@angular/core": "^18.2.0",
|
|
32
|
-
"@o3r/telemetry": "^11.7.0-prerelease.
|
|
32
|
+
"@o3r/telemetry": "^11.7.0-prerelease.33",
|
|
33
33
|
"@schematics/angular": "^18.2.0",
|
|
34
34
|
"type-fest": "^4.10.2",
|
|
35
35
|
"typescript": "^5.5.4"
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
}
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@o3r/schematics": "^11.7.0-prerelease.
|
|
49
|
+
"@o3r/schematics": "^11.7.0-prerelease.33",
|
|
50
50
|
"commander": "^12.0.0",
|
|
51
51
|
"globby": "^11.1.0",
|
|
52
52
|
"semver": "^7.5.2",
|
|
@@ -71,19 +71,19 @@
|
|
|
71
71
|
"@babel/core": "~7.26.0",
|
|
72
72
|
"@babel/preset-typescript": "~7.26.0",
|
|
73
73
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
74
|
-
"@ngrx/entity": "~18.
|
|
75
|
-
"@ngrx/store": "~18.
|
|
74
|
+
"@ngrx/entity": "~18.1.0",
|
|
75
|
+
"@ngrx/store": "~18.1.0",
|
|
76
76
|
"@nx/angular": "~19.8.0",
|
|
77
77
|
"@nx/eslint": "~19.8.0",
|
|
78
78
|
"@nx/eslint-plugin": "~19.8.0",
|
|
79
79
|
"@nx/jest": "~19.8.0",
|
|
80
80
|
"@nx/js": "~19.8.0",
|
|
81
81
|
"@nx/workspace": "~19.8.0",
|
|
82
|
-
"@o3r/build-helpers": "^11.7.0-prerelease.
|
|
83
|
-
"@o3r/core": "^11.7.0-prerelease.
|
|
84
|
-
"@o3r/eslint-plugin": "^11.7.0-prerelease.
|
|
85
|
-
"@o3r/schematics": "^11.7.0-prerelease.
|
|
86
|
-
"@o3r/test-helpers": "^11.7.0-prerelease.
|
|
82
|
+
"@o3r/build-helpers": "^11.7.0-prerelease.33",
|
|
83
|
+
"@o3r/core": "^11.7.0-prerelease.33",
|
|
84
|
+
"@o3r/eslint-plugin": "^11.7.0-prerelease.33",
|
|
85
|
+
"@o3r/schematics": "^11.7.0-prerelease.33",
|
|
86
|
+
"@o3r/test-helpers": "^11.7.0-prerelease.33",
|
|
87
87
|
"@schematics/angular": "~18.2.0",
|
|
88
88
|
"@stylistic/eslint-plugin": "~2.7.0",
|
|
89
89
|
"@types/jest": "~29.5.2",
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"jest": "~29.7.0",
|
|
110
110
|
"jest-environment-jsdom": "~29.7.0",
|
|
111
111
|
"jest-junit": "~16.0.0",
|
|
112
|
-
"jest-preset-angular": "~14.
|
|
112
|
+
"jest-preset-angular": "~14.5.0",
|
|
113
113
|
"jsonc-eslint-parser": "~2.4.0",
|
|
114
114
|
"minimist": "^1.2.6",
|
|
115
115
|
"nx": "~19.8.0",
|
|
@@ -124,9 +124,9 @@
|
|
|
124
124
|
},
|
|
125
125
|
"generatorDependencies": {
|
|
126
126
|
"@angular/material": "~18.2.0",
|
|
127
|
-
"@ngrx/router-store": "~18.
|
|
128
|
-
"@ngrx/effects": "~18.
|
|
129
|
-
"@ngrx/store-devtools": "~18.
|
|
127
|
+
"@ngrx/router-store": "~18.1.0",
|
|
128
|
+
"@ngrx/effects": "~18.1.0",
|
|
129
|
+
"@ngrx/store-devtools": "~18.1.0",
|
|
130
130
|
"lerna": "^8.1.7"
|
|
131
131
|
},
|
|
132
132
|
"engines": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAMnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAMnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAwGxH"}
|
|
@@ -55,27 +55,41 @@ function ngGenerateModule(options) {
|
|
|
55
55
|
*/
|
|
56
56
|
const updateTsConfigFiles = (tree, context) => {
|
|
57
57
|
const tsconfigBase = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
context.logger.warn(`${tsconfigPath} does not contain path mapping, the edition will be skipped`);
|
|
58
|
+
let tsconfigBuild = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
|
|
59
|
+
if (!tsconfigBase) {
|
|
60
|
+
context.logger.error('No TSConfig found in the workspace to register the library.');
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
// create tsconfig.build.json if it does not exist
|
|
64
|
+
if (!tsconfigBuild || !tree.exists(tsconfigBuild)) {
|
|
65
|
+
const content = {
|
|
66
|
+
extends: tsconfigBase.replace(/^\/?/, './'),
|
|
67
|
+
compilerOptions: {
|
|
68
|
+
declarationMap: false
|
|
69
|
+
},
|
|
70
|
+
angularCompilerOptions: {
|
|
71
|
+
compilationMode: 'partial'
|
|
73
72
|
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
};
|
|
74
|
+
tsconfigBuild ||= 'tsconfig.build.json';
|
|
75
|
+
tree.create(tsconfigBuild, JSON.stringify(content, null, 2));
|
|
76
|
+
}
|
|
77
|
+
[tsconfigBase, tsconfigBuild].forEach((tsconfigPath) => {
|
|
78
|
+
const configFile = tree.readJson(tsconfigPath);
|
|
79
|
+
configFile.compilerOptions ||= {};
|
|
80
|
+
configFile.compilerOptions.paths ||= {};
|
|
81
|
+
configFile.compilerOptions.baseUrl ||= '.';
|
|
82
|
+
configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
|
|
83
|
+
configFile.compilerOptions.paths[options.packageJsonName] = [
|
|
84
|
+
path.posix.join(relativeTargetPath, 'src', 'public-api')
|
|
85
|
+
];
|
|
86
|
+
tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
|
|
78
87
|
});
|
|
88
|
+
if (tsconfigBuild && tree.exists(tsconfigBuild)) {
|
|
89
|
+
const configFile = tree.readJson(tsconfigBuild);
|
|
90
|
+
configFile.compilerOptions.paths[options.packageJsonName].unshift(path.posix.join(relativeTargetPath, 'dist'));
|
|
91
|
+
tree.overwrite(tsconfigBuild, JSON.stringify(configFile, null, 2));
|
|
92
|
+
}
|
|
79
93
|
};
|
|
80
94
|
const ngCliUpdate = (tree, context) => {
|
|
81
95
|
return (0, schematics_1.chain)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":";;AAuCA,
|
|
1
|
+
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
|