From 4fd86d9bd9fe04fe5f323d9da559b04d0356a176 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 17:34:33 +0530 Subject: [PATCH 1/4] Bump next to 14.2.21 [SECURITY] (#44938) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/bundling/fixtures/next-webpack4/package.json | 2 +- test/bundling/fixtures/next-webpack5/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/bundling/fixtures/next-webpack4/package.json b/test/bundling/fixtures/next-webpack4/package.json index 25d9767b408558..d4f94b7e064b4e 100644 --- a/test/bundling/fixtures/next-webpack4/package.json +++ b/test/bundling/fixtures/next-webpack4/package.json @@ -17,7 +17,7 @@ "@mui/styles": "workspace:*", "@mui/system": "workspace:*", "@mui/utils": "workspace:*", - "next": "14.2.15", + "next": "14.2.21", "react": "^17.0.2", "react-dom": "^17.0.2", "react-is": "^17.0.2" diff --git a/test/bundling/fixtures/next-webpack5/package.json b/test/bundling/fixtures/next-webpack5/package.json index 5c70b1c6954ccb..93c23a686552f7 100644 --- a/test/bundling/fixtures/next-webpack5/package.json +++ b/test/bundling/fixtures/next-webpack5/package.json @@ -16,7 +16,7 @@ "@mui/styles": "workspace:*", "@mui/system": "workspace:*", "@mui/utils": "workspace:*", - "next": "14.2.15", + "next": "14.2.21", "react": "18.2.0", "react-dom": "18.2.0", "react-is": "18.2.0" From 6749c87fcddfc1e0ed21cfe9020497461691bc16 Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Wed, 8 Jan 2025 15:45:51 +0100 Subject: [PATCH 2/4] [docs] Remove misleading messaging on MD3 support (#44953) --- docs/data/material/getting-started/overview/overview.md | 3 +-- docs/src/components/productMaterial/MaterialEnd.tsx | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/data/material/getting-started/overview/overview.md b/docs/data/material/getting-started/overview/overview.md index 62406390415e2f..4dc5721b2d857d 100644 --- a/docs/data/material/getting-started/overview/overview.md +++ b/docs/data/material/getting-started/overview/overview.md @@ -14,8 +14,7 @@ It includes a comprehensive collection of prebuilt components that are ready for :::info Material UI v6 supports Material Design 2. -Adoption of Material Design 3 is tentatively planned for a future Material UI version. -You can follow [this GitHub issue](https://github.com/mui/material-ui/issues/29345) for future updates. +You can follow [this GitHub issue](https://github.com/mui/material-ui/issues/29345) for future design-related updates. ::: ## Advantages of Material UI diff --git a/docs/src/components/productMaterial/MaterialEnd.tsx b/docs/src/components/productMaterial/MaterialEnd.tsx index f38fcdae423c17..6b4ad3486d9f5f 100644 --- a/docs/src/components/productMaterial/MaterialEnd.tsx +++ b/docs/src/components/productMaterial/MaterialEnd.tsx @@ -103,16 +103,11 @@ export default function MaterialEnd({ noFaq }: MaterialEndProps) { Does it support Material Design 3? - The adoption of Material Design 3 is tentatively planned for Material UI v7. See - the{' '} - - the release schedule - {' '} - and follow{' '} + Material UI currently adopts Material Design 2. You can follow{' '} this GitHub issue {' '} - for future updates. + for future design-related updates. From 5e1aa337020d59fd3d562f3fe7dc99013b1f9b8e Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Wed, 8 Jan 2025 16:53:48 +0100 Subject: [PATCH 3/4] [figma] Clarify that Material UI Sync plugin is experimental (#44975) --- .../material-ui-sync/material-ui-sync.md | 13 +++++++------ docs/data/material/pages.ts | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md b/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md index f276b65d589d93..7a6294d42f8844 100644 --- a/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md +++ b/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md @@ -1,18 +1,19 @@ -# Material UI Sync plugin +# Material UI Sync plugin 🧪

Sync is a Figma plugin that generates Material UI themes directly from design to code.

+:::warning +This plugin is experimental. +::: + ## Introduction [Material UI Sync](https://www.figma.com/community/plugin/1336346114713490235/material-ui-sync) is a Figma plugin that lets you generate a theme from the [Material UI for Figma Design Kit](https://www.figma.com/community/file/912837788133317724/material-ui-for-figma-and-mui-x). -:::warning -Sync works in combination with the [Material UI for Figma Design Kit v5.16.0](https://github.com/mui/mui-design-kits/releases) and later. -Other kits, such as the Joy UI Design Kit, are not supported yet. -::: - Customizing the Material UI Switch component in Figma with the Sync plugin running. +Sync works in combination with the [Material UI for Figma Design Kit v5.16.0](https://github.com/mui/mui-design-kits/releases) and later. + ## Running the plugin If you don't have the [complete and latest version](/store/items/figma-react/) of the Material UI for Figma Design Kit installed, you can test the plugin by using the [Community version](https://www.figma.com/community/file/912837788133317724/material-ui-for-figma-and-mui-x) instead. diff --git a/docs/data/material/pages.ts b/docs/data/material/pages.ts index bcbfcebc05f48f..0d40d59337f672 100644 --- a/docs/data/material/pages.ts +++ b/docs/data/material/pages.ts @@ -373,7 +373,7 @@ const pages: MuiPage[] = [ { pathname: '/material-ui/design-resources/material-ui-sync', title: 'Figma Sync plugin', - beta: true, + unstable: true, }, ], }, From 03325351a4c3a7b1ef9adbb7ad49a5caa39559a9 Mon Sep 17 00:00:00 2001 From: Diego Andai Date: Wed, 8 Jan 2025 14:29:49 -0300 Subject: [PATCH 4/4] [core] Remove Suspense and clock mocking from regressions and e2e tests (#44935) --- test/e2e/TestViewer.js | 8 +++---- test/regressions/TestViewer.js | 43 +++++++++++++--------------------- 2 files changed, 19 insertions(+), 32 deletions(-) diff --git a/test/e2e/TestViewer.js b/test/e2e/TestViewer.js index 09c21fd4d7f755..7b9db57d1b49fe 100644 --- a/test/e2e/TestViewer.js +++ b/test/e2e/TestViewer.js @@ -13,11 +13,9 @@ function TestViewer(props) { }, []); return ( - }> -
- {children} -
- +
+ {children} +
); } diff --git a/test/regressions/TestViewer.js b/test/regressions/TestViewer.js index f261809e3c69b0..5d945bac91f2c8 100644 --- a/test/regressions/TestViewer.js +++ b/test/regressions/TestViewer.js @@ -1,6 +1,5 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import { useFakeTimers } from 'sinon'; import Box from '@mui/material/Box'; import GlobalStyles from '@mui/material/GlobalStyles'; import JoyBox from '@mui/joy/Box'; @@ -29,13 +28,6 @@ function TestViewer(props) { document.fonts.addEventListener('loading', handleFontsEvent); document.fonts.addEventListener('loadingdone', handleFontsEvent); - // Use a "real timestamp" so that we see a useful date instead of "00:00" - // TODO: uncomment once we enable eslint-plugin-react-compiler // eslint-disable-next-line react-compiler/react-compiler -- useFakeTimers is not a React hook - // eslint-disable-next-line react-hooks/rules-of-hooks -- not a React hook - const clock = useFakeTimers({ - now: new Date('Mon Aug 18 14:11:54 2014 -0500'), - toFake: ['Date'], - }); // In case the child triggered font fetching we're not ready yet. // The fonts event handler will mark the test as ready on `loadingdone` if (document.fonts.status === 'loaded') { @@ -45,7 +37,6 @@ function TestViewer(props) { return () => { document.fonts.removeEventListener('loading', handleFontsEvent); document.fonts.removeEventListener('loadingdone', handleFontsEvent); - clock.restore(); }; }, []); @@ -76,29 +67,27 @@ function TestViewer(props) { }, }} /> - }> - {window.location.pathname.startsWith('/docs-joy') ? ( - - - {children} - - - ) : ( - + {children} - - )} - + + + ) : ( + + {children} + + )} ); }