Skip to content

Commit

Permalink
fix(eslint): fix @o3r/eslint-config-otter deps to eslint and eslint p…
Browse files Browse the repository at this point in the history
…lugins packages
  • Loading branch information
matthieu-crouzet committed Nov 22, 2024
1 parent 8399ca1 commit b0d25f3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 40 deletions.
26 changes: 0 additions & 26 deletions packages/@o3r/eslint-config-otter/eslint.local.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,5 @@ export default [
]
}
}
},
{
name: '@o3r/eslint-config-otter/overrides',
files: ['package.json'],
rules: {
'@o3r/json-dependency-versions-harmonize': [
'error',
{
// TODO should be removed in Otter v12
ignoredDependencies: [
'eslint',
'@typescript-eslint/eslint-plugin',
'@typescript-eslint/parser',
'@typescript-eslint/utils',
'eslint-plugin-jsdoc',
'eslint-plugin-unicorn'
],
ignoredPackages: [
'@o3r/build-helpers',
'@o3r/workspace-helpers'
],
alignPeerDependencies: false,
alignEngines: true
}
]
}
}
];
10 changes: 5 additions & 5 deletions packages/@o3r/eslint-config-otter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@
"@schematics/angular": "~18.2.0",
"@stylistic/eslint-plugin-ts": "^2.7.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@typescript-eslint/utils": "^7.14.1",
"eslint": "^8.57.0",
"@typescript-eslint/parser": "^7.14.1 || ^8.0.0",
"@typescript-eslint/utils": "^7.14.1 || ^8.0.0",
"eslint": "^8.57.0 || <9.15.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-plugin-jasmine": "^4.1.3",
"eslint-plugin-jest": "^28.0.0",
"eslint-plugin-jsdoc": "^48.11.0",
"eslint-plugin-jsdoc": "^48.11.0 || ^49.0.0 || ^50.0.0",
"eslint-plugin-prefer-arrow": "^1.2.2",
"eslint-plugin-unicorn": "^54.0.0",
"eslint-plugin-unicorn": "^54.0.0 || ^55.0.0",
"typescript": "~5.5.4"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@angular-eslint/builder": "~18.4.0",
"@angular/compiler": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@eslint/js": "~9.14.0",
"@eslint/js": "<9.15.0",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
"@schematics/angular": "~18.2.0",
Expand All @@ -49,7 +49,7 @@
"@typescript-eslint/types": "^8.0.0",
"@typescript-eslint/utils": "^8.0.0",
"angular-eslint": "^18.4.0",
"eslint": "^8.57.0 || ~9.14.0",
"eslint": "^8.57.0 || <9.15.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8665,15 +8665,15 @@ __metadata:
"@schematics/angular": ~18.2.0
"@stylistic/eslint-plugin-ts": ^2.7.0
"@typescript-eslint/eslint-plugin": ^7.14.1
"@typescript-eslint/parser": ^7.14.1
"@typescript-eslint/utils": ^7.14.1
eslint: ^8.57.0
"@typescript-eslint/parser": ^7.14.1 || ^8.0.0
"@typescript-eslint/utils": ^7.14.1 || ^8.0.0
eslint: ^8.57.0 || <9.15.0
eslint-import-resolver-node: ^0.3.4
eslint-plugin-jasmine: ^4.1.3
eslint-plugin-jest: ^28.0.0
eslint-plugin-jsdoc: ^48.11.0
eslint-plugin-jsdoc: ^48.11.0 || ^49.0.0 || ^50.0.0
eslint-plugin-prefer-arrow: ^1.2.2
eslint-plugin-unicorn: ^54.0.0
eslint-plugin-unicorn: ^54.0.0 || ^55.0.0
typescript: ~5.5.4
peerDependenciesMeta:
"@angular-devkit/schematics":
Expand Down Expand Up @@ -8750,7 +8750,7 @@ __metadata:
"@angular-eslint/builder": ~18.4.0
"@angular/compiler": ~18.2.0
"@eslint-community/eslint-plugin-eslint-comments": ^4.4.0
"@eslint/js": ~9.14.0
"@eslint/js": <9.15.0
"@o3r/eslint-plugin": "workspace:^"
"@o3r/schematics": "workspace:^"
"@schematics/angular": ~18.2.0
Expand All @@ -8759,7 +8759,7 @@ __metadata:
"@typescript-eslint/types": ^8.0.0
"@typescript-eslint/utils": ^8.0.0
angular-eslint: ^18.4.0
eslint: ^8.57.0 || ~9.14.0
eslint: ^8.57.0 || <9.15.0
eslint-import-resolver-node: ^0.3.4
eslint-import-resolver-typescript: ^3.6.3
eslint-plugin-import: ^2.31.0
Expand Down

0 comments on commit b0d25f3

Please sign in to comment.