@o3r/application 12.4.0-rc.3 → 12.4.0
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/application",
|
|
3
|
-
"version": "12.4.0
|
|
3
|
+
"version": "12.4.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -26,14 +26,15 @@
|
|
|
26
26
|
"@angular-devkit/schematics": "^19.0.0",
|
|
27
27
|
"@angular/common": "^19.0.0",
|
|
28
28
|
"@angular/core": "^19.0.0",
|
|
29
|
-
"@o3r/core": "^12.4.0
|
|
30
|
-
"@o3r/logger": "^12.4.0
|
|
31
|
-
"@o3r/routing": "^12.4.0
|
|
32
|
-
"@o3r/schematics": "^12.4.0
|
|
33
|
-
"@o3r/testing": "^12.4.0
|
|
29
|
+
"@o3r/core": "^12.4.0",
|
|
30
|
+
"@o3r/logger": "^12.4.0",
|
|
31
|
+
"@o3r/routing": "^12.4.0",
|
|
32
|
+
"@o3r/schematics": "^12.4.0",
|
|
33
|
+
"@o3r/testing": "^12.4.0",
|
|
34
34
|
"@schematics/angular": "^19.0.0",
|
|
35
35
|
"rxjs": "^7.8.1",
|
|
36
36
|
"ts-node": "~10.9.2",
|
|
37
|
+
"type-fest": "^4.30.1",
|
|
37
38
|
"typescript": "^5.5.4"
|
|
38
39
|
},
|
|
39
40
|
"peerDependenciesMeta": {
|
|
@@ -46,12 +47,15 @@
|
|
|
46
47
|
"@o3r/testing": {
|
|
47
48
|
"optional": true
|
|
48
49
|
},
|
|
50
|
+
"type-fest": {
|
|
51
|
+
"optional": true
|
|
52
|
+
},
|
|
49
53
|
"typescript": {
|
|
50
54
|
"optional": true
|
|
51
55
|
}
|
|
52
56
|
},
|
|
53
57
|
"dependencies": {
|
|
54
|
-
"@o3r/schematics": "^12.4.0
|
|
58
|
+
"@o3r/schematics": "^12.4.0",
|
|
55
59
|
"tslib": "^2.6.2"
|
|
56
60
|
},
|
|
57
61
|
"engines": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAwBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAyHlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -6,6 +6,18 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
6
6
|
const schematics_2 = require("@o3r/schematics");
|
|
7
7
|
const utility_1 = require("@schematics/angular/utility");
|
|
8
8
|
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
9
|
+
/**
|
|
10
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
11
|
+
*/
|
|
12
|
+
const dependenciesToInstall = [
|
|
13
|
+
'@angular/common',
|
|
14
|
+
'@angular/core',
|
|
15
|
+
'rxjs'
|
|
16
|
+
];
|
|
17
|
+
/**
|
|
18
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
19
|
+
*/
|
|
20
|
+
const devDependenciesToInstall = [];
|
|
9
21
|
/**
|
|
10
22
|
* Add Otter application to an Angular Project
|
|
11
23
|
* @param options The options to pass to ng-add execution
|
|
@@ -55,11 +67,20 @@ function ngAddFn(options) {
|
|
|
55
67
|
};
|
|
56
68
|
return acc;
|
|
57
69
|
}, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
70
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
71
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
72
|
+
const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
|
|
73
|
+
devDependenciesToInstall,
|
|
74
|
+
dependenciesToInstall,
|
|
75
|
+
projectType: workspaceProject?.projectType,
|
|
76
|
+
o3rPackageJsonPath: packageJsonPath,
|
|
77
|
+
projectPackageJson
|
|
78
|
+
}, context.logger);
|
|
58
79
|
const registerDevtoolRule = (0, devtools_registration_1.registerDevtools)(options);
|
|
59
80
|
return () => (0, schematics_1.chain)([
|
|
60
81
|
(0, schematics_2.setupDependencies)({
|
|
61
82
|
projectName: options.projectName,
|
|
62
|
-
dependencies,
|
|
83
|
+
dependencies: { ...dependencies, ...externalDependenciesInfo },
|
|
63
84
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
64
85
|
}),
|
|
65
86
|
addAngularAnimationPreferences,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAMlC,2DAEoC;AACpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|