chore: align typescript-eslint deps

AmadeusITGroup · Feb 3, 2025 · 43bd7c9 · 43bd7c9
1 parent acd5258
commit 43bd7c9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 69 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -16,7 +16,7 @@ packageExtensions:
       "@swc/types": "*"
   "@typescript-eslint/rule-tester@*":
     dependencies:
-      "@typescript-eslint/parser": ~8.21.0
+      "@typescript-eslint/parser": ~8.22.0
   "@angular-eslint/eslint-plugin-template@*":
     dependencies:
       "@typescript-eslint/types": ^8.15.0

diff --git a/packages/@ama-sdk/schematics/package.json b/packages/@ama-sdk/schematics/package.json
@@ -143,7 +143,7 @@
     "@swc/helpers": "~0.5.0",
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.21.0",
+    "@typescript-eslint/eslint-plugin": "~8.22.0",
     "jest-junit": "~16.0.0",
     "lint-staged": "^15.0.0",
     "minimist": "^1.2.6",

diff --git a/packages/@o3r/core/package.json b/packages/@o3r/core/package.json
@@ -158,8 +158,8 @@
     "@o3r/store-sync": "workspace:^",
     "@stylistic/eslint-plugin": "~3.0.0",
     "@types/jest": "~29.5.2",
-    "@typescript-eslint/eslint-plugin": "~8.21.0",
-    "@typescript-eslint/parser": "~8.21.0",
+    "@typescript-eslint/eslint-plugin": "~8.22.0",
+    "@typescript-eslint/parser": "~8.22.0",
     "angular-eslint": "~19.0.0",
     "cpy-cli": "^5.0.0",
     "eslint": "~9.19.0",
@@ -178,7 +178,7 @@
     "jest-preset-angular": "~14.5.0",
     "jsonc-eslint-parser": "~2.4.0",
     "nx": "~20.2.0",
-    "typescript-eslint": "~8.21.0",
+    "typescript-eslint": "~8.22.0",
     "zone.js": "~0.15.0"
   },
   "engines": {

diff --git a/packages/@o3r/eslint-config-otter/package.json b/packages/@o3r/eslint-config-otter/package.json
@@ -74,9 +74,9 @@
     "typescript": "^5.5.4"
   },
   "generatorDependencies": {
-    "@typescript-eslint/eslint-plugin": "~8.21.0",
-    "@typescript-eslint/parser": "~8.21.0",
-    "@typescript-eslint/utils": "~8.21.0",
+    "@typescript-eslint/eslint-plugin": "~8.22.0",
+    "@typescript-eslint/parser": "~8.22.0",
+    "@typescript-eslint/utils": "~8.22.0",
     "eslint": "~9.19.0",
     "eslint-plugin-jsdoc": "~50.6.0",
     "eslint-plugin-unicorn": "^56.0.0"

diff --git a/packages/@o3r/eslint-config-otter/schematics/ng-add/index.ts b/packages/@o3r/eslint-config-otter/schematics/ng-add/index.ts
@@ -1,10 +1,14 @@
+import * as fs from 'node:fs';
 import * as path from 'node:path';
 import {
   chain,
   Rule,
   SchematicContext,
   Tree,
 } from '@angular-devkit/schematics';
+import type {
+  PackageJson,
+} from 'type-fest';
 import {
   updateLinterConfigs,
 } from './linter';
@@ -50,13 +54,15 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       getO3rPeerDeps,
       getProjectNewDependenciesTypes,
       removePackages,
+      registerPackageCollectionSchematics,
       getPackageInstallConfig
     } = await import('@o3r/schematics');
     const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk|eslint-)/);
     const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
     const linterSchematicsFolder = __dirname;
     const { NodeDependencyType } = await import('@schematics/angular/utility/dependencies');
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' })) as PackageJson;
     const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
       acc[dep] = {
         inManifest: [{
@@ -78,6 +84,7 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       });
 
     return () => chain([
+      registerPackageCollectionSchematics(packageJson),
       removePackages(['@otter/eslint-config-otter', '@otter/eslint-plugin']),
       setupDependencies({
         projectName: options.projectName,

diff --git a/yarn.lock b/yarn.lock
@@ -14434,22 +14434,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:~8.21.0":
-  version: 8.21.0
-  resolution: "@typescript-eslint/parser@npm:8.21.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.21.0"
-    "@typescript-eslint/types": "npm:8.21.0"
-    "@typescript-eslint/typescript-estree": "npm:8.21.0"
-    "@typescript-eslint/visitor-keys": "npm:8.21.0"
-    debug: "npm:^4.3.4"
-  peerDependencies:
-    eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10/c403f56b0a856ad25ffc0d78d4f0ede64d622edb279ace8bc7554c82518c0462f608a1e06d62111633a57b9ffcc37e063378c3980fba138f93d14a7aad5d0db1
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/rule-tester@npm:~8.22.0":
   version: 8.22.0
   resolution: "@typescript-eslint/rule-tester@npm:8.22.0"
@@ -14466,16 +14450,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.21.0":
-  version: 8.21.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.21.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.21.0"
-    "@typescript-eslint/visitor-keys": "npm:8.21.0"
-  checksum: 10/99aa8257c758546c8c4905bd34381be446adea7642dbc279269039308dc33b8dbcf3d7b7d12da7bec8f8d8760b813a5852dc53d75e953cbe327fac05d3f18fc4
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:8.22.0":
   version: 8.22.0
   resolution: "@typescript-eslint/scope-manager@npm:8.22.0"
@@ -14501,38 +14475,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.21.0":
-  version: 8.21.0
-  resolution: "@typescript-eslint/types@npm:8.21.0"
-  checksum: 10/a22c99f5687358c7343789b942c9885bc1b49eb239562b792f22e2ac4f0d3f04102f204cd2d749202d6888767566fba86f54447894955310890ec307fec8ed8d
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:8.22.0, @typescript-eslint/types@npm:^8.0.0, @typescript-eslint/types@npm:^8.15.0":
   version: 8.22.0
   resolution: "@typescript-eslint/types@npm:8.22.0"
   checksum: 10/b43ea5b05ed0b43dcee8d2fa98b2c3f79c604780cbd56e6ba7f89e3066798b7169848694f59523fd2003e8fa699ddc97f28b0860a4eb04eea26c96d5ac9346bd
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.21.0":
-  version: 8.21.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.21.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.21.0"
-    "@typescript-eslint/visitor-keys": "npm:8.21.0"
-    debug: "npm:^4.3.4"
-    fast-glob: "npm:^3.3.2"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:^9.0.4"
-    semver: "npm:^7.6.0"
-    ts-api-utils: "npm:^2.0.0"
-  peerDependencies:
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10/1a8bcd2968490dcf047273a36e1d2cd51725e893ad874e554e4b81e62bf54e4ff2b7ee2af206208a2ae9ac2cc5c8b50e2244dd4fe9c42ef34122df4360e9f9c2
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:8.22.0":
   version: 8.22.0
   resolution: "@typescript-eslint/typescript-estree@npm:8.22.0"
@@ -14566,16 +14515,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.21.0":
-  version: 8.21.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.21.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.21.0"
-    eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10/781cafa354177de4e864511435dbe61d896a7d1331bca76dd0a151295cc27b9677412444d47e1d5c6d2e7de5fee29b7bef0489d76c494fa59139e421f860506a
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:8.22.0":
   version: 8.22.0
   resolution: "@typescript-eslint/visitor-keys@npm:8.22.0"