Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
code-infra: https://raw.githubusercontent.com/mui/mui-public/c6471a4fe98cb2e52efe7397ff8362569f2ddada/.circleci/orbs/code-infra.yml
code-infra: https://raw.githubusercontent.com/mui/mui-public/08eb27e8b00569d564ede0903e59d0129bbe6b9a/.circleci/orbs/code-infra.yml

parameters:
workflow:
Expand Down
19 changes: 11 additions & 8 deletions babel.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,17 @@ export default function getBabelConfig(api) {
...baseConfig,
plugins: basePlugins,
// `@babel/plugin-transform-react-constant-elements` hoists static JSX — prod-only optimization.
overrides: isProductionBuild
? [
{
exclude: /\.test\.(m?js|ts|tsx)$/,
plugins: ['@babel/plugin-transform-react-constant-elements'],
},
]
: [],
overrides: [
...(baseConfig.overrides ?? []),
...(isProductionBuild
? [
{
exclude: /\.test\.(m?js|ts|tsx)$/,
plugins: ['@babel/plugin-transform-react-constant-elements'],
},
]
: []),
],
env: {
development: {
plugins: [
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@
},
"devDependencies": {
"@arethetypeswrong/cli": "0.18.5",
"@babel/core": "7.29.7",
"@babel/node": "7.29.7",
"@babel/plugin-transform-react-constant-elements": "7.29.7",
"@babel/core": "8.0.5",
"@babel/node": "8.0.1",
"@babel/plugin-transform-react-constant-elements": "8.0.1",
"@eslint/compat": "2.1.1",
"@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.31",
"@mui/internal-bundle-size-checker": "1.0.9-canary.92",
Expand Down
5 changes: 3 additions & 2 deletions packages/mui-material/src/styles/createTheme.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import createPalette, { PaletteOptions } from './createPalette';
import createPalette from './createPalette';
import type { PaletteOptions } from './createPalette';
import {
resolveFocusVisible,
mergeFocusVisibleInput,
isResolvedFocusVisible,
} from './focusVisible';
import { ColorSystemOptions } from './createThemeFoundation';
import { type ColorSystemOptions } from './createThemeFoundation';
import createThemeWithVars, {
CssVarsThemeOptions,
ColorSystem,
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/styles/overrides.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CSSObject, CSSInterpolation, Interpolation } from '@mui/system';
import { type CSSObject, type CSSInterpolation, type Interpolation } from '@mui/system';
import { PopperClassKey } from '../Popper';
import { ComponentsPropsList } from './props';
import { AccordionActionsClassKey } from '../AccordionActions';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/styles/variants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Interpolation } from '@mui/system';
import { type Interpolation } from '@mui/system';
import { ComponentsPropsList } from './props';

export type ComponentsVariants<Theme = unknown> = {
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/utils/memoTheme.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { unstable_memoTheme } from '@mui/system';
import { Theme } from '../styles/createTheme';
import { type Theme } from '../styles/createTheme';

const memoTheme: typeof unstable_memoTheme<Theme> = unstable_memoTheme<Theme>;

Expand Down
6 changes: 3 additions & 3 deletions packages/mui-material/src/zero-styled/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Interpolation } from '@mui/system';
import { type Interpolation } from '@mui/system';
import { extendSxProp } from '@mui/system/styleFunctionSx';
import { Theme } from '../styles/createTheme';
import { type Theme } from '../styles/createTheme';
import useTheme from '../styles/useTheme';
import GlobalStyles, { GlobalStylesProps } from '../GlobalStyles';
import GlobalStyles, { type GlobalStylesProps } from '../GlobalStyles';

export { css, keyframes } from '@mui/system';

Expand Down
1,856 changes: 1,500 additions & 356 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ packages:
engineStrict: true
enablePrePostScripts: true
updateNotifier: false
blockExoticSubdeps: true
# TEMP: disabled for pkg.pr.new testing of mui/mui-public#1875 (@mui/internal-code-infra
# pulls in its own workspace deps as pkg.pr.new URL subdeps). Restore to true once the
# overrides above are removed.
blockExoticSubdeps: false
minimumReleaseAge: 4320
minimumReleaseAgeExclude:
- '@mui/*'
Expand Down Expand Up @@ -43,6 +46,15 @@ catalogs:
'@emotion/styled': '^11.14.1'

overrides:
# TEMP: pin to mui-public#1875's pkg.pr.new build until it merges and publishes a real
# Babel-8 @mui/internal-code-infra. Remove this whole block (and blockExoticSubdeps below)
# once that lands and this repo's own @mui/internal-* versions are bumped normally.
'@mui/internal-code-infra': 'https://pkg.pr.new/mui/mui-public/@mui/internal-code-infra@08eb27e8b'
'@mui/internal-netlify-cache': 'https://pkg.pr.new/mui/mui-public/@mui/internal-netlify-cache@08eb27e8b'
'@mui/internal-test-utils': 'https://pkg.pr.new/mui/mui-public/@mui/internal-test-utils@08eb27e8b'
'@mui/internal-babel-plugin-display-name': 'https://pkg.pr.new/mui/mui-public/@mui/internal-babel-plugin-display-name@08eb27e8b'
'@mui/internal-babel-plugin-minify-errors': 'https://pkg.pr.new/mui/mui-public/@mui/internal-babel-plugin-minify-errors@08eb27e8b'
'@mui/internal-babel-plugin-resolve-imports': 'https://pkg.pr.new/mui/mui-public/@mui/internal-babel-plugin-resolve-imports@08eb27e8b'
# Both were bundled twice in the docs build
'docs>stylis': '4.2.0'
'docs>react-is': '19.3.0'
Expand Down
Loading