@o3r/configuration 12.2.5 → 12.2.7
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/configuration",
|
|
3
|
-
"version": "12.2.
|
|
3
|
+
"version": "12.2.7",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -48,16 +48,16 @@
|
|
|
48
48
|
"@angular/platform-browser-dynamic": "^19.0.0",
|
|
49
49
|
"@ngrx/entity": "^19.0.0",
|
|
50
50
|
"@ngrx/store": "^19.0.0",
|
|
51
|
-
"@o3r/core": "^12.2.
|
|
52
|
-
"@o3r/logger": "^12.2.
|
|
53
|
-
"@o3r/schematics": "^12.2.
|
|
54
|
-
"@o3r/testing": "^12.2.5",
|
|
51
|
+
"@o3r/core": "^12.2.7",
|
|
52
|
+
"@o3r/logger": "^12.2.7",
|
|
53
|
+
"@o3r/schematics": "^12.2.7",
|
|
55
54
|
"@schematics/angular": "^19.0.0",
|
|
56
55
|
"cheerio": "^1.0.0-rc.10",
|
|
57
56
|
"express-interceptor": "^1.2.0",
|
|
58
57
|
"jasmine": "^5.0.0",
|
|
59
58
|
"rxjs": "^7.8.1",
|
|
60
59
|
"ts-node": "~10.9.2",
|
|
60
|
+
"type-fest": "^4.30.1",
|
|
61
61
|
"typescript": "^5.5.4"
|
|
62
62
|
},
|
|
63
63
|
"peerDependenciesMeta": {
|
|
@@ -79,6 +79,9 @@
|
|
|
79
79
|
"jasmine": {
|
|
80
80
|
"optional": true
|
|
81
81
|
},
|
|
82
|
+
"type-fest": {
|
|
83
|
+
"optional": true
|
|
84
|
+
},
|
|
82
85
|
"typescript": {
|
|
83
86
|
"optional": true
|
|
84
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+FlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}
|
|
@@ -11,6 +11,22 @@ If the error is related to missing @o3r dependencies you need to install '@o3r/c
|
|
|
11
11
|
Otherwise, use the error message as guidance.`);
|
|
12
12
|
throw reason;
|
|
13
13
|
};
|
|
14
|
+
/**
|
|
15
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
16
|
+
*/
|
|
17
|
+
const dependenciesToInstall = [
|
|
18
|
+
'@angular/core',
|
|
19
|
+
'@angular/platform-browser-dynamic',
|
|
20
|
+
'@ngrx/entity',
|
|
21
|
+
'@ngrx/store',
|
|
22
|
+
'rxjs'
|
|
23
|
+
];
|
|
24
|
+
/**
|
|
25
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
26
|
+
*/
|
|
27
|
+
const devDependenciesToInstall = [
|
|
28
|
+
'rxjs'
|
|
29
|
+
];
|
|
14
30
|
/**
|
|
15
31
|
* Add Otter configuration to an Angular Project
|
|
16
32
|
* @param options The options to pass to ng-add execution
|
|
@@ -18,7 +34,7 @@ Otherwise, use the error message as guidance.`);
|
|
|
18
34
|
function ngAddFn(options) {
|
|
19
35
|
/* ng add rules */
|
|
20
36
|
return async (tree, context) => {
|
|
21
|
-
const { setupDependencies, getProjectNewDependenciesTypes, getWorkspaceConfig, getO3rPeerDeps, registerPackageCollectionSchematics, setupSchematicsParamsForProject, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
37
|
+
const { getExternalDependenciesInfo, setupDependencies, getProjectNewDependenciesTypes, getWorkspaceConfig, getO3rPeerDeps, registerPackageCollectionSchematics, setupSchematicsParamsForProject, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
22
38
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
23
39
|
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
|
|
24
40
|
const depsInfo = getO3rPeerDeps(packageJsonPath);
|
|
@@ -36,6 +52,15 @@ function ngAddFn(options) {
|
|
|
36
52
|
context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
|
|
37
53
|
context.logger.info('Get more information on the following page: https://github.com/AmadeusITGroup/otter/tree/main/docs/configuration/OVERVIEW.md#Runtime-debugging');
|
|
38
54
|
const schematicsDefaultOptions = { useOtterConfig: undefined };
|
|
55
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
56
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
57
|
+
const externalDependenciesInfo = getExternalDependenciesInfo({
|
|
58
|
+
devDependenciesToInstall,
|
|
59
|
+
dependenciesToInstall,
|
|
60
|
+
o3rPackageJsonPath: packageJsonPath,
|
|
61
|
+
projectType: workspaceProject?.projectType,
|
|
62
|
+
projectPackageJson
|
|
63
|
+
}, context.logger);
|
|
39
64
|
return () => (0, schematics_1.chain)([
|
|
40
65
|
registerPackageCollectionSchematics(packageJson),
|
|
41
66
|
setupSchematicsParamsForProject({
|
|
@@ -45,7 +70,10 @@ function ngAddFn(options) {
|
|
|
45
70
|
}, options.projectName),
|
|
46
71
|
setupDependencies({
|
|
47
72
|
projectName: options.projectName,
|
|
48
|
-
dependencies
|
|
73
|
+
dependencies: {
|
|
74
|
+
...dependencies,
|
|
75
|
+
...externalDependenciesInfo
|
|
76
|
+
},
|
|
49
77
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
50
78
|
}),
|
|
51
79
|
() => (0, devtools_registration_1.registerDevtools)(options)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAKoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|