From e521552e44e2bf3039670f2542515ed123579107 Mon Sep 17 00:00:00 2001 From: alexandre Date: Mon, 15 Jul 2024 17:43:07 +0200 Subject: [PATCH 01/19] [docs-infra] Move ads to the @mui/docs package --- docs/src/modules/components/ApiPage.js | 3 +-- docs/src/modules/components/AppLayoutDocs.js | 14 +++++++------- docs/src/modules/components/MarkdownDocs.js | 3 +-- docs/src/modules/components/MarkdownDocsV2.js | 3 +-- .../components => packages/mui-docs/src/Ad}/Ad.tsx | 8 ++++---- .../mui-docs/src/Ad}/AdCarbon.tsx | 4 ++-- .../mui-docs/src/Ad}/AdDisplay.tsx | 10 +++++----- .../mui-docs/src/Ad}/AdGuest.tsx | 2 +- .../mui-docs/src/Ad}/AdInHouse.tsx | 4 ++-- .../mui-docs/src/Ad}/AdManager.tsx | 0 .../mui-docs/src/Ad}/ad.styles.ts | 2 +- packages/mui-docs/src/Ad/index.ts | 3 +++ 12 files changed, 28 insertions(+), 28 deletions(-) rename {docs/src/modules/components => packages/mui-docs/src/Ad}/Ad.tsx (96%) rename {docs/src/modules/components => packages/mui-docs/src/Ad}/AdCarbon.tsx (96%) rename {docs/src/modules/components => packages/mui-docs/src/Ad}/AdDisplay.tsx (92%) rename {docs/src/modules/components => packages/mui-docs/src/Ad}/AdGuest.tsx (93%) rename {docs/src/modules/components => packages/mui-docs/src/Ad}/AdInHouse.tsx (61%) rename {docs/src/modules/components => packages/mui-docs/src/Ad}/AdManager.tsx (100%) rename {docs/src/modules/components => packages/mui-docs/src/Ad}/ad.styles.ts (97%) create mode 100644 packages/mui-docs/src/Ad/index.ts diff --git a/docs/src/modules/components/ApiPage.js b/docs/src/modules/components/ApiPage.js index abb59ef7b7df7f..d0515266588688 100644 --- a/docs/src/modules/components/ApiPage.js +++ b/docs/src/modules/components/ApiPage.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { exactProp } from '@mui/utils'; import Typography from '@mui/material/Typography'; import Alert from '@mui/material/Alert'; -import AdGuest from 'docs/src/modules/components/AdGuest'; +import { Ad, AdGuest } from '@mui/docs/Ad'; import VerifiedRoundedIcon from '@mui/icons-material/VerifiedRounded'; import WarningRoundedIcon from '@mui/icons-material/WarningRounded'; import { useTranslate, useUserLanguage } from '@mui/docs/i18n'; @@ -13,7 +13,6 @@ import { BrandingProvider } from '@mui/docs/branding'; import { SectionTitle } from '@mui/docs/SectionTitle'; import { MarkdownElement } from '@mui/docs/MarkdownElement'; import AppLayoutDocs from 'docs/src/modules/components/AppLayoutDocs'; -import Ad from 'docs/src/modules/components/Ad'; import PropertiesSection, { getPropsToC, } from 'docs/src/modules/components/ApiPage/sections/PropertiesSection'; diff --git a/docs/src/modules/components/AppLayoutDocs.js b/docs/src/modules/components/AppLayoutDocs.js index c711ea40973774..5b700a3b49443e 100644 --- a/docs/src/modules/components/AppLayoutDocs.js +++ b/docs/src/modules/components/AppLayoutDocs.js @@ -4,20 +4,20 @@ import { useRouter } from 'next/router'; import { styled } from '@mui/material/styles'; import { exactProp } from '@mui/utils'; import GlobalStyles from '@mui/material/GlobalStyles'; +import { + AdManager, + AD_MARGIN_TOP, + AD_HEIGHT, + AD_HEIGHT_MOBILE, + AD_MARGIN_BOTTOM, +} from '@mui/docs/Ad'; import Head from 'docs/src/modules/components/Head'; import AppFrame from 'docs/src/modules/components/AppFrame'; import AppContainer from 'docs/src/modules/components/AppContainer'; import AppTableOfContents from 'docs/src/modules/components/AppTableOfContents'; -import AdManager from 'docs/src/modules/components/AdManager'; import AppLayoutDocsFooter from 'docs/src/modules/components/AppLayoutDocsFooter'; import BackToTop from 'docs/src/modules/components/BackToTop'; import getProductInfoFromUrl from 'docs/src/modules/utils/getProductInfoFromUrl'; -import { - AD_MARGIN_TOP, - AD_HEIGHT, - AD_HEIGHT_MOBILE, - AD_MARGIN_BOTTOM, -} from 'docs/src/modules/components/Ad'; import { convertProductIdToName } from 'docs/src/modules/components/AppSearch'; const TOC_WIDTH = 242; diff --git a/docs/src/modules/components/MarkdownDocs.js b/docs/src/modules/components/MarkdownDocs.js index 5d1dc61a55b3c8..921451a9a7af93 100644 --- a/docs/src/modules/components/MarkdownDocs.js +++ b/docs/src/modules/components/MarkdownDocs.js @@ -4,13 +4,12 @@ import { useRouter } from 'next/router'; import { useTheme } from '@mui/system'; import { exactProp } from '@mui/utils'; import { CssVarsProvider as JoyCssVarsProvider, useColorScheme } from '@mui/joy/styles'; +import { Ad, AdGuest } from '@mui/docs/Ad'; import RichMarkdownElement from 'docs/src/modules/components/RichMarkdownElement'; import { pathnameToLanguage } from 'docs/src/modules/utils/helpers'; import AppLayoutDocs from 'docs/src/modules/components/AppLayoutDocs'; import { useUserLanguage } from '@mui/docs/i18n'; import { BrandingProvider } from '@mui/docs/branding'; -import Ad from 'docs/src/modules/components/Ad'; -import AdGuest from 'docs/src/modules/components/AdGuest'; function JoyModeObserver({ mode }) { const { setMode } = useColorScheme(); diff --git a/docs/src/modules/components/MarkdownDocsV2.js b/docs/src/modules/components/MarkdownDocsV2.js index cef3c473ccc059..ff7ac4047ce39a 100644 --- a/docs/src/modules/components/MarkdownDocsV2.js +++ b/docs/src/modules/components/MarkdownDocsV2.js @@ -5,6 +5,7 @@ import kebabCase from 'lodash/kebabCase'; import { useTheme } from '@mui/system'; import { exactProp } from '@mui/utils'; import { CssVarsProvider as JoyCssVarsProvider, useColorScheme } from '@mui/joy/styles'; +import { Ad, AdGuest } from '@mui/docs/Ad'; import ComponentsApiContent from 'docs/src/modules/components/ComponentsApiContent'; import HooksApiContent from 'docs/src/modules/components/HooksApiContent'; import { getTranslatedHeader as getComponentTranslatedHeader } from 'docs/src/modules/components/ApiPage'; @@ -13,10 +14,8 @@ import { pathnameToLanguage } from 'docs/src/modules/utils/helpers'; import AppLayoutDocs from 'docs/src/modules/components/AppLayoutDocs'; import { useTranslate, useUserLanguage } from '@mui/docs/i18n'; import { BrandingProvider } from '@mui/docs/branding'; -import Ad from 'docs/src/modules/components/Ad'; import { HEIGHT as AppFrameHeight } from 'docs/src/modules/components/AppFrame'; import { HEIGHT as TabsHeight } from 'docs/src/modules/components/ComponentPageTabs'; -import AdGuest from 'docs/src/modules/components/AdGuest'; import { getPropsToC } from 'docs/src/modules/components/ApiPage/sections/PropertiesSection'; import { getClassesToC } from 'docs/src/modules/components/ApiPage/sections/ClassesSection'; diff --git a/docs/src/modules/components/Ad.tsx b/packages/mui-docs/src/Ad/Ad.tsx similarity index 96% rename from docs/src/modules/components/Ad.tsx rename to packages/mui-docs/src/Ad/Ad.tsx index b94043f4cfdf69..8eab301ee79b28 100644 --- a/docs/src/modules/components/Ad.tsx +++ b/packages/mui-docs/src/Ad/Ad.tsx @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import Typography from '@mui/material/Typography'; import Box from '@mui/material/Box'; import Paper from '@mui/material/Paper'; -import AdCarbon from 'docs/src/modules/components/AdCarbon'; -import AdInHouse from 'docs/src/modules/components/AdInHouse'; -import { AdContext, adShape } from 'docs/src/modules/components/AdManager'; -import { useTranslate } from '@mui/docs/i18n'; +import { useTranslate } from '../i18n'; +import AdCarbon from './AdCarbon'; +import AdInHouse from './AdInHouse'; +import { AdContext, adShape } from './AdManager'; function PleaseDisableAdblock() { const t = useTranslate(); diff --git a/docs/src/modules/components/AdCarbon.tsx b/packages/mui-docs/src/Ad/AdCarbon.tsx similarity index 96% rename from docs/src/modules/components/AdCarbon.tsx rename to packages/mui-docs/src/Ad/AdCarbon.tsx index cf39fdc5b7c431..3043bc5b5eb0cd 100644 --- a/docs/src/modules/components/AdCarbon.tsx +++ b/packages/mui-docs/src/Ad/AdCarbon.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { styled } from '@mui/material/styles'; import loadScript from 'docs/src/modules/utils/loadScript'; -import AdDisplay from 'docs/src/modules/components/AdDisplay'; -import { adStylesObject } from 'docs/src/modules/components/ad.styles'; +import AdDisplay from './AdDisplay'; +import { adStylesObject } from './ad.styles'; type CarbonAd = { pixel: string; diff --git a/docs/src/modules/components/AdDisplay.tsx b/packages/mui-docs/src/Ad/AdDisplay.tsx similarity index 92% rename from docs/src/modules/components/AdDisplay.tsx rename to packages/mui-docs/src/Ad/AdDisplay.tsx index 21eddc2246e4ac..7f472585455473 100644 --- a/docs/src/modules/components/AdDisplay.tsx +++ b/packages/mui-docs/src/Ad/AdDisplay.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { styled } from '@mui/material/styles'; -import { adShape } from 'docs/src/modules/components/AdManager'; -import { adStylesObject } from 'docs/src/modules/components/ad.styles'; -import { useTranslate } from '@mui/docs/i18n'; +import { useTranslate } from '../i18n'; +import { adShape } from './AdManager'; +import { adStylesObject } from './ad.styles'; const InlineShape = styled('span')(({ theme }) => { const styles = adStylesObject['body-inline'](theme); @@ -31,7 +31,7 @@ const ImageShape = styled('span')(({ theme }) => { }; }); -export interface Ad { +export interface AdParameters { name: string; link: string; img?: string; @@ -40,7 +40,7 @@ export interface Ad { label: string; } interface AdDisplayProps { - ad: Ad; + ad: AdParameters; className?: string; shape?: 'auto' | 'inline' | 'image'; } diff --git a/docs/src/modules/components/AdGuest.tsx b/packages/mui-docs/src/Ad/AdGuest.tsx similarity index 93% rename from docs/src/modules/components/AdGuest.tsx rename to packages/mui-docs/src/Ad/AdGuest.tsx index e97f5440952d55..4e0af831236fed 100644 --- a/docs/src/modules/components/AdGuest.tsx +++ b/packages/mui-docs/src/Ad/AdGuest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import Portal from '@mui/material/Portal'; -import { AdContext } from 'docs/src/modules/components/AdManager'; +import { AdContext } from './AdManager'; interface AdGuestProps { /** diff --git a/docs/src/modules/components/AdInHouse.tsx b/packages/mui-docs/src/Ad/AdInHouse.tsx similarity index 61% rename from docs/src/modules/components/AdInHouse.tsx rename to packages/mui-docs/src/Ad/AdInHouse.tsx index e158a53adaa8a7..fea579a0d74916 100644 --- a/docs/src/modules/components/AdInHouse.tsx +++ b/packages/mui-docs/src/Ad/AdInHouse.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import AdDisplay, { Ad } from 'docs/src/modules/components/AdDisplay'; +import AdDisplay, { AdParameters } from './AdDisplay'; -export default function AdInHouse(props: { ad: Omit }) { +export default function AdInHouse(props: { ad: Omit }) { const { ad } = props; return ; diff --git a/docs/src/modules/components/AdManager.tsx b/packages/mui-docs/src/Ad/AdManager.tsx similarity index 100% rename from docs/src/modules/components/AdManager.tsx rename to packages/mui-docs/src/Ad/AdManager.tsx diff --git a/docs/src/modules/components/ad.styles.ts b/packages/mui-docs/src/Ad/ad.styles.ts similarity index 97% rename from docs/src/modules/components/ad.styles.ts rename to packages/mui-docs/src/Ad/ad.styles.ts index dffa082eb2f157..fbbb31db0d2884 100644 --- a/docs/src/modules/components/ad.styles.ts +++ b/packages/mui-docs/src/Ad/ad.styles.ts @@ -1,5 +1,5 @@ import { alpha, Theme } from '@mui/material/styles'; -import { adShape } from 'docs/src/modules/components/AdManager'; +import { adShape } from './AdManager'; const adBodyImageStyles = (theme: Theme) => ({ root: { diff --git a/packages/mui-docs/src/Ad/index.ts b/packages/mui-docs/src/Ad/index.ts new file mode 100644 index 00000000000000..8f3b16291d5aee --- /dev/null +++ b/packages/mui-docs/src/Ad/index.ts @@ -0,0 +1,3 @@ +export * from './Ad'; +export * from './AdManager'; +export { default as AdGuest } from './AdGuest'; From 82ab27f040f3af449ff5cb7d4236b64caa795f2a Mon Sep 17 00:00:00 2001 From: alexandre Date: Mon, 15 Jul 2024 18:12:14 +0200 Subject: [PATCH 02/19] move config to provider --- docs/nextConfigDocsInfra.js | 2 -- docs/pages/_app.js | 1 + packages/mui-docs/src/Ad/Ad.tsx | 4 ++- packages/mui-docs/src/Ad/AdDisplay.tsx | 5 ++- packages/mui-docs/src/Ad/AdProvider.tsx | 34 +++++++++++++++++++ packages/mui-docs/src/Ad/index.ts | 1 + .../src/DocsProvider/DocsProvider.tsx | 11 ++++-- 7 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 packages/mui-docs/src/Ad/AdProvider.tsx diff --git a/docs/nextConfigDocsInfra.js b/docs/nextConfigDocsInfra.js index 38a637a11855a6..b5e7a45f170b9d 100644 --- a/docs/nextConfigDocsInfra.js +++ b/docs/nextConfigDocsInfra.js @@ -71,8 +71,6 @@ function withDocsInfra(nextConfig) { NETLIFY_DEPLOY_URL: process.env.DEPLOY_URL, // Name of the site, its Netlify subdomain; for example, material-ui-docs NETLIFY_SITE_NAME: process.env.SITE_NAME, - // The ratio of ads display reported to Google Analytics. Used to avoid an exceed on the Google Analytics quotas. - GA_ADS_DISPLAY_RATIO: 0.1, }, experimental: { scrollRestoration: true, diff --git a/docs/pages/_app.js b/docs/pages/_app.js index f3ce4ea59bbca7..c5047f86c1f6fd 100644 --- a/docs/pages/_app.js +++ b/docs/pages/_app.js @@ -329,6 +329,7 @@ function AppWrapper(props) { diff --git a/packages/mui-docs/src/Ad/Ad.tsx b/packages/mui-docs/src/Ad/Ad.tsx index 8eab301ee79b28..dfd56f39b7e197 100644 --- a/packages/mui-docs/src/Ad/Ad.tsx +++ b/packages/mui-docs/src/Ad/Ad.tsx @@ -7,6 +7,7 @@ import { useTranslate } from '../i18n'; import AdCarbon from './AdCarbon'; import AdInHouse from './AdInHouse'; import { AdContext, adShape } from './AdManager'; +import { useAdConfig } from './AdProvider'; function PleaseDisableAdblock() { const t = useTranslate(); @@ -197,9 +198,10 @@ export default function Ad() { }; }, [checkAdblock]); + const { GADisplayRatio } = useAdConfig(); React.useEffect(() => { // Avoid an exceed on the Google Analytics quotas. - if (Math.random() > ((process.env.GA_ADS_DISPLAY_RATIO ?? 0.1) as number) || !eventLabel) { + if (Math.random() > (GADisplayRatio ?? 0.1) || !eventLabel) { return undefined; } diff --git a/packages/mui-docs/src/Ad/AdDisplay.tsx b/packages/mui-docs/src/Ad/AdDisplay.tsx index 7f472585455473..ecb2cf70052682 100644 --- a/packages/mui-docs/src/Ad/AdDisplay.tsx +++ b/packages/mui-docs/src/Ad/AdDisplay.tsx @@ -4,6 +4,7 @@ import { styled } from '@mui/material/styles'; import { useTranslate } from '../i18n'; import { adShape } from './AdManager'; import { adStylesObject } from './ad.styles'; +import { useAdConfig } from './AdProvider'; const InlineShape = styled('span')(({ theme }) => { const styles = adStylesObject['body-inline'](theme); @@ -49,9 +50,11 @@ export default function AdDisplay(props: AdDisplayProps) { const { ad, className, shape: shapeProp = 'auto' } = props; const t = useTranslate(); + const { GADisplayRatio } = useAdConfig(); + React.useEffect(() => { // Avoid an exceed on the Google Analytics quotas. - if (Math.random() > ((process.env.GA_ADS_DISPLAY_RATIO ?? 0.1) as number) || !ad.label) { + if (Math.random() > (GADisplayRatio ?? 0.1) || !ad.label) { return; } diff --git a/packages/mui-docs/src/Ad/AdProvider.tsx b/packages/mui-docs/src/Ad/AdProvider.tsx new file mode 100644 index 00000000000000..e7bd36fe183814 --- /dev/null +++ b/packages/mui-docs/src/Ad/AdProvider.tsx @@ -0,0 +1,34 @@ +import * as React from 'react'; + +export interface AdConfig { + /** + * The ratio of "ad display" event sent to Google Analytics. + * Used to avoid an exceed on the Google Analytics quotas. + * @default 0.1 + */ + GADisplayRatio: number; +} + +export interface AdProviderProps { + children: React.ReactNode; + config?: Partial; +} + +const AdConfigContext = React.createContext(null); + +export function AdProvider(props: AdProviderProps) { + const { children, config } = props; + const value = { GADisplayRatio: 0.1, ...config }; + + return {children}; +} + +export function useAdConfig() { + const config = React.useContext(AdConfigContext); + if (!config) { + throw new Error( + 'Could not find docs ad config context value; please ensure the component is wrapped in a ', + ); + } + return config; +} diff --git a/packages/mui-docs/src/Ad/index.ts b/packages/mui-docs/src/Ad/index.ts index 8f3b16291d5aee..11a376a3d57190 100644 --- a/packages/mui-docs/src/Ad/index.ts +++ b/packages/mui-docs/src/Ad/index.ts @@ -1,3 +1,4 @@ export * from './Ad'; export * from './AdManager'; +export * from './AdProvider'; export { default as AdGuest } from './AdGuest'; diff --git a/packages/mui-docs/src/DocsProvider/DocsProvider.tsx b/packages/mui-docs/src/DocsProvider/DocsProvider.tsx index debe6afeb5a70e..4cefa6b1e3d7fc 100644 --- a/packages/mui-docs/src/DocsProvider/DocsProvider.tsx +++ b/packages/mui-docs/src/DocsProvider/DocsProvider.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import { Translations, UserLanguageProvider } from '../i18n'; +import { AdConfig, AdProvider } from '../Ad'; export interface DocsConfig { LANGUAGES: string[]; @@ -12,6 +13,7 @@ const DocsConfigContext = React.createContext(null); export interface DocsProviderProps { config: DocsConfig; + adConfig?: Partial; defaultUserLanguage: string; children?: React.ReactNode; translations?: Translations; @@ -19,15 +21,18 @@ export interface DocsProviderProps { export function DocsProvider({ config, + adConfig, defaultUserLanguage, translations, children, }: DocsProviderProps) { return ( - - {children} - + + + {children} + + ); } From e402e166aece4aee9adca0435ea3556d4306a0c1 Mon Sep 17 00:00:00 2001 From: alexandre Date: Tue, 16 Jul 2024 09:20:23 +0200 Subject: [PATCH 03/19] fix effect --- packages/mui-docs/src/Ad/Ad.tsx | 4 ++-- packages/mui-docs/src/Ad/AdDisplay.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mui-docs/src/Ad/Ad.tsx b/packages/mui-docs/src/Ad/Ad.tsx index dfd56f39b7e197..51491762549ae1 100644 --- a/packages/mui-docs/src/Ad/Ad.tsx +++ b/packages/mui-docs/src/Ad/Ad.tsx @@ -121,7 +121,7 @@ function isBot() { return /bot|googlebot|crawler|spider|robot|crawling/i.test(navigator.userAgent); } -export default function Ad() { +export function Ad() { const [adblock, setAdblock] = React.useState(null); const [carbonOut, setCarbonOut] = React.useState(null); @@ -215,7 +215,7 @@ export default function Ad() { return () => { clearTimeout(delay); }; - }, [eventLabel]); + }, [GADisplayRatio, eventLabel]); return ( Date: Tue, 16 Jul 2024 09:23:29 +0200 Subject: [PATCH 04/19] backawrd compatibilty and export cleaning --- docs/src/modules/components/Ad.tsx | 4 ++++ packages/mui-docs/src/Ad/AdGuest.tsx | 6 ++++-- packages/mui-docs/src/Ad/index.ts | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 docs/src/modules/components/Ad.tsx diff --git a/docs/src/modules/components/Ad.tsx b/docs/src/modules/components/Ad.tsx new file mode 100644 index 00000000000000..97743c99229f57 --- /dev/null +++ b/docs/src/modules/components/Ad.tsx @@ -0,0 +1,4 @@ +// Backwards compatibility for Toolpad. +// TODO: remove when Toolpad migrated to `@mui/docs/i18n` + +export { Ad as default } from '@mui/docs/Ad'; diff --git a/packages/mui-docs/src/Ad/AdGuest.tsx b/packages/mui-docs/src/Ad/AdGuest.tsx index 4e0af831236fed..29c9bdc54693ef 100644 --- a/packages/mui-docs/src/Ad/AdGuest.tsx +++ b/packages/mui-docs/src/Ad/AdGuest.tsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import Portal from '@mui/material/Portal'; import { AdContext } from './AdManager'; -interface AdGuestProps { +export interface AdGuestProps { /** * The querySelector use to target the element which will include the ad. */ @@ -11,7 +11,7 @@ interface AdGuestProps { children?: React.ReactNode | undefined; } -export default function AdGuest(props: AdGuestProps) { +function AdGuest(props: AdGuestProps) { const { classSelector = '.description', children } = props; const ad = React.useContext(AdContext); @@ -44,3 +44,5 @@ AdGuest.propTypes = { children: PropTypes.node, classSelector: PropTypes.string, }; + +export { AdGuest }; diff --git a/packages/mui-docs/src/Ad/index.ts b/packages/mui-docs/src/Ad/index.ts index 11a376a3d57190..4c2adc2a259c0a 100644 --- a/packages/mui-docs/src/Ad/index.ts +++ b/packages/mui-docs/src/Ad/index.ts @@ -1,4 +1,4 @@ export * from './Ad'; export * from './AdManager'; export * from './AdProvider'; -export { default as AdGuest } from './AdGuest'; +export * from './AdGuest'; From cb98dc7d3ddc8a8c5a05a3ea530219e50293557b Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 11:54:05 +0200 Subject: [PATCH 05/19] export AdCarbonInline --- docs/src/modules/components/Demo.js | 2 +- packages/mui-docs/src/Ad/index.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/src/modules/components/Demo.js b/docs/src/modules/components/Demo.js index 94d8087bfd3400..1ad711ddfaf389 100644 --- a/docs/src/modules/components/Demo.js +++ b/docs/src/modules/components/Demo.js @@ -20,7 +20,6 @@ import DemoSandbox from 'docs/src/modules/components/DemoSandbox'; import ReactRunner from 'docs/src/modules/components/ReactRunner'; import DemoEditor from 'docs/src/modules/components/DemoEditor'; import DemoEditorError from 'docs/src/modules/components/DemoEditorError'; -import { AdCarbonInline } from 'docs/src/modules/components/AdCarbon'; import { pathnameToLanguage } from 'docs/src/modules/utils/helpers'; import { useCodeVariant } from 'docs/src/modules/utils/codeVariant'; import { useCodeStyling } from 'docs/src/modules/utils/codeStylingSolution'; @@ -28,6 +27,7 @@ import { CODE_VARIANTS, CODE_STYLING } from 'docs/src/modules/constants'; import { useUserLanguage, useTranslate } from '@mui/docs/i18n'; import stylingSolutionMapping from 'docs/src/modules/utils/stylingSolutionMapping'; import DemoToolbarRoot from 'docs/src/modules/components/DemoToolbarRoot'; +import { AdCarbonInline } from '@mui/docs/Ad'; import { BrandingProvider, blue, blueDark, grey } from '@mui/docs/branding'; /** diff --git a/packages/mui-docs/src/Ad/index.ts b/packages/mui-docs/src/Ad/index.ts index 4c2adc2a259c0a..bcc5b5f8f9679f 100644 --- a/packages/mui-docs/src/Ad/index.ts +++ b/packages/mui-docs/src/Ad/index.ts @@ -2,3 +2,4 @@ export * from './Ad'; export * from './AdManager'; export * from './AdProvider'; export * from './AdGuest'; +export { AdCarbonInline } from './AdCarbon'; From 6895443a8b8dbb1aad396749b8e34be27bbd5687 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 13:04:08 +0200 Subject: [PATCH 06/19] fix lint --- packages/mui-docs/src/Ad/AdProvider.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mui-docs/src/Ad/AdProvider.tsx b/packages/mui-docs/src/Ad/AdProvider.tsx index e7bd36fe183814..2a1eac40adaca7 100644 --- a/packages/mui-docs/src/Ad/AdProvider.tsx +++ b/packages/mui-docs/src/Ad/AdProvider.tsx @@ -18,7 +18,8 @@ const AdConfigContext = React.createContext(null); export function AdProvider(props: AdProviderProps) { const { children, config } = props; - const value = { GADisplayRatio: 0.1, ...config }; + + const value = React.useMemo(() => ({ GADisplayRatio: 0.1, ...config }), [config]); return {children}; } From f456f7c18a3c5a8ef1c28f5aa562554de43cca65 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 13:04:42 +0200 Subject: [PATCH 07/19] fix TS --- docs/package.json | 1 - packages/mui-docs/package.json | 1 + packages/mui-docs/tsconfig.build.json | 2 +- {docs => packages/mui-docs}/types/ga.d.ts | 0 pnpm-lock.yaml | 6 +++--- 5 files changed, 5 insertions(+), 5 deletions(-) rename {docs => packages/mui-docs}/types/ga.d.ts (100%) diff --git a/docs/package.json b/docs/package.json index 45b1950fa3b14c..eb230937137b7e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -129,7 +129,6 @@ "@types/react-transition-group": "^4.4.10", "@types/react-window": "^1.8.8", "@types/stylis": "^4.2.0", - "@types/gtag.js": "^0.0.20", "chai": "^4.4.1", "cross-fetch": "^4.0.0", "gm": "^1.25.0", diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json index 75c21937c59df7..3599152d156452 100644 --- a/packages/mui-docs/package.json +++ b/packages/mui-docs/package.json @@ -44,6 +44,7 @@ "devDependencies": { "@mui/icons-material": "workspace:*", "@mui/material": "workspace:*", + "@types/gtag.js": "^0.0.20", "@types/node": "^18.19.39", "@types/prop-types": "^15.7.12", "@types/react": "^18.3.3", diff --git a/packages/mui-docs/tsconfig.build.json b/packages/mui-docs/tsconfig.build.json index 6ecc42731f24fc..8f5b0d599966bf 100644 --- a/packages/mui-docs/tsconfig.build.json +++ b/packages/mui-docs/tsconfig.build.json @@ -11,7 +11,7 @@ "rootDir": "./src", "tsBuildInfoFile": "build/tsconfig.build.tsbuildinfo" }, - "include": ["src/**/*.ts*", "src/**/*.json"], + "include": ["src/**/*.ts*", "src/**/*.json", "types"], "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"], "references": [ { "path": "../mui-material/tsconfig.build.json" }, diff --git a/docs/types/ga.d.ts b/packages/mui-docs/types/ga.d.ts similarity index 100% rename from docs/types/ga.d.ts rename to packages/mui-docs/types/ga.d.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 404c8e36f832b1..5a9b8f4a787499 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -834,9 +834,6 @@ importers: '@types/css-mediaquery': specifier: ^0.1.4 version: 0.1.4 - '@types/gtag.js': - specifier: ^0.0.20 - version: 0.0.20 '@types/json2mq': specifier: ^0.2.2 version: 0.2.2 @@ -1424,6 +1421,9 @@ importers: '@mui/material': specifier: workspace:* version: link:../mui-material/build + '@types/gtag.js': + specifier: ^0.0.20 + version: 0.0.20 '@types/node': specifier: ^18.19.39 version: 18.19.39 From 78407da82a2af88ccac476881777981f99f6cdcf Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 13:26:21 +0200 Subject: [PATCH 08/19] Fix --- packages/mui-docs/src/Ad/Ad.tsx | 2 +- packages/mui-docs/tsconfig.build.json | 2 +- packages/mui-docs/tsconfig.json | 4 ++-- packages/mui-docs/types/ga.d.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mui-docs/src/Ad/Ad.tsx b/packages/mui-docs/src/Ad/Ad.tsx index 51491762549ae1..5a12bfba2bdaf4 100644 --- a/packages/mui-docs/src/Ad/Ad.tsx +++ b/packages/mui-docs/src/Ad/Ad.tsx @@ -93,7 +93,7 @@ class AdErrorBoundary extends React.Component<{ const eventLabel = String(this.props.eventLabel); // TODO: Use proper error monitoring service (for example Sentry) instead - window.gtag('event', 'ad', { + window.gtag<'event'>('zezsd', 'ad', { eventAction: 'crash', eventLabel, }); diff --git a/packages/mui-docs/tsconfig.build.json b/packages/mui-docs/tsconfig.build.json index 8f5b0d599966bf..6ecc42731f24fc 100644 --- a/packages/mui-docs/tsconfig.build.json +++ b/packages/mui-docs/tsconfig.build.json @@ -11,7 +11,7 @@ "rootDir": "./src", "tsBuildInfoFile": "build/tsconfig.build.tsbuildinfo" }, - "include": ["src/**/*.ts*", "src/**/*.json", "types"], + "include": ["src/**/*.ts*", "src/**/*.json"], "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"], "references": [ { "path": "../mui-material/tsconfig.build.json" }, diff --git a/packages/mui-docs/tsconfig.json b/packages/mui-docs/tsconfig.json index 63ed1fc8920b4f..692e5f7d2fb418 100644 --- a/packages/mui-docs/tsconfig.json +++ b/packages/mui-docs/tsconfig.json @@ -1,9 +1,9 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "skipLibCheck": true, + // "skipLibCheck": true, "resolveJsonModule": true, "types": ["react", "node"] }, - "include": ["src/**/*", "test/**/*"] + "include": ["src/**/*", "test/**/*", "types"] } diff --git a/packages/mui-docs/types/ga.d.ts b/packages/mui-docs/types/ga.d.ts index 77c372691d0f4d..9e78ccf7b61025 100644 --- a/packages/mui-docs/types/ga.d.ts +++ b/packages/mui-docs/types/ga.d.ts @@ -2,6 +2,6 @@ import Gtag from '@types/gtag.js'; declare global { interface Window { - gtag: Gtag.Gtag; + gtag?: Gtag.Gtag; } } From 5db9af3bd529b81c486150519fde84c23c7de447 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 14:21:02 +0200 Subject: [PATCH 09/19] fix TS --- packages/mui-docs/src/Ad/Ad.tsx | 2 +- packages/mui-docs/tsconfig.json | 2 +- packages/mui-docs/types/ga.d.ts | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 packages/mui-docs/types/ga.d.ts diff --git a/packages/mui-docs/src/Ad/Ad.tsx b/packages/mui-docs/src/Ad/Ad.tsx index 5a12bfba2bdaf4..51491762549ae1 100644 --- a/packages/mui-docs/src/Ad/Ad.tsx +++ b/packages/mui-docs/src/Ad/Ad.tsx @@ -93,7 +93,7 @@ class AdErrorBoundary extends React.Component<{ const eventLabel = String(this.props.eventLabel); // TODO: Use proper error monitoring service (for example Sentry) instead - window.gtag<'event'>('zezsd', 'ad', { + window.gtag('event', 'ad', { eventAction: 'crash', eventLabel, }); diff --git a/packages/mui-docs/tsconfig.json b/packages/mui-docs/tsconfig.json index 692e5f7d2fb418..b61e802bb2ea3b 100644 --- a/packages/mui-docs/tsconfig.json +++ b/packages/mui-docs/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { // "skipLibCheck": true, "resolveJsonModule": true, - "types": ["react", "node"] + "types": ["react", "node", "gtag.js"] }, "include": ["src/**/*", "test/**/*", "types"] } diff --git a/packages/mui-docs/types/ga.d.ts b/packages/mui-docs/types/ga.d.ts deleted file mode 100644 index 9e78ccf7b61025..00000000000000 --- a/packages/mui-docs/types/ga.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Gtag from '@types/gtag.js'; - -declare global { - interface Window { - gtag?: Gtag.Gtag; - } -} From 685ae7c5378451b4564c2cb79c54685d5b07ffc9 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 17:45:36 +0200 Subject: [PATCH 10/19] move load script --- docs/src/modules/utils/loadScript.js | 8 -------- packages/mui-docs/src/Ad/AdCarbon.tsx | 4 ++-- packages/mui-docs/src/utils/loadScript.ts | 10 ++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 docs/src/modules/utils/loadScript.js create mode 100644 packages/mui-docs/src/utils/loadScript.ts diff --git a/docs/src/modules/utils/loadScript.js b/docs/src/modules/utils/loadScript.js deleted file mode 100644 index 9b7ef0a0cc3c49..00000000000000 --- a/docs/src/modules/utils/loadScript.js +++ /dev/null @@ -1,8 +0,0 @@ -export default function loadScript(src, position) { - const script = document.createElement('script'); - script.setAttribute('async', ''); - script.src = src; - position.appendChild(script); - - return script; -} diff --git a/packages/mui-docs/src/Ad/AdCarbon.tsx b/packages/mui-docs/src/Ad/AdCarbon.tsx index 3043bc5b5eb0cd..8f4a6b94b0ca94 100644 --- a/packages/mui-docs/src/Ad/AdCarbon.tsx +++ b/packages/mui-docs/src/Ad/AdCarbon.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { styled } from '@mui/material/styles'; -import loadScript from 'docs/src/modules/utils/loadScript'; +import loadScript from '../utils/loadScript'; import AdDisplay from './AdDisplay'; import { adStylesObject } from './ad.styles'; @@ -38,7 +38,7 @@ const CarbonRoot = styled('span')(({ theme }) => { }); function AdCarbonImage() { - const ref = React.useRef(null); + const ref = React.useRef(null); React.useEffect(() => { // The isolation logic of carbonads is broken. diff --git a/packages/mui-docs/src/utils/loadScript.ts b/packages/mui-docs/src/utils/loadScript.ts new file mode 100644 index 00000000000000..5c245efc2d03d9 --- /dev/null +++ b/packages/mui-docs/src/utils/loadScript.ts @@ -0,0 +1,10 @@ +export default function loadScript(src: string, position: HTMLElement | null) { + const script = document.createElement('script'); + script.setAttribute('async', ''); + script.src = src; + if (position) { + position.appendChild(script); + } + + return script; +} From b6b1c9457d3bb8888d2b9d08c5adaac5b5696d7e Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 17:46:26 +0200 Subject: [PATCH 11/19] ts --- packages/mui-docs/src/Ad/index.ts | 2 ++ packages/mui-docs/tsconfig.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/mui-docs/src/Ad/index.ts b/packages/mui-docs/src/Ad/index.ts index bcc5b5f8f9679f..59c9abf8e91fff 100644 --- a/packages/mui-docs/src/Ad/index.ts +++ b/packages/mui-docs/src/Ad/index.ts @@ -1,3 +1,5 @@ +/// + export * from './Ad'; export * from './AdManager'; export * from './AdProvider'; diff --git a/packages/mui-docs/tsconfig.json b/packages/mui-docs/tsconfig.json index b61e802bb2ea3b..e953764a754e60 100644 --- a/packages/mui-docs/tsconfig.json +++ b/packages/mui-docs/tsconfig.json @@ -1,9 +1,9 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - // "skipLibCheck": true, + "skipLibCheck": true, "resolveJsonModule": true, - "types": ["react", "node", "gtag.js"] + "types": ["react", "node"] }, "include": ["src/**/*", "test/**/*", "types"] } From 921228c95b5fb46fc00ac8869b06c9b44ca1e456 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 17 Jul 2024 17:58:15 +0200 Subject: [PATCH 12/19] test --- packages/mui-docs/src/Ad/ad.styles.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/mui-docs/src/Ad/ad.styles.ts b/packages/mui-docs/src/Ad/ad.styles.ts index fbbb31db0d2884..bec4f9552a4b24 100644 --- a/packages/mui-docs/src/Ad/ad.styles.ts +++ b/packages/mui-docs/src/Ad/ad.styles.ts @@ -1,5 +1,4 @@ import { alpha, Theme } from '@mui/material/styles'; -import { adShape } from './AdManager'; const adBodyImageStyles = (theme: Theme) => ({ root: { @@ -92,9 +91,8 @@ const adBodyInlineStyles = (theme: Theme) => { }; }; +// eslint-disable-next-line import/prefer-default-export export const adStylesObject = { 'body-image': adBodyImageStyles, 'body-inline': adBodyInlineStyles, }; - -export default adStylesObject[`body-${adShape}`]; From 0aa6cf43ded245b306772e16a6f4c440cb401fcc Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 18 Jul 2024 12:19:22 +0200 Subject: [PATCH 13/19] fix some errors --- packages/mui-docs/src/Ad/Ad.tsx | 6 ------ packages/mui-docs/src/Ad/AdDisplay.tsx | 7 ------- packages/mui-docs/src/Ad/AdGuest.tsx | 6 ------ packages/mui-docs/src/Ad/AdInHouse.tsx | 5 ----- packages/mui-docs/src/Ad/AdManager.tsx | 6 ------ packages/mui-docs/src/Ad/ad.styles.ts | 9 +++++++-- 6 files changed, 7 insertions(+), 32 deletions(-) diff --git a/packages/mui-docs/src/Ad/Ad.tsx b/packages/mui-docs/src/Ad/Ad.tsx index 51491762549ae1..7be4bf3f8e1326 100644 --- a/packages/mui-docs/src/Ad/Ad.tsx +++ b/packages/mui-docs/src/Ad/Ad.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; import Typography from '@mui/material/Typography'; import Box from '@mui/material/Box'; import Paper from '@mui/material/Paper'; @@ -77,11 +76,6 @@ class AdErrorBoundary extends React.Component<{ eventLabel: string | null; children?: React.ReactNode | undefined; }> { - static propTypes = { - children: PropTypes.node.isRequired, - eventLabel: PropTypes.string, - }; - state = { didError: false }; static getDerivedStateFromError() { diff --git a/packages/mui-docs/src/Ad/AdDisplay.tsx b/packages/mui-docs/src/Ad/AdDisplay.tsx index c05315ddaab79c..0924896c6781bd 100644 --- a/packages/mui-docs/src/Ad/AdDisplay.tsx +++ b/packages/mui-docs/src/Ad/AdDisplay.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; import { styled } from '@mui/material/styles'; import { useTranslate } from '../i18n'; import { adShape } from './AdManager'; @@ -98,9 +97,3 @@ export default function AdDisplay(props: AdDisplayProps) { ); /* eslint-enable react/no-danger */ } - -AdDisplay.propTypes = { - ad: PropTypes.object.isRequired, - className: PropTypes.string, - shape: PropTypes.oneOf(['inline', 'auto']), -}; diff --git a/packages/mui-docs/src/Ad/AdGuest.tsx b/packages/mui-docs/src/Ad/AdGuest.tsx index 29c9bdc54693ef..c11c00809879bd 100644 --- a/packages/mui-docs/src/Ad/AdGuest.tsx +++ b/packages/mui-docs/src/Ad/AdGuest.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; import Portal from '@mui/material/Portal'; import { AdContext } from './AdManager'; @@ -40,9 +39,4 @@ function AdGuest(props: AdGuestProps) { ); } -AdGuest.propTypes = { - children: PropTypes.node, - classSelector: PropTypes.string, -}; - export { AdGuest }; diff --git a/packages/mui-docs/src/Ad/AdInHouse.tsx b/packages/mui-docs/src/Ad/AdInHouse.tsx index fea579a0d74916..67fd3b1a2af3aa 100644 --- a/packages/mui-docs/src/Ad/AdInHouse.tsx +++ b/packages/mui-docs/src/Ad/AdInHouse.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; import AdDisplay, { AdParameters } from './AdDisplay'; export default function AdInHouse(props: { ad: Omit }) { @@ -7,7 +6,3 @@ export default function AdInHouse(props: { ad: Omit; } - -AdInHouse.propTypes = { - ad: PropTypes.object.isRequired, -}; diff --git a/packages/mui-docs/src/Ad/AdManager.tsx b/packages/mui-docs/src/Ad/AdManager.tsx index 3fccd1c7ff5594..0361441e8d9d42 100644 --- a/packages/mui-docs/src/Ad/AdManager.tsx +++ b/packages/mui-docs/src/Ad/AdManager.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/material/utils'; type AdPortal = { @@ -36,8 +35,3 @@ export default function AdManager({ classSelector = '.description', children }: return {children}; } - -AdManager.propTypes = { - children: PropTypes.node, - classSelector: PropTypes.string, -}; diff --git a/packages/mui-docs/src/Ad/ad.styles.ts b/packages/mui-docs/src/Ad/ad.styles.ts index bec4f9552a4b24..6c7a912c26e074 100644 --- a/packages/mui-docs/src/Ad/ad.styles.ts +++ b/packages/mui-docs/src/Ad/ad.styles.ts @@ -1,6 +1,9 @@ import { alpha, Theme } from '@mui/material/styles'; +import { CSSObject } from '@mui/styled-engine'; -const adBodyImageStyles = (theme: Theme) => ({ +type BodyImageStylesKeys = 'root' | 'imgWrapper' | 'img' | 'a' | 'description' | 'poweredby'; + +const adBodyImageStyles = (theme: Theme): Record => ({ root: { display: 'block', overflow: 'hidden', @@ -43,7 +46,9 @@ const adBodyImageStyles = (theme: Theme) => ({ }, }); -const adBodyInlineStyles = (theme: Theme) => { +type BodyInlineStylesKeys = BodyImageStylesKeys | 'link'; + +const adBodyInlineStyles = (theme: Theme): Record => { const baseline = adBodyImageStyles(theme); return { From d769c0af1093d0edf2b8e4682b5ec5de72e05e5d Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 18 Jul 2024 12:41:06 +0200 Subject: [PATCH 14/19] fix export --- packages/mui-docs/src/Ad/AdManager.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-docs/src/Ad/AdManager.tsx b/packages/mui-docs/src/Ad/AdManager.tsx index 0361441e8d9d42..7168333c9d3cdf 100644 --- a/packages/mui-docs/src/Ad/AdManager.tsx +++ b/packages/mui-docs/src/Ad/AdManager.tsx @@ -25,7 +25,7 @@ const randomSession = Math.random(); // 80% body-image export const adShape = randomSession < 0.2 ? 'inline' : 'image'; -export default function AdManager({ classSelector = '.description', children }: AdManagerProps) { +export function AdManager({ classSelector = '.description', children }: AdManagerProps) { const [portal, setPortal] = React.useState({ placement: 'body-top', element: null }); useEnhancedEffect(() => { From 85bb731f144c6a56a9aa6e15b358b35190d47119 Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 18 Jul 2024 16:03:54 +0200 Subject: [PATCH 15/19] cleaner fix --- packages/mui-docs/package.json | 4 +++- packages/mui-docs/src/Ad/AdCarbon.tsx | 4 ++-- packages/mui-docs/src/Ad/AdDisplay.tsx | 8 +++----- packages/mui-docs/src/Ad/ad.styles.ts | 15 ++------------- packages/mui-docs/tsconfig.json | 4 ++-- pnpm-lock.yaml | 6 ++++++ 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json index 3599152d156452..753c6ce34c407a 100644 --- a/packages/mui-docs/package.json +++ b/packages/mui-docs/package.json @@ -44,6 +44,7 @@ "devDependencies": { "@mui/icons-material": "workspace:*", "@mui/material": "workspace:*", + "@mui/styled-engine": "workspace:*", "@types/gtag.js": "^0.0.20", "@types/node": "^18.19.39", "@types/prop-types": "^15.7.12", @@ -59,7 +60,8 @@ "@types/react": "^17.0.0 || ^18.0.0", "chai": "^4.4.1", "next": "^13.5.1 || ^14", - "react": "^17.0.0 || ^18.0.0" + "react": "^17.0.0 || ^18.0.0", + "csstype": "^3.1.3" }, "peerDependenciesMeta": { "@types/react": { diff --git a/packages/mui-docs/src/Ad/AdCarbon.tsx b/packages/mui-docs/src/Ad/AdCarbon.tsx index 8f4a6b94b0ca94..73727ae49dd714 100644 --- a/packages/mui-docs/src/Ad/AdCarbon.tsx +++ b/packages/mui-docs/src/Ad/AdCarbon.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { styled } from '@mui/material/styles'; import loadScript from '../utils/loadScript'; import AdDisplay from './AdDisplay'; -import { adStylesObject } from './ad.styles'; +import { adBodyImageStyles } from './ad.styles'; type CarbonAd = { pixel: string; @@ -14,7 +14,7 @@ type CarbonAd = { description: string; }; const CarbonRoot = styled('span')(({ theme }) => { - const styles = adStylesObject['body-image'](theme); + const styles = adBodyImageStyles(theme); return { width: '100%', diff --git a/packages/mui-docs/src/Ad/AdDisplay.tsx b/packages/mui-docs/src/Ad/AdDisplay.tsx index 0924896c6781bd..6fa3d0ad7f6a08 100644 --- a/packages/mui-docs/src/Ad/AdDisplay.tsx +++ b/packages/mui-docs/src/Ad/AdDisplay.tsx @@ -2,12 +2,11 @@ import * as React from 'react'; import { styled } from '@mui/material/styles'; import { useTranslate } from '../i18n'; import { adShape } from './AdManager'; -import { adStylesObject } from './ad.styles'; +import { adBodyImageStyles, adBodyInlineStyles } from './ad.styles'; import { useAdConfig } from './AdProvider'; const InlineShape = styled('span')(({ theme }) => { - const styles = adStylesObject['body-inline'](theme); - + const styles = adBodyInlineStyles(theme); return { ...styles.root, '& img': styles.img, @@ -19,8 +18,7 @@ const InlineShape = styled('span')(({ theme }) => { }); const ImageShape = styled('span')(({ theme }) => { - const styles = adStylesObject['body-image'](theme); - + const styles = adBodyImageStyles(theme); return { ...styles.root, '& img': styles.img, diff --git a/packages/mui-docs/src/Ad/ad.styles.ts b/packages/mui-docs/src/Ad/ad.styles.ts index 6c7a912c26e074..9c9f662c66af8a 100644 --- a/packages/mui-docs/src/Ad/ad.styles.ts +++ b/packages/mui-docs/src/Ad/ad.styles.ts @@ -1,9 +1,6 @@ import { alpha, Theme } from '@mui/material/styles'; -import { CSSObject } from '@mui/styled-engine'; -type BodyImageStylesKeys = 'root' | 'imgWrapper' | 'img' | 'a' | 'description' | 'poweredby'; - -const adBodyImageStyles = (theme: Theme): Record => ({ +export const adBodyImageStyles = (theme: Theme) => ({ root: { display: 'block', overflow: 'hidden', @@ -46,9 +43,7 @@ const adBodyImageStyles = (theme: Theme): Record }, }); -type BodyInlineStylesKeys = BodyImageStylesKeys | 'link'; - -const adBodyInlineStyles = (theme: Theme): Record => { +export const adBodyInlineStyles = (theme: Theme) => { const baseline = adBodyImageStyles(theme); return { @@ -95,9 +90,3 @@ const adBodyInlineStyles = (theme: Theme): Record Date: Mon, 22 Jul 2024 15:00:01 +0200 Subject: [PATCH 16/19] olivier's feedback --- packages/mui-docs/src/Ad/Ad.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-docs/src/Ad/Ad.tsx b/packages/mui-docs/src/Ad/Ad.tsx index 7be4bf3f8e1326..b056ca5ec54a7d 100644 --- a/packages/mui-docs/src/Ad/Ad.tsx +++ b/packages/mui-docs/src/Ad/Ad.tsx @@ -146,7 +146,7 @@ export function Ad() { const ad = React.useContext(AdContext); const eventLabel = label ? `${label}-${ad.placement}-${adShape}` : null; - const timerAdblock = React.useRef(); + const timerAdblock = React.useRef>(); const checkAdblock = React.useCallback( (attempt = 1) => { From d666fd9b006096a8e858df8562dd9352fda99ac7 Mon Sep 17 00:00:00 2001 From: alexandre Date: Mon, 22 Jul 2024 15:06:54 +0200 Subject: [PATCH 17/19] deduplicate --- pnpm-lock.yaml | 54 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 541e19d5161497..8bc42c9ad37972 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -323,7 +323,7 @@ importers: dependencies: '@emotion/cache': specifier: latest - version: 11.11.0 + version: 11.13.0 '@mui/base': specifier: workspace:^ version: link:../../packages/mui-base/build @@ -550,7 +550,7 @@ importers: version: 3.6.0(@algolia/client-search@4.23.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(search-insights@2.13.0) '@emotion/cache': specifier: ^11.11.0 - version: 11.11.0 + version: 11.13.0 '@emotion/react': specifier: ^11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) @@ -981,7 +981,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.11.0 - version: 11.11.0 + version: 11.13.0 '@emotion/react': specifier: ^11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) @@ -1813,7 +1813,7 @@ importers: devDependencies: '@emotion/cache': specifier: ^11.11.0 - version: 11.11.0 + version: 11.13.0 '@emotion/react': specifier: ^11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) @@ -1880,7 +1880,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.11.0 - version: 11.11.0 + version: 11.13.0 csstype: specifier: ^3.1.3 version: 3.1.3 @@ -2228,7 +2228,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.11.0 - version: 11.11.0 + version: 11.13.0 '@emotion/react': specifier: ^11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) @@ -3315,8 +3315,8 @@ packages: '@emotion/babel-plugin@11.11.0': resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} - '@emotion/cache@11.11.0': - resolution: {integrity: sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==} + '@emotion/cache@11.13.0': + resolution: {integrity: sha512-hPV345J/tH0Cwk2wnU/3PBzORQ9HeX+kQSbwI+jslzpRCHE6fSGTohswksA/Ensr8znPzwfzKZCmAM9Lmlhp7g==} '@emotion/css@11.11.2': resolution: {integrity: sha512-VJxe1ucoMYMS7DkiMdC2T7PWNbrEI0a39YRiyDvK2qq4lXwjRbVP/z4lpG+odCsRzadlR+1ywwrTzhdm5HNdew==} @@ -3345,6 +3345,9 @@ packages: '@emotion/memoize@0.8.1': resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} + '@emotion/memoize@0.9.0': + resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==} + '@emotion/react@11.11.4': resolution: {integrity: sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==} peerDependencies: @@ -3368,6 +3371,9 @@ packages: '@emotion/sheet@1.2.2': resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==} + '@emotion/sheet@1.4.0': + resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==} + '@emotion/styled@11.11.5': resolution: {integrity: sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==} peerDependencies: @@ -3389,9 +3395,15 @@ packages: '@emotion/utils@1.2.1': resolution: {integrity: sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==} + '@emotion/utils@1.4.0': + resolution: {integrity: sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==} + '@emotion/weak-memoize@0.3.1': resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} + '@emotion/weak-memoize@0.4.0': + resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==} + '@esbuild/aix-ppc64@0.21.5': resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} engines: {node: '>=12'} @@ -13479,18 +13491,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@emotion/cache@11.11.0': + '@emotion/cache@11.13.0': dependencies: - '@emotion/memoize': 0.8.1 - '@emotion/sheet': 1.2.2 - '@emotion/utils': 1.2.1 - '@emotion/weak-memoize': 0.3.1 + '@emotion/memoize': 0.9.0 + '@emotion/sheet': 1.4.0 + '@emotion/utils': 1.4.0 + '@emotion/weak-memoize': 0.4.0 stylis: 4.2.0 '@emotion/css@11.11.2': dependencies: '@emotion/babel-plugin': 11.11.0 - '@emotion/cache': 11.11.0 + '@emotion/cache': 11.13.0 '@emotion/serialize': 1.1.4 '@emotion/sheet': 1.2.2 '@emotion/utils': 1.2.1 @@ -13519,11 +13531,13 @@ snapshots: '@emotion/memoize@0.8.1': {} + '@emotion/memoize@0.9.0': {} + '@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 '@emotion/babel-plugin': 11.11.0 - '@emotion/cache': 11.11.0 + '@emotion/cache': 11.13.0 '@emotion/serialize': 1.1.4 '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.3.1) '@emotion/utils': 1.2.1 @@ -13554,6 +13568,8 @@ snapshots: '@emotion/sheet@1.2.2': {} + '@emotion/sheet@1.4.0': {} + '@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 @@ -13577,8 +13593,12 @@ snapshots: '@emotion/utils@1.2.1': {} + '@emotion/utils@1.4.0': {} + '@emotion/weak-memoize@0.3.1': {} + '@emotion/weak-memoize@0.4.0': {} + '@esbuild/aix-ppc64@0.21.5': optional: true @@ -14111,7 +14131,7 @@ snapshots: '@mui/styled-engine@5.15.14(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 - '@emotion/cache': 11.11.0 + '@emotion/cache': 11.13.0 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 @@ -14122,7 +14142,7 @@ snapshots: '@mui/styled-engine@6.0.0-alpha.3(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 - '@emotion/cache': 11.11.0 + '@emotion/cache': 11.13.0 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 From 45ea270d67892ae2594c56614265799958f58128 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 25 Jul 2024 10:36:03 +0200 Subject: [PATCH 18/19] reinstall pnpm --- packages/mui-docs/package.json | 1 - pnpm-lock.yaml | 338 ++++++++++----------------------- 2 files changed, 97 insertions(+), 242 deletions(-) diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json index 3dabf9694014dc..48517237c0204d 100644 --- a/packages/mui-docs/package.json +++ b/packages/mui-docs/package.json @@ -44,7 +44,6 @@ "devDependencies": { "@mui/icons-material": "workspace:*", "@mui/material": "workspace:*", - "@mui/styled-engine": "workspace:*", "@types/gtag.js": "^0.0.20", "@types/node": "^18.19.41", "@types/prop-types": "^15.7.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 349dae7f0ba5a2..f7ec1f96805ee9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -131,10 +131,10 @@ importers: version: 17.0.32 '@typescript-eslint/eslint-plugin': specifier: ^7.16.1 - version: 7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) + version: 7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/parser': specifier: ^7.16.1 - version: 7.17.0(eslint@8.57.0)(typescript@5.4.5) + version: 7.16.1(eslint@8.57.0)(typescript@5.4.5) babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.24.9)(webpack@5.92.1(webpack-cli@5.1.4)) @@ -179,10 +179,10 @@ importers: version: 8.57.0 eslint-config-airbnb: specifier: ^19.0.4 - version: 19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.4(eslint@8.57.0))(eslint@8.57.0) + version: 19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.4(eslint@8.57.0))(eslint@8.57.0) eslint-config-airbnb-typescript: specifier: ^18.0.0 - version: 18.0.0(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0) + version: 18.0.0(@typescript-eslint/eslint-plugin@7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0) eslint-config-prettier: specifier: ^9.1.0 version: 9.1.0(eslint@8.57.0) @@ -197,7 +197,7 @@ importers: version: 1.3.2(eslint@8.57.0) eslint-plugin-import: specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) + version: 2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) eslint-plugin-jsx-a11y: specifier: ^6.7.1 version: 6.7.1(eslint@8.57.0) @@ -550,7 +550,7 @@ importers: version: 3.6.1(@algolia/client-search@4.23.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(search-insights@2.13.0) '@emotion/cache': specifier: ^11.13.0 - version: 11.13.1 + version: 11.13.0 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -981,7 +981,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.13.0 - version: 11.13.1 + version: 11.13.0 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -1192,7 +1192,7 @@ importers: version: 8.56.10 '@typescript-eslint/parser': specifier: ^7.16.1 - version: 7.17.0(eslint@8.57.0)(typescript@5.4.5) + version: 7.16.1(eslint@8.57.0)(typescript@5.4.5) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -1554,10 +1554,10 @@ importers: version: 7.24.8 '@emotion/react': specifier: ^11.5.0 - version: 11.11.4(@types/react@18.3.3)(react@18.3.1) + version: 11.13.0(@types/react@18.3.3)(react@18.3.1) '@emotion/styled': specifier: ^11.3.0 - version: 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/base': specifier: workspace:* version: link:../mui-base/build @@ -1631,10 +1631,10 @@ importers: version: 7.24.8 '@emotion/react': specifier: ^11.5.0 - version: 11.11.4(@types/react@18.3.3)(react@18.3.1) + version: 11.13.0(@types/react@18.3.3)(react@18.3.1) '@emotion/styled': specifier: ^11.3.0 - version: 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/base': specifier: workspace:* version: link:../mui-base/build @@ -1699,10 +1699,10 @@ importers: version: 7.24.8 '@emotion/react': specifier: ^11.5.0 - version: 11.11.4(@types/react@18.3.3)(react@18.3.1) + version: 11.13.0(@types/react@18.3.3)(react@18.3.1) '@emotion/styled': specifier: ^11.3.0 - version: 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/core-downloads-tracker': specifier: workspace:^ version: link:../mui-core-downloads-tracker/build @@ -1807,7 +1807,7 @@ importers: devDependencies: '@emotion/cache': specifier: ^11.13.0 - version: 11.13.1 + version: 11.13.0 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -1874,7 +1874,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.13.0 - version: 11.13.1 + version: 11.13.0 csstype: specifier: ^3.1.3 version: 3.1.3 @@ -2222,7 +2222,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.13.0 - version: 11.13.1 + version: 11.13.0 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -2454,10 +2454,6 @@ packages: resolution: {integrity: sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==} engines: {node: '>=6.9.0'} - '@babel/generator@7.24.8': - resolution: {integrity: sha512-47DG+6F5SzOi0uEvK4wMShmn5yY0mVjVJoWTphdY2B4Rx9wHgjK7Yhtr0ru6nE+sn0v38mzrWOlah0p/YlHHOQ==} - engines: {node: '>=6.9.0'} - '@babel/helper-annotate-as-pure@7.24.7': resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==} engines: {node: '>=6.9.0'} @@ -2507,12 +2503,6 @@ packages: resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} engines: {node: '>=6.9.0'} - '@babel/helper-module-transforms@7.24.8': - resolution: {integrity: sha512-m4vWKVqvkVAWLXfHCCfff2luJj86U+J0/x+0N3ArG/tP0Fq7zky2dYwMbtPmkc/oulkkbjdL3uWzuoBwQ8R00Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.24.9 - '@babel/helper-module-transforms@7.24.9': resolution: {integrity: sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==} engines: {node: '>=6.9.0'} @@ -3316,18 +3306,12 @@ packages: '@emnapi/runtime@1.1.1': resolution: {integrity: sha512-3bfqkzuR1KLx57nZfjr2NLnFOobvyS0aTszaEGCGqmYMVDRaGvgIZbjGSV/MHSSmLgQ/b9JFHQ5xm5WRZYd+XQ==} - '@emotion/babel-plugin@11.11.0': - resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} - '@emotion/babel-plugin@11.12.0': resolution: {integrity: sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==} '@emotion/cache@11.13.0': resolution: {integrity: sha512-hPV345J/tH0Cwk2wnU/3PBzORQ9HeX+kQSbwI+jslzpRCHE6fSGTohswksA/Ensr8znPzwfzKZCmAM9Lmlhp7g==} - '@emotion/cache@11.13.1': - resolution: {integrity: sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==} - '@emotion/css@11.11.2': resolution: {integrity: sha512-VJxe1ucoMYMS7DkiMdC2T7PWNbrEI0a39YRiyDvK2qq4lXwjRbVP/z4lpG+odCsRzadlR+1ywwrTzhdm5HNdew==} @@ -3361,15 +3345,6 @@ packages: '@emotion/memoize@0.9.0': resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==} - '@emotion/react@11.11.4': - resolution: {integrity: sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==} - peerDependencies: - '@types/react': '*' - react: '>=16.8.0' - peerDependenciesMeta: - '@types/react': - optional: true - '@emotion/react@11.13.0': resolution: {integrity: sha512-WkL+bw1REC2VNV1goQyfxjx1GYJkcc23CRQkXX+vZNLINyfI7o+uUn/rTGPt/xJ3bJHd5GcljgnxHf4wRw5VWQ==} peerDependencies: @@ -3379,9 +3354,6 @@ packages: '@types/react': optional: true - '@emotion/serialize@1.1.4': - resolution: {integrity: sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==} - '@emotion/serialize@1.3.0': resolution: {integrity: sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==} @@ -3396,16 +3368,6 @@ packages: '@emotion/sheet@1.4.0': resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==} - '@emotion/styled@11.11.5': - resolution: {integrity: sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==} - peerDependencies: - '@emotion/react': ^11.0.0-rc.0 - '@types/react': '*' - react: '>=16.8.0' - peerDependenciesMeta: - '@types/react': - optional: true - '@emotion/styled@11.13.0': resolution: {integrity: sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA==} peerDependencies: @@ -3422,25 +3384,14 @@ packages: '@emotion/unitless@0.9.0': resolution: {integrity: sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==} - '@emotion/use-insertion-effect-with-fallbacks@1.0.1': - resolution: {integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==} - peerDependencies: - react: '>=16.8.0' - '@emotion/use-insertion-effect-with-fallbacks@1.1.0': resolution: {integrity: sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==} peerDependencies: react: '>=16.8.0' - '@emotion/utils@1.2.1': - resolution: {integrity: sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==} - '@emotion/utils@1.4.0': resolution: {integrity: sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==} - '@emotion/weak-memoize@0.3.1': - resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} - '@emotion/weak-memoize@0.4.0': resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==} @@ -3592,10 +3543,6 @@ packages: resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint-community/regexpp@4.6.2': - resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==} - engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/eslintrc@2.1.4': resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5352,8 +5299,8 @@ packages: '@types/yargs@17.0.32': resolution: {integrity: sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==} - '@typescript-eslint/eslint-plugin@7.17.0': - resolution: {integrity: sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==} + '@typescript-eslint/eslint-plugin@7.16.1': + resolution: {integrity: sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: '@typescript-eslint/parser': ^7.0.0 @@ -5363,8 +5310,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@7.17.0': - resolution: {integrity: sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==} + '@typescript-eslint/parser@7.16.1': + resolution: {integrity: sha512-u+1Qx86jfGQ5i4JjK33/FnawZRpsLxRnKzGE6EABZ40KxVT/vWsiZFEBBHjFOljmmV3MBYOHEKi0Jm9hbAOClA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -5373,12 +5320,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@7.17.0': - resolution: {integrity: sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==} + '@typescript-eslint/scope-manager@7.16.1': + resolution: {integrity: sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/type-utils@7.17.0': - resolution: {integrity: sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==} + '@typescript-eslint/type-utils@7.16.1': + resolution: {integrity: sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -5387,12 +5334,12 @@ packages: typescript: optional: true - '@typescript-eslint/types@7.17.0': - resolution: {integrity: sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==} + '@typescript-eslint/types@7.16.1': + resolution: {integrity: sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/typescript-estree@7.17.0': - resolution: {integrity: sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==} + '@typescript-eslint/typescript-estree@7.16.1': + resolution: {integrity: sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: typescript: '*' @@ -5400,14 +5347,14 @@ packages: typescript: optional: true - '@typescript-eslint/utils@7.17.0': - resolution: {integrity: sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==} + '@typescript-eslint/utils@7.16.1': + resolution: {integrity: sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 - '@typescript-eslint/visitor-keys@7.17.0': - resolution: {integrity: sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==} + '@typescript-eslint/visitor-keys@7.16.1': + resolution: {integrity: sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==} engines: {node: ^18.18.0 || >=20.0.0} '@ungap/structured-clone@1.2.0': @@ -12454,13 +12401,6 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 - '@babel/generator@7.24.8': - dependencies: - '@babel/types': 7.24.9 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - '@babel/helper-annotate-as-pure@7.24.7': dependencies: '@babel/types': 7.24.9 @@ -12540,17 +12480,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.24.8(@babel/core@7.24.9)': - dependencies: - '@babel/core': 7.24.9 - '@babel/helper-environment-visitor': 7.24.7 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-simple-access': 7.24.7 - '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 - transitivePeerDependencies: - - supports-color - '@babel/helper-module-transforms@7.24.9(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 @@ -13007,7 +12936,7 @@ snapshots: '@babel/plugin-transform-modules-amd@7.24.7(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 - '@babel/helper-module-transforms': 7.24.8(@babel/core@7.24.9) + '@babel/helper-module-transforms': 7.24.9(@babel/core@7.24.9) '@babel/helper-plugin-utils': 7.24.8 transitivePeerDependencies: - supports-color @@ -13015,7 +12944,7 @@ snapshots: '@babel/plugin-transform-modules-commonjs@7.24.8(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 - '@babel/helper-module-transforms': 7.24.8(@babel/core@7.24.9) + '@babel/helper-module-transforms': 7.24.9(@babel/core@7.24.9) '@babel/helper-plugin-utils': 7.24.8 '@babel/helper-simple-access': 7.24.7 transitivePeerDependencies: @@ -13025,7 +12954,7 @@ snapshots: dependencies: '@babel/core': 7.24.9 '@babel/helper-hoist-variables': 7.24.7 - '@babel/helper-module-transforms': 7.24.8(@babel/core@7.24.9) + '@babel/helper-module-transforms': 7.24.9(@babel/core@7.24.9) '@babel/helper-plugin-utils': 7.24.8 '@babel/helper-validator-identifier': 7.24.7 transitivePeerDependencies: @@ -13034,7 +12963,7 @@ snapshots: '@babel/plugin-transform-modules-umd@7.24.7(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 - '@babel/helper-module-transforms': 7.24.8(@babel/core@7.24.9) + '@babel/helper-module-transforms': 7.24.9(@babel/core@7.24.9) '@babel/helper-plugin-utils': 7.24.8 transitivePeerDependencies: - supports-color @@ -13407,7 +13336,7 @@ snapshots: '@babel/traverse@7.24.8': dependencies: '@babel/code-frame': 7.24.7 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-function-name': 7.24.7 '@babel/helper-hoist-variables': 7.24.7 @@ -13534,22 +13463,6 @@ snapshots: tslib: 2.6.2 optional: true - '@emotion/babel-plugin@11.11.0': - dependencies: - '@babel/helper-module-imports': 7.24.7 - '@babel/runtime': 7.24.8 - '@emotion/hash': 0.9.2 - '@emotion/memoize': 0.8.1 - '@emotion/serialize': 1.1.4 - babel-plugin-macros: 3.1.0 - convert-source-map: 1.8.0 - escape-string-regexp: 4.0.0 - find-root: 1.1.0 - source-map: 0.5.7 - stylis: 4.2.0 - transitivePeerDependencies: - - supports-color - '@emotion/babel-plugin@11.12.0': dependencies: '@babel/helper-module-imports': 7.24.7 @@ -13574,19 +13487,11 @@ snapshots: '@emotion/weak-memoize': 0.4.0 stylis: 4.2.0 - '@emotion/cache@11.13.1': - dependencies: - '@emotion/memoize': 0.9.0 - '@emotion/sheet': 1.4.0 - '@emotion/utils': 1.4.0 - '@emotion/weak-memoize': 0.4.0 - stylis: 4.2.0 - '@emotion/css@11.11.2': dependencies: - '@emotion/babel-plugin': 11.11.0 - '@emotion/cache': 11.13.1 - '@emotion/serialize': 1.1.4 + '@emotion/babel-plugin': 11.12.0 + '@emotion/cache': 11.13.0 + '@emotion/serialize': 1.3.0 '@emotion/sheet': 1.4.0 '@emotion/utils': 1.4.0 transitivePeerDependencies: @@ -13620,27 +13525,11 @@ snapshots: '@emotion/memoize@0.9.0': {} - '@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.8 - '@emotion/babel-plugin': 11.11.0 - '@emotion/cache': 11.13.1 - '@emotion/serialize': 1.1.4 - '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.3.1) - '@emotion/utils': 1.2.1 - '@emotion/weak-memoize': 0.3.1 - hoist-non-react-statics: 3.3.2 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.3 - transitivePeerDependencies: - - supports-color - '@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 '@emotion/babel-plugin': 11.12.0 - '@emotion/cache': 11.13.1 + '@emotion/cache': 11.13.0 '@emotion/serialize': 1.3.0 '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.3.1) '@emotion/utils': 1.4.0 @@ -13652,14 +13541,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@emotion/serialize@1.1.4': - dependencies: - '@emotion/hash': 0.9.2 - '@emotion/memoize': 0.8.1 - '@emotion/unitless': 0.8.1 - '@emotion/utils': 1.4.0 - csstype: 3.1.3 - '@emotion/serialize@1.3.0': dependencies: '@emotion/hash': 0.9.2 @@ -13670,7 +13551,7 @@ snapshots: '@emotion/server@11.11.0(@emotion/css@11.11.2)': dependencies: - '@emotion/utils': 1.2.1 + '@emotion/utils': 1.4.0 html-tokenize: 2.0.1 multipipe: 1.0.2 through: 2.3.8 @@ -13679,21 +13560,6 @@ snapshots: '@emotion/sheet@1.4.0': {} - '@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.8 - '@emotion/babel-plugin': 11.11.0 - '@emotion/is-prop-valid': 1.2.2 - '@emotion/react': 11.11.4(@types/react@18.3.3)(react@18.3.1) - '@emotion/serialize': 1.1.4 - '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.3.1) - '@emotion/utils': 1.2.1 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.3 - transitivePeerDependencies: - - supports-color - '@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 @@ -13713,20 +13579,12 @@ snapshots: '@emotion/unitless@0.9.0': {} - '@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@18.3.1)': - dependencies: - react: 18.3.1 - '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@18.3.1)': dependencies: react: 18.3.1 - '@emotion/utils@1.2.1': {} - '@emotion/utils@1.4.0': {} - '@emotion/weak-memoize@0.3.1': {} - '@emotion/weak-memoize@0.4.0': {} '@esbuild/aix-ppc64@0.21.5': @@ -13805,8 +13663,6 @@ snapshots: '@eslint-community/regexpp@4.11.0': {} - '@eslint-community/regexpp@4.6.2': {} - '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 @@ -14263,7 +14119,7 @@ snapshots: '@mui/styled-engine@5.15.14(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 - '@emotion/cache': 11.13.1 + '@emotion/cache': 11.13.0 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 @@ -14274,7 +14130,7 @@ snapshots: '@mui/styled-engine@6.0.0-alpha.3(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 - '@emotion/cache': 11.13.1 + '@emotion/cache': 11.13.0 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 @@ -15041,9 +14897,9 @@ snapshots: '@babel/parser': 7.24.8 '@babel/types': 7.24.9 '@emotion/css': 11.11.2 - '@emotion/is-prop-valid': 1.2.2 + '@emotion/is-prop-valid': 1.3.0 '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) - '@emotion/serialize': 1.1.4 + '@emotion/serialize': 1.3.0 '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': 6.0.0-dev.240424162023-9968b4889d(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/react@18.3.3)(react@18.3.1) @@ -16066,14 +15922,14 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 - '@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/eslint-plugin@7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': dependencies: '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/scope-manager': 7.17.0 - '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 7.17.0 + '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.16.1 + '@typescript-eslint/type-utils': 7.16.1(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.16.1(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.16.1 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 @@ -16084,12 +15940,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5)': dependencies: - '@typescript-eslint/scope-manager': 7.17.0 - '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 7.17.0 + '@typescript-eslint/scope-manager': 7.16.1 + '@typescript-eslint/types': 7.16.1 + '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.16.1 debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 optionalDependencies: @@ -16097,15 +15953,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@7.17.0': + '@typescript-eslint/scope-manager@7.16.1': dependencies: - '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/visitor-keys': 7.17.0 + '@typescript-eslint/types': 7.16.1 + '@typescript-eslint/visitor-keys': 7.16.1 - '@typescript-eslint/type-utils@7.17.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/type-utils@7.16.1(eslint@8.57.0)(typescript@5.4.5)': dependencies: - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.4.5) - '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.4.5) + '@typescript-eslint/utils': 7.16.1(eslint@8.57.0)(typescript@5.4.5) debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.4.5) @@ -16114,12 +15970,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@7.17.0': {} + '@typescript-eslint/types@7.16.1': {} - '@typescript-eslint/typescript-estree@7.17.0(typescript@5.4.5)': + '@typescript-eslint/typescript-estree@7.16.1(typescript@5.4.5)': dependencies: - '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/visitor-keys': 7.17.0 + '@typescript-eslint/types': 7.16.1 + '@typescript-eslint/visitor-keys': 7.16.1 debug: 4.3.5(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 @@ -16131,20 +15987,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.17.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/utils@7.16.1(eslint@8.57.0)(typescript@5.4.5)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@typescript-eslint/scope-manager': 7.17.0 - '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.16.1 + '@typescript-eslint/types': 7.16.1 + '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.4.5) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@7.17.0': + '@typescript-eslint/visitor-keys@7.16.1': dependencies: - '@typescript-eslint/types': 7.17.0 + '@typescript-eslint/types': 7.16.1 eslint-visitor-keys: 3.4.3 '@ungap/structured-clone@1.2.0': {} @@ -16253,7 +16109,7 @@ snapshots: '@wyw-in-js/processor-utils@0.5.3': dependencies: - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@wyw-in-js/shared': 0.5.3 transitivePeerDependencies: - supports-color @@ -16269,7 +16125,7 @@ snapshots: '@wyw-in-js/transform@0.5.3': dependencies: '@babel/core': 7.24.9 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/helper-module-imports': 7.24.7 '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.24.9) '@babel/template': 7.24.7 @@ -16741,7 +16597,7 @@ snapshots: babel-plugin-optimize-clsx@2.6.2: dependencies: - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/template': 7.24.7 '@babel/types': 7.24.9 find-cache-dir: 3.3.2 @@ -18184,29 +18040,29 @@ snapshots: escape-string-regexp@5.0.0: {} - eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0): + eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0): dependencies: confusing-browser-globals: 1.0.11 eslint: 8.57.0 - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) object.assign: 4.1.5 object.entries: 1.1.8 semver: 6.3.1 - eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0): + eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0): dependencies: - '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/eslint-plugin': 7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0) + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0) transitivePeerDependencies: - eslint-plugin-import - eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.4(eslint@8.57.0))(eslint@8.57.0): + eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.4(eslint@8.57.0))(eslint@8.57.0): dependencies: eslint: 8.57.0 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) eslint-plugin-jsx-a11y: 6.7.1(eslint@8.57.0) eslint-plugin-react: 7.34.4(eslint@8.57.0) eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0) @@ -18230,7 +18086,7 @@ snapshots: array.prototype.find: 2.2.2 debug: 3.2.7 enhanced-resolve: 0.9.1 - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0) find-root: 1.1.0 hasown: 2.0.2 interpret: 1.4.0 @@ -18243,11 +18099,11 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.8.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)))(eslint@8.57.0): + eslint-module-utils@2.8.0(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)))(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 eslint-import-resolver-webpack: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)) @@ -18267,7 +18123,7 @@ snapshots: lodash.snakecase: 4.1.1 lodash.upperfirst: 4.3.1 - eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0): + eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0): dependencies: array-includes: 3.1.8 array.prototype.findlastindex: 1.2.3 @@ -18277,7 +18133,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)))(eslint@8.57.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)))(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -18288,7 +18144,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.4.5) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -18384,7 +18240,7 @@ snapshots: eslint@8.57.0: dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@eslint-community/regexpp': 4.6.2 + '@eslint-community/regexpp': 4.11.0 '@eslint/eslintrc': 2.1.4 '@eslint/js': 8.57.0 '@humanwhocodes/config-array': 0.11.14 @@ -20798,7 +20654,7 @@ snapshots: metro-transform-plugins@0.80.7: dependencies: '@babel/core': 7.24.9 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/template': 7.24.7 '@babel/traverse': 7.24.8 nullthrows: 1.1.1 @@ -20808,7 +20664,7 @@ snapshots: metro-transform-worker@0.80.7(encoding@0.1.13): dependencies: '@babel/core': 7.24.9 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/parser': 7.24.8 '@babel/types': 7.24.9 metro: 0.80.7(encoding@0.1.13) @@ -20829,7 +20685,7 @@ snapshots: dependencies: '@babel/code-frame': 7.24.7 '@babel/core': 7.24.9 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/parser': 7.24.8 '@babel/template': 7.24.7 '@babel/traverse': 7.24.8 @@ -22158,7 +22014,7 @@ snapshots: react-docgen@5.4.3: dependencies: '@babel/core': 7.24.9 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/runtime': 7.24.8 ast-types: 0.14.2 commander: 2.20.3 From 72c600fd59ff0303271b2a5966fd129d31a62047 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 25 Jul 2024 11:11:43 +0200 Subject: [PATCH 19/19] deduplicate --- pnpm-lock.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7ec1f96805ee9..2bff347505a131 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -323,7 +323,7 @@ importers: dependencies: '@emotion/cache': specifier: latest - version: 11.13.0 + version: 11.13.1 '@mui/base': specifier: workspace:^ version: link:../../packages/mui-base/build @@ -550,7 +550,7 @@ importers: version: 3.6.1(@algolia/client-search@4.23.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(search-insights@2.13.0) '@emotion/cache': specifier: ^11.13.0 - version: 11.13.0 + version: 11.13.1 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -981,7 +981,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.13.0 - version: 11.13.0 + version: 11.13.1 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -1807,7 +1807,7 @@ importers: devDependencies: '@emotion/cache': specifier: ^11.13.0 - version: 11.13.0 + version: 11.13.1 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -1874,7 +1874,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.13.0 - version: 11.13.0 + version: 11.13.1 csstype: specifier: ^3.1.3 version: 3.1.3 @@ -2222,7 +2222,7 @@ importers: version: 7.24.8 '@emotion/cache': specifier: ^11.13.0 - version: 11.13.0 + version: 11.13.1 '@emotion/react': specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -3309,8 +3309,8 @@ packages: '@emotion/babel-plugin@11.12.0': resolution: {integrity: sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==} - '@emotion/cache@11.13.0': - resolution: {integrity: sha512-hPV345J/tH0Cwk2wnU/3PBzORQ9HeX+kQSbwI+jslzpRCHE6fSGTohswksA/Ensr8znPzwfzKZCmAM9Lmlhp7g==} + '@emotion/cache@11.13.1': + resolution: {integrity: sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==} '@emotion/css@11.11.2': resolution: {integrity: sha512-VJxe1ucoMYMS7DkiMdC2T7PWNbrEI0a39YRiyDvK2qq4lXwjRbVP/z4lpG+odCsRzadlR+1ywwrTzhdm5HNdew==} @@ -13479,7 +13479,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@emotion/cache@11.13.0': + '@emotion/cache@11.13.1': dependencies: '@emotion/memoize': 0.9.0 '@emotion/sheet': 1.4.0 @@ -13490,7 +13490,7 @@ snapshots: '@emotion/css@11.11.2': dependencies: '@emotion/babel-plugin': 11.12.0 - '@emotion/cache': 11.13.0 + '@emotion/cache': 11.13.1 '@emotion/serialize': 1.3.0 '@emotion/sheet': 1.4.0 '@emotion/utils': 1.4.0 @@ -13529,7 +13529,7 @@ snapshots: dependencies: '@babel/runtime': 7.24.8 '@emotion/babel-plugin': 11.12.0 - '@emotion/cache': 11.13.0 + '@emotion/cache': 11.13.1 '@emotion/serialize': 1.3.0 '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.3.1) '@emotion/utils': 1.4.0 @@ -14119,7 +14119,7 @@ snapshots: '@mui/styled-engine@5.15.14(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 - '@emotion/cache': 11.13.0 + '@emotion/cache': 11.13.1 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 @@ -14130,7 +14130,7 @@ snapshots: '@mui/styled-engine@6.0.0-alpha.3(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.8 - '@emotion/cache': 11.13.0 + '@emotion/cache': 11.13.1 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1