Skip to content

Commit 9761a52

Browse files
committed
[infra] Migrate to eslint-plugin-import-x
1 parent 390db56 commit 9761a52

File tree

9 files changed

+68
-28
lines changed

9 files changed

+68
-28
lines changed

docs/vitest.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mergeConfig, defineProject } from 'vitest/config';
2-
// eslint-disable-next-line import/no-relative-packages
2+
// eslint-disable-next-line import-x/no-relative-packages
33
import sharedConfig from '../vitest.shared.mts';
44

55
export default mergeConfig(

eslint.config.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default defineConfig(
3838
baseDirectory: dirname,
3939
}),
4040
settings: {
41-
'import/resolver': {
41+
'import-x/resolver': {
4242
typescript: {
4343
project: ['tsconfig.json'],
4444
},
@@ -49,7 +49,7 @@ export default defineConfig(
4949
* their own groups.
5050
*/
5151
rules: {
52-
'import/export': 'off', // FIXME: Maximum call stack exceeded
52+
'import-x/export': 'off', // FIXME: Maximum call stack exceeded
5353
'no-restricted-imports': [
5454
'error',
5555
{
@@ -111,7 +111,7 @@ export default defineConfig(
111111
extends: createDocsConfig(),
112112
rules: {
113113
'@typescript-eslint/no-use-before-define': 'off',
114-
'import/extensions': [
114+
'import-x/extensions': [
115115
'error',
116116
// Ignores extensions in package imports as well as local ts/tsx imports but .mjs is always required
117117
'ignorePackages',
@@ -136,7 +136,7 @@ export default defineConfig(
136136
'@typescript-eslint/no-use-before-define': 'off',
137137
'no-alert': 'off',
138138
'no-console': 'off',
139-
'import/no-relative-packages': 'off',
139+
'import-x/no-relative-packages': 'off',
140140
},
141141
},
142142
{

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@mui/internal-babel-plugin-display-name": "^1.0.4-canary.2",
7676
"@mui/internal-babel-plugin-resolve-imports": "^2.0.7-canary.12",
7777
"@mui/internal-bundle-size-checker": "^1.0.9-canary.13",
78-
"@mui/internal-code-infra": "^0.0.2-canary.26",
78+
"@mui/internal-code-infra": "https://pkg.pr.new/mui/mui-public/@mui/internal-code-infra@856013b",
7979
"@mui/internal-docs-utils": "^2.0.1",
8080
"@mui/internal-markdown": "^2.0.7",
8181
"@mui/internal-scripts": "^2.0.10",

packages/react/vitest.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mergeConfig, defineProject } from 'vitest/config';
2-
// eslint-disable-next-line import/no-relative-packages
2+
// eslint-disable-next-line import-x/no-relative-packages
33
import sharedConfig from '../../vitest.shared.mts';
44

55
export default mergeConfig(

packages/utils/vitest.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mergeConfig, defineProject } from 'vitest/config';
2-
// eslint-disable-next-line import/no-relative-packages
2+
// eslint-disable-next-line import-x/no-relative-packages
33
import sharedConfig from '../../vitest.shared.mts';
44

55
export default mergeConfig(

pnpm-lock.yaml

Lines changed: 57 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/e2e/vitest.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mergeConfig, defineProject } from 'vitest/config';
2-
// eslint-disable-next-line import/no-relative-packages
2+
// eslint-disable-next-line import-x/no-relative-packages
33
import sharedConfig from '../../vitest.shared.mts';
44

55
export default mergeConfig(

test/regressions/vitest.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mergeConfig, defineProject } from 'vitest/config';
2-
// eslint-disable-next-line import/no-relative-packages
2+
// eslint-disable-next-line import-x/no-relative-packages
33
import sharedConfig from '../../vitest.shared.mts';
44

55
export default mergeConfig(

vitest.shared.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { resolve, dirname } from 'node:path';
22
import { fileURLToPath } from 'node:url';
33
import { type UserWorkspaceConfig } from 'vitest/config';
4-
// eslint-disable-next-line import/extensions
4+
// eslint-disable-next-line import-x/extensions
55
import viteConfig from '@base-ui-components/monorepo-tests/vite.shared.config.mjs';
66

77
const CURRENT_DIR = dirname(fileURLToPath(import.meta.url));

0 commit comments

Comments
 (0)