Browse Source

Task/migrate ESLint configuration to flat config without FlatCompat

pull/7938/head
David Requeno 6 days ago
parent
commit
197f28e058
  1. 4
      apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
  2. 53
      eslint.config.cjs
  3. 27
      package-lock.json
  4. 3
      package.json

4
apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts

@ -398,10 +398,10 @@ export class GfAllocationsPageComponent implements OnInit {
this.holdings[assetProfileIdentifier] = {
assetClass:
position.assetProfile.assetClass || (UNKNOWN_KEY as AssetClass),
position.assetProfile.assetClass ?? (UNKNOWN_KEY as AssetClass),
assetClassLabel: position.assetProfile.assetClassLabel ?? UNKNOWN_KEY,
assetSubClass:
position.assetProfile.assetSubClass || (UNKNOWN_KEY as AssetSubClass),
position.assetProfile.assetSubClass ?? (UNKNOWN_KEY as AssetSubClass),
assetSubClassLabel:
position.assetProfile.assetSubClassLabel ?? UNKNOWN_KEY,
currency: this.extractCurrency(position.assetProfile),

53
eslint.config.cjs

@ -1,19 +1,14 @@
const { FlatCompat } = require('@eslint/eslintrc');
const js = require('@eslint/js');
const nxEslintPlugin = require('@nx/eslint-plugin');
const importPlugin = require('eslint-plugin-import');
const storybook = require('eslint-plugin-storybook');
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended
});
const typescriptEslint = require('typescript-eslint');
module.exports = [
{
ignores: ['**/dist']
},
...storybook.configs['flat/recommended'],
{ plugins: { '@nx': nxEslintPlugin } },
{ plugins: { '@nx': nxEslintPlugin, import: importPlugin } },
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
rules: {
@ -35,41 +30,15 @@ module.exports = [
'no-extra-semi': 'off'
}
},
...compat
.config({
extends: ['plugin:@nx/typescript']
})
.map((config) => ({
...config,
files: ['**/*.ts', '**/*.tsx', '**/*.cts', '**/*.mts'],
rules: {
...config.rules
}
})),
...compat
.config({
extends: ['plugin:@nx/javascript']
})
.map((config) => ({
...config,
files: ['**/*.js', '**/*.jsx', '**/*.cjs', '**/*.mjs'],
rules: {
...config.rules
}
})),
...compat
.config({
plugins: ['eslint-plugin-import', '@typescript-eslint'],
extends: [
'plugin:@typescript-eslint/recommended-type-checked',
'plugin:@typescript-eslint/stylistic-type-checked'
]
})
.map((config) => ({
...config,
...nxEslintPlugin.configs['flat/typescript'],
...nxEslintPlugin.configs['flat/javascript'],
...typescriptEslint.config({
files: ['**/*.ts'],
extends: [
typescriptEslint.configs.recommendedTypeChecked,
typescriptEslint.configs.stylisticTypeChecked
],
rules: {
...config.rules,
'@typescript-eslint/consistent-indexed-object-style': 'off',
'@typescript-eslint/dot-notation': 'off',
'@typescript-eslint/explicit-member-accessibility': [
@ -190,5 +159,5 @@ module.exports = [
// and can be remove once solved
'@typescript-eslint/prefer-nullish-coalescing': 'warn' // TODO: Requires strictNullChecks: true
}
}))
})
];

27
package-lock.json

@ -122,8 +122,6 @@
"@angular/language-service": "22.1.2",
"@angular/localize": "22.1.2",
"@angular/pwa": "22.1.4",
"@eslint/eslintrc": "3.3.1",
"@eslint/js": "9.35.0",
"@nestjs/schematics": "11.1.0",
"@nestjs/testing": "11.2.3",
"@nx/angular": "23.1.1",
@ -177,6 +175,7 @@
"ts-node": "10.9.2",
"tslib": "2.8.1",
"typescript": "6.0.3",
"typescript-eslint": "8.67.0",
"webpack-cli": "7.1.0"
},
"engines": {
@ -34881,6 +34880,30 @@
"node": ">=14.17"
}
},
"node_modules/typescript-eslint": {
"version": "8.67.0",
"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.67.0.tgz",
"integrity": "sha512-S2udFs8tCKEKffuJ4TB1idGUZiXdCPGi3IPBGWXarbLQ5UPXORV8QEVzJ4gCRduURMb5EkpNCdjbk0eDIuI8Yg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "8.67.0",
"@typescript-eslint/parser": "8.67.0",
"@typescript-eslint/typescript-estree": "8.67.0",
"@typescript-eslint/utils": "8.67.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/uglify-js": {
"version": "3.19.3",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",

3
package.json

@ -166,8 +166,6 @@
"@angular/language-service": "22.1.2",
"@angular/localize": "22.1.2",
"@angular/pwa": "22.1.4",
"@eslint/eslintrc": "3.3.1",
"@eslint/js": "9.35.0",
"@nestjs/schematics": "11.1.0",
"@nestjs/testing": "11.2.3",
"@nx/angular": "23.1.1",
@ -221,6 +219,7 @@
"ts-node": "10.9.2",
"tslib": "2.8.1",
"typescript": "6.0.3",
"typescript-eslint": "8.67.0",
"webpack-cli": "7.1.0"
},
"engines": {

Loading…
Cancel
Save