@o3r/extractors 12.5.0-prerelease.18 → 12.5.0-prerelease.2

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.
Files changed (3) hide show
  1. package/package.json +16 -16
  2. package/schematics/ng-add/index.d.ts.map +1 -1
  3. package/schematics/ng-add/index.js +12 -24
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.5.0-prerelease.18",
5
+ "version": "12.5.0-prerelease.2",
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.5.0-prerelease.18",
28
- "@o3r/schematics": "^12.5.0-prerelease.18",
29
- "@o3r/telemetry": "^12.5.0-prerelease.18",
27
+ "@o3r/core": "^12.5.0-prerelease.2",
28
+ "@o3r/schematics": "^12.5.0-prerelease.2",
29
+ "@o3r/telemetry": "^12.5.0-prerelease.2",
30
30
  "@schematics/angular": "^19.0.0",
31
31
  "@yarnpkg/cli": "^4.0.0",
32
32
  "@yarnpkg/core": "^4.1.1",
@@ -101,20 +101,20 @@
101
101
  "@nx/eslint-plugin": "~20.8.0",
102
102
  "@nx/jest": "~20.8.0",
103
103
  "@nx/js": "~20.8.0",
104
- "@o3r/build-helpers": "^12.5.0-prerelease.18",
105
- "@o3r/core": "^12.5.0-prerelease.18",
106
- "@o3r/eslint-config": "^12.5.0-prerelease.18",
107
- "@o3r/eslint-plugin": "^12.5.0-prerelease.18",
108
- "@o3r/schematics": "^12.5.0-prerelease.18",
109
- "@o3r/telemetry": "^12.5.0-prerelease.18",
110
- "@o3r/test-helpers": "^12.5.0-prerelease.18",
104
+ "@o3r/build-helpers": "^12.5.0-prerelease.2",
105
+ "@o3r/core": "^12.5.0-prerelease.2",
106
+ "@o3r/eslint-config": "^12.5.0-prerelease.2",
107
+ "@o3r/eslint-plugin": "^12.5.0-prerelease.2",
108
+ "@o3r/schematics": "^12.5.0-prerelease.2",
109
+ "@o3r/telemetry": "^12.5.0-prerelease.2",
110
+ "@o3r/test-helpers": "^12.5.0-prerelease.2",
111
111
  "@schematics/angular": "~19.2.0",
112
112
  "@stylistic/eslint-plugin": "~3.1.0",
113
113
  "@swc/helpers": "~0.5.0",
114
114
  "@types/jest": "~29.5.2",
115
115
  "@types/node": "^20.0.0",
116
116
  "@types/semver": "^7.3.13",
117
- "@typescript-eslint/parser": "~8.35.0",
117
+ "@typescript-eslint/parser": "~8.34.0",
118
118
  "@yarnpkg/cli": "^4.5.0",
119
119
  "@yarnpkg/core": "^4.1.3",
120
120
  "@yarnpkg/fslib": "^3.1.0",
@@ -122,12 +122,12 @@
122
122
  "@yarnpkg/plugin-pack": "^4.0.0",
123
123
  "angular-eslint": "~19.4.0",
124
124
  "cpy-cli": "^5.0.0",
125
- "eslint": "~9.29.0",
125
+ "eslint": "~9.28.0",
126
126
  "eslint-import-resolver-node": "~0.3.9",
127
127
  "eslint-import-resolver-typescript": "~3.10.0",
128
- "eslint-plugin-import": "~2.32.0",
128
+ "eslint-plugin-import": "~2.31.0",
129
129
  "eslint-plugin-import-newlines": "~1.4.0",
130
- "eslint-plugin-jest": "~28.14.0",
130
+ "eslint-plugin-jest": "~28.13.0",
131
131
  "eslint-plugin-jsdoc": "~50.8.0",
132
132
  "eslint-plugin-prefer-arrow": "~1.2.3",
133
133
  "eslint-plugin-unicorn": "~56.0.0",
@@ -149,7 +149,7 @@
149
149
  "ts-node": "~10.9.2",
150
150
  "type-fest": "^4.30.1",
151
151
  "typescript": "~5.8.2",
152
- "typescript-eslint": "~8.35.0",
152
+ "typescript-eslint": "~8.34.0",
153
153
  "typescript-json-schema": "^0.65.0",
154
154
  "zone.js": "~0.15.0"
155
155
  },
package/schematics/ng-add/index.d.ts.map CHANGED
@@ -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;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,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;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA6ClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
package/schematics/ng-add/index.js CHANGED
@@ -5,16 +5,7 @@ const path = require("node:path");
5
5
  const schematics_1 = require("@angular-devkit/schematics");
6
6
  const schematics_2 = require("@o3r/schematics");
7
7
  const cms_adapter_1 = require("../cms-adapter");
8
- /**
9
- * List of external dependencies to be added to the project as peer dependencies
10
- */
11
- const dependenciesToInstall = [];
12
- /**
13
- * List of external dependencies to be added to the project as dev dependencies
14
- */
15
- const devDependenciesToInstall = [
16
- '@angular-devkit/architect',
17
- '@angular-devkit/core',
8
+ const dependenciesToInstall = [
18
9
  'semver'
19
10
  ];
20
11
  /**
@@ -22,12 +13,11 @@ const devDependenciesToInstall = [
22
13
  * @param options
23
14
  */
24
15
  function ngAddFn(options) {
25
- return (tree, context) => {
16
+ return async (tree, context) => {
17
+ const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies')).catch(() => ({ NodeDependencyType: { Dev: 'devDependencies' } }));
26
18
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
27
19
  const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
28
20
  const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
29
- const projectDirectory = workspaceProject?.root || '.';
30
- const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
31
21
  const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
32
22
  acc[dep] = {
33
23
  inManifest: [{
@@ -38,20 +28,18 @@ function ngAddFn(options) {
38
28
  };
39
29
  return acc;
40
30
  }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
41
- const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
42
- devDependenciesToInstall,
43
- dependenciesToInstall,
44
- projectPackageJson,
45
- o3rPackageJsonPath: packageJsonPath,
46
- projectType: workspaceProject?.projectType
47
- }, context.logger);
31
+ Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
32
+ dependencies[dep] = {
33
+ inManifest: [{
34
+ range,
35
+ types: [NodeDependencyType.Dev]
36
+ }]
37
+ };
38
+ });
48
39
  return (0, schematics_1.chain)([
49
40
  (0, schematics_2.setupDependencies)({
50
41
  projectName: options.projectName,
51
- dependencies: {
52
- ...dependencies,
53
- ...externalDependenciesInfo
54
- },
42
+ dependencies,
55
43
  ngAddToRun: depsInfo.o3rPeerDeps
56
44
  }),
57
45
  (0, cms_adapter_1.updateCmsAdapter)(options, __dirname)