Merge branch 'master' into deprecated-menu-props

Author: sai6855

.circleci/config.yml

@@ -72,7 +72,6 @@ commands:
           name: Set npm registry public signing keys
           command: |
             echo "export COREPACK_INTEGRITY_KEYS='$(curl https://registry.npmjs.org/-/npm/v1/keys | jq -c '{npm: .keys}')'" >> $BASH_ENV
-
       - when:
           condition: << parameters.browsers >>
           steps:
@@ -87,59 +86,31 @@ commands:
                 name: Install pnpm package manager
                 # See https://stackoverflow.com/a/73411601
                 command: corepack enable --install-directory ~/bin
-
       - run:
           name: View install environment
           command: |
             node --version
             pnpm --version
-
   install_js:
     parameters:
       browsers:
         type: boolean
         default: false
         description: 'Set to true if you intend to any browser (for example with playwright).'
-
     steps:
       - setup_corepack:
           browsers: << parameters.browsers >>
-
       - run:
           name: Resolve React version
           command: |
             pnpm use-react-version
             # log a patch for maintainers who want to check out this change
             git --no-pager diff HEAD
-
       - run:
           name: Install js dependencies
           command: pnpm install
 
 jobs:
-  checkout:
-    <<: *default-job
-    steps:
-      - checkout
-      - install_js
-      - when:
-          # Install can be "dirty" when running with non-default versions of React
-          condition:
-            equal: [<< parameters.react-version >>, stable]
-          steps:
-            - run:
-                name: Should not have any git not staged
-                command: git add -A && git diff --exit-code --staged
-            - run:
-                name: '`pnpm dedupe` was run?'
-                command: |
-                  # #target-branch-reference
-                  if [[ $(git diff --name-status master | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
-                  then
-                      echo "No changes to dependencies detected. Skipping..."
-                  else
-                      pnpm dedupe --check
-                  fi
   test_unit:
     <<: *default-job
     steps:
@@ -204,6 +175,16 @@ jobs:
     steps:
       - checkout
       - install_js
+      - run:
+          name: '`pnpm dedupe` was run?'
+          command: |
+            # #target-branch-reference
+            if [[ $(git diff --name-status master | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
+            then
+                echo "No changes to dependencies detected. Skipping..."
+            else
+                pnpm dedupe --check
+            fi
       - run:
           name: '`pnpm prettier` changes committed?'
           command: pnpm prettier --check
@@ -264,7 +245,7 @@ jobs:
             git add -f packages/mui-material/build || echo '/material declarations do not exist'
             git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
             git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
-            pnpm -r build:stable && pnpm -r build:types  
+            pnpm -r build:stable && pnpm -r build:types
             git --no-pager diff
       - run:
           name: Any defect declaration files?
@@ -298,14 +279,12 @@ jobs:
             set +e
             pnpm typescript:ci
             exit 0
-
       - restore_cache:
           name: Restore generated declaration files
           keys:
             # We assume that the target branch is `next` and that declaration files are persisted in commit order.
             # "If there are multiple matches, the most recently generated cache will be used."
             - typescript-declaration-files-next
-
       - run:
           name: Diff declaration files
           command: |
@@ -314,7 +293,6 @@ jobs:
             git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
             pnpm -r build:types
             git --no-pager diff
-
       - run:
           name: Log defect declaration files
           command: |
@@ -444,7 +422,6 @@ jobs:
           root: packed
           paths:
             - '*'
-
   test_bundling_node_cjs:
     <<: *default-job
     working_directory: /tmp/material-ui/test/bundling/fixtures/node-cjs/
@@ -604,7 +581,6 @@ jobs:
       - run:
           name: Test fixture
           command: pnpm start
-
   test_bundle_size_monitor:
     <<: *default-job
     steps:
@@ -691,51 +667,28 @@ workflows:
     when:
       equal: [pipeline, << pipeline.parameters.workflow >>]
     jobs:
-      - checkout:
-          <<: *default-context
       - test_unit:
           <<: *default-context
-          requires:
-            - checkout
       - test_lint:
           <<: *default-context
-          requires:
-            - checkout
       - test_static:
           <<: *default-context
-          requires:
-            - checkout
       - test_types:
           <<: *default-context
-          requires:
-            - checkout
       - test_browser:
           <<: *default-context
-          requires:
-            - checkout
       - test_regressions:
           <<: *default-context
-          requires:
-            - checkout
       - test_e2e:
           <<: *default-context
-          requires:
-            - checkout
       - test_bundle_size_monitor:
           <<: *default-context
-          requires:
-            - checkout
   e2e-website:
     when:
       equal: [e2e-website, << pipeline.parameters.workflow >>]
     jobs:
-      - checkout:
-          <<: *default-context
       - test_e2e_website:
           <<: *default-context
-          requires:
-            - checkout
-
   bundling:
     when:
       equal: [bundling, << pipeline.parameters.workflow >>]
@@ -778,7 +731,6 @@ workflows:
           <<: *default-context
           requires:
             - test_bundling_prepare
-
   profile:
     when:
       equal: [profile, << pipeline.parameters.workflow >>]

.github/workflows/ci-check.yml

@@ -6,7 +6,10 @@ name: CI Check
 on:
   push:
     branches-ignore:
+      # Renovate branches are always Pull Requests.
+      # We don't need to run CI twice (push+pull_request)
       - 'renovate/**'
+      - 'dependabot/**'
   pull_request:
     paths:
       - 'docs/**'

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
       # Renovate branches are always Pull Requests.
       # We don't need to run CI twice (push+pull_request)
       - 'renovate/**'
+      - 'dependabot/**'
   pull_request:
     paths-ignore:
       # should sync with ci-check.yml as a workaround to bypass github checks
@@ -16,6 +17,8 @@ permissions: {}
 jobs:
   continuous-releases:
     runs-on: ubuntu-latest
+    # do not run on forks
+    if: github.repository == 'mui/material-ui'
     steps:
       - run: echo "${{ github.actor }}"
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

SECURITY.md

@@ -6,7 +6,8 @@ The versions of the project that are currently supported with security updates.
 
 | Material UI version | Release    | Supported                            |
 | ------------------: | :--------- | :----------------------------------- |
-|              ^6.0.0 | 2024-08-26 | :white_check_mark: Stable major      |
+|              ^7.0.0 | 2025-03-26 | :white_check_mark: Stable major      |
+|              ^6.0.0 | 2024-08-26 | :white_check_mark: Long-term support |
 |              ^5.0.0 | 2021-09-16 | :white_check_mark: Long-term support |
 |              ^4.0.0 | 2019-06-23 | :x:                                  |
 |              ^3.0.0 | 2018-08-27 | :x:                                  |

apps/bare-next-app/package.json

@@ -23,9 +23,9 @@
   },
   "devDependencies": {
     "@pigment-css/nextjs-plugin": "0.0.30",
-    "@types/node": "^20.17.32",
-    "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.3",
+    "@types/node": "^20.17.46",
+    "@types/react": "^19.1.4",
+    "@types/react-dom": "^19.1.4",
     "eslint": "^8.57.1",
     "typescript": "^5.8.3"
   },

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

@@ -22,9 +22,9 @@
   },
   "devDependencies": {
     "@pigment-css/nextjs-plugin": "0.0.30",
-    "@types/node": "^20.17.32",
-    "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.3",
+    "@types/node": "^20.17.46",
+    "@types/react": "^19.1.4",
+    "@types/react-dom": "^19.1.4",
     "eslint": "^8.57.1",
     "typescript": "^5.8.3"
   },

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

@@ -27,8 +27,8 @@
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@pigment-css/vite-plugin": "0.0.30",
-    "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.3",
+    "@types/react": "^19.1.4",
+    "@types/react-dom": "^19.1.4",
     "@types/webfontloader": "^1.6.38",
     "@vitejs/plugin-react": "^4.4.1",
     "postcss": "^8.5.3",

docs/data/material/discover-more/related-projects/related-projects.md

@@ -7,28 +7,11 @@ The MUI org and developers from the community have built some excellent supplem
 Do you have a project that you think should be featured here?
 Feel free to submit a pull request and the maintainers will work with you to write the description.
 
-## Third-party app starters
-
-### Admin frameworks
+## Third-party admin frameworks
 
 - [React-admin](https://github.com/marmelab/react-admin): A front-end framework for building data-driven applications running in the browser on top of REST/GraphQL APIs.
 - [Refine](https://github.com/refinedev/refine): An open source, headless React meta-framework for the rapid development of web applications.
 
-### Paid starters
-
-- [Divjoy](https://divjoy.com?via=material-ui):
-
-  - Create a Material UI app in minutes.
-  - Templates, authentication, database integration, subscription payments, and more.
-
-- [ScaffoldHub](https://v2.scaffoldhub.io/scaffolds/react-material-ui?partner=1):
-  - Tool for building web applications.
-  - Choose your framework and library (React with Material UI).
-  - Choose your database (SQL, MongoDB or Firestore).
-  - Model your database and application with the intuitive GUI.
-  - Generate your application, including a complete scaffolded backend.
-  - Preview your application online and download the generated code.
-
 ## Third-party theming tools
 
 - [Material palette generator](https://m2.material.io/inline-tools/color/): The official Material Design 2 palette generator tool.

docs/data/material/migration/upgrade-to-v6/upgrade-to-v6.md

@@ -88,6 +88,63 @@ yarn add react@<version> react-dom@<version>
 
 </codeblock>
 
+### React 18 and below
+
+If you are using React 18 or below, you need to set up a resolution of `react-is` package to the same version as the `react` you are using.
+
+For example, if you are using `[email protected]`, do the following steps:
+
+1. Install `[email protected]`.
+
+<codeblock storageKey="package-manager">
+
+```bash npm
+npm install [email protected]
+```
+
+```bash pnpm
+pnpm add [email protected]
+```
+
+```bash yarn
+yarn add [email protected]
+```
+
+</codeblock>
+
+2. Set the resolutions or overrides in the `package.json`.
+
+<codeblock storageKey="package-manager">
+
+```json npm
+{
+  …
+  "overrides": {
+    "react-is": "^18.3.1"
+  }
+}
+```
+
+```json pnpm
+{
+  …
+  "overrides": {
+    "react-is": "^18.3.1"
+  }
+}
+```
+
+```json yarn
+{
+  …
+  "resolutions": {
+    "react-is": "^18.3.1"
+  }
+}
+```
+
+</codeblock>
+
 ### Minimum TypeScript version
 
 The minimum supported version of TypeScript has been increased from v3.5 to 4.7.