@o3r/components 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/components",
|
|
3
|
-
"version": "12.4.0
|
|
3
|
+
"version": "12.4.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -45,15 +45,15 @@
|
|
|
45
45
|
"@ngrx/effects": "^19.0.0",
|
|
46
46
|
"@ngrx/entity": "^19.0.0",
|
|
47
47
|
"@ngrx/store": "^19.0.0",
|
|
48
|
-
"@o3r/analytics": "^12.4.0
|
|
49
|
-
"@o3r/configuration": "^12.4.0
|
|
50
|
-
"@o3r/core": "^12.4.0
|
|
51
|
-
"@o3r/dynamic-content": "^12.4.0
|
|
52
|
-
"@o3r/extractors": "^12.4.0
|
|
53
|
-
"@o3r/localization": "^12.4.0
|
|
54
|
-
"@o3r/logger": "^12.4.0
|
|
55
|
-
"@o3r/rules-engine": "^12.4.0
|
|
56
|
-
"@o3r/schematics": "^12.4.0
|
|
48
|
+
"@o3r/analytics": "^12.4.0",
|
|
49
|
+
"@o3r/configuration": "^12.4.0",
|
|
50
|
+
"@o3r/core": "^12.4.0",
|
|
51
|
+
"@o3r/dynamic-content": "^12.4.0",
|
|
52
|
+
"@o3r/extractors": "^12.4.0",
|
|
53
|
+
"@o3r/localization": "^12.4.0",
|
|
54
|
+
"@o3r/logger": "^12.4.0",
|
|
55
|
+
"@o3r/rules-engine": "^12.4.0",
|
|
56
|
+
"@o3r/schematics": "^12.4.0",
|
|
57
57
|
"@schematics/angular": "^19.0.0",
|
|
58
58
|
"@yarnpkg/cli": "^4.0.0",
|
|
59
59
|
"@yarnpkg/core": "^4.1.1",
|
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
"rxjs": "^7.8.1",
|
|
67
67
|
"semver": "^7.5.2",
|
|
68
68
|
"ts-node": "~10.9.2",
|
|
69
|
+
"type-fest": "^4.30.1",
|
|
69
70
|
"typescript": "^5.5.4"
|
|
70
71
|
},
|
|
71
72
|
"peerDependenciesMeta": {
|
|
@@ -129,17 +130,17 @@
|
|
|
129
130
|
"semver": {
|
|
130
131
|
"optional": true
|
|
131
132
|
},
|
|
133
|
+
"type-fest": {
|
|
134
|
+
"optional": true
|
|
135
|
+
},
|
|
132
136
|
"typescript": {
|
|
133
137
|
"optional": true
|
|
134
138
|
}
|
|
135
139
|
},
|
|
136
140
|
"dependencies": {
|
|
137
|
-
"@o3r/schematics": "^12.4.0
|
|
141
|
+
"@o3r/schematics": "^12.4.0",
|
|
138
142
|
"tslib": "^2.6.2"
|
|
139
143
|
},
|
|
140
|
-
"generatorDependencies": {
|
|
141
|
-
"@angular/cdk": "~19.2.0"
|
|
142
|
-
},
|
|
143
144
|
"engines": {
|
|
144
145
|
"node": "^20.11.1 || >=22.0.0"
|
|
145
146
|
},
|
|
@@ -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;AAuBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0FlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -8,51 +8,72 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
8
8
|
const schematics_2 = require("@o3r/schematics");
|
|
9
9
|
const cms_adapter_1 = require("../cms-adapter");
|
|
10
10
|
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
11
|
+
/**
|
|
12
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
13
|
+
*/
|
|
14
|
+
const dependenciesToInstall = [
|
|
15
|
+
'@angular/cdk',
|
|
16
|
+
'@angular/common',
|
|
17
|
+
'@angular/core',
|
|
18
|
+
'@angular/forms',
|
|
19
|
+
'@angular/platform-browser',
|
|
20
|
+
'@angular/platform-browser-dynamic',
|
|
21
|
+
'@ngrx/effects',
|
|
22
|
+
'@ngrx/entity',
|
|
23
|
+
'@ngrx/store',
|
|
24
|
+
'rxjs'
|
|
25
|
+
];
|
|
26
|
+
/**
|
|
27
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
28
|
+
*/
|
|
29
|
+
const devDependenciesToInstall = [
|
|
30
|
+
'chokidar'
|
|
31
|
+
];
|
|
11
32
|
/**
|
|
12
33
|
* Add Otter components to an Angular Project
|
|
13
34
|
* @param options
|
|
14
35
|
*/
|
|
15
36
|
function ngAddFn(options) {
|
|
16
37
|
/* ng add rules */
|
|
17
|
-
return
|
|
18
|
-
const { NodeDependencyType } = await Promise.resolve().then(() => tslib_1.__importStar(require('@schematics/angular/utility/dependencies'))).catch(() => ({ NodeDependencyType: { Dev: 'devDependencies' } }));
|
|
38
|
+
return (tree, context) => {
|
|
19
39
|
options = { ...(0, schematics_2.getDefaultOptionsForSchematic)((0, schematics_2.getWorkspaceConfig)(tree), '@o3r/components', 'ng-add', options), ...options };
|
|
20
40
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
21
|
-
const
|
|
22
|
-
const
|
|
41
|
+
const o3rPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
|
|
42
|
+
const o3rPeerDeps = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
|
|
23
43
|
if (options.enableMetadataExtract) {
|
|
24
|
-
|
|
44
|
+
o3rPeerDeps.o3rPeerDeps = [...o3rPeerDeps.o3rPeerDeps, '@o3r/extractors'];
|
|
25
45
|
}
|
|
26
46
|
const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
27
|
-
const dependencies =
|
|
47
|
+
const dependencies = o3rPeerDeps.o3rPeerDeps.reduce((acc, dep) => {
|
|
28
48
|
acc[dep] = {
|
|
29
49
|
inManifest: [{
|
|
30
|
-
range: `${options.exactO3rVersion ? '' : '~'}${
|
|
50
|
+
range: `${options.exactO3rVersion ? '' : '~'}${o3rPeerDeps.packageVersion}`,
|
|
31
51
|
types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
|
|
32
52
|
}],
|
|
33
53
|
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
34
54
|
};
|
|
35
55
|
return acc;
|
|
36
56
|
}, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
57
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
58
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
59
|
+
const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
|
|
60
|
+
devDependenciesToInstall,
|
|
61
|
+
dependenciesToInstall,
|
|
62
|
+
projectPackageJson,
|
|
63
|
+
o3rPackageJsonPath: packageJsonPath,
|
|
64
|
+
projectType: workspaceProject?.projectType
|
|
65
|
+
}, context.logger);
|
|
45
66
|
const rule = (0, schematics_1.chain)([
|
|
46
67
|
(0, schematics_2.removePackages)(['@otter/components']),
|
|
47
68
|
(0, schematics_2.setupDependencies)({
|
|
48
69
|
projectName: options.projectName,
|
|
49
70
|
dependencies: {
|
|
50
71
|
...dependencies,
|
|
51
|
-
...
|
|
72
|
+
...externalDependenciesInfo
|
|
52
73
|
},
|
|
53
|
-
ngAddToRun:
|
|
74
|
+
ngAddToRun: o3rPeerDeps.o3rPeerDeps
|
|
54
75
|
}),
|
|
55
|
-
(0, schematics_2.registerPackageCollectionSchematics)(
|
|
76
|
+
(0, schematics_2.registerPackageCollectionSchematics)(o3rPackageJson),
|
|
56
77
|
(0, schematics_2.setupSchematicsParamsForProject)({
|
|
57
78
|
'@o3r/core:component': {},
|
|
58
79
|
'@o3r/core:component-container': {},
|
|
@@ -61,7 +82,7 @@ function ngAddFn(options) {
|
|
|
61
82
|
...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
|
|
62
83
|
(0, devtools_registration_1.registerDevtools)(options)
|
|
63
84
|
]);
|
|
64
|
-
context.logger.info(`The package ${
|
|
85
|
+
context.logger.info(`The package ${o3rPeerDeps.packageName} comes with a debug mechanism`);
|
|
65
86
|
context.logger.info('Get more information on the following page: https://github.com/AmadeusITGroup/otter/tree/main/docs/components/INTRODUCTION.md#Runtime-debugging');
|
|
66
87
|
return () => rule(tree, context);
|
|
67
88
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,wDAAkC;AAClC,2DAKoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|