Skip to content

refactor(eslint): drop use of deprecated method #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(eslint): drop use of deprecated method #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ Include the ESLint preset in your root `eslint.config.mjs`:
```js
import path from 'path';
import { fileURLToPath } from 'url';
import typescriptEslint from 'typescript-eslint';
import { defineConfig } from 'eslint/config';
import typescriptConfig from '@siemens/eslint-config-typescript';

// mimic CommonJS variables
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

export default typescriptEslint.config({
export default defineConfig({
extends: [...baseTypescriptConfig, prettier],
files: ['**/*.ts'],
languageOptions: {
Expand All @@ -80,15 +80,15 @@ Include the ESLint preset in your root `eslint.config.mjs`:
```js
import path from 'path';
import { fileURLToPath } from 'url';
import typescriptEslint from 'typescript-eslint';
import { defineConfig } from 'eslint/config';
import angularTypescriptConfig from '@siemens/eslint-config-angular';
import angularTemplateConfig from '@siemens/eslint-config-angular/template';

// mimic CommonJS variables
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const tsConfig = typescriptEslint.config({
const tsConfig = defineConfig({
extends: [...angularTypescriptConfig],
files: ['**/*.ts'],
languageOptions: {
Expand Down Expand Up @@ -117,22 +117,22 @@ const tsConfig = typescriptEslint.config({
}
});

const templateConfig = typescriptEslint.config({
const templateConfig = defineConfig({
extends: [...angularTemplateConfig],
files: ['**/*.html']
});

export default typescriptEslint.config(...tsConfig, ...templateConfig);
export default defineConfig(...tsConfig, ...templateConfig);
```

For libraries and other things in the `projects` directory,
create an additional `eslint.config.mjs` for each project that looks like this:

```js
import typescriptEslint from 'typescript-eslint';
import { defineConfig } from 'eslint/config';
import { tsConfig, templateConfig } from '../../eslint.config.mjs';

export default typescriptEslint.config(
export default defineConfig(
{
extends: [...tsConfig],
files: ['**/*.ts'],
Expand Down
5 changes: 3 additions & 2 deletions eslint-config-angular/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import typescriptEslint from 'typescript-eslint';
import angularEslint from 'angular-eslint';
import perfectionist from 'eslint-plugin-perfectionist';
import preferArrowPlugin from 'eslint-plugin-prefer-arrow';
import { defineConfig } from 'eslint/config';

// Keep in sync with eslint-config-typescript (except Angular stuff).

export const configBase = typescriptEslint.config({
export const configBase = defineConfig({
extends: [
eslintJs.configs.recommended,
...typescriptEslint.configs.recommended,
Expand Down Expand Up @@ -78,7 +79,7 @@ export const configBase = typescriptEslint.config({
}
});

export const configRecommended = typescriptEslint.config({
export const configRecommended = defineConfig({
extends: [...angularEslint.configs.tsAll, ...configBase],
plugins: {
'prefer-arrow': preferArrowPlugin
Expand Down
6 changes: 3 additions & 3 deletions eslint-config-angular/template.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
* Copyright Siemens 2024.
* SPDX-License-Identifier: MIT
*/
import typescriptEslint from 'typescript-eslint';
import angularEslint from 'angular-eslint';
import { defineConfig } from 'eslint/config';

export const configBase = typescriptEslint.config(...angularEslint.configs.templateRecommended);
export const configBase = defineConfig(...angularEslint.configs.templateRecommended);

export const configRecommended = typescriptEslint.config({
export const configRecommended = defineConfig({
extends: [...angularEslint.configs.templateAll, ...configBase],
rules: {
'@angular-eslint/template/click-events-have-key-events': ['off'],
Expand Down
5 changes: 3 additions & 2 deletions eslint-config-typescript/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import eslintJs from '@eslint/js';
import typescriptEslint from 'typescript-eslint';
import perfectionist from 'eslint-plugin-perfectionist';
import preferArrowPlugin from 'eslint-plugin-prefer-arrow';
import { defineConfig } from 'eslint/config';

// Keep in sync with eslint-config-angular (except Angular stuff).

export const configBase = typescriptEslint.config({
export const configBase = defineConfig({
extends: [eslintJs.configs.recommended, ...typescriptEslint.configs.recommended],
plugins: {
perfectionist
Expand Down Expand Up @@ -68,7 +69,7 @@ export const configBase = typescriptEslint.config({
}
});

export const configRecommended = typescriptEslint.config({
export const configRecommended = defineConfig({
extends: [...configBase],
plugins: {
'prefer-arrow': preferArrowPlugin
Expand Down
4 changes: 2 additions & 2 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import eslintJs from '@eslint/js';
import path from 'path';
import { fileURLToPath } from 'url';
import typescriptEslint from 'typescript-eslint';
import { defineConfig } from 'eslint/config';
import angularTypescriptConfig from '@siemens/eslint-config-angular';
import tsdocPlugin from 'eslint-plugin-tsdoc';
import eslintPluginHeaders from 'eslint-plugin-headers';
Expand All @@ -29,7 +29,7 @@ export default [
]
}
},
...typescriptEslint.config({
...defineConfig({
name: 'typescript-eslint',
extends: [...angularTypescriptConfig],
files: ['**/*.ts'],
Expand Down