feat: material ui version updated to latest

vip-git · vip-git · commit 4cd9319fba39 · 2018-08-09T00:33:54.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,10 +6,11 @@
     "test": "npm run test:ci -- --watch",
     "heroku-postbuild": "npm run build:demo",
     "start": "node src/demo/server.js",
-    "deploy": "npm run build && npm version patch && npm publish",
+    "deploy": "npm run build && npm version major && npm publish",
     "test:ci": "mocha-webpack --glob \"*.spec.js*\" --reporter mochawesome --require mocha.setup.js --reporter-options reportDir=mochawesome-report-unit --recursive src"
   },
   "dependencies": {
+    "@material-ui/core": "^1.4.3",
     "@material-ui/icons": "^1.0.0-beta.42",
     "babel-core": "^6.26.0",
     "babel-plugin-module-resolver": "^3.1.1",
@@ -57,13 +58,13 @@
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.11",
     "html-webpack-plugin": "^2.30.1",
-    "image-webpack-loader": "^4.2.0",
+    "image-webpack-loader": "^4.3.1",
     "inject-loader": "^2.0.1",
     "jsdom": "^11.7.0",
     "mocha": "^4.1.0",
     "mocha-webpack": "^1.1.0",
     "mochawesome": "^3.0.2",
-    "node-sass": "^4.8.3",
+    "node-sass": "^4.9.2",
     "raf": "^3.4.0",
     "sass-loader": "^6.0.7",
     "sinon": "^4.5.0",
diff --git a/src/FieldSet/FieldSet.jsx b/src/FieldSet/FieldSet.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import classNames from 'classnames';
 import endsWith from 'lodash/endsWith';
 import isEqual from 'lodash/isEqual';
-import { withStyles } from 'material-ui/styles';
-import { InputLabel } from 'material-ui/Input';
+import { withStyles } from '@material-ui/core/styles';
+import { InputLabel } from '@material-ui/core/Input';
 import fieldSetStyles from './field-set-styles';
 import FieldSetArray from './FieldSetArray';
 import FieldSetObject from './FieldSetObject';
diff --git a/src/FieldSet/FieldSet.spec.jsx b/src/FieldSet/FieldSet.spec.jsx
@@ -8,7 +8,7 @@ import chaiEnzyme from 'chai-enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
-import IconButton from 'material-ui/IconButton';
+import IconButton from '@material-ui/core/IconButton';
 import {
   RawFieldSet,
   RawFieldSetObject,
diff --git a/src/FieldSet/FieldSetArray.jsx b/src/FieldSet/FieldSetArray.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import includes from 'lodash/includes';
 import slice from 'lodash/slice';
-import IconButton from 'material-ui/IconButton';
+import IconButton from '@material-ui/core/IconButton';
 import AddCircle from '@material-ui/icons/AddCircle';
 import isArray from 'lodash/isArray';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import FormField from '../FormField';
 import fieldSetStyles from './field-set-styles';
 import getDefaultValue from '../helpers/get-default-value';
diff --git a/src/FieldSet/FieldSetObject.jsx b/src/FieldSet/FieldSetObject.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import keys from 'lodash/keys';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import FormField from '../FormField';
 import fieldSetStyles from './field-set-styles';
 
diff --git a/src/FieldSet/ReorderControls.jsx b/src/FieldSet/ReorderControls.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
-import IconButton from 'material-ui/IconButton';
+import IconButton from '@material-ui/core/IconButton';
 import ArrowUpward from '@material-ui/icons/ArrowUpward';
 import ArrowDownward from '@material-ui/icons/ArrowDownward';
 import RemoveCircle from '@material-ui/icons/RemoveCircle';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import fieldSetStyles from './field-set-styles';
 
 export const RawReorderControls = ({ first, last, classes, onMoveItemUp, onMoveItemDown, onDeleteItem }) => (
diff --git a/src/FieldSet/ReorderableFormField.jsx b/src/FieldSet/ReorderableFormField.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import FormField from '../FormField';
 import fieldSetStyles from './field-set-styles';
 import ReorderControls from './ReorderControls';
diff --git a/src/Form.jsx b/src/Form.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import isEqual from 'lodash/isEqual';
 import { generate } from 'shortid';
-import { withStyles } from 'material-ui/styles';
-import Paper from 'material-ui/Paper';
+import { withStyles } from '@material-ui/core/styles';
+import Paper from '@material-ui/core/Paper';
 import formStyles from './form-styles';
 import FormField from './FormField';
 import updateFormData, { addListItem, removeListItem, moveListItem } from './helpers/update-form-data';
diff --git a/src/FormButtons.jsx b/src/FormButtons.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
-import Button from 'material-ui/Button';
+import Button from '@material-ui/core/Button';
 
 export class RawFormButtons extends React.Component {
   shouldComponentUpdate = () => false
diff --git a/src/FormField.jsx b/src/FormField.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import isEqual from 'lodash/isEqual';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import FieldSet from './FieldSet';
 import Field from './fields';
 import styles from './form-field-styles';
diff --git a/src/ValidationMessages.jsx b/src/ValidationMessages.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import keys from 'lodash/keys';
 import filter from 'lodash/filter';
 
diff --git a/src/demo/DemoHome.jsx b/src/demo/DemoHome.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import Menu from './menu';
 import Body from './body';
 import './main.scss'; // eslint-disable-line import/no-unresolved,import/no-extraneous-dependencies
diff --git a/src/demo/MuiRoot.jsx b/src/demo/MuiRoot.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import 'typeface-roboto'; // eslint-disable-line import/extensions
-import CssBaseline from 'material-ui/CssBaseline';
+import CssBaseline from '@material-ui/core/CssBaseline';
 
-import { MuiThemeProvider } from 'material-ui/styles';
+import { MuiThemeProvider } from '@material-ui/core/styles';
 import theme from './theme';
 
 export default ({ children }) => (
diff --git a/src/demo/body/Body.jsx b/src/demo/body/Body.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core//styles';
 import styles from './body-styles';
 import Example from './Example';
 
diff --git a/src/demo/body/Example.jsx b/src/demo/body/Example.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { withStyles } from 'material-ui/styles';
-import Paper from 'material-ui/Paper';
+import { withStyles } from '@material-ui/core//styles';
+import Paper from '@material-ui/core//Paper';
 import styles from './example-styles';
 import Source from './Source';
 import Form from '../../Form';
diff --git a/src/demo/body/Source.jsx b/src/demo/body/Source.jsx
@@ -6,7 +6,7 @@ import 'codemirror/theme/material.css';
 import 'codemirror/mode/javascript/javascript'; // eslint-disable-line
 import Valid from '@material-ui/icons/CheckCircle';
 import Invalid from '@material-ui/icons/HighlightOff';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import sourceStyles from './editor-styles';
 
 const cmOptions = {
diff --git a/src/demo/menu/LeftDrawer.jsx b/src/demo/menu/LeftDrawer.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { withStyles } from 'material-ui/styles';
-import Drawer from 'material-ui/Drawer';
-import Hidden from 'material-ui/Hidden';
+import { withStyles } from '@material-ui/core//styles';
+import Drawer from '@material-ui/core//Drawer';
+import Hidden from '@material-ui/core//Hidden';
 import MenuItems from './MenuItems';
 import menuStyles from './menu-styles';
 
diff --git a/src/demo/menu/Menu.jsx b/src/demo/menu/Menu.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
-import { withStyles } from 'material-ui/styles';
-import AppBar from 'material-ui/AppBar';
-import Toolbar from 'material-ui/Toolbar';
-import Typography from 'material-ui/Typography';
-import Hidden from 'material-ui/Hidden';
-import IconButton from 'material-ui/IconButton';
+import { withStyles } from '@material-ui/core/styles';
+import AppBar from '@material-ui/core/AppBar';
+import Toolbar from '@material-ui/core/Toolbar';
+import Typography from '@material-ui/core/Typography';
+import Hidden from '@material-ui/core/Hidden';
+import IconButton from '@material-ui/core/IconButton';
 import MenuIcon from '@material-ui/icons/Menu';
 import LeftDrawer from './LeftDrawer';
 import menuStyles from './menu-styles';
diff --git a/src/demo/menu/MenuItems.jsx b/src/demo/menu/MenuItems.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import keys from 'lodash/keys';
-import { withStyles } from 'material-ui/styles';
-import List, { ListItem, ListItemText, ListSubheader } from 'material-ui/List';
+import { withStyles } from '@material-ui/core/styles';
+import List, { ListItem, ListItemText, ListSubheader } from '@material-ui/core/List';
 import examples from '../examples';
 
 import menuStyles from './menu-styles';
diff --git a/src/demo/theme.js b/src/demo/theme.js
@@ -1,7 +1,7 @@
-import { createMuiTheme } from 'material-ui/styles';
-import teal from 'material-ui/colors/teal';
-import red from 'material-ui/colors/red';
-import blue from 'material-ui/colors/lightBlue';
+import { createMuiTheme } from '@material-ui/core/styles';
+import teal from '@material-ui/core/colors/teal';
+import red from '@material-ui/core/colors/red';
+import blue from '@material-ui/core/colors/lightBlue';
 
 const theme = {
   palette: {
diff --git a/src/fields/ConfiguredField.jsx b/src/fields/ConfiguredField.jsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import classNames from 'classnames';
-import { withStyles } from 'material-ui/styles';
-import { FormControl, FormHelperText } from 'material-ui/Form';
-import Input from 'material-ui/Input';
+import { withStyles } from '@material-ui/core/styles';
+import FormControl from '@material-ui/core/FormControl';
+import FormHelperText from '@material-ui/core/FormHelperText';
+import Input from '@material-ui/core/Input';
 import fieldStyles from './field-styles';
 
 // for unit testing only
diff --git a/src/fields/Field.spec.jsx b/src/fields/Field.spec.jsx
@@ -7,8 +7,8 @@ import chaiEnzyme from 'chai-enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
-import Input from 'material-ui/Input';
-import { FormControl, FormHelperText, FormLabel } from 'material-ui/Form';
+import Input from '@material-ui/core/Input';
+import { FormControl, FormHelperText, FormLabel } from '@material-ui/core/Form';
 import { RadioGroup } from './components';
 import { ConfiguredField } from './Field';
 
diff --git a/src/fields/components/Checkbox.jsx b/src/fields/components/Checkbox.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import Checkbox from 'material-ui/Checkbox';
-import { FormControlLabel } from 'material-ui/Form';
+import Checkbox from '@material-ui/core/Checkbox';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
 
 const doOnChange = onChange => (e, checked) => onChange(checked);
 
diff --git a/src/fields/components/Checkbox.spec.jsx b/src/fields/components/Checkbox.spec.jsx
@@ -7,8 +7,8 @@ import sinonChai from 'sinon-chai';
 import chaiEnzyme from 'chai-enzyme';
 import Enzyme, { mount, shallow } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
-import { FormControlLabel } from 'material-ui/Form';
-import Checkbox from 'material-ui/Checkbox';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
+import Checkbox from '@material-ui/core/Checkbox';
 import { default as CheckboxComp } from './Checkbox'; // eslint-disable-line import/no-named-default
 
 chai.use(sinonChai);
diff --git a/src/fields/components/RadioGroup.jsx b/src/fields/components/RadioGroup.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
-import Radio, { RadioGroup } from 'material-ui/Radio';
-import { FormControlLabel } from 'material-ui/Form';
+import Radio from '@material-ui/core/Radio';
+import RadioGroup from '@material-ui/core/RadioGroup';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
 
 export default ({ path, options = [], value, onChange, inputProps, nullOption, ...rest }) => (
   <RadioGroup
diff --git a/src/fields/components/Select.jsx b/src/fields/components/Select.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import Select from 'material-ui/Select';
-import { MenuItem } from 'material-ui/Menu';
+import Select from '@material-ui/core/Select';
+import { MenuItem } from '@material-ui/core/Menu';
 
 export default ({ type, value = '', options, nullOption, onChange, ...rest }) => (
   <Select
diff --git a/src/fields/configure/configure-component.js b/src/fields/configure/configure-component.js
@@ -1,4 +1,4 @@
-// import Input, { InputLabel } from 'material-ui/Input'; // eslint-disable-line import/no-named-default
+// import Input, { InputLabel } from '@material-ui/core/Input'; // eslint-disable-line import/no-named-default
 import getComponentProps from './get-component-props';
 import getLabelComponentProps from './get-label-component-props';
 import getLabelComponent from './get-label-component';
diff --git a/src/fields/configure/get-component.js b/src/fields/configure/get-component.js
@@ -1,7 +1,7 @@
-// import Input, { InputLabel } from 'material-ui/Input'; // eslint-disable-line import/no-named-default
+// import Input, { InputLabel } from '@material-ui/core/Input'; // eslint-disable-line import/no-named-default
 const { RadioGroup, Select, Checkbox } = require('../components');
 
-const Input = require('material-ui/Input').default;
+const Input = require('@material-ui/core/Input').default;
 
 export default ({ schema, uiSchema = {} }) => {
   // console.log('getComponent schema: %o, uiSchema: %o', schema, uiSchema);
diff --git a/src/fields/configure/get-component.spec.js b/src/fields/configure/get-component.spec.js
@@ -21,7 +21,7 @@ describe('getComponent', () => {
     CheckboxSpy = sinon.spy();
     SelectSpy = sinon.spy();
     getComponent = inject({
-      'material-ui/Input': {
+      '@material-ui/core/Input': {
         default: InputSpy,
       },
       '../components': {
diff --git a/src/fields/configure/get-label-component.js b/src/fields/configure/get-label-component.js
@@ -1,7 +1,7 @@
-// import Input, { InputLabel } from 'material-ui/Input'; // eslint-disable-line import/no-named-default
-import { FormLabel } from 'material-ui/Form';
+// import Input, { InputLabel } from '@material-ui/core/Input'; // eslint-disable-line import/no-named-default
+import FormLabel from '@material-ui/core/FormLabel';
 
-const { InputLabel } = require('material-ui/Input');
+const { InputLabel } = require('@material-ui/core/Input');
 
 
 export default ({ schema, uiSchema = {} }) => {
diff --git a/src/fields/configure/get-label-component.spec.js b/src/fields/configure/get-label-component.spec.js
@@ -17,7 +17,7 @@ describe('getLabelComponent', () => {
   beforeEach(() => {
     InputLabelSpy = sinon.spy();
     getLabelComponent = inject({
-      'material-ui/Input': {
+      '@material-ui/core/Input': {
         InputLabel: InputLabelSpy,
       },
     }).default;
