[core] Move material-ui to @material-ui/core (mui#11310)

marutanm · May 10, 2018 · 9350759 · 9350759
1 parent 92bc2ba
commit 9350759
Show file tree

Hide file tree

Showing 288 changed files with 1,023 additions and 991 deletions.
diff --git a/.babelrc b/.babelrc
@@ -11,8 +11,8 @@
           {
             "root": ["./"],
             "alias": {
-              "@material-ui/icons": "./packages/material-ui-icons/src",
-              "material-ui": "./packages/material-ui/src"
+              "@material-ui/core": "./packages/material-ui/src",
+              "@material-ui/icons": "./packages/material-ui-icons/src"
             }
           }
         ]
@@ -30,11 +30,11 @@
           "module-resolver",
           {
             "alias": {
+              "@material-ui/core": "./packages/material-ui/src",
               "@material-ui/docs": "./packages/material-ui-docs/src",
               "@material-ui/icons": "./packages/material-ui-icons/src",
               "@material-ui/lab": "./packages/material-ui-lab/src",
               "docs": "./docs",
-              "material-ui": "./packages/material-ui/src",
               "pages": "./pages"
             }
           }
@@ -50,11 +50,11 @@
           "module-resolver",
           {
             "alias": {
+              "@material-ui/core": "./packages/material-ui/src",
               "@material-ui/docs": "./packages/material-ui-docs/src",
               "@material-ui/icons": "./packages/material-ui-icons/src",
               "@material-ui/lab": "./packages/material-ui-lab/src",
               "docs": "./docs",
-              "material-ui": "./packages/material-ui/src",
               "pages": "./pages"
             }
           }
@@ -103,8 +103,8 @@
           {
             "root": ["./"],
             "alias": {
-              "@material-ui/icons": "./packages/material-ui-icons/src",
-              "material-ui": "./packages/material-ui/src"
+              "@material-ui/core": "./packages/material-ui/src",
+              "@material-ui/icons": "./packages/material-ui-icons/src"
             }
           }
         ]

diff --git a/.flowconfig b/.flowconfig
@@ -27,8 +27,8 @@ esproposal.class_instance_fields=enable
 module.file_ext=.js
 module.file_ext=.md
 module.name_mapper='.*\.\(html\|css\|svg\|png\|jpg\|gif\)$' -> '<PROJECT_ROOT>/flow/stubs/url-loader.js'
-module.name_mapper='^material-ui\/\(.*\)$' -> '<PROJECT_ROOT>/packages/material-ui/src/\1'
-module.name_mapper='^material-ui-icons\/\(.*\)$' -> '<PROJECT_ROOT>/packages/material-ui-icons/src/\1'
+module.name_mapper='^@material-ui/core\/\(.*\)$' -> '<PROJECT_ROOT>/packages/material-ui/src/\1'
+module.name_mapper='^@material-ui/icons\/\(.*\)$' -> '<PROJECT_ROOT>/packages/material-ui-icons/src/\1'
 
 module.ignore_non_literal_requires=true
 module.system.node.resolve_dirname=node_modules

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -108,13 +108,6 @@ that **are needed for the stable version**:
   +import ListItem from 'material-ui/ListItem';
   ```
 
-- [ ] Use `@material-ui npm scope name` #9673. The pros have been raised in the linked issue.
-
-```diff
--import Button from 'material-ui/Button';
-+import Button from '@material-ui/core/Button';
-```
-
 These breaking changes will be spread into different releases over the next few months to make the upgrade path as smooth as possible.
 Not only does the Material-UI project have to be upgraded for each breaking change,
 but we also have to upgrade our own projects.

diff --git a/docs/src/modules/components/AppContent.js b/docs/src/modules/components/AppContent.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 
 const styles = theme => ({
   root: theme.mixins.gutters({

diff --git a/docs/src/modules/components/AppDrawer.js b/docs/src/modules/components/AppDrawer.js
@@ -1,13 +1,13 @@
 import React from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
-import List from 'material-ui/List';
-import Drawer from 'material-ui/Drawer';
-import SwipeableDrawer from 'material-ui/SwipeableDrawer';
-import Typography from 'material-ui/Typography';
-import Divider from 'material-ui/Divider';
-import Hidden from 'material-ui/Hidden';
+import { withStyles } from '@material-ui/core/styles';
+import List from '@material-ui/core/List';
+import Drawer from '@material-ui/core/Drawer';
+import SwipeableDrawer from '@material-ui/core/SwipeableDrawer';
+import Typography from '@material-ui/core/Typography';
+import Divider from '@material-ui/core/Divider';
+import Hidden from '@material-ui/core/Hidden';
 import AppDrawerNavItem from 'docs/src/modules/components/AppDrawerNavItem';
 import Link from 'docs/src/modules/components/Link';
 import { pageToTitle } from 'docs/src/modules/utils/helpers';

diff --git a/docs/src/modules/components/AppDrawerNavItem.js b/docs/src/modules/components/AppDrawerNavItem.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { withStyles } from 'material-ui/styles';
-import { ListItem } from 'material-ui/List';
-import Button from 'material-ui/Button';
-import Collapse from 'material-ui/transitions/Collapse';
+import { withStyles } from '@material-ui/core/styles';
+import { ListItem } from '@material-ui/core/List';
+import Button from '@material-ui/core/Button';
+import Collapse from '@material-ui/core/transitions/Collapse';
 import Link from 'docs/src/modules/components/Link';
 
 const styles = theme => ({

diff --git a/docs/src/modules/components/AppFrame.js b/docs/src/modules/components/AppFrame.js
@@ -4,12 +4,12 @@ import { connect } from 'react-redux';
 import compose from 'recompose/compose';
 import NProgress from 'nprogress';
 import Router from 'next/router';
-import { withStyles } from 'material-ui/styles';
-import Typography from 'material-ui/Typography';
-import AppBar from 'material-ui/AppBar';
-import Toolbar from 'material-ui/Toolbar';
-import IconButton from 'material-ui/IconButton';
-import Tooltip from 'material-ui/Tooltip';
+import { withStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import AppBar from '@material-ui/core/AppBar';
+import Toolbar from '@material-ui/core/Toolbar';
+import IconButton from '@material-ui/core/IconButton';
+import Tooltip from '@material-ui/core/Tooltip';
 import MenuIcon from '@material-ui/icons/Menu';
 import LightbulbOutline from '@material-ui/icons/LightbulbOutline';
 import LightbublFull from '@material-ui/docs/svgIcons/LightbublFull';

diff --git a/docs/src/modules/components/AppSearch.js b/docs/src/modules/components/AppSearch.js
@@ -5,10 +5,10 @@ import pure from 'recompose/pure';
 import EventListener from 'react-event-listener';
 import PropTypes from 'prop-types';
 import Router from 'next/router';
-import withWidth, { isWidthUp } from 'material-ui/utils/withWidth';
+import withWidth, { isWidthUp } from '@material-ui/core/utils/withWidth';
 import SearchIcon from '@material-ui/icons/Search';
-import { fade } from 'material-ui/styles/colorManipulator';
-import { withStyles } from 'material-ui/styles';
+import { fade } from '@material-ui/core/styles/colorManipulator';
+import { withStyles } from '@material-ui/core/styles';
 
 let searchTimer;
 let initialized = false;

diff --git a/docs/src/modules/components/AppWrapper.js b/docs/src/modules/components/AppWrapper.js
@@ -3,8 +3,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { MuiThemeProvider } from 'material-ui/styles';
-import CssBaseline from 'material-ui/CssBaseline';
+import { MuiThemeProvider } from '@material-ui/core/styles';
+import CssBaseline from '@material-ui/core/CssBaseline';
 import JssProvider from 'react-jss/lib/JssProvider';
 import { polyfill } from 'react-lifecycles-compat';
 import { lightTheme, darkTheme, setPrismTheme } from '@material-ui/docs/MarkdownElement/prism';

diff --git a/docs/src/modules/components/Carbon.js b/docs/src/modules/components/Carbon.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import pure from 'recompose/pure';
-import { withStyles } from 'material-ui/styles';
-import Typography from 'material-ui/Typography';
-import Tooltip from 'material-ui/Tooltip';
+import { withStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import Tooltip from '@material-ui/core/Tooltip';
 
 const styles = theme => ({
   '@global': {

diff --git a/docs/src/modules/components/Demo.js b/docs/src/modules/components/Demo.js
@@ -3,14 +3,14 @@ import LZString from 'lz-string';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import copy from 'clipboard-copy';
-import { withStyles } from 'material-ui/styles';
-import IconButton from 'material-ui/IconButton';
-import Collapse from 'material-ui/transitions/Collapse';
+import { withStyles } from '@material-ui/core/styles';
+import IconButton from '@material-ui/core/IconButton';
+import Collapse from '@material-ui/core/transitions/Collapse';
 import ModeEditIcon from '@material-ui/icons/ModeEdit';
 import CodeIcon from '@material-ui/icons/Code';
-import Menu, { MenuItem } from 'material-ui/Menu';
+import Menu, { MenuItem } from '@material-ui/core/Menu';
 import MoreVertIcon from '@material-ui/icons/MoreVert';
-import Tooltip from 'material-ui/Tooltip';
+import Tooltip from '@material-ui/core/Tooltip';
 import Github from '@material-ui/docs/svgIcons/GitHub';
 import MarkdownElement from '@material-ui/docs/MarkdownElement';
 import { getDependencies } from 'docs/src/modules/utils/helpers';

diff --git a/docs/src/modules/components/HomeBackers.js b/docs/src/modules/components/HomeBackers.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import NoSSR from '@material-ui/docs/NoSSR';
 import MarkdownElement from '@material-ui/docs/MarkdownElement';
 

diff --git a/docs/src/modules/components/HomeFooter.js b/docs/src/modules/components/HomeFooter.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
-import Typography from 'material-ui/Typography';
-import Grid from 'material-ui/Grid';
+import { withStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import Grid from '@material-ui/core/Grid';
 import Link from 'docs/src/modules/components/Link';
 
 const styleSheet = theme => ({

diff --git a/docs/src/modules/components/HomeSteps.js b/docs/src/modules/components/HomeSteps.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
-import Typography from 'material-ui/Typography';
-import Grid from 'material-ui/Grid';
-import Button from 'material-ui/Button';
-import Divider from 'material-ui/Divider';
+import { withStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import Grid from '@material-ui/core/Grid';
+import Button from '@material-ui/core/Button';
+import Divider from '@material-ui/core/Divider';
 import FileDownloadIcon from '@material-ui/icons/FileDownload';
 import BuildIcon from '@material-ui/icons/Build'; // eslint-disable-line import/no-unresolved
 import WhatshotIcon from '@material-ui/icons/Whatshot';
@@ -131,7 +131,7 @@ function HomeSteps(props) {
             text={`
   \`\`\`jsx
   import React from 'react';
-  import Button from 'material-ui/Button';
+  import Button from '@material-ui/core/Button';
 
   const App = () => (
     <Button variant="raised" color="primary">
@@ -163,7 +163,7 @@ function HomeSteps(props) {
           </Typography>
           <Link prefetch href="/premium-themes" className={classes.link}>
             <NoSSR>
-              <img className={classes.img} alt="themes" src="/static/images/themes.png" />
+              <img className={classes.img} alt="themes" src="/static/images/themes.jpg" />
             </NoSSR>
           </Link>
         </div>

diff --git a/docs/src/modules/components/Link.js b/docs/src/modules/components/Link.js
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import compose from 'recompose/compose';
 import { withRouter } from 'next/router';
 import NextLink from 'next/link';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 
 const styles = theme => ({
   root: {

diff --git a/docs/src/modules/components/MarkdownDocs.js b/docs/src/modules/components/MarkdownDocs.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import kebabCase from 'lodash/kebabCase';
 import warning from 'warning';
 import Head from 'next/head';
-import { withStyles } from 'material-ui/styles';
-import Button from 'material-ui/Button';
+import { withStyles } from '@material-ui/core/styles';
+import Button from '@material-ui/core/Button';
 import MarkdownElement from '@material-ui/docs/MarkdownElement';
 import AppContent from 'docs/src/modules/components/AppContent';
 import Demo from 'docs/src/modules/components/Demo';

diff --git a/docs/src/modules/components/Notifications.js b/docs/src/modules/components/Notifications.js
@@ -1,8 +1,8 @@
 /* eslint-disable react/no-danger */
 
 import React from 'react';
-import Button from 'material-ui/Button';
-import Snackbar from 'material-ui/Snackbar';
+import Button from '@material-ui/core/Button';
+import Snackbar from '@material-ui/core/Snackbar';
 import 'isomorphic-fetch';
 
 function getLastSeenNotification() {

diff --git a/docs/src/modules/styles/getPageContext.js b/docs/src/modules/styles/getPageContext.js
@@ -2,10 +2,10 @@
 
 import { create, SheetsRegistry } from 'jss';
 import rtl from 'jss-rtl';
-import { createMuiTheme, createGenerateClassName, jssPreset } from 'material-ui/styles';
-import blue from 'material-ui/colors/blue';
-import pink from 'material-ui/colors/pink';
-import { darken } from 'material-ui/styles/colorManipulator';
+import { createMuiTheme, createGenerateClassName, jssPreset } from '@material-ui/core/styles';
+import blue from '@material-ui/core/colors/blue';
+import pink from '@material-ui/core/colors/pink';
+import { darken } from '@material-ui/core/styles/colorManipulator';
 
 function getTheme(uiTheme) {
   const theme = createMuiTheme({

diff --git a/docs/src/modules/utils/helpers.js b/docs/src/modules/utils/helpers.js
@@ -30,9 +30,9 @@ export function pageToTitle(page) {
 
 export function getDependencies(raw) {
   const deps = {
-    react: 'latest',
+    '@material-ui/core': 'latest',
     'react-dom': 'latest',
-    'material-ui': 'next',
+    react: 'latest',
   };
   const re = /^import\s.*\sfrom\s+'([^']+)'/gm;
   let m;

diff --git a/docs/src/modules/utils/helpers.test.js b/docs/src/modules/utils/helpers.test.js
@@ -3,10 +3,10 @@ import { getDependencies } from './helpers';
 
 const s1 = `import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
-import Input, { InputLabel } from 'material-ui/Input';
-import { FormControl, FormHelperText } from 'material-ui/Form';
-import Select from 'material-ui/Select';
+import { withStyles } from '@material-ui/core/styles';
+import Input, { InputLabel } from '@material-ui/core/Input';
+import { FormControl, FormHelperText } from '@material-ui/core/Form';
+import Select from '@material-ui/core/Select';
 import FooBar, { Qux } from '@foo-bar/bip';
 
 const styles = theme => ({
@@ -23,30 +23,30 @@ import * as _ from '@unexisting/thing';
 import Autosuggest from 'react-autosuggest';
 import match from 'autosuggest-highlight/match';
 import parse from 'autosuggest-highlight/parse';
-import TextField from 'material-ui/TextField';
-import Paper from 'material-ui/Paper';
-import { MenuItem } from 'material-ui/Menu';
-import { withStyles } from 'material-ui/styles';
+import TextField from '@material-ui/core/TextField';
+import Paper from '@material-ui/core/Paper';
+import { MenuItem } from '@material-ui/core/Menu';
+import { withStyles } from '@material-ui/core/styles';
 
 const suggestions = [`;
 
 describe('docs getDependencies helpers', () => {
   it('generate the right npm dependencies', () => {
     assert.deepEqual(getDependencies(s1), {
-      react: 'latest',
-      'react-dom': 'latest',
-      'material-ui': 'next',
-      'prop-types': 'latest',
       '@foo-bar/bip': 'latest',
+      '@material-ui/core': 'latest',
+      'prop-types': 'latest',
+      'react-dom': 'latest',
+      react: 'latest',
     });
     assert.deepEqual(getDependencies(s2), {
-      react: 'latest',
-      'react-dom': 'latest',
-      'material-ui': 'next',
-      'prop-types': 'latest',
+      '@material-ui/core': 'latest',
       '@unexisting/thing': 'latest',
-      'react-autosuggest': 'latest',
       'autosuggest-highlight': 'latest',
+      'prop-types': 'latest',
+      'react-autosuggest': 'latest',
+      'react-dom': 'latest',
+      react: 'latest',
     });
   });
 });
diff --git a/docs/src/pages/customization/css-in-js/CssInJs.js b/docs/src/pages/customization/css-in-js/CssInJs.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { withStyles } from 'material-ui/styles';
-import Typography from 'material-ui/Typography';
+import { withStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
 
 // 1. We define the styles.
 const styles = theme => ({

diff --git a/docs/src/pages/customization/css-in-js/JssRegistry.js b/docs/src/pages/customization/css-in-js/JssRegistry.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import JssProvider from 'react-jss/lib/JssProvider';
 import { SheetsRegistry } from 'jss';
-import { createMuiTheme, MuiThemeProvider } from 'material-ui/styles';
+import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
 import CssInJs from './CssInJs';
 
 const sheetsRegistry = new SheetsRegistry();

diff --git a/docs/src/pages/customization/css-in-js/RenderProps.js b/docs/src/pages/customization/css-in-js/RenderProps.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
-import Button from 'material-ui/Button';
+import { withStyles } from '@material-ui/core/styles';
+import Button from '@material-ui/core/Button';
 
 // A function you can extract and put into its own module.
 // Yes, 11 lines of code is all you need.