Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Rename directories to match the new package names #28185

Merged
merged 9 commits into from
Sep 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ jobs:
# latest commit
LATEST_COMMIT=$(git rev-parse HEAD)

# latest commit where packages/material-ui-icons was changed
FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/material-ui-icons)
# latest commit where packages/mui-icons-material was changed
FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/mui-icons-material)

if [ $FOLDER_COMMIT = $LATEST_COMMIT ]; then
echo "changes, let's run the tests"
Expand Down Expand Up @@ -261,9 +261,9 @@ jobs:
- run:
name: Diff declaration files
command: |
git add -f packages/material-ui/build || echo '/core declarations do not exist'
git add -f packages/material-ui-lab/build || echo '/lab declarations do not exist'
git add -f packages/material-ui-utils/build || echo '/utils declarations do not exist'
git add -f packages/mui-material/build || echo '/core declarations do not exist'
git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
yarn lerna run --parallel build:types
git --no-pager diff

Expand All @@ -275,9 +275,9 @@ jobs:
key: typescript-declaration-files-{{ .Branch }}-{{ .Revision }}
paths:
# packages with generated declaration files
- packages/material-ui/build
- packages/material-ui-lab/build
- packages/material-ui-utils/build
- packages/mui-material/build
- packages/mui-lab/build
- packages/mui-utils/build
test_types_next:
<<: *defaults
steps:
Expand Down Expand Up @@ -311,9 +311,9 @@ jobs:
- run:
name: Diff declaration files
command: |
git add -f packages/material-ui/build || echo '/core declarations do not exist'
git add -f packages/material-ui-lab/build || echo '/lab declarations do not exist'
git add -f packages/material-ui-utils/build || echo '/utils declarations do not exist'
git add -f packages/mui-material/build || echo '/core declarations do not exist'
git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
yarn lerna run --parallel build:types
git --no-pager diff

Expand Down
48 changes: 24 additions & 24 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@
"installCommand": "install:codesandbox",
"node": "12",
"packages": [
"packages/material-ui",
"packages/material-ui-codemod",
"packages/material-ui-icons",
"packages/material-ui-lab",
"packages/material-ui-styles",
"packages/material-ui-system",
"packages/material-ui-private-theming",
"packages/material-ui-types",
"packages/material-ui-utils",
"packages/material-ui-unstyled",
"packages/material-ui-styled-engine",
"packages/material-ui-styled-engine-sc"
"packages/mui-material",
"packages/mui-codemod",
"packages/mui-icons-material",
"packages/mui-lab",
"packages/mui-styles",
"packages/mui-system",
"packages/mui-private-theming",
"packages/mui-types",
"packages/mui-utils",
"packages/mui-core",
"packages/mui-styled-engine",
"packages/mui-styled-engine-sc"
],
"publishDirectory": {
"@mui/codemod": "packages/material-ui-codemod/build",
"@mui/material": "packages/material-ui/build",
"@mui/icons-material": "packages/material-ui-icons/build",
"@mui/lab": "packages/material-ui-lab/build",
"@mui/styles": "packages/material-ui-styles/build",
"@mui/styled-engine": "packages/material-ui-styled-engine/build",
"@mui/styled-engine-sc": "packages/material-ui-styled-engine-sc/build",
"@mui/system": "packages/material-ui-system/build",
"@mui/private-theming": "packages/material-ui-private-theming/build",
"@mui/types": "packages/material-ui-types/build",
"@mui/utils": "packages/material-ui-utils/build",
"@mui/core": "packages/material-ui-unstyled/build"
"@mui/codemod": "packages/mui-codemod/build",
"@mui/material": "packages/mui-material/build",
"@mui/icons-material": "packages/mui-icons-material/build",
"@mui/lab": "packages/mui-lab/build",
"@mui/styles": "packages/mui-styles/build",
"@mui/styled-engine": "packages/mui-styled-engine/build",
"@mui/styled-engine-sc": "packages/mui-styled-engine-sc/build",
"@mui/system": "packages/mui-system/build",
"@mui/private-theming": "packages/mui-private-theming/build",
"@mui/types": "packages/mui-types/build",
"@mui/utils": "packages/mui-utils/build",
"@mui/core": "packages/mui-core/build"
},
"sandboxes": [
"material-ui-issue-dh2yh",
Expand Down
18 changes: 9 additions & 9 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
/examples/preact/scripts
# auto-generated by Framer
/framer/Material-UI.framerfx/design/document.json
/packages/material-ui-codemod/lib
/packages/material-ui-codemod/src/*/*.test/*
/packages/material-ui-icons/fixtures
/packages/material-ui-icons/legacy
/packages/material-ui-icons/lib
/packages/material-ui-icons/material-icons/
/packages/material-ui-icons/src/*.js
/packages/material-ui-icons/templateSvgIcon.js
/packages/material-ui-utils/macros/__fixtures__/
/packages/mui-codemod/lib
/packages/mui-codemod/src/*/*.test/*
/packages/mui-icons-material/fixtures
/packages/mui-icons-material/legacy
/packages/mui-icons-material/lib
/packages/mui-icons-material/material-icons/
/packages/mui-icons-material/src/*.js
/packages/mui-icons-material/templateSvgIcon.js
/packages/mui-utils/macros/__fixtures__/
# Ignore fixtures
/packages/typescript-to-proptypes/test/*/*
/test/bundling/fixtures/**/*.fixture.js
Expand Down
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
packages/**/*.d.ts -linguist-vendored
# These icons are imported from Google.
# Kept so that we can review the impact when changing the generation script.
packages/material-ui-icons/lib/** linguist-generated
packages/material-ui-icons/material-icons/** linguist-generated
packages/material-ui-icons/legacy/** linguist-vendored
packages/mui-icons-material/lib/** linguist-generated
packages/mui-icons-material/material-icons/** linguist-generated
packages/mui-icons-material/legacy/** linguist-vendored
# bundling fixtures
test/bundling/scripts/packages.js linguist-generated
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
/docs/.env.local
/docs/export
/examples/**/.cache
/packages/material-ui-codemod/lib
/packages/material-ui-envinfo/*.tgz
/packages/material-ui-icons/src/*.js
/packages/mui-codemod/lib
/packages/mui-envinfo/*.tgz
/packages/mui-icons-material/src/*.js
/test/bundling/fixtures/*/yarn.lock
# created by test/bundling/scripts/createFixture
/test/bundling/fixtures/**/*.fixture.js
Expand Down
16 changes: 8 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ _Sep 1, 2021_
A big thanks to the 18 contributors who made this release possible. Here are some highlights ✨:

- 🎉 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).
- 🛠 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)
- 🛠 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)
- 🧪 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 👏!

### `@mui/material@5.0.0-rc.0`
Expand Down Expand Up @@ -41,7 +41,7 @@ A big thanks to the 18 contributors who made this release possible. Here are som

> **Note**: `@mui/core` (previously `@material-ui/unstyled`) is not the same as `@material-ui/core`.

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.
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.

#### Changes

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

- 🎉 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.
- 🚀 We have completed all the planned breaking changes.
- ⚒️ 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).
- ⚒️ 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).
- 🐛 The majority of other changes in this release were bug fixes, test utilities and docs.

### `@material-ui/core@5.0.0-beta.0`
Expand Down Expand Up @@ -1175,7 +1175,7 @@ A big thanks to the 14 contributors who made this release possible. Here are som

- 👩‍🎤 We have completed the migration to emotion of all the components (`@material-ui/core` and `@material-ui/lab`) @siriwatknp, @mnajdova.
- 📦 Save [10 kB gzipped](https://bundlephobia.com/result?p=@material-ui/core@5.0.0-alpha.34) by removing the dependency on `@material-ui/styles` (JSS) from the core and the lab (#26377, #26382, #26376) @mnajdova.
- ⚒️ 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.
- ⚒️ 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.
- And many more 🐛 bug fixes and 📚 improvements.

### `@material-ui/core@5.0.0-alpha.35`
Expand Down Expand Up @@ -2004,7 +2004,7 @@ A big thanks to the 19 contributors who made this release possible. Here are som
#### Breaking changes

- [FormControl] Change default variant from standard to outlined (#24895) @petyosi
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.
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.

```diff
-<FormControl value="Standard" />
Expand All @@ -2016,7 +2016,7 @@ A big thanks to the 19 contributors who made this release possible. Here are som
- [Menu] The `selectedMenu` variant will not vertically align the selected item with the anchor anymore. (#25691) @m4theushw
- [Popover] Remove the `getContentAnchorEl` prop to simplify the positioning logic. (#25691) @m4theushw
- [Select] Change default variant from standard to outlined (#24895) @petyosi
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.
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.

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

- [Box] Remove deprecated props (#23716) @mnajdova
All props are now available under the `sx` prop. A deprecation will be landing in v4.
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).
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).

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

- [TextField] Change default variant from standard to outlined (#23503) @mbrookes
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.
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.

```diff
-<TextField value="Standard" />
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Make sure the following is true:
- If this is a common use case, consider adding an example to the documentation.
- 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).
- If props were added or prop types were changed, the TypeScript declarations were updated.
- When submitting a new component, please add it to the [lab](https://github.com/mui-org/material-ui/tree/HEAD/packages/material-ui-lab).
- When submitting a new component, please add it to the [lab](https://github.com/mui-org/material-ui/tree/HEAD/packages/mui-lab).
- The branch is not [behind its target branch](https://github.community/t/branch-10-commits-behind/2403).

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

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.
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:
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:

```sh
$ yarn proptypes
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
displayName: 'build @mui packages'

- script: |
cd packages/material-ui/build
cd packages/mui-material/build
npm version 0.0.0-canary.$(Build.SourceVersion) --no-git-tag-version
npm pack
mv mui-material-0.0.0-canary.$(Build.SourceVersion).tgz ../../../mui-material.tgz
Expand Down
22 changes: 11 additions & 11 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ function resolveAliasPath(relativeToBabelConf) {
}

const defaultAlias = {
'@mui/material': resolveAliasPath('./packages/material-ui/src'),
'@mui/docs': resolveAliasPath('./packages/material-ui-docs/src'),
'@mui/icons-material': resolveAliasPath('./packages/material-ui-icons/lib'),
'@mui/lab': resolveAliasPath('./packages/material-ui-lab/src'),
'@mui/styled-engine': resolveAliasPath('./packages/material-ui-styled-engine/src'),
'@mui/styled-engine-sc': resolveAliasPath('./packages/material-ui-styled-engine-sc/src'),
'@mui/styles': resolveAliasPath('./packages/material-ui-styles/src'),
'@mui/system': resolveAliasPath('./packages/material-ui-system/src'),
'@mui/private-theming': resolveAliasPath('./packages/material-ui-private-theming/src'),
'@mui/core': resolveAliasPath('./packages/material-ui-unstyled/src'),
'@mui/utils': resolveAliasPath('./packages/material-ui-utils/src'),
'@mui/material': resolveAliasPath('./packages/mui-material/src'),
'@mui/docs': resolveAliasPath('./packages/mui-docs/src'),
'@mui/icons-material': resolveAliasPath('./packages/mui-icons-material/lib'),
'@mui/lab': resolveAliasPath('./packages/mui-lab/src'),
'@mui/styled-engine': resolveAliasPath('./packages/mui-styled-engine/src'),
'@mui/styled-engine-sc': resolveAliasPath('./packages/mui-styled-engine-sc/src'),
'@mui/styles': resolveAliasPath('./packages/mui-styles/src'),
'@mui/system': resolveAliasPath('./packages/mui-system/src'),
'@mui/private-theming': resolveAliasPath('./packages/mui-private-theming/src'),
'@mui/core': resolveAliasPath('./packages/mui-core/src'),
'@mui/utils': resolveAliasPath('./packages/mui-utils/src'),
};

const productionPlugins = [
Expand Down
24 changes: 12 additions & 12 deletions docs/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ function resolvePath(sourcePath, currentFile, opts) {
}

const alias = {
'@mui/material': '../packages/material-ui/src',
'@mui/docs': '../packages/material-ui-docs/src',
'@mui/icons-material': '../packages/material-ui-icons/lib',
'@mui/lab': '../packages/material-ui-lab/src',
'@mui/styles': '../packages/material-ui-styles/src',
'@mui/styled-engine-sc': '../packages/material-ui-styled-engine-sc/src',
'@mui/material': '../packages/mui-material/src',
'@mui/docs': '../packages/mui-docs/src',
'@mui/icons-material': '../packages/mui-icons-material/lib',
'@mui/lab': '../packages/mui-lab/src',
'@mui/styles': '../packages/mui-styles/src',
'@mui/styled-engine-sc': '../packages/mui-styled-engine-sc/src',
// Swap the comments on the next two lines for using the styled-components as style engine
'@mui/styled-engine': '../packages/material-ui-styled-engine/src',
// '@mui/styled-engine': '../packages/material-ui-styled-engine-sc/src',
'@mui/system': '../packages/material-ui-system/src',
'@mui/private-theming': '../packages/material-ui-private-theming/src',
'@mui/utils': '../packages/material-ui-utils/src',
'@mui/core': '../packages/material-ui-unstyled/src',
'@mui/styled-engine': '../packages/mui-styled-engine/src',
// '@mui/styled-engine': '../packages/mui-styled-engine-sc/src',
'@mui/system': '../packages/mui-system/src',
'@mui/private-theming': '../packages/mui-private-theming/src',
'@mui/utils': '../packages/mui-utils/src',
'@mui/core': '../packages/mui-core/src',
docs: './',
modules: '../modules',
pages: './pages',
Expand Down
Loading