Merge branch 'master' into colors-inherit-fix

Author: sai6855

.circleci/config.yml

@@ -240,6 +240,8 @@ module.exports = {
     'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
     'lines-around-directive': 'off',
     ...(ENABLE_REACT_COMPILER_PLUGIN ? { 'react-compiler/react-compiler': 'error' } : {}),
+    // Prevent the use of `e` as a shorthand for `event`, `error`, etc.
+    'id-denylist': ['error', 'e'],
   },
   overrides: [
     {

.eslintrc.js

@@ -43,3 +43,4 @@ docs/public/static/blog/feed/*
 .nx/cache
 .nx/workspace-data
 screenshots
+packed

.gitignore

@@ -823,7 +823,7 @@ This release was mostly about 🐛 bug fixes and 📚 documentation improvements
 - [blog] Add post about upcoming plans for Base UI (#40882) @danilo-leal
 - [core] Simplify CodeSandbox reproduction @oliviertassinari
 - [core] Missing redirection @oliviertassinari
-- [core] Export functions from `copyFiles` script to reuse in MUI X repo (#40970) @cherniavskii
+- [core] Export functions from `copyFiles` script to reuse in MUI X repo (#40970) @cherniavskii
 - [core] Avoid variable shorthands @oliviertassinari
 - [docs-infra] Fix search icon issue (#40957) @oliviertassinari
 - [docs-infra] Ignore classes tagged with `@ignore` (#41009) @cherniavskii
@@ -1013,7 +1013,7 @@ This release was mostly about 🐛 bug fixes and 📚 documentation improvements
 - &#8203;<!-- 54 -->[website] Move `React Engineer - X` into the future roles section (#40867) @DanailH
 - &#8203;<!-- 52 -->[material-ui][test][Alert] Add action, icon, and iconMapping tests (#40682) @DiegoAndai
 - &#8203;<!-- 45 -->[blog] Lint duplicate h1 on the page (#40835) @oliviertassinari
-- &#8203;<!-- 44 -->[blog] MUI X v7 beta announcement blogpost (#40784) @joserodolfofreitas
+- &#8203;<!-- 44 -->[blog] MUI X v7 beta announcement blogpost (#40784) @joserodolfofreitas
 - &#8203;<!-- 43 -->[code-infra] Remove custom TS installation script (#40636) @michaldudak
 - &#8203;<!-- 42 -->[code-infra] Correct API Docs Builder dependencies (#40775) @michaldudak
 - &#8203;<!-- 41 -->[code-infra] Migrate to prettier async APIs (#40668) @Janpot

CHANGELOG.old.md

@@ -27,7 +27,7 @@
     "@types/node": "^20.16.5",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "typescript": "^5.5.4"
   },
   "nx": {

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

@@ -17,7 +17,7 @@
     "@mui/system": "workspace:^",
     "@mui/utils": "workspace:^",
     "clsx": "^2.1.1",
-    "playwright": "^1.47.1",
+    "playwright": "^1.47.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.13",
@@ -34,7 +34,7 @@
     "@vitejs/plugin-react": "^4.3.1",
     "postcss": "^8.4.47",
     "postcss-combine-media-query": "^1.0.1",
-    "vite": "5.4.6",
+    "vite": "5.4.8",
     "vite-plugin-node-polyfills": "0.22.0",
     "vite-plugin-pages": "^0.32.3"
   },

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

@@ -17,9 +17,7 @@ export default function Layout() {
   );
 
   const demo = new URLSearchParams(location.search).get('demo');
-  const fixturesRoutes = (matchedRoute?.route.children ?? []).filter(
-    (item) => !!item.path && item.path !== 'index.test',
-  );
+  const fixturesRoutes = (matchedRoute?.route.children ?? []).filter((item) => !!item.path);
 
   const demosRoutes = (materialUIRoute?.route.children ?? []).filter(
     (item) => !!item.path && !item.path.includes('react-pagination'),

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

@@ -43,8 +43,10 @@ export default defineConfig({
       sourceMap: true,
       displayName: true,
     }),
-    Pages(),
     splitVendorChunkPlugin(),
+    Pages({
+      exclude: ['**/*.test.*'],
+    }),
     nodePolyfills(),
   ],
 });

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

@@ -25,7 +25,7 @@
     "express": "^4.19.2",
     "fs-extra": "^11.2.0",
     "jss": "^10.10.0",
-    "playwright": "^1.47.1",
+    "playwright": "^1.47.2",
     "prop-types": "^15.8.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -37,6 +37,6 @@
     "styled-components": "^6.1.13",
     "styled-system": "^5.1.5",
     "theme-ui": "^0.16.2",
-    "webpack": "^5.94.0"
+    "webpack": "^5.95.0"
   }
 }

benchmark/package.json

@@ -124,7 +124,7 @@ const StyledBackdrop = styled(Backdrop)`
 `;
 
 const style = {
-  position: 'absolute' as 'absolute',
+  position: 'absolute',
   top: '50%',
   left: '50%',
   transform: 'translate(-50%, -50%)',