Skip to content

Commit 134ad9d

Browse files
authored
Merge pull request #391 from oddbird/dependabot/npm_and_yarn/prod-0011aef14d
chore(deps): Bump the prod group with 3 updates
2 parents 8329232 + cb33d9e commit 134ad9d

7 files changed

Lines changed: 1358 additions & 2080 deletions

File tree

eslint.config.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/* eslint-disable import/no-named-as-default-member */
1+
/* eslint-disable import-x/no-named-as-default-member */
22

33
import js from '@eslint/js';
44
import vitest from '@vitest/eslint-plugin';
55
import prettier from 'eslint-config-prettier';
6-
import importPlugin from 'eslint-plugin-import';
6+
import { importX } from 'eslint-plugin-import-x';
77
import simpleImportSort from 'eslint-plugin-simple-import-sort';
88
import globals from 'globals';
99
import tseslint from 'typescript-eslint';
@@ -22,8 +22,8 @@ export default [
2222
js.configs.recommended,
2323
...tseslint.configs.recommended,
2424
...tseslint.configs.stylistic,
25-
importPlugin.flatConfigs.recommended,
26-
importPlugin.flatConfigs.typescript,
25+
importX.flatConfigs.recommended,
26+
importX.flatConfigs.typescript,
2727
prettier,
2828
{
2929
files: ['**/*.{js,mjs,cjs,ts,cts,mts}'],
@@ -39,7 +39,7 @@ export default [
3939
},
4040
plugins: { 'simple-import-sort': simpleImportSort },
4141
settings: {
42-
'import/resolver': {
42+
'import-x/resolver': {
4343
typescript: {
4444
project: ['tsconfig.json', 'tests/tsconfig.json'],
4545
},
@@ -54,10 +54,10 @@ export default [
5454
'no-warning-comments': ['warn', { terms: ['todo', 'fixme', '@@@'] }],
5555
'simple-import-sort/imports': 'warn',
5656
'simple-import-sort/exports': 'warn',
57-
'import/first': 'warn',
58-
'import/newline-after-import': 'warn',
59-
'import/no-duplicates': ['error', { 'prefer-inline': true }],
60-
'import/order': 'off',
57+
'import-x/first': 'warn',
58+
'import-x/newline-after-import': 'warn',
59+
'import-x/no-duplicates': ['error', { 'prefer-inline': true }],
60+
'import-x/order': 'off',
6161
},
6262
},
6363
{

0 commit comments

Comments
 (0)