From 9045d665e04364165a78327eae99c3bbf98e7a4f Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 23 Aug 2024 00:16:30 -0400 Subject: [PATCH 01/26] draft: pre-serialize styles --- packages/mui-material/src/Paper/Paper.js | 1 + packages/mui-material/src/utils/memoTheme.ts | 31 +-- packages/mui-styled-engine-sc/src/index.d.ts | 4 + packages/mui-styled-engine-sc/src/index.js | 7 +- packages/mui-styled-engine/package.json | 1 + packages/mui-styled-engine/src/index.d.ts | 3 + packages/mui-styled-engine/src/index.js | 11 +- .../src/createStyled/createStyled.js | 227 ++++++++++-------- packages/mui-system/src/memoProps.ts | 66 +++++ packages/mui-system/src/memoTheme.ts | 33 +++ packages/mui-system/src/preprocessStyles.ts | 31 +++ pnpm-lock.yaml | 164 ++++++++++++- 12 files changed, 442 insertions(+), 137 deletions(-) create mode 100644 packages/mui-system/src/memoProps.ts create mode 100644 packages/mui-system/src/memoTheme.ts create mode 100644 packages/mui-system/src/preprocessStyles.ts diff --git a/packages/mui-material/src/Paper/Paper.js b/packages/mui-material/src/Paper/Paper.js index 9ae2f32861649e..d458332a3b3b80 100644 --- a/packages/mui-material/src/Paper/Paper.js +++ b/packages/mui-material/src/Paper/Paper.js @@ -47,6 +47,7 @@ const PaperRoot = styled('div', { transition: theme.transitions.create('box-shadow'), variants: [ { + // XXX: inverse this style to use `props: { square: true }` props: ({ ownerState }) => !ownerState.square, style: { borderRadius: theme.shape.borderRadius, diff --git a/packages/mui-material/src/utils/memoTheme.ts b/packages/mui-material/src/utils/memoTheme.ts index 2b899413ca6c36..85b939aa45677c 100644 --- a/packages/mui-material/src/utils/memoTheme.ts +++ b/packages/mui-material/src/utils/memoTheme.ts @@ -1,31 +1,6 @@ -import { CSSInterpolation } from '@mui/styled-engine'; +import systemMemoTheme from '@mui/system/memoTheme'; import { Theme } from '../styles/createTheme'; -type ThemeStyleFunction = (props: { theme: Theme }) => CSSInterpolation; +const memoTheme = systemMemoTheme; -// We need to pass an argument as `{ theme }` for PigmentCSS, but we don't want to -// allocate more objects. -const arg = { theme: undefined as unknown as Theme }; - -/** - * Memoize style function on theme. - * Intended to be used in styled() calls that only need access to the theme. - */ -export default function memoTheme(styleFn: ThemeStyleFunction) { - let lastValue: CSSInterpolation; - let lastTheme: Theme; - - return (props: { theme: Theme }) => { - let value = lastValue; - if (value === undefined || props.theme !== lastTheme) { - arg.theme = props.theme; - - value = styleFn(arg); - - lastValue = value; - lastTheme = props.theme; - } - - return value; - }; -} +export default memoTheme; diff --git a/packages/mui-styled-engine-sc/src/index.d.ts b/packages/mui-styled-engine-sc/src/index.d.ts index 79f62fa896032c..7b5d25cb8b8389 100644 --- a/packages/mui-styled-engine-sc/src/index.d.ts +++ b/packages/mui-styled-engine-sc/src/index.d.ts @@ -81,6 +81,10 @@ export function internal_processStyles( processor: (styles: any) => any, ): void; +// eslint-disable-next-line @typescript-eslint/naming-convention +export function internal_serializeStyles

(styles: Interpolation

): object; + + // These are the same as the ones in @mui/styled-engine // CSS.PropertiesFallback are necessary so that we support spreading of the mixins. For example: // '@font-face'?: Fontface | Fontface[] diff --git a/packages/mui-styled-engine-sc/src/index.js b/packages/mui-styled-engine-sc/src/index.js index c3abf854c79360..77f12d1e8ac1be 100644 --- a/packages/mui-styled-engine-sc/src/index.js +++ b/packages/mui-styled-engine-sc/src/index.js @@ -37,7 +37,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export const internal_processStyles = (tag, processor) => { +export function internal_processStyles(tag, processor) { // Styled-components attaches an instance to `componentStyle`. // https://github.com/styled-components/styled-components/blob/da8151762dcf72735ffba358173d4c097f6d5888/packages/styled-components/src/models/StyledComponent.ts#L257 // @@ -48,6 +48,11 @@ export const internal_processStyles = (tag, processor) => { } }; +// eslint-disable-next-line @typescript-eslint/naming-convention +export function internal_serializeStyles(styles) { + return styles; +} + export { ThemeContext, keyframes, css } from 'styled-components'; export { default as StyledEngineProvider } from './StyledEngineProvider'; export { default as GlobalStyles } from './GlobalStyles'; diff --git a/packages/mui-styled-engine/package.json b/packages/mui-styled-engine/package.json index d4f5850756d797..eb77e17f38bd14 100644 --- a/packages/mui-styled-engine/package.json +++ b/packages/mui-styled-engine/package.json @@ -39,6 +39,7 @@ "dependencies": { "@babel/runtime": "^7.25.0", "@emotion/cache": "^11.13.1", + "@emotion/serialize": "^1.3.1", "csstype": "^3.1.3", "prop-types": "^15.8.1" }, diff --git a/packages/mui-styled-engine/src/index.d.ts b/packages/mui-styled-engine/src/index.d.ts index 5434b517a6b029..3570850b66cf3e 100644 --- a/packages/mui-styled-engine/src/index.d.ts +++ b/packages/mui-styled-engine/src/index.d.ts @@ -26,6 +26,9 @@ export function internal_processStyles( processor: (styles: any) => any, ): void; +// eslint-disable-next-line @typescript-eslint/naming-convention +export function internal_serializeStyles

(styles: Interpolation

): object; + export interface SerializedStyles { name: string; styles: string; diff --git a/packages/mui-styled-engine/src/index.js b/packages/mui-styled-engine/src/index.js index c3cdee4cac8b34..86256014e78ebc 100644 --- a/packages/mui-styled-engine/src/index.js +++ b/packages/mui-styled-engine/src/index.js @@ -1,6 +1,7 @@ 'use client'; /* eslint-disable no-underscore-dangle */ import emStyled from '@emotion/styled'; +import { serializeStyles as emSerializeStyles } from '@emotion/serialize'; export default function styled(tag, options) { const stylesFactory = emStyled(tag, options); @@ -28,7 +29,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export const internal_processStyles = (tag, processor) => { +export function internal_processStyles(tag, processor) { // Emotion attaches all the styles as `__emotion_styles`. // Ref: https://github.com/emotion-js/emotion/blob/16d971d0da229596d6bcc39d282ba9753c9ee7cf/packages/styled/src/base.js#L186 if (Array.isArray(tag.__emotion_styles)) { @@ -36,6 +37,14 @@ export const internal_processStyles = (tag, processor) => { } }; +const wrapper = [] +// eslint-disable-next-line @typescript-eslint/naming-convention +export function internal_serializeStyles(styles) { + wrapper[0] = styles + return emSerializeStyles(wrapper); +} + + export { ThemeContext, keyframes, css } from '@emotion/react'; export { default as StyledEngineProvider } from './StyledEngineProvider'; export { default as GlobalStyles } from './GlobalStyles'; diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index 04f654cd788d2e..290d65fc641a5d 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -1,10 +1,15 @@ /* eslint-disable no-underscore-dangle */ -import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; +import styledEngineStyled, { + internal_processStyles as processStyles, + internal_serializeStyles as serializeStyles, +} from '@mui/styled-engine'; import { isPlainObject } from '@mui/utils/deepmerge'; import capitalize from '@mui/utils/capitalize'; import getDisplayName from '@mui/utils/getDisplayName'; import createTheme from '../createTheme'; import styleFunctionSx from '../styleFunctionSx'; +import memoProps from '../memoProps'; +import preprocessStyles from '../preprocessStyles'; export const systemDefaultTheme = createTheme(); @@ -17,22 +22,16 @@ function resolveTheme(themeId, theme, defaultTheme) { return isObjectEmpty(theme) ? defaultTheme : theme[themeId] || theme; } -const PROCESSED_PROPS = Symbol('mui.processed_props'); +const ORIGINAL_THEME = Symbol('mui.original_theme'); function attachTheme(props, themeId, defaultTheme) { - if (PROCESSED_PROPS in props) { - return props[PROCESSED_PROPS]; - } - - const processedProps = { - ...props, - theme: resolveTheme(themeId, props.theme, defaultTheme), - }; + const theme = resolveTheme(themeId, props.theme, defaultTheme); + const originalTheme = props.theme; - props[PROCESSED_PROPS] = processedProps; - processedProps[PROCESSED_PROPS] = processedProps; + props.theme = theme; + props[ORIGINAL_THEME] = originalTheme; - return processedProps; + return props; } function defaultOverridesResolver(slot) { @@ -42,52 +41,54 @@ function defaultOverridesResolver(slot) { return (_props, styles) => styles[slot]; } -function processStyle(style, props) { +function processStyle(props, style) { const resolvedStyle = typeof style === 'function' ? style(props) : style; if (Array.isArray(resolvedStyle)) { - return resolvedStyle.flatMap((subStyle) => processStyle(subStyle, props)); + return resolvedStyle.flatMap((subStyle) => processStyle(props, subStyle)); } if (Array.isArray(resolvedStyle?.variants)) { - const { variants, ...otherStyles } = resolvedStyle; + return processStyleVariants( + props, + resolvedStyle.variants, + [resolvedStyle] + ); + } - let result = otherStyles; - let mergedState; // We might not need it, initalized lazily + return resolvedStyle; +} - /* eslint-disable no-labels */ - variantLoop: for (let i = 0; i < variants.length; i += 1) { - const variant = variants[i]; +function processStyleVariants(props, variants, results = []) { + let mergedState; // We might not need it, initialized lazily - if (typeof variant.props === 'function') { - mergedState ??= { ...props, ...props.ownerState, ownerState: props.ownerState }; - if (!variant.props(mergedState)) { - continue; - } - } else { - for (const key in variant.props) { - if (props[key] !== variant.props[key] && props.ownerState?.[key] !== variant.props[key]) { - continue variantLoop; - } - } - } + /* eslint-disable no-labels */ + variantLoop: for (let i = 0; i < variants.length; i += 1) { + const variant = variants[i]; - if (!Array.isArray(result)) { - result = [result]; + if (typeof variant.props === 'function') { + mergedState ??= { ...props, ...props.ownerState, ownerState: props.ownerState }; + if (!variant.props(mergedState)) { + continue; } - if (typeof variant.style === 'function') { - mergedState ??= { ...props, ...props.ownerState, ownerState: props.ownerState }; - result.push(variant.style(mergedState)); - } else { - result.push(variant.style); + } else { + for (const key in variant.props) { + if (props[key] !== variant.props[key] && props.ownerState?.[key] !== variant.props[key]) { + continue variantLoop; + } } } - /* eslint-enable no-labels */ - return result; + if (typeof variant.style === 'function') { + mergedState ??= { ...props, ...props.ownerState, ownerState: props.ownerState }; + results.push(variant.style(mergedState)); + } else { + results.push(variant.style); + } } + /* eslint-enable no-labels */ - return resolvedStyle; + return results } export default function createStyled(input = {}) { @@ -98,14 +99,15 @@ export default function createStyled(input = {}) { slotShouldForwardProp = shouldForwardProp, } = input; - const systemSx = (props) => { - return styleFunctionSx(attachTheme(props, themeId, defaultTheme)); - }; - systemSx.__mui_systemSx = true; + function styleAttachTheme(props) { + attachTheme(props, themeId, defaultTheme) + } const styled = (tag, inputOptions = {}) => { - // Filter out the `sx` style function from the previous styled component to prevent unnecessary styles generated by the composite components. - processStyles(tag, (styles) => styles.filter((style) => !style?.__mui_systemSx)); + + // If `tag` is already a styled component, filter out the `sx` style function + // to prevent unnecessary styles generated by the composite components. + processStyles(tag, (styles) => styles.filter(style => style !== styleFunctionSx)); const { name: componentName, @@ -128,16 +130,6 @@ export default function createStyled(input = {}) { const skipSx = inputSkipSx || false; - let label; - - if (process.env.NODE_ENV !== 'production') { - if (componentName) { - // TODO v6: remove `lowercaseFirstLetter()` in the next major release - // For more details: https://github.com/mui/material-ui/pull/37908 - label = `${componentName}-${lowercaseFirstLetter(componentSlot || 'Root')}`; - } - } - let shouldForwardPropOption = shouldForwardProp; // TODO v6: remove `Root` in the next major release @@ -154,43 +146,53 @@ export default function createStyled(input = {}) { const defaultStyledResolver = styledEngineStyled(tag, { shouldForwardProp: shouldForwardPropOption, - label, + label: generateStyledLabel(componentName, componentSlot), ...options, }); - const transformStyleArg = (style) => { + const transformStyle = (style) => { // On the server Emotion doesn't use React.forwardRef for creating components, so the created // component stays as a function. This condition makes sure that we do not interpolate functions // which are basically components used as a selectors. - if ((typeof style === 'function' && style.__emotion_real !== style) || isPlainObject(style)) { - return (props) => processStyle(style, attachTheme(props, themeId, defaultTheme)); + if ((typeof style === 'function' && style.__emotion_real !== style)) { + return function styleFunctionProcessor(props) { + return processStyle(props, style) + }; + } + if (isPlainObject(style)) { + // PERF: We could skip the function calls if there are no variants. + const serialized = preprocessStyles(style); + return function styleObjectProcessor(props) { + return processStyle(props, serialized) + }; } return style; }; - const muiStyledResolver = (style, ...expressions) => { - let transformedStyle = transformStyleArg(style); - const expressionsWithDefaultTheme = expressions ? expressions.map(transformStyleArg) : []; + const muiStyledResolver = (expressionFirst, ...expressionsMiddle) => { + expressionFirst = transformStyle(expressionFirst) + + const expressionsHead = [] + const expressionsTail = [] + + // Preprocess `props` to set the scoped theme value. + // This must run before any other expression. + expressionsHead.push(styleAttachTheme); if (componentName && overridesResolver) { - expressionsWithDefaultTheme.push((props) => { - const theme = resolveTheme(themeId, props.theme, defaultTheme); - if ( - !theme.components || - !theme.components[componentName] || - !theme.components[componentName].styleOverrides - ) { + expressionsTail.push(function styleThemeOverrides(props) { + const theme = props.theme; + const styleOverrides = theme.components?.[componentName]?.styleOverrides; + if (!styleOverrides) { return null; } - const styleOverrides = theme.components[componentName].styleOverrides; const resolvedStyleOverrides = {}; - const propsWithTheme = attachTheme(props, themeId, defaultTheme); // TODO: v7 remove iteration and use `resolveStyleArg(styleOverrides[slot])` directly // eslint-disable-next-line guard-for-in for (const slotKey in styleOverrides) { - resolvedStyleOverrides[slotKey] = processStyle(styleOverrides[slotKey], propsWithTheme); + resolvedStyleOverrides[slotKey] = processStyle(props, styleOverrides[slotKey]); } return overridesResolver(props, resolvedStyleOverrides); @@ -198,47 +200,51 @@ export default function createStyled(input = {}) { } if (componentName && !skipVariantsResolver) { - expressionsWithDefaultTheme.push((props) => { - const theme = resolveTheme(themeId, props.theme, defaultTheme); + expressionsTail.push(function styleThemeVariants(props) { + const theme = props.theme; const themeVariants = theme?.components?.[componentName]?.variants; if (!themeVariants) { return null; } - return processStyle( - { variants: themeVariants }, - attachTheme(props, themeId, defaultTheme), - ); + return processStyleVariants(props, themeVariants); }); } if (!skipSx) { - expressionsWithDefaultTheme.push(systemSx); + expressionsTail.push(styleFunctionSx); } - const numOfCustomFnsApplied = expressionsWithDefaultTheme.length - expressions.length; + // This function can be called as a tagged template, so `style` would contain CSS + // `string[]` values and `expressions` would contain the interpolated values. + if (Array.isArray(expressionFirst)) { + // We need to add placeholders in the tagged template for the custom functions we have + // possibly added (attachTheme, overrides, variants, and sx). + const placeholdersHead = new Array(expressionsHead.length).fill(''); + const placeholdersTail = new Array(expressionsTail.length).fill(''); - if (Array.isArray(style) && numOfCustomFnsApplied > 0) { - const placeholders = new Array(numOfCustomFnsApplied).fill(''); - // If the type is array, than we need to add placeholders in the template for the overrides, variants and the sx styles. - transformedStyle = [...style, ...placeholders]; - transformedStyle.raw = [...style.raw, ...placeholders]; - } - const Component = defaultStyledResolver(transformedStyle, ...expressionsWithDefaultTheme); + let taggedStrings; + taggedStrings = [...placeholdersHead, ...expressionFirst, ...placeholdersTail]; + taggedStrings.raw = [...placeholdersHead, ...expressionFirst.raw, ...placeholdersTail]; - if (process.env.NODE_ENV !== 'production') { - let displayName; - if (componentName) { - displayName = `${componentName}${capitalize(componentSlot || '')}`; - } - if (displayName === undefined) { - displayName = `Styled(${getDisplayName(tag)})`; - } - Component.displayName = displayName; + expressionsHead.unshift(taggedStrings) + } else { + // Unless it's a tagged template case, we still want attachTheme to run first. + expressionsHead.push(expressionFirst) } + const expressions = [ + ...expressionsHead, + ...expressionsMiddle.map(transformStyle), + ...expressionsTail, + ] + + const Component = defaultStyledResolver(...expressions); if (tag.muiName) { Component.muiName = tag.muiName; } + if (process.env.NODE_ENV !== 'production') { + Component.displayName = generateDisplayName(componentName, componentSlot, tag); + } return Component; }; @@ -253,6 +259,27 @@ export default function createStyled(input = {}) { return styled; } +function generateDisplayName(componentName, componentSlot, tag) { + if (componentName) { + return `${componentName}${capitalize(componentSlot || '')}`; + } + return `Styled(${getDisplayName(tag)})`; +} + +function generateStyledLabel(componentName, componentSlot) { + let label; + + if (process.env.NODE_ENV !== 'production') { + if (componentName) { + // TODO v6: remove `lowercaseFirstLetter()` in the next major release + // For more details: https://github.com/mui/material-ui/pull/37908 + label = `${componentName}-${lowercaseFirstLetter(componentSlot || 'Root')}`; + } + } + + return label; +} + function isObjectEmpty(object) { // eslint-disable-next-line for (const _ in object) { diff --git a/packages/mui-system/src/memoProps.ts b/packages/mui-system/src/memoProps.ts new file mode 100644 index 00000000000000..a08623abaf9c80 --- /dev/null +++ b/packages/mui-system/src/memoProps.ts @@ -0,0 +1,66 @@ +import { + Interpolation, + internal_serializeStyles as serializeStyles, +} from '@mui/styled-engine'; + +type StyleFunction

= (props: P) => Interpolation

; + +/** + * Memoize style function on theme. + * Intended to be used in styled() calls that only need access to the theme. + */ +export default function memoProps

(styleFn: StyleFunction

) { + let lastValue: Interpolation

; + let lastAccessedProps = {} as Record; + + function didChange(newProps: P) { + for (const key in lastAccessedProps) { + // @ts-ignore Index newProps with key + if (newProps[key] !== lastAccessedProps[key]) { + return true; + } + } + return false; + } + + function createProxy(props: P) { + const proxy = {} + for (const key in props) { + if (Object.prototype.hasOwnProperty.call(props, key)) { + if (key === 'ownerState') { + Object.defineProperty(proxy, key, { + // @ts-ignore + value: createProxy(props[key]), + writable: false, + enumerable: true, + }) + } else { + Object.defineProperty(proxy, key, { + get: () => { + const value = props[key]; + lastAccessedProps[key] = value; + return value; + }, + enumerable: true, + }) + } + } + } + return proxy; + } + + return (props: P) => { + if (lastValue === undefined || didChange(props)) { + lastAccessedProps = {} + + // @ts-ignore + const proxy = createProxy(props) + + // @ts-ignore + const style = styleFn(proxy); + + lastValue = style; + } + return lastValue; + }; +} diff --git a/packages/mui-system/src/memoTheme.ts b/packages/mui-system/src/memoTheme.ts new file mode 100644 index 00000000000000..2e141c00901d25 --- /dev/null +++ b/packages/mui-system/src/memoTheme.ts @@ -0,0 +1,33 @@ +import { CSSInterpolation } from './index.d'; +import preprocessStyles from './preprocessStyles'; + + +type ThemeStyleFunction = (props: { theme: T }) => CSSInterpolation; + +// We need to pass an argument as `{ theme }` for PigmentCSS, but we don't want to +// allocate more objects. +const arg = { theme: undefined as any }; + +/** + * Memoize style function on theme. + * Intended to be used in styled() calls that only need access to the theme. + */ +export default function memoTheme(styleFn: ThemeStyleFunction) { + let lastValue: CSSInterpolation; + let lastTheme: T; + + return function styleMemoized(props: { theme: T }) { + let value = lastValue; + if (value === undefined || props.theme !== lastTheme) { + arg.theme = props.theme; + + value = styleFn(arg); + value = preprocessStyles(value); + + lastValue = value; + lastTheme = props.theme; + } + + return value; + }; +} diff --git a/packages/mui-system/src/preprocessStyles.ts b/packages/mui-system/src/preprocessStyles.ts new file mode 100644 index 00000000000000..3c6ad87a47b7e6 --- /dev/null +++ b/packages/mui-system/src/preprocessStyles.ts @@ -0,0 +1,31 @@ +import { internal_serializeStyles } from '@mui/styled-engine'; + +export default function preprocessStyles(styles: any) { + if (!styles || typeof styles !== 'object') { + debugger + } + + const variants = styles.variants + styles.variants = undefined + + const serialized = internal_serializeStyles(styles) as any + + // Not supported on styled-components + if (serialized === styles) { + return styles; + } + + if (variants) { + variants.forEach((variant: any) => { + if (typeof variant.style === 'function') { + return variant + } + + variant.style = internal_serializeStyles(variant.style) + }) + + serialized.variants = variants + } + + return serialized; +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aca058fc06b71d..6d21201fad1f1e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -358,7 +358,7 @@ importers: version: link:../../packages/mui-utils/build next: specifier: latest - version: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -368,7 +368,7 @@ importers: devDependencies: '@pigment-css/nextjs-plugin': specifier: 0.0.20 - version: 0.0.20(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + version: 0.0.20(@types/react@18.3.3)(next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@types/node': specifier: ^18.19.44 version: 18.19.44 @@ -1880,6 +1880,9 @@ importers: '@emotion/cache': specifier: ^11.13.1 version: 11.13.1 + '@emotion/serialize': + specifier: ^1.3.1 + version: 1.3.1 csstype: specifier: ^3.1.3 version: 3.1.3 @@ -3376,6 +3379,9 @@ packages: '@emotion/serialize@1.3.0': resolution: {integrity: sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==} + '@emotion/serialize@1.3.1': + resolution: {integrity: sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA==} + '@emotion/server@11.11.0': resolution: {integrity: sha512-6q89fj2z8VBTx9w93kJ5n51hsmtYuFPtZgnc1L8VzRx9ti4EU6EyvF6Nn1H1x3vcCQCF7u2dB2lY4AYJwUW4PA==} peerDependencies: @@ -3397,6 +3403,9 @@ packages: '@types/react': optional: true + '@emotion/unitless@0.10.0': + resolution: {integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==} + '@emotion/unitless@0.8.1': resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} @@ -4372,6 +4381,9 @@ packages: '@next/env@14.2.5': resolution: {integrity: sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==} + '@next/env@14.2.6': + resolution: {integrity: sha512-bs5DFKV+08EjWrl8EB+KKqev1ZTNONH1vFCaHh911aaB362NnP32UDTbE9VQhyiAgbFqJsfDkSxFERNDDb3j0g==} + '@next/eslint-plugin-next@14.2.5': resolution: {integrity: sha512-LY3btOpPh+OTIpviNojDpUdIbHW9j0JBYBjsIp8IxtDFfYFyORvw3yNq6N231FVqQA7n7lwaf7xHbVJlA1ED7g==} @@ -4381,54 +4393,108 @@ packages: cpu: [arm64] os: [darwin] + '@next/swc-darwin-arm64@14.2.6': + resolution: {integrity: sha512-BtJZb+hYXGaVJJivpnDoi3JFVn80SHKCiiRUW3kk1SY6UCUy5dWFFSbh+tGi5lHAughzeduMyxbLt3pspvXNSg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + '@next/swc-darwin-x64@14.2.5': resolution: {integrity: sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] + '@next/swc-darwin-x64@14.2.6': + resolution: {integrity: sha512-ZHRbGpH6KHarzm6qEeXKSElSXh8dS2DtDPjQt3IMwY8QVk7GbdDYjvV4NgSnDA9huGpGgnyy3tH8i5yHCqVkiQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + '@next/swc-linux-arm64-gnu@14.2.5': resolution: {integrity: sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + '@next/swc-linux-arm64-gnu@14.2.6': + resolution: {integrity: sha512-O4HqUEe3ZvKshXHcDUXn1OybN4cSZg7ZdwHJMGCXSUEVUqGTJVsOh17smqilIjooP/sIJksgl+1kcf2IWMZWHg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@next/swc-linux-arm64-musl@14.2.5': resolution: {integrity: sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + '@next/swc-linux-arm64-musl@14.2.6': + resolution: {integrity: sha512-xUcdhr2hfalG8RDDGSFxQ75yOG894UlmFS4K2M0jLrUhauRBGOtUOxoDVwiIIuZQwZ3Y5hDsazNjdYGB0cQ9yQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@next/swc-linux-x64-gnu@14.2.5': resolution: {integrity: sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + '@next/swc-linux-x64-gnu@14.2.6': + resolution: {integrity: sha512-InosKxw8UMcA/wEib5n2QttwHSKHZHNSbGcMepBM0CTcNwpxWzX32KETmwbhKod3zrS8n1vJ+DuJKbL9ZAB0Ag==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + '@next/swc-linux-x64-musl@14.2.5': resolution: {integrity: sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + '@next/swc-linux-x64-musl@14.2.6': + resolution: {integrity: sha512-d4QXfJmt5pGJ7cG8qwxKSBnO5AXuKAFYxV7qyDRHnUNvY/dgDh+oX292gATpB2AAHgjdHd5ks1wXxIEj6muLUQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + '@next/swc-win32-arm64-msvc@14.2.5': resolution: {integrity: sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] + '@next/swc-win32-arm64-msvc@14.2.6': + resolution: {integrity: sha512-AlgIhk4/G+PzOG1qdF1b05uKTMsuRatFlFzAi5G8RZ9h67CVSSuZSbqGHbJDlcV1tZPxq/d4G0q6qcHDKWf4aQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + '@next/swc-win32-ia32-msvc@14.2.5': resolution: {integrity: sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] + '@next/swc-win32-ia32-msvc@14.2.6': + resolution: {integrity: sha512-hNukAxq7hu4o5/UjPp5jqoBEtrpCbOmnUqZSKNJG8GrUVzfq0ucdhQFVrHcLRMvQcwqqDh1a5AJN9ORnNDpgBQ==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + '@next/swc-win32-x64-msvc@14.2.5': resolution: {integrity: sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==} engines: {node: '>= 10'} cpu: [x64] os: [win32] + '@next/swc-win32-x64-msvc@14.2.6': + resolution: {integrity: sha512-NANtw+ead1rSDK1jxmzq3TYkl03UNK2KHqUYf1nIhNci6NkeqBD4s1njSzYGIlSHxCK+wSaL8RXZm4v+NF/pMw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + '@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3': resolution: {integrity: sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==} @@ -9632,6 +9698,24 @@ packages: sass: optional: true + next@14.2.6: + resolution: {integrity: sha512-57Su7RqXs5CBKKKOagt8gPhMM3CpjgbeQhrtei2KLAA1vTNm7jfKS+uDARkSW8ZETUflDCBIsUKGSyQdRs4U4g==} + engines: {node: '>=18.17.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + '@playwright/test': ^1.41.2 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + '@playwright/test': + optional: true + sass: + optional: true + nice-napi@1.0.2: resolution: {integrity: sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==} os: ['!win32'] @@ -13875,7 +13959,7 @@ snapshots: '@babel/runtime': 7.25.0 '@emotion/hash': 0.9.2 '@emotion/memoize': 0.9.0 - '@emotion/serialize': 1.3.0 + '@emotion/serialize': 1.3.1 babel-plugin-macros: 3.1.0 convert-source-map: 1.8.0 escape-string-regexp: 4.0.0 @@ -13936,7 +14020,7 @@ snapshots: '@babel/runtime': 7.25.0 '@emotion/babel-plugin': 11.12.0 '@emotion/cache': 11.13.1 - '@emotion/serialize': 1.3.0 + '@emotion/serialize': 1.3.1 '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.3.1) '@emotion/utils': 1.4.0 '@emotion/weak-memoize': 0.4.0 @@ -13955,6 +14039,14 @@ snapshots: '@emotion/utils': 1.4.0 csstype: 3.1.3 + '@emotion/serialize@1.3.1': + dependencies: + '@emotion/hash': 0.9.2 + '@emotion/memoize': 0.9.0 + '@emotion/unitless': 0.10.0 + '@emotion/utils': 1.4.0 + csstype: 3.1.3 + '@emotion/server@11.11.0(@emotion/css@11.11.2)': dependencies: '@emotion/utils': 1.4.0 @@ -13972,7 +14064,7 @@ snapshots: '@emotion/babel-plugin': 11.12.0 '@emotion/is-prop-valid': 1.3.0 '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) - '@emotion/serialize': 1.3.0 + '@emotion/serialize': 1.3.1 '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.3.1) '@emotion/utils': 1.4.0 react: 18.3.1 @@ -13981,6 +14073,8 @@ snapshots: transitivePeerDependencies: - supports-color + '@emotion/unitless@0.10.0': {} + '@emotion/unitless@0.8.1': {} '@emotion/unitless@0.9.0': {} @@ -14917,6 +15011,8 @@ snapshots: '@next/env@14.2.5': {} + '@next/env@14.2.6': {} + '@next/eslint-plugin-next@14.2.5': dependencies: glob: 10.3.10 @@ -14924,30 +15020,57 @@ snapshots: '@next/swc-darwin-arm64@14.2.5': optional: true + '@next/swc-darwin-arm64@14.2.6': + optional: true + '@next/swc-darwin-x64@14.2.5': optional: true + '@next/swc-darwin-x64@14.2.6': + optional: true + '@next/swc-linux-arm64-gnu@14.2.5': optional: true + '@next/swc-linux-arm64-gnu@14.2.6': + optional: true + '@next/swc-linux-arm64-musl@14.2.5': optional: true + '@next/swc-linux-arm64-musl@14.2.6': + optional: true + '@next/swc-linux-x64-gnu@14.2.5': optional: true + '@next/swc-linux-x64-gnu@14.2.6': + optional: true + '@next/swc-linux-x64-musl@14.2.5': optional: true + '@next/swc-linux-x64-musl@14.2.6': + optional: true + '@next/swc-win32-arm64-msvc@14.2.5': optional: true + '@next/swc-win32-arm64-msvc@14.2.6': + optional: true + '@next/swc-win32-ia32-msvc@14.2.5': optional: true + '@next/swc-win32-ia32-msvc@14.2.6': + optional: true + '@next/swc-win32-x64-msvc@14.2.5': optional: true + '@next/swc-win32-x64-msvc@14.2.6': + optional: true + '@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3': optional: true @@ -15380,10 +15503,10 @@ snapshots: '@opentelemetry/api@1.8.0': optional: true - '@pigment-css/nextjs-plugin@0.0.20(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@pigment-css/nextjs-plugin@0.0.20(@types/react@18.3.3)(next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@pigment-css/unplugin': 0.0.20(@types/react@18.3.3)(react@18.3.1) - next: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + next: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) transitivePeerDependencies: - '@types/react' - react @@ -21658,6 +21781,33 @@ snapshots: - '@babel/core' - babel-plugin-macros + next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + dependencies: + '@next/env': 14.2.6 + '@swc/helpers': 0.5.5 + busboy: 1.6.0 + caniuse-lite: 1.0.30001649 + graceful-fs: 4.2.11 + postcss: 8.4.31 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + styled-jsx: 5.1.1(@babel/core@7.25.2)(babel-plugin-macros@3.1.0)(react@18.3.1) + optionalDependencies: + '@next/swc-darwin-arm64': 14.2.6 + '@next/swc-darwin-x64': 14.2.6 + '@next/swc-linux-arm64-gnu': 14.2.6 + '@next/swc-linux-arm64-musl': 14.2.6 + '@next/swc-linux-x64-gnu': 14.2.6 + '@next/swc-linux-x64-musl': 14.2.6 + '@next/swc-win32-arm64-msvc': 14.2.6 + '@next/swc-win32-ia32-msvc': 14.2.6 + '@next/swc-win32-x64-msvc': 14.2.6 + '@opentelemetry/api': 1.8.0 + '@playwright/test': 1.46.1 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + nice-napi@1.0.2: dependencies: node-addon-api: 3.2.1 From f7d75a69361e31fcd41dde1036330cf5c9a749ce Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 23 Aug 2024 00:46:39 -0400 Subject: [PATCH 02/26] lint --- packages/mui-system/src/createStyled/createStyled.js | 6 +----- packages/mui-system/src/preprocessStyles.ts | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index 290d65fc641a5d..3606fa2a319020 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -1,14 +1,10 @@ /* eslint-disable no-underscore-dangle */ -import styledEngineStyled, { - internal_processStyles as processStyles, - internal_serializeStyles as serializeStyles, -} from '@mui/styled-engine'; +import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; import { isPlainObject } from '@mui/utils/deepmerge'; import capitalize from '@mui/utils/capitalize'; import getDisplayName from '@mui/utils/getDisplayName'; import createTheme from '../createTheme'; import styleFunctionSx from '../styleFunctionSx'; -import memoProps from '../memoProps'; import preprocessStyles from '../preprocessStyles'; export const systemDefaultTheme = createTheme(); diff --git a/packages/mui-system/src/preprocessStyles.ts b/packages/mui-system/src/preprocessStyles.ts index 3c6ad87a47b7e6..efd01c143fbde4 100644 --- a/packages/mui-system/src/preprocessStyles.ts +++ b/packages/mui-system/src/preprocessStyles.ts @@ -1,10 +1,6 @@ import { internal_serializeStyles } from '@mui/styled-engine'; export default function preprocessStyles(styles: any) { - if (!styles || typeof styles !== 'object') { - debugger - } - const variants = styles.variants styles.variants = undefined From e19bcf79b38d4112cfb91bfb69d3a64ecc1c58fc Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 23 Aug 2024 00:48:56 -0400 Subject: [PATCH 03/26] lint --- packages/mui-system/src/createStyled/createStyled.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index 3606fa2a319020..de13ba0db574ef 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -222,9 +222,10 @@ export default function createStyled(input = {}) { taggedStrings = [...placeholdersHead, ...expressionFirst, ...placeholdersTail]; taggedStrings.raw = [...placeholdersHead, ...expressionFirst.raw, ...placeholdersTail]; + // The only case where we put something before `attachTheme` expressionsHead.unshift(taggedStrings) } else { - // Unless it's a tagged template case, we still want attachTheme to run first. + // But otherwise, we always want attachTheme to stay first. expressionsHead.push(expressionFirst) } From 61f432e3e8acd8ae2136575ddbcf21c0cb005c78 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 23 Aug 2024 00:51:09 -0400 Subject: [PATCH 04/26] lint --- packages/mui-system/src/memoProps.ts | 66 ---------------------------- 1 file changed, 66 deletions(-) delete mode 100644 packages/mui-system/src/memoProps.ts diff --git a/packages/mui-system/src/memoProps.ts b/packages/mui-system/src/memoProps.ts deleted file mode 100644 index a08623abaf9c80..00000000000000 --- a/packages/mui-system/src/memoProps.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { - Interpolation, - internal_serializeStyles as serializeStyles, -} from '@mui/styled-engine'; - -type StyleFunction

= (props: P) => Interpolation

; - -/** - * Memoize style function on theme. - * Intended to be used in styled() calls that only need access to the theme. - */ -export default function memoProps

(styleFn: StyleFunction

) { - let lastValue: Interpolation

; - let lastAccessedProps = {} as Record; - - function didChange(newProps: P) { - for (const key in lastAccessedProps) { - // @ts-ignore Index newProps with key - if (newProps[key] !== lastAccessedProps[key]) { - return true; - } - } - return false; - } - - function createProxy(props: P) { - const proxy = {} - for (const key in props) { - if (Object.prototype.hasOwnProperty.call(props, key)) { - if (key === 'ownerState') { - Object.defineProperty(proxy, key, { - // @ts-ignore - value: createProxy(props[key]), - writable: false, - enumerable: true, - }) - } else { - Object.defineProperty(proxy, key, { - get: () => { - const value = props[key]; - lastAccessedProps[key] = value; - return value; - }, - enumerable: true, - }) - } - } - } - return proxy; - } - - return (props: P) => { - if (lastValue === undefined || didChange(props)) { - lastAccessedProps = {} - - // @ts-ignore - const proxy = createProxy(props) - - // @ts-ignore - const style = styleFn(proxy); - - lastValue = style; - } - return lastValue; - }; -} From 2cf055730d54627010766917c1e464a0d576a461 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 23 Aug 2024 01:19:23 -0400 Subject: [PATCH 05/26] lint --- packages/mui-system/src/preprocessStyles.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/mui-system/src/preprocessStyles.ts b/packages/mui-system/src/preprocessStyles.ts index efd01c143fbde4..fea1e708a28174 100644 --- a/packages/mui-system/src/preprocessStyles.ts +++ b/packages/mui-system/src/preprocessStyles.ts @@ -2,9 +2,11 @@ import { internal_serializeStyles } from '@mui/styled-engine'; export default function preprocessStyles(styles: any) { const variants = styles.variants - styles.variants = undefined + // Avoid passing `style.variants` to emotion, it will pollute the styles. + styles.variants = undefined const serialized = internal_serializeStyles(styles) as any + styles.variants = variants // Not supported on styled-components if (serialized === styles) { From bce2ac069404a63e18bdf28adb454317668f1306 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 23 Aug 2024 09:10:12 -0400 Subject: [PATCH 06/26] refactor: lints --- .../src/createStyled/createStyled.js | 26 +++++++++---------- packages/mui-system/src/memoTheme.ts | 3 +-- packages/mui-system/src/preprocessStyles.ts | 10 +++---- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index de13ba0db574ef..43235e431daacf 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -165,9 +165,7 @@ export default function createStyled(input = {}) { return style; }; - const muiStyledResolver = (expressionFirst, ...expressionsMiddle) => { - expressionFirst = transformStyle(expressionFirst) - + const muiStyledResolver = (...expressionsMiddle) => { const expressionsHead = [] const expressionsTail = [] @@ -210,23 +208,25 @@ export default function createStyled(input = {}) { expressionsTail.push(styleFunctionSx); } - // This function can be called as a tagged template, so `style` would contain CSS - // `string[]` values and `expressions` would contain the interpolated values. - if (Array.isArray(expressionFirst)) { + // This function can be called as a tagged template, so the first argument would contain + // CSS `string[]` values. + if (Array.isArray(expressionsMiddle[0])) { + const inputStrings = expressionsMiddle.shift(); + // We need to add placeholders in the tagged template for the custom functions we have // possibly added (attachTheme, overrides, variants, and sx). const placeholdersHead = new Array(expressionsHead.length).fill(''); const placeholdersTail = new Array(expressionsTail.length).fill(''); - let taggedStrings; - taggedStrings = [...placeholdersHead, ...expressionFirst, ...placeholdersTail]; - taggedStrings.raw = [...placeholdersHead, ...expressionFirst.raw, ...placeholdersTail]; + let outputStrings; + // prettier-ignore + { + outputStrings = [...placeholdersHead, ...inputStrings, ...placeholdersTail]; + outputStrings.raw = [...placeholdersHead, ...inputStrings.raw, ...placeholdersTail]; + } // The only case where we put something before `attachTheme` - expressionsHead.unshift(taggedStrings) - } else { - // But otherwise, we always want attachTheme to stay first. - expressionsHead.push(expressionFirst) + expressionsHead.unshift(outputStrings) } const expressions = [ diff --git a/packages/mui-system/src/memoTheme.ts b/packages/mui-system/src/memoTheme.ts index 2e141c00901d25..664fae046e1884 100644 --- a/packages/mui-system/src/memoTheme.ts +++ b/packages/mui-system/src/memoTheme.ts @@ -21,8 +21,7 @@ export default function memoTheme(styleFn: ThemeStyleFunction) { if (value === undefined || props.theme !== lastTheme) { arg.theme = props.theme; - value = styleFn(arg); - value = preprocessStyles(value); + value = preprocessStyles(styleFn(arg)); lastValue = value; lastTheme = props.theme; diff --git a/packages/mui-system/src/preprocessStyles.ts b/packages/mui-system/src/preprocessStyles.ts index fea1e708a28174..12026923af579f 100644 --- a/packages/mui-system/src/preprocessStyles.ts +++ b/packages/mui-system/src/preprocessStyles.ts @@ -4,9 +4,9 @@ export default function preprocessStyles(styles: any) { const variants = styles.variants // Avoid passing `style.variants` to emotion, it will pollute the styles. - styles.variants = undefined + if (variants) { styles.variants = undefined } const serialized = internal_serializeStyles(styles) as any - styles.variants = variants + if (variants) { styles.variants = variants } // Not supported on styled-components if (serialized === styles) { @@ -15,11 +15,9 @@ export default function preprocessStyles(styles: any) { if (variants) { variants.forEach((variant: any) => { - if (typeof variant.style === 'function') { - return variant + if (typeof variant.style !== 'function') { + variant.style = internal_serializeStyles(variant.style) } - - variant.style = internal_serializeStyles(variant.style) }) serialized.variants = variants From db0bf768c8faad106153ab60268abe8506deaee6 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 23 Aug 2024 09:17:43 -0400 Subject: [PATCH 07/26] lint --- packages/mui-material/src/Paper/Paper.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mui-material/src/Paper/Paper.js b/packages/mui-material/src/Paper/Paper.js index d458332a3b3b80..9ae2f32861649e 100644 --- a/packages/mui-material/src/Paper/Paper.js +++ b/packages/mui-material/src/Paper/Paper.js @@ -47,7 +47,6 @@ const PaperRoot = styled('div', { transition: theme.transitions.create('box-shadow'), variants: [ { - // XXX: inverse this style to use `props: { square: true }` props: ({ ownerState }) => !ownerState.square, style: { borderRadius: theme.shape.borderRadius, From c347735e252cfd2475f49c73d6ae05c50adc7f43 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 04:04:08 -0400 Subject: [PATCH 08/26] refactor: add .isProcessed --- packages/mui-styled-engine-sc/src/index.d.ts | 1 - packages/mui-styled-engine-sc/src/index.js | 2 +- packages/mui-styled-engine/src/index.js | 7 +- .../src/createStyled/createStyled.js | 77 ++++++++----------- packages/mui-system/src/memoTheme.ts | 3 +- packages/mui-system/src/preprocessStyles.ts | 25 +++--- 6 files changed, 50 insertions(+), 65 deletions(-) diff --git a/packages/mui-styled-engine-sc/src/index.d.ts b/packages/mui-styled-engine-sc/src/index.d.ts index 7b5d25cb8b8389..835db3f8d311bd 100644 --- a/packages/mui-styled-engine-sc/src/index.d.ts +++ b/packages/mui-styled-engine-sc/src/index.d.ts @@ -84,7 +84,6 @@ export function internal_processStyles( // eslint-disable-next-line @typescript-eslint/naming-convention export function internal_serializeStyles

(styles: Interpolation

): object; - // These are the same as the ones in @mui/styled-engine // CSS.PropertiesFallback are necessary so that we support spreading of the mixins. For example: // '@font-face'?: Fontface | Fontface[] diff --git a/packages/mui-styled-engine-sc/src/index.js b/packages/mui-styled-engine-sc/src/index.js index 77f12d1e8ac1be..267ed25fb3dab9 100644 --- a/packages/mui-styled-engine-sc/src/index.js +++ b/packages/mui-styled-engine-sc/src/index.js @@ -46,7 +46,7 @@ export function internal_processStyles(tag, processor) { if (tag.componentStyle) { tag.componentStyle.rules = processor(tag.componentStyle.rules); } -}; +} // eslint-disable-next-line @typescript-eslint/naming-convention export function internal_serializeStyles(styles) { diff --git a/packages/mui-styled-engine/src/index.js b/packages/mui-styled-engine/src/index.js index 86256014e78ebc..24e2440101f40f 100644 --- a/packages/mui-styled-engine/src/index.js +++ b/packages/mui-styled-engine/src/index.js @@ -35,16 +35,15 @@ export function internal_processStyles(tag, processor) { if (Array.isArray(tag.__emotion_styles)) { tag.__emotion_styles = processor(tag.__emotion_styles); } -}; +} -const wrapper = [] +const wrapper = []; // eslint-disable-next-line @typescript-eslint/naming-convention export function internal_serializeStyles(styles) { - wrapper[0] = styles + wrapper[0] = styles; return emSerializeStyles(wrapper); } - export { ThemeContext, keyframes, css } from '@emotion/react'; export { default as StyledEngineProvider } from './StyledEngineProvider'; export { default as GlobalStyles } from './GlobalStyles'; diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index 43235e431daacf..eaeefff0b71a14 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -1,4 +1,5 @@ /* eslint-disable no-underscore-dangle */ +/* eslint-disable no-labels */ import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; import { isPlainObject } from '@mui/utils/deepmerge'; import capitalize from '@mui/utils/capitalize'; @@ -14,22 +15,6 @@ export function shouldForwardProp(prop) { return prop !== 'ownerState' && prop !== 'theme' && prop !== 'sx' && prop !== 'as'; } -function resolveTheme(themeId, theme, defaultTheme) { - return isObjectEmpty(theme) ? defaultTheme : theme[themeId] || theme; -} - -const ORIGINAL_THEME = Symbol('mui.original_theme'); - -function attachTheme(props, themeId, defaultTheme) { - const theme = resolveTheme(themeId, props.theme, defaultTheme); - const originalTheme = props.theme; - - props.theme = theme; - props[ORIGINAL_THEME] = originalTheme; - - return props; -} - function defaultOverridesResolver(slot) { if (!slot) { return null; @@ -37,28 +22,35 @@ function defaultOverridesResolver(slot) { return (_props, styles) => styles[slot]; } +function attachTheme(props, themeId, defaultTheme) { + props.theme = isObjectEmpty(props.theme) ? defaultTheme : props.theme[themeId] || props.theme; +} + function processStyle(props, style) { - const resolvedStyle = typeof style === 'function' ? style(props) : style; + let resolvedStyle = typeof style === 'function' ? style(props) : style; if (Array.isArray(resolvedStyle)) { return resolvedStyle.flatMap((subStyle) => processStyle(props, subStyle)); } + let rootStyle; + if (resolvedStyle.isProcessed) { + rootStyle = resolvedStyle.style; + } else { + const { variants, ...otherStyles } = resolvedStyle; + rootStyle = otherStyles; + } + if (Array.isArray(resolvedStyle?.variants)) { - return processStyleVariants( - props, - resolvedStyle.variants, - [resolvedStyle] - ); + return processStyleVariants(props, resolvedStyle.variants, [rootStyle]); } - return resolvedStyle; + return rootStyle; } function processStyleVariants(props, variants, results = []) { let mergedState; // We might not need it, initialized lazily - /* eslint-disable no-labels */ variantLoop: for (let i = 0; i < variants.length; i += 1) { const variant = variants[i]; @@ -82,9 +74,8 @@ function processStyleVariants(props, variants, results = []) { results.push(variant.style); } } - /* eslint-enable no-labels */ - return results + return results; } export default function createStyled(input = {}) { @@ -96,14 +87,13 @@ export default function createStyled(input = {}) { } = input; function styleAttachTheme(props) { - attachTheme(props, themeId, defaultTheme) + attachTheme(props, themeId, defaultTheme); } const styled = (tag, inputOptions = {}) => { - // If `tag` is already a styled component, filter out the `sx` style function // to prevent unnecessary styles generated by the composite components. - processStyles(tag, (styles) => styles.filter(style => style !== styleFunctionSx)); + processStyles(tag, (styles) => styles.filter((style) => style !== styleFunctionSx)); const { name: componentName, @@ -150,24 +140,27 @@ export default function createStyled(input = {}) { // On the server Emotion doesn't use React.forwardRef for creating components, so the created // component stays as a function. This condition makes sure that we do not interpolate functions // which are basically components used as a selectors. - if ((typeof style === 'function' && style.__emotion_real !== style)) { + if (typeof style === 'function' && style.__emotion_real !== style) { return function styleFunctionProcessor(props) { - return processStyle(props, style) + return processStyle(props, style); }; } if (isPlainObject(style)) { - // PERF: We could skip the function calls if there are no variants. const serialized = preprocessStyles(style); + if (!serialized.variants) { + return serialized.style; + } return function styleObjectProcessor(props) { - return processStyle(props, serialized) + return processStyle(props, serialized); }; } return style; }; - const muiStyledResolver = (...expressionsMiddle) => { - const expressionsHead = [] - const expressionsTail = [] + const muiStyledResolver = (...expressionsInput) => { + const expressionsHead = []; + const expressionsBody = expressionsInput.map(transformStyle); + const expressionsTail = []; // Preprocess `props` to set the scoped theme value. // This must run before any other expression. @@ -210,8 +203,8 @@ export default function createStyled(input = {}) { // This function can be called as a tagged template, so the first argument would contain // CSS `string[]` values. - if (Array.isArray(expressionsMiddle[0])) { - const inputStrings = expressionsMiddle.shift(); + if (Array.isArray(expressionsBody[0])) { + const inputStrings = expressionsBody.shift(); // We need to add placeholders in the tagged template for the custom functions we have // possibly added (attachTheme, overrides, variants, and sx). @@ -226,14 +219,10 @@ export default function createStyled(input = {}) { } // The only case where we put something before `attachTheme` - expressionsHead.unshift(outputStrings) + expressionsHead.unshift(outputStrings); } - const expressions = [ - ...expressionsHead, - ...expressionsMiddle.map(transformStyle), - ...expressionsTail, - ] + const expressions = [...expressionsHead, ...expressionsBody, ...expressionsTail]; const Component = defaultStyledResolver(...expressions); if (tag.muiName) { diff --git a/packages/mui-system/src/memoTheme.ts b/packages/mui-system/src/memoTheme.ts index 664fae046e1884..9b00e5bd42f5a4 100644 --- a/packages/mui-system/src/memoTheme.ts +++ b/packages/mui-system/src/memoTheme.ts @@ -1,7 +1,6 @@ import { CSSInterpolation } from './index.d'; import preprocessStyles from './preprocessStyles'; - type ThemeStyleFunction = (props: { theme: T }) => CSSInterpolation; // We need to pass an argument as `{ theme }` for PigmentCSS, but we don't want to @@ -12,7 +11,7 @@ const arg = { theme: undefined as any }; * Memoize style function on theme. * Intended to be used in styled() calls that only need access to the theme. */ -export default function memoTheme(styleFn: ThemeStyleFunction) { +export default function unstable_memoTheme(styleFn: ThemeStyleFunction) { let lastValue: CSSInterpolation; let lastTheme: T; diff --git a/packages/mui-system/src/preprocessStyles.ts b/packages/mui-system/src/preprocessStyles.ts index 12026923af579f..68a9ba2c4f45f6 100644 --- a/packages/mui-system/src/preprocessStyles.ts +++ b/packages/mui-system/src/preprocessStyles.ts @@ -1,27 +1,26 @@ import { internal_serializeStyles } from '@mui/styled-engine'; -export default function preprocessStyles(styles: any) { - const variants = styles.variants +export default function preprocessStyles(input: any) { + const { variants, ...style } = input; - // Avoid passing `style.variants` to emotion, it will pollute the styles. - if (variants) { styles.variants = undefined } - const serialized = internal_serializeStyles(styles) as any - if (variants) { styles.variants = variants } + const result = { + variants, + style: internal_serializeStyles(style) as any, + isProcessed: true, + }; // Not supported on styled-components - if (serialized === styles) { - return styles; + if (result.style === style) { + return result; } if (variants) { variants.forEach((variant: any) => { if (typeof variant.style !== 'function') { - variant.style = internal_serializeStyles(variant.style) + variant.style = internal_serializeStyles(variant.style); } - }) - - serialized.variants = variants + }); } - return serialized; + return result; } From 094443190fd1bab80b867a1c33f0a083c03cccba Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 04:06:30 -0400 Subject: [PATCH 09/26] lint --- packages/mui-system/src/createStyled/createStyled.js | 8 +++++--- packages/mui-system/src/memoTheme.ts | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index eaeefff0b71a14..650ada72aca9f1 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -1,5 +1,3 @@ -/* eslint-disable no-underscore-dangle */ -/* eslint-disable no-labels */ import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; import { isPlainObject } from '@mui/utils/deepmerge'; import capitalize from '@mui/utils/capitalize'; @@ -8,6 +6,10 @@ import createTheme from '../createTheme'; import styleFunctionSx from '../styleFunctionSx'; import preprocessStyles from '../preprocessStyles'; +/* eslint-disable no-underscore-dangle */ +/* eslint-disable no-labels */ +/* eslint-disable no-lone-blocks */ + export const systemDefaultTheme = createTheme(); // Update /system/styled/#api in case if this changes @@ -27,7 +29,7 @@ function attachTheme(props, themeId, defaultTheme) { } function processStyle(props, style) { - let resolvedStyle = typeof style === 'function' ? style(props) : style; + const resolvedStyle = typeof style === 'function' ? style(props) : style; if (Array.isArray(resolvedStyle)) { return resolvedStyle.flatMap((subStyle) => processStyle(props, subStyle)); diff --git a/packages/mui-system/src/memoTheme.ts b/packages/mui-system/src/memoTheme.ts index 9b00e5bd42f5a4..a3638b857f2848 100644 --- a/packages/mui-system/src/memoTheme.ts +++ b/packages/mui-system/src/memoTheme.ts @@ -1,6 +1,8 @@ import { CSSInterpolation } from './index.d'; import preprocessStyles from './preprocessStyles'; +/* eslint-disable @typescript-eslint/naming-convention */ + type ThemeStyleFunction = (props: { theme: T }) => CSSInterpolation; // We need to pass an argument as `{ theme }` for PigmentCSS, but we don't want to From 25cfd5cf879b65d7aa8a39f1352b5fe615c35eb2 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 04:16:50 -0400 Subject: [PATCH 10/26] lint --- pnpm-lock.yaml | 72 ++++++-------------------------------------------- 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3ee862fc979684..7dc251616fc5d4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1578,10 +1578,10 @@ importers: version: 7.25.0 '@emotion/react': specifier: ^11.5.0 - version: 11.13.0(@types/react@18.3.4)(react@18.3.1) + version: 11.13.3(@types/react@18.3.4)(react@18.3.1) '@emotion/styled': specifier: ^11.3.0 - version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) + version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/base': specifier: workspace:* version: link:../mui-base/build @@ -1655,10 +1655,10 @@ importers: version: 7.25.0 '@emotion/react': specifier: ^11.5.0 - version: 11.13.0(@types/react@18.3.4)(react@18.3.1) + version: 11.13.3(@types/react@18.3.4)(react@18.3.1) '@emotion/styled': specifier: ^11.3.0 - version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) + version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/base': specifier: workspace:* version: link:../mui-base/build @@ -1723,10 +1723,10 @@ importers: version: 7.25.0 '@emotion/react': specifier: ^11.5.0 - version: 11.13.0(@types/react@18.3.4)(react@18.3.1) + version: 11.13.3(@types/react@18.3.4)(react@18.3.1) '@emotion/styled': specifier: ^11.3.0 - version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) + version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/core-downloads-tracker': specifier: workspace:^ version: link:../mui-core-downloads-tracker/build @@ -3386,15 +3386,6 @@ packages: '@emotion/memoize@0.9.0': resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==} - '@emotion/react@11.13.0': - resolution: {integrity: sha512-WkL+bw1REC2VNV1goQyfxjx1GYJkcc23CRQkXX+vZNLINyfI7o+uUn/rTGPt/xJ3bJHd5GcljgnxHf4wRw5VWQ==} - peerDependencies: - '@types/react': '*' - react: '>=16.8.0' - peerDependenciesMeta: - '@types/react': - optional: true - '@emotion/react@11.13.3': resolution: {integrity: sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==} peerDependencies: @@ -3404,9 +3395,6 @@ packages: '@types/react': optional: true - '@emotion/serialize@1.3.0': - resolution: {integrity: sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==} - '@emotion/serialize@1.3.1': resolution: {integrity: sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA==} @@ -3437,9 +3425,6 @@ packages: '@emotion/unitless@0.8.1': resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} - '@emotion/unitless@0.9.0': - resolution: {integrity: sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==} - '@emotion/use-insertion-effect-with-fallbacks@1.1.0': resolution: {integrity: sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==} peerDependencies: @@ -14012,7 +13997,7 @@ snapshots: dependencies: '@emotion/babel-plugin': 11.12.0 '@emotion/cache': 11.13.1 - '@emotion/serialize': 1.3.0 + '@emotion/serialize': 1.3.1 '@emotion/sheet': 1.4.0 '@emotion/utils': 1.4.0 transitivePeerDependencies: @@ -14046,22 +14031,6 @@ snapshots: '@emotion/memoize@0.9.0': {} - '@emotion/react@11.13.0(@types/react@18.3.4)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@emotion/babel-plugin': 11.12.0 - '@emotion/cache': 11.13.1 - '@emotion/serialize': 1.3.1 - '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.3.1) - '@emotion/utils': 1.4.0 - '@emotion/weak-memoize': 0.4.0 - hoist-non-react-statics: 3.3.2 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.4 - transitivePeerDependencies: - - supports-color - '@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 @@ -14078,14 +14047,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@emotion/serialize@1.3.0': - dependencies: - '@emotion/hash': 0.9.2 - '@emotion/memoize': 0.9.0 - '@emotion/unitless': 0.9.0 - '@emotion/utils': 1.4.0 - csstype: 3.1.3 - '@emotion/serialize@1.3.1': dependencies: '@emotion/hash': 0.9.2 @@ -14105,21 +14066,6 @@ snapshots: '@emotion/sheet@1.4.0': {} - '@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@emotion/babel-plugin': 11.12.0 - '@emotion/is-prop-valid': 1.3.0 - '@emotion/react': 11.13.0(@types/react@18.3.4)(react@18.3.1) - '@emotion/serialize': 1.3.1 - '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.3.1) - '@emotion/utils': 1.4.0 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.4 - transitivePeerDependencies: - - supports-color - '@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 @@ -14139,8 +14085,6 @@ snapshots: '@emotion/unitless@0.8.1': {} - '@emotion/unitless@0.9.0': {} - '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@18.3.1)': dependencies: react: 18.3.1 @@ -15584,7 +15528,7 @@ snapshots: '@emotion/css': 11.11.2 '@emotion/is-prop-valid': 1.3.0 '@emotion/react': 11.13.3(@types/react@18.3.4)(react@18.3.1) - '@emotion/serialize': 1.3.0 + '@emotion/serialize': 1.3.1 '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/system': 6.0.0-dev.240424162023-9968b4889d(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/react@18.3.4)(react@18.3.1) From 1ef64d8e6af87b7e5adaf4f09b12bbb2935a61d5 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 07:35:14 -0400 Subject: [PATCH 11/26] fix: style types --- .../src/createStyled/createStyled.js | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index 650ada72aca9f1..daf26d1b2d1976 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -29,25 +29,38 @@ function attachTheme(props, themeId, defaultTheme) { } function processStyle(props, style) { + /* + * Types: + * - null/undefined + * - string + * - CSS style object: { [cssKey]: [cssValue], variants } + * - Processed style object: { style, variants, isProcessed: true } + * - Array of any of the above + */ + const resolvedStyle = typeof style === 'function' ? style(props) : style; if (Array.isArray(resolvedStyle)) { return resolvedStyle.flatMap((subStyle) => processStyle(props, subStyle)); } - let rootStyle; - if (resolvedStyle.isProcessed) { - rootStyle = resolvedStyle.style; - } else { - const { variants, ...otherStyles } = resolvedStyle; - rootStyle = otherStyles; - } - if (Array.isArray(resolvedStyle?.variants)) { + let rootStyle; + if (resolvedStyle.isProcessed) { + rootStyle = resolvedStyle.style; + } else { + const { variants, ...otherStyles } = resolvedStyle; + rootStyle = otherStyles; + } + return processStyleVariants(props, resolvedStyle.variants, [rootStyle]); } - return rootStyle; + if (resolvedStyle?.isProcessed) { + return resolvedStyle.style; + } + + return resolvedStyle; } function processStyleVariants(props, variants, results = []) { From bd770e2f1e62e237a99632fb6ea6e4a7b4e5bc5d Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 07:43:50 -0400 Subject: [PATCH 12/26] fix: build --- packages/mui-system/src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mui-system/src/index.js b/packages/mui-system/src/index.js index b3c0bc3a6cd6ed..67691e7d7e3a4f 100644 --- a/packages/mui-system/src/index.js +++ b/packages/mui-system/src/index.js @@ -59,6 +59,7 @@ export { default as useThemeWithoutDefault } from './useThemeWithoutDefault'; export { default as useMediaQuery } from './useMediaQuery'; export * from './colorManipulator'; export { default as ThemeProvider } from './ThemeProvider'; +export { default as unstable_memoTheme } from './memoTheme'; export { default as unstable_createCssVarsProvider } from './cssVars/createCssVarsProvider'; export { default as unstable_createGetCssVar } from './cssVars/createGetCssVar'; export { default as unstable_cssVarsParser } from './cssVars/cssVarsParser'; From 30c33ab0c6c59403c5b1922d1c332bbf53b17cca Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 10:32:40 -0400 Subject: [PATCH 13/26] fix: build --- packages/mui-material/src/utils/memoTheme.ts | 4 ++-- packages/mui-system/src/index.d.ts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/mui-material/src/utils/memoTheme.ts b/packages/mui-material/src/utils/memoTheme.ts index 85b939aa45677c..ea7da75140e77c 100644 --- a/packages/mui-material/src/utils/memoTheme.ts +++ b/packages/mui-material/src/utils/memoTheme.ts @@ -1,6 +1,6 @@ -import systemMemoTheme from '@mui/system/memoTheme'; +import { unstable_memoTheme } from '@mui/system'; import { Theme } from '../styles/createTheme'; -const memoTheme = systemMemoTheme; +const memoTheme = unstable_memoTheme; export default memoTheme; diff --git a/packages/mui-system/src/index.d.ts b/packages/mui-system/src/index.d.ts index c8498706f467eb..21ca4c4629825a 100644 --- a/packages/mui-system/src/index.d.ts +++ b/packages/mui-system/src/index.d.ts @@ -102,6 +102,8 @@ export * from './colorManipulator'; export { default as ThemeProvider } from './ThemeProvider'; export * from './ThemeProvider'; +export { default as unstable_memoTheme } from './memoTheme'; + export { default as unstable_createCssVarsProvider, CreateCssVarsProviderResult } from './cssVars'; export { default as unstable_createGetCssVar } from './cssVars/createGetCssVar'; export { default as unstable_cssVarsParser } from './cssVars/cssVarsParser'; From c3ab49ed5cbc4e967c609096c304f0ba123c2254 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 10:42:12 -0400 Subject: [PATCH 14/26] lint --- packages/mui-system/src/memoTheme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-system/src/memoTheme.ts b/packages/mui-system/src/memoTheme.ts index a3638b857f2848..fc2e3fbad6ff35 100644 --- a/packages/mui-system/src/memoTheme.ts +++ b/packages/mui-system/src/memoTheme.ts @@ -1,4 +1,4 @@ -import { CSSInterpolation } from './index.d'; +import { CSSInterpolation } from '@mui/styled-engine'; import preprocessStyles from './preprocessStyles'; /* eslint-disable @typescript-eslint/naming-convention */ From 4fb397d630fd63f322f2166c03b151c71fa3ba7e Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 11:07:44 -0400 Subject: [PATCH 15/26] lint --- packages/mui-system/src/createStyled/createStyled.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index daf26d1b2d1976..8c5d88f2637d9e 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -30,7 +30,7 @@ function attachTheme(props, themeId, defaultTheme) { function processStyle(props, style) { /* - * Types: + * Style types: * - null/undefined * - string * - CSS style object: { [cssKey]: [cssValue], variants } From a7a6ee5bdcdb822d9261206ea5c7d7a5cca34ce7 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 13:39:16 -0400 Subject: [PATCH 16/26] ci: run (empty commit) From 96fce698f60cc7212fc1ac8d5e866beb97461fe6 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Tue, 27 Aug 2024 13:42:29 -0400 Subject: [PATCH 17/26] lint --- pnpm-lock.yaml | 106 ++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7dc251616fc5d4..4cf59f210a9c98 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -361,7 +361,7 @@ importers: version: link:../../packages/mui-utils/build next: specifier: latest - version: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -371,7 +371,7 @@ importers: devDependencies: '@pigment-css/nextjs-plugin': specifier: 0.0.20 - version: 0.0.20(@types/react@18.3.4)(next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + version: 0.0.20(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@types/node': specifier: ^18.19.46 version: 18.19.46 @@ -651,7 +651,7 @@ importers: version: 9.7.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@toolpad/core': specifier: ^0.5.1 - version: 0.5.1(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.46)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2) + version: 0.5.1(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.46)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.4.41) @@ -738,7 +738,7 @@ importers: version: 5.1.2(@mui/material@packages+mui-material+build)(react@18.3.1) next: specifier: ^14.2.5 - version: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) notistack: specifier: 3.0.1 version: 3.0.1(csstype@3.1.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1462,7 +1462,7 @@ importers: version: 18.3.4 next: specifier: ^14.2.5 - version: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -1636,7 +1636,7 @@ importers: version: 4.17.21 next: specifier: ^14.2.5 - version: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -4394,8 +4394,8 @@ packages: '@next/env@14.2.5': resolution: {integrity: sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==} - '@next/env@14.2.6': - resolution: {integrity: sha512-bs5DFKV+08EjWrl8EB+KKqev1ZTNONH1vFCaHh911aaB362NnP32UDTbE9VQhyiAgbFqJsfDkSxFERNDDb3j0g==} + '@next/env@14.2.7': + resolution: {integrity: sha512-OTx9y6I3xE/eih+qtthppwLytmpJVPM5PPoJxChFsbjIEFXIayG0h/xLzefHGJviAa3Q5+Fd+9uYojKkHDKxoQ==} '@next/eslint-plugin-next@14.2.6': resolution: {integrity: sha512-d3+p4AjIYmhqzYHhhmkRYYN6ZU35TwZAKX08xKRfnHkz72KhWL2kxMFsDptpZs5e8bBGdepn7vn1+9DaF8iX+A==} @@ -4406,8 +4406,8 @@ packages: cpu: [arm64] os: [darwin] - '@next/swc-darwin-arm64@14.2.6': - resolution: {integrity: sha512-BtJZb+hYXGaVJJivpnDoi3JFVn80SHKCiiRUW3kk1SY6UCUy5dWFFSbh+tGi5lHAughzeduMyxbLt3pspvXNSg==} + '@next/swc-darwin-arm64@14.2.7': + resolution: {integrity: sha512-UhZGcOyI9LE/tZL3h9rs/2wMZaaJKwnpAyegUVDGZqwsla6hMfeSj9ssBWQS9yA4UXun3pPhrFLVnw5KXZs3vw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -4418,8 +4418,8 @@ packages: cpu: [x64] os: [darwin] - '@next/swc-darwin-x64@14.2.6': - resolution: {integrity: sha512-ZHRbGpH6KHarzm6qEeXKSElSXh8dS2DtDPjQt3IMwY8QVk7GbdDYjvV4NgSnDA9huGpGgnyy3tH8i5yHCqVkiQ==} + '@next/swc-darwin-x64@14.2.7': + resolution: {integrity: sha512-ys2cUgZYRc+CbyDeLAaAdZgS7N1Kpyy+wo0b/gAj+SeOeaj0Lw/q+G1hp+DuDiDAVyxLBCJXEY/AkhDmtihUTA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -4430,8 +4430,8 @@ packages: cpu: [arm64] os: [linux] - '@next/swc-linux-arm64-gnu@14.2.6': - resolution: {integrity: sha512-O4HqUEe3ZvKshXHcDUXn1OybN4cSZg7ZdwHJMGCXSUEVUqGTJVsOh17smqilIjooP/sIJksgl+1kcf2IWMZWHg==} + '@next/swc-linux-arm64-gnu@14.2.7': + resolution: {integrity: sha512-2xoWtE13sUJ3qrC1lwE/HjbDPm+kBQYFkkiVECJWctRASAHQ+NwjMzgrfqqMYHfMxFb5Wws3w9PqzZJqKFdWcQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -4442,8 +4442,8 @@ packages: cpu: [arm64] os: [linux] - '@next/swc-linux-arm64-musl@14.2.6': - resolution: {integrity: sha512-xUcdhr2hfalG8RDDGSFxQ75yOG894UlmFS4K2M0jLrUhauRBGOtUOxoDVwiIIuZQwZ3Y5hDsazNjdYGB0cQ9yQ==} + '@next/swc-linux-arm64-musl@14.2.7': + resolution: {integrity: sha512-+zJ1gJdl35BSAGpkCbfyiY6iRTaPrt3KTl4SF/B1NyELkqqnrNX6cp4IjjjxKpd64/7enI0kf6b9O1Uf3cL0pw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -4454,8 +4454,8 @@ packages: cpu: [x64] os: [linux] - '@next/swc-linux-x64-gnu@14.2.6': - resolution: {integrity: sha512-InosKxw8UMcA/wEib5n2QttwHSKHZHNSbGcMepBM0CTcNwpxWzX32KETmwbhKod3zrS8n1vJ+DuJKbL9ZAB0Ag==} + '@next/swc-linux-x64-gnu@14.2.7': + resolution: {integrity: sha512-m6EBqrskeMUzykBrv0fDX/28lWIBGhMzOYaStp0ihkjzIYJiKUOzVYD1gULHc8XDf5EMSqoH/0/TRAgXqpQwmw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -4466,8 +4466,8 @@ packages: cpu: [x64] os: [linux] - '@next/swc-linux-x64-musl@14.2.6': - resolution: {integrity: sha512-d4QXfJmt5pGJ7cG8qwxKSBnO5AXuKAFYxV7qyDRHnUNvY/dgDh+oX292gATpB2AAHgjdHd5ks1wXxIEj6muLUQ==} + '@next/swc-linux-x64-musl@14.2.7': + resolution: {integrity: sha512-gUu0viOMvMlzFRz1r1eQ7Ql4OE+hPOmA7smfZAhn8vC4+0swMZaZxa9CSIozTYavi+bJNDZ3tgiSdMjmMzRJlQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -4478,8 +4478,8 @@ packages: cpu: [arm64] os: [win32] - '@next/swc-win32-arm64-msvc@14.2.6': - resolution: {integrity: sha512-AlgIhk4/G+PzOG1qdF1b05uKTMsuRatFlFzAi5G8RZ9h67CVSSuZSbqGHbJDlcV1tZPxq/d4G0q6qcHDKWf4aQ==} + '@next/swc-win32-arm64-msvc@14.2.7': + resolution: {integrity: sha512-PGbONHIVIuzWlYmLvuFKcj+8jXnLbx4WrlESYlVnEzDsa3+Q2hI1YHoXaSmbq0k4ZwZ7J6sWNV4UZfx1OeOlbQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -4490,8 +4490,8 @@ packages: cpu: [ia32] os: [win32] - '@next/swc-win32-ia32-msvc@14.2.6': - resolution: {integrity: sha512-hNukAxq7hu4o5/UjPp5jqoBEtrpCbOmnUqZSKNJG8GrUVzfq0ucdhQFVrHcLRMvQcwqqDh1a5AJN9ORnNDpgBQ==} + '@next/swc-win32-ia32-msvc@14.2.7': + resolution: {integrity: sha512-BiSY5umlx9ed5RQDoHcdbuKTUkuFORDqzYKPHlLeS+STUWQKWziVOn3Ic41LuTBvqE0TRJPKpio9GSIblNR+0w==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -4502,8 +4502,8 @@ packages: cpu: [x64] os: [win32] - '@next/swc-win32-x64-msvc@14.2.6': - resolution: {integrity: sha512-NANtw+ead1rSDK1jxmzq3TYkl03UNK2KHqUYf1nIhNci6NkeqBD4s1njSzYGIlSHxCK+wSaL8RXZm4v+NF/pMw==} + '@next/swc-win32-x64-msvc@14.2.7': + resolution: {integrity: sha512-pxsI23gKWRt/SPHFkDEsP+w+Nd7gK37Hpv0ngc5HpWy2e7cKx9zR/+Q2ptAUqICNTecAaGWvmhway7pj/JLEWA==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -9714,8 +9714,8 @@ packages: sass: optional: true - next@14.2.6: - resolution: {integrity: sha512-57Su7RqXs5CBKKKOagt8gPhMM3CpjgbeQhrtei2KLAA1vTNm7jfKS+uDARkSW8ZETUflDCBIsUKGSyQdRs4U4g==} + next@14.2.7: + resolution: {integrity: sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==} engines: {node: '>=18.17.0'} hasBin: true peerDependencies: @@ -15017,7 +15017,7 @@ snapshots: '@next/env@14.2.5': {} - '@next/env@14.2.6': {} + '@next/env@14.2.7': {} '@next/eslint-plugin-next@14.2.6': dependencies: @@ -15026,55 +15026,55 @@ snapshots: '@next/swc-darwin-arm64@14.2.5': optional: true - '@next/swc-darwin-arm64@14.2.6': + '@next/swc-darwin-arm64@14.2.7': optional: true '@next/swc-darwin-x64@14.2.5': optional: true - '@next/swc-darwin-x64@14.2.6': + '@next/swc-darwin-x64@14.2.7': optional: true '@next/swc-linux-arm64-gnu@14.2.5': optional: true - '@next/swc-linux-arm64-gnu@14.2.6': + '@next/swc-linux-arm64-gnu@14.2.7': optional: true '@next/swc-linux-arm64-musl@14.2.5': optional: true - '@next/swc-linux-arm64-musl@14.2.6': + '@next/swc-linux-arm64-musl@14.2.7': optional: true '@next/swc-linux-x64-gnu@14.2.5': optional: true - '@next/swc-linux-x64-gnu@14.2.6': + '@next/swc-linux-x64-gnu@14.2.7': optional: true '@next/swc-linux-x64-musl@14.2.5': optional: true - '@next/swc-linux-x64-musl@14.2.6': + '@next/swc-linux-x64-musl@14.2.7': optional: true '@next/swc-win32-arm64-msvc@14.2.5': optional: true - '@next/swc-win32-arm64-msvc@14.2.6': + '@next/swc-win32-arm64-msvc@14.2.7': optional: true '@next/swc-win32-ia32-msvc@14.2.5': optional: true - '@next/swc-win32-ia32-msvc@14.2.6': + '@next/swc-win32-ia32-msvc@14.2.7': optional: true '@next/swc-win32-x64-msvc@14.2.5': optional: true - '@next/swc-win32-x64-msvc@14.2.6': + '@next/swc-win32-x64-msvc@14.2.7': optional: true '@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3': @@ -15509,10 +15509,10 @@ snapshots: '@opentelemetry/api@1.8.0': optional: true - '@pigment-css/nextjs-plugin@0.0.20(@types/react@18.3.4)(next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@pigment-css/nextjs-plugin@0.0.20(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@pigment-css/unplugin': 0.0.20(@types/react@18.3.4)(react@18.3.1) - next: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + next: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) transitivePeerDependencies: - '@types/react' - react @@ -16271,7 +16271,7 @@ snapshots: '@theme-ui/css': 0.16.2(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1)) react: 18.3.1 - '@toolpad/core@0.5.1(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.46)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2)': + '@toolpad/core@0.5.1(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.46)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2)': dependencies: '@babel/runtime': 7.25.0 '@mui/icons-material': link:packages/mui-icons-material/build @@ -16284,7 +16284,7 @@ snapshots: prop-types: 15.8.1 react: 18.3.1 optionalDependencies: - next: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + next: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) transitivePeerDependencies: - '@edge-runtime/vm' - '@emotion/react' @@ -21789,9 +21789,9 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@next/env': 14.2.6 + '@next/env': 14.2.7 '@swc/helpers': 0.5.5 busboy: 1.6.0 caniuse-lite: 1.0.30001649 @@ -21801,15 +21801,15 @@ snapshots: react-dom: 18.3.1(react@18.3.1) styled-jsx: 5.1.1(@babel/core@7.25.2)(babel-plugin-macros@3.1.0)(react@18.3.1) optionalDependencies: - '@next/swc-darwin-arm64': 14.2.6 - '@next/swc-darwin-x64': 14.2.6 - '@next/swc-linux-arm64-gnu': 14.2.6 - '@next/swc-linux-arm64-musl': 14.2.6 - '@next/swc-linux-x64-gnu': 14.2.6 - '@next/swc-linux-x64-musl': 14.2.6 - '@next/swc-win32-arm64-msvc': 14.2.6 - '@next/swc-win32-ia32-msvc': 14.2.6 - '@next/swc-win32-x64-msvc': 14.2.6 + '@next/swc-darwin-arm64': 14.2.7 + '@next/swc-darwin-x64': 14.2.7 + '@next/swc-linux-arm64-gnu': 14.2.7 + '@next/swc-linux-arm64-musl': 14.2.7 + '@next/swc-linux-x64-gnu': 14.2.7 + '@next/swc-linux-x64-musl': 14.2.7 + '@next/swc-win32-arm64-msvc': 14.2.7 + '@next/swc-win32-ia32-msvc': 14.2.7 + '@next/swc-win32-x64-msvc': 14.2.7 '@opentelemetry/api': 1.8.0 '@playwright/test': 1.46.1 transitivePeerDependencies: From 509f0860cc951757aea2eecf7fd9e52c01f76661 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 30 Aug 2024 05:33:42 -0400 Subject: [PATCH 18/26] refactor: internal_processStyle => internal_mutateStyles --- packages/mui-styled-engine-sc/src/index.d.ts | 2 +- packages/mui-styled-engine-sc/src/index.js | 2 +- packages/mui-styled-engine/src/index.d.ts | 2 +- packages/mui-styled-engine/src/index.js | 2 +- packages/mui-system/src/createStyled/createStyled.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/mui-styled-engine-sc/src/index.d.ts b/packages/mui-styled-engine-sc/src/index.d.ts index 835db3f8d311bd..9b1de0cdb5b650 100644 --- a/packages/mui-styled-engine-sc/src/index.d.ts +++ b/packages/mui-styled-engine-sc/src/index.d.ts @@ -76,7 +76,7 @@ export * from './GlobalStyles'; * For internal usage in `@mui/system` package */ // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles( +export function internal_mutateStyles( tag: React.ElementType, processor: (styles: any) => any, ): void; diff --git a/packages/mui-styled-engine-sc/src/index.js b/packages/mui-styled-engine-sc/src/index.js index 267ed25fb3dab9..435e22b95d07e4 100644 --- a/packages/mui-styled-engine-sc/src/index.js +++ b/packages/mui-styled-engine-sc/src/index.js @@ -37,7 +37,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles(tag, processor) { +export function internal_mutateStyles(tag, processor) { // Styled-components attaches an instance to `componentStyle`. // https://github.com/styled-components/styled-components/blob/da8151762dcf72735ffba358173d4c097f6d5888/packages/styled-components/src/models/StyledComponent.ts#L257 // diff --git a/packages/mui-styled-engine/src/index.d.ts b/packages/mui-styled-engine/src/index.d.ts index 3570850b66cf3e..e6630a3885d61e 100644 --- a/packages/mui-styled-engine/src/index.d.ts +++ b/packages/mui-styled-engine/src/index.d.ts @@ -21,7 +21,7 @@ export type MUIStyledComponent< * For internal usage in `@mui/system` package */ // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles( +export function internal_mutateStyles( tag: React.ElementType, processor: (styles: any) => any, ): void; diff --git a/packages/mui-styled-engine/src/index.js b/packages/mui-styled-engine/src/index.js index 24e2440101f40f..dcdd2ca2832dcf 100644 --- a/packages/mui-styled-engine/src/index.js +++ b/packages/mui-styled-engine/src/index.js @@ -29,7 +29,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles(tag, processor) { +export function internal_mutateStyles(tag, processor) { // Emotion attaches all the styles as `__emotion_styles`. // Ref: https://github.com/emotion-js/emotion/blob/16d971d0da229596d6bcc39d282ba9753c9ee7cf/packages/styled/src/base.js#L186 if (Array.isArray(tag.__emotion_styles)) { diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index 8c5d88f2637d9e..e57e34990e1a0e 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -1,4 +1,4 @@ -import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; +import styledEngineStyled, { internal_mutateStyles as mutateStyles } from '@mui/styled-engine'; import { isPlainObject } from '@mui/utils/deepmerge'; import capitalize from '@mui/utils/capitalize'; import getDisplayName from '@mui/utils/getDisplayName'; @@ -108,7 +108,7 @@ export default function createStyled(input = {}) { const styled = (tag, inputOptions = {}) => { // If `tag` is already a styled component, filter out the `sx` style function // to prevent unnecessary styles generated by the composite components. - processStyles(tag, (styles) => styles.filter((style) => style !== styleFunctionSx)); + mutateStyles(tag, (styles) => styles.filter((style) => style !== styleFunctionSx)); const { name: componentName, From 1593d83f09f97437346f53a1238665df58422601 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 30 Aug 2024 06:54:37 -0400 Subject: [PATCH 19/26] ci: run (empty commit) From c317ce0eae6572874172eac2afe50a7d2216934b Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 30 Aug 2024 07:02:02 -0400 Subject: [PATCH 20/26] Revert "refactor: internal_processStyle => internal_mutateStyles" This reverts commit 509f0860cc951757aea2eecf7fd9e52c01f76661. --- packages/mui-styled-engine-sc/src/index.d.ts | 2 +- packages/mui-styled-engine-sc/src/index.js | 2 +- packages/mui-styled-engine/src/index.d.ts | 2 +- packages/mui-styled-engine/src/index.js | 2 +- packages/mui-system/src/createStyled/createStyled.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/mui-styled-engine-sc/src/index.d.ts b/packages/mui-styled-engine-sc/src/index.d.ts index 9b1de0cdb5b650..835db3f8d311bd 100644 --- a/packages/mui-styled-engine-sc/src/index.d.ts +++ b/packages/mui-styled-engine-sc/src/index.d.ts @@ -76,7 +76,7 @@ export * from './GlobalStyles'; * For internal usage in `@mui/system` package */ // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_mutateStyles( +export function internal_processStyles( tag: React.ElementType, processor: (styles: any) => any, ): void; diff --git a/packages/mui-styled-engine-sc/src/index.js b/packages/mui-styled-engine-sc/src/index.js index 435e22b95d07e4..267ed25fb3dab9 100644 --- a/packages/mui-styled-engine-sc/src/index.js +++ b/packages/mui-styled-engine-sc/src/index.js @@ -37,7 +37,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_mutateStyles(tag, processor) { +export function internal_processStyles(tag, processor) { // Styled-components attaches an instance to `componentStyle`. // https://github.com/styled-components/styled-components/blob/da8151762dcf72735ffba358173d4c097f6d5888/packages/styled-components/src/models/StyledComponent.ts#L257 // diff --git a/packages/mui-styled-engine/src/index.d.ts b/packages/mui-styled-engine/src/index.d.ts index e6630a3885d61e..3570850b66cf3e 100644 --- a/packages/mui-styled-engine/src/index.d.ts +++ b/packages/mui-styled-engine/src/index.d.ts @@ -21,7 +21,7 @@ export type MUIStyledComponent< * For internal usage in `@mui/system` package */ // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_mutateStyles( +export function internal_processStyles( tag: React.ElementType, processor: (styles: any) => any, ): void; diff --git a/packages/mui-styled-engine/src/index.js b/packages/mui-styled-engine/src/index.js index dcdd2ca2832dcf..24e2440101f40f 100644 --- a/packages/mui-styled-engine/src/index.js +++ b/packages/mui-styled-engine/src/index.js @@ -29,7 +29,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_mutateStyles(tag, processor) { +export function internal_processStyles(tag, processor) { // Emotion attaches all the styles as `__emotion_styles`. // Ref: https://github.com/emotion-js/emotion/blob/16d971d0da229596d6bcc39d282ba9753c9ee7cf/packages/styled/src/base.js#L186 if (Array.isArray(tag.__emotion_styles)) { diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index e57e34990e1a0e..8c5d88f2637d9e 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -1,4 +1,4 @@ -import styledEngineStyled, { internal_mutateStyles as mutateStyles } from '@mui/styled-engine'; +import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; import { isPlainObject } from '@mui/utils/deepmerge'; import capitalize from '@mui/utils/capitalize'; import getDisplayName from '@mui/utils/getDisplayName'; @@ -108,7 +108,7 @@ export default function createStyled(input = {}) { const styled = (tag, inputOptions = {}) => { // If `tag` is already a styled component, filter out the `sx` style function // to prevent unnecessary styles generated by the composite components. - mutateStyles(tag, (styles) => styles.filter((style) => style !== styleFunctionSx)); + processStyles(tag, (styles) => styles.filter((style) => style !== styleFunctionSx)); const { name: componentName, From f2d05c199b9287ae97ae93e70aa1da660cd74efc Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 30 Aug 2024 07:10:57 -0400 Subject: [PATCH 21/26] Reapply "refactor: internal_processStyle => internal_mutateStyles" This reverts commit c317ce0eae6572874172eac2afe50a7d2216934b. --- packages/mui-styled-engine-sc/src/index.d.ts | 2 +- packages/mui-styled-engine-sc/src/index.js | 2 +- packages/mui-styled-engine/src/index.d.ts | 2 +- packages/mui-styled-engine/src/index.js | 2 +- packages/mui-system/src/createStyled/createStyled.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/mui-styled-engine-sc/src/index.d.ts b/packages/mui-styled-engine-sc/src/index.d.ts index 835db3f8d311bd..9b1de0cdb5b650 100644 --- a/packages/mui-styled-engine-sc/src/index.d.ts +++ b/packages/mui-styled-engine-sc/src/index.d.ts @@ -76,7 +76,7 @@ export * from './GlobalStyles'; * For internal usage in `@mui/system` package */ // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles( +export function internal_mutateStyles( tag: React.ElementType, processor: (styles: any) => any, ): void; diff --git a/packages/mui-styled-engine-sc/src/index.js b/packages/mui-styled-engine-sc/src/index.js index 267ed25fb3dab9..435e22b95d07e4 100644 --- a/packages/mui-styled-engine-sc/src/index.js +++ b/packages/mui-styled-engine-sc/src/index.js @@ -37,7 +37,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles(tag, processor) { +export function internal_mutateStyles(tag, processor) { // Styled-components attaches an instance to `componentStyle`. // https://github.com/styled-components/styled-components/blob/da8151762dcf72735ffba358173d4c097f6d5888/packages/styled-components/src/models/StyledComponent.ts#L257 // diff --git a/packages/mui-styled-engine/src/index.d.ts b/packages/mui-styled-engine/src/index.d.ts index 3570850b66cf3e..e6630a3885d61e 100644 --- a/packages/mui-styled-engine/src/index.d.ts +++ b/packages/mui-styled-engine/src/index.d.ts @@ -21,7 +21,7 @@ export type MUIStyledComponent< * For internal usage in `@mui/system` package */ // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles( +export function internal_mutateStyles( tag: React.ElementType, processor: (styles: any) => any, ): void; diff --git a/packages/mui-styled-engine/src/index.js b/packages/mui-styled-engine/src/index.js index 24e2440101f40f..dcdd2ca2832dcf 100644 --- a/packages/mui-styled-engine/src/index.js +++ b/packages/mui-styled-engine/src/index.js @@ -29,7 +29,7 @@ export default function styled(tag, options) { } // eslint-disable-next-line @typescript-eslint/naming-convention -export function internal_processStyles(tag, processor) { +export function internal_mutateStyles(tag, processor) { // Emotion attaches all the styles as `__emotion_styles`. // Ref: https://github.com/emotion-js/emotion/blob/16d971d0da229596d6bcc39d282ba9753c9ee7cf/packages/styled/src/base.js#L186 if (Array.isArray(tag.__emotion_styles)) { diff --git a/packages/mui-system/src/createStyled/createStyled.js b/packages/mui-system/src/createStyled/createStyled.js index 8c5d88f2637d9e..e57e34990e1a0e 100644 --- a/packages/mui-system/src/createStyled/createStyled.js +++ b/packages/mui-system/src/createStyled/createStyled.js @@ -1,4 +1,4 @@ -import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; +import styledEngineStyled, { internal_mutateStyles as mutateStyles } from '@mui/styled-engine'; import { isPlainObject } from '@mui/utils/deepmerge'; import capitalize from '@mui/utils/capitalize'; import getDisplayName from '@mui/utils/getDisplayName'; @@ -108,7 +108,7 @@ export default function createStyled(input = {}) { const styled = (tag, inputOptions = {}) => { // If `tag` is already a styled component, filter out the `sx` style function // to prevent unnecessary styles generated by the composite components. - processStyles(tag, (styles) => styles.filter((style) => style !== styleFunctionSx)); + mutateStyles(tag, (styles) => styles.filter((style) => style !== styleFunctionSx)); const { name: componentName, From bc451b8029c622e7dc2ec3a661d8481c8fcd168e Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Wed, 4 Sep 2024 12:05:34 -0400 Subject: [PATCH 22/26] deps: upgrade pigment-css --- package.json | 4 ++-- .../mui-material-pigment-css/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 49f269a02ff0d4..cae11f301e6b43 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "@mui/utils": "workspace:^", "@next/eslint-plugin-next": "^14.2.6", "@octokit/rest": "^21.0.2", - "@pigment-css/react": "0.0.21", + "@pigment-css/react": "0.0.22", "@playwright/test": "1.46.1", "@types/babel__core": "^7.20.5", "@types/fs-extra": "^11.0.4", @@ -213,7 +213,7 @@ "@types/react": "^18.3.4", "@types/react-dom": "18.3.0", "cross-fetch": "^4.0.0", - "@pigment-css/react": "0.0.21", + "@pigment-css/react": "0.0.22", "@pigment-css/unplugin": "0.0.21", "@pigment-css/nextjs-plugin": "0.0.21", "@pigment-css/vite-plugin": "0.0.21" diff --git a/packages/mui-material-pigment-css/package.json b/packages/mui-material-pigment-css/package.json index 49bdd34694303f..6d88fb8e01ac4a 100644 --- a/packages/mui-material-pigment-css/package.json +++ b/packages/mui-material-pigment-css/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@mui/system": "workspace:*", - "@pigment-css/react": "0.0.21" + "@pigment-css/react": "0.0.22" }, "sideEffects": false, "publishConfig": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f6562041690ac4..eba0e0f9ab7c84 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,7 +20,7 @@ overrides: '@types/react': ^18.3.4 '@types/react-dom': 18.3.0 cross-fetch: ^4.0.0 - '@pigment-css/react': 0.0.21 + '@pigment-css/react': 0.0.22 '@pigment-css/unplugin': 0.0.21 '@pigment-css/nextjs-plugin': 0.0.21 '@pigment-css/vite-plugin': 0.0.21 @@ -111,8 +111,8 @@ importers: specifier: ^21.0.2 version: 21.0.2 '@pigment-css/react': - specifier: 0.0.21 - version: 0.0.21(@types/react@18.3.4)(react@18.3.1) + specifier: 0.0.22 + version: 0.0.22(@types/react@18.3.4)(react@18.3.1) '@playwright/test': specifier: 1.46.1 version: 1.46.1 @@ -1855,8 +1855,8 @@ importers: specifier: workspace:* version: link:../mui-system/build '@pigment-css/react': - specifier: 0.0.21 - version: 0.0.21(@types/react@18.3.4)(react@18.3.1) + specifier: 0.0.22 + version: 0.0.22(@types/react@18.3.4)(react@18.3.1) publishDirectory: build packages/mui-private-theming: @@ -4813,8 +4813,8 @@ packages: peerDependencies: next: ^12.0.0 || ^13.0.0 || ^14.0.0 - '@pigment-css/react@0.0.21': - resolution: {integrity: sha512-AxX5P59/wheAGIfqdxFQ8t9Qpw+Dc88icbqiCZMm5CusGXE1Kue7Etx74vIiAanD9Vg112hM5CNkI2DHsO80fQ==} + '@pigment-css/react@0.0.22': + resolution: {integrity: sha512-LFEWfBmI+gA1nQ9htDLSTuKhMbmQW+A/18wLZmx8kHqOTtGN6sSggBsduA0hrJO4ghdU6T/5QkwC3OlHccQ2Iw==} peerDependencies: react: ^17.0.0 || ^18.0.0 @@ -15540,7 +15540,7 @@ snapshots: - react - supports-color - '@pigment-css/react@0.0.21(@types/react@18.3.4)(react@18.3.1)': + '@pigment-css/react@0.0.22(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/core': 7.25.2 '@babel/helper-module-imports': 7.24.7 @@ -15571,7 +15571,7 @@ snapshots: '@pigment-css/unplugin@0.0.21(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/core': 7.25.2 - '@pigment-css/react': 0.0.21(@types/react@18.3.4)(react@18.3.1) + '@pigment-css/react': 0.0.22(@types/react@18.3.4)(react@18.3.1) '@wyw-in-js/shared': 0.5.4 '@wyw-in-js/transform': 0.5.4 babel-plugin-define-var: 0.1.0 @@ -15585,7 +15585,7 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) - '@pigment-css/react': 0.0.21(@types/react@18.3.4)(react@18.3.1) + '@pigment-css/react': 0.0.22(@types/react@18.3.4)(react@18.3.1) '@wyw-in-js/shared': 0.5.4 '@wyw-in-js/transform': 0.5.4 babel-plugin-define-var: 0.1.0 From ae000aec737e4e87d5bb72964290b464f8cad5e8 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Thu, 12 Sep 2024 17:50:19 -0400 Subject: [PATCH 23/26] ci: run (empty commit) From 5a8a106d40d37784840ecd0a497ba4ede476146b Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Thu, 12 Sep 2024 18:04:45 -0400 Subject: [PATCH 24/26] lint --- pnpm-lock.yaml | 533 ++++++++----------------------------------------- 1 file changed, 82 insertions(+), 451 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6760cd6597b6b..4e77aec5bb643c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -356,7 +356,7 @@ importers: version: link:../../packages/mui-utils/build next: specifier: latest - version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 14.2.11(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -366,7 +366,7 @@ importers: devDependencies: '@pigment-css/nextjs-plugin': specifier: 0.0.22 - version: 0.0.22(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + version: 0.0.22(@types/react@18.3.4)(next@14.2.11(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@types/node': specifier: ^20.16.5 version: 20.16.5 @@ -1274,7 +1274,7 @@ importers: version: 7.25.6 '@mui/utils': specifier: ^5.0.0 || ^6.0.0 - version: 5.16.5(@types/react@18.3.4)(react@18.3.1) + version: 5.16.6(@types/react@18.3.4)(react@18.3.1) babel-plugin-macros: specifier: ^3.1.0 version: 3.1.0 @@ -2501,10 +2501,6 @@ packages: resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.25.2': - resolution: {integrity: sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==} - engines: {node: '>=6.9.0'} - '@babel/compat-data@7.25.4': resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==} engines: {node: '>=6.9.0'} @@ -2513,10 +2509,6 @@ packages: resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==} engines: {node: '>=6.9.0'} - '@babel/generator@7.25.0': - resolution: {integrity: sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==} - engines: {node: '>=6.9.0'} - '@babel/generator@7.25.6': resolution: {integrity: sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==} engines: {node: '>=6.9.0'} @@ -2533,35 +2525,18 @@ packages: resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==} engines: {node: '>=6.9.0'} - '@babel/helper-create-class-features-plugin@7.24.7': - resolution: {integrity: sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.25.2 - '@babel/helper-create-class-features-plugin@7.25.4': resolution: {integrity: sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.25.2 - '@babel/helper-create-regexp-features-plugin@7.25.0': - resolution: {integrity: sha512-q0T+dknZS+L5LDazIP+02gEZITG5unzvb6yIjcmj5i0eFrs5ToBV2m2JGH4EsE/gtP8ygEGLGApBgRIZkTm7zg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.25.2 - '@babel/helper-create-regexp-features-plugin@7.25.2': resolution: {integrity: sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.25.2 - '@babel/helper-define-polyfill-provider@0.6.1': - resolution: {integrity: sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==} - peerDependencies: - '@babel/core': ^7.25.2 - '@babel/helper-define-polyfill-provider@0.6.2': resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==} peerDependencies: @@ -2571,10 +2546,6 @@ packages: resolution: {integrity: sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==} engines: {node: '>=6.9.0'} - '@babel/helper-function-name@7.24.7': - resolution: {integrity: sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==} - engines: {node: '>=6.9.0'} - '@babel/helper-member-expression-to-functions@7.24.8': resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==} engines: {node: '>=6.9.0'} @@ -2617,10 +2588,6 @@ packages: resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==} engines: {node: '>=6.9.0'} - '@babel/helper-split-export-declaration@7.24.7': - resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==} - engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@7.24.8': resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} engines: {node: '>=6.9.0'} @@ -2652,11 +2619,6 @@ packages: peerDependencies: '@babel/core': ^7.25.2 - '@babel/parser@7.25.3': - resolution: {integrity: sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==} - engines: {node: '>=6.0.0'} - hasBin: true - '@babel/parser@7.25.6': resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} engines: {node: '>=6.0.0'} @@ -2910,12 +2872,6 @@ packages: peerDependencies: '@babel/core': ^7.25.2 - '@babel/plugin-transform-class-properties@7.24.7': - resolution: {integrity: sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.25.2 - '@babel/plugin-transform-class-properties@7.25.4': resolution: {integrity: sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==} engines: {node: '>=6.9.0'} @@ -2928,12 +2884,6 @@ packages: peerDependencies: '@babel/core': ^7.25.2 - '@babel/plugin-transform-classes@7.25.0': - resolution: {integrity: sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.25.2 - '@babel/plugin-transform-classes@7.25.4': resolution: {integrity: sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==} engines: {node: '>=6.9.0'} @@ -3108,12 +3058,6 @@ packages: peerDependencies: '@babel/core': ^7.25.2 - '@babel/plugin-transform-private-methods@7.24.7': - resolution: {integrity: sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.25.2 - '@babel/plugin-transform-private-methods@7.25.4': resolution: {integrity: sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==} engines: {node: '>=6.9.0'} @@ -3306,10 +3250,6 @@ packages: resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.25.3': - resolution: {integrity: sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==} - engines: {node: '>=6.9.0'} - '@babel/traverse@7.25.6': resolution: {integrity: sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==} engines: {node: '>=6.9.0'} @@ -4245,16 +4185,6 @@ packages: '@types/react': optional: true - '@mui/utils@5.16.5': - resolution: {integrity: sha512-CwhcA9y44XwK7k2joL3Y29mRUnoBt+gOZZdGyw7YihbEwEErJYBtDwbZwVgH68zAljGe/b+Kd5bzfl63Gi3R2A==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/react': ^18.3.4 - react: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@mui/utils@5.16.6': resolution: {integrity: sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==} engines: {node: '>=12.0.0'} @@ -4265,16 +4195,6 @@ packages: '@types/react': optional: true - '@mui/utils@6.0.0-dev.20240529-082515-213b5e33ab': - resolution: {integrity: sha512-jyNcB0drDhYcoq5MHNTiEc63GfVE1GZK+CVUd8tlLzk5q631RPYJ5jONSOszLiUOXBmI8Uu1SBJUwrG3j2YG2A==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/react': ^18.3.4 - react: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@mui/utils@6.0.0-rc.0': resolution: {integrity: sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A==} engines: {node: '>=14.0.0'} @@ -4487,9 +4407,6 @@ packages: '@next/env@14.2.11': resolution: {integrity: sha512-HYsQRSIXwiNqvzzYThrBwq6RhXo3E0n8j8nQnAs8i4fCEo2Zf/3eS0IiRA8XnRg9Ha0YnpkyJZIZg1qEwemrHw==} - '@next/env@14.2.7': - resolution: {integrity: sha512-OTx9y6I3xE/eih+qtthppwLytmpJVPM5PPoJxChFsbjIEFXIayG0h/xLzefHGJviAa3Q5+Fd+9uYojKkHDKxoQ==} - '@next/env@14.2.8': resolution: {integrity: sha512-L44a+ynqkolyNBnYfF8VoCiSrjSZWgEHYKkKLGcs/a80qh7AkfVUD/MduVPgdsWZ31tgROR+yJRA0PZjSVBXWQ==} @@ -4502,12 +4419,6 @@ packages: cpu: [arm64] os: [darwin] - '@next/swc-darwin-arm64@14.2.7': - resolution: {integrity: sha512-UhZGcOyI9LE/tZL3h9rs/2wMZaaJKwnpAyegUVDGZqwsla6hMfeSj9ssBWQS9yA4UXun3pPhrFLVnw5KXZs3vw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - '@next/swc-darwin-arm64@14.2.8': resolution: {integrity: sha512-1VrQlG8OzdyvvGZhGJFnaNE2P10Jjy/2FopnqbY0nSa/gr8If3iINxvOEW3cmVeoAYkmW0RsBazQecA2dBFOSw==} engines: {node: '>= 10'} @@ -4520,12 +4431,6 @@ packages: cpu: [x64] os: [darwin] - '@next/swc-darwin-x64@14.2.7': - resolution: {integrity: sha512-ys2cUgZYRc+CbyDeLAaAdZgS7N1Kpyy+wo0b/gAj+SeOeaj0Lw/q+G1hp+DuDiDAVyxLBCJXEY/AkhDmtihUTA==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - '@next/swc-darwin-x64@14.2.8': resolution: {integrity: sha512-87t3I86rNRSOJB1gXIUzaQWWSWrkWPDyZGsR0Z7JAPtLeX3uUOW2fHxl7dNWD2BZvbvftctTQjgtfpp7nMtmWg==} engines: {node: '>= 10'} @@ -4538,12 +4443,6 @@ packages: cpu: [arm64] os: [linux] - '@next/swc-linux-arm64-gnu@14.2.7': - resolution: {integrity: sha512-2xoWtE13sUJ3qrC1lwE/HjbDPm+kBQYFkkiVECJWctRASAHQ+NwjMzgrfqqMYHfMxFb5Wws3w9PqzZJqKFdWcQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - '@next/swc-linux-arm64-gnu@14.2.8': resolution: {integrity: sha512-ta2sfVzbOpTbgBrF9HM5m+U58dv6QPuwU4n5EX4LLyCJGKc433Z0D9h9gay/HSOjLEXJ2fJYrMP5JYYbHdxhtw==} engines: {node: '>= 10'} @@ -4556,12 +4455,6 @@ packages: cpu: [arm64] os: [linux] - '@next/swc-linux-arm64-musl@14.2.7': - resolution: {integrity: sha512-+zJ1gJdl35BSAGpkCbfyiY6iRTaPrt3KTl4SF/B1NyELkqqnrNX6cp4IjjjxKpd64/7enI0kf6b9O1Uf3cL0pw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - '@next/swc-linux-arm64-musl@14.2.8': resolution: {integrity: sha512-+IoLTPK6Z5uIgDhgeWnQF5/o5GBN7+zyUNrs4Bes1W3g9++YELb8y0unFybS8s87ntAKMDl6jeQ+mD7oNwp/Ng==} engines: {node: '>= 10'} @@ -4574,12 +4467,6 @@ packages: cpu: [x64] os: [linux] - '@next/swc-linux-x64-gnu@14.2.7': - resolution: {integrity: sha512-m6EBqrskeMUzykBrv0fDX/28lWIBGhMzOYaStp0ihkjzIYJiKUOzVYD1gULHc8XDf5EMSqoH/0/TRAgXqpQwmw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - '@next/swc-linux-x64-gnu@14.2.8': resolution: {integrity: sha512-pO+hVXC+mvzUOQJJRG4RX4wJsRJ5BkURSf6dD6EjUXAX4Ml9es1WsEfkaZ4lcpmFzFvY47IkDaffks/GdCn9ag==} engines: {node: '>= 10'} @@ -4592,12 +4479,6 @@ packages: cpu: [x64] os: [linux] - '@next/swc-linux-x64-musl@14.2.7': - resolution: {integrity: sha512-gUu0viOMvMlzFRz1r1eQ7Ql4OE+hPOmA7smfZAhn8vC4+0swMZaZxa9CSIozTYavi+bJNDZ3tgiSdMjmMzRJlQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - '@next/swc-linux-x64-musl@14.2.8': resolution: {integrity: sha512-bCat9izctychCtf3uL1nqHq31N5e1VxvdyNcBQflkudPMLbxVnlrw45Vi87K+lt1CwrtVayHqzo4ie0Szcpwzg==} engines: {node: '>= 10'} @@ -4610,12 +4491,6 @@ packages: cpu: [arm64] os: [win32] - '@next/swc-win32-arm64-msvc@14.2.7': - resolution: {integrity: sha512-PGbONHIVIuzWlYmLvuFKcj+8jXnLbx4WrlESYlVnEzDsa3+Q2hI1YHoXaSmbq0k4ZwZ7J6sWNV4UZfx1OeOlbQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - '@next/swc-win32-arm64-msvc@14.2.8': resolution: {integrity: sha512-gbxfUaSPV7EyUobpavida2Hwi62GhSJaSg7iBjmBWoxkxlmETOD7U4tWt763cGIsyE6jM7IoNavq0BXqwdW2QA==} engines: {node: '>= 10'} @@ -4628,12 +4503,6 @@ packages: cpu: [ia32] os: [win32] - '@next/swc-win32-ia32-msvc@14.2.7': - resolution: {integrity: sha512-BiSY5umlx9ed5RQDoHcdbuKTUkuFORDqzYKPHlLeS+STUWQKWziVOn3Ic41LuTBvqE0TRJPKpio9GSIblNR+0w==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - '@next/swc-win32-ia32-msvc@14.2.8': resolution: {integrity: sha512-PUXzEzjTTlUh3b5VAn1nlpwvujTnuCMMwbiCnaTazoVlN1nA3kWjlmp42IfURA2N/nyrlVEw7pURa/o4Qxj1cw==} engines: {node: '>= 10'} @@ -4646,12 +4515,6 @@ packages: cpu: [x64] os: [win32] - '@next/swc-win32-x64-msvc@14.2.7': - resolution: {integrity: sha512-pxsI23gKWRt/SPHFkDEsP+w+Nd7gK37Hpv0ngc5HpWy2e7cKx9zR/+Q2ptAUqICNTecAaGWvmhway7pj/JLEWA==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - '@next/swc-win32-x64-msvc@14.2.8': resolution: {integrity: sha512-EnPKv0ttq02E9/1KZ/8Dn7kuutv6hy1CKc0HlNcvzOQcm4/SQtvfws5gY0zrG9tuupd3HfC2L/zcTrnBhpjTuQ==} engines: {node: '>= 10'} @@ -6987,9 +6850,6 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} - core-js-compat@3.37.1: - resolution: {integrity: sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==} - core-js-compat@3.38.1: resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==} @@ -9969,10 +9829,6 @@ packages: resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} - minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} - engines: {node: '>=16 || 14 >=14.17'} - minipass@7.1.2: resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} engines: {node: '>=16 || 14 >=14.17'} @@ -10079,24 +9935,6 @@ packages: sass: optional: true - next@14.2.7: - resolution: {integrity: sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==} - engines: {node: '>=18.17.0'} - hasBin: true - peerDependencies: - '@opentelemetry/api': ^1.1.0 - '@playwright/test': ^1.41.2 - react: ^18.2.0 - react-dom: ^18.2.0 - sass: ^1.3.0 - peerDependenciesMeta: - '@opentelemetry/api': - optional: true - '@playwright/test': - optional: true - sass: - optional: true - next@14.2.8: resolution: {integrity: sha512-EyEyJZ89r8C5FPlS/401AiF3O8jeMtHIE+bLom9MwcdWJJFBgRl+MR/2VgO0v5bI6tQORNY0a0DR5sjpFNrjbg==} engines: {node: '>=18.17.0'} @@ -11061,10 +10899,6 @@ packages: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} engines: {node: '>=0.6'} - qs@6.12.0: - resolution: {integrity: sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==} - engines: {node: '>=0.6'} - qs@6.13.0: resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} engines: {node: '>=0.6'} @@ -11376,9 +11210,6 @@ packages: readable-stream@1.0.34: resolution: {integrity: sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==} - readable-stream@2.3.7: - resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==} - readable-stream@2.3.8: resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} @@ -13091,11 +12922,6 @@ packages: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} - yaml@2.4.5: - resolution: {integrity: sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==} - engines: {node: '>= 14'} - hasBin: true - yaml@2.5.0: resolution: {integrity: sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==} engines: {node: '>= 14'} @@ -13335,21 +13161,19 @@ snapshots: '@babel/highlight': 7.24.7 picocolors: 1.0.1 - '@babel/compat-data@7.25.2': {} - '@babel/compat-data@7.25.4': {} '@babel/core@7.25.2': dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.0 + '@babel/generator': 7.25.6 '@babel/helper-compilation-targets': 7.25.2 '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) '@babel/helpers': 7.25.0 - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/template': 7.25.0 - '@babel/traverse': 7.25.3 + '@babel/traverse': 7.25.6 '@babel/types': 7.25.6 convert-source-map: 2.0.0 debug: 4.3.6(supports-color@8.1.1) @@ -13359,13 +13183,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.25.0': - dependencies: - '@babel/types': 7.25.6 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - '@babel/generator@7.25.6': dependencies: '@babel/types': 7.25.6 @@ -13386,27 +13203,12 @@ snapshots: '@babel/helper-compilation-targets@7.25.2': dependencies: - '@babel/compat-data': 7.25.2 + '@babel/compat-data': 7.25.4 '@babel/helper-validator-option': 7.24.8 browserslist: 4.23.3 lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.24.7(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-environment-visitor': 7.24.7 - '@babel/helper-function-name': 7.24.7 - '@babel/helper-member-expression-to-functions': 7.24.8 - '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 - '@babel/helper-split-export-declaration': 7.24.7 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/helper-create-class-features-plugin@7.25.4(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -13420,13 +13222,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-create-regexp-features-plugin@7.25.0(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - regexpu-core: 5.3.2 - semver: 6.3.1 - '@babel/helper-create-regexp-features-plugin@7.25.2(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -13434,17 +13229,6 @@ snapshots: regexpu-core: 5.3.2 semver: 6.3.1 - '@babel/helper-define-polyfill-provider@0.6.1(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - debug: 4.3.6(supports-color@8.1.1) - lodash.debounce: 4.0.8 - resolve: 1.22.8 - transitivePeerDependencies: - - supports-color - '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -13460,11 +13244,6 @@ snapshots: dependencies: '@babel/types': 7.25.6 - '@babel/helper-function-name@7.24.7': - dependencies: - '@babel/template': 7.25.0 - '@babel/types': 7.25.6 - '@babel/helper-member-expression-to-functions@7.24.8': dependencies: '@babel/traverse': 7.25.6 @@ -13527,10 +13306,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-split-export-declaration@7.24.7': - dependencies: - '@babel/types': 7.25.6 - '@babel/helper-string-parser@7.24.8': {} '@babel/helper-validator-identifier@7.24.7': {} @@ -13567,10 +13342,6 @@ snapshots: regenerator-runtime: 0.14.0 v8flags: 3.2.0 - '@babel/parser@7.25.3': - dependencies: - '@babel/types': 7.25.6 - '@babel/parser@7.25.6': dependencies: '@babel/types': 7.25.6 @@ -13623,7 +13394,7 @@ snapshots: '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.25.2) + '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 transitivePeerDependencies: - supports-color @@ -13648,7 +13419,7 @@ snapshots: '@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.25.2)': dependencies: - '@babel/compat-data': 7.25.2 + '@babel/compat-data': 7.25.4 '@babel/core': 7.25.2 '@babel/helper-compilation-targets': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 @@ -13673,7 +13444,7 @@ snapshots: '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.25.2) + '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 transitivePeerDependencies: - supports-color @@ -13790,7 +13561,7 @@ snapshots: '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.0(@babel/core@7.25.2) + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-transform-arrow-functions@7.24.7(@babel/core@7.25.2)': @@ -13827,14 +13598,6 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-transform-class-properties@7.24.7(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-class-properties@7.25.4(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -13846,24 +13609,12 @@ snapshots: '@babel/plugin-transform-class-static-block@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.25.2) + '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2) transitivePeerDependencies: - supports-color - '@babel/plugin-transform-classes@7.25.0(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) - '@babel/traverse': 7.25.6 - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-classes@7.25.4(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -13890,7 +13641,7 @@ snapshots: '@babel/plugin-transform-dotall-regex@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.0(@babel/core@7.25.2) + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-transform-duplicate-keys@7.24.7(@babel/core@7.25.2)': @@ -13901,7 +13652,7 @@ snapshots: '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.0(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.0(@babel/core@7.25.2) + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-transform-dynamic-import@7.24.7(@babel/core@7.25.2)': @@ -14007,7 +13758,7 @@ snapshots: '@babel/plugin-transform-named-capturing-groups-regex@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.0(@babel/core@7.25.2) + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-transform-new-target@7.24.7(@babel/core@7.25.2)': @@ -14063,14 +13814,6 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-transform-private-methods@7.24.7(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-private-methods@7.25.4(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -14083,7 +13826,7 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.25.2) + '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2) transitivePeerDependencies: @@ -14193,7 +13936,7 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.25.2) + '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-syntax-typescript': 7.25.4(@babel/core@7.25.2) transitivePeerDependencies: @@ -14207,13 +13950,13 @@ snapshots: '@babel/plugin-transform-unicode-property-regex@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.0(@babel/core@7.25.2) + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-transform-unicode-regex@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.0(@babel/core@7.25.2) + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-transform-unicode-sets-regex@7.25.4(@babel/core@7.25.2)': @@ -14306,7 +14049,7 @@ snapshots: babel-plugin-polyfill-corejs2: 0.4.10(@babel/core@7.25.2) babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.25.2) babel-plugin-polyfill-regenerator: 0.6.1(@babel/core@7.25.2) - core-js-compat: 3.37.1 + core-js-compat: 3.38.1 semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -14376,20 +14119,8 @@ snapshots: '@babel/template@7.25.0': dependencies: '@babel/code-frame': 7.24.7 - '@babel/parser': 7.25.3 - '@babel/types': 7.25.6 - - '@babel/traverse@7.25.3': - dependencies: - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.0 - '@babel/parser': 7.25.3 - '@babel/template': 7.25.0 + '@babel/parser': 7.25.6 '@babel/types': 7.25.6 - debug: 4.3.6(supports-color@8.1.1) - globals: 11.12.0 - transitivePeerDependencies: - - supports-color '@babel/traverse@7.25.6': dependencies: @@ -14869,12 +14600,12 @@ snapshots: '@gitbeaker/core@38.12.1': dependencies: '@gitbeaker/requester-utils': 38.12.1 - qs: 6.12.0 + qs: 6.13.0 xcase: 2.0.1 '@gitbeaker/requester-utils@38.12.1': dependencies: - qs: 6.12.0 + qs: 6.13.0 xcase: 2.0.1 '@gitbeaker/rest@38.12.1': @@ -15157,7 +14888,7 @@ snapshots: '@babel/runtime': 7.25.6 '@floating-ui/react-dom': 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) '@popperjs/core': 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 @@ -15171,7 +14902,7 @@ snapshots: '@babel/runtime': 7.25.6 '@floating-ui/react-dom': 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) '@popperjs/core': 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 @@ -15185,7 +14916,7 @@ snapshots: '@babel/runtime': 7.25.6 '@floating-ui/react-dom': 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) '@popperjs/core': 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 @@ -15203,7 +14934,7 @@ snapshots: '@mui/core-downloads-tracker': 5.15.14 '@mui/system': 5.16.5(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 @@ -15220,7 +14951,7 @@ snapshots: '@mui/material': link:packages/mui-material/build '@mui/system': 5.16.5(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 @@ -15237,7 +14968,7 @@ snapshots: '@mui/core-downloads-tracker': 5.15.14 '@mui/system': 5.16.5(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) '@types/react-transition-group': 4.4.11 clsx: 2.1.1 csstype: 3.1.3 @@ -15254,7 +14985,7 @@ snapshots: '@mui/private-theming@5.16.5(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.6 - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 optionalDependencies: @@ -15263,7 +14994,7 @@ snapshots: '@mui/private-theming@6.0.0-alpha.3(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.6 - '@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0-rc.0(@types/react@18.3.4)(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 optionalDependencies: @@ -15297,7 +15028,7 @@ snapshots: '@mui/private-theming': 5.16.5(@types/react@18.3.4)(react@18.3.1) '@mui/styled-engine': 5.16.4(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 @@ -15313,7 +15044,7 @@ snapshots: '@mui/private-theming': 6.0.0-alpha.3(@types/react@18.3.4)(react@18.3.1) '@mui/styled-engine': 6.0.0-alpha.3(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.4) - '@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0-rc.0(@types/react@18.3.4)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 @@ -15327,18 +15058,6 @@ snapshots: optionalDependencies: '@types/react': 18.3.4 - '@mui/utils@5.16.5(@types/react@18.3.4)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.6 - '@mui/types': 7.2.15(@types/react@18.3.4) - '@types/prop-types': 15.7.12 - clsx: 2.1.1 - prop-types: 15.8.1 - react: 18.3.1 - react-is: 18.3.1 - optionalDependencies: - '@types/react': 18.3.4 - '@mui/utils@5.16.6(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.6 @@ -15351,16 +15070,6 @@ snapshots: optionalDependencies: '@types/react': 18.3.4 - '@mui/utils@6.0.0-dev.20240529-082515-213b5e33ab(@types/react@18.3.4)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.6 - '@types/prop-types': 15.7.12 - prop-types: 15.8.1 - react: 18.3.1 - react-is: 18.3.1 - optionalDependencies: - '@types/react': 18.3.4 - '@mui/utils@6.0.0-rc.0(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.6 @@ -15588,8 +15297,6 @@ snapshots: '@next/env@14.2.11': {} - '@next/env@14.2.7': {} - '@next/env@14.2.8': {} '@next/eslint-plugin-next@14.2.11': @@ -15599,81 +15306,54 @@ snapshots: '@next/swc-darwin-arm64@14.2.11': optional: true - '@next/swc-darwin-arm64@14.2.7': - optional: true - '@next/swc-darwin-arm64@14.2.8': optional: true '@next/swc-darwin-x64@14.2.11': optional: true - '@next/swc-darwin-x64@14.2.7': - optional: true - '@next/swc-darwin-x64@14.2.8': optional: true '@next/swc-linux-arm64-gnu@14.2.11': optional: true - '@next/swc-linux-arm64-gnu@14.2.7': - optional: true - '@next/swc-linux-arm64-gnu@14.2.8': optional: true '@next/swc-linux-arm64-musl@14.2.11': optional: true - '@next/swc-linux-arm64-musl@14.2.7': - optional: true - '@next/swc-linux-arm64-musl@14.2.8': optional: true '@next/swc-linux-x64-gnu@14.2.11': optional: true - '@next/swc-linux-x64-gnu@14.2.7': - optional: true - '@next/swc-linux-x64-gnu@14.2.8': optional: true '@next/swc-linux-x64-musl@14.2.11': optional: true - '@next/swc-linux-x64-musl@14.2.7': - optional: true - '@next/swc-linux-x64-musl@14.2.8': optional: true '@next/swc-win32-arm64-msvc@14.2.11': optional: true - '@next/swc-win32-arm64-msvc@14.2.7': - optional: true - '@next/swc-win32-arm64-msvc@14.2.8': optional: true '@next/swc-win32-ia32-msvc@14.2.11': optional: true - '@next/swc-win32-ia32-msvc@14.2.7': - optional: true - '@next/swc-win32-ia32-msvc@14.2.8': optional: true '@next/swc-win32-x64-msvc@14.2.11': optional: true - '@next/swc-win32-x64-msvc@14.2.7': - optional: true - '@next/swc-win32-x64-msvc@14.2.8': optional: true @@ -16109,10 +15789,10 @@ snapshots: '@opentelemetry/api@1.8.0': optional: true - '@pigment-css/nextjs-plugin@0.0.22(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@pigment-css/nextjs-plugin@0.0.22(@types/react@18.3.4)(next@14.2.11(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@pigment-css/unplugin': 0.0.22(@types/react@18.3.4)(react@18.3.1) - next: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + next: 14.2.11(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) transitivePeerDependencies: - '@types/react' - react @@ -16123,7 +15803,7 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-module-imports': 7.24.7 '@babel/helper-plugin-utils': 7.24.8 - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/types': 7.25.6 '@emotion/css': 11.11.2 '@emotion/is-prop-valid': 1.3.0 @@ -16131,7 +15811,7 @@ snapshots: '@emotion/serialize': 1.3.1 '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/system': 6.0.0-dev.240424162023-9968b4889d(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) - '@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0-rc.0(@types/react@18.3.4)(react@18.3.1) '@wyw-in-js/processor-utils': 0.5.4 '@wyw-in-js/shared': 0.5.4 '@wyw-in-js/transform': 0.5.4 @@ -16226,7 +15906,7 @@ snapshots: semver: 7.6.3 strip-ansi: 5.2.0 wcwidth: 1.0.1 - yaml: 2.4.5 + yaml: 2.5.0 transitivePeerDependencies: - encoding @@ -16353,7 +16033,7 @@ snapshots: '@babel/plugin-transform-arrow-functions': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-async-to-generator': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-block-scoping': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-transform-classes': 7.25.0(@babel/core@7.25.2) + '@babel/plugin-transform-classes': 7.25.4(@babel/core@7.25.2) '@babel/plugin-transform-computed-properties': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-destructuring': 7.24.8(@babel/core@7.25.2) '@babel/plugin-transform-flow-strip-types': 7.24.7(@babel/core@7.25.2) @@ -16362,7 +16042,7 @@ snapshots: '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) '@babel/plugin-transform-named-capturing-groups-regex': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-private-methods': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-private-methods': 7.25.4(@babel/core@7.25.2) '@babel/plugin-transform-private-property-in-object': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-react-display-name': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-react-jsx': 7.24.7(@babel/core@7.25.2) @@ -16384,7 +16064,7 @@ snapshots: '@react-native/codegen@0.73.3(@babel/preset-env@7.25.4(@babel/core@7.25.2))': dependencies: - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/preset-env': 7.25.4(@babel/core@7.25.2) flow-parser: 0.206.0 glob: 7.2.3 @@ -16984,7 +16664,7 @@ snapshots: '@types/babel__core@7.20.5': dependencies: - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/types': 7.25.6 '@types/babel__generator': 7.6.4 '@types/babel__template': 7.4.1 @@ -16996,7 +16676,7 @@ snapshots: '@types/babel__template@7.4.1': dependencies: - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/types': 7.25.6 '@types/babel__traverse@7.20.6': @@ -17466,7 +17146,7 @@ snapshots: '@wyw-in-js/processor-utils@0.5.4': dependencies: - '@babel/generator': 7.25.0 + '@babel/generator': 7.25.6 '@wyw-in-js/shared': 0.5.4 transitivePeerDependencies: - supports-color @@ -17482,7 +17162,7 @@ snapshots: '@wyw-in-js/transform@0.5.4': dependencies: '@babel/core': 7.25.2 - '@babel/generator': 7.25.0 + '@babel/generator': 7.25.6 '@babel/helper-module-imports': 7.24.7 '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) '@babel/template': 7.25.0 @@ -17680,7 +17360,7 @@ snapshots: lodash.isplainobject: 4.0.6 lodash.union: 4.6.0 normalize-path: 3.0.0 - readable-stream: 2.3.7 + readable-stream: 2.3.8 archiver@3.1.1: dependencies: @@ -17958,7 +17638,7 @@ snapshots: babel-plugin-optimize-clsx@2.6.2: dependencies: - '@babel/generator': 7.25.0 + '@babel/generator': 7.25.6 '@babel/template': 7.25.0 '@babel/types': 7.25.6 find-cache-dir: 3.3.2 @@ -17967,9 +17647,9 @@ snapshots: babel-plugin-polyfill-corejs2@0.4.10(@babel/core@7.25.2): dependencies: - '@babel/compat-data': 7.25.2 + '@babel/compat-data': 7.25.4 '@babel/core': 7.25.2 - '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.25.2) + '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -17985,7 +17665,7 @@ snapshots: babel-plugin-polyfill-regenerator@0.6.1(@babel/core@7.25.2): dependencies: '@babel/core': 7.25.2 - '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.25.2) + '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) transitivePeerDependencies: - supports-color @@ -18252,7 +17932,7 @@ snapshots: fs-minipass: 3.0.2 glob: 10.3.10 lru-cache: 10.4.3 - minipass: 7.0.4 + minipass: 7.1.2 minipass-collect: 2.0.1 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -18601,7 +18281,7 @@ snapshots: buffer-crc32: 0.2.13 crc32-stream: 3.0.1 normalize-path: 3.0.0 - readable-stream: 2.3.7 + readable-stream: 2.3.8 compress-commons@4.1.1: dependencies: @@ -18747,10 +18427,6 @@ snapshots: cookie@0.6.0: {} - core-js-compat@3.37.1: - dependencies: - browserslist: 4.23.3 - core-js-compat@3.38.1: dependencies: browserslist: 4.23.3 @@ -19305,7 +18981,7 @@ snapshots: duplexer2@0.1.4: dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 duplexer@0.1.2: {} @@ -19313,7 +18989,7 @@ snapshots: dependencies: end-of-stream: 1.4.4 inherits: 2.0.4 - readable-stream: 2.3.7 + readable-stream: 2.3.8 stream-shift: 1.0.1 eastasianwidth@0.2.0: {} @@ -19736,7 +19412,7 @@ snapshots: eslint-plugin-react-compiler@0.0.0-experimental-b6997ec-20240910(eslint@8.57.0): dependencies: '@babel/core': 7.25.2 - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.25.2) eslint: 8.57.0 hermes-parser: 0.20.1 @@ -20426,7 +20102,7 @@ snapshots: foreground-child: 3.1.1 jackspeak: 2.3.6 minimatch: 9.0.5 - minipass: 7.0.4 + minipass: 7.1.2 path-scurry: 1.10.1 glob@11.0.0: @@ -20558,7 +20234,7 @@ snapshots: extend: 3.0.2 gaxios: 6.1.1(encoding@0.1.13) google-auth-library: 9.14.1(encoding@0.1.13) - qs: 6.12.0 + qs: 6.13.0 url-template: 2.0.8 uuid: 9.0.1 transitivePeerDependencies: @@ -21145,7 +20821,7 @@ snapshots: istanbul-lib-instrument@6.0.2: dependencies: '@babel/core': 7.25.2 - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 7.6.3 @@ -21338,7 +21014,7 @@ snapshots: jscodeshift@0.14.0(@babel/preset-env@7.25.4(@babel/core@7.25.2)): dependencies: '@babel/core': 7.25.2 - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.25.2) '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.25.2) '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.25.2) @@ -21363,12 +21039,12 @@ snapshots: jscodeshift@0.16.1(@babel/preset-env@7.25.4(@babel/core@7.25.2)): dependencies: '@babel/core': 7.25.2 - '@babel/parser': 7.25.3 - '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.25.2) + '@babel/parser': 7.25.6 + '@babel/plugin-transform-class-properties': 7.25.4(@babel/core@7.25.2) '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) '@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/core@7.25.2) - '@babel/plugin-transform-private-methods': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-private-methods': 7.25.4(@babel/core@7.25.2) '@babel/preset-flow': 7.24.7(@babel/core@7.25.2) '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) '@babel/register': 7.24.6(@babel/core@7.25.2) @@ -21581,7 +21257,7 @@ snapshots: dependencies: lie: 3.3.0 pako: 1.0.11 - readable-stream: 2.3.7 + readable-stream: 2.3.8 setimmediate: 1.0.5 junk@4.0.1: {} @@ -21711,7 +21387,7 @@ snapshots: lazystream@1.0.1: dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 lerna@8.1.8(babel-plugin-macros@3.1.0)(encoding@0.1.13): dependencies: @@ -22049,7 +21725,7 @@ snapshots: cacache: 18.0.3 http-cache-semantics: 4.1.1 is-lambda: 1.0.1 - minipass: 7.0.4 + minipass: 7.1.2 minipass-fetch: 3.0.3 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -22308,7 +21984,7 @@ snapshots: metro-transform-plugins@0.80.7: dependencies: '@babel/core': 7.25.2 - '@babel/generator': 7.25.0 + '@babel/generator': 7.25.6 '@babel/template': 7.25.0 '@babel/traverse': 7.25.6 nullthrows: 1.1.1 @@ -22318,8 +21994,8 @@ snapshots: metro-transform-worker@0.80.7(encoding@0.1.13): dependencies: '@babel/core': 7.25.2 - '@babel/generator': 7.25.0 - '@babel/parser': 7.25.3 + '@babel/generator': 7.25.6 + '@babel/parser': 7.25.6 '@babel/types': 7.25.6 metro: 0.80.7(encoding@0.1.13) metro-babel-transformer: 0.80.7 @@ -22339,8 +22015,8 @@ snapshots: dependencies: '@babel/code-frame': 7.24.7 '@babel/core': 7.25.2 - '@babel/generator': 7.25.0 - '@babel/parser': 7.25.3 + '@babel/generator': 7.25.6 + '@babel/parser': 7.25.6 '@babel/template': 7.25.0 '@babel/traverse': 7.25.6 '@babel/types': 7.25.6 @@ -22600,7 +22276,7 @@ snapshots: minipass-collect@2.0.1: dependencies: - minipass: 7.0.4 + minipass: 7.1.2 minipass-fetch@3.0.3: dependencies: @@ -22630,8 +22306,6 @@ snapshots: minipass@5.0.0: {} - minipass@7.0.4: {} - minipass@7.1.2: {} minizlib@2.1.2: @@ -22751,33 +22425,6 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@next/env': 14.2.7 - '@swc/helpers': 0.5.5 - busboy: 1.6.0 - caniuse-lite: 1.0.30001649 - graceful-fs: 4.2.11 - postcss: 8.4.31 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - styled-jsx: 5.1.1(@babel/core@7.25.2)(babel-plugin-macros@3.1.0)(react@18.3.1) - optionalDependencies: - '@next/swc-darwin-arm64': 14.2.7 - '@next/swc-darwin-x64': 14.2.7 - '@next/swc-linux-arm64-gnu': 14.2.7 - '@next/swc-linux-arm64-musl': 14.2.7 - '@next/swc-linux-x64-gnu': 14.2.7 - '@next/swc-linux-x64-musl': 14.2.7 - '@next/swc-win32-arm64-msvc': 14.2.7 - '@next/swc-win32-ia32-msvc': 14.2.7 - '@next/swc-win32-x64-msvc': 14.2.7 - '@opentelemetry/api': 1.8.0 - '@playwright/test': 1.46.1 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - next@14.2.8(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@next/env': 14.2.8 @@ -22984,7 +22631,7 @@ snapshots: '@npmcli/redact': 2.0.1 jsonparse: 1.3.1 make-fetch-happen: 13.0.1 - minipass: 7.0.4 + minipass: 7.1.2 minipass-fetch: 3.0.3 minizlib: 2.1.2 npm-package-arg: 11.0.2 @@ -23357,7 +23004,7 @@ snapshots: '@npmcli/run-script': 8.1.0 cacache: 18.0.3 fs-minipass: 3.0.2 - minipass: 7.0.4 + minipass: 7.1.2 npm-package-arg: 11.0.2 npm-packlist: 8.0.2 npm-pick-manifest: 9.0.1 @@ -23473,7 +23120,7 @@ snapshots: path-scurry@1.10.1: dependencies: lru-cache: 10.4.3 - minipass: 7.0.4 + minipass: 7.1.2 path-scurry@2.0.0: dependencies: @@ -23627,14 +23274,14 @@ snapshots: postcss-load-config@4.0.1(postcss@8.4.45): dependencies: lilconfig: 2.1.0 - yaml: 2.4.5 + yaml: 2.5.0 optionalDependencies: postcss: 8.4.45 postcss-load-config@5.1.0(jiti@1.21.0)(postcss@8.4.45)(tsx@4.19.1): dependencies: lilconfig: 3.1.1 - yaml: 2.4.5 + yaml: 2.5.0 optionalDependencies: jiti: 1.21.0 postcss: 8.4.45 @@ -23857,10 +23504,6 @@ snapshots: dependencies: side-channel: 1.0.6 - qs@6.12.0: - dependencies: - side-channel: 1.0.6 - qs@6.13.0: dependencies: side-channel: 1.0.6 @@ -23923,7 +23566,7 @@ snapshots: react-docgen@5.4.3: dependencies: '@babel/core': 7.25.2 - '@babel/generator': 7.25.0 + '@babel/generator': 7.25.6 '@babel/runtime': 7.25.6 ast-types: 0.14.2 commander: 2.20.3 @@ -24268,16 +23911,6 @@ snapshots: isarray: 0.0.1 string_decoder: 0.10.31 - readable-stream@2.3.7: - dependencies: - core-util-is: 1.0.3 - inherits: 2.0.4 - isarray: 1.0.0 - process-nextick-args: 2.0.1 - safe-buffer: 5.1.2 - string_decoder: 1.1.1 - util-deprecate: 1.0.2 - readable-stream@2.3.8: dependencies: core-util-is: 1.0.3 @@ -24947,7 +24580,7 @@ snapshots: ssri@10.0.6: dependencies: - minipass: 7.0.4 + minipass: 7.1.2 stack-utils@2.0.6: dependencies: @@ -25157,7 +24790,7 @@ snapshots: stylelint-processor-styled-components@1.10.0: dependencies: - '@babel/parser': 7.25.3 + '@babel/parser': 7.25.6 '@babel/traverse': 7.25.6 micromatch: 4.0.7 postcss: 7.0.39 @@ -25434,7 +25067,7 @@ snapshots: through2@2.0.5: dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 xtend: 4.0.2 through@2.3.8: {} @@ -25721,7 +25354,7 @@ snapshots: fstream: 1.0.12 graceful-fs: 4.2.11 listenercount: 1.0.1 - readable-stream: 2.3.7 + readable-stream: 2.3.8 setimmediate: 1.0.5 upath@2.0.1: {} @@ -25861,7 +25494,7 @@ snapshots: local-pkg: 0.5.0 picocolors: 1.0.1 vite: 5.4.2(@types/node@20.16.5)(terser@5.29.2) - yaml: 2.4.5 + yaml: 2.5.0 transitivePeerDependencies: - supports-color @@ -26230,8 +25863,6 @@ snapshots: yaml@1.10.2: {} - yaml@2.4.5: {} - yaml@2.5.0: {} yargs-parser@18.1.3: From 79fd545ab76f1265f7c9ff54eefcc8ee487041bc Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Wed, 18 Sep 2024 03:43:25 -0400 Subject: [PATCH 25/26] lint --- packages/mui-styled-engine/src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mui-styled-engine/src/index.js b/packages/mui-styled-engine/src/index.js index cba829fbc70761..c867ccdcbae004 100644 --- a/packages/mui-styled-engine/src/index.js +++ b/packages/mui-styled-engine/src/index.js @@ -36,6 +36,7 @@ export function internal_mutateStyles(tag, processor) { } } +// Emotion only accepts an array, but we want to avoid allocations const wrapper = []; // eslint-disable-next-line @typescript-eslint/naming-convention export function internal_serializeStyles(styles) { From 2b52189e974f05ac45ec69e0bf0972d3d6709ea6 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Thu, 26 Sep 2024 07:53:20 -0400 Subject: [PATCH 26/26] core: update deps --- apps/pigment-css-next-app/package.json | 2 +- apps/pigment-css-vite-app/package.json | 2 +- package.json | 10 +++++----- packages/mui-material-pigment-css/package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/pigment-css-next-app/package.json b/apps/pigment-css-next-app/package.json index 67c77343f34048..6f6c0c79b3eed1 100644 --- a/apps/pigment-css-next-app/package.json +++ b/apps/pigment-css-next-app/package.json @@ -23,7 +23,7 @@ "react-dom": "^18.3.1" }, "devDependencies": { - "@pigment-css/nextjs-plugin": "0.0.23", + "@pigment-css/nextjs-plugin": "0.0.24", "@types/node": "^20.16.5", "@types/react": "^18.3.4", "@types/react-dom": "^18.3.0", diff --git a/apps/pigment-css-vite-app/package.json b/apps/pigment-css-vite-app/package.json index 07baa331dc8ea7..983d25672e202e 100644 --- a/apps/pigment-css-vite-app/package.json +++ b/apps/pigment-css-vite-app/package.json @@ -27,7 +27,7 @@ "devDependencies": { "@babel/preset-react": "^7.24.7", "@babel/preset-typescript": "^7.24.7", - "@pigment-css/vite-plugin": "0.0.23", + "@pigment-css/vite-plugin": "0.0.24", "@types/react": "^18.3.4", "@types/react-dom": "^18.3.0", "@types/webfontloader": "^1.6.38", diff --git a/package.json b/package.json index c1a795decc7fcb..ad0a10ca837274 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "@mui/utils": "workspace:^", "@next/eslint-plugin-next": "^14.2.11", "@octokit/rest": "^21.0.2", - "@pigment-css/react": "0.0.23", + "@pigment-css/react": "0.0.24", "@playwright/test": "1.47.1", "@types/babel__core": "^7.20.5", "@types/fs-extra": "^11.0.4", @@ -219,10 +219,10 @@ "@types/react": "^18.3.4", "@types/react-dom": "18.3.0", "cross-fetch": "^4.0.0", - "@pigment-css/react": "0.0.23", - "@pigment-css/unplugin": "0.0.23", - "@pigment-css/nextjs-plugin": "0.0.23", - "@pigment-css/vite-plugin": "0.0.23" + "@pigment-css/react": "0.0.24", + "@pigment-css/unplugin": "0.0.24", + "@pigment-css/nextjs-plugin": "0.0.24", + "@pigment-css/vite-plugin": "0.0.24" }, "nyc": { "include": [ diff --git a/packages/mui-material-pigment-css/package.json b/packages/mui-material-pigment-css/package.json index fc01c00d343c2d..828710fd8abf0c 100644 --- a/packages/mui-material-pigment-css/package.json +++ b/packages/mui-material-pigment-css/package.json @@ -41,7 +41,7 @@ "dependencies": { "@babel/runtime": "^7.25.6", "@mui/system": "workspace:*", - "@pigment-css/react": "0.0.23" + "@pigment-css/react": "0.0.24" }, "sideEffects": false, "publishConfig": {