diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json index 5afb5c27d36021..5c7949333fbc54 100644 --- a/.codesandbox/ci.json +++ b/.codesandbox/ci.json @@ -36,10 +36,10 @@ }, "sandboxes": [ "material-ui-issue-latest-s2dsx", - "/examples/material-cra", - "/examples/material-cra-ts", - "/examples/joy-cra-ts", - "/examples/base-cra-ts" + "/examples/material-ui-cra", + "/examples/material-ui-cra-ts", + "/examples/joy-ui-cra-ts", + "/examples/base-ui-cra-ts" ], "silent": true } diff --git a/.eslintignore b/.eslintignore index b1ce3558845757..1aca21c39b7b59 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,10 +4,10 @@ /coverage /docs/export /docs/pages/playground/ -/examples/material-cra*/src/serviceWorker.js -/examples/material-gatsby/public/ -/examples/material-preact/config -/examples/material-preact/scripts +/examples/material-ui-cra*/src/serviceWorker.js +/examples/material-ui-gatsby/public/ +/examples/material-ui-preact/config +/examples/material-ui-preact/scripts /packages/mui-codemod/lib /packages/mui-codemod/src/*/*.test/* /packages/mui-icons-material/fixtures diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a3ad65abe97b8..8f410147fd27e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -129,7 +129,7 @@ A big thanks to the 23 contributors who made this release possible. - ​[docs][joy] Add adjustments to the color inversion page (#37143) @danilo-leal - ​[docs][material] Improve documentation about adding custom colors (#37743) @DiegoAndai - ​[examples] Fix Joy UI Next.js App Router font loading (#38095) @IgnacioUtrilla -- ​[examples] Fix material-next-app-router Font Usage with next/font (#38026) @onderonur +- ​[examples] Fix material-next Font Usage with next/font (#38026) @onderonur ### Core @@ -401,7 +401,7 @@ _Jun 21, 2023_ A big thanks to the 25 contributors who made this release possible. Here are some highlights ✨: - 💫 Added [Slider](https://mui.com/material-ui/react-slider/#material-you-version) component using the new Material You design language (#37520) @DiegoAndai. -- 📚 Added [examples](https://github.com/mui/material-ui/tree/master/examples/material-next-app-router-ts) showcasing how you can use Material UI with next.js's app directory (#37315) @smo043 +- 📚 Added [examples](https://github.com/mui/material-ui/tree/master/examples/material-ui-nextjs-ts) showcasing how you can use Material UI with next.js's app directory (#37315) @smo043 ### `@mui/material@5.13.6` @@ -462,7 +462,7 @@ A big thanks to the 25 contributors who made this release possible. Here are som - ​[docs-infra] Add analyticsTags to Algolia (#37600) @Janpot - ​[docs-infra] Simplify product id handling (#37593) @oliviertassinari - ​[CHANGELOG] Add missing release date for v5.13.5 @oliviertassinari -- ​[examples] Shell command fix in the readme file of material-next-app-router-ts example (#37675) @bablukpik +- ​[examples] Shell command fix in the readme file of material-next-ts example (#37675) @bablukpik - ​[examples] Next.js v13 app router with Material UI (#37315) @smo043 ### Core @@ -5109,7 +5109,7 @@ _Feb 1, 2022_ A big thanks to the 22 contributors who made this release possible. Here are some highlights ✨: -- 🛠 @goncalovf added an example project using [Material UI with Vite.js](https://github.com/mui/material-ui/tree/master/examples/material-vite) (#28241) +- 🛠 @goncalovf added an example project using [Material UI with Vite.js](https://github.com/mui/material-ui/tree/master/examples/material-ui-vite) (#28241) - Number of 🐛 bug fixes and 📚 documentation improvements. ### `@mui/material@5.4.0` diff --git a/docs/data/base/guides/next-js-app-router/next-js-app-router.md b/docs/data/base/guides/next-js-app-router/next-js-app-router.md index de22ccc7e916c7..060e3366eee2bc 100644 --- a/docs/data/base/guides/next-js-app-router/next-js-app-router.md +++ b/docs/data/base/guides/next-js-app-router/next-js-app-router.md @@ -5,7 +5,7 @@ :::info Starting fresh on a new App Router-based project? -Jump right into the code with [this example: Base UI - Next.js App Router with Tailwind CSS example in TypeScript](https://github.com/mui/material-ui/tree/master/examples/base-next-app-router-tailwind-ts). +Jump right into the code with [this example: Base UI - Next.js App Router with Tailwind CSS example in TypeScript](https://github.com/mui/material-ui/tree/master/examples/base-ui-nextjs-tailwind-ts). ::: ## Next.js and React Server Components @@ -47,7 +47,7 @@ module.exports = { }; ``` -Refer to this [example repo](https://github.com/mui/material-ui/tree/master/examples/base-next-app-router-tailwind-ts) for a full working demo of a Next.js 13 app using Base UI and Tailwind CSS. +Refer to this [example repo](https://github.com/mui/material-ui/tree/master/examples/base-ui-nextjs-tailwind-ts) for a full working demo of a Next.js 13 app using Base UI and Tailwind CSS. ### Emotion diff --git a/docs/data/base/guides/working-with-tailwind-css/PlayerFinal.js b/docs/data/base/guides/working-with-tailwind-css/PlayerFinal.js index 8f0cd97d720b6c..583193dc9c7f1b 100644 --- a/docs/data/base/guides/working-with-tailwind-css/PlayerFinal.js +++ b/docs/data/base/guides/working-with-tailwind-css/PlayerFinal.js @@ -4,7 +4,7 @@ export default function PlayerFinal() { return (