Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Bump monorepo #11303

Merged
merged 65 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
7c2aa05
setup scripts
alexfauquette Jan 3, 2024
9b48d96
fix components for tree view
alexfauquette Jan 3, 2024
070fa3d
fix components for charts
alexfauquette Jan 3, 2024
42ea9db
fix components for pickers
alexfauquette Jan 3, 2024
e7ea62f
fix proptypes default for data grid
alexfauquette Jan 3, 2024
22a4946
fix proptypes default for pickers
alexfauquette Jan 3, 2024
0553860
fix proptypes default for charts
alexfauquette Jan 3, 2024
0a45969
generate charts api
alexfauquette Jan 3, 2024
93002fd
generate tree view api
alexfauquette Jan 3, 2024
a61afaf
generate pickers api
alexfauquette Jan 3, 2024
445271f
generate data grid api
alexfauquette Jan 3, 2024
ae5d7d5
link:check
alexfauquette Jan 3, 2024
d9fafd1
remove console.log
alexfauquette Jan 3, 2024
63b3d6f
fix TS in pickers
alexfauquette Jan 3, 2024
9519757
deduplicate @types/react
alexfauquette Jan 3, 2024
c385031
fix scripts
alexfauquette Jan 3, 2024
203f1ab
Merge remote-tracking branch 'upstream/next' into bump-core2
alexfauquette Jan 3, 2024
50d62d1
proptypes
alexfauquette Jan 3, 2024
809b4c5
Fix data grid docs typescript errors
alexfauquette Jan 3, 2024
f247700
Merge remote-tracking branch 'upstream/next' into bump-core2
alexfauquette Jan 3, 2024
a530ced
support @mui/material-nextjs
alexfauquette Jan 4, 2024
141dec0
add autoprefixer
alexfauquette Jan 4, 2024
ab2a5d7
update translation import path
alexfauquette Jan 4, 2024
c67d22e
generate see more links
alexfauquette Jan 4, 2024
99f61f8
adapt scripts
alexfauquette Jan 4, 2024
9fd0ae6
fix GridColDef
alexfauquette Jan 4, 2024
2e18a65
prettier
alexfauquette Jan 4, 2024
73b5f9c
keep deduplicate until pnpm migration
alexfauquette Jan 4, 2024
c62a6fb
use pretier when saving files
alexfauquette Jan 4, 2024
d110ec1
Merge remote-tracking branch 'upstream/next' into bump-core2
alexfauquette Jan 4, 2024
c9d33f3
remove chainedProptypes
alexfauquette Jan 5, 2024
9b45389
data grid: skip broken tests
alexfauquette Jan 5, 2024
e794403
update links to data grid demos
cherniavskii Jan 5, 2024
1dd62f4
docs:api
cherniavskii Jan 5, 2024
44a097d
fix side navigation collapse when opening an api page
cherniavskii Jan 5, 2024
a73bc2d
enable typechecking for api pages definitions
cherniavskii Jan 5, 2024
3eb327b
remove training
alexfauquette Jan 5, 2024
b424eb8
enforce typechecking in api pages files
cherniavskii Jan 5, 2024
d2248c9
remove unused file
alexfauquette Jan 5, 2024
0fb305d
removed unused file
cherniavskii Jan 5, 2024
e32e79f
Merge remote-tracking branch 'upstream/next' into bump-core2
alexfauquette Jan 5, 2024
6b2c6cd
add props warnings back
cherniavskii Jan 5, 2024
92670b5
fix
cherniavskii Jan 5, 2024
f96f8f1
fix import
cherniavskii Jan 5, 2024
ec622c0
Merge branch 'next' into bump-core2
cherniavskii Jan 5, 2024
d00dd5d
revert test change
cherniavskii Jan 5, 2024
bc57293
fix typo in folder name
cherniavskii Jan 5, 2024
c6be2fb
try to fool codecov
cherniavskii Jan 5, 2024
aaac1aa
Merge remote-tracking branch 'upstream/next' into bump-core2
alexfauquette Jan 8, 2024
1619197
remove old translation
alexfauquette Jan 8, 2024
53c66cc
go back to core repo
alexfauquette Jan 9, 2024
de8436c
Merge remote-tracking branch 'upstream/next' into bump-core2
alexfauquette Jan 9, 2024
a619e2e
Merge branch 'bump-core2' of github.com:alexfauquette/mui-x into bump…
alexfauquette Jan 9, 2024
9beeb0e
yarn deduplicate
alexfauquette Jan 9, 2024
dd40918
fix charts api
alexfauquette Jan 9, 2024
1c0087f
fix eslint errors
cherniavskii Jan 9, 2024
b11ce4f
fix ts error
cherniavskii Jan 9, 2024
eb5e950
add Box back
cherniavskii Jan 9, 2024
5335ca5
fi date pickers toolbar generation
alexfauquette Jan 9, 2024
1f2f345
Merge branch 'bump-core2' of github.com:alexfauquette/mui-x into bump…
alexfauquette Jan 9, 2024
5a8a377
autoprefixer
alexfauquette Jan 9, 2024
6062666
Merge remote-tracking branch 'upstream/next' into bump-core2
alexfauquette Jan 10, 2024
fdf84e7
try passing paths to mocha CLI
cherniavskii Jan 10, 2024
0aca53c
Revert "try passing paths to mocha CLI"
cherniavskii Jan 10, 2024
aca9bf6
revert istanbul dependencies upgrade
cherniavskii Jan 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const defaultAlias = {
'@mui/x-charts': resolveAliasPath('./packages/x-charts/src'),
'@mui/x-tree-view': resolveAliasPath('./packages/x-tree-view/src'),
'@mui/markdown': '@mui/monorepo/packages/markdown',
'@mui/material-nextjs': '@mui/monorepo/packages/mui-material-nextjs/src',
'@mui-internal/api-docs-builder': '@mui/monorepo/packages/api-docs-builder',
'@mui-internal/docs-utilities': '@mui/monorepo/packages/docs-utilities',
'@mui-internal/test-utils': resolveAliasPath(
Expand Down
3 changes: 2 additions & 1 deletion docs/.link-check-errors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ Broken links found by `yarn docs:link-check` that exist:
- https://mui.com/base-ui/react-portal/components-api/
- https://mui.com/blog/material-ui-v4-is-out/#premium-themes-store-✨
- https://mui.com/material-ui/api/button/#props
- https://mui.com/material-ui/api/input-base/#InputBase-prop-disableInjectingGlobalStyles
- https://mui.com/material-ui/api/menu-item/#css
- https://mui.com/material-ui/api/popper/#props
- https://mui.com/material-ui/discover-more/roadmap/#priorities
- https://mui.com/material-ui/guides/api/#native-properties
- https://mui.com/size-snapshot/
- https://mui.com/system/styles/api/#creategenerateclassname-options-class-name-generator
Expand All @@ -16,4 +18,3 @@ Broken links found by `yarn docs:link-check` that exist:
- https://mui.com/x/api/data-grid/data-grid/#props
- https://mui.com/x/api/data-grid/data-grid/#slots
- https://mui.com/x/api/date-pickers/date-picker/#slots
- https://mui.com/x/react-charts/#getting-started
1 change: 1 addition & 0 deletions docs/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const alias = {
'@mui/docs': '../node_modules/@mui/monorepo/packages/mui-docs/src',
'@mui/markdown': '../node_modules/@mui/monorepo/packages/markdown',
'@mui/monorepo': '../node_modules/@mui/monorepo',
'@mui/material-nextjs': '../node_modules/@mui/monorepo/packages/mui-material-nextjs/src',
'@mui-internal/api-docs-builder': '../node_modules/@mui/monorepo/packages/api-docs-builder',
'@mui-internal/docs-utilities': '../node_modules/@mui/monorepo/packages/docs-utilities',
docs: '../node_modules/@mui/monorepo/docs',
Expand Down
173 changes: 135 additions & 38 deletions docs/data/charts-component-api-pages.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,70 @@
import type { MuiPage } from '@mui/monorepo/docs/src/MuiPage';

export default [
{ pathname: '/x/api/charts/area-element', title: 'AreaElement' },
{ pathname: '/x/api/charts/area-plot', title: 'AreaPlot' },
{ pathname: '/x/api/charts/bar-chart', title: 'BarChart' },
{ pathname: '/x/api/charts/bar-element', title: 'BarElement' },
{ pathname: '/x/api/charts/bar-plot', title: 'BarPlot' },
{ pathname: '/x/api/charts/cartesian-context-provider', title: 'CartesianContextProvider' },
{ pathname: '/x/api/charts/charts-axis', title: 'ChartsAxis' },
{ pathname: '/x/api/charts/charts-axis-highlight', title: 'ChartsAxisHighlight' },
{ pathname: '/x/api/charts/charts-axis-tooltip-content', title: 'ChartsAxisTooltipContent' },
{ pathname: '/x/api/charts/charts-clip-path', title: 'ChartsClipPath' },
{ pathname: '/x/api/charts/charts-item-tooltip-content', title: 'ChartsItemTooltipContent' },
{ pathname: '/x/api/charts/charts-legend', title: 'ChartsLegend' },
{ pathname: '/x/api/charts/charts-reference-line', title: 'ChartsReferenceLine' },
{ pathname: '/x/api/charts/charts-text', title: 'ChartsText' },
{ pathname: '/x/api/charts/charts-tooltip', title: 'ChartsTooltip' },
{ pathname: '/x/api/charts/charts-voronoi-handler', title: 'ChartsVoronoiHandler' },
{ pathname: '/x/api/charts/charts-x-axis', title: 'ChartsXAxis' },
{ pathname: '/x/api/charts/charts-y-axis', title: 'ChartsYAxis' },
const apiPages: MuiPage[] = [
{
pathname: '/x/api/charts/area-element',
title: 'AreaElement',
},
{
pathname: '/x/api/charts/area-plot',
title: 'AreaPlot',
},
{
pathname: '/x/api/charts/bar-chart',
title: 'BarChart',
},
{
pathname: '/x/api/charts/bar-element',
title: 'BarElement',
},
{
pathname: '/x/api/charts/bar-plot',
title: 'BarPlot',
},
{
pathname: '/x/api/charts/charts-axis',
title: 'ChartsAxis',
},
{
pathname: '/x/api/charts/charts-axis-highlight',
title: 'ChartsAxisHighlight',
},
{
pathname: '/x/api/charts/charts-axis-tooltip-content',
title: 'ChartsAxisTooltipContent',
},
{
pathname: '/x/api/charts/charts-clip-path',
title: 'ChartsClipPath',
},
{
pathname: '/x/api/charts/charts-item-tooltip-content',
title: 'ChartsItemTooltipContent',
},
{
pathname: '/x/api/charts/charts-legend',
title: 'ChartsLegend',
},
{
pathname: '/x/api/charts/charts-reference-line',
title: 'ChartsReferenceLine',
},
{
pathname: '/x/api/charts/charts-surface',
title: 'ChartsSurface',
},
{
pathname: '/x/api/charts/charts-text',
title: 'ChartsText',
},
{
pathname: '/x/api/charts/charts-tooltip',
title: 'ChartsTooltip',
},
{
pathname: '/x/api/charts/charts-voronoi-handler',
title: 'ChartsVoronoiHandler',
},
{
pathname: '/x/api/charts/default-charts-axis-tooltip-content',
title: 'DefaultChartsAxisTooltipContent',
Expand All @@ -27,22 +73,73 @@ export default [
pathname: '/x/api/charts/default-charts-item-tooltip-content',
title: 'DefaultChartsItemTooltipContent',
},
{ pathname: '/x/api/charts/drawing-provider', title: 'DrawingProvider' },
{ pathname: '/x/api/charts/line-chart', title: 'LineChart' },
{ pathname: '/x/api/charts/line-element', title: 'LineElement' },
{ pathname: '/x/api/charts/line-highlight-element', title: 'LineHighlightElement' },
{ pathname: '/x/api/charts/line-highlight-plot', title: 'LineHighlightPlot' },
{ pathname: '/x/api/charts/line-plot', title: 'LinePlot' },
{ pathname: '/x/api/charts/mark-element', title: 'MarkElement' },
{ pathname: '/x/api/charts/mark-plot', title: 'MarkPlot' },
{ pathname: '/x/api/charts/pie-arc', title: 'PieArc' },
{ pathname: '/x/api/charts/pie-arc-label', title: 'PieArcLabel' },
{ pathname: '/x/api/charts/pie-arc-label-plot', title: 'PieArcLabelPlot' },
{ pathname: '/x/api/charts/pie-arc-plot', title: 'PieArcPlot' },
{ pathname: '/x/api/charts/pie-chart', title: 'PieChart' },
{ pathname: '/x/api/charts/pie-plot', title: 'PiePlot' },
{ pathname: '/x/api/charts/scatter', title: 'Scatter' },
{ pathname: '/x/api/charts/scatter-chart', title: 'ScatterChart' },
{ pathname: '/x/api/charts/scatter-plot', title: 'ScatterPlot' },
{ pathname: '/x/api/charts/spark-line-chart', title: 'SparkLineChart' },
] as MuiPage[];
{
pathname: '/x/api/charts/line-chart',
title: 'LineChart',
},
{
pathname: '/x/api/charts/line-element',
title: 'LineElement',
},
{
pathname: '/x/api/charts/line-highlight-element',
title: 'LineHighlightElement',
},
{
pathname: '/x/api/charts/line-highlight-plot',
title: 'LineHighlightPlot',
},
{
pathname: '/x/api/charts/line-plot',
title: 'LinePlot',
},
{
pathname: '/x/api/charts/mark-element',
title: 'MarkElement',
},
{
pathname: '/x/api/charts/mark-plot',
title: 'MarkPlot',
},
{
pathname: '/x/api/charts/pie-arc',
title: 'PieArc',
},
{
pathname: '/x/api/charts/pie-arc-label',
title: 'PieArcLabel',
},
{
pathname: '/x/api/charts/pie-arc-label-plot',
title: 'PieArcLabelPlot',
},
{
pathname: '/x/api/charts/pie-arc-plot',
title: 'PieArcPlot',
},
{
pathname: '/x/api/charts/pie-chart',
title: 'PieChart',
},
{
pathname: '/x/api/charts/pie-plot',
title: 'PiePlot',
},
{
pathname: '/x/api/charts/scatter',
title: 'Scatter',
},
{
pathname: '/x/api/charts/scatter-chart',
title: 'ScatterChart',
},
{
pathname: '/x/api/charts/scatter-plot',
title: 'ScatterPlot',
},
{
pathname: '/x/api/charts/spark-line-chart',
title: 'SparkLineChart',
},
];
export default apiPages;
1 change: 1 addition & 0 deletions docs/data/charts/areas-demo/areas-demo.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Areas demonstration
components: LineChart, LineElement, LineHighlightElement, LineHighlightPlot, LinePlot, MarkElement, MarkPlot, AreaElement, AreaPlot
---

# Charts - Areas demonstration
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/axis/axis.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Axis
components: ChartsAxis, ChartsReferenceLine, ChartsText
---

# Charts - Axis
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/bar-demo/bar-demo.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Bar demonstration
components: BarChart, BarElement, BarPlot
---

# Charts - Bar demonstration
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/bars/bars.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: React Bar chart
components: BarChart, BarElement, BarPlot
---

# Charts - Bars
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/components/components.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Custom components
components: ChartsClipPath, ChartsSurface, CartesianContextProvider, DrawingProvider, HighlightProvider, InteractionProvider, SeriesContextProvider
---

# Charts - Custom components
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/legend/legend.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Legend
components: ChartsLegend, ChartsText
---

# Charts - Legend
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/line-demo/line-demo.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Line demonstration
components: LineChart, LineElement, LineHighlightElement, LineHighlightPlot, LinePlot, MarkElement, MarkPlot
---

# Charts - Line demonstration
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/lines/lines.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: React Line chart
components: LineChart, LineElement, LineHighlightElement, LineHighlightPlot, LinePlot, MarkElement, MarkPlot, AreaElement, AreaPlot
---

# Charts - Lines
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/pie-demo/pie-demo.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Pie demonstration
components: PieArc, PieArcLabel, PieArcLabelPlot, PieArcPlot, PieChart, PiePlot
---

# Charts - Pie demonstration
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/pie/pie.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: React Pie chart
components: PieArc, PieArcLabel, PieArcLabelPlot, PieArcPlot, PieChart, PiePlot
---

# Charts - Pie
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/scatter-demo/scatter-demo.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Scatter demonstration
components: Scatter, ScatterChart, ScatterPlot, ChartsVoronoiHandler
---

# Charts - Scatter demonstration
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/scatter/scatter.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: React Scatter chart
components: Scatter, ScatterChart, ScatterPlot, ChartsVoronoiHandler
---

# Charts - Scatter
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/sparkline/sparkline.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: React Sparkline chart
components: SparkLineChart
---

# Charts - Sparkline
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/tooltip/tooltip.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Charts - Tooltip
components: ChartsAxisTooltipContent, ChartsItemTooltipContent, ChartsTooltip, DefaultChartsAxisTooltipContent, DefaultChartsItemTooltipContent, ChartsAxisHighlight
---

# Charts - Tooltip
Expand Down
37 changes: 29 additions & 8 deletions docs/data/data-grid-component-api-pages.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
import type { MuiPage } from '@mui/monorepo/docs/src/MuiPage';

export default [
{ pathname: '/x/api/data-grid/data-grid', title: 'DataGrid' },
{ pathname: '/x/api/data-grid/data-grid-premium', title: 'DataGridPremium', plan: 'premium' },
{ pathname: '/x/api/data-grid/data-grid-pro', title: 'DataGridPro', plan: 'pro' },
{ pathname: '/x/api/data-grid/grid-filter-form', title: 'GridFilterForm' },
{ pathname: '/x/api/data-grid/grid-filter-panel', title: 'GridFilterPanel' },
{ pathname: '/x/api/data-grid/grid-toolbar-quick-filter', title: 'GridToolbarQuickFilter' },
] as MuiPage[];
const apiPages: MuiPage[] = [
{
pathname: '/x/api/data-grid/data-grid',
title: 'DataGrid',
},
{
pathname: '/x/api/data-grid/data-grid-premium',
title: 'DataGridPremium',
plan: 'premium',
},
{
pathname: '/x/api/data-grid/data-grid-pro',
title: 'DataGridPro',
plan: 'pro',
},
{
pathname: '/x/api/data-grid/grid-filter-form',
title: 'GridFilterForm',
},
{
pathname: '/x/api/data-grid/grid-filter-panel',
title: 'GridFilterPanel',
},
{
pathname: '/x/api/data-grid/grid-toolbar-quick-filter',
title: 'GridToolbarQuickFilter',
},
];
export default apiPages;
3 changes: 1 addition & 2 deletions docs/data/data-grid/demo/FullFeaturedDemo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import Box from '@mui/material/Box';
import {
DataGridPro,
GRID_CHECKBOX_SELECTION_FIELD,
Expand Down Expand Up @@ -133,7 +132,7 @@ const AntDesignStyledDataGridPro = styled(DataGridPro)(({ theme }) => ({
},
}));

const StyledBox = styled(Box)(({ theme }) => ({
const StyledBox = styled('div')(({ theme }) => ({
display: 'flex',
flexDirection: 'column',
height: 600,
Expand Down
3 changes: 1 addition & 2 deletions docs/data/data-grid/demo/FullFeaturedDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import Box from '@mui/material/Box';
import {
DataGridPro,
GRID_CHECKBOX_SELECTION_FIELD,
Expand Down Expand Up @@ -133,7 +132,7 @@ const AntDesignStyledDataGridPro = styled(DataGridPro)(({ theme }) => ({
},
}));

const StyledBox = styled(Box)(({ theme }) => ({
const StyledBox = styled('div')(({ theme }) => ({
display: 'flex',
flexDirection: 'column',
height: 600,
Expand Down
3 changes: 1 addition & 2 deletions docs/data/data-grid/editing/ValidateServerNameGrid.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import * as React from 'react';
import { styled } from '@mui/material/styles';
import Box from '@mui/material/Box';
import Tooltip, { tooltipClasses } from '@mui/material/Tooltip';
import { DataGrid, GridEditInputCell } from '@mui/x-data-grid';

const StyledBox = styled(Box)(({ theme }) => ({
const StyledBox = styled('div')(({ theme }) => ({
height: 400,
width: '100%',
'& .MuiDataGrid-cell--editable': {
Expand Down
Loading