diff --git a/.circleci/config.yml b/.circleci/config.yml index 64827aa7989ec8..1a8891609fb993 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,7 +129,7 @@ jobs: name: '`pnpm dedupe` was run?' command: | # #default-branch-switch - if [[ $(git diff --name-status master | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]]; + if [[ $(git diff --name-status v6.x | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]]; then echo "No changes to dependencies detected. Skipping..." else @@ -921,9 +921,10 @@ workflows: filters: branches: only: + # #target-branch-reference - master - - next - v5.x + - v6.x jobs: - test_unit: <<: *default-context @@ -971,8 +972,9 @@ workflows: filters: branches: only: + # #target-branch-reference - master - - next + - v6.x jobs: - test_unit: <<: *default-context @@ -998,8 +1000,9 @@ workflows: filters: branches: only: + # #target-branch-reference - master - - next + - v6.x jobs: - test_types_next: <<: *default-context diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml index 6c6a13d01dd68d..a0648e748f54c6 100644 --- a/.github/workflows/maintenance.yml +++ b/.github/workflows/maintenance.yml @@ -4,15 +4,17 @@ on: # So that PRs touching the same files as the push are updated push: branches: + # #target-branch-reference - master - - next + - v6.x # So that the `dirtyLabel` is removed if conflicts are resolved # Could put too much strain on rate limit # If we hit the rate limit too often remove this event pull_request_target: branches: + # #target-branch-reference - master - - next + - v6.x types: [synchronize] permissions: {} diff --git a/README.md b/README.md index 77c3635d40f768..7bb6d88dbed19d 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,9 @@ For how-to questions that don't involve making changes to the code base, please ## Examples -Our documentation features [a collection of example projects](https://github.com/mui/material-ui/tree/master/examples). + + +Our documentation features [a collection of example projects](https://github.com/mui/material-ui/tree/v6.x/examples). ## Premium templates diff --git a/docs/data/material/customization/dark-mode/dark-mode.md b/docs/data/material/customization/dark-mode/dark-mode.md index 804769e1d6a02a..b3af91f641c475 100644 --- a/docs/data/material/customization/dark-mode/dark-mode.md +++ b/docs/data/material/customization/dark-mode/dark-mode.md @@ -175,7 +175,9 @@ Use the `theme.applyStyles()` utility to apply styles for a specific mode. We recommend using this function over checking `theme.palette.mode` to switch between styles as it has more benefits: -- It can be used with [Pigment CSS](https://github.com/mui/material-ui/tree/master/packages/pigment-css-react), our in-house zero-runtime CSS-in-JS solution. + + +- It can be used with [Pigment CSS](https://github.com/mui/material-ui/tree/v6.x/packages/pigment-css-react), our in-house zero-runtime CSS-in-JS solution. - It is generally more readable and maintainable. - It is slightly more performant as it doesn't require to do style recalculation but the bundle size of SSR generated styles is larger. diff --git a/docs/data/material/customization/palette/palette.md b/docs/data/material/customization/palette/palette.md index 7fcde9b9ff0928..8d01305697240b 100644 --- a/docs/data/material/customization/palette/palette.md +++ b/docs/data/material/customization/palette/palette.md @@ -149,7 +149,9 @@ const theme = createTheme({ {{"demo": "ManuallyProvideCustomColor.js", "defaultCodeOpen": false}} -If you need to manipulate colors, `@mui/material/styles` provides [a set of utilities](https://github.com/mui/material-ui/blob/master/packages/mui-material/src/styles/index.d.ts#L52-L67) to help with this. + + +If you need to manipulate colors, `@mui/material/styles` provides [a set of utilities](https://github.com/mui/material-ui/blob/v6.x/packages/mui-material/src/styles/index.d.ts#L52-L67) to help with this. The following example uses the `alpha()` and `getContrastRatio()` utilities to define tokens using opacity: ```jsx diff --git a/docs/data/material/getting-started/example-projects/example-projects.md b/docs/data/material/getting-started/example-projects/example-projects.md index d2d7361b5c11ed..bbdaf64a2e20d0 100644 --- a/docs/data/material/getting-started/example-projects/example-projects.md +++ b/docs/data/material/getting-started/example-projects/example-projects.md @@ -4,7 +4,9 @@ ## Official integrations -The following integration examples are available in the [`/examples`](https://github.com/mui/material-ui/tree/master/examples) folder of the Material UI GitHub repository. + + +The following integration examples are available in the [`/examples`](https://github.com/mui/material-ui/tree/v6.x/examples) folder of the Material UI GitHub repository. These examples feature Material UI paired with other popular React libraries and frameworks, so you can skip the initial setup steps and jump straight into building. :::success diff --git a/docs/data/material/getting-started/installation/installation.md b/docs/data/material/getting-started/installation/installation.md index f4c5af11f9de0a..d009de9c4d7f13 100644 --- a/docs/data/material/getting-started/installation/installation.md +++ b/docs/data/material/getting-started/installation/installation.md @@ -158,7 +158,7 @@ You can start using Material UI right away with minimal front-end infrastructur -Follow [this CDN example](https://github.com/mui/material-ui/tree/master/examples/material-ui-via-cdn) to get started. +Follow [this CDN example](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-via-cdn) to get started. :::error We do _not_ recommend using this approach in production. diff --git a/docs/data/material/getting-started/supported-platforms/supported-platforms.md b/docs/data/material/getting-started/supported-platforms/supported-platforms.md index da2dc51092693e..d5e40e73646d47 100644 --- a/docs/data/material/getting-started/supported-platforms/supported-platforms.md +++ b/docs/data/material/getting-started/supported-platforms/supported-platforms.md @@ -15,7 +15,7 @@ You don't need to provide any JavaScript polyfill as it manages unsupported brow -An extensive list can be found in our [.browserlistrc](https://github.com/mui/material-ui/blob/-/.browserslistrc#L12-L27) (check the `stable` entry). +An extensive list can be found in our [.browserlistrc](https://github.com/mui/material-ui/blob/v6.x/.browserslistrc#L12-L27) (check the `stable` entry). Because Googlebot uses a web rendering service (WRS) to index the page content, it's critical that Material UI supports it. [WRS regularly updates the rendering engine it uses](https://webmasters.googleblog.com/2019/05/the-new-evergreen-googlebot.html). diff --git a/docs/data/material/getting-started/templates/blog/README.md b/docs/data/material/getting-started/templates/blog/README.md index 3d2484e7e96e38..3724c63b33154a 100644 --- a/docs/data/material/getting-started/templates/blog/README.md +++ b/docs/data/material/getting-started/templates/blog/README.md @@ -4,7 +4,7 @@ -1. Copy these folders (`blog` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples). +1. Copy these folders (`blog` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/v6.x/examples). 2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react, markdown-to-jsx. 3. Import and use the `Blog` component. diff --git a/docs/data/material/getting-started/templates/checkout/README.md b/docs/data/material/getting-started/templates/checkout/README.md index 87c57a6006ba6b..c46a81c4ba98f6 100644 --- a/docs/data/material/getting-started/templates/checkout/README.md +++ b/docs/data/material/getting-started/templates/checkout/README.md @@ -4,7 +4,7 @@ -1. Copy these folders (`checkout` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples). +1. Copy these folders (`checkout` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/v6.x/examples). 2. Make sure your project has the required dependencies: @mui/material, @emotion/styled, @emotion/react. 3. Import and use the `Checkout` component. diff --git a/docs/data/material/getting-started/templates/dashboard/README.md b/docs/data/material/getting-started/templates/dashboard/README.md index 98a9b8754f7be3..b3d87a12f3db8f 100644 --- a/docs/data/material/getting-started/templates/dashboard/README.md +++ b/docs/data/material/getting-started/templates/dashboard/README.md @@ -4,7 +4,7 @@ -1. Copy these folders (`dashboard` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples). +1. Copy these folders (`dashboard` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/v6.x/examples). 2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react, @mui/x-charts, @mui/x-date-pickers, @mui/x-data-grid, @mui/x-tree-view, dayjs 3. Import and use the `Dashboard` component. diff --git a/docs/data/material/getting-started/templates/marketing-page/README.md b/docs/data/material/getting-started/templates/marketing-page/README.md index 5b12c5dff629a3..56dde7818fd635 100644 --- a/docs/data/material/getting-started/templates/marketing-page/README.md +++ b/docs/data/material/getting-started/templates/marketing-page/README.md @@ -4,7 +4,7 @@ -1. Copy these folders (`marketing-page` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples). +1. Copy these folders (`marketing-page` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/v6.x/examples). 2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react. 3. Import and use the `MarketingPage` component. diff --git a/docs/data/material/getting-started/templates/sign-in-side/README.md b/docs/data/material/getting-started/templates/sign-in-side/README.md index 9265abb77d132e..492212d5b6d5f0 100644 --- a/docs/data/material/getting-started/templates/sign-in-side/README.md +++ b/docs/data/material/getting-started/templates/sign-in-side/README.md @@ -4,7 +4,7 @@ -1. Copy these folders (`sign-in-side` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples). +1. Copy these folders (`sign-in-side` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/v6.x/examples). 2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react. 3. Import and use the `SignInSide` component. diff --git a/docs/data/material/getting-started/templates/sign-in/README.md b/docs/data/material/getting-started/templates/sign-in/README.md index 7dde1e6b1e4b1a..511c86eace257a 100644 --- a/docs/data/material/getting-started/templates/sign-in/README.md +++ b/docs/data/material/getting-started/templates/sign-in/README.md @@ -4,7 +4,7 @@ -1. Copy these folders (`sign-in` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples). +1. Copy these folders (`sign-in` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/v6.x/examples). 2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react. 3. Import and use the `SignIn` component. diff --git a/docs/data/material/getting-started/templates/sign-up/README.md b/docs/data/material/getting-started/templates/sign-up/README.md index 3acc20ef960927..09b666f5de8e30 100644 --- a/docs/data/material/getting-started/templates/sign-up/README.md +++ b/docs/data/material/getting-started/templates/sign-up/README.md @@ -4,7 +4,7 @@ -1. Copy these folders (`sign-up` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples). +1. Copy these folders (`sign-up` and `shared-theme`) into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/v6.x/examples). 2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react. 3. Import and use the `SignUp` component. diff --git a/docs/data/material/guides/localization/localization.md b/docs/data/material/guides/localization/localization.md index f341c4725f0ef3..5008b9ab04d41f 100644 --- a/docs/data/material/guides/localization/localization.md +++ b/docs/data/material/guides/localization/localization.md @@ -98,7 +98,7 @@ The [Data Grid and Data Grid Pro](/x/react-data-grid/) components have their own -You can [find the source](https://github.com/mui/material-ui/blob/master/packages/mui-material/src/locale/index.ts) in the GitHub repository. +You can [find the source](https://github.com/mui/material-ui/blob/v6.x/packages/mui-material/src/locale/index.ts) in the GitHub repository. To create your own translation, or to customize the English text, copy this file to your project, make any changes needed and import the locale from there. diff --git a/docs/data/material/guides/typescript/typescript.md b/docs/data/material/guides/typescript/typescript.md index 5310d4b13bc5d7..1eed5e67994bab 100644 --- a/docs/data/material/guides/typescript/typescript.md +++ b/docs/data/material/guides/typescript/typescript.md @@ -6,7 +6,7 @@ -Material UI requires a minimum version of TypeScript 4.7. Have a look at the [Create React App with TypeScript](https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-ts) example. +Material UI requires a minimum version of TypeScript 4.7. Have a look at the [Create React App with TypeScript](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-ts) example. For types to work, it's recommended that you have at least the following options enabled in your `tsconfig.json`: diff --git a/docs/data/material/integrations/interoperability/interoperability.md b/docs/data/material/integrations/interoperability/interoperability.md index 1e3bf6016e98dd..04c6cbe28d7a79 100644 --- a/docs/data/material/integrations/interoperability/interoperability.md +++ b/docs/data/material/integrations/interoperability/interoperability.md @@ -274,8 +274,8 @@ If, however, you would like to use styled-components, you can configure your app -- [Create React App with styled-components](https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-styled-components) -- [Create React App with styled-components and TypeScript](https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-styled-components-ts) +- [Create React App with styled-components](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components) +- [Create React App with styled-components and TypeScript](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components-ts) Following this approach reduces the bundle size, and removes the need to configure the CSS injection order. @@ -580,7 +580,9 @@ It works exactly like styled components. You can [use the same guide](/material- ### Setup -If you are used to Tailwind CSS and want to use it together with the Material UI components, you can start by cloning the [Tailwind CSS](https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-tailwind-ts) example project. + + +If you are used to Tailwind CSS and want to use it together with the Material UI components, you can start by cloning the [Tailwind CSS](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-tailwind-ts) example project. If you use a different framework, or already have set up your project, follow these steps: 1. Add Tailwind CSS to your project, following the instructions in https://tailwindcss.com/docs/installation. diff --git a/docs/data/material/integrations/styled-components/styled-components.md b/docs/data/material/integrations/styled-components/styled-components.md index 1745a5ccd6118f..a4d9656230ee0a 100644 --- a/docs/data/material/integrations/styled-components/styled-components.md +++ b/docs/data/material/integrations/styled-components/styled-components.md @@ -102,8 +102,8 @@ We provide boilerplate examples of Create React App with Material UI and styled -- [Material UI + CRA + styled-components (JavaScript)](https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-styled-components) -- [Material UI + CRA + styled-components (TypeScript)](https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-styled-components-ts) +- [Material UI + CRA + styled-components (JavaScript)](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components) +- [Material UI + CRA + styled-components (TypeScript)](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components-ts) :::warning `@emotion/react`, `@emotion/styled`, and `styled-components` are optional peer dependencies of `@mui/material`, so you need to install them yourself. diff --git a/docs/data/system/experimental-api/css-theme-variables/css-theme-variables.md b/docs/data/system/experimental-api/css-theme-variables/css-theme-variables.md index 6905605fb83fd1..b1ae6e972e0a88 100644 --- a/docs/data/system/experimental-api/css-theme-variables/css-theme-variables.md +++ b/docs/data/system/experimental-api/css-theme-variables/css-theme-variables.md @@ -189,7 +189,9 @@ Now, the Button's `backgroundColor`, `borderColor` and text `color` values will For framework- or language-specific setup instructions, see [CSS theme variables—Usage—Server-side rendering](/material-ui/customization/css-theme-variables/usage/). For framework or language specific setup, see [this](/material-ui/customization/css-theme-variables/usage/) -See the complete usage of `createCssVarsProvider` in [Material UI](https://github.com/mui/material-ui/blob/master/packages/mui-material/src/styles/ThemeProviderWithVars.tsx) and [Joy UI](https://github.com/mui/material-ui/blob/master/packages/mui-joy/src/styles/CssVarsProvider.tsx). + + +See the complete usage of `createCssVarsProvider` in [Material UI](https://github.com/mui/material-ui/blob/v6.x/packages/mui-material/src/styles/ThemeProviderWithVars.tsx) and [Joy UI](https://github.com/mui/material-ui/blob/v6.x/packages/mui-joy/src/styles/CssVarsProvider.tsx). ## API diff --git a/docs/data/system/getting-started/usage/usage.md b/docs/data/system/getting-started/usage/usage.md index 6d3d0bae641795..3a2911e3ebf54d 100644 --- a/docs/data/system/getting-started/usage/usage.md +++ b/docs/data/system/getting-started/usage/usage.md @@ -158,7 +158,7 @@ Runtime performance takes a hit. -Visit the [benchmark folder](https://github.com/mui/material-ui/tree/master/benchmark/browser) for a reproduction of the metrics above. +Visit the [benchmark folder](https://github.com/mui/material-ui/tree/v6.x/benchmark/browser) for a reproduction of the metrics above. We believe that for most use cases it's fast enough, but there are simple workarounds when performance becomes critical. For instance, when rendering a list with many items, you can use a CSS child selector to have a single "style injection" point (using d. for the wrapper and a. for each item). diff --git a/docs/next.config.ts b/docs/next.config.ts index df35d969bb97ea..83de9e2d9cb87f 100644 --- a/docs/next.config.ts +++ b/docs/next.config.ts @@ -189,7 +189,7 @@ export default withDocsInfra({ // docs-infra LIB_VERSION: pkg.version, SOURCE_CODE_REPO: 'https://github.com/mui/material-ui', - SOURCE_GITHUB_BRANCH: 'master', // #default-branch-switch + SOURCE_GITHUB_BRANCH: 'v6.x', // #default-branch-switch GITHUB_TEMPLATE_DOCS_FEEDBACK: '4.docs-feedback.yml', BUILD_ONLY_ENGLISH_LOCALE: String(buildOnlyEnglishLocale), // MUI Core related diff --git a/docs/package.json b/docs/package.json index 91d02cfc8552dc..96696a9ac57abc 100644 --- a/docs/package.json +++ b/docs/package.json @@ -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 v6.x:latest", "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", diff --git a/docs/src/modules/components/MaterialUIExampleCollection.js b/docs/src/modules/components/MaterialUIExampleCollection.js index 492f837295ef98..03408f5ac7e75c 100644 --- a/docs/src/modules/components/MaterialUIExampleCollection.js +++ b/docs/src/modules/components/MaterialUIExampleCollection.js @@ -14,78 +14,78 @@ const examples = [ name: 'Next.js App Router', label: 'View JavaScript', tsLabel: 'View TypeScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-nextjs', - tsLink: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-nextjs-ts', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-nextjs', + tsLink: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-ts', src: '/static/images/examples/next.svg', }, { name: 'Next.js Pages Router', label: 'View JavaScript', tsLabel: 'View TypeScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-nextjs-pages-router', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-pages-router', tsLink: - 'https://github.com/mui/material-ui/tree/master/examples/material-ui-nextjs-pages-router-ts', + 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-pages-router-ts', src: '/static/images/examples/next.svg', }, { name: 'Vite.js', label: 'View JavaScript', tsLabel: 'View TypeScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-vite', - tsLink: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-vite-ts', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-vite', + tsLink: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-vite-ts', src: '/static/images/examples/vite.svg', }, { name: 'Remix', label: 'View TypeScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-remix-ts', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-remix-ts', src: '/static/images/examples/remix.svg', }, { name: 'Create React App', label: 'View JavaScript', tsLabel: 'View TypeScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-cra', - tsLink: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-ts', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra', + tsLink: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-ts', src: '/static/images/examples/cra.svg', }, { name: 'Tailwind CSS + Create React App', label: 'View TypeScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-tailwind-ts', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-tailwind-ts', src: '/static/images/examples/tailwindcss.svg', }, { name: 'styled-components', label: 'View JavaScript', tsLabel: 'View TypeScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-styled-components', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components', tsLink: - 'https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-styled-components-ts', + 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components-ts', src: '/static/images/examples/styled.png', }, { name: 'Preact', label: 'View JavaScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-preact', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-preact', src: '/static/images/examples/preact.svg', }, { name: 'CDN', label: 'View JavaScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-via-cdn', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-via-cdn', src: , }, { name: 'Express.js (server-rendered)', label: 'View JavaScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-express-ssr', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-express-ssr', src: '/static/images/examples/express.png', }, { name: 'Gatsby', label: 'View JavaScript', - link: 'https://github.com/mui/material-ui/tree/master/examples/material-ui-gatsby', + link: 'https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-gatsby', src: '/static/images/examples/gatsby.svg', }, ]; diff --git a/docs/src/modules/components/Notifications.js b/docs/src/modules/components/Notifications.js index bad939bb9df464..4a094e7fea1047 100644 --- a/docs/src/modules/components/Notifications.js +++ b/docs/src/modules/components/Notifications.js @@ -21,8 +21,9 @@ async function fetchNotifications() { const items = (await import('../../../notifications.json')).default; return items; } + // #repo-reference const response = await fetch( - 'https://raw.githubusercontent.com/mui/material-ui/master/docs/notifications.json', + 'https://raw.githubusercontent.com/mui/material-ui/v6.x/docs/notifications.json', ); return response.json(); } diff --git a/examples/material-ui-cra-styled-components-ts/README.md b/examples/material-ui-cra-styled-components-ts/README.md index 4fa59826c2ab3b..3fc6acb9da57f0 100644 --- a/examples/material-ui-cra-styled-components-ts/README.md +++ b/examples/material-ui-cra-styled-components-ts/README.md @@ -23,7 +23,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-cra-styled-components-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-cra-styled-components-ts cd material-ui-cra-styled-components-ts ``` @@ -38,7 +38,7 @@ npm start -Note that CodeSandbox is not supporting react-app-rewired, yet you can [still see the code](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-cra-styled-components-ts). +Note that CodeSandbox is not supporting react-app-rewired, yet you can [still see the code](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components-ts). The following link leverages this demo: https://mui.com/material-ui/integrations/interoperability/#change-the-default-styled-engine with Parcel's alias feature within the `package.json`. diff --git a/examples/material-ui-cra-styled-components/README.md b/examples/material-ui-cra-styled-components/README.md index e4a94251ed7bc8..78fa1d6dfca2f7 100644 --- a/examples/material-ui-cra-styled-components/README.md +++ b/examples/material-ui-cra-styled-components/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-cra-styled-components +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-cra-styled-components cd material-ui-cra-styled-components ``` @@ -22,7 +22,7 @@ npm start -Note that CodeSandbox is not supporting react-app-rewired, yet you can [still see the code](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-cra-styled-components). +Note that CodeSandbox is not supporting react-app-rewired, yet you can [still see the code](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-cra-styled-components). The following link leverages this demo: https://mui.com/material-ui/integrations/interoperability/#change-the-default-styled-engine with Parcel's alias feature within the `package.json`. diff --git a/examples/material-ui-cra-tailwind-ts/README.md b/examples/material-ui-cra-tailwind-ts/README.md index f4f8e5f13deb58..709b4c215453f5 100644 --- a/examples/material-ui-cra-tailwind-ts/README.md +++ b/examples/material-ui-cra-tailwind-ts/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-cra-tailwind-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-cra-tailwind-ts cd material-ui-cra-tailwind-ts ``` @@ -22,7 +22,7 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-cra-tailwind-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-cra-tailwind-ts) ## The idea behind the example diff --git a/examples/material-ui-cra-ts/README.md b/examples/material-ui-cra-ts/README.md index dfd9da114d38ae..9e54ea8108e9a1 100644 --- a/examples/material-ui-cra-ts/README.md +++ b/examples/material-ui-cra-ts/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-cra-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-cra-ts cd material-ui-cra-ts ``` @@ -22,9 +22,9 @@ or: -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-cra-ts) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-cra-ts) -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-cra-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-cra-ts) ## The idea behind the example diff --git a/examples/material-ui-cra/README.md b/examples/material-ui-cra/README.md index 94dbc3515b6db6..f4c1fbe55e1670 100644 --- a/examples/material-ui-cra/README.md +++ b/examples/material-ui-cra/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-cra +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-cra cd material-ui-cra ``` @@ -22,9 +22,9 @@ or: -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-cra) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-cra) -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-cra) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-cra) ## The idea behind the example diff --git a/examples/material-ui-express-ssr/README.md b/examples/material-ui-express-ssr/README.md index 2ee2fbc7f97917..dc0937c2b7426d 100644 --- a/examples/material-ui-express-ssr/README.md +++ b/examples/material-ui-express-ssr/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-express-ssr +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-express-ssr cd material-ui-express-ssr ``` @@ -22,9 +22,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-express-ssr) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-express-ssr) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-express-ssr) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-express-ssr) ## The idea behind the example diff --git a/examples/material-ui-gatsby/README.md b/examples/material-ui-gatsby/README.md index afdad50c1d209b..c4db815159d6f9 100644 --- a/examples/material-ui-gatsby/README.md +++ b/examples/material-ui-gatsby/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-gatsby +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-gatsby cd material-ui-gatsby ``` diff --git a/examples/material-ui-nextjs-pages-router-ts/README.md b/examples/material-ui-nextjs-pages-router-ts/README.md index 25e32aa803cfd2..f7d46f242234b6 100644 --- a/examples/material-ui-nextjs-pages-router-ts/README.md +++ b/examples/material-ui-nextjs-pages-router-ts/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-nextjs-pages-router-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-nextjs-pages-router-ts cd material-ui-nextjs-pages-router-ts ``` @@ -22,15 +22,15 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-nextjs-pages-router-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-pages-router-ts) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-nextjs-pages-router-ts) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-pages-router-ts) ## The idea behind the example **Note:** This example is set up to use the Next.js Pages Router. As of Next.js 13.4, the newer App Router pattern is stable. -We recommend starting new projects with the [Material UI with Next.js (App Router) example](https://github.com/mui/material-ui/tree/master/examples/material-ui-nextjs-ts) unless you need (or prefer) the Pages Router. +We recommend starting new projects with the [Material UI with Next.js (App Router) example](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-ts) unless you need (or prefer) the Pages Router. The project uses [Next.js](https://github.com/vercel/next.js), which is a framework for server-rendered React apps. It includes `@mui/material` and its peer dependencies, including [Emotion](https://emotion.sh/docs/introduction), the default style engine in Material UI v6. diff --git a/examples/material-ui-nextjs-pages-router/README.md b/examples/material-ui-nextjs-pages-router/README.md index 50453acf21f548..bcb54500033220 100644 --- a/examples/material-ui-nextjs-pages-router/README.md +++ b/examples/material-ui-nextjs-pages-router/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-nextjs-pages-router +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-nextjs-pages-router cd material-ui-nextjs-pages-router ``` @@ -22,15 +22,15 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-nextjs-pages-router) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-pages-router) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-nextjs-pages-router) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-pages-router) ## The idea behind the example **Note:** This example is set up to use the Next.js Pages Router. As of Next.js 13.4, the newer App Router pattern is stable. -We recommend starting new projects with the [Material UI with Next.js (App Router) example](https://github.com/mui/material-ui/tree/master/examples/material-ui-nextjs) unless you need (or prefer) the Pages Router. +We recommend starting new projects with the [Material UI with Next.js (App Router) example](https://github.com/mui/material-ui/tree/v6.x/examples/material-ui-nextjs) unless you need (or prefer) the Pages Router. The project uses [Next.js](https://github.com/vercel/next.js), which is a framework for server-rendered React apps. It includes `@mui/material` and its peer dependencies, including [Emotion](https://emotion.sh/docs/introduction), the default style engine in Material UI v6. diff --git a/examples/material-ui-nextjs-ts/README.md b/examples/material-ui-nextjs-ts/README.md index df5d86c065a2a4..7d9d697cb8d790 100644 --- a/examples/material-ui-nextjs-ts/README.md +++ b/examples/material-ui-nextjs-ts/README.md @@ -9,7 +9,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-nextjs-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-nextjs-ts cd material-ui-nextjs-ts ``` @@ -26,9 +26,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-nextjs-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-ts) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-nextjs-ts) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs-ts) ## Learn more diff --git a/examples/material-ui-nextjs/README.md b/examples/material-ui-nextjs/README.md index 98ea0fabe4fc94..3178c67a3e4c99 100644 --- a/examples/material-ui-nextjs/README.md +++ b/examples/material-ui-nextjs/README.md @@ -9,7 +9,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-nextjs +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-nextjs cd material-ui-nextjs ``` @@ -26,9 +26,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-nextjs) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-nextjs) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-nextjs) ## Learn more diff --git a/examples/material-ui-pigment-css-nextjs-ts/README.md b/examples/material-ui-pigment-css-nextjs-ts/README.md index ed2d9cf3e6a81a..7f9e87f073d7fb 100644 --- a/examples/material-ui-pigment-css-nextjs-ts/README.md +++ b/examples/material-ui-pigment-css-nextjs-ts/README.md @@ -9,7 +9,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-pigment-css-nextjs-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-pigment-css-nextjs-ts cd material-ui-pigment-css-nextjs-ts ``` @@ -26,9 +26,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-pigment-css-nextjs-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-pigment-css-nextjs-ts) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-pigment-css-nextjs-ts) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-pigment-css-nextjs-ts) ## Learn more diff --git a/examples/material-ui-pigment-css-vite-ts/README.md b/examples/material-ui-pigment-css-vite-ts/README.md index bc4f7c97f85946..c089c0c28d8c22 100644 --- a/examples/material-ui-pigment-css-vite-ts/README.md +++ b/examples/material-ui-pigment-css-vite-ts/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-pigment-css-vite-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-pigment-css-vite-ts cd material-ui-pigment-css-vite-ts ``` @@ -22,9 +22,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-pigment-css-vite-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-pigment-css-vite-ts) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-pigment-css-vite-ts) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-pigment-css-vite-ts) ## The idea behind the example diff --git a/examples/material-ui-preact/README.md b/examples/material-ui-preact/README.md index 16c27d14101bf1..3da4eaa0dcc801 100644 --- a/examples/material-ui-preact/README.md +++ b/examples/material-ui-preact/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-preact +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-preact cd material-ui-preact ``` diff --git a/examples/material-ui-remix-ts/README.md b/examples/material-ui-remix-ts/README.md index 4cba4dca5836f9..6df6e44a9a94bb 100644 --- a/examples/material-ui-remix-ts/README.md +++ b/examples/material-ui-remix-ts/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-remix-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-remix-ts cd material-ui-remix-ts ``` @@ -22,9 +22,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-remix-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-remix-ts) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-remix-ts) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-remix-ts) ## The idea behind the example diff --git a/examples/material-ui-via-cdn/README.md b/examples/material-ui-via-cdn/README.md index acdba207e21fe4..2685b42200cb07 100644 --- a/examples/material-ui-via-cdn/README.md +++ b/examples/material-ui-via-cdn/README.md @@ -4,8 +4,10 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): + + ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-via-cdn +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-via-cdn cd material-ui-via-cdn ``` @@ -26,7 +28,7 @@ The client has to download the entire library, regardless of which components ar -[The live preview.](https://raw.githack.com/mui/material-ui/master/examples/material-ui-via-cdn/index.html) +[The live preview.](https://raw.githack.com/mui/material-ui/v6.x/examples/material-ui-via-cdn/index.html) ## What's next? diff --git a/examples/material-ui-vite-ts/README.md b/examples/material-ui-vite-ts/README.md index 0428f0631fac0d..07d3c8af39279f 100644 --- a/examples/material-ui-vite-ts/README.md +++ b/examples/material-ui-vite-ts/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-vite-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-vite-ts cd material-ui-vite-ts ``` @@ -22,9 +22,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-vite-ts) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-vite-ts) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-vite-ts) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-vite-ts) ## The idea behind the example diff --git a/examples/material-ui-vite/README.md b/examples/material-ui-vite/README.md index 185ce6aeabe059..11ce908386dc21 100644 --- a/examples/material-ui-vite/README.md +++ b/examples/material-ui-vite/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```bash -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-ui-vite +curl https://codeload.github.com/mui/material-ui/tar.gz/v6.x | tar -xz --strip=2 material-ui-v6.x/examples/material-ui-vite cd material-ui-vite ``` @@ -22,9 +22,9 @@ or: -[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/master/examples/material-ui-vite) +[![Edit on StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/mui/material-ui/tree/v6.x/examples/material-ui-vite) -[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/master/examples/material-ui-vite) +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/p/sandbox/github/mui/material-ui/tree/v6.x/examples/material-ui-vite) ## The idea behind the example diff --git a/package.json b/package.json index 63fe5f689a1352..202ed648b3965d 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "stylelint": "stylelint --reportInvalidScopeDisables --reportNeedlessDisables \"docs/**/*.?(c|m)[jt]s?(x)\" --ignore-path .gitignore", "markdownlint": "markdownlint-cli2 \"**/*.md\"", "valelint": "git ls-files | grep -h \".md$\" | xargs vale --filter='.Level==\"error\"'", - "prettier": "pretty-quick --ignore-path .eslintignore --branch master", + "prettier": "pretty-quick --ignore-path .eslintignore --branch v6.x", "prettier:all": "prettier --write . --ignore-path .eslintignore", "size:snapshot": "node --max-old-space-size=4096 ./scripts/sizeSnapshot/create", "size:why": "pnpm size:snapshot --analyze", diff --git a/scripts/README.md b/scripts/README.md index d9aec080797fe4..9ad3809df29e54 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -88,7 +88,7 @@ To do so, follow these steps: In case of conflicts you will need to resolve them and commit the changes manually. If this command fails with the message 'bad revision', it means that the commit doesn't exist on your local repository. - The commit might have been created on a remote branch, probably when merging into `master` or `next`. + The commit might have been created on a remote branch, probably when merging into `master` or `v*.x`. In this case, you'll have to fetch the latest changes of the corresponding remote branch and then try again. 5. Push the changes to the `material-ui-docs` remote: diff --git a/scripts/releaseChangelog.mjs b/scripts/releaseChangelog.mjs index 472f32eb576495..fc566aa203a7b0 100644 --- a/scripts/releaseChangelog.mjs +++ b/scripts/releaseChangelog.mjs @@ -215,7 +215,7 @@ yargs(process.argv.slice(2)) }) .option('release', { // #default-branch-switch - default: 'master', + default: 'v6.x', describe: 'Ref which we want to release', type: 'string', })