Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/vitest.config.mts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mergeConfig, defineProject } from 'vitest/config';
// eslint-disable-next-line import/no-relative-packages
// eslint-disable-next-line import-x/no-relative-packages
import sharedConfig from '../vitest.shared.mts';

export default mergeConfig(
Expand Down
8 changes: 4 additions & 4 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default defineConfig(
baseDirectory: dirname,
}),
settings: {
'import/resolver': {
'import-x/resolver': {
typescript: {
project: ['tsconfig.json'],
},
Expand All @@ -49,7 +49,7 @@ export default defineConfig(
* their own groups.
*/
rules: {
'import/export': 'off', // FIXME: Maximum call stack exceeded
'import-x/export': 'off', // FIXME: Maximum call stack exceeded
'no-restricted-imports': [
'error',
{
Expand Down Expand Up @@ -111,7 +111,7 @@ export default defineConfig(
extends: createDocsConfig(),
rules: {
'@typescript-eslint/no-use-before-define': 'off',
'import/extensions': [
'import-x/extensions': [
'error',
// Ignores extensions in package imports as well as local ts/tsx imports but .mjs is always required
'ignorePackages',
Expand All @@ -136,7 +136,7 @@ export default defineConfig(
'@typescript-eslint/no-use-before-define': 'off',
'no-alert': 'off',
'no-console': 'off',
'import/no-relative-packages': 'off',
'import-x/no-relative-packages': 'off',
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@mui/internal-babel-plugin-display-name": "^1.0.4-canary.2",
"@mui/internal-babel-plugin-resolve-imports": "^2.0.7-canary.12",
"@mui/internal-bundle-size-checker": "^1.0.9-canary.13",
"@mui/internal-code-infra": "^0.0.2-canary.26",
"@mui/internal-code-infra": "https://pkg.pr.new/mui/mui-public/@mui/internal-code-infra@856013b",
"@mui/internal-docs-utils": "^2.0.1",
"@mui/internal-markdown": "^2.0.7",
"@mui/internal-scripts": "^2.0.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/vitest.config.mts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mergeConfig, defineProject } from 'vitest/config';
// eslint-disable-next-line import/no-relative-packages
// eslint-disable-next-line import-x/no-relative-packages
import sharedConfig from '../../vitest.shared.mts';

export default mergeConfig(
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/vitest.config.mts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mergeConfig, defineProject } from 'vitest/config';
// eslint-disable-next-line import/no-relative-packages
// eslint-disable-next-line import-x/no-relative-packages
import sharedConfig from '../../vitest.shared.mts';

export default mergeConfig(
Expand Down
74 changes: 57 additions & 17 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/vitest.config.mts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mergeConfig, defineProject } from 'vitest/config';
// eslint-disable-next-line import/no-relative-packages
// eslint-disable-next-line import-x/no-relative-packages
import sharedConfig from '../../vitest.shared.mts';

export default mergeConfig(
Expand Down
2 changes: 1 addition & 1 deletion test/regressions/vitest.config.mts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mergeConfig, defineProject } from 'vitest/config';
// eslint-disable-next-line import/no-relative-packages
// eslint-disable-next-line import-x/no-relative-packages
import sharedConfig from '../../vitest.shared.mts';

export default mergeConfig(
Expand Down
2 changes: 1 addition & 1 deletion vitest.shared.mts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resolve, dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
import { type UserWorkspaceConfig } from 'vitest/config';
// eslint-disable-next-line import/extensions
// eslint-disable-next-line import-x/extensions
import viteConfig from '@base-ui-components/monorepo-tests/vite.shared.config.mjs';

const CURRENT_DIR = dirname(fileURLToPath(import.meta.url));
Expand Down
Loading