Skip to content

Commit 49b3469

Browse files
authored
[core] Rename directories to match the new package names (#28185)
1 parent 2db48e8 commit 49b3469

File tree

29,101 files changed

+433
-464
lines changed

Some content is hidden

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

29,101 files changed

+433
-464
lines changed

.circleci/config.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ jobs:
152152
# latest commit
153153
LATEST_COMMIT=$(git rev-parse HEAD)
154154
155-
# latest commit where packages/material-ui-icons was changed
156-
FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/material-ui-icons)
155+
# latest commit where packages/mui-icons-material was changed
156+
FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/mui-icons-material)
157157
158158
if [ $FOLDER_COMMIT = $LATEST_COMMIT ]; then
159159
echo "changes, let's run the tests"
@@ -261,9 +261,9 @@ jobs:
261261
- run:
262262
name: Diff declaration files
263263
command: |
264-
git add -f packages/material-ui/build || echo '/core declarations do not exist'
265-
git add -f packages/material-ui-lab/build || echo '/lab declarations do not exist'
266-
git add -f packages/material-ui-utils/build || echo '/utils declarations do not exist'
264+
git add -f packages/mui-material/build || echo '/core declarations do not exist'
265+
git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
266+
git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
267267
yarn lerna run --parallel build:types
268268
git --no-pager diff
269269
@@ -275,9 +275,9 @@ jobs:
275275
key: typescript-declaration-files-{{ .Branch }}-{{ .Revision }}
276276
paths:
277277
# packages with generated declaration files
278-
- packages/material-ui/build
279-
- packages/material-ui-lab/build
280-
- packages/material-ui-utils/build
278+
- packages/mui-material/build
279+
- packages/mui-lab/build
280+
- packages/mui-utils/build
281281
test_types_next:
282282
<<: *defaults
283283
steps:
@@ -311,9 +311,9 @@ jobs:
311311
- run:
312312
name: Diff declaration files
313313
command: |
314-
git add -f packages/material-ui/build || echo '/core declarations do not exist'
315-
git add -f packages/material-ui-lab/build || echo '/lab declarations do not exist'
316-
git add -f packages/material-ui-utils/build || echo '/utils declarations do not exist'
314+
git add -f packages/mui-material/build || echo '/core declarations do not exist'
315+
git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
316+
git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
317317
yarn lerna run --parallel build:types
318318
git --no-pager diff
319319

.codesandbox/ci.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33
"installCommand": "install:codesandbox",
44
"node": "12",
55
"packages": [
6-
"packages/material-ui",
7-
"packages/material-ui-codemod",
8-
"packages/material-ui-icons",
9-
"packages/material-ui-lab",
10-
"packages/material-ui-styles",
11-
"packages/material-ui-system",
12-
"packages/material-ui-private-theming",
13-
"packages/material-ui-types",
14-
"packages/material-ui-utils",
15-
"packages/material-ui-unstyled",
16-
"packages/material-ui-styled-engine",
17-
"packages/material-ui-styled-engine-sc"
6+
"packages/mui-material",
7+
"packages/mui-codemod",
8+
"packages/mui-icons-material",
9+
"packages/mui-lab",
10+
"packages/mui-styles",
11+
"packages/mui-system",
12+
"packages/mui-private-theming",
13+
"packages/mui-types",
14+
"packages/mui-utils",
15+
"packages/mui-core",
16+
"packages/mui-styled-engine",
17+
"packages/mui-styled-engine-sc"
1818
],
1919
"publishDirectory": {
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"
20+
"@mui/codemod": "packages/mui-codemod/build",
21+
"@mui/material": "packages/mui-material/build",
22+
"@mui/icons-material": "packages/mui-icons-material/build",
23+
"@mui/lab": "packages/mui-lab/build",
24+
"@mui/styles": "packages/mui-styles/build",
25+
"@mui/styled-engine": "packages/mui-styled-engine/build",
26+
"@mui/styled-engine-sc": "packages/mui-styled-engine-sc/build",
27+
"@mui/system": "packages/mui-system/build",
28+
"@mui/private-theming": "packages/mui-private-theming/build",
29+
"@mui/types": "packages/mui-types/build",
30+
"@mui/utils": "packages/mui-utils/build",
31+
"@mui/core": "packages/mui-core/build"
3232
},
3333
"sandboxes": [
3434
"material-ui-issue-dh2yh",

.eslintignore

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
/examples/preact/scripts
1010
# auto-generated by Framer
1111
/framer/Material-UI.framerfx/design/document.json
12-
/packages/material-ui-codemod/lib
13-
/packages/material-ui-codemod/src/*/*.test/*
14-
/packages/material-ui-icons/fixtures
15-
/packages/material-ui-icons/legacy
16-
/packages/material-ui-icons/lib
17-
/packages/material-ui-icons/material-icons/
18-
/packages/material-ui-icons/src/*.js
19-
/packages/material-ui-icons/templateSvgIcon.js
20-
/packages/material-ui-utils/macros/__fixtures__/
12+
/packages/mui-codemod/lib
13+
/packages/mui-codemod/src/*/*.test/*
14+
/packages/mui-icons-material/fixtures
15+
/packages/mui-icons-material/legacy
16+
/packages/mui-icons-material/lib
17+
/packages/mui-icons-material/material-icons/
18+
/packages/mui-icons-material/src/*.js
19+
/packages/mui-icons-material/templateSvgIcon.js
20+
/packages/mui-utils/macros/__fixtures__/
2121
# Ignore fixtures
2222
/packages/typescript-to-proptypes/test/*/*
2323
/test/bundling/fixtures/**/*.fixture.js

.gitattributes

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
packages/**/*.d.ts -linguist-vendored
66
# These icons are imported from Google.
77
# Kept so that we can review the impact when changing the generation script.
8-
packages/material-ui-icons/lib/** linguist-generated
9-
packages/material-ui-icons/material-icons/** linguist-generated
10-
packages/material-ui-icons/legacy/** linguist-vendored
8+
packages/mui-icons-material/lib/** linguist-generated
9+
packages/mui-icons-material/material-icons/** linguist-generated
10+
packages/mui-icons-material/legacy/** linguist-vendored
1111
# bundling fixtures
1212
test/bundling/scripts/packages.js linguist-generated

.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
/docs/.env.local
1313
/docs/export
1414
/examples/**/.cache
15-
/packages/material-ui-codemod/lib
16-
/packages/material-ui-envinfo/*.tgz
17-
/packages/material-ui-icons/src/*.js
15+
/packages/mui-codemod/lib
16+
/packages/mui-envinfo/*.tgz
17+
/packages/mui-icons-material/src/*.js
1818
/test/bundling/fixtures/*/yarn.lock
1919
# created by test/bundling/scripts/createFixture
2020
/test/bundling/fixtures/**/*.fixture.js

CHANGELOG.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ _Sep 1, 2021_
99
A big thanks to the 18 contributors who made this release possible. Here are some highlights ✨:
1010

1111
- 🎉 Renamed packages to `@mui/*` as part of rebranding the company, following the strategy of expanding the library scope beyond Material Design. For more details about it, check the [GitHub discussion](https://github.com/mui-org/material-ui/discussions/27803).
12-
- 🛠 Added `mui-replace` codemod for migrating `@material-ui/*` to new packages `@mui/*`. Check out this [codemod detail](https://github.com/mui-org/material-ui/blob/next/packages/material-ui-codemod/README.md#mui-replace) or head to [migration guide](https://next.material-ui.com/guides/migration-v4/#preset-safe)
12+
- 🛠 Added `mui-replace` codemod for migrating `@material-ui/*` to new packages `@mui/*`. Check out this [codemod detail](https://github.com/mui-org/material-ui/blob/next/packages/mui-codemod/README.md#mui-replace) or head to [migration guide](https://next.material-ui.com/guides/migration-v4/#preset-safe)
1313
- 🧪 Added new `<Mansory>` component to the lab, [check it out](https://next.material-ui.com/components/masonry/). It has been crafted by our first intern, @hbjORbj 👏!
1414

1515
@@ -41,7 +41,7 @@ A big thanks to the 18 contributors who made this release possible. Here are som
4141

4242
> **Note**: `@mui/core` (previously `@material-ui/unstyled`) is not the same as `@material-ui/core`.
4343
44-
We encourage you to use the [codemod](https://github.com/mui-org/material-ui/blob/next/packages/material-ui-codemod/README.md#mui-replace) for smooth migration.
44+
We encourage you to use the [codemod](https://github.com/mui-org/material-ui/blob/next/packages/mui-codemod/README.md#mui-replace) for smooth migration.
4545

4646
#### Changes
4747

@@ -612,7 +612,7 @@ A big thanks to the 13 contributors who made this release possible. Here are som
612612

613613
- 🎉 This is the first beta release of v5! A huge thanks to everyone who helped to make this happen! We're targeting the 1st of September for a stable release, and will use the next two months to polish v5, and ease the migration from v4. You can follow [the v5 stable milestone](https://github.com/mui-org/material-ui/milestone/44) for more details. We now encourage any new projects to start on v5.
614614
- 🚀 We have completed all the planned breaking changes.
615-
- ⚒️ We added the codemod CLI to simplify migration to v5 (#26941) @eps1lon. You can find it at [`@material-ui/codemod`](https://github.com/mui-org/material-ui/tree/HEAD/packages/material-ui-codemod).
615+
- ⚒️ We added the codemod CLI to simplify migration to v5 (#26941) @eps1lon. You can find it at [`@material-ui/codemod`](https://github.com/mui-org/material-ui/tree/HEAD/packages/mui-codemod).
616616
- 🐛 The majority of other changes in this release were bug fixes, test utilities and docs.
617617

618618
### `@material-ui/[email protected]`
@@ -1175,7 +1175,7 @@ A big thanks to the 14 contributors who made this release possible. Here are som
11751175

11761176
- 👩‍🎤 We have completed the migration to emotion of all the components (`@material-ui/core` and `@material-ui/lab`) @siriwatknp, @mnajdova.
11771177
- 📦 Save [10 kB gzipped](https://bundlephobia.com/result?p=@material-ui/[email protected]) by removing the dependency on `@material-ui/styles` (JSS) from the core and the lab (#26377, #26382, #26376) @mnajdova.
1178-
- ⚒️ Add many new [codemods](https://github.com/mui-org/material-ui/blob/HEAD/packages/material-ui-codemod/README.md) to automate the migration from v4 to v5 (#24867) @mbrookes.
1178+
- ⚒️ Add many new [codemods](https://github.com/mui-org/material-ui/blob/HEAD/packages/mui-codemod/README.md) to automate the migration from v4 to v5 (#24867) @mbrookes.
11791179
- And many more 🐛 bug fixes and 📚 improvements.
11801180

11811181
### `@material-ui/[email protected]`
@@ -2004,7 +2004,7 @@ A big thanks to the 19 contributors who made this release possible. Here are som
20042004
#### Breaking changes
20052005

20062006
- [FormControl] Change default variant from standard to outlined (#24895) @petyosi
2007-
Standard has been removed from the Material Design guidelines. [This codemod](https://github.com/mui-org/material-ui/tree/next/packages/material-ui-codemod#variant-prop) will automatically update your code.
2007+
Standard has been removed from the Material Design guidelines. [This codemod](https://github.com/mui-org/material-ui/tree/next/packages/mui-codemod#variant-prop) will automatically update your code.
20082008

20092009
```diff
20102010
-<FormControl value="Standard" />
@@ -2016,7 +2016,7 @@ A big thanks to the 19 contributors who made this release possible. Here are som
20162016
- [Menu] The `selectedMenu` variant will not vertically align the selected item with the anchor anymore. (#25691) @m4theushw
20172017
- [Popover] Remove the `getContentAnchorEl` prop to simplify the positioning logic. (#25691) @m4theushw
20182018
- [Select] Change default variant from standard to outlined (#24895) @petyosi
2019-
Standard has been removed from the Material Design guidelines. [This codemod](https://github.com/mui-org/material-ui/tree/next/packages/material-ui-codemod#variant-prop) will automatically update your code.
2019+
Standard has been removed from the Material Design guidelines. [This codemod](https://github.com/mui-org/material-ui/tree/next/packages/mui-codemod#variant-prop) will automatically update your code.
20202020

20212021
```diff
20222022
-<Select value="Standard" />
@@ -3438,7 +3438,7 @@ A big thanks to the 17 contributors who made this release possible. Here are som
34383438

34393439
- [Box] Remove deprecated props (#23716) @mnajdova
34403440
All props are now available under the `sx` prop. A deprecation will be landing in v4.
3441-
Thanks to @mbrookes developers can automate the migration with a [codemod](https://github.com/mui-org/material-ui/blob/next/packages/material-ui-codemod/README.md#box-sx-prop).
3441+
Thanks to @mbrookes developers can automate the migration with a [codemod](https://github.com/mui-org/material-ui/blob/next/packages/mui-codemod/README.md#box-sx-prop).
34423442

34433443
```diff
34443444
-<Box p={2} bgColor="primary.main">
@@ -3702,7 +3702,7 @@ A big thanks to the 34 contributors who made this release possible. Here are som
37023702
#### Breaking changes
37033703

37043704
- [TextField] Change default variant from standard to outlined (#23503) @mbrookes
3705-
Standard has been removed from the Material Design guidelines. [This codemod](https://github.com/mui-org/material-ui/tree/next/packages/material-ui-codemod#variant-prop) will automatically update your code.
3705+
Standard has been removed from the Material Design guidelines. [This codemod](https://github.com/mui-org/material-ui/tree/next/packages/mui-codemod#variant-prop) will automatically update your code.
37063706

37073707
```diff
37083708
-<TextField value="Standard" />

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Make sure the following is true:
105105
- If this is a common use case, consider adding an example to the documentation.
106106
- When adding new features or modifying existing ones, please include tests to confirm the new behavior. You can read more about our test setup in our test [README](https://github.com/mui-org/material-ui/blob/HEAD/test/README.md).
107107
- If props were added or prop types were changed, the TypeScript declarations were updated.
108-
- When submitting a new component, please add it to the [lab](https://github.com/mui-org/material-ui/tree/HEAD/packages/material-ui-lab).
108+
- When submitting a new component, please add it to the [lab](https://github.com/mui-org/material-ui/tree/HEAD/packages/mui-lab).
109109
- The branch is not [behind its target branch](https://github.community/t/branch-10-commits-behind/2403).
110110

111111
Because we will only merge a Pull Request for which all tests pass. The following items need to be true:
@@ -195,7 +195,7 @@ on _Details_ to find out more about them.
195195
### Updating the component API documentation
196196

197197
The component API in the component `propTypes` and under `docs/pages/api-docs` is auto-generated from the [JSDoc](https://jsdoc.app/about-getting-started.html) in the TypeScript declarations.
198-
Be sure to update the documentation in the corresponding `.d.ts` files (e.g. `packages/material-ui/src/Button/Button.d.ts` for `<Button>`) and then run:
198+
Be sure to update the documentation in the corresponding `.d.ts` files (e.g. `packages/mui-material/src/Button/Button.d.ts` for `<Button>`) and then run:
199199

200200
```sh
201201
$ yarn proptypes

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
displayName: 'build @mui packages'
7575
7676
- script: |
77-
cd packages/material-ui/build
77+
cd packages/mui-material/build
7878
npm version 0.0.0-canary.$(Build.SourceVersion) --no-git-tag-version
7979
npm pack
8080
mv mui-material-0.0.0-canary.$(Build.SourceVersion).tgz ../../../mui-material.tgz

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-
'@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'),
12+
'@mui/material': resolveAliasPath('./packages/mui-material/src'),
13+
'@mui/docs': resolveAliasPath('./packages/mui-docs/src'),
14+
'@mui/icons-material': resolveAliasPath('./packages/mui-icons-material/lib'),
15+
'@mui/lab': resolveAliasPath('./packages/mui-lab/src'),
16+
'@mui/styled-engine': resolveAliasPath('./packages/mui-styled-engine/src'),
17+
'@mui/styled-engine-sc': resolveAliasPath('./packages/mui-styled-engine-sc/src'),
18+
'@mui/styles': resolveAliasPath('./packages/mui-styles/src'),
19+
'@mui/system': resolveAliasPath('./packages/mui-system/src'),
20+
'@mui/private-theming': resolveAliasPath('./packages/mui-private-theming/src'),
21+
'@mui/core': resolveAliasPath('./packages/mui-core/src'),
22+
'@mui/utils': resolveAliasPath('./packages/mui-utils/src'),
2323
};
2424

2525
const productionPlugins = [

docs/babel.config.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ function resolvePath(sourcePath, currentFile, opts) {
1414
}
1515

1616
const alias = {
17-
'@mui/material': '../packages/material-ui/src',
18-
'@mui/docs': '../packages/material-ui-docs/src',
19-
'@mui/icons-material': '../packages/material-ui-icons/lib',
20-
'@mui/lab': '../packages/material-ui-lab/src',
21-
'@mui/styles': '../packages/material-ui-styles/src',
22-
'@mui/styled-engine-sc': '../packages/material-ui-styled-engine-sc/src',
17+
'@mui/material': '../packages/mui-material/src',
18+
'@mui/docs': '../packages/mui-docs/src',
19+
'@mui/icons-material': '../packages/mui-icons-material/lib',
20+
'@mui/lab': '../packages/mui-lab/src',
21+
'@mui/styles': '../packages/mui-styles/src',
22+
'@mui/styled-engine-sc': '../packages/mui-styled-engine-sc/src',
2323
// Swap the comments on the next two lines for using the styled-components as style engine
24-
'@mui/styled-engine': '../packages/material-ui-styled-engine/src',
25-
// '@mui/styled-engine': '../packages/material-ui-styled-engine-sc/src',
26-
'@mui/system': '../packages/material-ui-system/src',
27-
'@mui/private-theming': '../packages/material-ui-private-theming/src',
28-
'@mui/utils': '../packages/material-ui-utils/src',
29-
'@mui/core': '../packages/material-ui-unstyled/src',
24+
'@mui/styled-engine': '../packages/mui-styled-engine/src',
25+
// '@mui/styled-engine': '../packages/mui-styled-engine-sc/src',
26+
'@mui/system': '../packages/mui-system/src',
27+
'@mui/private-theming': '../packages/mui-private-theming/src',
28+
'@mui/utils': '../packages/mui-utils/src',
29+
'@mui/core': '../packages/mui-core/src',
3030
docs: './',
3131
modules: '../modules',
3232
pages: './pages',

0 commit comments

Comments
 (0)