Skip to content

Commit 0979e6a

Browse files
authored
[core] Rename packages (mui#28049)
1 parent c3a0d12 commit 0979e6a

File tree

3,136 files changed

+11028
-11170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,136 files changed

+11028
-11170
lines changed

.circleci/config.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ jobs:
157157
158158
if [ $FOLDER_COMMIT = $LATEST_COMMIT ]; then
159159
echo "changes, let's run the tests"
160-
yarn workspace @material-ui/icons build:typings
161-
yarn workspace @material-ui/icons test:built-typings
160+
yarn workspace @mui/icons-material build:typings
161+
yarn workspace @mui/icons-material test:built-typings
162162
else
163163
echo "no changes"
164164
fi
@@ -248,8 +248,8 @@ jobs:
248248
- run:
249249
name: Test module augmenation
250250
command: |
251-
yarn workspace @material-ui/core typescript:module-augmentation
252-
yarn workspace @material-ui/unstyled typescript:module-augmentation
251+
yarn workspace @mui/material typescript:module-augmentation
252+
yarn workspace @mui/core typescript:module-augmentation
253253
254254
- restore_cache:
255255
name: Restore generated declaration files
@@ -367,8 +367,8 @@ jobs:
367367
name: yarn test:e2e
368368
command: yarn test:e2e
369369
- run:
370-
name: Can we generate the @material-ui/core umd build?
371-
command: yarn workspace @material-ui/core build:umd
370+
name: Can we generate the @mui/material umd build?
371+
command: yarn workspace @mui/material build:umd
372372
- run:
373373
name: Test umd release
374374
command: yarn test:umd
@@ -422,7 +422,7 @@ jobs:
422422
- install_js
423423
- run:
424424
name: Build packages for fixtures
425-
command: yarn lerna run --scope "@material-ui/*" build
425+
command: yarn lerna run --scope "@mui/*" build
426426
- persist_to_workspace:
427427
root: packages
428428
paths:

.codesandbox/ci.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
"packages/material-ui-styled-engine-sc"
1818
],
1919
"publishDirectory": {
20-
"@material-ui/codemod": "packages/material-ui-codemod/build",
21-
"@material-ui/core": "packages/material-ui/build",
22-
"@material-ui/icons": "packages/material-ui-icons/build",
23-
"@material-ui/lab": "packages/material-ui-lab/build",
24-
"@material-ui/styles": "packages/material-ui-styles/build",
25-
"@material-ui/styled-engine": "packages/material-ui-styled-engine/build",
26-
"@material-ui/styled-engine-sc": "packages/material-ui-styled-engine-sc/build",
27-
"@material-ui/system": "packages/material-ui-system/build",
28-
"@material-ui/private-theming": "packages/material-ui-private-theming/build",
29-
"@material-ui/types": "packages/material-ui-types/build",
30-
"@material-ui/utils": "packages/material-ui-utils/build",
31-
"@material-ui/unstyled": "packages/material-ui-unstyled/build"
20+
"@mui/codemod": "packages/material-ui-codemod/build",
21+
"@mui/material": "packages/material-ui/build",
22+
"@mui/icons-material": "packages/material-ui-icons/build",
23+
"@mui/lab": "packages/material-ui-lab/build",
24+
"@mui/styles": "packages/material-ui-styles/build",
25+
"@mui/styled-engine": "packages/material-ui-styled-engine/build",
26+
"@mui/styled-engine-sc": "packages/material-ui-styled-engine-sc/build",
27+
"@mui/system": "packages/material-ui-system/build",
28+
"@mui/private-theming": "packages/material-ui-private-theming/build",
29+
"@mui/types": "packages/material-ui-types/build",
30+
"@mui/utils": "packages/material-ui-utils/build",
31+
"@mui/core": "packages/material-ui-unstyled/build"
3232
},
3333
"sandboxes": [
3434
"material-ui-issue-dh2yh",

.eslintrc.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const forbidTopLevelMessage = [
55
'See https://github.com/mui-org/material-ui/pull/24147 for the kind of win it can unlock.',
66
].join('\n');
77
// This only applies to packages published from this monorepo.
8-
// If you build a library around `@material-ui/core` you can safely use `createStyles` without running into the same issue as we are.
8+
// If you build a library around `@mui/material` you can safely use `createStyles` without running into the same issue as we are.
99
const forbidCreateStylesMessage =
1010
'Use `MuiStyles<ClassKey, Props>` instead if the styles are exported. Otherwise use `as const` assertions. ' +
1111
'`createStyles` will lead to inlined, at-compile-time-resolved type-imports. ' +
@@ -63,19 +63,19 @@ module.exports = {
6363
'error',
6464
{
6565
patterns: [
66-
'@material-ui/*/*/*',
66+
'@mui/*/*/*',
6767
// Begin block: Packages with files instead of packages in the top level
6868
// Importing from the top level pulls in CommonJS instead of ES modules
6969
// Allowing /icons as to reduce cold-start of dev builds significantly.
7070
// There's nothing to tree-shake when importing from /icons this way:
71-
// '@material-ui/icons/*/',
72-
'@material-ui/system/*',
73-
'@material-ui/utils/*',
71+
// '@mui/icons-material/*/',
72+
'@mui/system/*',
73+
'@mui/utils/*',
7474
// End block
7575
// Macros are fine since their import path is transpiled away
76-
'!@material-ui/utils/macros',
77-
'@material-ui/utils/macros/*',
78-
'!@material-ui/utils/macros/*.macro',
76+
'!@mui/utils/macros',
77+
'@mui/utils/macros/*',
78+
'!@mui/utils/macros/*.macro',
7979
],
8080
},
8181
],
@@ -262,9 +262,9 @@ module.exports = {
262262
{
263263
patterns: [
264264
// Allow deeper imports for TypeScript types. TODO?
265-
'@material-ui/*/*/*/*',
265+
'@mui/*/*/*/*',
266266
// Macros are fine since they're transpiled into something else
267-
'!@material-ui/utils/macros/*.macro',
267+
'!@mui/utils/macros/*.macro',
268268
],
269269
},
270270
],
@@ -281,25 +281,25 @@ module.exports = {
281281
{
282282
paths: [
283283
{
284-
name: '@material-ui/core/styles',
284+
name: '@mui/material/styles',
285285
importNames: ['createStyles'],
286286
message: forbidCreateStylesMessage,
287287
},
288288
{
289-
name: '@material-ui/styles',
289+
name: '@mui/styles',
290290
importNames: ['createStyles'],
291291
message: forbidCreateStylesMessage,
292292
},
293293
{
294-
name: '@material-ui/styles/createStyles',
294+
name: '@mui/styles/createStyles',
295295
message: forbidCreateStylesMessage,
296296
},
297297
],
298298
patterns: [
299299
// Allow deeper imports for TypeScript types. TODO?
300-
'@material-ui/*/*/*/*',
300+
'@mui/*/*/*/*',
301301
// Macros are fine since they're transpiled into something else
302-
'!@material-ui/utils/macros/*.macro',
302+
'!@mui/utils/macros/*.macro',
303303
],
304304
},
305305
],
@@ -360,11 +360,11 @@ module.exports = {
360360
{
361361
paths: [
362362
{
363-
name: '@material-ui/core',
363+
name: '@mui/material',
364364
message: forbidTopLevelMessage,
365365
},
366366
{
367-
name: '@material-ui/lab',
367+
name: '@mui/lab',
368368
message: forbidTopLevelMessage,
369369
},
370370
],

.github/FUNDING.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, u
44
patreon: # Replace with a single Patreon username
55
open_collective: material-ui
66
ko_fi: # Replace with a single Ko-fi username
7-
tidelift: npm/@material-ui/core
7+
tidelift: npm/@mui/material
88
custom: # Replace with a single custom sponsorship URL

.github/ISSUE_TEMPLATE/1.bug.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ Steps:
5454
## Your Environment 🌎
5555

5656
<!--
57-
Run `npx @material-ui/envinfo` and post the results.
57+
Run `npx @mui/envinfo` and post the results.
5858
If you encounter issues with TypeScript please include the used tsconfig.
5959
-->
6060
<details>
61-
<summary>`npx @material-ui/envinfo`</summary>
61+
<summary>`npx @mui/envinfo`</summary>
6262

6363
```
6464
Don't forget to mention which browser you used.
65-
Output from `npx @material-ui/envinfo` goes here.
65+
Output from `npx @mui/envinfo` goes here.
6666
```
6767
</details>

CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,10 @@ index 791a7da1f4..a5db13b414 100644
269269
@@ -61,7 +61,7 @@
270270
"dependencies": {
271271
"@babel/runtime": "^7.4.4",
272-
"@material-ui/styled-engine": "^5.0.0-alpha.16",
273-
- "@material-ui/core": "^5.0.0-alpha.15",
274-
+ "@material-ui/core": "https://pkg.csb.dev/mui-org/material-ui/commit/371c952b/@material-ui/core",
275-
"@material-ui/system": "^5.0.0-alpha.16",
272+
"@mui/styled-engine": "^5.0.0-alpha.16",
273+
- "@mui/material": "^5.0.0-alpha.15",
274+
+ "@mui/material": "https://pkg.csb.dev/mui-org/material-ui/commit/371c952b/@mui/material",
275+
"@mui/system": "^5.0.0-alpha.16",
276276
```
277277

278278
Alternatively, you can open the Netlify preview of the documentation, and open any demo in Codesandbox. The documentation automatically configures the dependencies to use the preview packages.

README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
Quickly build beautiful [React](https://reactjs.org/) apps. Material-UI is a simple and customizable component library to build faster, beautiful, and more accessible React applications. Follow your own design system, or start with [Material Design](https://material.io/design/introduction/).
1010

1111
[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/mui-org/material-ui/blob/master/LICENSE)
12-
[![npm latest package](https://img.shields.io/npm/v/@material-ui/core/latest.svg)](https://www.npmjs.com/package/@material-ui/core)
13-
[![npm next package](https://img.shields.io/npm/v/@material-ui/core/next.svg)](https://www.npmjs.com/package/@material-ui/core)
14-
[![npm downloads](https://img.shields.io/npm/dm/@material-ui/core.svg)](https://www.npmjs.com/package/@material-ui/core)
12+
[![npm latest package](https://img.shields.io/npm/v/@mui/material/latest.svg)](https://www.npmjs.com/package/@mui/material)
13+
[![npm next package](https://img.shields.io/npm/v/@mui/material/next.svg)](https://www.npmjs.com/package/@mui/material)
14+
[![npm downloads](https://img.shields.io/npm/dm/@mui/material.svg)](https://www.npmjs.com/package/@mui/material)
1515
[![CircleCI](https://img.shields.io/circleci/project/github/mui-org/material-ui/next.svg)](https://app.circleci.com/pipelines/github/mui-org/material-ui?branch=next)
1616
[![Coverage Status](https://img.shields.io/codecov/c/github/mui-org/material-ui/next.svg)](https://codecov.io/gh/mui-org/material-ui/branch/next)
1717
[![Follow on Twitter](https://img.shields.io/twitter/follow/MaterialUI.svg?label=follow+Material-UI)](https://twitter.com/MaterialUI)
@@ -24,16 +24,16 @@ Quickly build beautiful [React](https://reactjs.org/) apps. Material-UI is a sim
2424

2525
## Installation
2626

27-
Material-UI is available as an [npm package](https://www.npmjs.com/package/@material-ui/core).
27+
Material-UI is available as an [npm package](https://www.npmjs.com/package/@mui/material).
2828

2929
**[Stable channel v4](https://material-ui.com/)**
3030

3131
```sh
3232
// with npm
33-
npm install @material-ui/core
33+
npm install @mui/material
3434

3535
// with yarn
36-
yarn add @material-ui/core
36+
yarn add @mui/material
3737
```
3838

3939
⚠️ All ongoing work has moved to v5. The development of v4 is limited to important bug fixes, security patches and easing the upgrade path to v5.
@@ -42,10 +42,10 @@ yarn add @material-ui/core
4242

4343
```sh
4444
// with npm
45-
npm install @material-ui/core@next @emotion/react @emotion/styled
45+
npm install @mui/material@next @emotion/react @emotion/styled
4646

4747
// with yarn
48-
yarn add @material-ui/core@next @emotion/react @emotion/styled
48+
yarn add @mui/material@next @emotion/react @emotion/styled
4949
```
5050

5151
<details>
@@ -107,7 +107,7 @@ Here is a quick example to get you started, **it's all you need**:
107107
```jsx
108108
import * as React from 'react';
109109
import ReactDOM from 'react-dom';
110-
import Button from '@material-ui/core/Button';
110+
import Button from '@mui/material/Button';
111111

112112
function App() {
113113
return <Button variant="contained">Hello World</Button>;

TYPESCRIPT_CONVENTION.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Component
44

5-
> **Public components** are considered all components exported from `@material-ui/core` or `@material-ui/lab`.
5+
> **Public components** are considered all components exported from `@mui/material` or `@mui/lab`.
66
>
77
> **Internal components** are considered all components that are not exported from the packages, but only used in some public component. There is no need to have `sx` prop on these components
88

azure-pipelines.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ jobs:
7070
displayName: Cache node_modules/.cache
7171

7272
- script: |
73-
yarn lerna run --ignore @material-ui/icons --parallel --scope "@material-ui/*" build
74-
displayName: 'build @material-ui packages'
73+
yarn lerna run --ignore @mui/icons-material --parallel --scope "@mui/*" build
74+
displayName: 'build @mui packages'
7575
7676
- script: |
7777
cd packages/material-ui/build
7878
npm version 0.0.0-canary.$(Build.SourceVersion) --no-git-tag-version
7979
npm pack
80-
mv material-ui-core-0.0.0-canary.$(Build.SourceVersion).tgz ../../../material-ui-core.tgz
81-
displayName: 'create @material-ui/core canary distributable'
80+
mv mui-material-0.0.0-canary.$(Build.SourceVersion).tgz ../../../mui-material.tgz
81+
displayName: 'create @mui/material canary distributable'
8282
8383
- task: S3Upload@1
8484
inputs:
@@ -96,7 +96,7 @@ jobs:
9696
- task: PublishPipelineArtifact@1
9797
inputs:
9898
artifactName: 'canaries'
99-
targetPath: 'material-ui-core.tgz'
99+
targetPath: 'mui-material.tgz'
100100

101101
- script: |
102102
yarn size:snapshot

babel.config.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ function resolveAliasPath(relativeToBabelConf) {
99
}
1010

1111
const defaultAlias = {
12-
'@material-ui/core': resolveAliasPath('./packages/material-ui/src'),
13-
'@material-ui/docs': resolveAliasPath('./packages/material-ui-docs/src'),
14-
'@material-ui/icons': resolveAliasPath('./packages/material-ui-icons/lib'),
15-
'@material-ui/lab': resolveAliasPath('./packages/material-ui-lab/src'),
16-
'@material-ui/styled-engine': resolveAliasPath('./packages/material-ui-styled-engine/src'),
17-
'@material-ui/styled-engine-sc': resolveAliasPath('./packages/material-ui-styled-engine-sc/src'),
18-
'@material-ui/styles': resolveAliasPath('./packages/material-ui-styles/src'),
19-
'@material-ui/system': resolveAliasPath('./packages/material-ui-system/src'),
20-
'@material-ui/private-theming': resolveAliasPath('./packages/material-ui-private-theming/src'),
21-
'@material-ui/unstyled': resolveAliasPath('./packages/material-ui-unstyled/src'),
22-
'@material-ui/utils': resolveAliasPath('./packages/material-ui-utils/src'),
12+
'@mui/material': resolveAliasPath('./packages/material-ui/src'),
13+
'@mui/docs': resolveAliasPath('./packages/material-ui-docs/src'),
14+
'@mui/icons-material': resolveAliasPath('./packages/material-ui-icons/lib'),
15+
'@mui/lab': resolveAliasPath('./packages/material-ui-lab/src'),
16+
'@mui/styled-engine': resolveAliasPath('./packages/material-ui-styled-engine/src'),
17+
'@mui/styled-engine-sc': resolveAliasPath('./packages/material-ui-styled-engine-sc/src'),
18+
'@mui/styles': resolveAliasPath('./packages/material-ui-styles/src'),
19+
'@mui/system': resolveAliasPath('./packages/material-ui-system/src'),
20+
'@mui/private-theming': resolveAliasPath('./packages/material-ui-private-theming/src'),
21+
'@mui/core': resolveAliasPath('./packages/material-ui-unstyled/src'),
22+
'@mui/utils': resolveAliasPath('./packages/material-ui-utils/src'),
2323
};
2424

2525
const productionPlugins = [

benchmark/browser/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Box Theme-UI:
3939
172 ±8%
4040
Box Chakra-UI:
4141
115 ±8%
42-
styled-components Box + @material-ui/system:
42+
styled-components Box + @mui/system:
4343
194 ±9%
4444
styled-components Box + styled-system:
4545
162 ±10%

benchmark/browser/scenarios/box-material-ui/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import Box from '@material-ui/core/Box';
2+
import Box from '@mui/material/Box';
33

44
export default function SxPropBoxMaterialUI() {
55
return (

benchmark/browser/scenarios/make-styles/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
2-
import { createTheme } from '@material-ui/core/styles';
3-
import { makeStyles } from '@material-ui/styles';
2+
import { createTheme } from '@mui/material/styles';
3+
import { makeStyles } from '@mui/styles';
44

55
const defaultTheme = createTheme();
66

benchmark/browser/scenarios/styled-components-box-material-ui-system/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from 'react';
2-
import { createTheme } from '@material-ui/core/styles';
2+
import { createTheme } from '@mui/material/styles';
33
import styledComponents, {
44
ThemeProvider as StyledComponentsThemeProvider,
55
} from 'styled-components';
6-
import { spacing, palette, typography, compose } from '@material-ui/system';
6+
import { spacing, palette, typography, compose } from '@mui/system';
77

88
const materialSystem = compose(palette, spacing, typography);
99
const materialSystemTheme = createTheme();
@@ -20,7 +20,7 @@ export default function StyledComponentsBoxMaterialUISystem() {
2020
fontSize={['h6.fontSize', 'h4.fontSize', 'h3.fontSize']}
2121
p={[2, 3, 4]}
2222
>
23-
@material-ui/system
23+
@mui/system
2424
</BoxMaterialSystem>
2525
))}
2626
</StyledComponentsThemeProvider>

benchmark/browser/scenarios/styled-components-box-styled-system/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { createTheme } from '@material-ui/core/styles';
2+
import { createTheme } from '@mui/material/styles';
33
import styledComponents, {
44
ThemeProvider as StyledComponentsThemeProvider,
55
} from 'styled-components';

benchmark/browser/scenarios/styled-emotion/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { createTheme } from '@material-ui/core/styles';
2+
import { createTheme } from '@mui/material/styles';
33
import emotionStyled from '@emotion/styled';
44

55
const Div = emotionStyled('div')(

benchmark/browser/scenarios/styled-material-ui/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { styled } from '@material-ui/core/styles';
2+
import { styled } from '@mui/material/styles';
33

44
const Div = styled('div')(
55
({ theme }) => `

0 commit comments

Comments
 (0)