@o3r/extractors 12.2.4 → 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
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@o3r/extractors",
|
|
3
3
|
"main": "./src/public_api.js",
|
|
4
4
|
"types": "./src/public_api.d.ts",
|
|
5
|
-
"version": "12.2.
|
|
5
|
+
"version": "12.2.7",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
8
8
|
},
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
"@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
|
|
25
25
|
"@angular-devkit/core": "^19.0.0",
|
|
26
26
|
"@angular-devkit/schematics": "^19.0.0",
|
|
27
|
-
"@o3r/core": "^12.2.
|
|
28
|
-
"@o3r/schematics": "^12.2.
|
|
29
|
-
"@o3r/telemetry": "^12.2.
|
|
27
|
+
"@o3r/core": "^12.2.7",
|
|
28
|
+
"@o3r/schematics": "^12.2.7",
|
|
29
|
+
"@o3r/telemetry": "^12.2.7",
|
|
30
30
|
"@schematics/angular": "^19.0.0",
|
|
31
31
|
"@yarnpkg/cli": "^4.0.0",
|
|
32
32
|
"@yarnpkg/core": "^4.1.1",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"globby": "^11.1.0",
|
|
37
37
|
"semver": "^7.5.2",
|
|
38
38
|
"ts-node": "~10.9.2",
|
|
39
|
-
"type-fest": "^4.
|
|
39
|
+
"type-fest": "^4.30.1",
|
|
40
40
|
"typescript": "^5.5.4"
|
|
41
41
|
},
|
|
42
42
|
"peerDependenciesMeta": {
|
|
@@ -67,9 +67,6 @@
|
|
|
67
67
|
"globby": {
|
|
68
68
|
"optional": true
|
|
69
69
|
},
|
|
70
|
-
"semver": {
|
|
71
|
-
"optional": true
|
|
72
|
-
},
|
|
73
70
|
"type-fest": {
|
|
74
71
|
"optional": true
|
|
75
72
|
}
|
|
@@ -101,13 +98,13 @@
|
|
|
101
98
|
"@nx/eslint-plugin": "~20.6.0",
|
|
102
99
|
"@nx/jest": "~20.6.0",
|
|
103
100
|
"@nx/js": "~20.6.0",
|
|
104
|
-
"@o3r/build-helpers": "^12.2.
|
|
105
|
-
"@o3r/core": "^12.2.
|
|
106
|
-
"@o3r/eslint-config": "^12.2.
|
|
107
|
-
"@o3r/eslint-plugin": "^12.2.
|
|
108
|
-
"@o3r/schematics": "^12.2.
|
|
109
|
-
"@o3r/telemetry": "^12.2.
|
|
110
|
-
"@o3r/test-helpers": "^12.2.
|
|
101
|
+
"@o3r/build-helpers": "^12.2.7",
|
|
102
|
+
"@o3r/core": "^12.2.7",
|
|
103
|
+
"@o3r/eslint-config": "^12.2.7",
|
|
104
|
+
"@o3r/eslint-plugin": "^12.2.7",
|
|
105
|
+
"@o3r/schematics": "^12.2.7",
|
|
106
|
+
"@o3r/telemetry": "^12.2.7",
|
|
107
|
+
"@o3r/test-helpers": "^12.2.7",
|
|
111
108
|
"@schematics/angular": "~19.2.0",
|
|
112
109
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
113
110
|
"@swc/helpers": "~0.5.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA8ElB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}
|
|
@@ -4,7 +4,16 @@ exports.ngAdd = void 0;
|
|
|
4
4
|
const path = require("node:path");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const cms_adapter_1 = require("../cms-adapter");
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
9
|
+
*/
|
|
10
|
+
const dependenciesToInstall = [];
|
|
11
|
+
/**
|
|
12
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
13
|
+
*/
|
|
14
|
+
const devDependenciesToInstall = [
|
|
15
|
+
'@angular-devkit/architect',
|
|
16
|
+
'@angular-devkit/core',
|
|
8
17
|
'semver'
|
|
9
18
|
];
|
|
10
19
|
const reportMissingSchematicsDep = (logger) => (reason) => {
|
|
@@ -19,11 +28,12 @@ Otherwise, use the error message as guidance.`);
|
|
|
19
28
|
*/
|
|
20
29
|
function ngAddFn(options) {
|
|
21
30
|
return async (tree, context) => {
|
|
22
|
-
const {
|
|
23
|
-
const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies')).catch(() => ({ NodeDependencyType: { Dev: 'devDependencies' } }));
|
|
31
|
+
const { getExternalDependenciesInfo, getPackageInstallConfig, getProjectNewDependenciesTypes, setupDependencies, getO3rPeerDeps, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
24
32
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
25
33
|
const depsInfo = getO3rPeerDeps(packageJsonPath);
|
|
26
34
|
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
35
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
36
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
27
37
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
28
38
|
acc[dep] = {
|
|
29
39
|
inManifest: [{
|
|
@@ -34,18 +44,20 @@ function ngAddFn(options) {
|
|
|
34
44
|
};
|
|
35
45
|
return acc;
|
|
36
46
|
}, getPackageInstallConfig(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
});
|
|
47
|
+
const externalDependenciesInfo = getExternalDependenciesInfo({
|
|
48
|
+
devDependenciesToInstall,
|
|
49
|
+
dependenciesToInstall,
|
|
50
|
+
projectPackageJson,
|
|
51
|
+
o3rPackageJsonPath: packageJsonPath,
|
|
52
|
+
projectType: workspaceProject?.projectType
|
|
53
|
+
}, context.logger);
|
|
45
54
|
return (0, schematics_1.chain)([
|
|
46
55
|
setupDependencies({
|
|
47
56
|
projectName: options.projectName,
|
|
48
|
-
dependencies
|
|
57
|
+
dependencies: {
|
|
58
|
+
...dependencies,
|
|
59
|
+
...externalDependenciesInfo
|
|
60
|
+
},
|
|
49
61
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
50
62
|
}),
|
|
51
63
|
(0, cms_adapter_1.updateCmsAdapter)(options, __dirname)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAEoC;AAOpC,gDAEwB;AAKxB,MAAM,qBAAqB,GAAG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|