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] Prepare libraries for first v7 alpha release #45132

Merged
merged 12 commits into from
Jan 29, 2025
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!-- #default-branch-switch -->
<!-- markdownlint-disable-next-line -->
<p align="center">
<a href="https://mui.com/core/" rel="noopener" target="_blank"><img width="150" height="133" src="https://mui.com/static/logo.svg" alt="Material UI logo"></a>
<a href="https://next.mui.com/core/" rel="noopener" target="_blank"><img width="150" height="133" src="https://mui.com/static/logo.svg" alt="Material UI logo"></a>
</p>

<h1 align="center">Material UI</h1>
Expand Down
6 changes: 3 additions & 3 deletions docs/data/material/components/about-the-lab/about-the-lab.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ To install and save in your `package.json` dependencies, run one of the followin
<codeblock storageKey="package-manager">

```bash npm
npm install @mui/lab @mui/material
npm install @mui/lab@next @mui/material@next
```

```bash pnpm
pnpm add @mui/lab @mui/material
pnpm add @mui/lab@next @mui/material@next
```

```bash yarn
yarn add @mui/lab @mui/material
yarn add @mui/lab@next @mui/material@next
```

</codeblock>
Expand Down
6 changes: 3 additions & 3 deletions docs/data/material/components/icons/icons.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ Run one of the following commands to install it and save it to your `package.jso

<codeblock storageKey="package-manager">
```bash npm
npm install @mui/icons-material
npm install @mui/icons-material@next
```

```bash pnpm
pnpm add @mui/icons-material
pnpm add @mui/icons-material@next
```

```bash yarn
yarn add @mui/icons-material
yarn add @mui/icons-material@next
```

</codeblock>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Use one of the following commands to install it:
<codeblock storageKey="package-manager">

```bash npm
npm install @mui/icons-material @mui/material @emotion/styled @emotion/react
npm install @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
```

```bash pnpm
pnpm add @mui/icons-material @mui/material @emotion/styled @emotion/react
pnpm add @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
```

```bash yarn
yarn add @mui/icons-material @mui/material @emotion/styled @emotion/react
yarn add @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
```

</codeblock>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ We recommend Next.js for server-side rendering and more opinionated framework fe
See [Start a New React Project](https://react.dev/learn/start-a-new-react-project) from the official React docs to learn more about some of the options available.
:::

<!-- #default-branch-switch -->

{{"component": "modules/components/MaterialUIExampleCollection"}}

<br />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ Run one of the following commands to add Material UI to your project:
<codeblock storageKey="package-manager">

```bash npm
npm install @mui/material @emotion/react @emotion/styled
npm install @mui/material@next @emotion/react @emotion/styled
```

```bash pnpm
pnpm add @mui/material @emotion/react @emotion/styled
pnpm add @mui/material@next @emotion/react @emotion/styled
```

```bash yarn
yarn add @mui/material @emotion/react @emotion/styled
yarn add @mui/material@next @emotion/react @emotion/styled
```

</codeblock>
Expand Down
1 change: 1 addition & 0 deletions docs/data/material/getting-started/support/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ This includes issues introduced by external sources, like browser upgrades or ch

| Material UI version | Release | Supported |
| ------------------: | :--------- | :------------------------------------------------------------------ |
| ^7.0.0 | March 2025 | 🚧 Pre release (Continuous support) |
| ^6.0.0 | 2024-08-26 | ✅ Stable major (Continuous support) |
| ^5.0.0 | 2021-09-16 | ⚠️ Long-term support (Support for security issues and regressions). |
| ^4.0.0 | 2019-06-23 ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #default-branch-switch -->

View the demo at https://mui.com/material-ui/getting-started/templates/blog/.
View the demo at https://next.mui.com/material-ui/getting-started/templates/blog/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #default-branch-switch -->

View the demo at https://mui.com/material-ui/getting-started/templates/checkout/.
View the demo at https://next.mui.com/material-ui/getting-started/templates/checkout/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #default-branch-switch -->

View the demo at https://mui.com/material-ui/getting-started/templates/dashboard/.
View the demo at https://next.mui.com/material-ui/getting-started/templates/dashboard/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #default-branch-switch -->

View the demo at https://mui.com/material-ui/getting-started/templates/marketing-page/.
View the demo at https://next.mui.com/material-ui/getting-started/templates/marketing-page/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #default-branch-switch -->

View the demo at https://mui.com/material-ui/getting-started/templates/sign-in-side/.
View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-in-side/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #default-branch-switch -->

View the demo at https://mui.com/material-ui/getting-started/templates/sign-in/.
View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-in/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #default-branch-switch -->

View the demo at https://mui.com/material-ui/getting-started/templates/sign-up/.
View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-up/.
2 changes: 0 additions & 2 deletions docs/data/material/getting-started/templates/templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ title: New Free React Templates

<p class="description">Browse our collection of free React templates to get started building your app with Material UI, including a React dashboard, React marketing page, and more.</p>

<!-- #default-branch-switch -->

## Free templates

Our curated collection of free Material UI templates includes a dashboard, a marketing page, a checkout flow, sign-in and sign-up pages, and a blog.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ If you're using yarn, you can configure it using a package resolution:
```diff title="package.json"
{
"dependencies": {
- "@mui/styled-engine": "latest"
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"
- "@mui/styled-engine": "next"
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@next"
},
+ "resolutions": {
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@next"
+ },
}
```
Expand Down
2 changes: 1 addition & 1 deletion docs/data/styles/basics/basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To install and save in your `package.json` dependencies, run:
<!-- #default-branch-switch -->

```bash
npm install @mui/styles
npm install @mui/styles@next
```

## Getting started
Expand Down
6 changes: 3 additions & 3 deletions docs/data/system/getting-started/installation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ If you want to use [styled-components](https://styled-components.com/) instead,
<codeblock storageKey="package-manager">

```bash npm
npm install @mui/system @mui/styled-engine-sc styled-components
npm install @mui/system@next @mui/styled-engine-sc@next styled-components
```

```bash pnpm
pnpm add @mui/system @mui/styled-engine-sc styled-components
pnpm add @mui/system@next @mui/styled-engine-sc@next styled-components
```

```bash yarn
yarn add @mui/system @mui/styled-engine-sc styled-components
yarn add @mui/system@next @mui/styled-engine-sc@next styled-components
```

</codeblock>
Expand Down
18 changes: 9 additions & 9 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:clean": "rimraf .next && pnpm build",
"build-sw": "node ./scripts/buildServiceWorker.js",
"dev": "next dev",
"deploy": "git push -f material-ui-docs master:latest",
"deploy": "git push -f material-ui-docs master:next",
"icons": "rimraf --glob public/static/icons/* && node ./scripts/buildIcons.js",
"start": "serve ./export",
"create-playground": "cpy --cwd=scripts playground.template.tsx ../../pages/playground --rename=index.tsx",
Expand All @@ -31,18 +31,18 @@
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@mui/base": "workspace:*",
"@mui/docs": "workspace:^",
"@mui/icons-material": "workspace:^",
"@mui/docs": "workspace:*",
"@mui/icons-material": "workspace:*",
"@mui/internal-markdown": "workspace:^",
"@mui/joy": "workspace:*",
"@mui/lab": "workspace:*",
"@mui/material": "workspace:^",
"@mui/styled-engine": "workspace:^",
"@mui/styled-engine-sc": "workspace:^",
"@mui/styles": "workspace:^",
"@mui/system": "workspace:^",
"@mui/material": "workspace:*",
"@mui/styled-engine": "workspace:*",
"@mui/styled-engine-sc": "workspace:*",
"@mui/styles": "workspace:*",
"@mui/system": "workspace:*",
"@mui/types": "workspace:^",
"@mui/utils": "workspace:^",
"@mui/utils": "workspace:*",
"@mui/x-charts": "7.23.6",
"@mui/x-data-grid": "7.23.6",
"@mui/x-data-grid-generator": "7.23.6",
Expand Down
3 changes: 3 additions & 0 deletions docs/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ function AppWrapper(props) {
wordmarkSvg: muiSvgWordmarkString,
versions: [
{ text: `v${materialPkgJson.version}`, current: true },
{ text: `v6`, href: `https://mui.com${languagePrefix}/material-ui/getting-started/` },
{
text: 'v5',
href: `https://v5.mui.com${languagePrefix}/getting-started/installation/`,
Expand Down Expand Up @@ -214,6 +215,8 @@ function AppWrapper(props) {
wordmarkSvg: muiSvgWordmarkString,
versions: [
{ text: `v${systemPkgJson.version}`, current: true },
{ text: 'v6', href: `https://mui.com${languagePrefix}/system/getting-started/` },
{ text: 'v5', href: `https://v5.mui.com${languagePrefix}/system/getting-started/` },
{ text: 'v4', href: `https://v4.mui.com${languagePrefix}/system/basics/` },
{
text: 'View all versions',
Expand Down
4 changes: 2 additions & 2 deletions docs/scripts/reportBrokenLinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ Object.keys(usedLinks)
//
// <!-- #default-branch-switch -->
//
write(`- https://mui.com${linkKey}`);
console.log(`https://mui.com${linkKey}`);
write(`- https://next.mui.com${linkKey}`);
console.log(`https://next.mui.com${linkKey}`);

console.log(`used in`);
usedLinks[linkKey].forEach((f) => console.log(`- ${path.relative(docsSpaceRoot, f)}`));
Expand Down
6 changes: 2 additions & 4 deletions docs/src/modules/components/Head.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { pathnameToLanguage } from 'docs/src/modules/utils/helpers';
// #default-branch-switch
const HOST = process.env.PULL_REQUEST_ID
? `https://deploy-preview-${process.env.PULL_REQUEST_ID}--${process.env.NETLIFY_SITE_NAME}.netlify.app`
: 'https://mui.com';
: 'https://next.mui.com';

interface HeadProps {
card?: string;
Expand Down Expand Up @@ -44,14 +44,12 @@ export default function Head(props: HeadProps) {
<meta name="twitter:card" content={largeCard ? 'summary_large_image' : 'summary'} />
{/* https://x.com/MUI_hq */}
<meta name="twitter:site" content="@MUI_hq" />
{/* #default-branch-switch */}
<meta name="twitter:title" content={title} />
<meta name="twitter:description" content={description} />
<meta name="twitter:image" content={preview} />
{/* Facebook */}
<meta property="og:type" content={type} />
<meta property="og:title" content={title} />
{/* #default-branch-switch */}
<meta property="og:url" content={`${HOST}${router.asPath}`} />
<meta property="og:description" content={description} />
<meta property="og:image" content={preview} />
Expand All @@ -66,7 +64,7 @@ export default function Head(props: HeadProps) {
<link
key={userLanguage2}
rel="alternate"
href={`https://mui.com${
href={`https://next.mui.com${
userLanguage2 === 'en' ? '' : `/${userLanguage2}`
}${canonicalAs}`}
hrefLang={userLanguage2}
Expand Down
6 changes: 3 additions & 3 deletions docs/src/modules/sandbox/CodeSandbox.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('CodeSandbox', () => {
'https://github.com/mui/material-ui/blob/v5.7.0/docs/data/material/components/buttons/BasicButtons.js',
dependencies: {
react: 'latest',
'@mui/material': 'latest',
'@mui/material': 'next',
'react-dom': 'latest',
'@emotion/react': 'latest',
'@emotion/styled': 'latest',
Expand Down Expand Up @@ -123,7 +123,7 @@ ReactDOM.createRoot(document.querySelector("#root")).render(
'https://github.com/mui/material-ui/blob/v5.7.0/docs/data/material/components/buttons/BasicButtons.tsx',
dependencies: {
react: 'latest',
'@mui/material': 'latest',
'@mui/material': 'next',
'react-dom': 'latest',
'@emotion/react': 'latest',
'@emotion/styled': 'latest',
Expand Down Expand Up @@ -230,7 +230,7 @@ ReactDOM.createRoot(document.querySelector("#root")!).render(
expect(result.dependencies).to.deep.equal({
'@emotion/react': 'latest',
'@emotion/styled': 'latest',
'@mui/material': 'latest',
'@mui/material': 'next',
'@types/react': 'latest',
'@types/react-dom': 'latest',
react: 'latest',
Expand Down
Loading
Loading