Skip to content

Commit 0dbb432

Browse files
authored
Merge branch 'master' into fix/22735-scheduler-month-view-continuation-overflow
2 parents 7579382 + a57d297 commit 0dbb432

1,704 files changed

Lines changed: 6078 additions & 9083 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/next.config.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,14 @@ export default withDeploymentConfig({
149149
loaders: [{ loader: 'string-replace-loader', options: { multiple: stringReplaceRules } }],
150150
},
151151
],
152+
// API page description JSON (imported only by generated API pages) → render
153+
// the markdown to HTML at build time.
154+
'**/translations/api-docs/**/*.json': [
155+
{
156+
loaders: [{ loader: '@mui/internal-markdown/apiPageTranslationLoader' }],
157+
as: '*.js',
158+
},
159+
],
152160
},
153161
},
154162
// @ts-ignore
@@ -202,6 +210,13 @@ export default withDeploymentConfig({
202210
multiple: stringReplaceRules,
203211
},
204212
},
213+
{
214+
// API page description JSON (`translations/api-docs/**`, imported only by
215+
// generated API pages) → render the markdown to HTML at build time.
216+
test: /translations[\\/]api-docs[\\/].*\.json$/,
217+
type: 'javascript/auto',
218+
use: [{ loader: '@mui/internal-markdown/apiPageTranslationLoader' }],
219+
},
205220
]),
206221
},
207222
};

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
},
9595
"devDependencies": {
9696
"@babel/preset-typescript": "catalog:",
97-
"@mui/internal-docs-utils": "3.0.7-canary.0",
97+
"@mui/internal-docs-utils": "3.0.7-canary.1",
9898
"@types/chance": "catalog:",
9999
"@types/d3-scale-chromatic": "3.1.0",
100100
"@types/luxon": "catalog:",
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import * as React from 'react';
22
import { ApiPage } from '@mui/internal-core-docs/ApiPage';
3-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
4-
import translation from 'docs/translations/api-docs/charts/animated-area/animated-area.json';
3+
import descriptions from 'docs/translations/api-docs/charts/animated-area/animated-area.json';
54
import jsonPageContent from './animated-area.json';
65

7-
export default function Page(props) {
8-
const { descriptions } = props;
6+
export default function Page() {
97
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
108
}
11-
12-
export async function getStaticProps() {
13-
const descriptions = mapApiPageTranslation(translation);
14-
15-
return { props: { descriptions } };
16-
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import * as React from 'react';
22
import { ApiPage } from '@mui/internal-core-docs/ApiPage';
3-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
4-
import translation from 'docs/translations/api-docs/charts/animated-line/animated-line.json';
3+
import descriptions from 'docs/translations/api-docs/charts/animated-line/animated-line.json';
54
import jsonPageContent from './animated-line.json';
65

7-
export default function Page(props) {
8-
const { descriptions } = props;
6+
export default function Page() {
97
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
108
}
11-
12-
export async function getStaticProps() {
13-
const descriptions = mapApiPageTranslation(translation);
14-
15-
return { props: { descriptions } };
16-
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import * as React from 'react';
22
import { ApiPage } from '@mui/internal-core-docs/ApiPage';
3-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
4-
import translation from 'docs/translations/api-docs/charts/area-element/area-element.json';
3+
import descriptions from 'docs/translations/api-docs/charts/area-element/area-element.json';
54
import jsonPageContent from './area-element.json';
65

7-
export default function Page(props) {
8-
const { descriptions } = props;
6+
export default function Page() {
97
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
108
}
11-
12-
export async function getStaticProps() {
13-
const descriptions = mapApiPageTranslation(translation);
14-
15-
return { props: { descriptions } };
16-
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import * as React from 'react';
22
import { ApiPage } from '@mui/internal-core-docs/ApiPage';
3-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
4-
import translation from 'docs/translations/api-docs/charts/area-plot/area-plot.json';
3+
import descriptions from 'docs/translations/api-docs/charts/area-plot/area-plot.json';
54
import jsonPageContent from './area-plot.json';
65

7-
export default function Page(props) {
8-
const { descriptions } = props;
6+
export default function Page() {
97
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
108
}
11-
12-
export async function getStaticProps() {
13-
const descriptions = mapApiPageTranslation(translation);
14-
15-
return { props: { descriptions } };
16-
}
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
import * as React from 'react';
22
import InterfaceApiPage from 'docs/src/modules/components/InterfaceApiPage';
33
import layoutConfig from 'docs/src/modules/utils/dataGridLayoutConfig';
4-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
5-
import translation from 'docs/translations/api-docs/charts/axis-config.json';
4+
import descriptions from 'docs/translations/api-docs/charts/axis-config.json';
65
import jsonPageContent from './axis-config.json';
76

8-
export default function Page(props) {
9-
const { descriptions } = props;
7+
export default function Page() {
108
return (
119
<InterfaceApiPage {...layoutConfig} descriptions={descriptions} pageContent={jsonPageContent} />
1210
);
1311
}
14-
15-
export async function getStaticProps() {
16-
const descriptions = mapApiPageTranslation(translation);
17-
return { props: { descriptions } };
18-
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import * as React from 'react';
22
import { ApiPage } from '@mui/internal-core-docs/ApiPage';
3-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
4-
import translation from 'docs/translations/api-docs/charts/bar-chart-premium/bar-chart-premium.json';
3+
import descriptions from 'docs/translations/api-docs/charts/bar-chart-premium/bar-chart-premium.json';
54
import jsonPageContent from './bar-chart-premium.json';
65

7-
export default function Page(props) {
8-
const { descriptions } = props;
6+
export default function Page() {
97
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
108
}
11-
12-
export async function getStaticProps() {
13-
const descriptions = mapApiPageTranslation(translation);
14-
15-
return { props: { descriptions } };
16-
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import * as React from 'react';
22
import { ApiPage } from '@mui/internal-core-docs/ApiPage';
3-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
4-
import translation from 'docs/translations/api-docs/charts/bar-chart-pro/bar-chart-pro.json';
3+
import descriptions from 'docs/translations/api-docs/charts/bar-chart-pro/bar-chart-pro.json';
54
import jsonPageContent from './bar-chart-pro.json';
65

7-
export default function Page(props) {
8-
const { descriptions } = props;
6+
export default function Page() {
97
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
108
}
11-
12-
export async function getStaticProps() {
13-
const descriptions = mapApiPageTranslation(translation);
14-
15-
return { props: { descriptions } };
16-
}
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import * as React from 'react';
22
import { ApiPage } from '@mui/internal-core-docs/ApiPage';
3-
import { mapApiPageTranslation } from '@mui/internal-core-docs/mapApiPageTranslations';
4-
import translation from 'docs/translations/api-docs/charts/bar-chart/bar-chart.json';
3+
import descriptions from 'docs/translations/api-docs/charts/bar-chart/bar-chart.json';
54
import jsonPageContent from './bar-chart.json';
65

7-
export default function Page(props) {
8-
const { descriptions } = props;
6+
export default function Page() {
97
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
108
}
11-
12-
export async function getStaticProps() {
13-
const descriptions = mapApiPageTranslation(translation);
14-
15-
return { props: { descriptions } };
16-
}

0 commit comments

Comments
 (0)