@o3r/workspace 11.7.0-prerelease.0 → 11.7.0-prerelease.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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.7.0-prerelease.
|
|
3
|
+
"version": "11.7.0-prerelease.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@angular/common": "^18.2.0",
|
|
31
31
|
"@angular/compiler-cli": "^18.2.0",
|
|
32
32
|
"@angular/core": "^18.2.0",
|
|
33
|
-
"@o3r/telemetry": "^11.7.0-prerelease.
|
|
33
|
+
"@o3r/telemetry": "^11.7.0-prerelease.1",
|
|
34
34
|
"@schematics/angular": "^18.2.0",
|
|
35
35
|
"type-fest": "^4.10.2",
|
|
36
36
|
"typescript": "^5.5.4"
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
}
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@o3r/schematics": "^11.7.0-prerelease.
|
|
50
|
+
"@o3r/schematics": "^11.7.0-prerelease.1",
|
|
51
51
|
"commander": "^12.0.0",
|
|
52
52
|
"globby": "^11.1.0",
|
|
53
53
|
"semver": "^7.5.2",
|
|
@@ -80,11 +80,11 @@
|
|
|
80
80
|
"@nx/jest": "~19.8.0",
|
|
81
81
|
"@nx/js": "~19.8.0",
|
|
82
82
|
"@nx/workspace": "~19.8.0",
|
|
83
|
-
"@o3r/build-helpers": "^11.7.0-prerelease.
|
|
84
|
-
"@o3r/core": "^11.7.0-prerelease.
|
|
85
|
-
"@o3r/eslint-plugin": "^11.7.0-prerelease.
|
|
86
|
-
"@o3r/schematics": "^11.7.0-prerelease.
|
|
87
|
-
"@o3r/test-helpers": "^11.7.0-prerelease.
|
|
83
|
+
"@o3r/build-helpers": "^11.7.0-prerelease.1",
|
|
84
|
+
"@o3r/core": "^11.7.0-prerelease.1",
|
|
85
|
+
"@o3r/eslint-plugin": "^11.7.0-prerelease.1",
|
|
86
|
+
"@o3r/schematics": "^11.7.0-prerelease.1",
|
|
87
|
+
"@o3r/test-helpers": "^11.7.0-prerelease.1",
|
|
88
88
|
"@schematics/angular": "~18.2.0",
|
|
89
89
|
"@stylistic/eslint-plugin": "~2.7.0",
|
|
90
90
|
"@types/jest": "~29.5.2",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AA4GlB;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
|
|
@@ -8,6 +8,20 @@ const schematics_2 = require("@o3r/schematics");
|
|
|
8
8
|
const schema_1 = require("@schematics/angular/application/schema");
|
|
9
9
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
10
10
|
const index_1 = require("../rule-factories/index");
|
|
11
|
+
/**
|
|
12
|
+
* Find the relative path to a configuration file at the monorepo root
|
|
13
|
+
* Note: This function is a duplicate of {@link import('@o3r/schematics').findConfigFileRelativePath} required due to TS Import issue
|
|
14
|
+
* @param tree
|
|
15
|
+
* @param files List of files to look for, the first of the list will be used
|
|
16
|
+
* @param originPath Path from where to calculate the relative path
|
|
17
|
+
*/
|
|
18
|
+
function findConfigFileRelativePath(tree, files, originPath) {
|
|
19
|
+
const foundFile = files.find((file) => tree.exists(`/${file}`));
|
|
20
|
+
if (foundFile === undefined) {
|
|
21
|
+
return '';
|
|
22
|
+
}
|
|
23
|
+
return path.posix.relative(originPath, `/${foundFile}`);
|
|
24
|
+
}
|
|
11
25
|
/**
|
|
12
26
|
* Add an Otter application to a monorepo
|
|
13
27
|
* @param options Schematic options
|
|
@@ -16,10 +30,11 @@ function generateApplicationFn(options) {
|
|
|
16
30
|
const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
|
|
17
31
|
const packageJsonName = schematics_1.strings.dasherize(options.name);
|
|
18
32
|
const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
|
|
19
|
-
const addProjectSpecificFiles = (targetPath, rootDependencies) => {
|
|
33
|
+
const addProjectSpecificFiles = (targetPath, rootDependencies, tsconfigBasePath) => {
|
|
20
34
|
return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
|
|
21
35
|
(0, schematics_1.template)({
|
|
22
36
|
...options,
|
|
37
|
+
tsconfigBasePath,
|
|
23
38
|
enforceTildeRange: schematics_2.enforceTildeRange,
|
|
24
39
|
name: packageJsonName,
|
|
25
40
|
rootDependencies
|
|
@@ -64,6 +79,7 @@ function generateApplicationFn(options) {
|
|
|
64
79
|
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
65
80
|
}
|
|
66
81
|
};
|
|
82
|
+
const tsconfigBasePath = findConfigFileRelativePath(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath);
|
|
67
83
|
return (0, schematics_1.chain)([
|
|
68
84
|
(0, schematics_1.externalSchematic)('@schematics/angular', 'application', {
|
|
69
85
|
...Object.entries(extendedOptions).reduce((acc, [key, value]) => (angularOptions.includes(key) ? { ...acc, [key]: value } : acc), {}),
|
|
@@ -71,7 +87,7 @@ function generateApplicationFn(options) {
|
|
|
71
87
|
projectRoot,
|
|
72
88
|
style: schema_1.Style.Scss
|
|
73
89
|
}),
|
|
74
|
-
addProjectSpecificFiles(targetPath, rootDependencies),
|
|
90
|
+
addProjectSpecificFiles(targetPath, rootDependencies, tsconfigBasePath),
|
|
75
91
|
(0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json', { updateInputFiles: true }),
|
|
76
92
|
(0, schematics_2.setupDependencies)({
|
|
77
93
|
dependencies,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|