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] Replace Material-UI with MUI #28243

Merged
merged 8 commits into from
Sep 13, 2021

Conversation

mnajdova
Copy link
Member

@mnajdova mnajdova commented Sep 9, 2021

One step of #27825 and driven by #27803

I replaced all occurrences of Material-UI with MUI except the following:

index b9130ad1f4..164021f3a9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -8,7 +8,7 @@
 /examples/preact/config
 /examples/preact/scripts
 # auto-generated by Framer
-/framer/Material-UI.framerfx/design/document.json
+/framer/MUI.framerfx/design/document.json
 /packages/mui-codemod/lib
 /packages/mui-codemod/src/*/*.test/*
 /packages/mui-icons-material/fixtures
diff --git a/.eslintrc.js b/.eslintrc.js
index b172f90d4a..0320f751c9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -338,7 +338,7 @@ module.exports = {
       },
     },
     {
-      files: ['framer/Material-UI.framerfx/code/**/*.tsx'],
+      files: ['framer/MUI.framerfx/code/**/*.tsx'],
       rules: {
         // framer requires named exports
         'import/prefer-default-export': 'off',
diff --git a/README.md b/README.md
index cc3474700c..2382c3aca4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Quickly build beautiful [React](https://reactjs.org/) apps. MUI is a simple and
 [![npm downloads](https://img.shields.io/npm/dm/@mui/material.svg)](https://www.npmjs.com/package/@mui/material)
 [![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)
 [![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)
-[![Follow on Twitter](https://img.shields.io/twitter/follow/MaterialUI.svg?label=follow+Material-UI)](https://twitter.com/MaterialUI)
+[![Follow on Twitter](https://img.shields.io/twitter/follow/MaterialUI.svg?label=follow+MUI)](https://twitter.com/MaterialUI)
 [![Renovate status](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://github.com/mui-org/material-ui/issues/27062)
 [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/mui-org/material-ui.svg)](https://isitmaintained.com/project/mui-org/material-ui 'Average time to resolve an issue')
 [![Crowdin](https://badges.crowdin.net/material-ui-docs/localized.svg)](https://translate.material-ui.com/project/material-ui-docs)
diff --git a/dangerfile.js b/dangerfile.js
index 2b0764c314..a61433b8ba 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -5,7 +5,7 @@ const { exec } = require('child_process');
 const { loadComparison } = require('./scripts/sizeSnapshot');

 const azureBuildId = process.env.AZURE_BUILD_ID;
-const azureBuildUrl = `https://dev.azure.com/mui-org/Material-UI/_build/results?buildId=${azureBuildId}`;
+const azureBuildUrl = `https://dev.azure.com/mui-org/MUI/_build/results?buildId=${azureBuildId}`;
 const dangerCommand = process.env.DANGER_COMMAND;

 const parsedSizeChangeThreshold = 300;
diff --git a/docs/pages/branding/about.tsx b/docs/pages/branding/about.tsx
index 3de62da1d3..bada409225 100644
--- a/docs/pages/branding/about.tsx
+++ b/docs/pages/branding/about.tsx
@@ -709,7 +709,7 @@ export default function About() {
     <BrandingProvider>
       <Head
         title="About Us - MUI"
-        description="MUI (formerly Material-UI) started back in 2014 to unify React and Material Design. Today, MUI has grown to become one of the world's most popular React libraries <E2><80><93> used by a vibrant community of more than 2M developers in over 180 countries."
+        description="MUI (formerly MUI) started back in 2014 to unify React and Material Design. Today, MUI has grown to become one of the world's most popular React libraries <E2><80><93> used by a vibrant community of more than 2M developers in over 180 countries."
       />
       <AppHeader />
       <main>
diff --git a/docs/src/pages/company/contact/contact.md b/docs/src/pages/company/contact/contact.md
index 1beaa00ac1..2c24e61d0f 100644
--- a/docs/src/pages/company/contact/contact.md
+++ b/docs/src/pages/company/contact/contact.md
@@ -7,7 +7,7 @@ Please choose a topic below related to your inquiry:
 - [Help & Support](/getting-started/support/)
 - Email enquiries: [contact@material-ui.com](mailto:contact@material-ui.com)
 - Our address:<br /><br />
-  **Material-UI SAS**<br />
+  **MUI SAS**<br />
   128 Rue La Bo<C3><A9>tie<br />
   75008 Paris<br />
   France
diff --git a/docs/src/pages/landing/Quotes.js b/docs/src/pages/landing/Quotes.js
index d2ab22e8ed..ea28d4825c 100644
--- a/docs/src/pages/landing/Quotes.js
+++ b/docs/src/pages/landing/Quotes.js
@@ -21,7 +21,7 @@ const quotes = [
     username: '@aumitleon',
     tweet: 'https://twitter.com/aumitleon/status/1210396946566963200',
     quote:
-      'Material-UI continues to blow my mind how easily I can put together really aesthetic and functional components and minimize overhead.',
+      'MUI continues to blow my mind how easily I can put together really aesthetic and functional components and minimize overhead.',
   },
   {
     avatar: 'https://pbs.twimg.com/profile_images/1231452795368329216/GhjrxYH2',
@@ -45,7 +45,7 @@ const quotes = [
     username: '@MohamedELAYAD19',
     tweet: 'https://twitter.com/MohamedELAYAD19/status/1208118580430229504',
     quote:
-      "Such a great library. I have used Material-UI for the last two years as the main react ui library in my projects (in more than 4 companies!) and I find that it's really great! A lot of good work and dedication are put in there. Salute to the team!",
+      "Such a great library. I have used MUI for the last two years as the main react ui library in my projects (in more than 4 companies!) and I find that it's really great! A lot of good work and dedication are put in there. Salute to the team!",
   },
   {
     avatar: 'https://pbs.twimg.com/profile_images/1144184864754851840/WIVBqpWM',
@@ -53,7 +53,7 @@ const quotes = [
     username: '@matthiasmargot',
     tweet: 'https://twitter.com/matthiasmargot/status/1215482285681795072',
     quote:
-      'The DX on Material-UI is absolutely insane and that package has shaped my approach to Component API Design / Composition Design & Style System Design. I think those guys got it idiomatically right, wonderful product.',
+      'The DX on MUI is absolutely insane and that package has shaped my approach to Component API Design / Composition Design & Style System Design. I think those guys got it idiomatically right, wonderful product.',
   },
   {
     avatar: 'https://pbs.twimg.com/profile_images/1129370929409056769/Zkwjy9_I',
@@ -93,7 +93,7 @@ const quotes = [
     username: '@jimboolean',
     tweet: 'https://twitter.com/jimboolean/status/1276549134128943106',
     quote:
-      'Working with Material-UI is like working with an entire UI development team, minus the overhead. The theming tooling is simple and well-done. The components are common, customizable, and practical. <F0><9F><8F><86>',
+      'Working with MUI is like working with an entire UI development team, minus the overhead. The theming tooling is simple and well-done. The components are common, customizable, and practical. <F0><9F><8F><86>',
   },
   {
     avatar: 'https://pbs.twimg.com/profile_images/931358187793530880/C08Iv8_f',
diff --git a/framer/.prettierignore b/framer/.prettierignore
index 9a491997b3..6736b29a1e 100644
--- a/framer/.prettierignore
+++ b/framer/.prettierignore
@@ -1,4 +1,4 @@
-Material-UI.framerfx/design/*
-Material-UI.framerfx/build/*
-Material-UI.framerfx/dist/*
+MUI.framerfx/design/*
+MUI.framerfx/build/*
+MUI.framerfx/dist/*
 canvas.tsx
diff --git a/framer/Material-UI.framerfx/package.json b/framer/Material-UI.framerfx/package.json
index ca068b049e..bf1681b9bb 100644
--- a/framer/Material-UI.framerfx/package.json
+++ b/framer/Material-UI.framerfx/package.json
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/mui-org/material-ui.git",
-    "directory": "framer/Material-UI.framerfx"
+    "directory": "framer/MUI.framerfx"
   },
   "bugs": {
     "url": "https://github.com/mui-org/material-ui/issues"
diff --git a/framer/package.json b/framer/package.json
index 4bd149b332..214ca395a0 100644
--- a/framer/package.json
+++ b/framer/package.json
@@ -19,8 +19,8 @@
   },
   "scripts": {
     "build": "yarn build:core && yarn build:styles && yarn prettier",
-    "build:core": "cross-env BABEL_ENV=development babel-node --config-file ../babel.config.js ./scripts/buildFramer.js ../packages/mui-material/src ./Material-UI.framerfx/code",
-    "build:styles": "cross-env BABEL_ENV=development babel-node --config-file ../babel.config.js ./scripts/buildFramer.js ../packages/mui-styles/src ./Material-UI.framerfx/code",
+    "build:core": "cross-env BABEL_ENV=development babel-node --config-file ../babel.config.js ./scripts/buildFramer.js ../packages/mui-material/src ./MUI.framerfx/code",
+    "build:styles": "cross-env BABEL_ENV=development babel-node --config-file ../babel.config.js ./scripts/buildFramer.js ../packages/mui-styles/src ./MUI.framerfx/code",
     "prettier": "prettier --write --config ../prettier.config.js ./**/*.{js,tsx}",
     "typescript": "tsc -p tsconfig.json"
   }
diff --git a/framer/tsconfig.json b/framer/tsconfig.json
index b5b0379736..e363892d34 100644
--- a/framer/tsconfig.json
+++ b/framer/tsconfig.json
@@ -4,5 +4,5 @@
     "skipLibCheck": true,
     "noUnusedLocals": true
   },
-  "include": ["Material-UI.framerfx/code", "types"]
+  "include": ["MUI.framerfx/code", "types"]
 }
diff --git a/scripts/copy-files.js b/scripts/copy-files.js
index 59e6a87e7e..85bc9599c2 100644
--- a/scripts/copy-files.js
+++ b/scripts/copy-files.js
@@ -119,7 +119,7 @@ async function prepend(file, string) {
 }

 async function addLicense(packageData) {
-  const license = `/** @license Material-UI v${packageData.version}
+  const license = `/** @license MUI v${packageData.version}
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  * 

The changes of the translation files are reverted.

@mui-pr-bot
Copy link

mui-pr-bot commented Sep 9, 2021

Details of bundle changes (experimental)

Generated by 🚫 dangerJS against effcdc4

Copy link
Contributor

@danilo-leal danilo-leal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! I don't see any problems with it. Looks good.

@mnajdova mnajdova marked this pull request as ready for review September 9, 2021 15:58
@github-actions github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Sep 10, 2021
@github-actions github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Sep 10, 2021
@oliviertassinari
Copy link
Member

Regarding the license, the file that we can see at the top of https://unpkg.com/@mui/material@5.0.0-rc.0/node/index.js or https://unpkg.com/@mui/utils@5.0.0-rc.0/index.js, I think that we could consider this change:

 async function addLicense(packageData) {
-  const license = `/** @license Material-UI v${packageData.version}
+  const license = `/** @license MUI Core v${packageData.version}
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *

.github/support.yml Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
docs/src/layouts/AppFooter.tsx Outdated Show resolved Hide resolved
@oliviertassinari oliviertassinari added core Infrastructure work going on behind the scenes docs Improvements or additions to the documentation website Pages that are not documentation-related, marketing-focused. labels Sep 10, 2021
mnajdova and others added 5 commits September 11, 2021 21:36
Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
@mnajdova mnajdova merged commit b9576c5 into mui:next Sep 13, 2021
@ekv88
Copy link

ekv88 commented Sep 16, 2021

description="MUI (formerly MUI) ..."

This looks like a mistake.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Infrastructure work going on behind the scenes docs Improvements or additions to the documentation website Pages that are not documentation-related, marketing-focused.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants