[core] Fix no-restricted-imports ESLint rule not working for data g…

…rid packages (#12477)
mui · Mar 18, 2024 · 83de93f · 83de93f
1 parent b438784
commit 83de93f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 15 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -157,10 +157,10 @@ module.exports = {
       },
     },
     buildPackageRestrictedImports('@mui/x-charts', 'x-charts'),
-    buildPackageRestrictedImports('@mui/x-data-grid', 'grid/x-data-grid'),
-    buildPackageRestrictedImports('@mui/x-data-grid-pro', 'grid/x-data-grid-pro'),
-    buildPackageRestrictedImports('@mui/x-data-grid-premium', 'grid/x-data-grid-premium'),
-    buildPackageRestrictedImports('@mui/x-data-grid-generator', 'grid/x-data-grid-generator'),
+    buildPackageRestrictedImports('@mui/x-data-grid', 'x-data-grid'),
+    buildPackageRestrictedImports('@mui/x-data-grid-pro', 'x-data-grid-pro'),
+    buildPackageRestrictedImports('@mui/x-data-grid-premium', 'x-data-grid-premium'),
+    buildPackageRestrictedImports('@mui/x-data-grid-generator', 'x-data-grid-generator'),
     buildPackageRestrictedImports('@mui/x-pickers', 'x-pickers'),
     buildPackageRestrictedImports('@mui/x-pickers-pro', 'x-pickers-pro'),
     buildPackageRestrictedImports('@mui/x-license', 'x-license'),

diff --git a/packages/x-data-grid-pro/src/components/headerFiltering/GridHeaderFilterCell.tsx b/packages/x-data-grid-pro/src/components/headerFiltering/GridHeaderFilterCell.tsx
@@ -25,11 +25,9 @@ import {
   gridHeaderFilteringEditFieldSelector,
   gridHeaderFilteringMenuSelector,
   isNavigationKey,
-} from '@mui/x-data-grid/internals';
-import {
   shouldCellShowLeftBorder,
   shouldCellShowRightBorder,
-} from '@mui/x-data-grid/utils/cellBorderUtils';
+} from '@mui/x-data-grid/internals';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { DataGridProProcessedProps } from '../../models/dataGridProProps';
 import { GridHeaderFilterMenuContainer } from './GridHeaderFilterMenuContainer';

diff --git a/packages/x-data-grid-pro/src/hooks/features/infiniteLoader/useGridInfiniteLoader.tsx b/packages/x-data-grid-pro/src/hooks/features/infiniteLoader/useGridInfiniteLoader.tsx
@@ -6,10 +6,9 @@ import {
   useGridApiMethod,
   gridDimensionsSelector,
 } from '@mui/x-data-grid';
-import { useGridVisibleRows } from '@mui/x-data-grid/internals';
+import { useGridVisibleRows, GridInfiniteLoaderPrivateApi } from '@mui/x-data-grid/internals';
 import useEventCallback from '@mui/utils/useEventCallback';
 import { styled } from '@mui/system';
-import type { GridInfiniteLoaderPrivateApi } from '@mui/x-data-grid/models/api/gridInfiniteLoaderApi';
 import { GridRowScrollEndParams } from '../../../models';
 import { GridPrivateApiPro } from '../../../models/gridApiPro';
 import { DataGridProProcessedProps } from '../../../models/dataGridProProps';

diff --git a/packages/x-data-grid-pro/src/models/gridApiPro.ts b/packages/x-data-grid-pro/src/models/gridApiPro.ts
@@ -4,8 +4,7 @@ import {
   GridRowMultiSelectionApi,
   GridRowProApi,
 } from '@mui/x-data-grid';
-import { GridPrivateOnlyApiCommon } from '@mui/x-data-grid/internals';
-import type { GridInfiniteLoaderPrivateApi } from '@mui/x-data-grid/models/api/gridInfiniteLoaderApi';
+import { GridPrivateOnlyApiCommon, GridInfiniteLoaderPrivateApi } from '@mui/x-data-grid/internals';
 import { GridInitialStatePro, GridStatePro } from './gridStatePro';
 import type {
   GridColumnPinningApi,

diff --git a/packages/x-data-grid/src/internals/index.ts b/packages/x-data-grid/src/internals/index.ts
@@ -151,7 +151,9 @@ export * from '../utils/fastMemo';
 export { buildWarning } from '../utils/warning';
 export { exportAs } from '../utils/exportAs';
 export * from '../utils/getPublicApiRef';
+export * from '../utils/cellBorderUtils';
 export type { GridPrivateOnlyApiCommon } from '../models/api/gridApiCommon';
+export type { GridInfiniteLoaderPrivateApi } from '../models/api/gridInfiniteLoaderApi';
 export { useGridPrivateApiContext } from '../hooks/utils/useGridPrivateApiContext';
 export * from '../hooks/utils';
 

diff --git a/packages/x-data-grid/src/models/api/index.ts b/packages/x-data-grid/src/models/api/index.ts
@@ -18,7 +18,7 @@ export * from './gridPreferencesPanelApi';
 export * from './gridPrintExportApi';
 export * from './gridCallbackDetails';
 export * from './gridScrollApi';
-export * from './gridVirtualizationApi';
+export type { GridVirtualizationApi } from './gridVirtualizationApi';
 export type { GridApiCommon } from './gridApiCommon';
 
 export type { GridEditingApi, GridCellModesModel, GridRowModesModel } from './gridEditingApi';

diff --git a/scripts/x-data-grid-premium.exports.json b/scripts/x-data-grid-premium.exports.json
@@ -598,7 +598,6 @@
   { "name": "GridVirtualizationApi", "kind": "Interface" },
   { "name": "gridVirtualizationColumnEnabledSelector", "kind": "Variable" },
   { "name": "gridVirtualizationEnabledSelector", "kind": "Variable" },
-  { "name": "GridVirtualizationPrivateApi", "kind": "Interface" },
   { "name": "gridVirtualizationSelector", "kind": "Variable" },
   { "name": "GridVirtualizationState", "kind": "TypeAlias" },
   { "name": "GridVisibilityOffIcon", "kind": "Variable" },

diff --git a/scripts/x-data-grid-pro.exports.json b/scripts/x-data-grid-pro.exports.json
@@ -552,7 +552,6 @@
   { "name": "GridVirtualizationApi", "kind": "Interface" },
   { "name": "gridVirtualizationColumnEnabledSelector", "kind": "Variable" },
   { "name": "gridVirtualizationEnabledSelector", "kind": "Variable" },
-  { "name": "GridVirtualizationPrivateApi", "kind": "Interface" },
   { "name": "gridVirtualizationSelector", "kind": "Variable" },
   { "name": "GridVirtualizationState", "kind": "TypeAlias" },
   { "name": "GridVisibilityOffIcon", "kind": "Variable" },

diff --git a/scripts/x-data-grid.exports.json b/scripts/x-data-grid.exports.json
@@ -511,7 +511,6 @@
   { "name": "GridVirtualizationApi", "kind": "Interface" },
   { "name": "gridVirtualizationColumnEnabledSelector", "kind": "Variable" },
   { "name": "gridVirtualizationEnabledSelector", "kind": "Variable" },
-  { "name": "GridVirtualizationPrivateApi", "kind": "Interface" },
   { "name": "gridVirtualizationSelector", "kind": "Variable" },
   { "name": "GridVirtualizationState", "kind": "TypeAlias" },
   { "name": "GridVisibilityOffIcon", "kind": "Variable" },