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: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ jobs:
- run:
name: ESLint
command: pnpm eslint:ci
environment:
NODE_OPTIONS: --max-old-space-size=8192
- run:
name: Lint JSON
command: pnpm jsonlint
Expand Down
2 changes: 1 addition & 1 deletion docs/next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const pickersAdaptersDeps = getPickerAdapterDeps();

let localSettings = {};
try {
// eslint-disable-next-line import/extensions
// eslint-disable-next-line import-x/extensions
localSettings = require('./next.config.local.js');
} catch (_) {
// Ignore
Expand Down
14 changes: 10 additions & 4 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default defineConfig(
'consistent-default-export-name': eslintPluginConsistentName,
},
settings: {
'import/resolver': {
'import-x/resolver': {
webpack: {
config: path.join(dirname, './webpackBaseConfig.js'),
},
Expand All @@ -121,8 +121,8 @@ export default defineConfig(
'material-ui/straight-quotes': 'error',
// turn off global react compiler plugin as it's controlled per package on this repo
'react-compiler/react-compiler': 'off',
'import/no-relative-packages': 'error',
'import/no-restricted-paths': [
'import-x/no-relative-packages': 'error',
'import-x/no-restricted-paths': [
'error',
{
zones: [
Expand Down Expand Up @@ -253,6 +253,12 @@ export default defineConfig(
extends: createDocsConfig(),
rules: {
'@next/next/no-img-element': 'off',
'import-x/no-unresolved': [
'error',
{
ignore: ['\\?muiMarkdown$'],
},
],
},
},

Expand Down Expand Up @@ -344,7 +350,7 @@ export default defineConfig(
rules: {
// Base UI lint rules
'@typescript-eslint/no-redeclare': 'off',
'import/export': 'off',
'import-x/export': 'off',
'material-ui/straight-quotes': 'off',
'jsdoc/require-param': 'off',
'jsdoc/require-returns': 'off',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"@mui/internal-babel-plugin-display-name": "^1.0.4-canary.3",
"@mui/internal-babel-plugin-resolve-imports": "^2.0.7-canary.13",
"@mui/internal-bundle-size-checker": "^1.0.9-canary.18",
"@mui/internal-code-infra": "^0.0.2-canary.31",
"@mui/internal-code-infra": "https://pkg.pr.new/mui/mui-public/@mui/internal-code-infra@d608fe0",
"@mui/internal-markdown": "^2.0.6",
"@mui/internal-test-utils": "catalog:",
"@mui/material": "catalog:",
Expand Down
2 changes: 2 additions & 0 deletions packages/x-charts-premium/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@ export * from '@mui/x-charts-pro/ChartZoomSlider';
export * from '@mui/x-charts-pro/ChartsToolbarPro';

// Premium utilities
/* eslint-disable import-x/export */
export * from './constants';
export * from './hooks';
export * from './context';
export * from './models';
// Locales should be imported from `@mui/x-charts-premium/locales`
// export * from './locales';
export * from './colorPalettes';
/* eslint-enable import-x/export */
2 changes: 2 additions & 0 deletions packages/x-charts-pro/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ export * from '@mui/x-charts/ChartsOverlay';
export * from '@mui/x-charts/ChartsWrapper';

// Pro utilities
// eslint-disable-next-line import-x/export
export * from './constants';
export * from './hooks';
export * from './context';
export * from './models';
// Locales should be imported from `@mui/x-charts-pro/locales`
// export * from './locales';
// eslint-disable-next-line import-x/export
export * from './colorPalettes';

// Pro components
Expand Down
1 change: 1 addition & 0 deletions packages/x-data-grid/src/hooks/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export * from './useGridApiMethod';
export * from './useGridLogger';
export { useGridSelector } from './useGridSelector';
export * from './useGridNativeEventListener';
// eslint-disable-next-line import-x/export
export * from './useFirstRender';
export * from './useOnMount';
export * from './useRunOncePerLoop';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// date-fns-jalali@<3 has no exports field defined
// See https://github.com/date-fns/date-fns/issues/1781
/* eslint-disable import/extensions, class-methods-use-this */
/* eslint-disable import-x/extensions, class-methods-use-this */
/* v8 ignore start */
// @ts-nocheck
import addSeconds from 'date-fns-jalali/addSeconds/index.js';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// date-fns@<3 has no exports field defined
// See https://github.com/date-fns/date-fns/issues/1781
/* eslint-disable import/extensions, class-methods-use-this */
/* eslint-disable import-x/extensions, class-methods-use-this */
/* v8 ignore start */
// @ts-nocheck
import addDays from 'date-fns/addDays/index.js';
Expand Down
4 changes: 2 additions & 2 deletions packages/x-date-pickers/src/AdapterDayjs/AdapterDayjs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import dayjs, { Dayjs } from 'dayjs';
// dayjs has no exports field defined
// See https://github.com/iamkun/dayjs/issues/2562
/* eslint-disable import/extensions */
/* eslint-disable import-x/extensions */
import weekOfYearPlugin from 'dayjs/plugin/weekOfYear.js';
import customParseFormatPlugin from 'dayjs/plugin/customParseFormat.js';
import localizedFormatPlugin from 'dayjs/plugin/localizedFormat.js';
import isBetweenPlugin from 'dayjs/plugin/isBetween.js';
import advancedFormatPlugin from 'dayjs/plugin/advancedFormat.js';
/* v8 ignore stop */
/* eslint-enable import/extensions */
/* eslint-enable import-x/extensions */
import { warnOnce } from '@mui/x-internals/warning';
import {
FieldFormatTokenMap,
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers/vitest.config.jsdom.mts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url';
import { mergeConfig } from 'vitest/config';
// eslint-disable-next-line import/no-relative-packages
// eslint-disable-next-line import-x/no-relative-packages
import { redirectImports } from '../../test/vite-plugin-filter-replace.mts';
import sharedConfig from '../../vitest.shared.mts';
import { getTestName } from '../../scripts/getTestName.mts';
Expand Down
2 changes: 1 addition & 1 deletion packages/x-virtualizer/src/features/colspan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { ColumnWithWidth, RowId } from '../models';
import type { CellColSpanInfo } from '../models/colspan';
import { Virtualization } from './virtualization';

/* eslint-disable import/export, @typescript-eslint/no-redeclare */
/* eslint-disable import-x/export, @typescript-eslint/no-redeclare */

type ColumnIndex = number;
type ColspanMap = Map<RowId, Record<ColumnIndex, CellColSpanInfo>>;
Expand Down
2 changes: 1 addition & 1 deletion packages/x-virtualizer/src/features/dimensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Store, useStore, useStoreEffect, createSelectorMemoized } from '@mui/x-
import { ColumnWithWidth, DimensionsState, RowId, RowEntry, RowsMetaState, Size } from '../models';
import type { BaseState, VirtualizerParams } from '../useVirtualizer';

/* eslint-disable import/export, @typescript-eslint/no-redeclare */
/* eslint-disable import-x/export, @typescript-eslint/no-redeclare */
/* eslint-disable no-underscore-dangle */

export type DimensionsParams = {
Expand Down
2 changes: 1 addition & 1 deletion packages/x-virtualizer/src/features/keyboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { BaseState, VirtualizerParams } from '../useVirtualizer';
import { Dimensions } from './dimensions';
import { Virtualization } from './virtualization';

/* eslint-disable import/export, @typescript-eslint/no-redeclare */
/* eslint-disable import-x/export, @typescript-eslint/no-redeclare */

const selectors = {};

Expand Down
2 changes: 1 addition & 1 deletion packages/x-virtualizer/src/features/rowspan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { RowRange } from '../models';
import type { RowSpanningState, RowSpanningCaches } from '../models/rowspan';
import { Virtualization } from './virtualization';

/* eslint-disable import/export, @typescript-eslint/no-redeclare */
/* eslint-disable import-x/export, @typescript-eslint/no-redeclare */

const EMPTY_RANGE: RowRange = { firstRowIndex: 0, lastRowIndex: 0 };
const EMPTY_CACHES: RowSpanningCaches = {
Expand Down
2 changes: 1 addition & 1 deletion packages/x-virtualizer/src/features/virtualization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
ScrollDirection,
} from '../models';

/* eslint-disable import/export, @typescript-eslint/no-redeclare */
/* eslint-disable import-x/export, @typescript-eslint/no-redeclare */

const clamp = (value: number, min: number, max: number) => Math.max(min, Math.min(max, value));

Expand Down
Loading
Loading