From 7a85173ca22081726dd2f772ce5ef7bc7ebe0e76 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Wed, 24 Jan 2024 13:36:18 +0700 Subject: [PATCH 01/19] init deprecations codemod --- .eslintignore | 1 + .../accordion-props/accordion-props.js | 11 +++++ .../accordion-props/accordion-props.test.js | 43 +++++++++++++++++++ .../accordion-props/test-cases/actual.js | 12 ++++++ .../accordion-props/test-cases/expected.js | 12 ++++++ .../src/deprecations/all/deprecations-all.js | 11 +++++ 6 files changed, 90 insertions(+) create mode 100644 packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js create mode 100644 packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js create mode 100644 packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js create mode 100644 packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js create mode 100644 packages/mui-codemod/src/deprecations/all/deprecations-all.js diff --git a/.eslintignore b/.eslintignore index 298ccbdd2f0041..2933e3842db111 100644 --- a/.eslintignore +++ b/.eslintignore @@ -11,6 +11,7 @@ /examples/material-ui-nextjs/src /packages/mui-codemod/lib /packages/mui-codemod/src/*/*.test/* +/packages/mui-codemod/src/**/test-cases/* /packages/mui-icons-material/fixtures /packages/mui-icons-material/legacy /packages/mui-icons-material/lib diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js new file mode 100644 index 00000000000000..9f3c083b86de65 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js @@ -0,0 +1,11 @@ +/** + * @param {import('jscodeshift').FileInfo} file + * @param {import('jscodeshift').API} api + */ +export default function transformer(file, api, options) { + const j = api.jscodeshift; + + const printOptions = options.printOptions; + + return j(file.source).toSource(printOptions); +} diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js new file mode 100644 index 00000000000000..6c6d4a71db002a --- /dev/null +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js @@ -0,0 +1,43 @@ +import path from 'path'; +import { expect } from 'chai'; +import jscodeshift from 'jscodeshift'; +import transform from './accordion-props'; +import readFile from '../../util/readFile'; + +function read(fileName) { + return readFile(path.join(__dirname, fileName)); +} + +describe('@mui/codemod', () => { + describe('deprecations', () => { + describe('accordion-props', () => { + it('transforms props as needed', () => { + const actual = transform( + { + source: read('./test-cases/actual.js'), + path: require.resolve('./test-cases/actual.js'), + }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + + it('should be idempotent', () => { + const actual = transform( + { + source: read('./test-cases/expected.js'), + path: require.resolve('./test-cases/expected.js'), + }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + }); + }); +}); diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js new file mode 100644 index 00000000000000..05bc7e0cca8c5e --- /dev/null +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js @@ -0,0 +1,12 @@ +; +; + +// theme +fn({ + MuiAccordion: { + defaultProps: { + TransitionComponent: CustomTransition, + TransitionProps: { unmountOnExit: true }, + }, + }, +}); diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js new file mode 100644 index 00000000000000..05bc7e0cca8c5e --- /dev/null +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js @@ -0,0 +1,12 @@ +; +; + +// theme +fn({ + MuiAccordion: { + defaultProps: { + TransitionComponent: CustomTransition, + TransitionProps: { unmountOnExit: true }, + }, + }, +}); diff --git a/packages/mui-codemod/src/deprecations/all/deprecations-all.js b/packages/mui-codemod/src/deprecations/all/deprecations-all.js new file mode 100644 index 00000000000000..08e1d4510f02fd --- /dev/null +++ b/packages/mui-codemod/src/deprecations/all/deprecations-all.js @@ -0,0 +1,11 @@ +import transformAccordionProps from '../accordion-props/accordion-props'; + +/** + * @param {import('jscodeshift').FileInfo} file + * @param {import('jscodeshift').API} api + */ +export default function deprecationsAll(file, api, options) { + file.source = transformAccordionProps(file, api, options); + + return file.source; +} From 5c4c9a237f3c1767f0ddf8f9d56b83c80f8f73f3 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Wed, 24 Jan 2024 13:40:42 +0700 Subject: [PATCH 02/19] update readme --- packages/mui-codemod/README.md | 35 ++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/packages/mui-codemod/README.md b/packages/mui-codemod/README.md index 0a1f256699e47c..acabaf5646f6cc 100644 --- a/packages/mui-codemod/README.md +++ b/packages/mui-codemod/README.md @@ -60,9 +60,40 @@ npx @mui/codemod@latest --jscodeshift="--printOptions='{\"quo ## Included scripts +- [Deprecation](#deprecations) +- [v5](#v500) +- [v4](#v400) +- [v1](#v100) +- [v0.15](#v0150) + +### Deprecations + +```bash +npx @mui/codemod@latest deprecations/all +``` + +#### `all` + +A combination of all deprecations. + +#### `accordion-props` + +```diff + +``` + +```bash +npx @mui/codemod@latest deprecations/accordion-props +``` + ### v5.0.0 -### `base-use-named-exports` +#### `base-use-named-exports` Base UI default exports were changed to named ones. Previously we had a mix of default and named ones. This was changed to improve consistency and avoid problems some bundlers have with default exports. @@ -81,7 +112,7 @@ This codemod updates the import and re-export statements. npx @mui/codemod@latest v5.0.0/base-use-named-exports ``` -### `base-remove-unstyled-suffix` +#### `base-remove-unstyled-suffix` The `Unstyled` suffix has been removed from all Base UI component names, including names of types and other related identifiers. From 39bf9464b25f04676967cc23088c99244bc2ee91 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Wed, 24 Jan 2024 17:03:10 +0700 Subject: [PATCH 03/19] add accordion-props --- packages/mui-codemod/codemod.js | 48 +++++--- .../accordion-props/accordion-props.js | 105 +++++++++++++++++- .../accordion-props/accordion-props.test.js | 30 +++++ .../src/deprecations/accordion-props/index.js | 1 + .../accordion-props/test-cases/actual.js | 22 ++-- .../accordion-props/test-cases/expected.js | 40 +++++-- .../test-cases/theme.actual.js | 8 ++ .../test-cases/theme.expected.js | 12 ++ 8 files changed, 224 insertions(+), 42 deletions(-) create mode 100644 packages/mui-codemod/src/deprecations/accordion-props/index.js create mode 100644 packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.actual.js create mode 100644 packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js diff --git a/packages/mui-codemod/codemod.js b/packages/mui-codemod/codemod.js index 20c0622c98f27a..5c9e19d739cc49 100755 --- a/packages/mui-codemod/codemod.js +++ b/packages/mui-codemod/codemod.js @@ -10,27 +10,39 @@ const jscodeshiftDirectory = path.dirname(require.resolve('jscodeshift')); const jscodeshiftExecutable = path.join(jscodeshiftDirectory, jscodeshiftPackage.bin.jscodeshift); async function runTransform(transform, files, flags, codemodFlags) { - const transformerSrcPath = path.resolve(__dirname, './src', `${transform}.js`); - const transformerBuildPath = path.resolve(__dirname, './node', `${transform}.js`); + const paths = [ + path.resolve(__dirname, './src', `${transform}/index.js`), + path.resolve(__dirname, './src', `${transform}.js`), + path.resolve(__dirname, './node', `${transform}/index.js`), + path.resolve(__dirname, './node', `${transform}.js`), + ]; + let transformerPath; - try { - await fs.stat(transformerSrcPath); - transformerPath = transformerSrcPath; - } catch (srcPathError) { + let error; + // eslint-disable-next-line no-restricted-syntax + for (const item of paths) { try { - await fs.stat(transformerBuildPath); - transformerPath = transformerBuildPath; - } catch (buildPathError) { - if (buildPathError.code === 'ENOENT') { - throw new Error( - `Transform '${transform}' not found. Check out ${path.resolve( - __dirname, - './README.md for a list of available codemods.', - )}`, - ); - } - throw buildPathError; + // eslint-disable-next-line no-await-in-loop + await fs.stat(item); + error = undefined; + transformerPath = item; + break; + } catch (srcPathError) { + error = srcPathError; + continue; + } + } + + if (error) { + if (error?.code === 'ENOENT') { + throw new Error( + `Transform '${transform}' not found. Check out ${path.resolve( + __dirname, + './README.md for a list of available codemods.', + )}`, + ); } + throw error; } const args = [ diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js index 9f3c083b86de65..18542dafe0e9b6 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js @@ -4,8 +4,109 @@ */ export default function transformer(file, api, options) { const j = api.jscodeshift; - + const root = j(file.source); const printOptions = options.printOptions; - return j(file.source).toSource(printOptions); + root.find(j.JSXAttribute, { name: { name: 'TransitionComponent' } }).forEach((path) => { + const slotsNode = /** @type import('jscodeshift').JSXOpeningElement */ ( + path.parent.node + ).attributes.find((attr) => attr.name?.name === 'slots'); + + if (slotsNode) { + const expContainer = /** @type import('jscodeshift').JSXExpressionContainer */ ( + slotsNode.value + ); + if (expContainer.expression.type === 'ObjectExpression') { + // case `slots={{ ... }}` + expContainer.expression.properties.push( + j.objectProperty(j.identifier('transition'), path.node.value.expression), + ); + } else if (expContainer.expression.type === 'Identifier') { + // case `slots={outerSlots} + expContainer.expression = j.objectExpression([ + j.spreadElement(j.identifier(expContainer.expression.name)), + j.objectProperty(j.identifier('transition'), path.node.value.expression), + ]); + } + } else { + path.insertAfter( + j.jsxAttribute( + j.jsxIdentifier('slots'), + j.jsxExpressionContainer( + j.objectExpression([ + j.objectProperty(j.identifier('transition'), path.node.value.expression), + ]), + ), + ), + ); + } + + // remove `TransitionComponent` prop + path.replace(); + }); + + root.find(j.JSXAttribute, { name: { name: 'TransitionProps' } }).forEach((path) => { + const slotPropsNode = /** @type import('jscodeshift').JSXOpeningElement */ ( + path.parent.node + ).attributes.find((attr) => attr.name?.name === 'slotProps'); + + if (slotPropsNode) { + // insert to `slotProps` prop + const expContainer = /** @type import('jscodeshift').JSXExpressionContainer */ ( + slotPropsNode.value + ); + if (expContainer.expression.type === 'ObjectExpression') { + // case `slotProps={{ ... }}` + expContainer.expression.properties.push( + j.objectProperty(j.identifier('transition'), path.node.value.expression), + ); + } else if (expContainer.expression.type === 'Identifier') { + // case `slotProps={outerSlotProps} + expContainer.expression = j.objectExpression([ + j.spreadElement(j.identifier(expContainer.expression.name)), + j.objectProperty(j.identifier('transition'), path.node.value.expression), + ]); + } + } else { + path.insertAfter( + j.jsxAttribute( + j.jsxIdentifier('slotProps'), + j.jsxExpressionContainer( + j.objectExpression([ + j.objectProperty(j.identifier('transition'), path.node.value.expression), + ]), + ), + ), + ); + } + + // remove `TransitionProps` prop + path.replace(); + }); + + root.find(j.Property, { key: { name: 'TransitionComponent' } }).forEach((path) => { + if (path.parent?.parent?.parent?.parent?.node.key?.name === 'MuiAccordion') { + path.replace( + j.property( + 'init', + j.identifier('slots'), + j.objectExpression([j.objectProperty(j.identifier('transition'), path.node.value)]), + ), + ); + } + }); + + root.find(j.Property, { key: { name: 'TransitionProps' } }).forEach((path) => { + if (path.parent?.parent?.parent?.parent?.node.key?.name === 'MuiAccordion') { + path.replace( + j.property( + 'init', + j.identifier('slotProps'), + j.objectExpression([j.objectProperty(j.identifier('transition'), path.node.value)]), + ), + ); + } + }); + + return root.toSource(printOptions); } diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js index 6c6d4a71db002a..89b724843ec406 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js @@ -39,5 +39,35 @@ describe('@mui/codemod', () => { expect(actual).to.equal(expected, 'The transformed version should be correct'); }); }); + + describe('[theme] accordion-props', () => { + it('transforms props as needed', () => { + const actual = transform( + { + source: read('./test-cases/theme.actual.js'), + path: require.resolve('./test-cases/theme.actual.js'), + }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/theme.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + + it('should be idempotent', () => { + const actual = transform( + { + source: read('./test-cases/theme.expected.js'), + path: require.resolve('./test-cases/theme.expected.js'), + }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/theme.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + }); }); }); diff --git a/packages/mui-codemod/src/deprecations/accordion-props/index.js b/packages/mui-codemod/src/deprecations/accordion-props/index.js new file mode 100644 index 00000000000000..d069f42dc1754a --- /dev/null +++ b/packages/mui-codemod/src/deprecations/accordion-props/index.js @@ -0,0 +1 @@ +export { default } from './accordion-props'; diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js index 05bc7e0cca8c5e..ed0da30e7d35d9 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js @@ -1,12 +1,14 @@ ; ; - -// theme -fn({ - MuiAccordion: { - defaultProps: { - TransitionComponent: CustomTransition, - TransitionProps: { unmountOnExit: true }, - }, - }, -}); +; +; diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js index 05bc7e0cca8c5e..787f5694d2c322 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js @@ -1,12 +1,28 @@ -; -; - -// theme -fn({ - MuiAccordion: { - defaultProps: { - TransitionComponent: CustomTransition, - TransitionProps: { unmountOnExit: true }, - }, - }, -}); +; +; +; +; diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.actual.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.actual.js new file mode 100644 index 00000000000000..b21358b649fa77 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.actual.js @@ -0,0 +1,8 @@ +fn({ + MuiAccordion: { + defaultProps: { + TransitionComponent: CustomTransition, + TransitionProps: { unmountOnExit: true }, + }, + }, +}); diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js new file mode 100644 index 00000000000000..c3495144d05221 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js @@ -0,0 +1,12 @@ +fn({ + MuiAccordion: { + defaultProps: { + slots: { + transition: CustomTransition + }, + slotProps: { + transition: { unmountOnExit: true } + }, + }, + }, +}); From 78e70aa19a52055938dd59835455d9300c1337a4 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Fri, 26 Jan 2024 09:52:58 +0700 Subject: [PATCH 04/19] add missing index file --- packages/mui-codemod/src/deprecations/all/index.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/mui-codemod/src/deprecations/all/index.js diff --git a/packages/mui-codemod/src/deprecations/all/index.js b/packages/mui-codemod/src/deprecations/all/index.js new file mode 100644 index 00000000000000..dcd97bd9b0e340 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/all/index.js @@ -0,0 +1 @@ +export { default } from './deprecations-all'; From a05e8a28bab67b3b6e329682603b356927ad8625 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Fri, 26 Jan 2024 10:52:08 +0700 Subject: [PATCH 05/19] fix jscodeshift import for test --- .../accordion-props/accordion-props.js | 4 +-- .../accordion-props/accordion-props.test.js | 30 ++++--------------- .../test-cases/theme.expected.js | 3 +- packages/mui-codemod/testUtils/index.js | 4 +++ 4 files changed, 13 insertions(+), 28 deletions(-) create mode 100644 packages/mui-codemod/testUtils/index.js diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js index 18542dafe0e9b6..c069c808bfceca 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js @@ -84,7 +84,7 @@ export default function transformer(file, api, options) { path.replace(); }); - root.find(j.Property, { key: { name: 'TransitionComponent' } }).forEach((path) => { + root.find(j.ObjectProperty, { key: { name: 'TransitionComponent' } }).forEach((path) => { if (path.parent?.parent?.parent?.parent?.node.key?.name === 'MuiAccordion') { path.replace( j.property( @@ -96,7 +96,7 @@ export default function transformer(file, api, options) { } }); - root.find(j.Property, { key: { name: 'TransitionProps' } }).forEach((path) => { + root.find(j.ObjectProperty, { key: { name: 'TransitionProps' } }).forEach((path) => { if (path.parent?.parent?.parent?.parent?.node.key?.name === 'MuiAccordion') { path.replace( j.property( diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js index 89b724843ec406..4c807f4721f71c 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.test.js @@ -1,6 +1,6 @@ import path from 'path'; import { expect } from 'chai'; -import jscodeshift from 'jscodeshift'; +import { jscodeshift } from '../../../testUtils'; import transform from './accordion-props'; import readFile from '../../util/readFile'; @@ -12,28 +12,14 @@ describe('@mui/codemod', () => { describe('deprecations', () => { describe('accordion-props', () => { it('transforms props as needed', () => { - const actual = transform( - { - source: read('./test-cases/actual.js'), - path: require.resolve('./test-cases/actual.js'), - }, - { jscodeshift }, - {}, - ); + const actual = transform({ source: read('./test-cases/actual.js') }, { jscodeshift }, {}); const expected = read('./test-cases/expected.js'); expect(actual).to.equal(expected, 'The transformed version should be correct'); }); it('should be idempotent', () => { - const actual = transform( - { - source: read('./test-cases/expected.js'), - path: require.resolve('./test-cases/expected.js'), - }, - { jscodeshift }, - {}, - ); + const actual = transform({ source: read('./test-cases/expected.js') }, { jscodeshift }, {}); const expected = read('./test-cases/expected.js'); expect(actual).to.equal(expected, 'The transformed version should be correct'); @@ -43,10 +29,7 @@ describe('@mui/codemod', () => { describe('[theme] accordion-props', () => { it('transforms props as needed', () => { const actual = transform( - { - source: read('./test-cases/theme.actual.js'), - path: require.resolve('./test-cases/theme.actual.js'), - }, + { source: read('./test-cases/theme.actual.js') }, { jscodeshift }, {}, ); @@ -57,10 +40,7 @@ describe('@mui/codemod', () => { it('should be idempotent', () => { const actual = transform( - { - source: read('./test-cases/theme.expected.js'), - path: require.resolve('./test-cases/theme.expected.js'), - }, + { source: read('./test-cases/theme.expected.js') }, { jscodeshift }, {}, ); diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js index c3495144d05221..e98f56af5651d5 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.expected.js @@ -4,9 +4,10 @@ fn({ slots: { transition: CustomTransition }, + slotProps: { transition: { unmountOnExit: true } - }, + } }, }, }); diff --git a/packages/mui-codemod/testUtils/index.js b/packages/mui-codemod/testUtils/index.js new file mode 100644 index 00000000000000..038f57962c8576 --- /dev/null +++ b/packages/mui-codemod/testUtils/index.js @@ -0,0 +1,4 @@ +/* eslint-disable import/prefer-default-export */ +import j from 'jscodeshift'; + +export const jscodeshift = j.withParser('tsx'); From 0db96f0e8a266955ca53c2ec4f2f43817e73cb6d Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Fri, 26 Jan 2024 10:56:48 +0700 Subject: [PATCH 06/19] added contributing guide --- packages/mui-codemod/CONTRIBUTING.md | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 packages/mui-codemod/CONTRIBUTING.md diff --git a/packages/mui-codemod/CONTRIBUTING.md b/packages/mui-codemod/CONTRIBUTING.md new file mode 100644 index 00000000000000..ffd1e3176c437f --- /dev/null +++ b/packages/mui-codemod/CONTRIBUTING.md @@ -0,0 +1,44 @@ +## Understanding the codemod + +The codemod is a tool that helps developers migrate thier codebase when we introduced changes in new version. The changes could be deprecations, enhancements, or breaking changes. + +The codemod is based on [jscodeshift](https://github.com/facebook/jscodeshift) which is a wrapper of [recast](https://github.com/benjamn/recast). + +## Adding new codemods + +1. Create a new folder in `packages/mui-codemod/src/*/*` with the name of the codemod. +2. The folder should include: + - `.js` - the transform implementation + - `.test.js` - tests for the codemod (use jscodeshift from the `testUtils` folder) + - `test-cases` - folder with fixtures for the codemod + - `actual.js` - the input for the codemod + - `expected.js` - the expected output of the codemod +3. Use [astexplorer](https://astexplorer.net/) to check the AST types and properties (set to @babel/parser because we use [`tsx`](https://github.com/benjamn/recast/blob/master/parsers/babel.ts) as a default parser for our codemod). +4. [Test the codemod locally](#local) +5. Add the codemod to README.md + +## Testing + +### Local + +Open the terminal at root directory and run the codemod to test the transformation, for example, testing the `accordion-props` codemod: + +```sh +node packages/mui-codemod/codemod deprecations/accordion-props packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.actual.js +``` + +### CI + +Open the CodeSandbox CI build and copy the link from the "Local Install Instructions" section. + +Run the codemod to test the transformation: + +```sh +npx @mui/codemod@ +``` + +For example: + +```sh +npx @mui/codemod@https://pkg.csb.dev/mui/material-ui/commit/39bf9464/@mui/codemod deprecations/accordion-props docs/src/modules/brandingTheme.ts +``` From e54092cf1cf97e44f7a61e262670bd3afa3a8c2e Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Fri, 26 Jan 2024 12:57:44 +0700 Subject: [PATCH 07/19] fix logic --- .../accordion-props/accordion-props.js | 123 ++++++++---------- .../accordion-props/test-cases/actual.js | 7 +- .../mui-codemod/src/util/appendAttribute.js | 11 ++ packages/mui-codemod/src/util/assignObject.js | 26 ++++ .../mui-codemod/src/util/findComponentJSX.js | 39 ++++++ 5 files changed, 137 insertions(+), 69 deletions(-) create mode 100644 packages/mui-codemod/src/util/appendAttribute.js create mode 100644 packages/mui-codemod/src/util/assignObject.js create mode 100644 packages/mui-codemod/src/util/findComponentJSX.js diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js index c069c808bfceca..8ae9cc0b1c7167 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js @@ -1,3 +1,7 @@ +import findComponentJSX from '../../util/findComponentJSX'; +import assignObject from '../../util/assignObject'; +import appendAttribute from '../../util/appendAttribute'; + /** * @param {import('jscodeshift').FileInfo} file * @param {import('jscodeshift').API} api @@ -7,81 +11,66 @@ export default function transformer(file, api, options) { const root = j(file.source); const printOptions = options.printOptions; - root.find(j.JSXAttribute, { name: { name: 'TransitionComponent' } }).forEach((path) => { - const slotsNode = /** @type import('jscodeshift').JSXOpeningElement */ ( - path.parent.node - ).attributes.find((attr) => attr.name?.name === 'slots'); - - if (slotsNode) { - const expContainer = /** @type import('jscodeshift').JSXExpressionContainer */ ( - slotsNode.value + findComponentJSX(j, { root, componentName: 'Accordion' }, (elementPath) => { + let expression = elementPath.node.openingElement.attributes.find( + (attr) => attr.type === 'JSXAttribute' && attr.name.name === 'TransitionComponent', + )?.value?.expression; + if (expression) { + const slotsNode = elementPath.node.openingElement.attributes.find( + (attr) => attr.name?.name === 'slots', ); - if (expContainer.expression.type === 'ObjectExpression') { - // case `slots={{ ... }}` - expContainer.expression.properties.push( - j.objectProperty(j.identifier('transition'), path.node.value.expression), - ); - } else if (expContainer.expression.type === 'Identifier') { - // case `slots={outerSlots} - expContainer.expression = j.objectExpression([ - j.spreadElement(j.identifier(expContainer.expression.name)), - j.objectProperty(j.identifier('transition'), path.node.value.expression), - ]); + + if (slotsNode) { + assignObject(j, { + target: slotsNode, + key: 'transition', + expression, + }); + } else { + appendAttribute(j, { + target: elementPath.node, + attributeName: 'slots', + expression: j.objectExpression([ + j.objectProperty(j.identifier('transition'), expression), + ]), + }); } - } else { - path.insertAfter( - j.jsxAttribute( - j.jsxIdentifier('slots'), - j.jsxExpressionContainer( - j.objectExpression([ - j.objectProperty(j.identifier('transition'), path.node.value.expression), - ]), - ), - ), - ); + + elementPath.node.openingElement.attributes = + elementPath.node.openingElement.attributes.filter( + (attr) => attr.name.name === 'TransitionComponent', + ); } - // remove `TransitionComponent` prop - path.replace(); - }); + expression = elementPath.node.openingElement.attributes.find( + (attr) => attr.type === 'JSXAttribute' && attr.name.name === 'TransitionProps', + )?.value?.expression; + if (expression) { + const slotsNode = elementPath.node.openingElement.attributes.find( + (attr) => attr.name?.name === 'slotProps', + ); - root.find(j.JSXAttribute, { name: { name: 'TransitionProps' } }).forEach((path) => { - const slotPropsNode = /** @type import('jscodeshift').JSXOpeningElement */ ( - path.parent.node - ).attributes.find((attr) => attr.name?.name === 'slotProps'); + if (slotsNode) { + assignObject(j, { + target: slotsNode, + key: 'transition', + expression, + }); + } else { + appendAttribute(j, { + target: elementPath.node, + attributeName: 'slotProps', + expression: j.objectExpression([ + j.objectProperty(j.identifier('transition'), expression), + ]), + }); + } - if (slotPropsNode) { - // insert to `slotProps` prop - const expContainer = /** @type import('jscodeshift').JSXExpressionContainer */ ( - slotPropsNode.value - ); - if (expContainer.expression.type === 'ObjectExpression') { - // case `slotProps={{ ... }}` - expContainer.expression.properties.push( - j.objectProperty(j.identifier('transition'), path.node.value.expression), + elementPath.node.openingElement.attributes = + elementPath.node.openingElement.attributes.filter( + (attr) => attr.name.name === 'TransitionProps', ); - } else if (expContainer.expression.type === 'Identifier') { - // case `slotProps={outerSlotProps} - expContainer.expression = j.objectExpression([ - j.spreadElement(j.identifier(expContainer.expression.name)), - j.objectProperty(j.identifier('transition'), path.node.value.expression), - ]); - } - } else { - path.insertAfter( - j.jsxAttribute( - j.jsxIdentifier('slotProps'), - j.jsxExpressionContainer( - j.objectExpression([ - j.objectProperty(j.identifier('transition'), path.node.value.expression), - ]), - ), - ), - ); } - - // remove `TransitionProps` prop - path.replace(); }); root.find(j.ObjectProperty, { key: { name: 'TransitionComponent' } }).forEach((path) => { diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js index ed0da30e7d35d9..bc3d9ce31411f3 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js @@ -1,12 +1,15 @@ +import Accordion from '@mui/material/Accordion'; +import { Accordion as MyAccordion } from '@mui/material'; + ; -; +; ; - }} /> + * @example push expression to `slots.transition` => }} /> + */ +export default function assignObject(j, options) { + const { target, expression, key } = options; + if (target && target.type === 'JSXOpeningElement') { + const expContainer = /** @type import('jscodeshift').JSXExpressionContainer */ (target.value); + + if (expContainer.expression.type === 'ObjectExpression') { + // case `={{ ... }}` + expContainer.expression.properties.push(j.objectProperty(j.identifier(key), expression)); + } else if (expContainer.expression.type === 'Identifier') { + // case `={outerVariable} + expContainer.expression = j.objectExpression([ + j.spreadElement(j.identifier(expContainer.expression.name)), + j.objectProperty(j.identifier(key), expression), + ]); + } + } +} diff --git a/packages/mui-codemod/src/util/findComponentJSX.js b/packages/mui-codemod/src/util/findComponentJSX.js new file mode 100644 index 00000000000000..08d6fa4d497710 --- /dev/null +++ b/packages/mui-codemod/src/util/findComponentJSX.js @@ -0,0 +1,39 @@ +/** + * Find all the JSXElements of a given component name. + * + * @param {import('jscodeshift')} j + * @param {{ root: import('jscodeshift').Collection; componentName: string }} options + * @param {(path: import('jscodeshift').ASTPath) => void} callback + * + */ +export default function findComponentJSX(j, options, callback) { + const { root, componentName } = options; + + // case 1: import ComponentName from '@mui/material/ComponentName'; + // case 2: import { ComponentName } from '@mui/material'; + // case 3: import { ComponentName as SomethingElse } from '@mui/material'; + + const importName = new Set(); + + root + .find(j.ImportDeclaration) + .filter((path) => + path.node.source.value.match(new RegExp(`^@material-ui/material/?(${componentName})?`)), + ) + .forEach((path) => { + path.node.specifiers.forEach((specifier) => { + if (specifier.type === 'ImportDefaultSpecifier') { + importName.add(specifier.local.name); + } + if (specifier.type === 'ImportSpecifier' && specifier.imported.name === componentName) { + importName.add(specifier.local.name); + } + }); + }); + + [...importName].forEach((name) => { + root.findJSXElements(name).forEach((elementPath) => { + callback(elementPath); + }); + }); +} From 280ece1ef18539797bac8ebdeb4cabd16febd29b Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Fri, 26 Jan 2024 13:18:01 +0700 Subject: [PATCH 08/19] update test cases --- .../accordion-props/accordion-props.js | 74 +++++++++---------- .../accordion-props/test-cases/expected.js | 25 ++----- .../mui-codemod/src/util/findComponentJSX.js | 2 +- 3 files changed, 41 insertions(+), 60 deletions(-) diff --git a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js index 8ae9cc0b1c7167..dddc01c2288104 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/accordion-props.js @@ -12,64 +12,58 @@ export default function transformer(file, api, options) { const printOptions = options.printOptions; findComponentJSX(j, { root, componentName: 'Accordion' }, (elementPath) => { - let expression = elementPath.node.openingElement.attributes.find( + let index = elementPath.node.openingElement.attributes.findIndex( (attr) => attr.type === 'JSXAttribute' && attr.name.name === 'TransitionComponent', - )?.value?.expression; - if (expression) { - const slotsNode = elementPath.node.openingElement.attributes.find( - (attr) => attr.name?.name === 'slots', - ); - - if (slotsNode) { - assignObject(j, { - target: slotsNode, - key: 'transition', - expression, - }); - } else { + ); + if (index !== -1) { + const removed = elementPath.node.openingElement.attributes.splice(index, 1); + let hasNode = false; + elementPath.node.openingElement.attributes.forEach((attr) => { + if (attr.name?.name === 'slots') { + hasNode = true; + assignObject(j, { + target: attr, + key: 'transition', + expression: removed[0].value.expression, + }); + } + }); + if (!hasNode) { appendAttribute(j, { target: elementPath.node, attributeName: 'slots', expression: j.objectExpression([ - j.objectProperty(j.identifier('transition'), expression), + j.objectProperty(j.identifier('transition'), removed[0].value.expression), ]), }); } - - elementPath.node.openingElement.attributes = - elementPath.node.openingElement.attributes.filter( - (attr) => attr.name.name === 'TransitionComponent', - ); } - expression = elementPath.node.openingElement.attributes.find( + index = elementPath.node.openingElement.attributes.findIndex( (attr) => attr.type === 'JSXAttribute' && attr.name.name === 'TransitionProps', - )?.value?.expression; - if (expression) { - const slotsNode = elementPath.node.openingElement.attributes.find( - (attr) => attr.name?.name === 'slotProps', - ); - - if (slotsNode) { - assignObject(j, { - target: slotsNode, - key: 'transition', - expression, - }); - } else { + ); + if (index !== -1) { + const removed = elementPath.node.openingElement.attributes.splice(index, 1); + let hasNode = false; + elementPath.node.openingElement.attributes.forEach((attr) => { + if (attr.name?.name === 'slotProps') { + hasNode = true; + assignObject(j, { + target: attr, + key: 'transition', + expression: removed[0].value.expression, + }); + } + }); + if (!hasNode) { appendAttribute(j, { target: elementPath.node, attributeName: 'slotProps', expression: j.objectExpression([ - j.objectProperty(j.identifier('transition'), expression), + j.objectProperty(j.identifier('transition'), removed[0].value.expression), ]), }); } - - elementPath.node.openingElement.attributes = - elementPath.node.openingElement.attributes.filter( - (attr) => attr.name.name === 'TransitionProps', - ); } }); diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js index 787f5694d2c322..0686530e49cb22 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js @@ -1,28 +1,15 @@ +import Accordion from '@mui/material/Accordion'; +import { Accordion as MyAccordion } from '@mui/material'; + ; -; -; -; +; +; diff --git a/packages/mui-codemod/src/util/findComponentJSX.js b/packages/mui-codemod/src/util/findComponentJSX.js index 08d6fa4d497710..e079d004648f7e 100644 --- a/packages/mui-codemod/src/util/findComponentJSX.js +++ b/packages/mui-codemod/src/util/findComponentJSX.js @@ -18,7 +18,7 @@ export default function findComponentJSX(j, options, callback) { root .find(j.ImportDeclaration) .filter((path) => - path.node.source.value.match(new RegExp(`^@material-ui/material/?(${componentName})?`)), + path.node.source.value.match(new RegExp(`^@mui/material/?(${componentName})?`)), ) .forEach((path) => { path.node.specifiers.forEach((specifier) => { From 46f1f12122b4a8cbff3685c739e2318f386febdc Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Fri, 26 Jan 2024 20:24:55 +0700 Subject: [PATCH 09/19] fix guide --- packages/mui-codemod/CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/mui-codemod/CONTRIBUTING.md b/packages/mui-codemod/CONTRIBUTING.md index ffd1e3176c437f..8debfcb046338b 100644 --- a/packages/mui-codemod/CONTRIBUTING.md +++ b/packages/mui-codemod/CONTRIBUTING.md @@ -1,10 +1,12 @@ +# Contributing + ## Understanding the codemod The codemod is a tool that helps developers migrate thier codebase when we introduced changes in new version. The changes could be deprecations, enhancements, or breaking changes. The codemod is based on [jscodeshift](https://github.com/facebook/jscodeshift) which is a wrapper of [recast](https://github.com/benjamn/recast). -## Adding new codemods +## Adding a new codemod 1. Create a new folder in `packages/mui-codemod/src/*/*` with the name of the codemod. 2. The folder should include: @@ -23,7 +25,7 @@ The codemod is based on [jscodeshift](https://github.com/facebook/jscodeshift) w Open the terminal at root directory and run the codemod to test the transformation, for example, testing the `accordion-props` codemod: -```sh +```bash node packages/mui-codemod/codemod deprecations/accordion-props packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.actual.js ``` @@ -33,12 +35,12 @@ Open the CodeSandbox CI build and copy the link from the "Local Install Instruct Run the codemod to test the transformation: -```sh +```bash npx @mui/codemod@ ``` For example: -```sh +```bash npx @mui/codemod@https://pkg.csb.dev/mui/material-ui/commit/39bf9464/@mui/codemod deprecations/accordion-props docs/src/modules/brandingTheme.ts ``` From 8a3e4baeadd16d0a995ba6003a29175ea80f47e0 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 29 Jan 2024 17:07:12 +0700 Subject: [PATCH 10/19] fix assignObject logic --- .../accordion-props/test-cases/actual.js | 37 ++++++++++++++----- .../accordion-props/test-cases/expected.js | 25 ++++++++++++- packages/mui-codemod/src/util/assignObject.js | 2 +- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js index bc3d9ce31411f3..d0f76993c9142a 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/actual.js @@ -1,17 +1,36 @@ import Accordion from '@mui/material/Accordion'; import { Accordion as MyAccordion } from '@mui/material'; -; -; +; +; ; + slots={{ + root: 'div', + transition: CustomTransition + }} + slotProps={{ + root: { className: 'foo' }, + transition: { unmountOnExit: true } + }} />; ; +// should skip non MUI components +; diff --git a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js index 0686530e49cb22..d0f76993c9142a 100644 --- a/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js +++ b/packages/mui-codemod/src/deprecations/accordion-props/test-cases/expected.js @@ -11,5 +11,26 @@ import { Accordion as MyAccordion } from '@mui/material'; }} slotProps={{ transition: transitionVars }} />; -; -; +; +; +// should skip non MUI components +; diff --git a/packages/mui-codemod/src/util/assignObject.js b/packages/mui-codemod/src/util/assignObject.js index edaf3ce1c791fa..f08a1a6fb91d21 100644 --- a/packages/mui-codemod/src/util/assignObject.js +++ b/packages/mui-codemod/src/util/assignObject.js @@ -9,7 +9,7 @@ */ export default function assignObject(j, options) { const { target, expression, key } = options; - if (target && target.type === 'JSXOpeningElement') { + if (target && target.type === 'JSXAttribute') { const expContainer = /** @type import('jscodeshift').JSXExpressionContainer */ (target.value); if (expContainer.expression.type === 'ObjectExpression') { From 465523218c09a45bb4b859a9de061b7141ec4c50 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 29 Jan 2024 17:07:23 +0700 Subject: [PATCH 11/19] update CONTRIBUTING --- packages/mui-codemod/CONTRIBUTING.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/mui-codemod/CONTRIBUTING.md b/packages/mui-codemod/CONTRIBUTING.md index 8debfcb046338b..f4fc9feba22676 100644 --- a/packages/mui-codemod/CONTRIBUTING.md +++ b/packages/mui-codemod/CONTRIBUTING.md @@ -21,7 +21,16 @@ The codemod is based on [jscodeshift](https://github.com/facebook/jscodeshift) w ## Testing -### Local +I recommend to follow these steps to test the codemod: + +- Create an `actual.js` file with the code you want to transform. +- Run [local](#local) transformation to check if the codemod is correct. +- Copy the transformed code to `expected.js`. +- Run `pnpm tc ` to final check if the codemod is correct. + +💡 The reason that I don't recommend creating the `expected.js` and run the test with `pnpm` script is because the transformation is likely not pretty-printed and it's hard to compare the output with the expected output. + +### Local transformation (while developing) Open the terminal at root directory and run the codemod to test the transformation, for example, testing the `accordion-props` codemod: @@ -29,9 +38,9 @@ Open the terminal at root directory and run the codemod to test the transformati node packages/mui-codemod/codemod deprecations/accordion-props packages/mui-codemod/src/deprecations/accordion-props/test-cases/theme.actual.js ``` -### CI +### CI (after opening a PR) -Open the CodeSandbox CI build and copy the link from the "Local Install Instructions" section. +To simulate a consumer-facing experience on any project before merging the PR, open the CodeSandbox CI build and copy the link from the "Local Install Instructions" section. Run the codemod to test the transformation: From f3c161df11f545c1bb284727fdac65b8ea155a34 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 29 Jan 2024 18:24:49 +0700 Subject: [PATCH 12/19] add mui-utils-import codemod --- .../deprecations/mui-utils-import/index.js | 1 + .../mui-utils-import/mui-utils-import.js | 202 ++++++++++++++++++ .../mui-utils-import/test-cases/actual.js | 3 + 3 files changed, 206 insertions(+) create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/index.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/index.js b/packages/mui-codemod/src/deprecations/mui-utils-import/index.js new file mode 100644 index 00000000000000..01ce838464ded7 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/index.js @@ -0,0 +1 @@ +export { default } from './mui-utils-import'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js new file mode 100644 index 00000000000000..769865c986be64 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js @@ -0,0 +1,202 @@ +/** + * @param {import('jscodeshift').FileInfo} file + * @param {import('jscodeshift').API} api + */ +export default function transformer(file, api, options) { + const j = api.jscodeshift; + const root = j(file.source); + const printOptions = options.printOptions; + + // @mui/utils + const timeoutSpecifiers = []; + const deepmergeSpecifiers = []; + root + .find(j.ImportDeclaration) + .filter((path) => path.node.source.value === '@mui/utils') + .forEach((path) => { + path.node.specifiers.forEach((specifier) => { + if (specifier.imported.name === 'unstable_Timeout') { + timeoutSpecifiers.push(j.importSpecifier(j.identifier(specifier.local.name))); + } else if (specifier.imported.name === 'unstable_useTimeout') { + timeoutSpecifiers.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); + } else if (specifier.imported.name === 'isPlainObject') { + deepmergeSpecifiers.push(j.importSpecifier(j.identifier(specifier.local.name))); + } else if (specifier.imported.name === 'deepmerge') { + deepmergeSpecifiers.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); + } else { + path.insertAfter( + j.importDeclaration( + [j.importDefaultSpecifier(j.identifier(specifier.local.name))], + j.stringLiteral(`@mui/utils/${specifier.local.name}`), + ), + ); + } + }); + if (timeoutSpecifiers.length) { + path.insertAfter( + j.importDeclaration(timeoutSpecifiers, j.stringLiteral(`@mui/utils/useTimeout`)), + ); + } + if (deepmergeSpecifiers.length) { + path.insertAfter( + j.importDeclaration(deepmergeSpecifiers, j.stringLiteral(`@mui/utils/deepmerge`)), + ); + } + path.replace(); + }); + + // @mui/base + root + .find(j.ImportDeclaration) + .filter((path) => path.node.source.value === '@mui/base/composeClasses') + .forEach((path) => { + path.insertAfter( + j.importDeclaration( + [j.importDefaultSpecifier(j.identifier('composeClasses'))], + j.stringLiteral(`@mui/utils/composeClasses`), + ), + ); + path.replace(); + }); + + const existingBaseUtils = [ + 'appendOwnerState', + 'areArraysEqual', + 'ClassNameConfigurator', + 'extractEventHandlers', + 'isHostComponent', + 'resolveComponentProps', + 'useSlotProps', + 'mergeSlotProps', + 'prepareForSlot', + ]; + const baseUtils = []; + let baseImportPath; + root + .find(j.ImportDeclaration) + .filter((path) => path.node.source.value === '@mui/base') + .forEach((path) => { + baseImportPath = path; + path.node.specifiers.forEach((specifier) => { + if (existingBaseUtils.includes(specifier.imported.name)) { + baseUtils.push(specifier); + } + if (specifier.imported.name === 'unstable_composeClasses') { + path.insertAfter( + j.importDeclaration( + [j.importDefaultSpecifier(j.identifier(specifier.local.name))], + j.stringLiteral(`@mui/utils/composeClasses`), + ), + ); + } + }); + }); + if (baseUtils.length) { + baseImportPath.insertAfter(j.importDeclaration(baseUtils, j.stringLiteral(`@mui/base/utils`))); + } + if (baseImportPath) { + baseImportPath.node.specifiers = baseImportPath.node.specifiers.filter( + (specifier) => + ![...existingBaseUtils, 'unstable_composeClasses'].includes(specifier.imported.name), + ); + if (!baseImportPath.node.specifiers.length) { + baseImportPath.replace(); + } + } + + // @mui/system + const colors = []; + const systemColorFns = [ + 'hexToRgb', + 'rgbToHex', + 'hslToRgb', + 'decomposeColor', + 'colorChannel', + 'recomposeColor', + 'getContrastRatio', + 'getLuminance', + 'emphasize', + 'alpha', + 'darken', + 'lighten', + 'private_safeColorChannel', + 'private_safeEmphasize', + 'private_safeAlpha', + 'private_safeDarken', + 'private_safeLighten', + ]; + const styleFunctionSx = []; + const useThemePropsSpecifier = []; + const defaultImport = ['createTheme', 'useThemeWithoutDefault']; + let systemImportPath; + root + .find(j.ImportDeclaration) + .filter((path) => path.node.source.value === '@mui/system') + .forEach((path) => { + systemImportPath = path; + path.node.specifiers.forEach((specifier) => { + if (systemColorFns.includes(specifier.imported.name)) { + colors.push(specifier); + } + defaultImport.forEach((item) => { + if (specifier.imported.name === item) { + path.insertAfter( + j.importDeclaration( + [j.importDefaultSpecifier(j.identifier(specifier.local.name))], + j.stringLiteral(`@mui/system/${specifier.imported.name}`), + ), + ); + } + }); + if (specifier.imported.name === 'getThemeProps') { + useThemePropsSpecifier.push(j.importSpecifier(j.identifier(specifier.local.name))); + } + if (specifier.imported.name === 'useThemeProps') { + useThemePropsSpecifier.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); + } + if (specifier.imported.name === 'unstable_styleFunctionSx') { + styleFunctionSx.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); + } + if (specifier.imported.name === 'unstable_defaultSxConfig') { + styleFunctionSx.push(specifier); + } + if (specifier.imported.name === 'unstable_extendSxProp') { + styleFunctionSx.push(j.importSpecifier(j.identifier('extendSxProp'), specifier.local)); + } + }); + if (useThemePropsSpecifier.length) { + path.insertAfter( + j.importDeclaration(useThemePropsSpecifier, j.stringLiteral(`@mui/system/useThemeProps`)), + ); + } + }); + if (colors.length) { + systemImportPath.insertAfter( + j.importDeclaration(colors, j.stringLiteral(`@mui/system/colorManipulator`)), + ); + } + if (styleFunctionSx.length) { + systemImportPath.insertAfter( + j.importDeclaration(styleFunctionSx, j.stringLiteral(`@mui/system/styleFunctionSx`)), + ); + } + if (systemImportPath) { + systemImportPath.node.specifiers = systemImportPath.node.specifiers.filter( + (specifier) => + ![ + ...systemColorFns, + ...defaultImport, + 'useThemeProps', + 'getThemeProps', + 'unstable_styleFunctionSx', + 'unstable_defaultSxConfig', + 'unstable_extendSxProp', + ].includes(specifier.imported.name), + ); + if (!systemImportPath.node.specifiers.length) { + systemImportPath.replace(); + } + } + + return root.toSource(printOptions); +} diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js new file mode 100644 index 00000000000000..d6b9a930c6f67d --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js @@ -0,0 +1,3 @@ +import deepmerge from "@mui/utils/deepmerge"; +import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig, extendSxProp } from "@mui/system/styleFunctionSx"; +import systemCreateTheme from "@mui/system/createTheme"; From 27ade218470de65657fc2bc48446f0af1f5c74c2 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 29 Jan 2024 20:45:57 +0700 Subject: [PATCH 13/19] add tests --- .../mui-utils-import/mui-utils-import.js | 10 +++ .../mui-utils-import/mui-utils-import.test.js | 87 +++++++++++++++++++ .../mui-utils-import/test-cases/actual.js | 3 - .../test-cases/base.actual.js | 5 ++ .../test-cases/base.expected.js | 2 + .../test-cases/system.actual.js | 19 ++++ .../test-cases/system.expected.js | 21 +++++ .../test-cases/utils.actual.js | 21 +++++ .../test-cases/utils.expected.js | 17 ++++ 9 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js create mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js index 769865c986be64..2d171da279bcb0 100644 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js @@ -10,6 +10,7 @@ export default function transformer(file, api, options) { // @mui/utils const timeoutSpecifiers = []; const deepmergeSpecifiers = []; + const scrollLeftSpecifier = []; root .find(j.ImportDeclaration) .filter((path) => path.node.source.value === '@mui/utils') @@ -23,6 +24,10 @@ export default function transformer(file, api, options) { deepmergeSpecifiers.push(j.importSpecifier(j.identifier(specifier.local.name))); } else if (specifier.imported.name === 'deepmerge') { deepmergeSpecifiers.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); + } else if (specifier.imported.name === 'unstable_detectScrollType') { + scrollLeftSpecifier.push(j.importSpecifier(j.identifier(specifier.local.name))); + } else if (specifier.imported.name === 'unstable_getNormalizedScrollLeft') { + scrollLeftSpecifier.push(j.importSpecifier(j.identifier(specifier.local.name))); } else { path.insertAfter( j.importDeclaration( @@ -42,6 +47,11 @@ export default function transformer(file, api, options) { j.importDeclaration(deepmergeSpecifiers, j.stringLiteral(`@mui/utils/deepmerge`)), ); } + if (scrollLeftSpecifier.length) { + path.insertAfter( + j.importDeclaration(scrollLeftSpecifier, j.stringLiteral(`@mui/utils/scrollLeft`)), + ); + } path.replace(); }); diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js new file mode 100644 index 00000000000000..b8ae9eba163b56 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js @@ -0,0 +1,87 @@ +import path from 'path'; +import { expect } from 'chai'; +import { jscodeshift } from '../../../testUtils'; +import transform from './mui-utils-import'; +import readFile from '../../util/readFile'; + +function read(fileName) { + return readFile(path.join(__dirname, fileName)); +} + +describe('@mui/codemod', () => { + describe('deprecations', () => { + describe('mui-utils-import', () => { + describe('utils', () => { + it('transforms props as needed', () => { + const actual = transform( + { source: read('./test-cases/utils.actual.js') }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/utils.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + + it('should be idempotent', () => { + const actual = transform( + { source: read('./test-cases/utils.expected.js') }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/utils.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + }); + + describe('base', () => { + it('transforms props as needed', () => { + const actual = transform( + { source: read('./test-cases/base.actual.js') }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/base.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + + it('should be idempotent', () => { + const actual = transform( + { source: read('./test-cases/base.expected.js') }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/base.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + }); + + describe('system', () => { + it('transforms props as needed', () => { + const actual = transform( + { source: read('./test-cases/system.actual.js') }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/system.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + + it('should be idempotent', () => { + const actual = transform( + { source: read('./test-cases/system.expected.js') }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/system.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); + }); + }); + }); +}); diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js deleted file mode 100644 index d6b9a930c6f67d..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/actual.js +++ /dev/null @@ -1,3 +0,0 @@ -import deepmerge from "@mui/utils/deepmerge"; -import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig, extendSxProp } from "@mui/system/styleFunctionSx"; -import systemCreateTheme from "@mui/system/createTheme"; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js new file mode 100644 index 00000000000000..7314c8b7142211 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js @@ -0,0 +1,5 @@ +import { + unstable_composeClasses as composeClasses, + useSlotProps, + isHostComponent, +} from '@mui/base'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js new file mode 100644 index 00000000000000..4be0abaad90ccb --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js @@ -0,0 +1,2 @@ +import { useSlotProps, isHostComponent } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js new file mode 100644 index 00000000000000..0ca92b9888165c --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js @@ -0,0 +1,19 @@ +import { + darken, + lighten, + emphasize, + alpha, + useThemeWithoutDefault as useTheme, + createTheme as systemCreateTheme, + unstable_defaultSxConfig as defaultSxConfig, + unstable_styleFunctionSx as styleFunctionSx, + private_safeColorChannel as safeColorChannel, + private_safeAlpha as safeAlpha, + private_safeDarken as safeDarken, + private_safeLighten as safeLighten, + private_safeEmphasize as safeEmphasize, + unstable_createGetCssVar as systemCreateGetCssVar, + unstable_prepareCssVars as prepareCssVars, + hslToRgb, + unstable_extendSxProp as extendSxProp, +} from '@mui/system'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js new file mode 100644 index 00000000000000..9bc095647e3c0d --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js @@ -0,0 +1,21 @@ +import { + unstable_createGetCssVar as systemCreateGetCssVar, + unstable_prepareCssVars as prepareCssVars, +} from '@mui/system'; +import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig, extendSxProp } from "@mui/system/styleFunctionSx"; + +import { + darken, + lighten, + emphasize, + alpha, + private_safeColorChannel as safeColorChannel, + private_safeAlpha as safeAlpha, + private_safeDarken as safeDarken, + private_safeLighten as safeLighten, + private_safeEmphasize as safeEmphasize, + hslToRgb, +} from "@mui/system/colorManipulator"; + +import systemCreateTheme from "@mui/system/createTheme"; +import useTheme from "@mui/system/useThemeWithoutDefault"; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js new file mode 100644 index 00000000000000..ca8c409cff1b4e --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js @@ -0,0 +1,21 @@ +import { + chainPropTypes, + integerPropType, + usePreviousProps, + getValidReactChildren, + refType, + unstable_ClassNameGenerator, + unstable_useId as useId, + deepmerge, + elementAcceptingRef, + unstable_Timeout as Timeout, + unstable_useTimeout as useTimeout, + exactProp, + getDisplayName, + unstable_capitalize as capitalize, + elementTypeAcceptingRef, + HTMLElementType, + clamp, + unstable_detectScrollType as detectScrollType, + unstable_getNormalizedScrollLeft as getNormalizedScrollLeft, +} from '@mui/utils'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js new file mode 100644 index 00000000000000..a4a083090294a4 --- /dev/null +++ b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js @@ -0,0 +1,17 @@ +import { detectScrollType, getNormalizedScrollLeft } from "@mui/utils/scrollLeft"; +import deepmerge from "@mui/utils/deepmerge"; +import useTimeout, { Timeout } from "@mui/utils/useTimeout"; +import clamp from "@mui/utils/clamp"; +import HTMLElementType from "@mui/utils/HTMLElementType"; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import capitalize from "@mui/utils/capitalize"; +import getDisplayName from "@mui/utils/getDisplayName"; +import exactProp from "@mui/utils/exactProp"; +import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; +import useId from "@mui/utils/useId"; +import unstable_ClassNameGenerator from "@mui/utils/unstable_ClassNameGenerator"; +import refType from "@mui/utils/refType"; +import getValidReactChildren from "@mui/utils/getValidReactChildren"; +import usePreviousProps from "@mui/utils/usePreviousProps"; +import integerPropType from "@mui/utils/integerPropType"; +import chainPropTypes from "@mui/utils/chainPropTypes"; From e1937f091fe0ea1911caaeb1868b3526407b7d74 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 12 Feb 2024 15:08:58 +0700 Subject: [PATCH 14/19] transform Material UI --- .../mui-material/src/Accordion/Accordion.js | 4 ++-- .../src/AccordionActions/AccordionActions.js | 2 +- .../src/AccordionDetails/AccordionDetails.js | 2 +- .../src/AccordionSummary/AccordionSummary.js | 2 +- packages/mui-material/src/Alert/Alert.js | 4 ++-- .../mui-material/src/AlertTitle/AlertTitle.js | 2 +- packages/mui-material/src/AppBar/AppBar.js | 2 +- .../src/Autocomplete/Autocomplete.js | 14 ++++++------- packages/mui-material/src/Avatar/Avatar.js | 2 +- .../src/AvatarGroup/AvatarGroup.js | 4 ++-- .../mui-material/src/Backdrop/Backdrop.js | 2 +- packages/mui-material/src/Badge/Badge.js | 6 +++--- .../src/BottomNavigation/BottomNavigation.js | 2 +- .../BottomNavigationAction.js | 2 +- .../src/Breadcrumbs/BreadcrumbCollapsed.js | 2 +- .../src/Breadcrumbs/Breadcrumbs.js | 7 ++++--- packages/mui-material/src/Button/Button.js | 6 +++--- .../mui-material/src/ButtonBase/ButtonBase.js | 7 ++++--- .../src/ButtonBase/TouchRipple.js | 2 +- .../src/ButtonGroup/ButtonGroup.js | 6 +++--- packages/mui-material/src/Card/Card.js | 4 ++-- .../src/CardActionArea/CardActionArea.js | 2 +- .../src/CardActions/CardActions.js | 2 +- .../src/CardContent/CardContent.js | 2 +- .../mui-material/src/CardHeader/CardHeader.js | 2 +- .../mui-material/src/CardMedia/CardMedia.js | 4 ++-- .../mui-material/src/Checkbox/Checkbox.js | 6 +++--- packages/mui-material/src/Chip/Chip.js | 4 ++-- .../src/CircularProgress/CircularProgress.js | 4 ++-- .../mui-material/src/Collapse/Collapse.js | 7 ++++--- packages/mui-material/src/Dialog/Dialog.js | 4 ++-- .../src/DialogActions/DialogActions.js | 2 +- .../src/DialogContent/DialogContent.js | 2 +- .../DialogContentText/DialogContentText.js | 2 +- .../src/DialogTitle/DialogTitle.js | 2 +- packages/mui-material/src/Divider/Divider.js | 4 ++-- packages/mui-material/src/Drawer/Drawer.js | 4 ++-- packages/mui-material/src/Fab/Fab.js | 2 +- packages/mui-material/src/Fade/Fade.js | 2 +- .../src/FilledInput/FilledInput.js | 7 ++++--- .../src/FormControl/FormControl.js | 2 +- .../src/FormControlLabel/FormControlLabel.js | 4 ++-- .../mui-material/src/FormGroup/FormGroup.js | 2 +- .../src/FormHelperText/FormHelperText.js | 2 +- .../mui-material/src/FormLabel/FormLabel.js | 2 +- packages/mui-material/src/Grid/Grid.js | 6 +++--- packages/mui-material/src/Grow/Grow.js | 5 +++-- packages/mui-material/src/Hidden/HiddenCss.js | 2 +- packages/mui-material/src/Hidden/HiddenJs.js | 2 +- packages/mui-material/src/Hidden/withWidth.js | 4 ++-- packages/mui-material/src/Icon/Icon.js | 2 +- .../mui-material/src/IconButton/IconButton.js | 6 +++--- .../src/IconButton/IconButton.test.js | 2 +- .../mui-material/src/ImageList/ImageList.js | 4 ++-- .../src/ImageListItem/ImageListItem.js | 4 ++-- .../src/ImageListItemBar/ImageListItemBar.js | 2 +- packages/mui-material/src/Input/Input.js | 7 ++++--- .../src/InputAdornment/InputAdornment.js | 2 +- .../mui-material/src/InputBase/InputBase.js | 13 ++++++------ .../mui-material/src/InputLabel/InputLabel.js | 2 +- .../src/LinearProgress/LinearProgress.js | 7 ++++--- packages/mui-material/src/Link/Link.js | 4 ++-- .../src/Link/getTextDecoration.ts | 3 ++- packages/mui-material/src/List/List.js | 2 +- .../mui-material/src/ListItem/ListItem.js | 10 +++++---- .../src/ListItemAvatar/ListItemAvatar.js | 2 +- .../src/ListItemButton/ListItemButton.js | 4 ++-- .../src/ListItemIcon/ListItemIcon.js | 2 +- .../ListItemSecondaryAction.js | 2 +- .../src/ListItemText/ListItemText.js | 2 +- .../src/ListSubheader/ListSubheader.js | 2 +- packages/mui-material/src/Menu/Menu.js | 4 ++-- .../mui-material/src/MenuItem/MenuItem.js | 4 ++-- .../src/MobileStepper/MobileStepper.js | 4 ++-- packages/mui-material/src/Modal/Modal.js | 9 ++++---- .../src/NativeSelect/NativeSelect.js | 2 +- .../src/NativeSelect/NativeSelectInput.js | 4 ++-- .../src/OutlinedInput/OutlinedInput.js | 4 ++-- .../mui-material/src/Pagination/Pagination.js | 4 ++-- .../src/PaginationItem/PaginationItem.js | 4 ++-- packages/mui-material/src/Paper/Paper.js | 9 ++++---- packages/mui-material/src/Popover/Popover.js | 21 +++++++------------ .../mui-material/src/Popper/Popper.test.js | 3 ++- packages/mui-material/src/Popper/Popper.tsx | 8 ++++--- packages/mui-material/src/Radio/Radio.js | 6 +++--- packages/mui-material/src/Rating/Rating.js | 8 ++++--- .../ScopedCssBaseline/ScopedCssBaseline.js | 2 +- packages/mui-material/src/Select/Select.js | 2 +- .../mui-material/src/Select/SelectInput.js | 7 ++++--- .../mui-material/src/Skeleton/Skeleton.js | 2 +- packages/mui-material/src/Slide/Slide.js | 6 ++++-- packages/mui-material/src/Slider/Slider.js | 13 +++++------- .../mui-material/src/Snackbar/Snackbar.js | 5 +++-- .../src/SnackbarContent/SnackbarContent.js | 4 ++-- .../mui-material/src/SpeedDial/SpeedDial.js | 7 ++++--- .../src/SpeedDialAction/SpeedDialAction.js | 4 ++-- .../src/SpeedDialIcon/SpeedDialIcon.js | 2 +- packages/mui-material/src/Step/Step.js | 4 ++-- .../mui-material/src/StepButton/StepButton.js | 2 +- .../src/StepConnector/StepConnector.js | 2 +- .../src/StepContent/StepContent.js | 2 +- .../mui-material/src/StepIcon/StepIcon.js | 2 +- .../mui-material/src/StepLabel/StepLabel.js | 2 +- packages/mui-material/src/Stepper/Stepper.js | 4 ++-- packages/mui-material/src/SvgIcon/SvgIcon.js | 2 +- .../src/SwipeableDrawer/SwipeableDrawer.js | 4 ++-- packages/mui-material/src/Switch/Switch.js | 6 +++--- packages/mui-material/src/Tab/Tab.js | 2 +- .../src/TabScrollButton/TabScrollButton.js | 5 +++-- packages/mui-material/src/Table/Table.js | 2 +- .../mui-material/src/TableBody/TableBody.js | 2 +- .../mui-material/src/TableCell/TableCell.js | 4 ++-- .../src/TableContainer/TableContainer.js | 2 +- .../src/TableFooter/TableFooter.js | 2 +- .../mui-material/src/TableHead/TableHead.js | 2 +- .../src/TablePagination/TablePagination.js | 8 ++++--- .../mui-material/src/TableRow/TableRow.js | 4 ++-- .../src/TableSortLabel/TableSortLabel.js | 2 +- packages/mui-material/src/Tabs/Tabs.js | 7 ++++--- .../mui-material/src/TextField/TextField.js | 7 ++++--- .../src/ToggleButton/ToggleButton.js | 4 ++-- .../ToggleButtonGroup/ToggleButtonGroup.js | 4 ++-- packages/mui-material/src/Toolbar/Toolbar.js | 2 +- packages/mui-material/src/Tooltip/Tooltip.js | 14 ++++++------- .../mui-material/src/Typography/Typography.js | 4 ++-- packages/mui-material/src/Zoom/Zoom.js | 2 +- .../mui-material/src/internal/SwitchBase.js | 4 ++-- .../src/styles/CssVarsProvider.tsx | 9 +++----- .../src/styles/createMuiStrictModeTheme.js | 2 +- .../mui-material/src/styles/createPalette.js | 4 ++-- .../src/styles/createPalette.test.js | 2 +- .../mui-material/src/styles/createTheme.js | 9 +++----- .../src/styles/createTypography.js | 2 +- .../src/styles/experimental_extendTheme.js | 15 +++++++------ .../src/styles/shouldSkipGeneratingVar.ts | 8 +++---- packages/mui-material/src/styles/styled.js | 2 +- .../mui-material/src/styles/useThemeProps.js | 2 +- .../src/useMediaQuery/useMediaQuery.ts | 5 +++-- .../src/usePagination/usePagination.js | 2 +- .../mui-material/src/utils/capitalize.d.ts | 2 +- packages/mui-material/src/utils/capitalize.js | 2 +- .../src/utils/createChainedFunction.d.ts | 2 +- .../src/utils/createChainedFunction.js | 2 +- packages/mui-material/src/utils/debounce.d.ts | 2 +- packages/mui-material/src/utils/debounce.js | 2 +- .../src/utils/deprecatedPropType.d.ts | 2 +- .../src/utils/deprecatedPropType.js | 2 +- .../src/utils/getScrollbarSize.ts | 2 +- .../mui-material/src/utils/isMuiElement.d.ts | 2 +- .../mui-material/src/utils/isMuiElement.js | 2 +- .../mui-material/src/utils/ownerDocument.ts | 2 +- .../mui-material/src/utils/ownerWindow.ts | 2 +- .../src/utils/requirePropFactory.d.ts | 2 +- .../src/utils/requirePropFactory.js | 2 +- packages/mui-material/src/utils/setRef.ts | 2 +- .../src/utils/shouldSpreadAdditionalProps.js | 2 +- .../src/utils/unsupportedProp.d.ts | 2 +- .../mui-material/src/utils/unsupportedProp.js | 2 +- .../mui-material/src/utils/useControlled.d.ts | 2 +- .../mui-material/src/utils/useControlled.js | 2 +- .../src/utils/useEnhancedEffect.d.ts | 2 +- .../src/utils/useEnhancedEffect.js | 2 +- .../src/utils/useEventCallback.d.ts | 2 +- .../src/utils/useEventCallback.js | 2 +- .../mui-material/src/utils/useForkRef.d.ts | 2 +- packages/mui-material/src/utils/useForkRef.js | 2 +- packages/mui-material/src/utils/useId.d.ts | 2 +- packages/mui-material/src/utils/useId.js | 2 +- .../src/utils/useIsFocusVisible.d.ts | 2 +- .../src/utils/useIsFocusVisible.js | 2 +- packages/mui-material/src/utils/useSlot.ts | 2 +- 171 files changed, 330 insertions(+), 320 deletions(-) diff --git a/packages/mui-material/src/Accordion/Accordion.js b/packages/mui-material/src/Accordion/Accordion.js index 5483c88ad1f670..d7a67cd67021c3 100644 --- a/packages/mui-material/src/Accordion/Accordion.js +++ b/packages/mui-material/src/Accordion/Accordion.js @@ -3,8 +3,8 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Collapse from '../Collapse'; diff --git a/packages/mui-material/src/AccordionActions/AccordionActions.js b/packages/mui-material/src/AccordionActions/AccordionActions.js index 912b6f265049c8..6c58b66aa181c7 100644 --- a/packages/mui-material/src/AccordionActions/AccordionActions.js +++ b/packages/mui-material/src/AccordionActions/AccordionActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getAccordionActionsUtilityClass } from './accordionActionsClasses'; diff --git a/packages/mui-material/src/AccordionDetails/AccordionDetails.js b/packages/mui-material/src/AccordionDetails/AccordionDetails.js index b9c7eefc67e1ef..eeef2548a9c38a 100644 --- a/packages/mui-material/src/AccordionDetails/AccordionDetails.js +++ b/packages/mui-material/src/AccordionDetails/AccordionDetails.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getAccordionDetailsUtilityClass } from './accordionDetailsClasses'; diff --git a/packages/mui-material/src/AccordionSummary/AccordionSummary.js b/packages/mui-material/src/AccordionSummary/AccordionSummary.js index b40956653b9d0d..c01675a549101d 100644 --- a/packages/mui-material/src/AccordionSummary/AccordionSummary.js +++ b/packages/mui-material/src/AccordionSummary/AccordionSummary.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Alert/Alert.js b/packages/mui-material/src/Alert/Alert.js index b063487a913c3b..4563f93d4c9254 100644 --- a/packages/mui-material/src/Alert/Alert.js +++ b/packages/mui-material/src/Alert/Alert.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { darken, lighten } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { darken, lighten } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/AlertTitle/AlertTitle.js b/packages/mui-material/src/AlertTitle/AlertTitle.js index ab003a117e4f48..ff5e7557a682e0 100644 --- a/packages/mui-material/src/AlertTitle/AlertTitle.js +++ b/packages/mui-material/src/AlertTitle/AlertTitle.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/AppBar/AppBar.js b/packages/mui-material/src/AppBar/AppBar.js index 2f36324bf04e35..13912aac5b623e 100644 --- a/packages/mui-material/src/AppBar/AppBar.js +++ b/packages/mui-material/src/AppBar/AppBar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Autocomplete/Autocomplete.js b/packages/mui-material/src/Autocomplete/Autocomplete.js index 1be40792197f1a..1eb06e42cdd10e 100644 --- a/packages/mui-material/src/Autocomplete/Autocomplete.js +++ b/packages/mui-material/src/Autocomplete/Autocomplete.js @@ -1,14 +1,12 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, integerPropType } from '@mui/utils'; -import { - unstable_composeClasses as composeClasses, - useAutocomplete, - createFilterOptions, -} from '@mui/base'; -import { alpha } from '@mui/system'; +import integerPropType from "@mui/utils/integerPropType"; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import { useAutocomplete, createFilterOptions } from '@mui/base'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import Popper from '../Popper'; import ListSubheader from '../ListSubheader'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/Avatar/Avatar.js b/packages/mui-material/src/Avatar/Avatar.js index e1994e72475b00..f68aa676dd475c 100644 --- a/packages/mui-material/src/Avatar/Avatar.js +++ b/packages/mui-material/src/Avatar/Avatar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Person from '../internal/svg-icons/Person'; diff --git a/packages/mui-material/src/AvatarGroup/AvatarGroup.js b/packages/mui-material/src/AvatarGroup/AvatarGroup.js index a1fdfb09dc466e..89fb16de81cacf 100644 --- a/packages/mui-material/src/AvatarGroup/AvatarGroup.js +++ b/packages/mui-material/src/AvatarGroup/AvatarGroup.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { isFragment } from 'react-is'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Avatar, { avatarClasses } from '../Avatar'; diff --git a/packages/mui-material/src/Backdrop/Backdrop.js b/packages/mui-material/src/Backdrop/Backdrop.js index 8a8f4331409da8..8cccb95db03db8 100644 --- a/packages/mui-material/src/Backdrop/Backdrop.js +++ b/packages/mui-material/src/Backdrop/Backdrop.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Fade from '../Fade'; diff --git a/packages/mui-material/src/Badge/Badge.js b/packages/mui-material/src/Badge/Badge.js index 0acd4237363ddf..8b10c5e5688839 100644 --- a/packages/mui-material/src/Badge/Badge.js +++ b/packages/mui-material/src/Badge/Badge.js @@ -2,10 +2,10 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { usePreviousProps } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import usePreviousProps from "@mui/utils/usePreviousProps"; +import composeClasses from "@mui/utils/composeClasses"; import { useBadge } from '@mui/base/useBadge'; -import { useSlotProps } from '@mui/base'; +import { useSlotProps } from "@mui/base/utils"; import { styled, createUseThemeProps } from '../zero-styled'; import capitalize from '../utils/capitalize'; import badgeClasses, { getBadgeUtilityClass } from './badgeClasses'; diff --git a/packages/mui-material/src/BottomNavigation/BottomNavigation.js b/packages/mui-material/src/BottomNavigation/BottomNavigation.js index e62764d9f91099..5dbe976884ced0 100755 --- a/packages/mui-material/src/BottomNavigation/BottomNavigation.js +++ b/packages/mui-material/src/BottomNavigation/BottomNavigation.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getBottomNavigationUtilityClass } from './bottomNavigationClasses'; diff --git a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js index 0274540aeaeefa..5deca3029736b3 100644 --- a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js +++ b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js index 7ae564eca375dc..edae25a6641acc 100644 --- a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js +++ b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { emphasize } from '@mui/system'; +import { emphasize } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import MoreHorizIcon from '../internal/svg-icons/MoreHoriz'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js index cde6e6dbba8256..a2833ea8e6be36 100644 --- a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js +++ b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js @@ -1,10 +1,11 @@ -'use client'; +'use client';; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import integerPropType from "@mui/utils/integerPropType"; +import { useSlotProps } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/Button/Button.js b/packages/mui-material/src/Button/Button.js index d924ad68d38966..077d381f6d7d19 100644 --- a/packages/mui-material/src/Button/Button.js +++ b/packages/mui-material/src/Button/Button.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { internal_resolveProps as resolveProps } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import resolveProps from "@mui/utils/resolveProps"; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.js b/packages/mui-material/src/ButtonBase/ButtonBase.js index 05f3e5963e7052..9f3a63f69d4177 100644 --- a/packages/mui-material/src/ButtonBase/ButtonBase.js +++ b/packages/mui-material/src/ButtonBase/ButtonBase.js @@ -1,9 +1,10 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { elementTypeAcceptingRef, refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from "@mui/utils/refType"; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/ButtonBase/TouchRipple.js b/packages/mui-material/src/ButtonBase/TouchRipple.js index 4c0bc8ad469305..3a89006691a234 100644 --- a/packages/mui-material/src/ButtonBase/TouchRipple.js +++ b/packages/mui-material/src/ButtonBase/TouchRipple.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { TransitionGroup } from 'react-transition-group'; import clsx from 'clsx'; import { keyframes } from '@mui/system'; -import { unstable_useTimeout as useTimeout } from '@mui/utils'; +import useTimeout from "@mui/utils/useTimeout"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Ripple from './Ripple'; diff --git a/packages/mui-material/src/ButtonGroup/ButtonGroup.js b/packages/mui-material/src/ButtonGroup/ButtonGroup.js index e9eb02dddf72a2..0d0ab4bbd0cb02 100644 --- a/packages/mui-material/src/ButtonGroup/ButtonGroup.js +++ b/packages/mui-material/src/ButtonGroup/ButtonGroup.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; -import { getValidReactChildren } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; +import getValidReactChildren from "@mui/utils/getValidReactChildren"; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Card/Card.js b/packages/mui-material/src/Card/Card.js index 26526533e02e24..8a14b7b898b23b 100644 --- a/packages/mui-material/src/Card/Card.js +++ b/packages/mui-material/src/Card/Card.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/CardActionArea/CardActionArea.js b/packages/mui-material/src/CardActionArea/CardActionArea.js index b666d03ed7f4a8..bb096ab281a238 100644 --- a/packages/mui-material/src/CardActionArea/CardActionArea.js +++ b/packages/mui-material/src/CardActionArea/CardActionArea.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import cardActionAreaClasses, { getCardActionAreaUtilityClass } from './cardActionAreaClasses'; diff --git a/packages/mui-material/src/CardActions/CardActions.js b/packages/mui-material/src/CardActions/CardActions.js index 958111cafd32d5..65e307d669f463 100644 --- a/packages/mui-material/src/CardActions/CardActions.js +++ b/packages/mui-material/src/CardActions/CardActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getCardActionsUtilityClass } from './cardActionsClasses'; diff --git a/packages/mui-material/src/CardContent/CardContent.js b/packages/mui-material/src/CardContent/CardContent.js index db30e846cca8e4..785737d85f5b84 100644 --- a/packages/mui-material/src/CardContent/CardContent.js +++ b/packages/mui-material/src/CardContent/CardContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getCardContentUtilityClass } from './cardContentClasses'; diff --git a/packages/mui-material/src/CardHeader/CardHeader.js b/packages/mui-material/src/CardHeader/CardHeader.js index db9d6e6fbbe679..800fd998d6852f 100644 --- a/packages/mui-material/src/CardHeader/CardHeader.js +++ b/packages/mui-material/src/CardHeader/CardHeader.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import Typography from '../Typography'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/CardMedia/CardMedia.js b/packages/mui-material/src/CardMedia/CardMedia.js index 16932d30316359..59f01896b9d73d 100644 --- a/packages/mui-material/src/CardMedia/CardMedia.js +++ b/packages/mui-material/src/CardMedia/CardMedia.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getCardMediaUtilityClass } from './cardMediaClasses'; diff --git a/packages/mui-material/src/Checkbox/Checkbox.js b/packages/mui-material/src/Checkbox/Checkbox.js index 8b9577ec2c6177..98fedeeb4d1363 100644 --- a/packages/mui-material/src/Checkbox/Checkbox.js +++ b/packages/mui-material/src/Checkbox/Checkbox.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import refType from "@mui/utils/refType"; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import SwitchBase from '../internal/SwitchBase'; import CheckBoxOutlineBlankIcon from '../internal/svg-icons/CheckBoxOutlineBlank'; import CheckBoxIcon from '../internal/svg-icons/CheckBox'; diff --git a/packages/mui-material/src/Chip/Chip.js b/packages/mui-material/src/Chip/Chip.js index 39210a127f5893..13157023ca8fe4 100644 --- a/packages/mui-material/src/Chip/Chip.js +++ b/packages/mui-material/src/Chip/Chip.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import CancelIcon from '../internal/svg-icons/Cancel'; import useForkRef from '../utils/useForkRef'; import unsupportedProp from '../utils/unsupportedProp'; diff --git a/packages/mui-material/src/CircularProgress/CircularProgress.js b/packages/mui-material/src/CircularProgress/CircularProgress.js index ab5b6861c18903..2d4d96ac835a33 100644 --- a/packages/mui-material/src/CircularProgress/CircularProgress.js +++ b/packages/mui-material/src/CircularProgress/CircularProgress.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; import { keyframes, css } from '@mui/system'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Collapse/Collapse.js b/packages/mui-material/src/Collapse/Collapse.js index b7294131917fd4..f59ab95fd69a4f 100644 --- a/packages/mui-material/src/Collapse/Collapse.js +++ b/packages/mui-material/src/Collapse/Collapse.js @@ -1,10 +1,11 @@ -'use client'; +'use client';; import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementTypeAcceptingRef, unstable_useTimeout as useTimeout } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import useTimeout from "@mui/utils/useTimeout"; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { duration } from '../styles/createTransitions'; diff --git a/packages/mui-material/src/Dialog/Dialog.js b/packages/mui-material/src/Dialog/Dialog.js index a2472f8b58e36d..2eee65aeb1e958 100644 --- a/packages/mui-material/src/Dialog/Dialog.js +++ b/packages/mui-material/src/Dialog/Dialog.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { unstable_useId as useId } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import useId from "@mui/utils/useId"; import capitalize from '../utils/capitalize'; import Modal from '../Modal'; import Fade from '../Fade'; diff --git a/packages/mui-material/src/DialogActions/DialogActions.js b/packages/mui-material/src/DialogActions/DialogActions.js index b54ca2f6da7dbd..6296cf91d19c0e 100644 --- a/packages/mui-material/src/DialogActions/DialogActions.js +++ b/packages/mui-material/src/DialogActions/DialogActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDialogActionsUtilityClass } from './dialogActionsClasses'; diff --git a/packages/mui-material/src/DialogContent/DialogContent.js b/packages/mui-material/src/DialogContent/DialogContent.js index 9606dd07ad071f..2a435325d9fb61 100644 --- a/packages/mui-material/src/DialogContent/DialogContent.js +++ b/packages/mui-material/src/DialogContent/DialogContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDialogContentUtilityClass } from './dialogContentClasses'; diff --git a/packages/mui-material/src/DialogContentText/DialogContentText.js b/packages/mui-material/src/DialogContentText/DialogContentText.js index 980b0de7d13604..03f6bac702d4e8 100644 --- a/packages/mui-material/src/DialogContentText/DialogContentText.js +++ b/packages/mui-material/src/DialogContentText/DialogContentText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/DialogTitle/DialogTitle.js b/packages/mui-material/src/DialogTitle/DialogTitle.js index a22ecde134baa8..4c0022cb68a766 100644 --- a/packages/mui-material/src/DialogTitle/DialogTitle.js +++ b/packages/mui-material/src/DialogTitle/DialogTitle.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import Typography from '../Typography'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Divider/Divider.js b/packages/mui-material/src/Divider/Divider.js index a986b921347550..3b419a820093ec 100644 --- a/packages/mui-material/src/Divider/Divider.js +++ b/packages/mui-material/src/Divider/Divider.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDividerUtilityClass } from './dividerClasses'; diff --git a/packages/mui-material/src/Drawer/Drawer.js b/packages/mui-material/src/Drawer/Drawer.js index 520c77e7286220..a417d3eda42155 100644 --- a/packages/mui-material/src/Drawer/Drawer.js +++ b/packages/mui-material/src/Drawer/Drawer.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from "@mui/utils/integerPropType"; +import composeClasses from "@mui/utils/composeClasses"; import Modal from '../Modal'; import Slide from '../Slide'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/Fab/Fab.js b/packages/mui-material/src/Fab/Fab.js index 579bc36656102b..fcbe210625fe0e 100644 --- a/packages/mui-material/src/Fab/Fab.js +++ b/packages/mui-material/src/Fab/Fab.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Fade/Fade.js b/packages/mui-material/src/Fade/Fade.js index b659c8e77d9f9d..e05684d826a39a 100644 --- a/packages/mui-material/src/Fade/Fade.js +++ b/packages/mui-material/src/Fade/Fade.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementAcceptingRef } from '@mui/utils'; +import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; import useTheme from '../styles/useTheme'; import { reflow, getTransitionProps } from '../transitions/utils'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/FilledInput/FilledInput.js b/packages/mui-material/src/FilledInput/FilledInput.js index 1440d645b11df4..a2584f75a31dba 100644 --- a/packages/mui-material/src/FilledInput/FilledInput.js +++ b/packages/mui-material/src/FilledInput/FilledInput.js @@ -1,8 +1,9 @@ -'use client'; +'use client';; import * as React from 'react'; -import { refType, deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; +import refType from "@mui/utils/refType"; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import InputBase from '../InputBase'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/FormControl/FormControl.js b/packages/mui-material/src/FormControl/FormControl.js index 1385536d3b53e0..50f0765e690c10 100644 --- a/packages/mui-material/src/FormControl/FormControl.js +++ b/packages/mui-material/src/FormControl/FormControl.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { isFilled, isAdornedStart } from '../InputBase/utils'; diff --git a/packages/mui-material/src/FormControlLabel/FormControlLabel.js b/packages/mui-material/src/FormControlLabel/FormControlLabel.js index cff14bda1a9924..9a2bb44e01e913 100644 --- a/packages/mui-material/src/FormControlLabel/FormControlLabel.js +++ b/packages/mui-material/src/FormControlLabel/FormControlLabel.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from "@mui/utils/refType"; +import composeClasses from "@mui/utils/composeClasses"; import { useFormControl } from '../FormControl'; import Stack from '../Stack'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/FormGroup/FormGroup.js b/packages/mui-material/src/FormGroup/FormGroup.js index d8e42477b93eb2..6e8ba04a5e9e8f 100644 --- a/packages/mui-material/src/FormGroup/FormGroup.js +++ b/packages/mui-material/src/FormGroup/FormGroup.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getFormGroupUtilityClass } from './formGroupClasses'; diff --git a/packages/mui-material/src/FormHelperText/FormHelperText.js b/packages/mui-material/src/FormHelperText/FormHelperText.js index 6c5c74afa4d19e..684d871435bbfb 100644 --- a/packages/mui-material/src/FormHelperText/FormHelperText.js +++ b/packages/mui-material/src/FormHelperText/FormHelperText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/FormLabel/FormLabel.js b/packages/mui-material/src/FormLabel/FormLabel.js index fb02e3b9af9eb6..7118f1ea4f3d98 100644 --- a/packages/mui-material/src/FormLabel/FormLabel.js +++ b/packages/mui-material/src/FormLabel/FormLabel.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Grid/Grid.js b/packages/mui-material/src/Grid/Grid.js index 4672813ffc6175..53df75e1b5f97b 100644 --- a/packages/mui-material/src/Grid/Grid.js +++ b/packages/mui-material/src/Grid/Grid.js @@ -1,4 +1,4 @@ -'use client'; +'use client';; // A grid component using the following libs as inspiration. // // For the implementation: @@ -13,11 +13,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { - unstable_extendSxProp as extendSxProp, handleBreakpoints, unstable_resolveBreakpointValues as resolveBreakpointValues, } from '@mui/system'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import { extendSxProp } from "@mui/system/styleFunctionSx"; +import composeClasses from "@mui/utils/composeClasses"; import requirePropFactory from '../utils/requirePropFactory'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Grow/Grow.js b/packages/mui-material/src/Grow/Grow.js index 99d37827cd132d..58666bd5488fb8 100644 --- a/packages/mui-material/src/Grow/Grow.js +++ b/packages/mui-material/src/Grow/Grow.js @@ -1,7 +1,8 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; -import { elementAcceptingRef, unstable_useTimeout as useTimeout } from '@mui/utils'; +import useTimeout from "@mui/utils/useTimeout"; +import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; import { Transition } from 'react-transition-group'; import useTheme from '../styles/useTheme'; import { getTransitionProps, reflow } from '../transitions/utils'; diff --git a/packages/mui-material/src/Hidden/HiddenCss.js b/packages/mui-material/src/Hidden/HiddenCss.js index e27c28524cf8e6..ef71c78695461e 100644 --- a/packages/mui-material/src/Hidden/HiddenCss.js +++ b/packages/mui-material/src/Hidden/HiddenCss.js @@ -2,7 +2,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Hidden/HiddenJs.js b/packages/mui-material/src/Hidden/HiddenJs.js index 5b718c09c008e8..922fd64c250484 100644 --- a/packages/mui-material/src/Hidden/HiddenJs.js +++ b/packages/mui-material/src/Hidden/HiddenJs.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { exactProp } from '@mui/utils'; +import exactProp from "@mui/utils/exactProp"; import withWidth, { isWidthDown, isWidthUp } from './withWidth'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Hidden/withWidth.js b/packages/mui-material/src/Hidden/withWidth.js index 276ba00f470684..e13d4837cdd174 100644 --- a/packages/mui-material/src/Hidden/withWidth.js +++ b/packages/mui-material/src/Hidden/withWidth.js @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import { getDisplayName } from '@mui/utils'; -import { getThemeProps } from '@mui/system'; +import getDisplayName from "@mui/utils/getDisplayName"; +import { getThemeProps } from "@mui/system/useThemeProps"; import useTheme from '../styles/useTheme'; import useEnhancedEffect from '../utils/useEnhancedEffect'; import useMediaQuery from '../useMediaQuery'; diff --git a/packages/mui-material/src/Icon/Icon.js b/packages/mui-material/src/Icon/Icon.js index b21d0d573c5fac..1c5b13612bceb4 100644 --- a/packages/mui-material/src/Icon/Icon.js +++ b/packages/mui-material/src/Icon/Icon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/IconButton/IconButton.js b/packages/mui-material/src/IconButton/IconButton.js index abd4ebf72427e2..61ac0a084eed32 100644 --- a/packages/mui-material/src/IconButton/IconButton.js +++ b/packages/mui-material/src/IconButton/IconButton.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/IconButton/IconButton.test.js b/packages/mui-material/src/IconButton/IconButton.test.js index 7c744f92a59c47..798a3f7df0c46c 100644 --- a/packages/mui-material/src/IconButton/IconButton.test.js +++ b/packages/mui-material/src/IconButton/IconButton.test.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import PropTypes from 'prop-types'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from "@mui/utils/capitalize"; import { ThemeProvider, createTheme } from '@mui/material/styles'; import IconButton, { iconButtonClasses as classes } from '@mui/material/IconButton'; import Icon from '@mui/material/Icon'; diff --git a/packages/mui-material/src/ImageList/ImageList.js b/packages/mui-material/src/ImageList/ImageList.js index 70da0435e7a0fb..c016e2d77bdf6d 100644 --- a/packages/mui-material/src/ImageList/ImageList.js +++ b/packages/mui-material/src/ImageList/ImageList.js @@ -1,6 +1,6 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { integerPropType } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from "@mui/utils/integerPropType"; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/ImageListItem/ImageListItem.js b/packages/mui-material/src/ImageListItem/ImageListItem.js index f105b3e6ea1abd..be75dd30c6d3e2 100644 --- a/packages/mui-material/src/ImageListItem/ImageListItem.js +++ b/packages/mui-material/src/ImageListItem/ImageListItem.js @@ -1,6 +1,6 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { integerPropType } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from "@mui/utils/integerPropType"; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js index 53bdcce44953e3..8469c725a079be 100644 --- a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js +++ b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js @@ -1,5 +1,5 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/Input/Input.js b/packages/mui-material/src/Input/Input.js index 51982e9d261346..cd8efd529eb506 100644 --- a/packages/mui-material/src/Input/Input.js +++ b/packages/mui-material/src/Input/Input.js @@ -1,8 +1,9 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { refType, deepmerge } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import deepmerge from "@mui/utils/deepmerge"; +import refType from "@mui/utils/refType"; import InputBase from '../InputBase'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/InputAdornment/InputAdornment.js b/packages/mui-material/src/InputAdornment/InputAdornment.js index 7f80baf3a880d0..a81eda5d8cdc69 100644 --- a/packages/mui-material/src/InputAdornment/InputAdornment.js +++ b/packages/mui-material/src/InputAdornment/InputAdornment.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import capitalize from '../utils/capitalize'; import Typography from '../Typography'; import FormControlContext from '../FormControl/FormControlContext'; diff --git a/packages/mui-material/src/InputBase/InputBase.js b/packages/mui-material/src/InputBase/InputBase.js index a7b4186b88d0a9..7a83117b84702f 100644 --- a/packages/mui-material/src/InputBase/InputBase.js +++ b/packages/mui-material/src/InputBase/InputBase.js @@ -1,14 +1,13 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType, elementTypeAcceptingRef } from '@mui/utils'; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import refType from "@mui/utils/refType"; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { - unstable_composeClasses as composeClasses, - isHostComponent, - TextareaAutosize, -} from '@mui/base'; +import { TextareaAutosize } from '@mui/base'; +import { isHostComponent } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; import formControlState from '../FormControl/formControlState'; import FormControlContext from '../FormControl/FormControlContext'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/InputLabel/InputLabel.js b/packages/mui-material/src/InputLabel/InputLabel.js index 8007698a5e0ea8..56497d62f12e2b 100644 --- a/packages/mui-material/src/InputLabel/InputLabel.js +++ b/packages/mui-material/src/InputLabel/InputLabel.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import clsx from 'clsx'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/LinearProgress/LinearProgress.js b/packages/mui-material/src/LinearProgress/LinearProgress.js index 5a298f109c2f06..45fac1b4436f7d 100644 --- a/packages/mui-material/src/LinearProgress/LinearProgress.js +++ b/packages/mui-material/src/LinearProgress/LinearProgress.js @@ -1,9 +1,10 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { keyframes, css, darken, lighten } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { keyframes, css } from '@mui/system'; +import { darken, lighten } from "@mui/system/colorManipulator"; import capitalize from '../utils/capitalize'; import useTheme from '../styles/useTheme'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/Link/Link.js b/packages/mui-material/src/Link/Link.js index e23708341b4ec4..67df39fb9fe1fc 100644 --- a/packages/mui-material/src/Link/Link.js +++ b/packages/mui-material/src/Link/Link.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { elementTypeAcceptingRef } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import composeClasses from "@mui/utils/composeClasses"; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Link/getTextDecoration.ts b/packages/mui-material/src/Link/getTextDecoration.ts index cd574b1d0c3321..d3518e4939f00d 100644 --- a/packages/mui-material/src/Link/getTextDecoration.ts +++ b/packages/mui-material/src/Link/getTextDecoration.ts @@ -1,4 +1,5 @@ -import { alpha, getPath } from '@mui/system'; +import { getPath } from '@mui/system'; +import { alpha } from "@mui/system/colorManipulator"; import type { Theme } from '../styles'; export const colorTransformations = { diff --git a/packages/mui-material/src/List/List.js b/packages/mui-material/src/List/List.js index a8c6037163f5db..a26e1653cf4340 100644 --- a/packages/mui-material/src/List/List.js +++ b/packages/mui-material/src/List/List.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from './ListContext'; diff --git a/packages/mui-material/src/ListItem/ListItem.js b/packages/mui-material/src/ListItem/ListItem.js index 9b31b6651b0352..7634fb7d25ed14 100644 --- a/packages/mui-material/src/ListItem/ListItem.js +++ b/packages/mui-material/src/ListItem/ListItem.js @@ -1,10 +1,12 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses, isHostComponent } from '@mui/base'; -import { chainPropTypes, elementTypeAcceptingRef } from '@mui/utils'; -import { alpha } from '@mui/system'; +import { isHostComponent } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import { alpha } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js index 6bb8339ba8eec7..71b2bf668d5769 100644 --- a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js +++ b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import ListContext from '../List/ListContext'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/ListItemButton/ListItemButton.js b/packages/mui-material/src/ListItemButton/ListItemButton.js index 2870684be5a99b..5670925cc6032a 100644 --- a/packages/mui-material/src/ListItemButton/ListItemButton.js +++ b/packages/mui-material/src/ListItemButton/ListItemButton.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ListItemIcon/ListItemIcon.js b/packages/mui-material/src/ListItemIcon/ListItemIcon.js index 1b0ff52ff8ed5a..83f56af8cd3ccb 100644 --- a/packages/mui-material/src/ListItemIcon/ListItemIcon.js +++ b/packages/mui-material/src/ListItemIcon/ListItemIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getListItemIconUtilityClass } from './listItemIconClasses'; diff --git a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js index cf9d7acfceefb0..c4118306534eb2 100644 --- a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js +++ b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from '../List/ListContext'; diff --git a/packages/mui-material/src/ListItemText/ListItemText.js b/packages/mui-material/src/ListItemText/ListItemText.js index 6729dfb7bfc254..bc6fc5304b50c7 100644 --- a/packages/mui-material/src/ListItemText/ListItemText.js +++ b/packages/mui-material/src/ListItemText/ListItemText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import Typography from '../Typography'; import ListContext from '../List/ListContext'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/ListSubheader/ListSubheader.js b/packages/mui-material/src/ListSubheader/ListSubheader.js index 48c01aa2fbdc5d..7c4813effee426 100644 --- a/packages/mui-material/src/ListSubheader/ListSubheader.js +++ b/packages/mui-material/src/ListSubheader/ListSubheader.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Menu/Menu.js b/packages/mui-material/src/Menu/Menu.js index 1e3af0d0b445e4..fbd15e153a9bed 100644 --- a/packages/mui-material/src/Menu/Menu.js +++ b/packages/mui-material/src/Menu/Menu.js @@ -3,9 +3,9 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import { useSlotProps } from '@mui/base/utils'; -import { HTMLElementType } from '@mui/utils'; +import HTMLElementType from "@mui/utils/HTMLElementType"; import MenuList from '../MenuList'; import Popover, { PopoverPaper } from '../Popover'; import styled, { rootShouldForwardProp } from '../styles/styled'; diff --git a/packages/mui-material/src/MenuItem/MenuItem.js b/packages/mui-material/src/MenuItem/MenuItem.js index 64b5a079e820cf..fea0c0e90cf725 100644 --- a/packages/mui-material/src/MenuItem/MenuItem.js +++ b/packages/mui-material/src/MenuItem/MenuItem.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from '../List/ListContext'; diff --git a/packages/mui-material/src/MobileStepper/MobileStepper.js b/packages/mui-material/src/MobileStepper/MobileStepper.js index 4a9511714bc087..beae8bd212a2e9 100644 --- a/packages/mui-material/src/MobileStepper/MobileStepper.js +++ b/packages/mui-material/src/MobileStepper/MobileStepper.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from "@mui/utils/integerPropType"; +import composeClasses from "@mui/utils/composeClasses"; import Paper from '../Paper'; import capitalize from '../utils/capitalize'; import LinearProgress from '../LinearProgress'; diff --git a/packages/mui-material/src/Modal/Modal.js b/packages/mui-material/src/Modal/Modal.js index 691edcc89b97cd..673cbe6db6a836 100644 --- a/packages/mui-material/src/Modal/Modal.js +++ b/packages/mui-material/src/Modal/Modal.js @@ -1,11 +1,12 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { elementAcceptingRef, HTMLElementType } from '@mui/utils'; -import { useSlotProps } from '@mui/base'; +import HTMLElementType from "@mui/utils/HTMLElementType"; +import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; +import { useSlotProps } from "@mui/base/utils"; import { unstable_useModal as useModal } from '@mui/base/unstable_useModal'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import FocusTrap from '../Unstable_TrapFocus'; import Portal from '../Portal'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/NativeSelect/NativeSelect.js b/packages/mui-material/src/NativeSelect/NativeSelect.js index 674f0e6797b75c..bce61a380e7b7e 100644 --- a/packages/mui-material/src/NativeSelect/NativeSelect.js +++ b/packages/mui-material/src/NativeSelect/NativeSelect.js @@ -2,7 +2,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import NativeSelectInput from './NativeSelectInput'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/NativeSelect/NativeSelectInput.js b/packages/mui-material/src/NativeSelect/NativeSelectInput.js index d0c88089f1ff3e..ad8ef84b21907b 100644 --- a/packages/mui-material/src/NativeSelect/NativeSelectInput.js +++ b/packages/mui-material/src/NativeSelect/NativeSelectInput.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from "@mui/utils/refType"; +import composeClasses from "@mui/utils/composeClasses"; import capitalize from '../utils/capitalize'; import nativeSelectClasses, { getNativeSelectUtilityClasses } from './nativeSelectClasses'; import styled, { rootShouldForwardProp } from '../styles/styled'; diff --git a/packages/mui-material/src/OutlinedInput/OutlinedInput.js b/packages/mui-material/src/OutlinedInput/OutlinedInput.js index 2a9b87952f9d7a..9ee8f3b001a47a 100644 --- a/packages/mui-material/src/OutlinedInput/OutlinedInput.js +++ b/packages/mui-material/src/OutlinedInput/OutlinedInput.js @@ -1,8 +1,8 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from "@mui/utils/refType"; +import composeClasses from "@mui/utils/composeClasses"; import NotchedOutline from './NotchedOutline'; import useFormControl from '../FormControl/useFormControl'; import formControlState from '../FormControl/formControlState'; diff --git a/packages/mui-material/src/Pagination/Pagination.js b/packages/mui-material/src/Pagination/Pagination.js index f96d8720d6609f..1a32fd5476347f 100644 --- a/packages/mui-material/src/Pagination/Pagination.js +++ b/packages/mui-material/src/Pagination/Pagination.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { integerPropType } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from "@mui/utils/integerPropType"; import useThemeProps from '../styles/useThemeProps'; import { getPaginationUtilityClass } from './paginationClasses'; import usePagination from '../usePagination'; diff --git a/packages/mui-material/src/PaginationItem/PaginationItem.js b/packages/mui-material/src/PaginationItem/PaginationItem.js index 9be03580d12ca3..904439a5ee0039 100644 --- a/packages/mui-material/src/PaginationItem/PaginationItem.js +++ b/packages/mui-material/src/PaginationItem/PaginationItem.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import useThemeProps from '../styles/useThemeProps'; import paginationItemClasses, { getPaginationItemUtilityClass } from './paginationItemClasses'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Paper/Paper.js b/packages/mui-material/src/Paper/Paper.js index e4f6d6da4bca88..df3b331aeb97ba 100644 --- a/packages/mui-material/src/Paper/Paper.js +++ b/packages/mui-material/src/Paper/Paper.js @@ -1,10 +1,11 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import integerPropType from "@mui/utils/integerPropType"; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import getOverlayAlpha from '../styles/getOverlayAlpha'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Popover/Popover.js b/packages/mui-material/src/Popover/Popover.js index ff8e582fae651c..9d7d500c5b4052 100644 --- a/packages/mui-material/src/Popover/Popover.js +++ b/packages/mui-material/src/Popover/Popover.js @@ -1,19 +1,14 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { - unstable_composeClasses as composeClasses, - useSlotProps, - isHostComponent, -} from '@mui/base'; -import { - chainPropTypes, - integerPropType, - elementTypeAcceptingRef, - refType, - HTMLElementType, -} from '@mui/utils'; +import { useSlotProps, isHostComponent } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; +import HTMLElementType from "@mui/utils/HTMLElementType"; +import refType from "@mui/utils/refType"; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import integerPropType from "@mui/utils/integerPropType"; +import chainPropTypes from "@mui/utils/chainPropTypes"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import debounce from '../utils/debounce'; diff --git a/packages/mui-material/src/Popper/Popper.test.js b/packages/mui-material/src/Popper/Popper.test.js index 74162a2c04da51..38ca13bb6a72eb 100644 --- a/packages/mui-material/src/Popper/Popper.test.js +++ b/packages/mui-material/src/Popper/Popper.test.js @@ -7,7 +7,8 @@ import { fireEvent, screen, } from '@mui-internal/test-utils'; -import { ThemeProvider, createTheme } from '@mui/system'; +import { ThemeProvider } from '@mui/system'; +import createTheme from "@mui/system/createTheme"; import Grow from '@mui/material/Grow'; import Popper from '@mui/material/Popper'; diff --git a/packages/mui-material/src/Popper/Popper.tsx b/packages/mui-material/src/Popper/Popper.tsx index ab8059ff1ed1dd..259b13da2f2c07 100644 --- a/packages/mui-material/src/Popper/Popper.tsx +++ b/packages/mui-material/src/Popper/Popper.tsx @@ -1,7 +1,9 @@ -'use client'; +'use client';; import { Popper as BasePopper, PopperProps as BasePopperProps } from '@mui/base/Popper'; -import { Direction, SxProps, useThemeWithoutDefault as useTheme } from '@mui/system'; -import { HTMLElementType, refType } from '@mui/utils'; +import { Direction, SxProps } from '@mui/system'; +import useTheme from "@mui/system/useThemeWithoutDefault"; +import refType from "@mui/utils/refType"; +import HTMLElementType from "@mui/utils/HTMLElementType"; import PropTypes from 'prop-types'; import * as React from 'react'; import { styled, Theme, useThemeProps } from '../styles'; diff --git a/packages/mui-material/src/Radio/Radio.js b/packages/mui-material/src/Radio/Radio.js index c84584cb866338..ba49c754390be5 100644 --- a/packages/mui-material/src/Radio/Radio.js +++ b/packages/mui-material/src/Radio/Radio.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import refType from "@mui/utils/refType"; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import SwitchBase from '../internal/SwitchBase'; import useThemeProps from '../styles/useThemeProps'; import RadioButtonIcon from './RadioButtonIcon'; diff --git a/packages/mui-material/src/Rating/Rating.js b/packages/mui-material/src/Rating/Rating.js index 77fdd726b9ccae..486a5671a85b54 100644 --- a/packages/mui-material/src/Rating/Rating.js +++ b/packages/mui-material/src/Rating/Rating.js @@ -1,9 +1,11 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, visuallyHidden, clamp } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import clamp from "@mui/utils/clamp"; +import visuallyHidden from "@mui/utils/visuallyHidden"; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import composeClasses from "@mui/utils/composeClasses"; import useTheme from '../styles/useTheme'; import { capitalize, diff --git a/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js b/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js index b4d1c1dde4505a..4669855b21aa99 100644 --- a/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js +++ b/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { html, body } from '../CssBaseline/CssBaseline'; diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js index 1902ac88385fab..97b8abdf337b37 100644 --- a/packages/mui-material/src/Select/Select.js +++ b/packages/mui-material/src/Select/Select.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; import SelectInput from './SelectInput'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js index 6a361ae35e5a1a..dcff5f54f012e1 100644 --- a/packages/mui-material/src/Select/SelectInput.js +++ b/packages/mui-material/src/Select/SelectInput.js @@ -1,11 +1,12 @@ -'use client'; +'use client';; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { refType, unstable_useId as useId } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import useId from "@mui/utils/useId"; +import refType from "@mui/utils/refType"; import ownerDocument from '../utils/ownerDocument'; import capitalize from '../utils/capitalize'; import Menu from '../Menu/Menu'; diff --git a/packages/mui-material/src/Skeleton/Skeleton.js b/packages/mui-material/src/Skeleton/Skeleton.js index 00bf3a357e82c2..7c25f1a9c617ab 100644 --- a/packages/mui-material/src/Skeleton/Skeleton.js +++ b/packages/mui-material/src/Skeleton/Skeleton.js @@ -3,7 +3,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import { keyframes, css } from '@mui/system'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import { alpha, unstable_getUnit as getUnit, unstable_toUnitless as toUnitless } from '../styles'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Slide/Slide.js b/packages/mui-material/src/Slide/Slide.js index ee52963c949829..07419d095146ae 100644 --- a/packages/mui-material/src/Slide/Slide.js +++ b/packages/mui-material/src/Slide/Slide.js @@ -1,8 +1,10 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementAcceptingRef, HTMLElementType, chainPropTypes } from '@mui/utils'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import HTMLElementType from "@mui/utils/HTMLElementType"; +import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; import debounce from '../utils/debounce'; import useForkRef from '../utils/useForkRef'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Slider/Slider.js b/packages/mui-material/src/Slider/Slider.js index ac67ca95010292..f75d2f8e9d89b4 100644 --- a/packages/mui-material/src/Slider/Slider.js +++ b/packages/mui-material/src/Slider/Slider.js @@ -1,15 +1,12 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { - isHostComponent, - useSlotProps, - unstable_composeClasses as composeClasses, -} from '@mui/base'; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import { isHostComponent, useSlotProps } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; import { useSlider, valueToPercent } from '@mui/base/useSlider'; -import { alpha, lighten, darken } from '@mui/system'; +import { alpha, lighten, darken } from "@mui/system/colorManipulator"; import useThemeProps from '../styles/useThemeProps'; import styled, { slotShouldForwardProp } from '../styles/styled'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Snackbar/Snackbar.js b/packages/mui-material/src/Snackbar/Snackbar.js index 87371a15ab6e5e..4745e3505aa256 100644 --- a/packages/mui-material/src/Snackbar/Snackbar.js +++ b/packages/mui-material/src/Snackbar/Snackbar.js @@ -1,7 +1,8 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import { useSlotProps } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; import { ClickAwayListener } from '@mui/base/ClickAwayListener'; import { useSnackbar } from '@mui/base/useSnackbar'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/SnackbarContent/SnackbarContent.js b/packages/mui-material/src/SnackbarContent/SnackbarContent.js index 33aaaf9b66771b..12724ebe0415eb 100644 --- a/packages/mui-material/src/SnackbarContent/SnackbarContent.js +++ b/packages/mui-material/src/SnackbarContent/SnackbarContent.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { emphasize } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { emphasize } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/SpeedDial/SpeedDial.js b/packages/mui-material/src/SpeedDial/SpeedDial.js index 880c13d01bc98b..172f72c4e522cd 100644 --- a/packages/mui-material/src/SpeedDial/SpeedDial.js +++ b/packages/mui-material/src/SpeedDial/SpeedDial.js @@ -1,10 +1,11 @@ -'use client'; +'use client';; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { clamp, unstable_useTimeout as useTimeout } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import useTimeout from "@mui/utils/useTimeout"; +import clamp from "@mui/utils/clamp"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js index c922fff9dc98f6..a0b29bf34cca89 100644 --- a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js +++ b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { emphasize } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { emphasize } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Fab from '../Fab'; diff --git a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js index 5e538681be3ee5..98a402c7abf80b 100644 --- a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js +++ b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import AddIcon from '../internal/svg-icons/Add'; diff --git a/packages/mui-material/src/Step/Step.js b/packages/mui-material/src/Step/Step.js index 331a4d4f80cfd8..adc3f59db7c4ef 100644 --- a/packages/mui-material/src/Step/Step.js +++ b/packages/mui-material/src/Step/Step.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from "@mui/utils/integerPropType"; +import composeClasses from "@mui/utils/composeClasses"; import StepperContext from '../Stepper/StepperContext'; import StepContext from './StepContext'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/StepButton/StepButton.js b/packages/mui-material/src/StepButton/StepButton.js index 0f566ab05ef21c..0bf9d598006203 100644 --- a/packages/mui-material/src/StepButton/StepButton.js +++ b/packages/mui-material/src/StepButton/StepButton.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/StepConnector/StepConnector.js b/packages/mui-material/src/StepConnector/StepConnector.js index 98cb45deddb2b4..66ce41726e6fd2 100644 --- a/packages/mui-material/src/StepConnector/StepConnector.js +++ b/packages/mui-material/src/StepConnector/StepConnector.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/StepContent/StepContent.js b/packages/mui-material/src/StepContent/StepContent.js index c51158f86f9dea..824f36c9da123d 100644 --- a/packages/mui-material/src/StepContent/StepContent.js +++ b/packages/mui-material/src/StepContent/StepContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Collapse from '../Collapse'; diff --git a/packages/mui-material/src/StepIcon/StepIcon.js b/packages/mui-material/src/StepIcon/StepIcon.js index a1805e99b41d1e..03147c58bc2d7d 100644 --- a/packages/mui-material/src/StepIcon/StepIcon.js +++ b/packages/mui-material/src/StepIcon/StepIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import CheckCircle from '../internal/svg-icons/CheckCircle'; diff --git a/packages/mui-material/src/StepLabel/StepLabel.js b/packages/mui-material/src/StepLabel/StepLabel.js index d2ab98fdabb29a..e6beaf30e7ea68 100644 --- a/packages/mui-material/src/StepLabel/StepLabel.js +++ b/packages/mui-material/src/StepLabel/StepLabel.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import StepIcon from '../StepIcon'; diff --git a/packages/mui-material/src/Stepper/Stepper.js b/packages/mui-material/src/Stepper/Stepper.js index 8d33b470a4ac85..b6742ab312bbde 100644 --- a/packages/mui-material/src/Stepper/Stepper.js +++ b/packages/mui-material/src/Stepper/Stepper.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from "@mui/utils/integerPropType"; +import composeClasses from "@mui/utils/composeClasses"; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getStepperUtilityClass } from './stepperClasses'; diff --git a/packages/mui-material/src/SvgIcon/SvgIcon.js b/packages/mui-material/src/SvgIcon/SvgIcon.js index d944ee248bdc28..c1468bd4b70b2a 100644 --- a/packages/mui-material/src/SvgIcon/SvgIcon.js +++ b/packages/mui-material/src/SvgIcon/SvgIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js index fe08513c28dc18..c5ff8548dfb075 100644 --- a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js +++ b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js @@ -2,8 +2,8 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; -import { elementTypeAcceptingRef } from '@mui/utils'; -import { useThemeProps } from '@mui/system'; +import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; +import useThemeProps from "@mui/system/useThemeProps"; import { NoSsr } from '@mui/base'; import Drawer, { getAnchor, isHorizontal } from '../Drawer/Drawer'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/Switch/Switch.js b/packages/mui-material/src/Switch/Switch.js index 61b4fc95e69277..64d62633ee0df6 100644 --- a/packages/mui-material/src/Switch/Switch.js +++ b/packages/mui-material/src/Switch/Switch.js @@ -3,9 +3,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha, darken, lighten } from '@mui/system'; +import refType from "@mui/utils/refType"; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha, darken, lighten } from "@mui/system/colorManipulator"; import capitalize from '../utils/capitalize'; import SwitchBase from '../internal/SwitchBase'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Tab/Tab.js b/packages/mui-material/src/Tab/Tab.js index 92ccbeb63f665b..f4a7427e308710 100644 --- a/packages/mui-material/src/Tab/Tab.js +++ b/packages/mui-material/src/Tab/Tab.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/TabScrollButton/TabScrollButton.js b/packages/mui-material/src/TabScrollButton/TabScrollButton.js index 5b6e75322044a1..2f32272b9541b7 100644 --- a/packages/mui-material/src/TabScrollButton/TabScrollButton.js +++ b/packages/mui-material/src/TabScrollButton/TabScrollButton.js @@ -1,9 +1,10 @@ -'use client'; +'use client';; /* eslint-disable jsx-a11y/aria-role */ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import { useSlotProps } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; import KeyboardArrowLeft from '../internal/svg-icons/KeyboardArrowLeft'; import KeyboardArrowRight from '../internal/svg-icons/KeyboardArrowRight'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Table/Table.js b/packages/mui-material/src/Table/Table.js index 167176dab2cb01..a98738f3af0362 100644 --- a/packages/mui-material/src/Table/Table.js +++ b/packages/mui-material/src/Table/Table.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import TableContext from './TableContext'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableBody/TableBody.js b/packages/mui-material/src/TableBody/TableBody.js index 406165a74f11ff..188a21ea1b9db8 100644 --- a/packages/mui-material/src/TableBody/TableBody.js +++ b/packages/mui-material/src/TableBody/TableBody.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableCell/TableCell.js b/packages/mui-material/src/TableCell/TableCell.js index 2b07787e17b9ec..72ab9e38fa021f 100644 --- a/packages/mui-material/src/TableCell/TableCell.js +++ b/packages/mui-material/src/TableCell/TableCell.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { darken, alpha, lighten } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { darken, alpha, lighten } from "@mui/system/colorManipulator"; import capitalize from '../utils/capitalize'; import TableContext from '../Table/TableContext'; import Tablelvl2Context from '../Table/Tablelvl2Context'; diff --git a/packages/mui-material/src/TableContainer/TableContainer.js b/packages/mui-material/src/TableContainer/TableContainer.js index 4aa1ad7037a580..248d6cc896fe62 100644 --- a/packages/mui-material/src/TableContainer/TableContainer.js +++ b/packages/mui-material/src/TableContainer/TableContainer.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getTableContainerUtilityClass } from './tableContainerClasses'; diff --git a/packages/mui-material/src/TableFooter/TableFooter.js b/packages/mui-material/src/TableFooter/TableFooter.js index 9bfe4bbbeb681f..7d376f0a9a9844 100644 --- a/packages/mui-material/src/TableFooter/TableFooter.js +++ b/packages/mui-material/src/TableFooter/TableFooter.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableHead/TableHead.js b/packages/mui-material/src/TableHead/TableHead.js index 4e2b9ea456c63d..3c4a07cb2bf828 100644 --- a/packages/mui-material/src/TableHead/TableHead.js +++ b/packages/mui-material/src/TableHead/TableHead.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TablePagination/TablePagination.js b/packages/mui-material/src/TablePagination/TablePagination.js index a8101f155f49fc..59a7b7ba6af5c3 100644 --- a/packages/mui-material/src/TablePagination/TablePagination.js +++ b/packages/mui-material/src/TablePagination/TablePagination.js @@ -1,9 +1,11 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses, isHostComponent } from '@mui/base'; +import integerPropType from "@mui/utils/integerPropType"; +import chainPropTypes from "@mui/utils/chainPropTypes"; +import { isHostComponent } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import InputBase from '../InputBase'; diff --git a/packages/mui-material/src/TableRow/TableRow.js b/packages/mui-material/src/TableRow/TableRow.js index 23f2582388da13..20ee1a42416cca 100644 --- a/packages/mui-material/src/TableRow/TableRow.js +++ b/packages/mui-material/src/TableRow/TableRow.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableSortLabel/TableSortLabel.js b/packages/mui-material/src/TableSortLabel/TableSortLabel.js index 65586b8443726c..d18e6c18c85816 100644 --- a/packages/mui-material/src/TableSortLabel/TableSortLabel.js +++ b/packages/mui-material/src/TableSortLabel/TableSortLabel.js @@ -1,5 +1,5 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/Tabs/Tabs.js b/packages/mui-material/src/Tabs/Tabs.js index 1971e21c7188f9..a8cf9b98bbd14a 100644 --- a/packages/mui-material/src/Tabs/Tabs.js +++ b/packages/mui-material/src/Tabs/Tabs.js @@ -1,10 +1,11 @@ -'use client'; +'use client';; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import refType from "@mui/utils/refType"; +import { useSlotProps } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/TextField/TextField.js b/packages/mui-material/src/TextField/TextField.js index 3a97d7c0a7d353..a8758706335699 100644 --- a/packages/mui-material/src/TextField/TextField.js +++ b/packages/mui-material/src/TextField/TextField.js @@ -1,9 +1,10 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { refType, unstable_useId as useId } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import useId from "@mui/utils/useId"; +import refType from "@mui/utils/refType"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Input from '../Input'; diff --git a/packages/mui-material/src/ToggleButton/ToggleButton.js b/packages/mui-material/src/ToggleButton/ToggleButton.js index eb7c65a40aa97f..2857004109ed89 100644 --- a/packages/mui-material/src/ToggleButton/ToggleButton.js +++ b/packages/mui-material/src/ToggleButton/ToggleButton.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { internal_resolveProps as resolveProps } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import resolveProps from "@mui/utils/resolveProps"; +import composeClasses from "@mui/utils/composeClasses"; import { alpha } from '../styles'; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js index d6be6dcd4bd2d8..d542212c1e7de0 100644 --- a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js +++ b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js @@ -3,8 +3,8 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { getValidReactChildren } from '@mui/utils'; +import composeClasses from "@mui/utils/composeClasses"; +import getValidReactChildren from "@mui/utils/getValidReactChildren"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Toolbar/Toolbar.js b/packages/mui-material/src/Toolbar/Toolbar.js index 7861b9beb207ba..0b7778dd525bcb 100644 --- a/packages/mui-material/src/Toolbar/Toolbar.js +++ b/packages/mui-material/src/Toolbar/Toolbar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from "@mui/utils/composeClasses"; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getToolbarUtilityClass } from './toolbarClasses'; diff --git a/packages/mui-material/src/Tooltip/Tooltip.js b/packages/mui-material/src/Tooltip/Tooltip.js index 71f532f6834e4f..eea6f89afbc1fb 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.js +++ b/packages/mui-material/src/Tooltip/Tooltip.js @@ -1,14 +1,12 @@ -'use client'; +'use client';; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { - elementAcceptingRef, - unstable_useTimeout as useTimeout, - unstable_Timeout as Timeout, -} from '@mui/utils'; -import { unstable_composeClasses as composeClasses, appendOwnerState } from '@mui/base'; -import { alpha } from '@mui/system'; +import useTimeout, { Timeout } from "@mui/utils/useTimeout"; +import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; +import { appendOwnerState } from "@mui/base/utils"; +import composeClasses from "@mui/utils/composeClasses"; +import { alpha } from "@mui/system/colorManipulator"; import styled from '../styles/styled'; import useTheme from '../styles/useTheme'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js index d385bbb1b73c17..279a37144dbd21 100644 --- a/packages/mui-material/src/Typography/Typography.js +++ b/packages/mui-material/src/Typography/Typography.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_extendSxProp as extendSxProp } from '@mui/system'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import { extendSxProp } from "@mui/system/styleFunctionSx"; +import composeClasses from "@mui/utils/composeClasses"; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Zoom/Zoom.js b/packages/mui-material/src/Zoom/Zoom.js index 0724707ab6251a..0ddc4cb3c088e6 100644 --- a/packages/mui-material/src/Zoom/Zoom.js +++ b/packages/mui-material/src/Zoom/Zoom.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementAcceptingRef } from '@mui/utils'; +import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; import useTheme from '../styles/useTheme'; import { reflow, getTransitionProps } from '../transitions/utils'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/internal/SwitchBase.js b/packages/mui-material/src/internal/SwitchBase.js index ecc2d7735edb23..f70aeb6c7ae50e 100644 --- a/packages/mui-material/src/internal/SwitchBase.js +++ b/packages/mui-material/src/internal/SwitchBase.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from "@mui/utils/refType"; +import composeClasses from "@mui/utils/composeClasses"; import capitalize from '../utils/capitalize'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useControlled from '../utils/useControlled'; diff --git a/packages/mui-material/src/styles/CssVarsProvider.tsx b/packages/mui-material/src/styles/CssVarsProvider.tsx index 68cd94172e4579..cf4d36b72eed5c 100644 --- a/packages/mui-material/src/styles/CssVarsProvider.tsx +++ b/packages/mui-material/src/styles/CssVarsProvider.tsx @@ -1,13 +1,10 @@ -'use client'; +'use client';; // do not remove the following import (https://github.com/microsoft/TypeScript/issues/29808#issuecomment-1320713018) /* eslint-disable @typescript-eslint/no-unused-vars */ // @ts-ignore import * as React from 'react'; -import { - unstable_createCssVarsProvider as createCssVarsProvider, - SxProps, - unstable_styleFunctionSx as styleFunctionSx, -} from '@mui/system'; +import { unstable_createCssVarsProvider as createCssVarsProvider, SxProps } from '@mui/system'; +import styleFunctionSx from "@mui/system/styleFunctionSx"; import experimental_extendTheme, { SupportedColorScheme, CssVarsTheme, diff --git a/packages/mui-material/src/styles/createMuiStrictModeTheme.js b/packages/mui-material/src/styles/createMuiStrictModeTheme.js index 73a29c693390ab..a886f4c5ea1f29 100644 --- a/packages/mui-material/src/styles/createMuiStrictModeTheme.js +++ b/packages/mui-material/src/styles/createMuiStrictModeTheme.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; import createTheme from './createTheme'; export default function createMuiStrictModeTheme(options, ...args) { diff --git a/packages/mui-material/src/styles/createPalette.js b/packages/mui-material/src/styles/createPalette.js index cd984c8e30f39e..e67549095267dc 100644 --- a/packages/mui-material/src/styles/createPalette.js +++ b/packages/mui-material/src/styles/createPalette.js @@ -1,6 +1,6 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { darken, getContrastRatio, lighten } from '@mui/system'; +import { darken, getContrastRatio, lighten } from "@mui/system/colorManipulator"; import common from '../colors/common'; import grey from '../colors/grey'; import purple from '../colors/purple'; diff --git a/packages/mui-material/src/styles/createPalette.test.js b/packages/mui-material/src/styles/createPalette.test.js index d992456ec26131..b6202d608db43a 100644 --- a/packages/mui-material/src/styles/createPalette.test.js +++ b/packages/mui-material/src/styles/createPalette.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { darken, lighten } from '@mui/system'; +import { darken, lighten } from "@mui/system/colorManipulator"; import { deepOrange, blue, purple, indigo } from '../colors'; import createPalette, { dark, light } from './createPalette'; diff --git a/packages/mui-material/src/styles/createTheme.js b/packages/mui-material/src/styles/createTheme.js index 39cba1f2731a1f..f4f516a10c3791 100644 --- a/packages/mui-material/src/styles/createTheme.js +++ b/packages/mui-material/src/styles/createTheme.js @@ -1,9 +1,6 @@ -import { deepmerge } from '@mui/utils'; -import { - createTheme as systemCreateTheme, - unstable_defaultSxConfig as defaultSxConfig, - unstable_styleFunctionSx as styleFunctionSx, -} from '@mui/system'; +import deepmerge from "@mui/utils/deepmerge"; +import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig } from "@mui/system/styleFunctionSx"; +import systemCreateTheme from "@mui/system/createTheme"; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; import generateUtilityClass from '@mui/utils/generateUtilityClass'; import createMixins from './createMixins'; diff --git a/packages/mui-material/src/styles/createTypography.js b/packages/mui-material/src/styles/createTypography.js index 8d2c6ed73e8c46..9b5fda7a5de4b6 100644 --- a/packages/mui-material/src/styles/createTypography.js +++ b/packages/mui-material/src/styles/createTypography.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; function round(value) { return Math.round(value * 1e5) / 1e5; diff --git a/packages/mui-material/src/styles/experimental_extendTheme.js b/packages/mui-material/src/styles/experimental_extendTheme.js index 6d4c61b5a45b9c..3c40f4736ca4c8 100644 --- a/packages/mui-material/src/styles/experimental_extendTheme.js +++ b/packages/mui-material/src/styles/experimental_extendTheme.js @@ -1,16 +1,19 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; +import { + unstable_createGetCssVar as systemCreateGetCssVar, + unstable_prepareCssVars as prepareCssVars, +} from '@mui/system'; +import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig } from "@mui/system/styleFunctionSx"; + import { private_safeColorChannel as safeColorChannel, private_safeAlpha as safeAlpha, private_safeDarken as safeDarken, private_safeLighten as safeLighten, private_safeEmphasize as safeEmphasize, - unstable_createGetCssVar as systemCreateGetCssVar, - unstable_defaultSxConfig as defaultSxConfig, - unstable_styleFunctionSx as styleFunctionSx, - unstable_prepareCssVars as prepareCssVars, hslToRgb, -} from '@mui/system'; +} from "@mui/system/colorManipulator"; + import defaultShouldSkipGeneratingVar from './shouldSkipGeneratingVar'; import createThemeWithoutVars from './createTheme'; import getOverlayAlpha from './getOverlayAlpha'; diff --git a/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts b/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts index 0146d320943c88..6268a1c0adca26 100644 --- a/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts +++ b/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts @@ -1,7 +1,5 @@ export default function shouldSkipGeneratingVar(keys: string[]) { - return ( - !!keys[0].match(/(cssVarPrefix|typography|mixins|breakpoints|direction|transitions)/) || - !!keys[0].match(/sxConfig$/) || // ends with sxConfig - (keys[0] === 'palette' && !!keys[1]?.match(/(mode|contrastThreshold|tonalOffset)/)) - ); + return !!keys[0].match(/(cssVarPrefix|typography|mixins|breakpoints|direction|transitions)/) || + !!keys[0].match(/sxConfig$/) || // ends with sxConfig + (keys[0] === 'palette' && !!keys[1]?.match(/(mode|contrastThreshold|tonalOffset)/)); } diff --git a/packages/mui-material/src/styles/styled.js b/packages/mui-material/src/styles/styled.js index 83798adbda1e78..4e68a6ab48eaef 100644 --- a/packages/mui-material/src/styles/styled.js +++ b/packages/mui-material/src/styles/styled.js @@ -1,5 +1,5 @@ 'use client'; -import { createStyled, shouldForwardProp } from '@mui/system'; +import createStyled, { shouldForwardProp } from '@mui/system/createStyled'; import defaultTheme from './defaultTheme'; import THEME_ID from './identifier'; diff --git a/packages/mui-material/src/styles/useThemeProps.js b/packages/mui-material/src/styles/useThemeProps.js index 77e14c7646ed24..80dbd70e5c6146 100644 --- a/packages/mui-material/src/styles/useThemeProps.js +++ b/packages/mui-material/src/styles/useThemeProps.js @@ -1,5 +1,5 @@ 'use client'; -import { useThemeProps as systemUseThemeProps } from '@mui/system'; +import systemUseThemeProps from "@mui/system/useThemeProps"; import defaultTheme from './defaultTheme'; import THEME_ID from './identifier'; diff --git a/packages/mui-material/src/useMediaQuery/useMediaQuery.ts b/packages/mui-material/src/useMediaQuery/useMediaQuery.ts index afdda55456e356..9cb59f52ebbac1 100644 --- a/packages/mui-material/src/useMediaQuery/useMediaQuery.ts +++ b/packages/mui-material/src/useMediaQuery/useMediaQuery.ts @@ -1,6 +1,7 @@ -'use client'; +'use client';; import * as React from 'react'; -import { getThemeProps, useThemeWithoutDefault as useTheme } from '@mui/system'; +import { getThemeProps } from "@mui/system/useThemeProps"; +import useTheme from "@mui/system/useThemeWithoutDefault"; import useEnhancedEffect from '../utils/useEnhancedEffect'; /** diff --git a/packages/mui-material/src/usePagination/usePagination.js b/packages/mui-material/src/usePagination/usePagination.js index 46aaeb777ffaed..d215cd596ff999 100644 --- a/packages/mui-material/src/usePagination/usePagination.js +++ b/packages/mui-material/src/usePagination/usePagination.js @@ -1,5 +1,5 @@ 'use client'; -import { unstable_useControlled as useControlled } from '@mui/utils'; +import useControlled from "@mui/utils/useControlled"; export default function usePagination(props = {}) { // keep default values in sync with @default tags in Pagination.propTypes diff --git a/packages/mui-material/src/utils/capitalize.d.ts b/packages/mui-material/src/utils/capitalize.d.ts index 4f0850098ea2dc..3baee07edd1779 100644 --- a/packages/mui-material/src/utils/capitalize.d.ts +++ b/packages/mui-material/src/utils/capitalize.d.ts @@ -1,3 +1,3 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from "@mui/utils/capitalize"; export default capitalize; diff --git a/packages/mui-material/src/utils/capitalize.js b/packages/mui-material/src/utils/capitalize.js index 4f0850098ea2dc..3baee07edd1779 100644 --- a/packages/mui-material/src/utils/capitalize.js +++ b/packages/mui-material/src/utils/capitalize.js @@ -1,3 +1,3 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from "@mui/utils/capitalize"; export default capitalize; diff --git a/packages/mui-material/src/utils/createChainedFunction.d.ts b/packages/mui-material/src/utils/createChainedFunction.d.ts index a84cf559319c84..d1bd63794ede38 100644 --- a/packages/mui-material/src/utils/createChainedFunction.d.ts +++ b/packages/mui-material/src/utils/createChainedFunction.d.ts @@ -1,3 +1,3 @@ -import { unstable_createChainedFunction as createChainedFunction } from '@mui/utils'; +import createChainedFunction from "@mui/utils/createChainedFunction"; export default createChainedFunction; diff --git a/packages/mui-material/src/utils/createChainedFunction.js b/packages/mui-material/src/utils/createChainedFunction.js index a84cf559319c84..d1bd63794ede38 100644 --- a/packages/mui-material/src/utils/createChainedFunction.js +++ b/packages/mui-material/src/utils/createChainedFunction.js @@ -1,3 +1,3 @@ -import { unstable_createChainedFunction as createChainedFunction } from '@mui/utils'; +import createChainedFunction from "@mui/utils/createChainedFunction"; export default createChainedFunction; diff --git a/packages/mui-material/src/utils/debounce.d.ts b/packages/mui-material/src/utils/debounce.d.ts index fe7cea1db2834a..cea4ff8607391c 100644 --- a/packages/mui-material/src/utils/debounce.d.ts +++ b/packages/mui-material/src/utils/debounce.d.ts @@ -1,3 +1,3 @@ -import { unstable_debounce as debounce } from '@mui/utils'; +import debounce from "@mui/utils/debounce"; export default debounce; diff --git a/packages/mui-material/src/utils/debounce.js b/packages/mui-material/src/utils/debounce.js index fe7cea1db2834a..cea4ff8607391c 100644 --- a/packages/mui-material/src/utils/debounce.js +++ b/packages/mui-material/src/utils/debounce.js @@ -1,3 +1,3 @@ -import { unstable_debounce as debounce } from '@mui/utils'; +import debounce from "@mui/utils/debounce"; export default debounce; diff --git a/packages/mui-material/src/utils/deprecatedPropType.d.ts b/packages/mui-material/src/utils/deprecatedPropType.d.ts index fbb605c0bbac97..5017c35cae4cc4 100644 --- a/packages/mui-material/src/utils/deprecatedPropType.d.ts +++ b/packages/mui-material/src/utils/deprecatedPropType.d.ts @@ -1,3 +1,3 @@ -import { unstable_deprecatedPropType as deprecatedPropType } from '@mui/utils'; +import deprecatedPropType from "@mui/utils/deprecatedPropType"; export default deprecatedPropType; diff --git a/packages/mui-material/src/utils/deprecatedPropType.js b/packages/mui-material/src/utils/deprecatedPropType.js index fbb605c0bbac97..5017c35cae4cc4 100644 --- a/packages/mui-material/src/utils/deprecatedPropType.js +++ b/packages/mui-material/src/utils/deprecatedPropType.js @@ -1,3 +1,3 @@ -import { unstable_deprecatedPropType as deprecatedPropType } from '@mui/utils'; +import deprecatedPropType from "@mui/utils/deprecatedPropType"; export default deprecatedPropType; diff --git a/packages/mui-material/src/utils/getScrollbarSize.ts b/packages/mui-material/src/utils/getScrollbarSize.ts index e3dcf3ea57a1e0..f2967ba4e191f1 100644 --- a/packages/mui-material/src/utils/getScrollbarSize.ts +++ b/packages/mui-material/src/utils/getScrollbarSize.ts @@ -1,3 +1,3 @@ -import { unstable_getScrollbarSize as getScrollbarSize } from '@mui/utils'; +import getScrollbarSize from "@mui/utils/getScrollbarSize"; export default getScrollbarSize; diff --git a/packages/mui-material/src/utils/isMuiElement.d.ts b/packages/mui-material/src/utils/isMuiElement.d.ts index c3784104b24753..447be0ab7bcaf0 100644 --- a/packages/mui-material/src/utils/isMuiElement.d.ts +++ b/packages/mui-material/src/utils/isMuiElement.d.ts @@ -1,3 +1,3 @@ -import { unstable_isMuiElement as isMuiElement } from '@mui/utils'; +import isMuiElement from "@mui/utils/isMuiElement"; export default isMuiElement; diff --git a/packages/mui-material/src/utils/isMuiElement.js b/packages/mui-material/src/utils/isMuiElement.js index c3784104b24753..447be0ab7bcaf0 100644 --- a/packages/mui-material/src/utils/isMuiElement.js +++ b/packages/mui-material/src/utils/isMuiElement.js @@ -1,3 +1,3 @@ -import { unstable_isMuiElement as isMuiElement } from '@mui/utils'; +import isMuiElement from "@mui/utils/isMuiElement"; export default isMuiElement; diff --git a/packages/mui-material/src/utils/ownerDocument.ts b/packages/mui-material/src/utils/ownerDocument.ts index fd042ac6edcd51..4cd1cf38b3e8e0 100644 --- a/packages/mui-material/src/utils/ownerDocument.ts +++ b/packages/mui-material/src/utils/ownerDocument.ts @@ -1,3 +1,3 @@ -import { unstable_ownerDocument as ownerDocument } from '@mui/utils'; +import ownerDocument from "@mui/utils/ownerDocument"; export default ownerDocument; diff --git a/packages/mui-material/src/utils/ownerWindow.ts b/packages/mui-material/src/utils/ownerWindow.ts index 47a847d5feba9a..52ce1328cba4ce 100644 --- a/packages/mui-material/src/utils/ownerWindow.ts +++ b/packages/mui-material/src/utils/ownerWindow.ts @@ -1,3 +1,3 @@ -import { unstable_ownerWindow as ownerWindow } from '@mui/utils'; +import ownerWindow from "@mui/utils/ownerWindow"; export default ownerWindow; diff --git a/packages/mui-material/src/utils/requirePropFactory.d.ts b/packages/mui-material/src/utils/requirePropFactory.d.ts index eb2c8e65787d91..e71fffdc999396 100644 --- a/packages/mui-material/src/utils/requirePropFactory.d.ts +++ b/packages/mui-material/src/utils/requirePropFactory.d.ts @@ -1,3 +1,3 @@ -import { unstable_requirePropFactory as requirePropFactory } from '@mui/utils'; +import requirePropFactory from "@mui/utils/requirePropFactory"; export default requirePropFactory; diff --git a/packages/mui-material/src/utils/requirePropFactory.js b/packages/mui-material/src/utils/requirePropFactory.js index eb2c8e65787d91..e71fffdc999396 100644 --- a/packages/mui-material/src/utils/requirePropFactory.js +++ b/packages/mui-material/src/utils/requirePropFactory.js @@ -1,3 +1,3 @@ -import { unstable_requirePropFactory as requirePropFactory } from '@mui/utils'; +import requirePropFactory from "@mui/utils/requirePropFactory"; export default requirePropFactory; diff --git a/packages/mui-material/src/utils/setRef.ts b/packages/mui-material/src/utils/setRef.ts index c1d1eddf231690..960ee425b0bd76 100644 --- a/packages/mui-material/src/utils/setRef.ts +++ b/packages/mui-material/src/utils/setRef.ts @@ -1,3 +1,3 @@ -import { unstable_setRef as setRef } from '@mui/utils'; +import setRef from "@mui/utils/setRef"; export default setRef; diff --git a/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js b/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js index 751ce4ee7aef79..27f053c54d8363 100644 --- a/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js +++ b/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js @@ -1,4 +1,4 @@ -import { isHostComponent } from '@mui/base'; +import { isHostComponent } from "@mui/base/utils"; const shouldSpreadAdditionalProps = (Slot) => { return !Slot || !isHostComponent(Slot); diff --git a/packages/mui-material/src/utils/unsupportedProp.d.ts b/packages/mui-material/src/utils/unsupportedProp.d.ts index a7ac2dbd955df4..e611dba309a63f 100644 --- a/packages/mui-material/src/utils/unsupportedProp.d.ts +++ b/packages/mui-material/src/utils/unsupportedProp.d.ts @@ -1,3 +1,3 @@ -import { unstable_unsupportedProp as unsupportedProp } from '@mui/utils'; +import unsupportedProp from "@mui/utils/unsupportedProp"; export default unsupportedProp; diff --git a/packages/mui-material/src/utils/unsupportedProp.js b/packages/mui-material/src/utils/unsupportedProp.js index a7ac2dbd955df4..e611dba309a63f 100644 --- a/packages/mui-material/src/utils/unsupportedProp.js +++ b/packages/mui-material/src/utils/unsupportedProp.js @@ -1,3 +1,3 @@ -import { unstable_unsupportedProp as unsupportedProp } from '@mui/utils'; +import unsupportedProp from "@mui/utils/unsupportedProp"; export default unsupportedProp; diff --git a/packages/mui-material/src/utils/useControlled.d.ts b/packages/mui-material/src/utils/useControlled.d.ts index 1e05d42f2be58f..637c116a90cee2 100644 --- a/packages/mui-material/src/utils/useControlled.d.ts +++ b/packages/mui-material/src/utils/useControlled.d.ts @@ -1,3 +1,3 @@ -import { unstable_useControlled as useControlled } from '@mui/utils'; +import useControlled from "@mui/utils/useControlled"; export default useControlled; diff --git a/packages/mui-material/src/utils/useControlled.js b/packages/mui-material/src/utils/useControlled.js index 098ebf75c4e83d..9a9b3ebc9dda81 100644 --- a/packages/mui-material/src/utils/useControlled.js +++ b/packages/mui-material/src/utils/useControlled.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useControlled as useControlled } from '@mui/utils'; +import useControlled from "@mui/utils/useControlled"; export default useControlled; diff --git a/packages/mui-material/src/utils/useEnhancedEffect.d.ts b/packages/mui-material/src/utils/useEnhancedEffect.d.ts index 2ec3b89a86d8ba..35d86d962c53c2 100644 --- a/packages/mui-material/src/utils/useEnhancedEffect.d.ts +++ b/packages/mui-material/src/utils/useEnhancedEffect.d.ts @@ -1,3 +1,3 @@ -import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils'; +import useEnhancedEffect from "@mui/utils/useEnhancedEffect"; export default useEnhancedEffect; diff --git a/packages/mui-material/src/utils/useEnhancedEffect.js b/packages/mui-material/src/utils/useEnhancedEffect.js index 2695c89b614494..2a36ef9d26229b 100644 --- a/packages/mui-material/src/utils/useEnhancedEffect.js +++ b/packages/mui-material/src/utils/useEnhancedEffect.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils'; +import useEnhancedEffect from "@mui/utils/useEnhancedEffect"; export default useEnhancedEffect; diff --git a/packages/mui-material/src/utils/useEventCallback.d.ts b/packages/mui-material/src/utils/useEventCallback.d.ts index ff3ee70183388b..98ab628c05bfed 100644 --- a/packages/mui-material/src/utils/useEventCallback.d.ts +++ b/packages/mui-material/src/utils/useEventCallback.d.ts @@ -1,3 +1,3 @@ -import { unstable_useEventCallback as useEventCallback } from '@mui/utils'; +import useEventCallback from "@mui/utils/useEventCallback"; export default useEventCallback; diff --git a/packages/mui-material/src/utils/useEventCallback.js b/packages/mui-material/src/utils/useEventCallback.js index 03b624ad3749d2..01ac3fce81ede9 100644 --- a/packages/mui-material/src/utils/useEventCallback.js +++ b/packages/mui-material/src/utils/useEventCallback.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useEventCallback as useEventCallback } from '@mui/utils'; +import useEventCallback from "@mui/utils/useEventCallback"; export default useEventCallback; diff --git a/packages/mui-material/src/utils/useForkRef.d.ts b/packages/mui-material/src/utils/useForkRef.d.ts index b80dfcccfaacfb..8ae133e24ec04f 100644 --- a/packages/mui-material/src/utils/useForkRef.d.ts +++ b/packages/mui-material/src/utils/useForkRef.d.ts @@ -1,3 +1,3 @@ -import { unstable_useForkRef as useForkRef } from '@mui/utils'; +import useForkRef from "@mui/utils/useForkRef"; export default useForkRef; diff --git a/packages/mui-material/src/utils/useForkRef.js b/packages/mui-material/src/utils/useForkRef.js index 38b967df8e7a75..10f839db7f3a52 100644 --- a/packages/mui-material/src/utils/useForkRef.js +++ b/packages/mui-material/src/utils/useForkRef.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useForkRef as useForkRef } from '@mui/utils'; +import useForkRef from "@mui/utils/useForkRef"; export default useForkRef; diff --git a/packages/mui-material/src/utils/useId.d.ts b/packages/mui-material/src/utils/useId.d.ts index 51a0cf8c6d03f9..4927fafe07b4d5 100644 --- a/packages/mui-material/src/utils/useId.d.ts +++ b/packages/mui-material/src/utils/useId.d.ts @@ -1,3 +1,3 @@ -import { unstable_useId as useId } from '@mui/utils'; +import useId from "@mui/utils/useId"; export default useId; diff --git a/packages/mui-material/src/utils/useId.js b/packages/mui-material/src/utils/useId.js index fbd108d5635dad..ae06d631d8e879 100644 --- a/packages/mui-material/src/utils/useId.js +++ b/packages/mui-material/src/utils/useId.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useId as useId } from '@mui/utils'; +import useId from "@mui/utils/useId"; export default useId; diff --git a/packages/mui-material/src/utils/useIsFocusVisible.d.ts b/packages/mui-material/src/utils/useIsFocusVisible.d.ts index e640db0f81d031..2a702ae3f7f980 100644 --- a/packages/mui-material/src/utils/useIsFocusVisible.d.ts +++ b/packages/mui-material/src/utils/useIsFocusVisible.d.ts @@ -1,3 +1,3 @@ -import { unstable_useIsFocusVisible as useIsFocusVisible } from '@mui/utils'; +import useIsFocusVisible from "@mui/utils/useIsFocusVisible"; export default useIsFocusVisible; diff --git a/packages/mui-material/src/utils/useIsFocusVisible.js b/packages/mui-material/src/utils/useIsFocusVisible.js index 14e2ca9248573d..eb37d820e5de27 100644 --- a/packages/mui-material/src/utils/useIsFocusVisible.js +++ b/packages/mui-material/src/utils/useIsFocusVisible.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useIsFocusVisible as useIsFocusVisible } from '@mui/utils'; +import useIsFocusVisible from "@mui/utils/useIsFocusVisible"; export default useIsFocusVisible; diff --git a/packages/mui-material/src/utils/useSlot.ts b/packages/mui-material/src/utils/useSlot.ts index 8709c030e95eab..f1b614ea01fd8f 100644 --- a/packages/mui-material/src/utils/useSlot.ts +++ b/packages/mui-material/src/utils/useSlot.ts @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import { ClassValue } from 'clsx'; -import { unstable_useForkRef as useForkRef } from '@mui/utils'; +import useForkRef from "@mui/utils/useForkRef"; import { appendOwnerState, resolveComponentProps, mergeSlotProps } from '@mui/base/utils'; export type WithCommonProps = T & { From f0b7d5061b0ddb1ce149337784003b6793a571ec Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 12 Feb 2024 15:10:32 +0700 Subject: [PATCH 15/19] transform MUI system --- packages/mui-system/src/Box/Box.js | 2 +- packages/mui-system/src/Box/Box.test.js | 4 +++- packages/mui-system/src/Box/boxClasses.ts | 2 +- .../mui-system/src/Container/containerClasses.ts | 6 ++---- .../mui-system/src/Container/createContainer.tsx | 10 ++++------ packages/mui-system/src/Stack/Stack.test.js | 2 +- packages/mui-system/src/Stack/createStack.tsx | 8 +++----- packages/mui-system/src/Stack/stackClasses.ts | 6 ++---- .../mui-system/src/ThemeProvider/ThemeProvider.js | 2 +- packages/mui-system/src/Unstable_Grid/Grid.test.js | 3 ++- packages/mui-system/src/Unstable_Grid/createGrid.tsx | 8 +++----- packages/mui-system/src/Unstable_Grid/gridClasses.ts | 6 ++---- packages/mui-system/src/breakpoints.js | 2 +- packages/mui-system/src/colorManipulator.js | 3 +-- packages/mui-system/src/colorManipulator.spec.ts | 6 +++--- packages/mui-system/src/colorManipulator.test.js | 5 +++-- packages/mui-system/src/createStyled.js | 4 +++- packages/mui-system/src/createTheme/createTheme.js | 2 +- .../mui-system/src/createTheme/createTheme.test.js | 4 +++- .../mui-system/src/cssVars/createCssVarsProvider.js | 2 +- .../src/cssVars/createCssVarsProvider.spec.tsx | 4 ++-- packages/mui-system/src/cssVars/prepareCssVars.ts | 2 +- packages/mui-system/src/index.spec.tsx | 12 +++--------- packages/mui-system/src/merge.js | 2 +- packages/mui-system/src/propsToClassKey.js | 2 +- packages/mui-system/src/sizing.test.js | 2 +- packages/mui-system/src/style.js | 2 +- .../mui-system/src/styleFunctionSx/extendSxProp.js | 2 +- .../src/styleFunctionSx/styleFunctionSx.js | 2 +- packages/mui-system/src/styled.test.js | 4 +++- .../mui-system/src/useThemeProps/getThemeProps.js | 2 +- .../src/useThemeProps/useThemeProps.spec.ts | 2 +- 32 files changed, 58 insertions(+), 67 deletions(-) diff --git a/packages/mui-system/src/Box/Box.js b/packages/mui-system/src/Box/Box.js index 5a153663dc56b6..81237aca0f5a3c 100644 --- a/packages/mui-system/src/Box/Box.js +++ b/packages/mui-system/src/Box/Box.js @@ -1,6 +1,6 @@ 'use client'; import PropTypes from 'prop-types'; -import { unstable_ClassNameGenerator as ClassNameGenerator } from '@mui/utils'; +import ClassNameGenerator from "@mui/utils/ClassNameGenerator"; import createBox from '../createBox'; import boxClasses from './boxClasses'; diff --git a/packages/mui-system/src/Box/Box.test.js b/packages/mui-system/src/Box/Box.test.js index 0a908fb2403bf2..0f3f027437089a 100644 --- a/packages/mui-system/src/Box/Box.test.js +++ b/packages/mui-system/src/Box/Box.test.js @@ -2,7 +2,9 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; -import { Box, createTheme, ThemeProvider, boxClasses as classes } from '@mui/system'; +import { Box, ThemeProvider, boxClasses as classes } from '@mui/system'; + +import createTheme from "@mui/system/createTheme"; describe('', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/Box/boxClasses.ts b/packages/mui-system/src/Box/boxClasses.ts index 65757282f0af88..3a55dc0bbdd3d2 100644 --- a/packages/mui-system/src/Box/boxClasses.ts +++ b/packages/mui-system/src/Box/boxClasses.ts @@ -1,4 +1,4 @@ -import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; export interface BoxClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/Container/containerClasses.ts b/packages/mui-system/src/Container/containerClasses.ts index fc68f10115c6ad..85b4c57707990e 100644 --- a/packages/mui-system/src/Container/containerClasses.ts +++ b/packages/mui-system/src/Container/containerClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; +import generateUtilityClass from "@mui/utils/generateUtilityClass"; export interface ContainerClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/Container/createContainer.tsx b/packages/mui-system/src/Container/createContainer.tsx index e412907809fe38..949a557eca193d 100644 --- a/packages/mui-system/src/Container/createContainer.tsx +++ b/packages/mui-system/src/Container/createContainer.tsx @@ -3,11 +3,9 @@ import PropTypes from 'prop-types'; import clsx from 'clsx'; import { Interpolation, MUIStyledComponent as StyledComponent } from '@mui/styled-engine'; import { OverridableComponent } from '@mui/types'; -import { - unstable_capitalize as capitalize, - unstable_composeClasses as composeClasses, - unstable_generateUtilityClass as generateUtilityClass, -} from '@mui/utils'; +import generateUtilityClass from "@mui/utils/generateUtilityClass"; +import composeClasses from "@mui/utils/composeClasses"; +import capitalize from "@mui/utils/capitalize"; import { ContainerProps, ContainerTypeMap } from './ContainerProps'; import useThemePropsSystem from '../useThemeProps'; import systemStyled from '../styled'; @@ -91,7 +89,7 @@ export default function createContainer>, + } as Interpolation>), ({ theme, ownerState }: StyleFnProps) => ownerState.fixed && Object.keys(theme.breakpoints.values).reduce((acc, breakpointValueKey) => { diff --git a/packages/mui-system/src/Stack/Stack.test.js b/packages/mui-system/src/Stack/Stack.test.js index 7e190c6d1703f2..9006626217031c 100644 --- a/packages/mui-system/src/Stack/Stack.test.js +++ b/packages/mui-system/src/Stack/Stack.test.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; import Stack from '@mui/system/Stack'; -import { createTheme } from '@mui/system'; +import createTheme from "@mui/system/createTheme"; import { style } from './createStack'; describe('', () => { diff --git a/packages/mui-system/src/Stack/createStack.tsx b/packages/mui-system/src/Stack/createStack.tsx index 9cbae5fe1fc9ec..d487f4eaaebaae 100644 --- a/packages/mui-system/src/Stack/createStack.tsx +++ b/packages/mui-system/src/Stack/createStack.tsx @@ -2,11 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { OverridableComponent } from '@mui/types'; -import { - deepmerge, - unstable_composeClasses as composeClasses, - unstable_generateUtilityClass as generateUtilityClass, -} from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; +import generateUtilityClass from "@mui/utils/generateUtilityClass"; +import composeClasses from "@mui/utils/composeClasses"; import systemStyled from '../styled'; import useThemePropsSystem from '../useThemeProps'; import { extendSxProp } from '../styleFunctionSx'; diff --git a/packages/mui-system/src/Stack/stackClasses.ts b/packages/mui-system/src/Stack/stackClasses.ts index 3c3aea3ec5e8b4..a66065e2041ca2 100644 --- a/packages/mui-system/src/Stack/stackClasses.ts +++ b/packages/mui-system/src/Stack/stackClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; +import generateUtilityClass from "@mui/utils/generateUtilityClass"; export interface StackClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/ThemeProvider/ThemeProvider.js b/packages/mui-system/src/ThemeProvider/ThemeProvider.js index 65c9649eb89bf4..7206b052f1718a 100644 --- a/packages/mui-system/src/ThemeProvider/ThemeProvider.js +++ b/packages/mui-system/src/ThemeProvider/ThemeProvider.js @@ -5,7 +5,7 @@ import { ThemeProvider as MuiThemeProvider, useTheme as usePrivateTheme, } from '@mui/private-theming'; -import { exactProp } from '@mui/utils'; +import exactProp from "@mui/utils/exactProp"; import { ThemeContext as StyledEngineThemeContext } from '@mui/styled-engine'; import useThemeWithoutDefault from '../useThemeWithoutDefault'; diff --git a/packages/mui-system/src/Unstable_Grid/Grid.test.js b/packages/mui-system/src/Unstable_Grid/Grid.test.js index 6e6d9094a9cd97..836765cbb1bdc3 100644 --- a/packages/mui-system/src/Unstable_Grid/Grid.test.js +++ b/packages/mui-system/src/Unstable_Grid/Grid.test.js @@ -1,7 +1,8 @@ import * as React from 'react'; import { expect } from 'chai'; import { describeConformance, createRenderer, screen } from '@mui-internal/test-utils'; -import { ThemeProvider, createTheme } from '@mui/system'; +import { ThemeProvider } from '@mui/system'; +import createTheme from "@mui/system/createTheme"; import Grid, { gridClasses as classes } from '@mui/system/Unstable_Grid'; describe('System ', () => { diff --git a/packages/mui-system/src/Unstable_Grid/createGrid.tsx b/packages/mui-system/src/Unstable_Grid/createGrid.tsx index 37465f1953ef5b..080556f3724d94 100644 --- a/packages/mui-system/src/Unstable_Grid/createGrid.tsx +++ b/packages/mui-system/src/Unstable_Grid/createGrid.tsx @@ -2,11 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { OverridableComponent } from '@mui/types'; -import { - unstable_composeClasses as composeClasses, - unstable_generateUtilityClass as generateUtilityClass, - unstable_isMuiElement as isMuiElement, -} from '@mui/utils'; +import isMuiElement from "@mui/utils/isMuiElement"; +import generateUtilityClass from "@mui/utils/generateUtilityClass"; +import composeClasses from "@mui/utils/composeClasses"; import systemStyled from '../styled'; import useThemePropsSystem from '../useThemeProps'; import useTheme from '../useTheme'; diff --git a/packages/mui-system/src/Unstable_Grid/gridClasses.ts b/packages/mui-system/src/Unstable_Grid/gridClasses.ts index 65909e9e05fb96..28b1f49ed4966b 100644 --- a/packages/mui-system/src/Unstable_Grid/gridClasses.ts +++ b/packages/mui-system/src/Unstable_Grid/gridClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; +import generateUtilityClass from "@mui/utils/generateUtilityClass"; export interface GridClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/breakpoints.js b/packages/mui-system/src/breakpoints.js index 44b48db750aa10..627335ac37125e 100644 --- a/packages/mui-system/src/breakpoints.js +++ b/packages/mui-system/src/breakpoints.js @@ -1,5 +1,5 @@ import PropTypes from 'prop-types'; -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; import merge from './merge'; // The breakpoint **start** at this value. diff --git a/packages/mui-system/src/colorManipulator.js b/packages/mui-system/src/colorManipulator.js index dc8960c9027847..f0665cb1476f61 100644 --- a/packages/mui-system/src/colorManipulator.js +++ b/packages/mui-system/src/colorManipulator.js @@ -1,5 +1,4 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -import { clamp } from '@mui/utils'; +import clamp from "@mui/utils/clamp"; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; /** diff --git a/packages/mui-system/src/colorManipulator.spec.ts b/packages/mui-system/src/colorManipulator.spec.ts index feca52b4430345..30017f3241cd0f 100644 --- a/packages/mui-system/src/colorManipulator.spec.ts +++ b/packages/mui-system/src/colorManipulator.spec.ts @@ -1,4 +1,6 @@ import { expectType } from '@mui/types'; +import { ColorFormat, ColorObject } from '@mui/system'; + import { hexToRgb, rgbToHex, @@ -12,9 +14,7 @@ import { alpha, lighten, darken, - ColorFormat, - ColorObject, -} from '@mui/system'; +} from "@mui/system/colorManipulator"; expectType<(color: string) => string, typeof hexToRgb>(hexToRgb); diff --git a/packages/mui-system/src/colorManipulator.test.js b/packages/mui-system/src/colorManipulator.test.js index 99ba4aaacf8aea..deb3f427164a99 100644 --- a/packages/mui-system/src/colorManipulator.test.js +++ b/packages/mui-system/src/colorManipulator.test.js @@ -1,4 +1,6 @@ import { expect } from 'chai'; +import { blend } from '@mui/system'; + import { recomposeColor, hexToRgb, @@ -12,8 +14,7 @@ import { getLuminance, lighten, colorChannel, - blend, -} from '@mui/system'; +} from "@mui/system/colorManipulator"; describe('utils/colorManipulator', () => { describe('recomposeColor', () => { diff --git a/packages/mui-system/src/createStyled.js b/packages/mui-system/src/createStyled.js index ee118347505d86..7f0f21334e6b25 100644 --- a/packages/mui-system/src/createStyled.js +++ b/packages/mui-system/src/createStyled.js @@ -1,6 +1,8 @@ /* eslint-disable no-underscore-dangle */ import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; -import { getDisplayName, unstable_capitalize as capitalize, isPlainObject } from '@mui/utils'; +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'; diff --git a/packages/mui-system/src/createTheme/createTheme.js b/packages/mui-system/src/createTheme/createTheme.js index a0727253b00bcf..1642642047549e 100644 --- a/packages/mui-system/src/createTheme/createTheme.js +++ b/packages/mui-system/src/createTheme/createTheme.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; import createBreakpoints from './createBreakpoints'; import shape from './shape'; import createSpacing from './createSpacing'; diff --git a/packages/mui-system/src/createTheme/createTheme.test.js b/packages/mui-system/src/createTheme/createTheme.test.js index 3698f1e0c0e9d0..362b296322e2fd 100644 --- a/packages/mui-system/src/createTheme/createTheme.test.js +++ b/packages/mui-system/src/createTheme/createTheme.test.js @@ -1,7 +1,9 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer } from '@mui-internal/test-utils'; -import { createTheme, styled, ThemeProvider } from '@mui/system'; +import { styled, ThemeProvider } from '@mui/system'; + +import createTheme from "@mui/system/createTheme"; describe('createTheme', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.js b/packages/mui-system/src/cssVars/createCssVarsProvider.js index 429f1f634ed390..b1a92fa12abfc9 100644 --- a/packages/mui-system/src/cssVars/createCssVarsProvider.js +++ b/packages/mui-system/src/cssVars/createCssVarsProvider.js @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; import { GlobalStyles } from '@mui/styled-engine'; import { useTheme as muiUseTheme } from '@mui/private-theming'; import ThemeProvider from '../ThemeProvider'; diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx b/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx index 421a55cc7563b9..f4e964ed0bfeed 100644 --- a/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx +++ b/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx @@ -26,10 +26,10 @@ const extendTheme = (themeInput: JoyThemeInput) => dark: { palette: { primary: { main: '' } } }, }, fontSize: { md: '' }, - }) as { + } as { colorSchemes: Record; fontSize: { md: string }; - }; + }); const { CssVarsProvider, useColorScheme } = createCssVarsProvider({ defaultColorScheme: 'light', diff --git a/packages/mui-system/src/cssVars/prepareCssVars.ts b/packages/mui-system/src/cssVars/prepareCssVars.ts index c73dc7240ecdb7..3b1a48c2533ce5 100644 --- a/packages/mui-system/src/cssVars/prepareCssVars.ts +++ b/packages/mui-system/src/cssVars/prepareCssVars.ts @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; import cssVarsParser from './cssVarsParser'; export interface DefaultCssVarsTheme { diff --git a/packages/mui-system/src/index.spec.tsx b/packages/mui-system/src/index.spec.tsx index 8411979d97df94..024a7e6d67d9cb 100644 --- a/packages/mui-system/src/index.spec.tsx +++ b/packages/mui-system/src/index.spec.tsx @@ -1,14 +1,8 @@ import * as React from 'react'; import styled from 'styled-components'; -import { - breakpoints, - display, - compose, - createTheme, - spacing, - style, - styled as muiStyled, -} from '@mui/system'; +import { breakpoints, display, compose, spacing, style, styled as muiStyled } from '@mui/system'; + +import createTheme from "@mui/system/createTheme"; function composeTest() { function first(props: { color: string }) { diff --git a/packages/mui-system/src/merge.js b/packages/mui-system/src/merge.js index 83c30c82e7ba45..cdf603e9d92c2e 100644 --- a/packages/mui-system/src/merge.js +++ b/packages/mui-system/src/merge.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from "@mui/utils/deepmerge"; function merge(acc, item) { if (!item) { diff --git a/packages/mui-system/src/propsToClassKey.js b/packages/mui-system/src/propsToClassKey.js index 631ea38b7310b4..620c15e2d5597e 100644 --- a/packages/mui-system/src/propsToClassKey.js +++ b/packages/mui-system/src/propsToClassKey.js @@ -1,4 +1,4 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from "@mui/utils/capitalize"; function isEmpty(string) { return string.length === 0; diff --git a/packages/mui-system/src/sizing.test.js b/packages/mui-system/src/sizing.test.js index fbab61d41fde36..61a184f0b81f5e 100644 --- a/packages/mui-system/src/sizing.test.js +++ b/packages/mui-system/src/sizing.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { createTheme } from '@mui/system'; +import createTheme from "@mui/system/createTheme"; import sizing from './sizing'; describe('sizing', () => { diff --git a/packages/mui-system/src/style.js b/packages/mui-system/src/style.js index 2767e7e306623a..313bbbedbc3aa5 100644 --- a/packages/mui-system/src/style.js +++ b/packages/mui-system/src/style.js @@ -1,4 +1,4 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from "@mui/utils/capitalize"; import responsivePropType from './responsivePropType'; import { handleBreakpoints } from './breakpoints'; diff --git a/packages/mui-system/src/styleFunctionSx/extendSxProp.js b/packages/mui-system/src/styleFunctionSx/extendSxProp.js index 773172783f79c2..e0eae568c0c78a 100644 --- a/packages/mui-system/src/styleFunctionSx/extendSxProp.js +++ b/packages/mui-system/src/styleFunctionSx/extendSxProp.js @@ -1,4 +1,4 @@ -import { isPlainObject } from '@mui/utils'; +import { isPlainObject } from "@mui/utils/deepmerge"; import defaultSxConfig from './defaultSxConfig'; const splitProps = (props) => { diff --git a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js index 4f391e563b674a..a70cf2c9dcf84f 100644 --- a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js +++ b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js @@ -1,4 +1,4 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from "@mui/utils/capitalize"; import merge from '../merge'; import { getPath, getStyleValue as getValue } from '../style'; import { diff --git a/packages/mui-system/src/styled.test.js b/packages/mui-system/src/styled.test.js index a8551cc90bb52c..c0690e2e20488b 100644 --- a/packages/mui-system/src/styled.test.js +++ b/packages/mui-system/src/styled.test.js @@ -1,7 +1,9 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, screen } from '@mui-internal/test-utils'; -import { styled, createTheme, ThemeProvider } from '@mui/system'; +import { styled, ThemeProvider } from '@mui/system'; + +import createTheme from "@mui/system/createTheme"; describe('styled', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/useThemeProps/getThemeProps.js b/packages/mui-system/src/useThemeProps/getThemeProps.js index aa3a17f87941c9..fb47fc40dc7ad6 100644 --- a/packages/mui-system/src/useThemeProps/getThemeProps.js +++ b/packages/mui-system/src/useThemeProps/getThemeProps.js @@ -1,4 +1,4 @@ -import { internal_resolveProps as resolveProps } from '@mui/utils'; +import resolveProps from "@mui/utils/resolveProps"; export default function getThemeProps(params) { const { theme, name, props } = params; diff --git a/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts b/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts index a313ca87b5e00f..1acc1bbe82d93b 100644 --- a/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts +++ b/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts @@ -1,5 +1,5 @@ import { expectType } from '@mui/types'; -import { useThemeProps } from '@mui/system'; +import useThemeProps from "@mui/system/useThemeProps"; interface SliderProps { track?: boolean; From 1f4baaa872db7c3dff89b6fbd67450d791a2fefd Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 12 Feb 2024 15:11:46 +0700 Subject: [PATCH 16/19] remove codemod --- .../deprecations/mui-utils-import/index.js | 1 - .../mui-utils-import/mui-utils-import.js | 212 ------------------ .../mui-utils-import/mui-utils-import.test.js | 87 ------- .../test-cases/base.actual.js | 5 - .../test-cases/base.expected.js | 2 - .../test-cases/system.actual.js | 19 -- .../test-cases/system.expected.js | 21 -- .../test-cases/utils.actual.js | 21 -- .../test-cases/utils.expected.js | 17 -- 9 files changed, 385 deletions(-) delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/index.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js delete mode 100644 packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/index.js b/packages/mui-codemod/src/deprecations/mui-utils-import/index.js deleted file mode 100644 index 01ce838464ded7..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './mui-utils-import'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js deleted file mode 100644 index 2d171da279bcb0..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.js +++ /dev/null @@ -1,212 +0,0 @@ -/** - * @param {import('jscodeshift').FileInfo} file - * @param {import('jscodeshift').API} api - */ -export default function transformer(file, api, options) { - const j = api.jscodeshift; - const root = j(file.source); - const printOptions = options.printOptions; - - // @mui/utils - const timeoutSpecifiers = []; - const deepmergeSpecifiers = []; - const scrollLeftSpecifier = []; - root - .find(j.ImportDeclaration) - .filter((path) => path.node.source.value === '@mui/utils') - .forEach((path) => { - path.node.specifiers.forEach((specifier) => { - if (specifier.imported.name === 'unstable_Timeout') { - timeoutSpecifiers.push(j.importSpecifier(j.identifier(specifier.local.name))); - } else if (specifier.imported.name === 'unstable_useTimeout') { - timeoutSpecifiers.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); - } else if (specifier.imported.name === 'isPlainObject') { - deepmergeSpecifiers.push(j.importSpecifier(j.identifier(specifier.local.name))); - } else if (specifier.imported.name === 'deepmerge') { - deepmergeSpecifiers.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); - } else if (specifier.imported.name === 'unstable_detectScrollType') { - scrollLeftSpecifier.push(j.importSpecifier(j.identifier(specifier.local.name))); - } else if (specifier.imported.name === 'unstable_getNormalizedScrollLeft') { - scrollLeftSpecifier.push(j.importSpecifier(j.identifier(specifier.local.name))); - } else { - path.insertAfter( - j.importDeclaration( - [j.importDefaultSpecifier(j.identifier(specifier.local.name))], - j.stringLiteral(`@mui/utils/${specifier.local.name}`), - ), - ); - } - }); - if (timeoutSpecifiers.length) { - path.insertAfter( - j.importDeclaration(timeoutSpecifiers, j.stringLiteral(`@mui/utils/useTimeout`)), - ); - } - if (deepmergeSpecifiers.length) { - path.insertAfter( - j.importDeclaration(deepmergeSpecifiers, j.stringLiteral(`@mui/utils/deepmerge`)), - ); - } - if (scrollLeftSpecifier.length) { - path.insertAfter( - j.importDeclaration(scrollLeftSpecifier, j.stringLiteral(`@mui/utils/scrollLeft`)), - ); - } - path.replace(); - }); - - // @mui/base - root - .find(j.ImportDeclaration) - .filter((path) => path.node.source.value === '@mui/base/composeClasses') - .forEach((path) => { - path.insertAfter( - j.importDeclaration( - [j.importDefaultSpecifier(j.identifier('composeClasses'))], - j.stringLiteral(`@mui/utils/composeClasses`), - ), - ); - path.replace(); - }); - - const existingBaseUtils = [ - 'appendOwnerState', - 'areArraysEqual', - 'ClassNameConfigurator', - 'extractEventHandlers', - 'isHostComponent', - 'resolveComponentProps', - 'useSlotProps', - 'mergeSlotProps', - 'prepareForSlot', - ]; - const baseUtils = []; - let baseImportPath; - root - .find(j.ImportDeclaration) - .filter((path) => path.node.source.value === '@mui/base') - .forEach((path) => { - baseImportPath = path; - path.node.specifiers.forEach((specifier) => { - if (existingBaseUtils.includes(specifier.imported.name)) { - baseUtils.push(specifier); - } - if (specifier.imported.name === 'unstable_composeClasses') { - path.insertAfter( - j.importDeclaration( - [j.importDefaultSpecifier(j.identifier(specifier.local.name))], - j.stringLiteral(`@mui/utils/composeClasses`), - ), - ); - } - }); - }); - if (baseUtils.length) { - baseImportPath.insertAfter(j.importDeclaration(baseUtils, j.stringLiteral(`@mui/base/utils`))); - } - if (baseImportPath) { - baseImportPath.node.specifiers = baseImportPath.node.specifiers.filter( - (specifier) => - ![...existingBaseUtils, 'unstable_composeClasses'].includes(specifier.imported.name), - ); - if (!baseImportPath.node.specifiers.length) { - baseImportPath.replace(); - } - } - - // @mui/system - const colors = []; - const systemColorFns = [ - 'hexToRgb', - 'rgbToHex', - 'hslToRgb', - 'decomposeColor', - 'colorChannel', - 'recomposeColor', - 'getContrastRatio', - 'getLuminance', - 'emphasize', - 'alpha', - 'darken', - 'lighten', - 'private_safeColorChannel', - 'private_safeEmphasize', - 'private_safeAlpha', - 'private_safeDarken', - 'private_safeLighten', - ]; - const styleFunctionSx = []; - const useThemePropsSpecifier = []; - const defaultImport = ['createTheme', 'useThemeWithoutDefault']; - let systemImportPath; - root - .find(j.ImportDeclaration) - .filter((path) => path.node.source.value === '@mui/system') - .forEach((path) => { - systemImportPath = path; - path.node.specifiers.forEach((specifier) => { - if (systemColorFns.includes(specifier.imported.name)) { - colors.push(specifier); - } - defaultImport.forEach((item) => { - if (specifier.imported.name === item) { - path.insertAfter( - j.importDeclaration( - [j.importDefaultSpecifier(j.identifier(specifier.local.name))], - j.stringLiteral(`@mui/system/${specifier.imported.name}`), - ), - ); - } - }); - if (specifier.imported.name === 'getThemeProps') { - useThemePropsSpecifier.push(j.importSpecifier(j.identifier(specifier.local.name))); - } - if (specifier.imported.name === 'useThemeProps') { - useThemePropsSpecifier.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); - } - if (specifier.imported.name === 'unstable_styleFunctionSx') { - styleFunctionSx.push(j.importDefaultSpecifier(j.identifier(specifier.local.name))); - } - if (specifier.imported.name === 'unstable_defaultSxConfig') { - styleFunctionSx.push(specifier); - } - if (specifier.imported.name === 'unstable_extendSxProp') { - styleFunctionSx.push(j.importSpecifier(j.identifier('extendSxProp'), specifier.local)); - } - }); - if (useThemePropsSpecifier.length) { - path.insertAfter( - j.importDeclaration(useThemePropsSpecifier, j.stringLiteral(`@mui/system/useThemeProps`)), - ); - } - }); - if (colors.length) { - systemImportPath.insertAfter( - j.importDeclaration(colors, j.stringLiteral(`@mui/system/colorManipulator`)), - ); - } - if (styleFunctionSx.length) { - systemImportPath.insertAfter( - j.importDeclaration(styleFunctionSx, j.stringLiteral(`@mui/system/styleFunctionSx`)), - ); - } - if (systemImportPath) { - systemImportPath.node.specifiers = systemImportPath.node.specifiers.filter( - (specifier) => - ![ - ...systemColorFns, - ...defaultImport, - 'useThemeProps', - 'getThemeProps', - 'unstable_styleFunctionSx', - 'unstable_defaultSxConfig', - 'unstable_extendSxProp', - ].includes(specifier.imported.name), - ); - if (!systemImportPath.node.specifiers.length) { - systemImportPath.replace(); - } - } - - return root.toSource(printOptions); -} diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js b/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js deleted file mode 100644 index b8ae9eba163b56..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/mui-utils-import.test.js +++ /dev/null @@ -1,87 +0,0 @@ -import path from 'path'; -import { expect } from 'chai'; -import { jscodeshift } from '../../../testUtils'; -import transform from './mui-utils-import'; -import readFile from '../../util/readFile'; - -function read(fileName) { - return readFile(path.join(__dirname, fileName)); -} - -describe('@mui/codemod', () => { - describe('deprecations', () => { - describe('mui-utils-import', () => { - describe('utils', () => { - it('transforms props as needed', () => { - const actual = transform( - { source: read('./test-cases/utils.actual.js') }, - { jscodeshift }, - {}, - ); - - const expected = read('./test-cases/utils.expected.js'); - expect(actual).to.equal(expected, 'The transformed version should be correct'); - }); - - it('should be idempotent', () => { - const actual = transform( - { source: read('./test-cases/utils.expected.js') }, - { jscodeshift }, - {}, - ); - - const expected = read('./test-cases/utils.expected.js'); - expect(actual).to.equal(expected, 'The transformed version should be correct'); - }); - }); - - describe('base', () => { - it('transforms props as needed', () => { - const actual = transform( - { source: read('./test-cases/base.actual.js') }, - { jscodeshift }, - {}, - ); - - const expected = read('./test-cases/base.expected.js'); - expect(actual).to.equal(expected, 'The transformed version should be correct'); - }); - - it('should be idempotent', () => { - const actual = transform( - { source: read('./test-cases/base.expected.js') }, - { jscodeshift }, - {}, - ); - - const expected = read('./test-cases/base.expected.js'); - expect(actual).to.equal(expected, 'The transformed version should be correct'); - }); - }); - - describe('system', () => { - it('transforms props as needed', () => { - const actual = transform( - { source: read('./test-cases/system.actual.js') }, - { jscodeshift }, - {}, - ); - - const expected = read('./test-cases/system.expected.js'); - expect(actual).to.equal(expected, 'The transformed version should be correct'); - }); - - it('should be idempotent', () => { - const actual = transform( - { source: read('./test-cases/system.expected.js') }, - { jscodeshift }, - {}, - ); - - const expected = read('./test-cases/system.expected.js'); - expect(actual).to.equal(expected, 'The transformed version should be correct'); - }); - }); - }); - }); -}); diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js deleted file mode 100644 index 7314c8b7142211..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.actual.js +++ /dev/null @@ -1,5 +0,0 @@ -import { - unstable_composeClasses as composeClasses, - useSlotProps, - isHostComponent, -} from '@mui/base'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js deleted file mode 100644 index 4be0abaad90ccb..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/base.expected.js +++ /dev/null @@ -1,2 +0,0 @@ -import { useSlotProps, isHostComponent } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js deleted file mode 100644 index 0ca92b9888165c..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.actual.js +++ /dev/null @@ -1,19 +0,0 @@ -import { - darken, - lighten, - emphasize, - alpha, - useThemeWithoutDefault as useTheme, - createTheme as systemCreateTheme, - unstable_defaultSxConfig as defaultSxConfig, - unstable_styleFunctionSx as styleFunctionSx, - private_safeColorChannel as safeColorChannel, - private_safeAlpha as safeAlpha, - private_safeDarken as safeDarken, - private_safeLighten as safeLighten, - private_safeEmphasize as safeEmphasize, - unstable_createGetCssVar as systemCreateGetCssVar, - unstable_prepareCssVars as prepareCssVars, - hslToRgb, - unstable_extendSxProp as extendSxProp, -} from '@mui/system'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js deleted file mode 100644 index 9bc095647e3c0d..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/system.expected.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - unstable_createGetCssVar as systemCreateGetCssVar, - unstable_prepareCssVars as prepareCssVars, -} from '@mui/system'; -import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig, extendSxProp } from "@mui/system/styleFunctionSx"; - -import { - darken, - lighten, - emphasize, - alpha, - private_safeColorChannel as safeColorChannel, - private_safeAlpha as safeAlpha, - private_safeDarken as safeDarken, - private_safeLighten as safeLighten, - private_safeEmphasize as safeEmphasize, - hslToRgb, -} from "@mui/system/colorManipulator"; - -import systemCreateTheme from "@mui/system/createTheme"; -import useTheme from "@mui/system/useThemeWithoutDefault"; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js deleted file mode 100644 index ca8c409cff1b4e..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.actual.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - chainPropTypes, - integerPropType, - usePreviousProps, - getValidReactChildren, - refType, - unstable_ClassNameGenerator, - unstable_useId as useId, - deepmerge, - elementAcceptingRef, - unstable_Timeout as Timeout, - unstable_useTimeout as useTimeout, - exactProp, - getDisplayName, - unstable_capitalize as capitalize, - elementTypeAcceptingRef, - HTMLElementType, - clamp, - unstable_detectScrollType as detectScrollType, - unstable_getNormalizedScrollLeft as getNormalizedScrollLeft, -} from '@mui/utils'; diff --git a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js b/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js deleted file mode 100644 index a4a083090294a4..00000000000000 --- a/packages/mui-codemod/src/deprecations/mui-utils-import/test-cases/utils.expected.js +++ /dev/null @@ -1,17 +0,0 @@ -import { detectScrollType, getNormalizedScrollLeft } from "@mui/utils/scrollLeft"; -import deepmerge from "@mui/utils/deepmerge"; -import useTimeout, { Timeout } from "@mui/utils/useTimeout"; -import clamp from "@mui/utils/clamp"; -import HTMLElementType from "@mui/utils/HTMLElementType"; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import capitalize from "@mui/utils/capitalize"; -import getDisplayName from "@mui/utils/getDisplayName"; -import exactProp from "@mui/utils/exactProp"; -import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; -import useId from "@mui/utils/useId"; -import unstable_ClassNameGenerator from "@mui/utils/unstable_ClassNameGenerator"; -import refType from "@mui/utils/refType"; -import getValidReactChildren from "@mui/utils/getValidReactChildren"; -import usePreviousProps from "@mui/utils/usePreviousProps"; -import integerPropType from "@mui/utils/integerPropType"; -import chainPropTypes from "@mui/utils/chainPropTypes"; From 0da8f6b35fa9f99ae648b227341d134a14490cb1 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 12 Feb 2024 15:12:17 +0700 Subject: [PATCH 17/19] run prettier --- packages/mui-material/src/Accordion/Accordion.js | 4 ++-- .../src/AccordionActions/AccordionActions.js | 2 +- .../src/AccordionDetails/AccordionDetails.js | 2 +- .../src/AccordionSummary/AccordionSummary.js | 2 +- packages/mui-material/src/Alert/Alert.js | 4 ++-- .../mui-material/src/AlertTitle/AlertTitle.js | 2 +- packages/mui-material/src/AppBar/AppBar.js | 2 +- .../src/Autocomplete/Autocomplete.js | 10 +++++----- packages/mui-material/src/Avatar/Avatar.js | 2 +- .../mui-material/src/AvatarGroup/AvatarGroup.js | 4 ++-- packages/mui-material/src/Backdrop/Backdrop.js | 2 +- packages/mui-material/src/Badge/Badge.js | 6 +++--- .../src/BottomNavigation/BottomNavigation.js | 2 +- .../BottomNavigationAction.js | 2 +- .../src/Breadcrumbs/BreadcrumbCollapsed.js | 2 +- .../mui-material/src/Breadcrumbs/Breadcrumbs.js | 8 ++++---- packages/mui-material/src/Button/Button.js | 6 +++--- .../mui-material/src/ButtonBase/ButtonBase.js | 8 ++++---- .../mui-material/src/ButtonBase/TouchRipple.js | 2 +- .../mui-material/src/ButtonGroup/ButtonGroup.js | 6 +++--- packages/mui-material/src/Card/Card.js | 4 ++-- .../src/CardActionArea/CardActionArea.js | 2 +- .../mui-material/src/CardActions/CardActions.js | 2 +- .../mui-material/src/CardContent/CardContent.js | 2 +- .../mui-material/src/CardHeader/CardHeader.js | 2 +- packages/mui-material/src/CardMedia/CardMedia.js | 4 ++-- packages/mui-material/src/Checkbox/Checkbox.js | 6 +++--- packages/mui-material/src/Chip/Chip.js | 4 ++-- .../src/CircularProgress/CircularProgress.js | 4 ++-- packages/mui-material/src/Collapse/Collapse.js | 8 ++++---- packages/mui-material/src/Dialog/Dialog.js | 4 ++-- .../src/DialogActions/DialogActions.js | 2 +- .../src/DialogContent/DialogContent.js | 2 +- .../src/DialogContentText/DialogContentText.js | 2 +- .../mui-material/src/DialogTitle/DialogTitle.js | 2 +- packages/mui-material/src/Divider/Divider.js | 4 ++-- packages/mui-material/src/Drawer/Drawer.js | 4 ++-- packages/mui-material/src/Fab/Fab.js | 2 +- packages/mui-material/src/Fade/Fade.js | 2 +- .../mui-material/src/FilledInput/FilledInput.js | 8 ++++---- .../mui-material/src/FormControl/FormControl.js | 2 +- .../src/FormControlLabel/FormControlLabel.js | 4 ++-- packages/mui-material/src/FormGroup/FormGroup.js | 2 +- .../src/FormHelperText/FormHelperText.js | 2 +- packages/mui-material/src/FormLabel/FormLabel.js | 2 +- packages/mui-material/src/Grid/Grid.js | 6 +++--- packages/mui-material/src/Grow/Grow.js | 6 +++--- packages/mui-material/src/Hidden/HiddenCss.js | 2 +- packages/mui-material/src/Hidden/HiddenJs.js | 2 +- packages/mui-material/src/Hidden/withWidth.js | 4 ++-- packages/mui-material/src/Icon/Icon.js | 2 +- .../mui-material/src/IconButton/IconButton.js | 6 +++--- .../src/IconButton/IconButton.test.js | 2 +- packages/mui-material/src/ImageList/ImageList.js | 4 ++-- .../src/ImageListItem/ImageListItem.js | 4 ++-- .../src/ImageListItemBar/ImageListItemBar.js | 2 +- packages/mui-material/src/Input/Input.js | 8 ++++---- .../src/InputAdornment/InputAdornment.js | 2 +- packages/mui-material/src/InputBase/InputBase.js | 10 +++++----- .../mui-material/src/InputLabel/InputLabel.js | 2 +- .../src/LinearProgress/LinearProgress.js | 6 +++--- packages/mui-material/src/Link/Link.js | 4 ++-- .../mui-material/src/Link/getTextDecoration.ts | 2 +- packages/mui-material/src/List/List.js | 2 +- packages/mui-material/src/ListItem/ListItem.js | 12 ++++++------ .../src/ListItemAvatar/ListItemAvatar.js | 2 +- .../src/ListItemButton/ListItemButton.js | 4 ++-- .../src/ListItemIcon/ListItemIcon.js | 2 +- .../ListItemSecondaryAction.js | 2 +- .../src/ListItemText/ListItemText.js | 2 +- .../src/ListSubheader/ListSubheader.js | 2 +- packages/mui-material/src/Menu/Menu.js | 4 ++-- packages/mui-material/src/MenuItem/MenuItem.js | 4 ++-- .../src/MobileStepper/MobileStepper.js | 4 ++-- packages/mui-material/src/Modal/Modal.js | 10 +++++----- .../src/NativeSelect/NativeSelect.js | 2 +- .../src/NativeSelect/NativeSelectInput.js | 4 ++-- .../src/OutlinedInput/OutlinedInput.js | 4 ++-- .../mui-material/src/Pagination/Pagination.js | 4 ++-- .../src/PaginationItem/PaginationItem.js | 4 ++-- packages/mui-material/src/Paper/Paper.js | 10 +++++----- packages/mui-material/src/Popover/Popover.js | 16 ++++++++-------- packages/mui-material/src/Popper/Popper.test.js | 2 +- packages/mui-material/src/Popper/Popper.tsx | 8 ++++---- packages/mui-material/src/Radio/Radio.js | 6 +++--- packages/mui-material/src/Rating/Rating.js | 10 +++++----- .../src/ScopedCssBaseline/ScopedCssBaseline.js | 2 +- packages/mui-material/src/Select/Select.js | 2 +- packages/mui-material/src/Select/SelectInput.js | 8 ++++---- packages/mui-material/src/Skeleton/Skeleton.js | 2 +- packages/mui-material/src/Slide/Slide.js | 8 ++++---- packages/mui-material/src/Slider/Slider.js | 10 +++++----- packages/mui-material/src/Snackbar/Snackbar.js | 6 +++--- .../src/SnackbarContent/SnackbarContent.js | 4 ++-- packages/mui-material/src/SpeedDial/SpeedDial.js | 8 ++++---- .../src/SpeedDialAction/SpeedDialAction.js | 4 ++-- .../src/SpeedDialIcon/SpeedDialIcon.js | 2 +- packages/mui-material/src/Step/Step.js | 4 ++-- .../mui-material/src/StepButton/StepButton.js | 2 +- .../src/StepConnector/StepConnector.js | 2 +- .../mui-material/src/StepContent/StepContent.js | 2 +- packages/mui-material/src/StepIcon/StepIcon.js | 2 +- packages/mui-material/src/StepLabel/StepLabel.js | 2 +- packages/mui-material/src/Stepper/Stepper.js | 4 ++-- packages/mui-material/src/SvgIcon/SvgIcon.js | 2 +- .../src/SwipeableDrawer/SwipeableDrawer.js | 4 ++-- packages/mui-material/src/Switch/Switch.js | 6 +++--- packages/mui-material/src/Tab/Tab.js | 2 +- .../src/TabScrollButton/TabScrollButton.js | 6 +++--- packages/mui-material/src/Table/Table.js | 2 +- packages/mui-material/src/TableBody/TableBody.js | 2 +- packages/mui-material/src/TableCell/TableCell.js | 4 ++-- .../src/TableContainer/TableContainer.js | 2 +- .../mui-material/src/TableFooter/TableFooter.js | 2 +- packages/mui-material/src/TableHead/TableHead.js | 2 +- .../src/TablePagination/TablePagination.js | 10 +++++----- packages/mui-material/src/TableRow/TableRow.js | 4 ++-- .../src/TableSortLabel/TableSortLabel.js | 2 +- packages/mui-material/src/Tabs/Tabs.js | 8 ++++---- packages/mui-material/src/TextField/TextField.js | 8 ++++---- .../src/ToggleButton/ToggleButton.js | 4 ++-- .../src/ToggleButtonGroup/ToggleButtonGroup.js | 4 ++-- packages/mui-material/src/Toolbar/Toolbar.js | 2 +- packages/mui-material/src/Tooltip/Tooltip.js | 12 ++++++------ .../mui-material/src/Typography/Typography.js | 4 ++-- packages/mui-material/src/Zoom/Zoom.js | 2 +- packages/mui-material/src/internal/SwitchBase.js | 4 ++-- .../mui-material/src/styles/CssVarsProvider.tsx | 4 ++-- .../src/styles/createMuiStrictModeTheme.js | 2 +- .../mui-material/src/styles/createPalette.js | 4 ++-- .../src/styles/createPalette.test.js | 2 +- packages/mui-material/src/styles/createTheme.js | 8 +++++--- .../mui-material/src/styles/createTypography.js | 2 +- .../src/styles/experimental_extendTheme.js | 8 +++++--- .../src/styles/shouldSkipGeneratingVar.ts | 8 +++++--- .../mui-material/src/styles/useThemeProps.js | 2 +- .../src/useMediaQuery/useMediaQuery.ts | 6 +++--- .../src/usePagination/usePagination.js | 10 +++++----- packages/mui-material/src/utils/capitalize.d.ts | 2 +- packages/mui-material/src/utils/capitalize.js | 2 +- .../src/utils/createChainedFunction.d.ts | 2 +- .../src/utils/createChainedFunction.js | 2 +- packages/mui-material/src/utils/debounce.d.ts | 2 +- packages/mui-material/src/utils/debounce.js | 2 +- .../src/utils/deprecatedPropType.d.ts | 2 +- .../mui-material/src/utils/deprecatedPropType.js | 2 +- .../mui-material/src/utils/getScrollbarSize.ts | 2 +- .../mui-material/src/utils/isMuiElement.d.ts | 2 +- packages/mui-material/src/utils/isMuiElement.js | 2 +- packages/mui-material/src/utils/ownerDocument.ts | 2 +- packages/mui-material/src/utils/ownerWindow.ts | 2 +- .../src/utils/requirePropFactory.d.ts | 2 +- .../mui-material/src/utils/requirePropFactory.js | 2 +- packages/mui-material/src/utils/setRef.ts | 2 +- .../src/utils/shouldSpreadAdditionalProps.js | 2 +- .../mui-material/src/utils/unsupportedProp.d.ts | 2 +- .../mui-material/src/utils/unsupportedProp.js | 2 +- .../mui-material/src/utils/useControlled.d.ts | 2 +- packages/mui-material/src/utils/useControlled.js | 2 +- .../src/utils/useEnhancedEffect.d.ts | 2 +- .../mui-material/src/utils/useEnhancedEffect.js | 2 +- .../mui-material/src/utils/useEventCallback.d.ts | 2 +- .../mui-material/src/utils/useEventCallback.js | 2 +- packages/mui-material/src/utils/useForkRef.d.ts | 2 +- packages/mui-material/src/utils/useForkRef.js | 2 +- packages/mui-material/src/utils/useId.d.ts | 2 +- packages/mui-material/src/utils/useId.js | 2 +- .../src/utils/useIsFocusVisible.d.ts | 2 +- .../mui-material/src/utils/useIsFocusVisible.js | 2 +- packages/mui-material/src/utils/useSlot.ts | 2 +- packages/mui-system/src/Box/Box.js | 2 +- packages/mui-system/src/Box/Box.test.js | 2 +- packages/mui-system/src/Box/boxClasses.ts | 2 +- .../mui-system/src/Container/containerClasses.ts | 4 ++-- .../mui-system/src/Container/createContainer.tsx | 6 +++--- packages/mui-system/src/Stack/Stack.test.js | 2 +- packages/mui-system/src/Stack/createStack.tsx | 6 +++--- packages/mui-system/src/Stack/stackClasses.ts | 4 ++-- .../src/ThemeProvider/ThemeProvider.js | 2 +- .../mui-system/src/Unstable_Grid/Grid.test.js | 2 +- .../mui-system/src/Unstable_Grid/createGrid.tsx | 6 +++--- .../mui-system/src/Unstable_Grid/gridClasses.ts | 4 ++-- packages/mui-system/src/breakpoints.js | 2 +- packages/mui-system/src/colorManipulator.js | 2 +- packages/mui-system/src/colorManipulator.spec.ts | 2 +- packages/mui-system/src/colorManipulator.test.js | 2 +- packages/mui-system/src/createStyled.js | 6 +++--- .../mui-system/src/createTheme/createTheme.js | 2 +- .../src/createTheme/createTheme.test.js | 2 +- .../src/cssVars/createCssVarsProvider.js | 2 +- .../mui-system/src/cssVars/prepareCssVars.ts | 2 +- packages/mui-system/src/index.spec.tsx | 2 +- packages/mui-system/src/merge.js | 2 +- packages/mui-system/src/propsToClassKey.js | 2 +- packages/mui-system/src/sizing.test.js | 2 +- packages/mui-system/src/style.js | 2 +- .../src/styleFunctionSx/extendSxProp.js | 2 +- .../src/styleFunctionSx/styleFunctionSx.js | 2 +- packages/mui-system/src/styled.test.js | 2 +- .../src/useThemeProps/getThemeProps.js | 2 +- .../src/useThemeProps/useThemeProps.spec.ts | 2 +- 201 files changed, 368 insertions(+), 362 deletions(-) diff --git a/packages/mui-material/src/Accordion/Accordion.js b/packages/mui-material/src/Accordion/Accordion.js index d7a67cd67021c3..3adf939dcd5cdd 100644 --- a/packages/mui-material/src/Accordion/Accordion.js +++ b/packages/mui-material/src/Accordion/Accordion.js @@ -3,8 +3,8 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Collapse from '../Collapse'; diff --git a/packages/mui-material/src/AccordionActions/AccordionActions.js b/packages/mui-material/src/AccordionActions/AccordionActions.js index 6c58b66aa181c7..c6bc67b81056e9 100644 --- a/packages/mui-material/src/AccordionActions/AccordionActions.js +++ b/packages/mui-material/src/AccordionActions/AccordionActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getAccordionActionsUtilityClass } from './accordionActionsClasses'; diff --git a/packages/mui-material/src/AccordionDetails/AccordionDetails.js b/packages/mui-material/src/AccordionDetails/AccordionDetails.js index eeef2548a9c38a..d39ee3bd0b5f72 100644 --- a/packages/mui-material/src/AccordionDetails/AccordionDetails.js +++ b/packages/mui-material/src/AccordionDetails/AccordionDetails.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getAccordionDetailsUtilityClass } from './accordionDetailsClasses'; diff --git a/packages/mui-material/src/AccordionSummary/AccordionSummary.js b/packages/mui-material/src/AccordionSummary/AccordionSummary.js index c01675a549101d..922f9615d5d6e4 100644 --- a/packages/mui-material/src/AccordionSummary/AccordionSummary.js +++ b/packages/mui-material/src/AccordionSummary/AccordionSummary.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Alert/Alert.js b/packages/mui-material/src/Alert/Alert.js index 4563f93d4c9254..db4a52e3fc21b6 100644 --- a/packages/mui-material/src/Alert/Alert.js +++ b/packages/mui-material/src/Alert/Alert.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { darken, lighten } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { darken, lighten } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/AlertTitle/AlertTitle.js b/packages/mui-material/src/AlertTitle/AlertTitle.js index ff5e7557a682e0..8889812510d73f 100644 --- a/packages/mui-material/src/AlertTitle/AlertTitle.js +++ b/packages/mui-material/src/AlertTitle/AlertTitle.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/AppBar/AppBar.js b/packages/mui-material/src/AppBar/AppBar.js index 13912aac5b623e..fec36c2e635a3d 100644 --- a/packages/mui-material/src/AppBar/AppBar.js +++ b/packages/mui-material/src/AppBar/AppBar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Autocomplete/Autocomplete.js b/packages/mui-material/src/Autocomplete/Autocomplete.js index 1eb06e42cdd10e..eecfa476f39d29 100644 --- a/packages/mui-material/src/Autocomplete/Autocomplete.js +++ b/packages/mui-material/src/Autocomplete/Autocomplete.js @@ -1,12 +1,12 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import chainPropTypes from "@mui/utils/chainPropTypes"; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; import { useAutocomplete, createFilterOptions } from '@mui/base'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import Popper from '../Popper'; import ListSubheader from '../ListSubheader'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/Avatar/Avatar.js b/packages/mui-material/src/Avatar/Avatar.js index f68aa676dd475c..60002012382a53 100644 --- a/packages/mui-material/src/Avatar/Avatar.js +++ b/packages/mui-material/src/Avatar/Avatar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Person from '../internal/svg-icons/Person'; diff --git a/packages/mui-material/src/AvatarGroup/AvatarGroup.js b/packages/mui-material/src/AvatarGroup/AvatarGroup.js index 89fb16de81cacf..84babf704c59e8 100644 --- a/packages/mui-material/src/AvatarGroup/AvatarGroup.js +++ b/packages/mui-material/src/AvatarGroup/AvatarGroup.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { isFragment } from 'react-is'; import clsx from 'clsx'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Avatar, { avatarClasses } from '../Avatar'; diff --git a/packages/mui-material/src/Backdrop/Backdrop.js b/packages/mui-material/src/Backdrop/Backdrop.js index 8cccb95db03db8..1221de8bc3db64 100644 --- a/packages/mui-material/src/Backdrop/Backdrop.js +++ b/packages/mui-material/src/Backdrop/Backdrop.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Fade from '../Fade'; diff --git a/packages/mui-material/src/Badge/Badge.js b/packages/mui-material/src/Badge/Badge.js index 8b10c5e5688839..f38326e038e5a9 100644 --- a/packages/mui-material/src/Badge/Badge.js +++ b/packages/mui-material/src/Badge/Badge.js @@ -2,10 +2,10 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import usePreviousProps from "@mui/utils/usePreviousProps"; -import composeClasses from "@mui/utils/composeClasses"; +import usePreviousProps from '@mui/utils/usePreviousProps'; +import composeClasses from '@mui/utils/composeClasses'; import { useBadge } from '@mui/base/useBadge'; -import { useSlotProps } from "@mui/base/utils"; +import { useSlotProps } from '@mui/base/utils'; import { styled, createUseThemeProps } from '../zero-styled'; import capitalize from '../utils/capitalize'; import badgeClasses, { getBadgeUtilityClass } from './badgeClasses'; diff --git a/packages/mui-material/src/BottomNavigation/BottomNavigation.js b/packages/mui-material/src/BottomNavigation/BottomNavigation.js index 5dbe976884ced0..86eb69a517aec6 100755 --- a/packages/mui-material/src/BottomNavigation/BottomNavigation.js +++ b/packages/mui-material/src/BottomNavigation/BottomNavigation.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getBottomNavigationUtilityClass } from './bottomNavigationClasses'; diff --git a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js index 5deca3029736b3..caedc7018e73b3 100644 --- a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js +++ b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js index edae25a6641acc..2b208d529df3a1 100644 --- a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js +++ b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { emphasize } from "@mui/system/colorManipulator"; +import { emphasize } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import MoreHorizIcon from '../internal/svg-icons/MoreHoriz'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js index a2833ea8e6be36..6d9ffc22b684d4 100644 --- a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js +++ b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js @@ -1,11 +1,11 @@ -'use client';; +'use client'; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import { useSlotProps } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from '@mui/utils/integerPropType'; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/Button/Button.js b/packages/mui-material/src/Button/Button.js index 077d381f6d7d19..014448bf49e051 100644 --- a/packages/mui-material/src/Button/Button.js +++ b/packages/mui-material/src/Button/Button.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import resolveProps from "@mui/utils/resolveProps"; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import resolveProps from '@mui/utils/resolveProps'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.js b/packages/mui-material/src/ButtonBase/ButtonBase.js index 9f3a63f69d4177..bad1a0f69f2891 100644 --- a/packages/mui-material/src/ButtonBase/ButtonBase.js +++ b/packages/mui-material/src/ButtonBase/ButtonBase.js @@ -1,10 +1,10 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import composeClasses from "@mui/utils/composeClasses"; +import refType from '@mui/utils/refType'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/ButtonBase/TouchRipple.js b/packages/mui-material/src/ButtonBase/TouchRipple.js index 3a89006691a234..584d3982405702 100644 --- a/packages/mui-material/src/ButtonBase/TouchRipple.js +++ b/packages/mui-material/src/ButtonBase/TouchRipple.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { TransitionGroup } from 'react-transition-group'; import clsx from 'clsx'; import { keyframes } from '@mui/system'; -import useTimeout from "@mui/utils/useTimeout"; +import useTimeout from '@mui/utils/useTimeout'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Ripple from './Ripple'; diff --git a/packages/mui-material/src/ButtonGroup/ButtonGroup.js b/packages/mui-material/src/ButtonGroup/ButtonGroup.js index 0d0ab4bbd0cb02..8dc5c7aa6e1855 100644 --- a/packages/mui-material/src/ButtonGroup/ButtonGroup.js +++ b/packages/mui-material/src/ButtonGroup/ButtonGroup.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; -import getValidReactChildren from "@mui/utils/getValidReactChildren"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; +import getValidReactChildren from '@mui/utils/getValidReactChildren'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Card/Card.js b/packages/mui-material/src/Card/Card.js index 8a14b7b898b23b..76fec05f8f4399 100644 --- a/packages/mui-material/src/Card/Card.js +++ b/packages/mui-material/src/Card/Card.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/CardActionArea/CardActionArea.js b/packages/mui-material/src/CardActionArea/CardActionArea.js index bb096ab281a238..55cf85f103b9f0 100644 --- a/packages/mui-material/src/CardActionArea/CardActionArea.js +++ b/packages/mui-material/src/CardActionArea/CardActionArea.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import cardActionAreaClasses, { getCardActionAreaUtilityClass } from './cardActionAreaClasses'; diff --git a/packages/mui-material/src/CardActions/CardActions.js b/packages/mui-material/src/CardActions/CardActions.js index 65e307d669f463..c20972400583d5 100644 --- a/packages/mui-material/src/CardActions/CardActions.js +++ b/packages/mui-material/src/CardActions/CardActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getCardActionsUtilityClass } from './cardActionsClasses'; diff --git a/packages/mui-material/src/CardContent/CardContent.js b/packages/mui-material/src/CardContent/CardContent.js index 785737d85f5b84..2021d480c12177 100644 --- a/packages/mui-material/src/CardContent/CardContent.js +++ b/packages/mui-material/src/CardContent/CardContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getCardContentUtilityClass } from './cardContentClasses'; diff --git a/packages/mui-material/src/CardHeader/CardHeader.js b/packages/mui-material/src/CardHeader/CardHeader.js index 800fd998d6852f..1ac7c5e80ad7fa 100644 --- a/packages/mui-material/src/CardHeader/CardHeader.js +++ b/packages/mui-material/src/CardHeader/CardHeader.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import Typography from '../Typography'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/CardMedia/CardMedia.js b/packages/mui-material/src/CardMedia/CardMedia.js index 59f01896b9d73d..6cf26c3cba1f38 100644 --- a/packages/mui-material/src/CardMedia/CardMedia.js +++ b/packages/mui-material/src/CardMedia/CardMedia.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getCardMediaUtilityClass } from './cardMediaClasses'; diff --git a/packages/mui-material/src/Checkbox/Checkbox.js b/packages/mui-material/src/Checkbox/Checkbox.js index 98fedeeb4d1363..2a320260668f68 100644 --- a/packages/mui-material/src/Checkbox/Checkbox.js +++ b/packages/mui-material/src/Checkbox/Checkbox.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import SwitchBase from '../internal/SwitchBase'; import CheckBoxOutlineBlankIcon from '../internal/svg-icons/CheckBoxOutlineBlank'; import CheckBoxIcon from '../internal/svg-icons/CheckBox'; diff --git a/packages/mui-material/src/Chip/Chip.js b/packages/mui-material/src/Chip/Chip.js index 13157023ca8fe4..a8ffaf70cf30d8 100644 --- a/packages/mui-material/src/Chip/Chip.js +++ b/packages/mui-material/src/Chip/Chip.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import CancelIcon from '../internal/svg-icons/Cancel'; import useForkRef from '../utils/useForkRef'; import unsupportedProp from '../utils/unsupportedProp'; diff --git a/packages/mui-material/src/CircularProgress/CircularProgress.js b/packages/mui-material/src/CircularProgress/CircularProgress.js index 2d4d96ac835a33..e50517d07ec2d8 100644 --- a/packages/mui-material/src/CircularProgress/CircularProgress.js +++ b/packages/mui-material/src/CircularProgress/CircularProgress.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import { keyframes, css } from '@mui/system'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Collapse/Collapse.js b/packages/mui-material/src/Collapse/Collapse.js index f59ab95fd69a4f..42e206e96137b8 100644 --- a/packages/mui-material/src/Collapse/Collapse.js +++ b/packages/mui-material/src/Collapse/Collapse.js @@ -1,11 +1,11 @@ -'use client';; +'use client'; import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import useTimeout from "@mui/utils/useTimeout"; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import composeClasses from "@mui/utils/composeClasses"; +import useTimeout from '@mui/utils/useTimeout'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { duration } from '../styles/createTransitions'; diff --git a/packages/mui-material/src/Dialog/Dialog.js b/packages/mui-material/src/Dialog/Dialog.js index 2eee65aeb1e958..420076e0bf8092 100644 --- a/packages/mui-material/src/Dialog/Dialog.js +++ b/packages/mui-material/src/Dialog/Dialog.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import useId from "@mui/utils/useId"; +import composeClasses from '@mui/utils/composeClasses'; +import useId from '@mui/utils/useId'; import capitalize from '../utils/capitalize'; import Modal from '../Modal'; import Fade from '../Fade'; diff --git a/packages/mui-material/src/DialogActions/DialogActions.js b/packages/mui-material/src/DialogActions/DialogActions.js index 6296cf91d19c0e..a66fb25bf2008b 100644 --- a/packages/mui-material/src/DialogActions/DialogActions.js +++ b/packages/mui-material/src/DialogActions/DialogActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDialogActionsUtilityClass } from './dialogActionsClasses'; diff --git a/packages/mui-material/src/DialogContent/DialogContent.js b/packages/mui-material/src/DialogContent/DialogContent.js index 2a435325d9fb61..ec0367c918df4c 100644 --- a/packages/mui-material/src/DialogContent/DialogContent.js +++ b/packages/mui-material/src/DialogContent/DialogContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDialogContentUtilityClass } from './dialogContentClasses'; diff --git a/packages/mui-material/src/DialogContentText/DialogContentText.js b/packages/mui-material/src/DialogContentText/DialogContentText.js index 03f6bac702d4e8..c6c8cabc6056ed 100644 --- a/packages/mui-material/src/DialogContentText/DialogContentText.js +++ b/packages/mui-material/src/DialogContentText/DialogContentText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/DialogTitle/DialogTitle.js b/packages/mui-material/src/DialogTitle/DialogTitle.js index 4c0022cb68a766..aa160274950623 100644 --- a/packages/mui-material/src/DialogTitle/DialogTitle.js +++ b/packages/mui-material/src/DialogTitle/DialogTitle.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import Typography from '../Typography'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Divider/Divider.js b/packages/mui-material/src/Divider/Divider.js index 3b419a820093ec..80aefb09bbe3c6 100644 --- a/packages/mui-material/src/Divider/Divider.js +++ b/packages/mui-material/src/Divider/Divider.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDividerUtilityClass } from './dividerClasses'; diff --git a/packages/mui-material/src/Drawer/Drawer.js b/packages/mui-material/src/Drawer/Drawer.js index a417d3eda42155..eef70ec528fcd4 100644 --- a/packages/mui-material/src/Drawer/Drawer.js +++ b/packages/mui-material/src/Drawer/Drawer.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import Modal from '../Modal'; import Slide from '../Slide'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/Fab/Fab.js b/packages/mui-material/src/Fab/Fab.js index fcbe210625fe0e..10f3ab80910ed0 100644 --- a/packages/mui-material/src/Fab/Fab.js +++ b/packages/mui-material/src/Fab/Fab.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Fade/Fade.js b/packages/mui-material/src/Fade/Fade.js index e05684d826a39a..0258a3adae8723 100644 --- a/packages/mui-material/src/Fade/Fade.js +++ b/packages/mui-material/src/Fade/Fade.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import useTheme from '../styles/useTheme'; import { reflow, getTransitionProps } from '../transitions/utils'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/FilledInput/FilledInput.js b/packages/mui-material/src/FilledInput/FilledInput.js index a2584f75a31dba..9e2de297107310 100644 --- a/packages/mui-material/src/FilledInput/FilledInput.js +++ b/packages/mui-material/src/FilledInput/FilledInput.js @@ -1,9 +1,9 @@ -'use client';; +'use client'; import * as React from 'react'; -import deepmerge from "@mui/utils/deepmerge"; -import refType from "@mui/utils/refType"; +import deepmerge from '@mui/utils/deepmerge'; +import refType from '@mui/utils/refType'; import PropTypes from 'prop-types'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import InputBase from '../InputBase'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/FormControl/FormControl.js b/packages/mui-material/src/FormControl/FormControl.js index 50f0765e690c10..ce8353db232aa5 100644 --- a/packages/mui-material/src/FormControl/FormControl.js +++ b/packages/mui-material/src/FormControl/FormControl.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { isFilled, isAdornedStart } from '../InputBase/utils'; diff --git a/packages/mui-material/src/FormControlLabel/FormControlLabel.js b/packages/mui-material/src/FormControlLabel/FormControlLabel.js index 9a2bb44e01e913..d6d215eb661ca8 100644 --- a/packages/mui-material/src/FormControlLabel/FormControlLabel.js +++ b/packages/mui-material/src/FormControlLabel/FormControlLabel.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import composeClasses from "@mui/utils/composeClasses"; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import { useFormControl } from '../FormControl'; import Stack from '../Stack'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/FormGroup/FormGroup.js b/packages/mui-material/src/FormGroup/FormGroup.js index 6e8ba04a5e9e8f..7a908ea680476c 100644 --- a/packages/mui-material/src/FormGroup/FormGroup.js +++ b/packages/mui-material/src/FormGroup/FormGroup.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getFormGroupUtilityClass } from './formGroupClasses'; diff --git a/packages/mui-material/src/FormHelperText/FormHelperText.js b/packages/mui-material/src/FormHelperText/FormHelperText.js index 684d871435bbfb..f8acae4f37d515 100644 --- a/packages/mui-material/src/FormHelperText/FormHelperText.js +++ b/packages/mui-material/src/FormHelperText/FormHelperText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/FormLabel/FormLabel.js b/packages/mui-material/src/FormLabel/FormLabel.js index 7118f1ea4f3d98..ba9826f0d7f52a 100644 --- a/packages/mui-material/src/FormLabel/FormLabel.js +++ b/packages/mui-material/src/FormLabel/FormLabel.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Grid/Grid.js b/packages/mui-material/src/Grid/Grid.js index 53df75e1b5f97b..62900dc203ac44 100644 --- a/packages/mui-material/src/Grid/Grid.js +++ b/packages/mui-material/src/Grid/Grid.js @@ -1,4 +1,4 @@ -'use client';; +'use client'; // A grid component using the following libs as inspiration. // // For the implementation: @@ -16,8 +16,8 @@ import { handleBreakpoints, unstable_resolveBreakpointValues as resolveBreakpointValues, } from '@mui/system'; -import { extendSxProp } from "@mui/system/styleFunctionSx"; -import composeClasses from "@mui/utils/composeClasses"; +import { extendSxProp } from '@mui/system/styleFunctionSx'; +import composeClasses from '@mui/utils/composeClasses'; import requirePropFactory from '../utils/requirePropFactory'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Grow/Grow.js b/packages/mui-material/src/Grow/Grow.js index 58666bd5488fb8..77866f1f107765 100644 --- a/packages/mui-material/src/Grow/Grow.js +++ b/packages/mui-material/src/Grow/Grow.js @@ -1,8 +1,8 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import useTimeout from "@mui/utils/useTimeout"; -import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; +import useTimeout from '@mui/utils/useTimeout'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import { Transition } from 'react-transition-group'; import useTheme from '../styles/useTheme'; import { getTransitionProps, reflow } from '../transitions/utils'; diff --git a/packages/mui-material/src/Hidden/HiddenCss.js b/packages/mui-material/src/Hidden/HiddenCss.js index ef71c78695461e..c88531677ce928 100644 --- a/packages/mui-material/src/Hidden/HiddenCss.js +++ b/packages/mui-material/src/Hidden/HiddenCss.js @@ -2,7 +2,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Hidden/HiddenJs.js b/packages/mui-material/src/Hidden/HiddenJs.js index 922fd64c250484..b591452cef6299 100644 --- a/packages/mui-material/src/Hidden/HiddenJs.js +++ b/packages/mui-material/src/Hidden/HiddenJs.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import exactProp from "@mui/utils/exactProp"; +import exactProp from '@mui/utils/exactProp'; import withWidth, { isWidthDown, isWidthUp } from './withWidth'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Hidden/withWidth.js b/packages/mui-material/src/Hidden/withWidth.js index e13d4837cdd174..986fa0a8fd8e30 100644 --- a/packages/mui-material/src/Hidden/withWidth.js +++ b/packages/mui-material/src/Hidden/withWidth.js @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import getDisplayName from "@mui/utils/getDisplayName"; -import { getThemeProps } from "@mui/system/useThemeProps"; +import getDisplayName from '@mui/utils/getDisplayName'; +import { getThemeProps } from '@mui/system/useThemeProps'; import useTheme from '../styles/useTheme'; import useEnhancedEffect from '../utils/useEnhancedEffect'; import useMediaQuery from '../useMediaQuery'; diff --git a/packages/mui-material/src/Icon/Icon.js b/packages/mui-material/src/Icon/Icon.js index 1c5b13612bceb4..c98665f504ca04 100644 --- a/packages/mui-material/src/Icon/Icon.js +++ b/packages/mui-material/src/Icon/Icon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/IconButton/IconButton.js b/packages/mui-material/src/IconButton/IconButton.js index 61ac0a084eed32..0c6a5351555cc2 100644 --- a/packages/mui-material/src/IconButton/IconButton.js +++ b/packages/mui-material/src/IconButton/IconButton.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/IconButton/IconButton.test.js b/packages/mui-material/src/IconButton/IconButton.test.js index 798a3f7df0c46c..f282aed1da1b08 100644 --- a/packages/mui-material/src/IconButton/IconButton.test.js +++ b/packages/mui-material/src/IconButton/IconButton.test.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import PropTypes from 'prop-types'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; -import capitalize from "@mui/utils/capitalize"; +import capitalize from '@mui/utils/capitalize'; import { ThemeProvider, createTheme } from '@mui/material/styles'; import IconButton, { iconButtonClasses as classes } from '@mui/material/IconButton'; import Icon from '@mui/material/Icon'; diff --git a/packages/mui-material/src/ImageList/ImageList.js b/packages/mui-material/src/ImageList/ImageList.js index c016e2d77bdf6d..5a521234e12ef5 100644 --- a/packages/mui-material/src/ImageList/ImageList.js +++ b/packages/mui-material/src/ImageList/ImageList.js @@ -1,6 +1,6 @@ 'use client'; -import composeClasses from "@mui/utils/composeClasses"; -import integerPropType from "@mui/utils/integerPropType"; +import composeClasses from '@mui/utils/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/ImageListItem/ImageListItem.js b/packages/mui-material/src/ImageListItem/ImageListItem.js index be75dd30c6d3e2..4efc8004bd0537 100644 --- a/packages/mui-material/src/ImageListItem/ImageListItem.js +++ b/packages/mui-material/src/ImageListItem/ImageListItem.js @@ -1,6 +1,6 @@ 'use client'; -import composeClasses from "@mui/utils/composeClasses"; -import integerPropType from "@mui/utils/integerPropType"; +import composeClasses from '@mui/utils/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js index 8469c725a079be..beb348657dbc6b 100644 --- a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js +++ b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js @@ -1,5 +1,5 @@ 'use client'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/Input/Input.js b/packages/mui-material/src/Input/Input.js index cd8efd529eb506..23f0d477ed74f3 100644 --- a/packages/mui-material/src/Input/Input.js +++ b/packages/mui-material/src/Input/Input.js @@ -1,9 +1,9 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import composeClasses from "@mui/utils/composeClasses"; -import deepmerge from "@mui/utils/deepmerge"; -import refType from "@mui/utils/refType"; +import composeClasses from '@mui/utils/composeClasses'; +import deepmerge from '@mui/utils/deepmerge'; +import refType from '@mui/utils/refType'; import InputBase from '../InputBase'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/InputAdornment/InputAdornment.js b/packages/mui-material/src/InputAdornment/InputAdornment.js index a81eda5d8cdc69..286d7f3463c249 100644 --- a/packages/mui-material/src/InputAdornment/InputAdornment.js +++ b/packages/mui-material/src/InputAdornment/InputAdornment.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import Typography from '../Typography'; import FormControlContext from '../FormControl/FormControlContext'; diff --git a/packages/mui-material/src/InputBase/InputBase.js b/packages/mui-material/src/InputBase/InputBase.js index 7a83117b84702f..cbb51b1ed0f844 100644 --- a/packages/mui-material/src/InputBase/InputBase.js +++ b/packages/mui-material/src/InputBase/InputBase.js @@ -1,13 +1,13 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import refType from "@mui/utils/refType"; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import refType from '@mui/utils/refType'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; import { TextareaAutosize } from '@mui/base'; -import { isHostComponent } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; +import { isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import formControlState from '../FormControl/formControlState'; import FormControlContext from '../FormControl/FormControlContext'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/InputLabel/InputLabel.js b/packages/mui-material/src/InputLabel/InputLabel.js index 56497d62f12e2b..dd8003ee8ebb7c 100644 --- a/packages/mui-material/src/InputLabel/InputLabel.js +++ b/packages/mui-material/src/InputLabel/InputLabel.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import clsx from 'clsx'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/LinearProgress/LinearProgress.js b/packages/mui-material/src/LinearProgress/LinearProgress.js index 45fac1b4436f7d..4ca989cf10592e 100644 --- a/packages/mui-material/src/LinearProgress/LinearProgress.js +++ b/packages/mui-material/src/LinearProgress/LinearProgress.js @@ -1,10 +1,10 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import { keyframes, css } from '@mui/system'; -import { darken, lighten } from "@mui/system/colorManipulator"; +import { darken, lighten } from '@mui/system/colorManipulator'; import capitalize from '../utils/capitalize'; import useTheme from '../styles/useTheme'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/Link/Link.js b/packages/mui-material/src/Link/Link.js index 67df39fb9fe1fc..f5e72605b7312d 100644 --- a/packages/mui-material/src/Link/Link.js +++ b/packages/mui-material/src/Link/Link.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import composeClasses from "@mui/utils/composeClasses"; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Link/getTextDecoration.ts b/packages/mui-material/src/Link/getTextDecoration.ts index d3518e4939f00d..7cdb42cd9d501f 100644 --- a/packages/mui-material/src/Link/getTextDecoration.ts +++ b/packages/mui-material/src/Link/getTextDecoration.ts @@ -1,5 +1,5 @@ import { getPath } from '@mui/system'; -import { alpha } from "@mui/system/colorManipulator"; +import { alpha } from '@mui/system/colorManipulator'; import type { Theme } from '../styles'; export const colorTransformations = { diff --git a/packages/mui-material/src/List/List.js b/packages/mui-material/src/List/List.js index a26e1653cf4340..aecb83a331e8ae 100644 --- a/packages/mui-material/src/List/List.js +++ b/packages/mui-material/src/List/List.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from './ListContext'; diff --git a/packages/mui-material/src/ListItem/ListItem.js b/packages/mui-material/src/ListItem/ListItem.js index 7634fb7d25ed14..d60ee0e4892a8c 100644 --- a/packages/mui-material/src/ListItem/ListItem.js +++ b/packages/mui-material/src/ListItem/ListItem.js @@ -1,12 +1,12 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { isHostComponent } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import { alpha } from "@mui/system/colorManipulator"; +import { isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js index 71b2bf668d5769..fa580dbcb2509f 100644 --- a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js +++ b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import ListContext from '../List/ListContext'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/ListItemButton/ListItemButton.js b/packages/mui-material/src/ListItemButton/ListItemButton.js index 5670925cc6032a..58d025dba07928 100644 --- a/packages/mui-material/src/ListItemButton/ListItemButton.js +++ b/packages/mui-material/src/ListItemButton/ListItemButton.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ListItemIcon/ListItemIcon.js b/packages/mui-material/src/ListItemIcon/ListItemIcon.js index 83f56af8cd3ccb..7a143e3d89d8c0 100644 --- a/packages/mui-material/src/ListItemIcon/ListItemIcon.js +++ b/packages/mui-material/src/ListItemIcon/ListItemIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getListItemIconUtilityClass } from './listItemIconClasses'; diff --git a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js index c4118306534eb2..3b101be0640fe4 100644 --- a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js +++ b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from '../List/ListContext'; diff --git a/packages/mui-material/src/ListItemText/ListItemText.js b/packages/mui-material/src/ListItemText/ListItemText.js index bc6fc5304b50c7..b5460439d37b9a 100644 --- a/packages/mui-material/src/ListItemText/ListItemText.js +++ b/packages/mui-material/src/ListItemText/ListItemText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import Typography from '../Typography'; import ListContext from '../List/ListContext'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/ListSubheader/ListSubheader.js b/packages/mui-material/src/ListSubheader/ListSubheader.js index 7c4813effee426..668b3e9dd32dcf 100644 --- a/packages/mui-material/src/ListSubheader/ListSubheader.js +++ b/packages/mui-material/src/ListSubheader/ListSubheader.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Menu/Menu.js b/packages/mui-material/src/Menu/Menu.js index fbd15e153a9bed..adced73ab01bb1 100644 --- a/packages/mui-material/src/Menu/Menu.js +++ b/packages/mui-material/src/Menu/Menu.js @@ -3,9 +3,9 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import { useSlotProps } from '@mui/base/utils'; -import HTMLElementType from "@mui/utils/HTMLElementType"; +import HTMLElementType from '@mui/utils/HTMLElementType'; import MenuList from '../MenuList'; import Popover, { PopoverPaper } from '../Popover'; import styled, { rootShouldForwardProp } from '../styles/styled'; diff --git a/packages/mui-material/src/MenuItem/MenuItem.js b/packages/mui-material/src/MenuItem/MenuItem.js index fea0c0e90cf725..fde0d2867c1e1f 100644 --- a/packages/mui-material/src/MenuItem/MenuItem.js +++ b/packages/mui-material/src/MenuItem/MenuItem.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from '../List/ListContext'; diff --git a/packages/mui-material/src/MobileStepper/MobileStepper.js b/packages/mui-material/src/MobileStepper/MobileStepper.js index beae8bd212a2e9..fbf543479f5e3f 100644 --- a/packages/mui-material/src/MobileStepper/MobileStepper.js +++ b/packages/mui-material/src/MobileStepper/MobileStepper.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import Paper from '../Paper'; import capitalize from '../utils/capitalize'; import LinearProgress from '../LinearProgress'; diff --git a/packages/mui-material/src/Modal/Modal.js b/packages/mui-material/src/Modal/Modal.js index 673cbe6db6a836..69b85c5bf6d7b4 100644 --- a/packages/mui-material/src/Modal/Modal.js +++ b/packages/mui-material/src/Modal/Modal.js @@ -1,12 +1,12 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import HTMLElementType from "@mui/utils/HTMLElementType"; -import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; -import { useSlotProps } from "@mui/base/utils"; +import HTMLElementType from '@mui/utils/HTMLElementType'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; +import { useSlotProps } from '@mui/base/utils'; import { unstable_useModal as useModal } from '@mui/base/unstable_useModal'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import FocusTrap from '../Unstable_TrapFocus'; import Portal from '../Portal'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/NativeSelect/NativeSelect.js b/packages/mui-material/src/NativeSelect/NativeSelect.js index bce61a380e7b7e..ebfa1ea9ca753d 100644 --- a/packages/mui-material/src/NativeSelect/NativeSelect.js +++ b/packages/mui-material/src/NativeSelect/NativeSelect.js @@ -2,7 +2,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import NativeSelectInput from './NativeSelectInput'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/NativeSelect/NativeSelectInput.js b/packages/mui-material/src/NativeSelect/NativeSelectInput.js index ad8ef84b21907b..c912d69ddc9a7c 100644 --- a/packages/mui-material/src/NativeSelect/NativeSelectInput.js +++ b/packages/mui-material/src/NativeSelect/NativeSelectInput.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import composeClasses from "@mui/utils/composeClasses"; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import nativeSelectClasses, { getNativeSelectUtilityClasses } from './nativeSelectClasses'; import styled, { rootShouldForwardProp } from '../styles/styled'; diff --git a/packages/mui-material/src/OutlinedInput/OutlinedInput.js b/packages/mui-material/src/OutlinedInput/OutlinedInput.js index 9ee8f3b001a47a..6d75411fa65732 100644 --- a/packages/mui-material/src/OutlinedInput/OutlinedInput.js +++ b/packages/mui-material/src/OutlinedInput/OutlinedInput.js @@ -1,8 +1,8 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import refType from "@mui/utils/refType"; -import composeClasses from "@mui/utils/composeClasses"; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import NotchedOutline from './NotchedOutline'; import useFormControl from '../FormControl/useFormControl'; import formControlState from '../FormControl/formControlState'; diff --git a/packages/mui-material/src/Pagination/Pagination.js b/packages/mui-material/src/Pagination/Pagination.js index 1a32fd5476347f..659f4588fd1989 100644 --- a/packages/mui-material/src/Pagination/Pagination.js +++ b/packages/mui-material/src/Pagination/Pagination.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import integerPropType from "@mui/utils/integerPropType"; +import composeClasses from '@mui/utils/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; import useThemeProps from '../styles/useThemeProps'; import { getPaginationUtilityClass } from './paginationClasses'; import usePagination from '../usePagination'; diff --git a/packages/mui-material/src/PaginationItem/PaginationItem.js b/packages/mui-material/src/PaginationItem/PaginationItem.js index 904439a5ee0039..715286a41a4458 100644 --- a/packages/mui-material/src/PaginationItem/PaginationItem.js +++ b/packages/mui-material/src/PaginationItem/PaginationItem.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import useThemeProps from '../styles/useThemeProps'; import paginationItemClasses, { getPaginationItemUtilityClass } from './paginationItemClasses'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Paper/Paper.js b/packages/mui-material/src/Paper/Paper.js index df3b331aeb97ba..7f0d449c86c278 100644 --- a/packages/mui-material/src/Paper/Paper.js +++ b/packages/mui-material/src/Paper/Paper.js @@ -1,11 +1,11 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import getOverlayAlpha from '../styles/getOverlayAlpha'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Popover/Popover.js b/packages/mui-material/src/Popover/Popover.js index 9d7d500c5b4052..8df1fbc6b7cd6d 100644 --- a/packages/mui-material/src/Popover/Popover.js +++ b/packages/mui-material/src/Popover/Popover.js @@ -1,14 +1,14 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { useSlotProps, isHostComponent } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; -import HTMLElementType from "@mui/utils/HTMLElementType"; -import refType from "@mui/utils/refType"; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import integerPropType from "@mui/utils/integerPropType"; -import chainPropTypes from "@mui/utils/chainPropTypes"; +import { useSlotProps, isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import HTMLElementType from '@mui/utils/HTMLElementType'; +import refType from '@mui/utils/refType'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import debounce from '../utils/debounce'; diff --git a/packages/mui-material/src/Popper/Popper.test.js b/packages/mui-material/src/Popper/Popper.test.js index 38ca13bb6a72eb..b8418f6859e8f2 100644 --- a/packages/mui-material/src/Popper/Popper.test.js +++ b/packages/mui-material/src/Popper/Popper.test.js @@ -8,7 +8,7 @@ import { screen, } from '@mui-internal/test-utils'; import { ThemeProvider } from '@mui/system'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; import Grow from '@mui/material/Grow'; import Popper from '@mui/material/Popper'; diff --git a/packages/mui-material/src/Popper/Popper.tsx b/packages/mui-material/src/Popper/Popper.tsx index 259b13da2f2c07..6609e81a78b2a1 100644 --- a/packages/mui-material/src/Popper/Popper.tsx +++ b/packages/mui-material/src/Popper/Popper.tsx @@ -1,9 +1,9 @@ -'use client';; +'use client'; import { Popper as BasePopper, PopperProps as BasePopperProps } from '@mui/base/Popper'; import { Direction, SxProps } from '@mui/system'; -import useTheme from "@mui/system/useThemeWithoutDefault"; -import refType from "@mui/utils/refType"; -import HTMLElementType from "@mui/utils/HTMLElementType"; +import useTheme from '@mui/system/useThemeWithoutDefault'; +import refType from '@mui/utils/refType'; +import HTMLElementType from '@mui/utils/HTMLElementType'; import PropTypes from 'prop-types'; import * as React from 'react'; import { styled, Theme, useThemeProps } from '../styles'; diff --git a/packages/mui-material/src/Radio/Radio.js b/packages/mui-material/src/Radio/Radio.js index ba49c754390be5..71025ca11975d4 100644 --- a/packages/mui-material/src/Radio/Radio.js +++ b/packages/mui-material/src/Radio/Radio.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import SwitchBase from '../internal/SwitchBase'; import useThemeProps from '../styles/useThemeProps'; import RadioButtonIcon from './RadioButtonIcon'; diff --git a/packages/mui-material/src/Rating/Rating.js b/packages/mui-material/src/Rating/Rating.js index 486a5671a85b54..dcf47bd122362d 100644 --- a/packages/mui-material/src/Rating/Rating.js +++ b/packages/mui-material/src/Rating/Rating.js @@ -1,11 +1,11 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import clamp from "@mui/utils/clamp"; -import visuallyHidden from "@mui/utils/visuallyHidden"; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import composeClasses from "@mui/utils/composeClasses"; +import clamp from '@mui/utils/clamp'; +import visuallyHidden from '@mui/utils/visuallyHidden'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import useTheme from '../styles/useTheme'; import { capitalize, diff --git a/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js b/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js index 4669855b21aa99..e061f697005ec3 100644 --- a/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js +++ b/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { html, body } from '../CssBaseline/CssBaseline'; diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js index 97b8abdf337b37..69bc3ea931cddb 100644 --- a/packages/mui-material/src/Select/Select.js +++ b/packages/mui-material/src/Select/Select.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import SelectInput from './SelectInput'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js index dcff5f54f012e1..159346bf0bc050 100644 --- a/packages/mui-material/src/Select/SelectInput.js +++ b/packages/mui-material/src/Select/SelectInput.js @@ -1,12 +1,12 @@ -'use client';; +'use client'; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import composeClasses from "@mui/utils/composeClasses"; -import useId from "@mui/utils/useId"; -import refType from "@mui/utils/refType"; +import composeClasses from '@mui/utils/composeClasses'; +import useId from '@mui/utils/useId'; +import refType from '@mui/utils/refType'; import ownerDocument from '../utils/ownerDocument'; import capitalize from '../utils/capitalize'; import Menu from '../Menu/Menu'; diff --git a/packages/mui-material/src/Skeleton/Skeleton.js b/packages/mui-material/src/Skeleton/Skeleton.js index 7c25f1a9c617ab..94d72f36b8da95 100644 --- a/packages/mui-material/src/Skeleton/Skeleton.js +++ b/packages/mui-material/src/Skeleton/Skeleton.js @@ -3,7 +3,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import { keyframes, css } from '@mui/system'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import { alpha, unstable_getUnit as getUnit, unstable_toUnitless as toUnitless } from '../styles'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Slide/Slide.js b/packages/mui-material/src/Slide/Slide.js index 07419d095146ae..f2d30a7a97d588 100644 --- a/packages/mui-material/src/Slide/Slide.js +++ b/packages/mui-material/src/Slide/Slide.js @@ -1,10 +1,10 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import HTMLElementType from "@mui/utils/HTMLElementType"; -import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import HTMLElementType from '@mui/utils/HTMLElementType'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import debounce from '../utils/debounce'; import useForkRef from '../utils/useForkRef'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Slider/Slider.js b/packages/mui-material/src/Slider/Slider.js index f75d2f8e9d89b4..5b4e386af1f6d8 100644 --- a/packages/mui-material/src/Slider/Slider.js +++ b/packages/mui-material/src/Slider/Slider.js @@ -1,12 +1,12 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import { isHostComponent, useSlotProps } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import { isHostComponent, useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import { useSlider, valueToPercent } from '@mui/base/useSlider'; -import { alpha, lighten, darken } from "@mui/system/colorManipulator"; +import { alpha, lighten, darken } from '@mui/system/colorManipulator'; import useThemeProps from '../styles/useThemeProps'; import styled, { slotShouldForwardProp } from '../styles/styled'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Snackbar/Snackbar.js b/packages/mui-material/src/Snackbar/Snackbar.js index 4745e3505aa256..36f68c826193f2 100644 --- a/packages/mui-material/src/Snackbar/Snackbar.js +++ b/packages/mui-material/src/Snackbar/Snackbar.js @@ -1,8 +1,8 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { useSlotProps } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import { ClickAwayListener } from '@mui/base/ClickAwayListener'; import { useSnackbar } from '@mui/base/useSnackbar'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/SnackbarContent/SnackbarContent.js b/packages/mui-material/src/SnackbarContent/SnackbarContent.js index 12724ebe0415eb..cdee122e3185c0 100644 --- a/packages/mui-material/src/SnackbarContent/SnackbarContent.js +++ b/packages/mui-material/src/SnackbarContent/SnackbarContent.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { emphasize } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { emphasize } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/SpeedDial/SpeedDial.js b/packages/mui-material/src/SpeedDial/SpeedDial.js index 172f72c4e522cd..ed88ceaf072c9b 100644 --- a/packages/mui-material/src/SpeedDial/SpeedDial.js +++ b/packages/mui-material/src/SpeedDial/SpeedDial.js @@ -1,11 +1,11 @@ -'use client';; +'use client'; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import useTimeout from "@mui/utils/useTimeout"; -import clamp from "@mui/utils/clamp"; +import composeClasses from '@mui/utils/composeClasses'; +import useTimeout from '@mui/utils/useTimeout'; +import clamp from '@mui/utils/clamp'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js index a0b29bf34cca89..b1a44948531dc8 100644 --- a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js +++ b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { emphasize } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { emphasize } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Fab from '../Fab'; diff --git a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js index 98a402c7abf80b..5286882d359bcd 100644 --- a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js +++ b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import AddIcon from '../internal/svg-icons/Add'; diff --git a/packages/mui-material/src/Step/Step.js b/packages/mui-material/src/Step/Step.js index adc3f59db7c4ef..40010102fb5d05 100644 --- a/packages/mui-material/src/Step/Step.js +++ b/packages/mui-material/src/Step/Step.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import StepperContext from '../Stepper/StepperContext'; import StepContext from './StepContext'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/StepButton/StepButton.js b/packages/mui-material/src/StepButton/StepButton.js index 0bf9d598006203..068741b194eddc 100644 --- a/packages/mui-material/src/StepButton/StepButton.js +++ b/packages/mui-material/src/StepButton/StepButton.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/StepConnector/StepConnector.js b/packages/mui-material/src/StepConnector/StepConnector.js index 66ce41726e6fd2..30d416e5d9baae 100644 --- a/packages/mui-material/src/StepConnector/StepConnector.js +++ b/packages/mui-material/src/StepConnector/StepConnector.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/StepContent/StepContent.js b/packages/mui-material/src/StepContent/StepContent.js index 824f36c9da123d..3be729ca1ea5a5 100644 --- a/packages/mui-material/src/StepContent/StepContent.js +++ b/packages/mui-material/src/StepContent/StepContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Collapse from '../Collapse'; diff --git a/packages/mui-material/src/StepIcon/StepIcon.js b/packages/mui-material/src/StepIcon/StepIcon.js index 03147c58bc2d7d..f40a13455e9fc5 100644 --- a/packages/mui-material/src/StepIcon/StepIcon.js +++ b/packages/mui-material/src/StepIcon/StepIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import CheckCircle from '../internal/svg-icons/CheckCircle'; diff --git a/packages/mui-material/src/StepLabel/StepLabel.js b/packages/mui-material/src/StepLabel/StepLabel.js index e6beaf30e7ea68..80c3f7e5e36a93 100644 --- a/packages/mui-material/src/StepLabel/StepLabel.js +++ b/packages/mui-material/src/StepLabel/StepLabel.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import StepIcon from '../StepIcon'; diff --git a/packages/mui-material/src/Stepper/Stepper.js b/packages/mui-material/src/Stepper/Stepper.js index b6742ab312bbde..0edd4ab6516329 100644 --- a/packages/mui-material/src/Stepper/Stepper.js +++ b/packages/mui-material/src/Stepper/Stepper.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getStepperUtilityClass } from './stepperClasses'; diff --git a/packages/mui-material/src/SvgIcon/SvgIcon.js b/packages/mui-material/src/SvgIcon/SvgIcon.js index c1468bd4b70b2a..3548612a6b256d 100644 --- a/packages/mui-material/src/SvgIcon/SvgIcon.js +++ b/packages/mui-material/src/SvgIcon/SvgIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js index c5ff8548dfb075..71e6f51c2932ae 100644 --- a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js +++ b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js @@ -2,8 +2,8 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; -import elementTypeAcceptingRef from "@mui/utils/elementTypeAcceptingRef"; -import useThemeProps from "@mui/system/useThemeProps"; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import useThemeProps from '@mui/system/useThemeProps'; import { NoSsr } from '@mui/base'; import Drawer, { getAnchor, isHorizontal } from '../Drawer/Drawer'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/Switch/Switch.js b/packages/mui-material/src/Switch/Switch.js index 64d62633ee0df6..9506a24aa7eb0b 100644 --- a/packages/mui-material/src/Switch/Switch.js +++ b/packages/mui-material/src/Switch/Switch.js @@ -3,9 +3,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha, darken, lighten } from "@mui/system/colorManipulator"; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha, darken, lighten } from '@mui/system/colorManipulator'; import capitalize from '../utils/capitalize'; import SwitchBase from '../internal/SwitchBase'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Tab/Tab.js b/packages/mui-material/src/Tab/Tab.js index f4a7427e308710..43d53422a76454 100644 --- a/packages/mui-material/src/Tab/Tab.js +++ b/packages/mui-material/src/Tab/Tab.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/TabScrollButton/TabScrollButton.js b/packages/mui-material/src/TabScrollButton/TabScrollButton.js index 2f32272b9541b7..c2fdad8acb5f9e 100644 --- a/packages/mui-material/src/TabScrollButton/TabScrollButton.js +++ b/packages/mui-material/src/TabScrollButton/TabScrollButton.js @@ -1,10 +1,10 @@ -'use client';; +'use client'; /* eslint-disable jsx-a11y/aria-role */ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { useSlotProps } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import KeyboardArrowLeft from '../internal/svg-icons/KeyboardArrowLeft'; import KeyboardArrowRight from '../internal/svg-icons/KeyboardArrowRight'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Table/Table.js b/packages/mui-material/src/Table/Table.js index a98738f3af0362..33201ca6ae94ab 100644 --- a/packages/mui-material/src/Table/Table.js +++ b/packages/mui-material/src/Table/Table.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import TableContext from './TableContext'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableBody/TableBody.js b/packages/mui-material/src/TableBody/TableBody.js index 188a21ea1b9db8..0fc5115e327055 100644 --- a/packages/mui-material/src/TableBody/TableBody.js +++ b/packages/mui-material/src/TableBody/TableBody.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableCell/TableCell.js b/packages/mui-material/src/TableCell/TableCell.js index 72ab9e38fa021f..1b790f9e04c4e1 100644 --- a/packages/mui-material/src/TableCell/TableCell.js +++ b/packages/mui-material/src/TableCell/TableCell.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { darken, alpha, lighten } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { darken, alpha, lighten } from '@mui/system/colorManipulator'; import capitalize from '../utils/capitalize'; import TableContext from '../Table/TableContext'; import Tablelvl2Context from '../Table/Tablelvl2Context'; diff --git a/packages/mui-material/src/TableContainer/TableContainer.js b/packages/mui-material/src/TableContainer/TableContainer.js index 248d6cc896fe62..206d3b4295b7af 100644 --- a/packages/mui-material/src/TableContainer/TableContainer.js +++ b/packages/mui-material/src/TableContainer/TableContainer.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getTableContainerUtilityClass } from './tableContainerClasses'; diff --git a/packages/mui-material/src/TableFooter/TableFooter.js b/packages/mui-material/src/TableFooter/TableFooter.js index 7d376f0a9a9844..ca142c563b62d6 100644 --- a/packages/mui-material/src/TableFooter/TableFooter.js +++ b/packages/mui-material/src/TableFooter/TableFooter.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableHead/TableHead.js b/packages/mui-material/src/TableHead/TableHead.js index 3c4a07cb2bf828..3a58974aa5ab09 100644 --- a/packages/mui-material/src/TableHead/TableHead.js +++ b/packages/mui-material/src/TableHead/TableHead.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TablePagination/TablePagination.js b/packages/mui-material/src/TablePagination/TablePagination.js index 59a7b7ba6af5c3..88dbd75c142c07 100644 --- a/packages/mui-material/src/TablePagination/TablePagination.js +++ b/packages/mui-material/src/TablePagination/TablePagination.js @@ -1,11 +1,11 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import integerPropType from "@mui/utils/integerPropType"; -import chainPropTypes from "@mui/utils/chainPropTypes"; -import { isHostComponent } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import { isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import InputBase from '../InputBase'; diff --git a/packages/mui-material/src/TableRow/TableRow.js b/packages/mui-material/src/TableRow/TableRow.js index 20ee1a42416cca..40612a6e0a9209 100644 --- a/packages/mui-material/src/TableRow/TableRow.js +++ b/packages/mui-material/src/TableRow/TableRow.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableSortLabel/TableSortLabel.js b/packages/mui-material/src/TableSortLabel/TableSortLabel.js index d18e6c18c85816..7031a61adebc1d 100644 --- a/packages/mui-material/src/TableSortLabel/TableSortLabel.js +++ b/packages/mui-material/src/TableSortLabel/TableSortLabel.js @@ -1,5 +1,5 @@ 'use client'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/Tabs/Tabs.js b/packages/mui-material/src/Tabs/Tabs.js index a8cf9b98bbd14a..31a26e7f16b83a 100644 --- a/packages/mui-material/src/Tabs/Tabs.js +++ b/packages/mui-material/src/Tabs/Tabs.js @@ -1,11 +1,11 @@ -'use client';; +'use client'; import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import { useSlotProps } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; +import refType from '@mui/utils/refType'; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/TextField/TextField.js b/packages/mui-material/src/TextField/TextField.js index a8758706335699..6e3372513b7aac 100644 --- a/packages/mui-material/src/TextField/TextField.js +++ b/packages/mui-material/src/TextField/TextField.js @@ -1,10 +1,10 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import useId from "@mui/utils/useId"; -import refType from "@mui/utils/refType"; +import composeClasses from '@mui/utils/composeClasses'; +import useId from '@mui/utils/useId'; +import refType from '@mui/utils/refType'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Input from '../Input'; diff --git a/packages/mui-material/src/ToggleButton/ToggleButton.js b/packages/mui-material/src/ToggleButton/ToggleButton.js index 2857004109ed89..bfa15b63247e6a 100644 --- a/packages/mui-material/src/ToggleButton/ToggleButton.js +++ b/packages/mui-material/src/ToggleButton/ToggleButton.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import resolveProps from "@mui/utils/resolveProps"; -import composeClasses from "@mui/utils/composeClasses"; +import resolveProps from '@mui/utils/resolveProps'; +import composeClasses from '@mui/utils/composeClasses'; import { alpha } from '../styles'; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js index d542212c1e7de0..799cf46053b912 100644 --- a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js +++ b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js @@ -3,8 +3,8 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; -import getValidReactChildren from "@mui/utils/getValidReactChildren"; +import composeClasses from '@mui/utils/composeClasses'; +import getValidReactChildren from '@mui/utils/getValidReactChildren'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Toolbar/Toolbar.js b/packages/mui-material/src/Toolbar/Toolbar.js index 0b7778dd525bcb..070e1a54739974 100644 --- a/packages/mui-material/src/Toolbar/Toolbar.js +++ b/packages/mui-material/src/Toolbar/Toolbar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import composeClasses from "@mui/utils/composeClasses"; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getToolbarUtilityClass } from './toolbarClasses'; diff --git a/packages/mui-material/src/Tooltip/Tooltip.js b/packages/mui-material/src/Tooltip/Tooltip.js index eea6f89afbc1fb..4ac297822d06a3 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.js +++ b/packages/mui-material/src/Tooltip/Tooltip.js @@ -1,12 +1,12 @@ -'use client';; +'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import useTimeout, { Timeout } from "@mui/utils/useTimeout"; -import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; -import { appendOwnerState } from "@mui/base/utils"; -import composeClasses from "@mui/utils/composeClasses"; -import { alpha } from "@mui/system/colorManipulator"; +import useTimeout, { Timeout } from '@mui/utils/useTimeout'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; +import { appendOwnerState } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useTheme from '../styles/useTheme'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js index 279a37144dbd21..0f917f9d9a0318 100644 --- a/packages/mui-material/src/Typography/Typography.js +++ b/packages/mui-material/src/Typography/Typography.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { extendSxProp } from "@mui/system/styleFunctionSx"; -import composeClasses from "@mui/utils/composeClasses"; +import { extendSxProp } from '@mui/system/styleFunctionSx'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Zoom/Zoom.js b/packages/mui-material/src/Zoom/Zoom.js index 0ddc4cb3c088e6..5f0ebfd5d9f781 100644 --- a/packages/mui-material/src/Zoom/Zoom.js +++ b/packages/mui-material/src/Zoom/Zoom.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import elementAcceptingRef from "@mui/utils/elementAcceptingRef"; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import useTheme from '../styles/useTheme'; import { reflow, getTransitionProps } from '../transitions/utils'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/internal/SwitchBase.js b/packages/mui-material/src/internal/SwitchBase.js index f70aeb6c7ae50e..35d8b4b1f749ff 100644 --- a/packages/mui-material/src/internal/SwitchBase.js +++ b/packages/mui-material/src/internal/SwitchBase.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import refType from "@mui/utils/refType"; -import composeClasses from "@mui/utils/composeClasses"; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useControlled from '../utils/useControlled'; diff --git a/packages/mui-material/src/styles/CssVarsProvider.tsx b/packages/mui-material/src/styles/CssVarsProvider.tsx index cf4d36b72eed5c..90cd0733dd72a7 100644 --- a/packages/mui-material/src/styles/CssVarsProvider.tsx +++ b/packages/mui-material/src/styles/CssVarsProvider.tsx @@ -1,10 +1,10 @@ -'use client';; +'use client'; // do not remove the following import (https://github.com/microsoft/TypeScript/issues/29808#issuecomment-1320713018) /* eslint-disable @typescript-eslint/no-unused-vars */ // @ts-ignore import * as React from 'react'; import { unstable_createCssVarsProvider as createCssVarsProvider, SxProps } from '@mui/system'; -import styleFunctionSx from "@mui/system/styleFunctionSx"; +import styleFunctionSx from '@mui/system/styleFunctionSx'; import experimental_extendTheme, { SupportedColorScheme, CssVarsTheme, diff --git a/packages/mui-material/src/styles/createMuiStrictModeTheme.js b/packages/mui-material/src/styles/createMuiStrictModeTheme.js index a886f4c5ea1f29..6974e0013b72f9 100644 --- a/packages/mui-material/src/styles/createMuiStrictModeTheme.js +++ b/packages/mui-material/src/styles/createMuiStrictModeTheme.js @@ -1,4 +1,4 @@ -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import createTheme from './createTheme'; export default function createMuiStrictModeTheme(options, ...args) { diff --git a/packages/mui-material/src/styles/createPalette.js b/packages/mui-material/src/styles/createPalette.js index e67549095267dc..4d6bf554415986 100644 --- a/packages/mui-material/src/styles/createPalette.js +++ b/packages/mui-material/src/styles/createPalette.js @@ -1,6 +1,6 @@ -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { darken, getContrastRatio, lighten } from "@mui/system/colorManipulator"; +import { darken, getContrastRatio, lighten } from '@mui/system/colorManipulator'; import common from '../colors/common'; import grey from '../colors/grey'; import purple from '../colors/purple'; diff --git a/packages/mui-material/src/styles/createPalette.test.js b/packages/mui-material/src/styles/createPalette.test.js index b6202d608db43a..16c7cfaa4c0de8 100644 --- a/packages/mui-material/src/styles/createPalette.test.js +++ b/packages/mui-material/src/styles/createPalette.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { darken, lighten } from "@mui/system/colorManipulator"; +import { darken, lighten } from '@mui/system/colorManipulator'; import { deepOrange, blue, purple, indigo } from '../colors'; import createPalette, { dark, light } from './createPalette'; diff --git a/packages/mui-material/src/styles/createTheme.js b/packages/mui-material/src/styles/createTheme.js index f4f516a10c3791..da3850cf994703 100644 --- a/packages/mui-material/src/styles/createTheme.js +++ b/packages/mui-material/src/styles/createTheme.js @@ -1,6 +1,8 @@ -import deepmerge from "@mui/utils/deepmerge"; -import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig } from "@mui/system/styleFunctionSx"; -import systemCreateTheme from "@mui/system/createTheme"; +import deepmerge from '@mui/utils/deepmerge'; +import styleFunctionSx, { + unstable_defaultSxConfig as defaultSxConfig, +} from '@mui/system/styleFunctionSx'; +import systemCreateTheme from '@mui/system/createTheme'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; import generateUtilityClass from '@mui/utils/generateUtilityClass'; import createMixins from './createMixins'; diff --git a/packages/mui-material/src/styles/createTypography.js b/packages/mui-material/src/styles/createTypography.js index 9b5fda7a5de4b6..277808d2a7ec0c 100644 --- a/packages/mui-material/src/styles/createTypography.js +++ b/packages/mui-material/src/styles/createTypography.js @@ -1,4 +1,4 @@ -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; function round(value) { return Math.round(value * 1e5) / 1e5; diff --git a/packages/mui-material/src/styles/experimental_extendTheme.js b/packages/mui-material/src/styles/experimental_extendTheme.js index 3c40f4736ca4c8..3d8c2a31f3f357 100644 --- a/packages/mui-material/src/styles/experimental_extendTheme.js +++ b/packages/mui-material/src/styles/experimental_extendTheme.js @@ -1,9 +1,11 @@ -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import { unstable_createGetCssVar as systemCreateGetCssVar, unstable_prepareCssVars as prepareCssVars, } from '@mui/system'; -import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig } from "@mui/system/styleFunctionSx"; +import styleFunctionSx, { + unstable_defaultSxConfig as defaultSxConfig, +} from '@mui/system/styleFunctionSx'; import { private_safeColorChannel as safeColorChannel, @@ -12,7 +14,7 @@ import { private_safeLighten as safeLighten, private_safeEmphasize as safeEmphasize, hslToRgb, -} from "@mui/system/colorManipulator"; +} from '@mui/system/colorManipulator'; import defaultShouldSkipGeneratingVar from './shouldSkipGeneratingVar'; import createThemeWithoutVars from './createTheme'; diff --git a/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts b/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts index 6268a1c0adca26..0146d320943c88 100644 --- a/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts +++ b/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts @@ -1,5 +1,7 @@ export default function shouldSkipGeneratingVar(keys: string[]) { - return !!keys[0].match(/(cssVarPrefix|typography|mixins|breakpoints|direction|transitions)/) || - !!keys[0].match(/sxConfig$/) || // ends with sxConfig - (keys[0] === 'palette' && !!keys[1]?.match(/(mode|contrastThreshold|tonalOffset)/)); + return ( + !!keys[0].match(/(cssVarPrefix|typography|mixins|breakpoints|direction|transitions)/) || + !!keys[0].match(/sxConfig$/) || // ends with sxConfig + (keys[0] === 'palette' && !!keys[1]?.match(/(mode|contrastThreshold|tonalOffset)/)) + ); } diff --git a/packages/mui-material/src/styles/useThemeProps.js b/packages/mui-material/src/styles/useThemeProps.js index 80dbd70e5c6146..60b85ce8fd8894 100644 --- a/packages/mui-material/src/styles/useThemeProps.js +++ b/packages/mui-material/src/styles/useThemeProps.js @@ -1,5 +1,5 @@ 'use client'; -import systemUseThemeProps from "@mui/system/useThemeProps"; +import systemUseThemeProps from '@mui/system/useThemeProps'; import defaultTheme from './defaultTheme'; import THEME_ID from './identifier'; diff --git a/packages/mui-material/src/useMediaQuery/useMediaQuery.ts b/packages/mui-material/src/useMediaQuery/useMediaQuery.ts index 9cb59f52ebbac1..33d8650b83395c 100644 --- a/packages/mui-material/src/useMediaQuery/useMediaQuery.ts +++ b/packages/mui-material/src/useMediaQuery/useMediaQuery.ts @@ -1,7 +1,7 @@ -'use client';; +'use client'; import * as React from 'react'; -import { getThemeProps } from "@mui/system/useThemeProps"; -import useTheme from "@mui/system/useThemeWithoutDefault"; +import { getThemeProps } from '@mui/system/useThemeProps'; +import useTheme from '@mui/system/useThemeWithoutDefault'; import useEnhancedEffect from '../utils/useEnhancedEffect'; /** diff --git a/packages/mui-material/src/usePagination/usePagination.js b/packages/mui-material/src/usePagination/usePagination.js index d215cd596ff999..6125f1b03e3805 100644 --- a/packages/mui-material/src/usePagination/usePagination.js +++ b/packages/mui-material/src/usePagination/usePagination.js @@ -1,5 +1,5 @@ 'use client'; -import useControlled from "@mui/utils/useControlled"; +import useControlled from '@mui/utils/useControlled'; export default function usePagination(props = {}) { // keep default values in sync with @default tags in Pagination.propTypes @@ -78,8 +78,8 @@ export default function usePagination(props = {}) { ...(siblingsStart > boundaryCount + 2 ? ['start-ellipsis'] : boundaryCount + 1 < count - boundaryCount - ? [boundaryCount + 1] - : []), + ? [boundaryCount + 1] + : []), // Sibling pages ...range(siblingsStart, siblingsEnd), @@ -89,8 +89,8 @@ export default function usePagination(props = {}) { ...(siblingsEnd < count - boundaryCount - 1 ? ['end-ellipsis'] : count - boundaryCount > boundaryCount - ? [count - boundaryCount] - : []), + ? [count - boundaryCount] + : []), ...endPages, ...(hideNextButton ? [] : ['next']), diff --git a/packages/mui-material/src/utils/capitalize.d.ts b/packages/mui-material/src/utils/capitalize.d.ts index 3baee07edd1779..01718f07f09ff2 100644 --- a/packages/mui-material/src/utils/capitalize.d.ts +++ b/packages/mui-material/src/utils/capitalize.d.ts @@ -1,3 +1,3 @@ -import capitalize from "@mui/utils/capitalize"; +import capitalize from '@mui/utils/capitalize'; export default capitalize; diff --git a/packages/mui-material/src/utils/capitalize.js b/packages/mui-material/src/utils/capitalize.js index 3baee07edd1779..01718f07f09ff2 100644 --- a/packages/mui-material/src/utils/capitalize.js +++ b/packages/mui-material/src/utils/capitalize.js @@ -1,3 +1,3 @@ -import capitalize from "@mui/utils/capitalize"; +import capitalize from '@mui/utils/capitalize'; export default capitalize; diff --git a/packages/mui-material/src/utils/createChainedFunction.d.ts b/packages/mui-material/src/utils/createChainedFunction.d.ts index d1bd63794ede38..59818e8c187bc1 100644 --- a/packages/mui-material/src/utils/createChainedFunction.d.ts +++ b/packages/mui-material/src/utils/createChainedFunction.d.ts @@ -1,3 +1,3 @@ -import createChainedFunction from "@mui/utils/createChainedFunction"; +import createChainedFunction from '@mui/utils/createChainedFunction'; export default createChainedFunction; diff --git a/packages/mui-material/src/utils/createChainedFunction.js b/packages/mui-material/src/utils/createChainedFunction.js index d1bd63794ede38..59818e8c187bc1 100644 --- a/packages/mui-material/src/utils/createChainedFunction.js +++ b/packages/mui-material/src/utils/createChainedFunction.js @@ -1,3 +1,3 @@ -import createChainedFunction from "@mui/utils/createChainedFunction"; +import createChainedFunction from '@mui/utils/createChainedFunction'; export default createChainedFunction; diff --git a/packages/mui-material/src/utils/debounce.d.ts b/packages/mui-material/src/utils/debounce.d.ts index cea4ff8607391c..5d8a1c9fdc408b 100644 --- a/packages/mui-material/src/utils/debounce.d.ts +++ b/packages/mui-material/src/utils/debounce.d.ts @@ -1,3 +1,3 @@ -import debounce from "@mui/utils/debounce"; +import debounce from '@mui/utils/debounce'; export default debounce; diff --git a/packages/mui-material/src/utils/debounce.js b/packages/mui-material/src/utils/debounce.js index cea4ff8607391c..5d8a1c9fdc408b 100644 --- a/packages/mui-material/src/utils/debounce.js +++ b/packages/mui-material/src/utils/debounce.js @@ -1,3 +1,3 @@ -import debounce from "@mui/utils/debounce"; +import debounce from '@mui/utils/debounce'; export default debounce; diff --git a/packages/mui-material/src/utils/deprecatedPropType.d.ts b/packages/mui-material/src/utils/deprecatedPropType.d.ts index 5017c35cae4cc4..67e8da82050a76 100644 --- a/packages/mui-material/src/utils/deprecatedPropType.d.ts +++ b/packages/mui-material/src/utils/deprecatedPropType.d.ts @@ -1,3 +1,3 @@ -import deprecatedPropType from "@mui/utils/deprecatedPropType"; +import deprecatedPropType from '@mui/utils/deprecatedPropType'; export default deprecatedPropType; diff --git a/packages/mui-material/src/utils/deprecatedPropType.js b/packages/mui-material/src/utils/deprecatedPropType.js index 5017c35cae4cc4..67e8da82050a76 100644 --- a/packages/mui-material/src/utils/deprecatedPropType.js +++ b/packages/mui-material/src/utils/deprecatedPropType.js @@ -1,3 +1,3 @@ -import deprecatedPropType from "@mui/utils/deprecatedPropType"; +import deprecatedPropType from '@mui/utils/deprecatedPropType'; export default deprecatedPropType; diff --git a/packages/mui-material/src/utils/getScrollbarSize.ts b/packages/mui-material/src/utils/getScrollbarSize.ts index f2967ba4e191f1..62dd95cc8f1e33 100644 --- a/packages/mui-material/src/utils/getScrollbarSize.ts +++ b/packages/mui-material/src/utils/getScrollbarSize.ts @@ -1,3 +1,3 @@ -import getScrollbarSize from "@mui/utils/getScrollbarSize"; +import getScrollbarSize from '@mui/utils/getScrollbarSize'; export default getScrollbarSize; diff --git a/packages/mui-material/src/utils/isMuiElement.d.ts b/packages/mui-material/src/utils/isMuiElement.d.ts index 447be0ab7bcaf0..f886833aff8c85 100644 --- a/packages/mui-material/src/utils/isMuiElement.d.ts +++ b/packages/mui-material/src/utils/isMuiElement.d.ts @@ -1,3 +1,3 @@ -import isMuiElement from "@mui/utils/isMuiElement"; +import isMuiElement from '@mui/utils/isMuiElement'; export default isMuiElement; diff --git a/packages/mui-material/src/utils/isMuiElement.js b/packages/mui-material/src/utils/isMuiElement.js index 447be0ab7bcaf0..f886833aff8c85 100644 --- a/packages/mui-material/src/utils/isMuiElement.js +++ b/packages/mui-material/src/utils/isMuiElement.js @@ -1,3 +1,3 @@ -import isMuiElement from "@mui/utils/isMuiElement"; +import isMuiElement from '@mui/utils/isMuiElement'; export default isMuiElement; diff --git a/packages/mui-material/src/utils/ownerDocument.ts b/packages/mui-material/src/utils/ownerDocument.ts index 4cd1cf38b3e8e0..155fa3528eda81 100644 --- a/packages/mui-material/src/utils/ownerDocument.ts +++ b/packages/mui-material/src/utils/ownerDocument.ts @@ -1,3 +1,3 @@ -import ownerDocument from "@mui/utils/ownerDocument"; +import ownerDocument from '@mui/utils/ownerDocument'; export default ownerDocument; diff --git a/packages/mui-material/src/utils/ownerWindow.ts b/packages/mui-material/src/utils/ownerWindow.ts index 52ce1328cba4ce..9af3de65cb6989 100644 --- a/packages/mui-material/src/utils/ownerWindow.ts +++ b/packages/mui-material/src/utils/ownerWindow.ts @@ -1,3 +1,3 @@ -import ownerWindow from "@mui/utils/ownerWindow"; +import ownerWindow from '@mui/utils/ownerWindow'; export default ownerWindow; diff --git a/packages/mui-material/src/utils/requirePropFactory.d.ts b/packages/mui-material/src/utils/requirePropFactory.d.ts index e71fffdc999396..1074ad5c85a976 100644 --- a/packages/mui-material/src/utils/requirePropFactory.d.ts +++ b/packages/mui-material/src/utils/requirePropFactory.d.ts @@ -1,3 +1,3 @@ -import requirePropFactory from "@mui/utils/requirePropFactory"; +import requirePropFactory from '@mui/utils/requirePropFactory'; export default requirePropFactory; diff --git a/packages/mui-material/src/utils/requirePropFactory.js b/packages/mui-material/src/utils/requirePropFactory.js index e71fffdc999396..1074ad5c85a976 100644 --- a/packages/mui-material/src/utils/requirePropFactory.js +++ b/packages/mui-material/src/utils/requirePropFactory.js @@ -1,3 +1,3 @@ -import requirePropFactory from "@mui/utils/requirePropFactory"; +import requirePropFactory from '@mui/utils/requirePropFactory'; export default requirePropFactory; diff --git a/packages/mui-material/src/utils/setRef.ts b/packages/mui-material/src/utils/setRef.ts index 960ee425b0bd76..6cee7e00bffe43 100644 --- a/packages/mui-material/src/utils/setRef.ts +++ b/packages/mui-material/src/utils/setRef.ts @@ -1,3 +1,3 @@ -import setRef from "@mui/utils/setRef"; +import setRef from '@mui/utils/setRef'; export default setRef; diff --git a/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js b/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js index 27f053c54d8363..eb22bb12531ae4 100644 --- a/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js +++ b/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js @@ -1,4 +1,4 @@ -import { isHostComponent } from "@mui/base/utils"; +import { isHostComponent } from '@mui/base/utils'; const shouldSpreadAdditionalProps = (Slot) => { return !Slot || !isHostComponent(Slot); diff --git a/packages/mui-material/src/utils/unsupportedProp.d.ts b/packages/mui-material/src/utils/unsupportedProp.d.ts index e611dba309a63f..80104143560b59 100644 --- a/packages/mui-material/src/utils/unsupportedProp.d.ts +++ b/packages/mui-material/src/utils/unsupportedProp.d.ts @@ -1,3 +1,3 @@ -import unsupportedProp from "@mui/utils/unsupportedProp"; +import unsupportedProp from '@mui/utils/unsupportedProp'; export default unsupportedProp; diff --git a/packages/mui-material/src/utils/unsupportedProp.js b/packages/mui-material/src/utils/unsupportedProp.js index e611dba309a63f..80104143560b59 100644 --- a/packages/mui-material/src/utils/unsupportedProp.js +++ b/packages/mui-material/src/utils/unsupportedProp.js @@ -1,3 +1,3 @@ -import unsupportedProp from "@mui/utils/unsupportedProp"; +import unsupportedProp from '@mui/utils/unsupportedProp'; export default unsupportedProp; diff --git a/packages/mui-material/src/utils/useControlled.d.ts b/packages/mui-material/src/utils/useControlled.d.ts index 637c116a90cee2..ae268b214180de 100644 --- a/packages/mui-material/src/utils/useControlled.d.ts +++ b/packages/mui-material/src/utils/useControlled.d.ts @@ -1,3 +1,3 @@ -import useControlled from "@mui/utils/useControlled"; +import useControlled from '@mui/utils/useControlled'; export default useControlled; diff --git a/packages/mui-material/src/utils/useControlled.js b/packages/mui-material/src/utils/useControlled.js index 9a9b3ebc9dda81..33aefe699f5974 100644 --- a/packages/mui-material/src/utils/useControlled.js +++ b/packages/mui-material/src/utils/useControlled.js @@ -1,4 +1,4 @@ 'use client'; -import useControlled from "@mui/utils/useControlled"; +import useControlled from '@mui/utils/useControlled'; export default useControlled; diff --git a/packages/mui-material/src/utils/useEnhancedEffect.d.ts b/packages/mui-material/src/utils/useEnhancedEffect.d.ts index 35d86d962c53c2..52622565d8fa3e 100644 --- a/packages/mui-material/src/utils/useEnhancedEffect.d.ts +++ b/packages/mui-material/src/utils/useEnhancedEffect.d.ts @@ -1,3 +1,3 @@ -import useEnhancedEffect from "@mui/utils/useEnhancedEffect"; +import useEnhancedEffect from '@mui/utils/useEnhancedEffect'; export default useEnhancedEffect; diff --git a/packages/mui-material/src/utils/useEnhancedEffect.js b/packages/mui-material/src/utils/useEnhancedEffect.js index 2a36ef9d26229b..d4e273740fb956 100644 --- a/packages/mui-material/src/utils/useEnhancedEffect.js +++ b/packages/mui-material/src/utils/useEnhancedEffect.js @@ -1,4 +1,4 @@ 'use client'; -import useEnhancedEffect from "@mui/utils/useEnhancedEffect"; +import useEnhancedEffect from '@mui/utils/useEnhancedEffect'; export default useEnhancedEffect; diff --git a/packages/mui-material/src/utils/useEventCallback.d.ts b/packages/mui-material/src/utils/useEventCallback.d.ts index 98ab628c05bfed..69ed51700c8348 100644 --- a/packages/mui-material/src/utils/useEventCallback.d.ts +++ b/packages/mui-material/src/utils/useEventCallback.d.ts @@ -1,3 +1,3 @@ -import useEventCallback from "@mui/utils/useEventCallback"; +import useEventCallback from '@mui/utils/useEventCallback'; export default useEventCallback; diff --git a/packages/mui-material/src/utils/useEventCallback.js b/packages/mui-material/src/utils/useEventCallback.js index 01ac3fce81ede9..4ebbd890c36689 100644 --- a/packages/mui-material/src/utils/useEventCallback.js +++ b/packages/mui-material/src/utils/useEventCallback.js @@ -1,4 +1,4 @@ 'use client'; -import useEventCallback from "@mui/utils/useEventCallback"; +import useEventCallback from '@mui/utils/useEventCallback'; export default useEventCallback; diff --git a/packages/mui-material/src/utils/useForkRef.d.ts b/packages/mui-material/src/utils/useForkRef.d.ts index 8ae133e24ec04f..5c0ce6f3608d8a 100644 --- a/packages/mui-material/src/utils/useForkRef.d.ts +++ b/packages/mui-material/src/utils/useForkRef.d.ts @@ -1,3 +1,3 @@ -import useForkRef from "@mui/utils/useForkRef"; +import useForkRef from '@mui/utils/useForkRef'; export default useForkRef; diff --git a/packages/mui-material/src/utils/useForkRef.js b/packages/mui-material/src/utils/useForkRef.js index 10f839db7f3a52..bdcb95552910c4 100644 --- a/packages/mui-material/src/utils/useForkRef.js +++ b/packages/mui-material/src/utils/useForkRef.js @@ -1,4 +1,4 @@ 'use client'; -import useForkRef from "@mui/utils/useForkRef"; +import useForkRef from '@mui/utils/useForkRef'; export default useForkRef; diff --git a/packages/mui-material/src/utils/useId.d.ts b/packages/mui-material/src/utils/useId.d.ts index 4927fafe07b4d5..8f3624cea3c0c7 100644 --- a/packages/mui-material/src/utils/useId.d.ts +++ b/packages/mui-material/src/utils/useId.d.ts @@ -1,3 +1,3 @@ -import useId from "@mui/utils/useId"; +import useId from '@mui/utils/useId'; export default useId; diff --git a/packages/mui-material/src/utils/useId.js b/packages/mui-material/src/utils/useId.js index ae06d631d8e879..d99075f6377825 100644 --- a/packages/mui-material/src/utils/useId.js +++ b/packages/mui-material/src/utils/useId.js @@ -1,4 +1,4 @@ 'use client'; -import useId from "@mui/utils/useId"; +import useId from '@mui/utils/useId'; export default useId; diff --git a/packages/mui-material/src/utils/useIsFocusVisible.d.ts b/packages/mui-material/src/utils/useIsFocusVisible.d.ts index 2a702ae3f7f980..b1d9d514e158b6 100644 --- a/packages/mui-material/src/utils/useIsFocusVisible.d.ts +++ b/packages/mui-material/src/utils/useIsFocusVisible.d.ts @@ -1,3 +1,3 @@ -import useIsFocusVisible from "@mui/utils/useIsFocusVisible"; +import useIsFocusVisible from '@mui/utils/useIsFocusVisible'; export default useIsFocusVisible; diff --git a/packages/mui-material/src/utils/useIsFocusVisible.js b/packages/mui-material/src/utils/useIsFocusVisible.js index eb37d820e5de27..9cfe9a7a1cb64c 100644 --- a/packages/mui-material/src/utils/useIsFocusVisible.js +++ b/packages/mui-material/src/utils/useIsFocusVisible.js @@ -1,4 +1,4 @@ 'use client'; -import useIsFocusVisible from "@mui/utils/useIsFocusVisible"; +import useIsFocusVisible from '@mui/utils/useIsFocusVisible'; export default useIsFocusVisible; diff --git a/packages/mui-material/src/utils/useSlot.ts b/packages/mui-material/src/utils/useSlot.ts index f1b614ea01fd8f..53731186cd595d 100644 --- a/packages/mui-material/src/utils/useSlot.ts +++ b/packages/mui-material/src/utils/useSlot.ts @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import { ClassValue } from 'clsx'; -import useForkRef from "@mui/utils/useForkRef"; +import useForkRef from '@mui/utils/useForkRef'; import { appendOwnerState, resolveComponentProps, mergeSlotProps } from '@mui/base/utils'; export type WithCommonProps = T & { diff --git a/packages/mui-system/src/Box/Box.js b/packages/mui-system/src/Box/Box.js index 81237aca0f5a3c..2d00707a13f3c7 100644 --- a/packages/mui-system/src/Box/Box.js +++ b/packages/mui-system/src/Box/Box.js @@ -1,6 +1,6 @@ 'use client'; import PropTypes from 'prop-types'; -import ClassNameGenerator from "@mui/utils/ClassNameGenerator"; +import ClassNameGenerator from '@mui/utils/ClassNameGenerator'; import createBox from '../createBox'; import boxClasses from './boxClasses'; diff --git a/packages/mui-system/src/Box/Box.test.js b/packages/mui-system/src/Box/Box.test.js index 0f3f027437089a..6e03f46a484c97 100644 --- a/packages/mui-system/src/Box/Box.test.js +++ b/packages/mui-system/src/Box/Box.test.js @@ -4,7 +4,7 @@ import { expect } from 'chai'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; import { Box, ThemeProvider, boxClasses as classes } from '@mui/system'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/Box/boxClasses.ts b/packages/mui-system/src/Box/boxClasses.ts index 3a55dc0bbdd3d2..c3d38ea7d59ae3 100644 --- a/packages/mui-system/src/Box/boxClasses.ts +++ b/packages/mui-system/src/Box/boxClasses.ts @@ -1,4 +1,4 @@ -import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; export interface BoxClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/Container/containerClasses.ts b/packages/mui-system/src/Container/containerClasses.ts index 85b4c57707990e..f7794eeb2cfc17 100644 --- a/packages/mui-system/src/Container/containerClasses.ts +++ b/packages/mui-system/src/Container/containerClasses.ts @@ -1,5 +1,5 @@ -import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; -import generateUtilityClass from "@mui/utils/generateUtilityClass"; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; export interface ContainerClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/Container/createContainer.tsx b/packages/mui-system/src/Container/createContainer.tsx index 949a557eca193d..b08839f5821448 100644 --- a/packages/mui-system/src/Container/createContainer.tsx +++ b/packages/mui-system/src/Container/createContainer.tsx @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import clsx from 'clsx'; import { Interpolation, MUIStyledComponent as StyledComponent } from '@mui/styled-engine'; import { OverridableComponent } from '@mui/types'; -import generateUtilityClass from "@mui/utils/generateUtilityClass"; -import composeClasses from "@mui/utils/composeClasses"; -import capitalize from "@mui/utils/capitalize"; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; +import composeClasses from '@mui/utils/composeClasses'; +import capitalize from '@mui/utils/capitalize'; import { ContainerProps, ContainerTypeMap } from './ContainerProps'; import useThemePropsSystem from '../useThemeProps'; import systemStyled from '../styled'; diff --git a/packages/mui-system/src/Stack/Stack.test.js b/packages/mui-system/src/Stack/Stack.test.js index 9006626217031c..6da5266b210e2b 100644 --- a/packages/mui-system/src/Stack/Stack.test.js +++ b/packages/mui-system/src/Stack/Stack.test.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; import Stack from '@mui/system/Stack'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; import { style } from './createStack'; describe('', () => { diff --git a/packages/mui-system/src/Stack/createStack.tsx b/packages/mui-system/src/Stack/createStack.tsx index d487f4eaaebaae..840163c4e20799 100644 --- a/packages/mui-system/src/Stack/createStack.tsx +++ b/packages/mui-system/src/Stack/createStack.tsx @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { OverridableComponent } from '@mui/types'; -import deepmerge from "@mui/utils/deepmerge"; -import generateUtilityClass from "@mui/utils/generateUtilityClass"; -import composeClasses from "@mui/utils/composeClasses"; +import deepmerge from '@mui/utils/deepmerge'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; +import composeClasses from '@mui/utils/composeClasses'; import systemStyled from '../styled'; import useThemePropsSystem from '../useThemeProps'; import { extendSxProp } from '../styleFunctionSx'; diff --git a/packages/mui-system/src/Stack/stackClasses.ts b/packages/mui-system/src/Stack/stackClasses.ts index a66065e2041ca2..b1ed723fc77998 100644 --- a/packages/mui-system/src/Stack/stackClasses.ts +++ b/packages/mui-system/src/Stack/stackClasses.ts @@ -1,5 +1,5 @@ -import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; -import generateUtilityClass from "@mui/utils/generateUtilityClass"; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; export interface StackClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/ThemeProvider/ThemeProvider.js b/packages/mui-system/src/ThemeProvider/ThemeProvider.js index 7206b052f1718a..48d4e8a3d97dda 100644 --- a/packages/mui-system/src/ThemeProvider/ThemeProvider.js +++ b/packages/mui-system/src/ThemeProvider/ThemeProvider.js @@ -5,7 +5,7 @@ import { ThemeProvider as MuiThemeProvider, useTheme as usePrivateTheme, } from '@mui/private-theming'; -import exactProp from "@mui/utils/exactProp"; +import exactProp from '@mui/utils/exactProp'; import { ThemeContext as StyledEngineThemeContext } from '@mui/styled-engine'; import useThemeWithoutDefault from '../useThemeWithoutDefault'; diff --git a/packages/mui-system/src/Unstable_Grid/Grid.test.js b/packages/mui-system/src/Unstable_Grid/Grid.test.js index 836765cbb1bdc3..83308842e38ccd 100644 --- a/packages/mui-system/src/Unstable_Grid/Grid.test.js +++ b/packages/mui-system/src/Unstable_Grid/Grid.test.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { describeConformance, createRenderer, screen } from '@mui-internal/test-utils'; import { ThemeProvider } from '@mui/system'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; import Grid, { gridClasses as classes } from '@mui/system/Unstable_Grid'; describe('System ', () => { diff --git a/packages/mui-system/src/Unstable_Grid/createGrid.tsx b/packages/mui-system/src/Unstable_Grid/createGrid.tsx index 080556f3724d94..38b361a9a2a44b 100644 --- a/packages/mui-system/src/Unstable_Grid/createGrid.tsx +++ b/packages/mui-system/src/Unstable_Grid/createGrid.tsx @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { OverridableComponent } from '@mui/types'; -import isMuiElement from "@mui/utils/isMuiElement"; -import generateUtilityClass from "@mui/utils/generateUtilityClass"; -import composeClasses from "@mui/utils/composeClasses"; +import isMuiElement from '@mui/utils/isMuiElement'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; +import composeClasses from '@mui/utils/composeClasses'; import systemStyled from '../styled'; import useThemePropsSystem from '../useThemeProps'; import useTheme from '../useTheme'; diff --git a/packages/mui-system/src/Unstable_Grid/gridClasses.ts b/packages/mui-system/src/Unstable_Grid/gridClasses.ts index 28b1f49ed4966b..93b59de11cb538 100644 --- a/packages/mui-system/src/Unstable_Grid/gridClasses.ts +++ b/packages/mui-system/src/Unstable_Grid/gridClasses.ts @@ -1,5 +1,5 @@ -import generateUtilityClasses from "@mui/utils/generateUtilityClasses"; -import generateUtilityClass from "@mui/utils/generateUtilityClass"; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; export interface GridClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/breakpoints.js b/packages/mui-system/src/breakpoints.js index 627335ac37125e..b1d017b24777ed 100644 --- a/packages/mui-system/src/breakpoints.js +++ b/packages/mui-system/src/breakpoints.js @@ -1,5 +1,5 @@ import PropTypes from 'prop-types'; -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import merge from './merge'; // The breakpoint **start** at this value. diff --git a/packages/mui-system/src/colorManipulator.js b/packages/mui-system/src/colorManipulator.js index f0665cb1476f61..c8185699bf8449 100644 --- a/packages/mui-system/src/colorManipulator.js +++ b/packages/mui-system/src/colorManipulator.js @@ -1,4 +1,4 @@ -import clamp from "@mui/utils/clamp"; +import clamp from '@mui/utils/clamp'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; /** diff --git a/packages/mui-system/src/colorManipulator.spec.ts b/packages/mui-system/src/colorManipulator.spec.ts index 30017f3241cd0f..37e37f0f0292e0 100644 --- a/packages/mui-system/src/colorManipulator.spec.ts +++ b/packages/mui-system/src/colorManipulator.spec.ts @@ -14,7 +14,7 @@ import { alpha, lighten, darken, -} from "@mui/system/colorManipulator"; +} from '@mui/system/colorManipulator'; expectType<(color: string) => string, typeof hexToRgb>(hexToRgb); diff --git a/packages/mui-system/src/colorManipulator.test.js b/packages/mui-system/src/colorManipulator.test.js index deb3f427164a99..98406f195d0b83 100644 --- a/packages/mui-system/src/colorManipulator.test.js +++ b/packages/mui-system/src/colorManipulator.test.js @@ -14,7 +14,7 @@ import { getLuminance, lighten, colorChannel, -} from "@mui/system/colorManipulator"; +} from '@mui/system/colorManipulator'; describe('utils/colorManipulator', () => { describe('recomposeColor', () => { diff --git a/packages/mui-system/src/createStyled.js b/packages/mui-system/src/createStyled.js index 7f0f21334e6b25..da61ca564547da 100644 --- a/packages/mui-system/src/createStyled.js +++ b/packages/mui-system/src/createStyled.js @@ -1,8 +1,8 @@ /* eslint-disable no-underscore-dangle */ 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 { 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'; diff --git a/packages/mui-system/src/createTheme/createTheme.js b/packages/mui-system/src/createTheme/createTheme.js index 1642642047549e..24c1c4d29971cc 100644 --- a/packages/mui-system/src/createTheme/createTheme.js +++ b/packages/mui-system/src/createTheme/createTheme.js @@ -1,4 +1,4 @@ -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import createBreakpoints from './createBreakpoints'; import shape from './shape'; import createSpacing from './createSpacing'; diff --git a/packages/mui-system/src/createTheme/createTheme.test.js b/packages/mui-system/src/createTheme/createTheme.test.js index 362b296322e2fd..934e3ee1f87eb9 100644 --- a/packages/mui-system/src/createTheme/createTheme.test.js +++ b/packages/mui-system/src/createTheme/createTheme.test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { createRenderer } from '@mui-internal/test-utils'; import { styled, ThemeProvider } from '@mui/system'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; describe('createTheme', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.js b/packages/mui-system/src/cssVars/createCssVarsProvider.js index b1a92fa12abfc9..b6c1877bbaea65 100644 --- a/packages/mui-system/src/cssVars/createCssVarsProvider.js +++ b/packages/mui-system/src/cssVars/createCssVarsProvider.js @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import { GlobalStyles } from '@mui/styled-engine'; import { useTheme as muiUseTheme } from '@mui/private-theming'; import ThemeProvider from '../ThemeProvider'; diff --git a/packages/mui-system/src/cssVars/prepareCssVars.ts b/packages/mui-system/src/cssVars/prepareCssVars.ts index 3b1a48c2533ce5..4a5f75a36db7b1 100644 --- a/packages/mui-system/src/cssVars/prepareCssVars.ts +++ b/packages/mui-system/src/cssVars/prepareCssVars.ts @@ -1,4 +1,4 @@ -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; import cssVarsParser from './cssVarsParser'; export interface DefaultCssVarsTheme { diff --git a/packages/mui-system/src/index.spec.tsx b/packages/mui-system/src/index.spec.tsx index 024a7e6d67d9cb..8605558b50ccfa 100644 --- a/packages/mui-system/src/index.spec.tsx +++ b/packages/mui-system/src/index.spec.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import styled from 'styled-components'; import { breakpoints, display, compose, spacing, style, styled as muiStyled } from '@mui/system'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; function composeTest() { function first(props: { color: string }) { diff --git a/packages/mui-system/src/merge.js b/packages/mui-system/src/merge.js index cdf603e9d92c2e..8fdd03b1d17c18 100644 --- a/packages/mui-system/src/merge.js +++ b/packages/mui-system/src/merge.js @@ -1,4 +1,4 @@ -import deepmerge from "@mui/utils/deepmerge"; +import deepmerge from '@mui/utils/deepmerge'; function merge(acc, item) { if (!item) { diff --git a/packages/mui-system/src/propsToClassKey.js b/packages/mui-system/src/propsToClassKey.js index 620c15e2d5597e..9596e920aa19e3 100644 --- a/packages/mui-system/src/propsToClassKey.js +++ b/packages/mui-system/src/propsToClassKey.js @@ -1,4 +1,4 @@ -import capitalize from "@mui/utils/capitalize"; +import capitalize from '@mui/utils/capitalize'; function isEmpty(string) { return string.length === 0; diff --git a/packages/mui-system/src/sizing.test.js b/packages/mui-system/src/sizing.test.js index 61a184f0b81f5e..dafd725654be8b 100644 --- a/packages/mui-system/src/sizing.test.js +++ b/packages/mui-system/src/sizing.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; import sizing from './sizing'; describe('sizing', () => { diff --git a/packages/mui-system/src/style.js b/packages/mui-system/src/style.js index 313bbbedbc3aa5..46e4044e34cbe8 100644 --- a/packages/mui-system/src/style.js +++ b/packages/mui-system/src/style.js @@ -1,4 +1,4 @@ -import capitalize from "@mui/utils/capitalize"; +import capitalize from '@mui/utils/capitalize'; import responsivePropType from './responsivePropType'; import { handleBreakpoints } from './breakpoints'; diff --git a/packages/mui-system/src/styleFunctionSx/extendSxProp.js b/packages/mui-system/src/styleFunctionSx/extendSxProp.js index e0eae568c0c78a..7fe50d39fa7e2d 100644 --- a/packages/mui-system/src/styleFunctionSx/extendSxProp.js +++ b/packages/mui-system/src/styleFunctionSx/extendSxProp.js @@ -1,4 +1,4 @@ -import { isPlainObject } from "@mui/utils/deepmerge"; +import { isPlainObject } from '@mui/utils/deepmerge'; import defaultSxConfig from './defaultSxConfig'; const splitProps = (props) => { diff --git a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js index a70cf2c9dcf84f..151f117c416477 100644 --- a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js +++ b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js @@ -1,4 +1,4 @@ -import capitalize from "@mui/utils/capitalize"; +import capitalize from '@mui/utils/capitalize'; import merge from '../merge'; import { getPath, getStyleValue as getValue } from '../style'; import { diff --git a/packages/mui-system/src/styled.test.js b/packages/mui-system/src/styled.test.js index c0690e2e20488b..31a8b178dfc52f 100644 --- a/packages/mui-system/src/styled.test.js +++ b/packages/mui-system/src/styled.test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { createRenderer, screen } from '@mui-internal/test-utils'; import { styled, ThemeProvider } from '@mui/system'; -import createTheme from "@mui/system/createTheme"; +import createTheme from '@mui/system/createTheme'; describe('styled', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/useThemeProps/getThemeProps.js b/packages/mui-system/src/useThemeProps/getThemeProps.js index fb47fc40dc7ad6..0d3042c2eec2f1 100644 --- a/packages/mui-system/src/useThemeProps/getThemeProps.js +++ b/packages/mui-system/src/useThemeProps/getThemeProps.js @@ -1,4 +1,4 @@ -import resolveProps from "@mui/utils/resolveProps"; +import resolveProps from '@mui/utils/resolveProps'; export default function getThemeProps(params) { const { theme, name, props } = params; diff --git a/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts b/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts index 1acc1bbe82d93b..d940e5c33ff7f5 100644 --- a/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts +++ b/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts @@ -1,5 +1,5 @@ import { expectType } from '@mui/types'; -import useThemeProps from "@mui/system/useThemeProps"; +import useThemeProps from '@mui/system/useThemeProps'; interface SliderProps { track?: boolean; From 7ed728ff23ec14b2313949afa71b37741051ac45 Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 12 Feb 2024 15:21:22 +0700 Subject: [PATCH 18/19] bring back eslint-disable --- packages/mui-system/src/colorManipulator.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mui-system/src/colorManipulator.js b/packages/mui-system/src/colorManipulator.js index c8185699bf8449..cec3860d6bd6c3 100644 --- a/packages/mui-system/src/colorManipulator.js +++ b/packages/mui-system/src/colorManipulator.js @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/naming-convention */ import clamp from '@mui/utils/clamp'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; From 58f8b9301c4a40da5c7d168a1e80ce7322718adc Mon Sep 17 00:00:00 2001 From: siriwatknp Date: Mon, 12 Feb 2024 15:28:54 +0700 Subject: [PATCH 19/19] run prettier --- packages/mui-material/src/usePagination/usePagination.js | 8 ++++---- packages/mui-system/src/Container/createContainer.tsx | 2 +- .../mui-system/src/cssVars/createCssVarsProvider.spec.tsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/mui-material/src/usePagination/usePagination.js b/packages/mui-material/src/usePagination/usePagination.js index 6125f1b03e3805..c77a737e0ebbe3 100644 --- a/packages/mui-material/src/usePagination/usePagination.js +++ b/packages/mui-material/src/usePagination/usePagination.js @@ -78,8 +78,8 @@ export default function usePagination(props = {}) { ...(siblingsStart > boundaryCount + 2 ? ['start-ellipsis'] : boundaryCount + 1 < count - boundaryCount - ? [boundaryCount + 1] - : []), + ? [boundaryCount + 1] + : []), // Sibling pages ...range(siblingsStart, siblingsEnd), @@ -89,8 +89,8 @@ export default function usePagination(props = {}) { ...(siblingsEnd < count - boundaryCount - 1 ? ['end-ellipsis'] : count - boundaryCount > boundaryCount - ? [count - boundaryCount] - : []), + ? [count - boundaryCount] + : []), ...endPages, ...(hideNextButton ? [] : ['next']), diff --git a/packages/mui-system/src/Container/createContainer.tsx b/packages/mui-system/src/Container/createContainer.tsx index b08839f5821448..a5ec4fc96e0f9a 100644 --- a/packages/mui-system/src/Container/createContainer.tsx +++ b/packages/mui-system/src/Container/createContainer.tsx @@ -89,7 +89,7 @@ export default function createContainer>), + }) as Interpolation>, ({ theme, ownerState }: StyleFnProps) => ownerState.fixed && Object.keys(theme.breakpoints.values).reduce((acc, breakpointValueKey) => { diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx b/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx index f4e964ed0bfeed..421a55cc7563b9 100644 --- a/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx +++ b/packages/mui-system/src/cssVars/createCssVarsProvider.spec.tsx @@ -26,10 +26,10 @@ const extendTheme = (themeInput: JoyThemeInput) => dark: { palette: { primary: { main: '' } } }, }, fontSize: { md: '' }, - } as { + }) as { colorSchemes: Record; fontSize: { md: string }; - }); + }; const { CssVarsProvider, useColorScheme } = createCssVarsProvider({ defaultColorScheme: 'light',