@o3r/workspace 10.3.0-prerelease.61 → 10.3.0-prerelease.63
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": "10.3.0-prerelease.
|
|
3
|
+
"version": "10.3.0-prerelease.63",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^10.3.0-prerelease.
|
|
41
|
+
"@o3r/schematics": "^10.3.0-prerelease.63",
|
|
42
42
|
"commander": "^12.0.0",
|
|
43
43
|
"globby": "^11.1.0",
|
|
44
44
|
"semver": "^7.5.2",
|
|
@@ -69,11 +69,11 @@
|
|
|
69
69
|
"@nx/eslint-plugin": "~18.3.0",
|
|
70
70
|
"@nx/jest": "~18.3.0",
|
|
71
71
|
"@nx/js": "~18.3.0",
|
|
72
|
-
"@o3r/build-helpers": "^10.3.0-prerelease.
|
|
73
|
-
"@o3r/core": "^10.3.0-prerelease.
|
|
74
|
-
"@o3r/eslint-plugin": "^10.3.0-prerelease.
|
|
75
|
-
"@o3r/schematics": "^10.3.0-prerelease.
|
|
76
|
-
"@o3r/test-helpers": "^10.3.0-prerelease.
|
|
72
|
+
"@o3r/build-helpers": "^10.3.0-prerelease.63",
|
|
73
|
+
"@o3r/core": "^10.3.0-prerelease.63",
|
|
74
|
+
"@o3r/eslint-plugin": "^10.3.0-prerelease.63",
|
|
75
|
+
"@o3r/schematics": "^10.3.0-prerelease.63",
|
|
76
|
+
"@o3r/test-helpers": "^10.3.0-prerelease.63",
|
|
77
77
|
"@schematics/angular": "~17.3.0",
|
|
78
78
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
79
79
|
"@types/jest": "~29.5.2",
|
|
@@ -33,7 +33,7 @@ function generateModuleFn(options) {
|
|
|
33
33
|
inManifest: [
|
|
34
34
|
{
|
|
35
35
|
range: `${options.exactO3rVersion ? '' : '~'}${ownPackageJsonContent.version}`,
|
|
36
|
-
types: [dependencies_1.NodeDependencyType.
|
|
36
|
+
types: [dependencies_1.NodeDependencyType.Dev]
|
|
37
37
|
}
|
|
38
38
|
],
|
|
39
39
|
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":";;;AAAA,2DAAwE;AACxE,4DAAoE;AACpE,kCAAkC;AAClC,gDASyB;AAEzB,+CAAoD;AACpD,+CAAoD;AAEpD,2EAA8E;AAC9E,8BAA8B;AAE9B;;;GAGG;AACH,SAAS,gBAAgB,CAAC,OAA+B;IAEvD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAgB,CAAC;QACrJ,MAAM,eAAe,GAAG,oBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAE3E,MAAM,IAAI,GAAG,IAAA,wBAAW,EAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,wBAAW,CAAC,uCAAuC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,WAAW,GAAG,IAAA,sCAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEhF,uDAAuD;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,WAAW,EAAE,SAAS,CAAC,CAAC;QACnF,MAAM,eAAe,GAAG,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;QAEtG,MAAM,YAAY,GAAoC;YACpD,gEAAgE;YAChE,WAAW,EAAE;gBACX,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,qBAAqB,CAAC,OAAQ,EAAE;wBAC/E,KAAK,EAAE,CAAC,iCAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAwF,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAMvJ;;;;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":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAwF,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAMvJ;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqFxH"}
|
|
@@ -41,6 +41,8 @@ function ngGenerateModule(options) {
|
|
|
41
41
|
const genPackageJsonPath = path.posix.join(options.targetPath, 'package.json');
|
|
42
42
|
const packageJson = t.readJson(genPackageJsonPath);
|
|
43
43
|
packageJson.name = options.packageJsonName;
|
|
44
|
+
packageJson.scripts ||= {};
|
|
45
|
+
packageJson.scripts.ng = 'ng';
|
|
44
46
|
t.overwrite(genPackageJsonPath, JSON.stringify(packageJson, null, 2));
|
|
45
47
|
return t;
|
|
46
48
|
}
|
|
@@ -54,37 +56,26 @@ function ngGenerateModule(options) {
|
|
|
54
56
|
const updateTsConfigFiles = (tree, context) => {
|
|
55
57
|
const tsconfigBase = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
|
|
56
58
|
const tsconfigBuild = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
59
|
+
[tsconfigBase, tsconfigBuild].forEach(tsconfigPath => {
|
|
60
|
+
if (tsconfigPath) {
|
|
61
|
+
const configFile = tree.readJson(tsconfigPath);
|
|
62
|
+
if (configFile?.compilerOptions?.paths) {
|
|
63
|
+
configFile.compilerOptions.baseUrl = '.';
|
|
64
|
+
configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
|
|
65
|
+
configFile.compilerOptions.paths[options.packageJsonName] = [
|
|
66
|
+
path.posix.join(relativeTargetPath, 'dist'),
|
|
67
|
+
path.posix.join(relativeTargetPath, 'src', 'public-api')
|
|
68
|
+
];
|
|
69
|
+
tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
context.logger.warn(`${tsconfigPath} does not contain path mapping, the edition will be skipped`);
|
|
73
|
+
}
|
|
66
74
|
}
|
|
67
75
|
else {
|
|
68
|
-
context.logger.warn(
|
|
76
|
+
context.logger.warn(`No TsConfig file found at ${tsconfigPath}`);
|
|
69
77
|
}
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
context.logger.warn('No base TsConfig file found');
|
|
73
|
-
}
|
|
74
|
-
if (tsconfigBuild) {
|
|
75
|
-
const configFile = tree.readJson(tsconfigBuild);
|
|
76
|
-
if (configFile?.compilerOptions?.paths) {
|
|
77
|
-
configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
|
|
78
|
-
configFile.compilerOptions.paths[options.packageJsonName] = [
|
|
79
|
-
path.posix.join(relativeTargetPath, 'dist'),
|
|
80
|
-
path.posix.join(relativeTargetPath, 'src', 'public-api')
|
|
81
|
-
];
|
|
82
|
-
tree.overwrite(tsconfigBuild, JSON.stringify(configFile, null, 2));
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
context.logger.warn(`${tsconfigBuild} does not contain path mapping, the edition will be skipped`);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
78
|
+
});
|
|
88
79
|
};
|
|
89
80
|
const ngCliUpdate = (tree, context) => {
|
|
90
81
|
return (0, schematics_2.chain)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":";;;AAEA,gDAA6D;AAC7D,2DAAuJ;AACvJ,kCAAkC;AAClC,qCAAuC;AACvC,qCAAoF;AACpF,sDAAmE;AAEnE;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,OAAiF;IAEhH,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,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACzF,MAAM,kBAAkB,GAAqE,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzJ,MAAM,YAAY,GAAG,kBAAkB,CAAC,YAAa,CAAC,iBAAiB,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,gBAAgB,CAAC,EAAE;YAC9C,IAAA,qBAAQ,EAAC;gBACP,GAAG,OAAO;gBACV,gBAAgB,EAAE,IAAA,uCAA0B,EAAC,IAAI,EAC/C,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC;gBACzJ,gBAAgB,EAAE,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC;gBAC/G,iBAAiB,EAAE,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC;aACxI,CAAC;YACF,IAAA,gCAAmB,GAAE;YACrB,IAAA,iBAAI,EAAC,OAAO,CAAC,UAAU,CAAC;SACzB,CAAC,CAAC;QAEH,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAS,EAAC,UAAU,EAAE,0BAAa,CAAC,SAAS,CAAC;YAC9C,IAAA,yCAAgC,EAAC,OAAO,CAAC,UAAU,EAAE,YAAa,EAAE,kBAAkB,EAAE,OAAO,CAAC;YAChG,IAAA,+BAAsB,EAAC,OAAO,CAAC,UAAU,CAAC;YAC1C,CAAC,CAAC,EAAE,EAAE;gBACJ,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;gBAC/E,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAgB,CAAC;gBAClE,WAAW,CAAC,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC;gBAC3C,CAAC,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBACtE,OAAO,CAAC,CAAC;YACX,CAAC;SACF,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,mBAAmB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,YAAY,GAAG,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,GAAG,CAAC,CAAC;QACpG,MAAM,aAAa,GAAG,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,GAAG,CAAC,CAAC;QACrF,IAAI,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
|