Merge remote-tracking branch 'upstream/master' into rename-toolpad-repo

.circleci/config.yml

@@ -299,12 +299,6 @@ jobs:
           command: |
             pnpm docs:link-check
             git add -A && git diff --exit-code --staged
-      - run:
-          name: Update the templates shared themes
-          command: pnpm template:update-theme
-      - run:
-          name: '`pnpm template:update-theme` changes committed?'
-          command: git add -A && git diff --exit-code --staged
   test_types:
     <<: *default-job
     resource_class: 'medium+'
@@ -399,7 +393,7 @@ jobs:
     <<: *default-job
     resource_class: 'medium+'
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -429,7 +423,7 @@ jobs:
   test_e2e:
     <<: *default-job
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -443,7 +437,7 @@ jobs:
     # NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
     <<: *default-job
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -458,7 +452,7 @@ jobs:
   test_profile:
     <<: *default-job
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -485,7 +479,7 @@ jobs:
   test_regressions:
     <<: *default-job
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -545,7 +539,7 @@ jobs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -569,7 +563,7 @@ jobs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -593,7 +587,7 @@ jobs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -617,7 +611,7 @@ jobs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -641,7 +635,7 @@ jobs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -665,7 +659,7 @@ jobs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -693,7 +687,7 @@ jobs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -794,7 +788,7 @@ jobs:
   test_benchmark:
     <<: *default-job
     docker:
-      - image: mcr.microsoft.com/playwright:v1.46.1-focal
+      - image: mcr.microsoft.com/playwright:v1.47.1-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:

.eslintignore

@@ -1,5 +1,4 @@
 /.git
-/.yarn
 /coverage
 /docs/export
 /docs/pages/playground/

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           languages: typescript
           config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7

.github/workflows/scorecards.yml

@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -1,6 +1,82 @@
 # [Versions](https://mui.com/versions/)
 
-## 6.0.2
+## v6.1.0
+
+<!-- generated comparing v6.0.2..master -->
+
+_Sep 10, 2024_
+
+A big thanks to the 21 contributors who made this release possible. Here are the highlights ✨:
+
+- **Minor version changes**: To solve longstanding ESM compatibility issues we added [package exports](https://nodejs.org/api/packages.html#exports) to `@mui/icons-material` (#43624). This change is backwards compatible with previously recommended setups. Bundlers that don't support the `exports` field won't be affected. If you discover any issues, please reach out by creating a GitHub issue.
+- This release also includes several fixes and documentation improvements to support the Material UI v6 upgrade.
+
+### `@mui/[email protected]`
+
+- Add exports field to package.json (#43624) @Janpot
+
+### `@mui/[email protected]`
+
+- [Autocomplete] Add custom props support via `slotProps` (#43613) @Michael-Hutchinson
+- [Dialog] Fix broken scrolling in full screen mode (#43626) @LuseBiswas
+- [Grid] Revert wrap deprecation (#42363) (#43459) @DiegoAndai
+- Improve color map filter on styles (#43579) @DiegoAndai
+- Return styles directly if the selector is `&` when using `applyStyles` (#43633) @siriwatknp
+- [types] Make slots partial in `CreateSlotsAndSlotProp`type (#42077) @lhilgert9
+- [Radio] Fix disabled state styling regression (#43592) @mnajdova
+- Fix wrong import to type (#43584) @mnajdova
+- Simplify version prerelease export (#43699) @DiegoAndai
+
+### `@mui/[email protected]`
+
+- Use a custom sheet to set prepend for `GlobalStyles` (#43632) @siriwatknp
+- Simplify version prerelease export (#43699) @DiegoAndai
+
+### Docs
+
+- [material-ui][Autocomplete] Refactor asynchronous loading demo (#43630) @sai6855
+- [material-ui][Autocomplete] Fix GitHubLabel demo input background color (#43599) @sai6855
+- [material-ui] Update Next.js font optimization guide (#43196) @siriwatknp
+- [material-ui] Fix getting started with CSS variables in theme example (#43658) @Designer023
+- [material-ui][system] Edit "How to use components selector API" section to add about direct import (#43377) @IAluI
+- [material-ui] Update @mui/material-nextjs import examples to v14 (#43698) @ohmsl
+- Fix typo in Divider doc (#43691) @lokendra-reco
+- Add Anima section to documentation (#43673) @GoOrit-Anima
+- Add Integrations section to design resources page (#43612) @zanivan
+- Fix versions URL @oliviertassinari
+- Keep showing next under the subdomain @oliviertassinari
+- Add Next.js font optimization section to Pigment CSS migration (#43631) @siriwatknp
+- Update the Material UI readme post-v6 (#43504) @samuelsycamore
+- Bring back v5 release changelogs (#43460) @oliviertassinari
+- Fix use of absolute URLs (#43567) @oliviertassinari
+- Remove explicit `date-fns` dependency (#40823) @renovate[bot]
+- [pigment-css] Add guide for Pigment CSS quickstart (#43395) @alelthomas
+- [system] Fix link to createCssVarsProvider (#43661) @oliviertassinari
+- Add scrollbar to color picker demo (#43672) @sai6855
+
+### Core
+
+- [blog] Uniformalize version between projects @oliviertassinari
+- [blog] Fix page layout shift @oliviertassinari
+- [code-infra] Build size snapshots from installed packages (#43452) @Janpot
+- [code-infra] Recreate lockfile (#43623) @Janpot
+- [code-infra] Make the API docs builder more configurable (#43574) @michaldudak
+- [code-infra] Update runners from node 18 to 20 for GHA (#43593) @JCQuintas
+- [code-infra] Update runners from node 18 to 20 (#43591) @JCQuintas
+- [docs-infra] Fix axe issue scroll-to-top without landmark (#43663) @oliviertassinari
+- [docs-infra] Reduce Algolia index size, no need for lvl6 @oliviertassinari
+- [docs-infra] Use embed as the default for opening CodeSandbox (#43618) @siriwatknp
+- [docs-infra] Fix broken anchor button when header has a link (#43598) @cherniavskii
+- [docs-infra] Open Sign-in and Dashboard template with CodeSandbox/StackBlitz (#43604) @siriwatknp
+- [examples] Fix CDN live preview demo (#43641) @oliviertassinari
+- Add Pigment CSS screenshot test (#43280) @mnajdova
+- [website] Polish gold sponsors @oliviertassinari
+- [website] Add CopyCopter as gold sponsor (#43595) @zanivan
+- [website] Add disabled button styles to branding theme (#43577) @zanivan
+
+All contributors of this release in alphabetical order: @alelthomas, @cherniavskii, @Designer023, @DiegoAndai, @GoOrit-Anima, @IAluI, @Janpot, @JCQuintas, @lhilgert9, @lokendra-reco, @LuseBiswas, @Michael-Hutchinson, @michaldudak, @mnajdova, @ohmsl, @oliviertassinari, @renovate[bot], @sai6855, @samuelsycamore, @siriwatknp, @zanivan
+
+## v6.0.2
 
 <!-- generated comparing v6.0.1..master -->
 

CHANGELOG.old.md

@@ -4127,8 +4127,8 @@ A big thanks to the 17 contributors who made this release possible. Here are som
 
   ```diff
    import {
-      unstable_createCssVarsProvider as createCssVarsProvider,
-  +   unstable_createCssVarsTheme as createCssVarsTheme,
+     unstable_createCssVarsProvider as createCssVarsProvider,
+  +  unstable_createCssVarsTheme as createCssVarsTheme,
    } from '@mui/system';
 
    const { CssVarsProvider } = createCssVarsProvider({

apps/pigment-css-next-app/package.json

@@ -23,7 +23,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@pigment-css/nextjs-plugin": "0.0.21",
+    "@pigment-css/nextjs-plugin": "0.0.22",
     "@types/node": "^20.16.5",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",

apps/pigment-css-vite-app/package.json

@@ -17,22 +17,22 @@
     "@mui/material": "workspace:^",
     "@mui/system": "workspace:^",
     "clsx": "^2.1.1",
-    "playwright": "^1.46.1",
+    "playwright": "^1.47.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.13",
-    "react-router-dom": "^6.26.1"
+    "react-router-dom": "^6.26.2"
   },
   "devDependencies": {
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
-    "@pigment-css/vite-plugin": "0.0.21",
+    "@pigment-css/vite-plugin": "0.0.22",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "postcss": "^8.4.45",
+    "postcss": "^8.4.47",
     "postcss-combine-media-query": "^1.0.1",
-    "vite": "5.4.2",
+    "vite": "5.4.5",
     "vite-plugin-pages": "^0.32.3",
     "vite-plugin-node-polyfills": "0.22.0"
   },

apps/pigment-css-vite-app/src/Slider/ZeroSlider.tsx

@@ -847,7 +847,7 @@ const Slider = React.forwardRef<HTMLSpanElement, SliderProps>(function Slider(pr
 
           let markActive;
           if (track === false) {
-            markActive = values.indexOf(mark.value) !== -1;
+            markActive = values.includes(mark.value);
           } else {
             markActive =
               (track === 'normal' &&

apps/pigment-css-vite-app/src/pages/fixtures/index.tsx

@@ -21,7 +21,7 @@ export default function Layout() {
   );
 
   const demosRoutes = (materialUIRoute?.route.children ?? []).filter(
-    (item) => !!item.path && item.path.indexOf('react-pagination') < 0,
+    (item) => !!item.path && !item.path.includes('react-pagination'),
   );
 
   return (

apps/pigment-css-vite-app/vite.config.ts

@@ -47,12 +47,4 @@ export default defineConfig({
     splitVendorChunkPlugin(),
     nodePolyfills(),
   ],
-  resolve: {
-    alias: [
-      {
-        find: /^@mui\/icons-material\/(.*)/,
-        replacement: '@mui/icons-material/esm/$1',
-      },
-    ],
-  },
 });

babel.config.js

@@ -110,8 +110,7 @@ module.exports = function getBabelConfig(api) {
           'MUI_MAJOR_VERSION',
           'MUI_MINOR_VERSION',
           'MUI_PATCH_VERSION',
-          'MUI_PRERELEASE_LABEL',
-          'MUI_PRERELEASE_NUMBER',
+          'MUI_PRERELEASE',
         ],
       },
     ],

benchmark/package.json

@@ -11,7 +11,7 @@
     "server:system": "cd ../ && cross-env NODE_ENV=production BABEL_ENV=benchmark babel-node benchmark/server/scenarios/system.js --inspect=0.0.0.0:9229 --extensions \".tsx,.ts,.js\""
   },
   "dependencies": {
-    "@babel/runtime": "^7.25.0",
+    "@babel/runtime": "^7.25.6",
     "@chakra-ui/system": "^2.6.2",
     "@emotion/react": "^11.13.3",
     "@emotion/server": "^11.11.0",
@@ -25,7 +25,7 @@
     "express": "^4.19.2",
     "fs-extra": "^11.2.0",
     "jss": "^10.10.0",
-    "playwright": "^1.46.1",
+    "playwright": "^1.47.1",
     "prop-types": "^15.8.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -34,9 +34,9 @@
     "react-redux": "^8.1.3",
     "redux": "^4.2.1",
     "serve-handler": "^6.1.5",
-    "styled-components": "^6.1.12",
+    "styled-components": "^6.1.13",
     "styled-system": "^5.1.5",
     "theme-ui": "^0.16.2",
-    "webpack": "^5.93.0"
+    "webpack": "^5.94.0"
   }
 }

docs/data/base/components/autocomplete/AutocompleteIntroduction/css/index.js

@@ -72,7 +72,6 @@ const Autocomplete = React.forwardRef(function Autocomplete(props, ref) {
             <ClearIcon />
           </Button>
         )}
-
         <Button
           {...getPopupIndicatorProps()}
           className={clsx(

docs/data/base/components/autocomplete/AutocompleteIntroduction/system/index.js

@@ -57,7 +57,6 @@ const Autocomplete = React.forwardRef(function Autocomplete(props, ref) {
             <ClearIcon />
           </StyledClearIndicator>
         )}
-
         <StyledPopupIndicator
           {...getPopupIndicatorProps()}
           className={popupOpen ? 'popupOpen' : undefined}

docs/data/base/components/autocomplete/AutocompleteIntroduction/tailwind/index.js

@@ -69,7 +69,6 @@ const Autocomplete = React.forwardRef(function Autocomplete(props, ref) {
             <ClearIcon className="translate-y-[2px] scale-90" />
           </Button>
         )}
-
         <Button
           {...getPopupIndicatorProps()}
           className="self-center outline-0 shadow-none border-0 py-0 px-0.5 rounded-[4px] bg-transparent hover:bg-violet-100 dark:hover:bg-gray-700 hover:cursor-pointer"

docs/data/base/components/focus-trap/PortalFocusTrap.js

@@ -38,7 +38,6 @@ export default function PortalFocusTrap() {
           </Box>
         </FocusTrap>
       )}
-
       <div ref={setContainer} />
     </Box>
   );