Skip to content

Commit

Permalink
fix(react-grid-material-ui): update material-ui to 1.0.0-rc.0 (#1079)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kvet
kvet committed May 16, 2018
1 parent eecaeb9 commit 6045891
Show file tree
Hide file tree
Showing 149 changed files with 321 additions and 322 deletions.
2 changes: 1 addition & 1 deletion packages/dx-demo-shell/.eslintrc.json
View file
Expand Up @@ -18,6 +18,6 @@
"jsx-a11y/anchor-is-valid": "off",
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.*"]}],
"filenames/match-regex": [2, "^[a-z-\\.]+$"],
"no-restricted-imports": ["error", "material-ui", "material-ui-icons"]
"no-restricted-imports": ["error", "@material-ui/core", "@material-ui/icons"]
}
}
4 changes: 2 additions & 2 deletions packages/dx-demo-shell/package.json
View file
Expand Up @@ -20,9 +20,9 @@
"peerDependencies": {
"prismjs": "^1.14.0",
"prop-types": "^15.6.1",
"react": "^16.2.0",
"react": "^16.3.2",
"react-bootstrap": "^0.32.1",
"react-dom": "^16.2.0",
"react-dom": "^16.3.2",
"react-frame-component": "^3.0.0",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2"
Expand Down
6 changes: 3 additions & 3 deletions packages/dx-react-chart-bootstrap4/package.json
View file
Expand Up @@ -69,9 +69,9 @@
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.7.0",
"jest": "^22.4.3",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"react": "^16.3.2",
"react-dom": "^16.3.2",
"react-test-renderer": "^16.3.2",
"reactstrap": "5.0.0",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/.eslintrc.json
View file
Expand Up @@ -16,7 +16,7 @@
"jsx-a11y/href-no-hash": "off",
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.*", "**/testing.*"]}],
"filenames/match-regex": [2, "^[a-z-\\.]+$"],
"no-restricted-imports": ["error", "material-ui", "@material-ui/icons"]
"no-restricted-imports": ["error", "@material-ui/core", "@material-ui/icons"]
},
"env": {
"jest/globals": true
Expand Down
16 changes: 8 additions & 8 deletions packages/dx-react-chart-material-ui/package.json
View file
Expand Up @@ -46,7 +46,8 @@
"devDependencies": {
"@devexpress/dx-react-core": "1.2.0",
"@devexpress/dx-testing": "1.2.0",
"@material-ui/icons": "1.0.0-beta.43",
"@material-ui/core": "1.0.0-rc.0",
"@material-ui/icons": "1.0.0-rc.0",
"babel-core": "^6.26.0",
"babel-jest": "^22.4.3",
"babel-plugin-external-helpers": "^6.22.0",
Expand All @@ -69,14 +70,13 @@
"jss": "^9.8.1",
"jss-preset-default": "^4.3.0",
"jss-theme-reactor": "^0.11.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"react": "^16.3.2",
"react-dom": "^16.3.2",
"react-test-renderer": "^16.3.2",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.3",
"rollup-plugin-license": "^0.6.0",
"rollup-plugin-node-resolve": "^3.2.0",
"material-ui": "1.0.0-beta.44"
"rollup-plugin-node-resolve": "^3.2.0"
},
"dependencies": {
"classnames": "^2.2.5",
Expand All @@ -86,8 +86,8 @@
"@devexpress/dx-chart-core": "1.2.0",
"@devexpress/dx-react-core": "1.2.0",
"@devexpress/dx-react-chart": "1.2.0",
"@material-ui/icons": "1.0.0-beta.43",
"material-ui": "1.0.0-beta.44",
"@material-ui/core": "1.0.0-rc.0",
"@material-ui/icons": "1.0.0-rc.0",
"react": "^16.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/label.jsx
View file
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';

const styles = (theme) => {
const { fontFamily, fontSize, fontWeightLight } = theme.typography;
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/label.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Label } from './label';

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/line.jsx
View file
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';
import { getBorderColor } from '../utils';

const styles = theme => ({
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/line.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Line } from './line';

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/root.jsx
View file
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';

const styles = () => ({
root: {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/root.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Root } from './root';

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/tick.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';
import classNames from 'classnames';
import { getBorderColor } from '../utils';

Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/axis/tick.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Tick } from './tick';

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/grid/line.jsx
View file
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';
import { getBorderColor } from '../utils';

const styles = theme => ({
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/grid/line.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Line } from './line';

describe('Line', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/grid/root.jsx
View file
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';

const styles = () => ({
root: {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/grid/root.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Root } from './root';

describe('Root', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/layout.jsx
View file
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';

const styles = (theme) => {
const { fontFamily, fontSize, fontWeightLight } = theme.typography;
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/layouts.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Root } from './layout';

const defaultProps = {
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-chart-material-ui/src/templates/legend/item.jsx
View file
@@ -1,8 +1,8 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import { withStyles } from 'material-ui/styles';
import { ListItem } from 'material-ui/List';
import { withStyles } from '@material-ui/core/styles';
import ListItem from '@material-ui/core/ListItem';

const styles = () => ({
root: {
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-chart-material-ui/src/templates/legend/item.test.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { ListItem } from 'material-ui/List';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import ListItem from '@material-ui/core/ListItem';
import { Item } from './item';

describe('Root', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/legend/label.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import { ListItemText } from 'material-ui/List';
import ListItemText from '@material-ui/core/ListItemText';

export class Label extends React.PureComponent {
render() {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/legend/label.test.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import { shallow, mount } from 'enzyme';
import { ListItemText } from 'material-ui/List';
import ListItemText from '@material-ui/core/ListItemText';
import { Label } from './label';

const defaultProps = { text: 'a' };
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/legend/root.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import List from 'material-ui/List';
import List from '@material-ui/core/List';

export class Root extends React.PureComponent {
render() {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/legend/root.test.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import { shallow } from 'enzyme';
import List from 'material-ui/List';
import List from '@material-ui/core/List';
import { Root } from './root';

describe('Root', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/series/path.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';
import classNames from 'classnames';

const styles = () => ({
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/series/path.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Path } from './path';

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/series/point.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';
import classNames from 'classnames';

const styles = () => ({
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/series/point.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Point } from './point';

describe('Point', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/series/slice.jsx
View file
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import { withStyles } from 'material-ui/styles';
import { withStyles } from '@material-ui/core/styles';
import classNames from 'classnames';

const styles = () => ({
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/series/slice.test.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createShallow, getClasses } from 'material-ui/test-utils';
import { createShallow, getClasses } from '@material-ui/core/test-utils';
import { Slice } from './slice';

describe('Slice', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-chart-material-ui/src/templates/utils.jsx
View file
@@ -1,4 +1,4 @@
import { darken, fade, lighten } from 'material-ui/styles/colorManipulator';
import { darken, fade, lighten } from '@material-ui/core/styles/colorManipulator';

export const getBorderColor = theme => (
theme.palette.type !== 'light'
Expand Down
6 changes: 3 additions & 3 deletions packages/dx-react-chart/package.json
View file
Expand Up @@ -62,9 +62,9 @@
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.6.1",
"jest": "^22.1.4",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"react": "^16.3.2",
"react-dom": "^16.3.2",
"react-test-renderer": "^16.3.2",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.3",
"rollup-plugin-license": "^0.6.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-core/package.json
View file
Expand Up @@ -59,8 +59,8 @@
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.7.0",
"jest": "^22.4.3",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react": "^16.3.2",
"react-dom": "^16.3.2",
"react-test-renderer": "^16.3.1",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/.eslintrc.json
View file
Expand Up @@ -20,6 +20,6 @@
"jsx-a11y/anchor-is-valid": "off",
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.*"]}],
"filenames/match-regex": [2, "^[a-z-\\.]+$"],
"no-restricted-imports": ["error", "material-ui", "@material-ui/icons"]
"no-restricted-imports": ["error", "@material-ui/core", "@material-ui/icons"]
}
}
8 changes: 4 additions & 4 deletions packages/dx-react-demos/package.json
View file
Expand Up @@ -31,16 +31,16 @@
"@devexpress/dx-react-grid-bootstrap3": "1.2.0",
"@devexpress/dx-react-grid-bootstrap4": "1.2.0",
"@devexpress/dx-react-grid-material-ui": "1.2.0",
"@material-ui/icons": "1.0.0-beta.43",
"@material-ui/core": "1.0.0-rc.0",
"@material-ui/icons": "1.0.0-rc.0",
"@types/react": "^16.3.13",
"@types/react-dom": "^16.0.5",
"core-js": "^2.5.5",
"material-ui": "1.0.0-beta.44",
"prismjs": "^1.14.0",
"prop-types": "^15.6.1",
"react": "^16.2.0",
"react": "^16.3.2",
"react-bootstrap": "^0.32.1",
"react-dom": "^16.2.0",
"react-dom": "^16.3.2",
"react-frame-component": "^3.0.0",
"react-redux": "^5.0.7",
"react-router-dom": "^4.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/src/demo-sources/chart-basic/material-ui/bar.skip.jsx
View file
@@ -1,6 +1,6 @@
/* eslint-disable react/jsx-filename-extension */
import * as React from 'react';
import Paper from 'material-ui/Paper';
import Paper from '@material-ui/core/Paper';
import {
Chart,
ArgumentAxis,
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/src/demo-sources/chart-basic/material-ui/basic.skip.jsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react';
import Paper from 'material-ui/Paper';
import Paper from '@material-ui/core/Paper';
import {
ArgumentAxis,
ValueAxis,
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/src/demo-sources/chart-basic/material-ui/group-bar.skip.jsx
View file
Expand Up @@ -6,7 +6,7 @@ import {
ValueAxis,
BarSeries,
} from '@devexpress/dx-react-chart-material-ui';
import Paper from 'material-ui/Paper';
import Paper from '@material-ui/core/Paper';
import { ageStructure } from '../../../demo-data/data-vizualization';

export default class Demo extends React.PureComponent {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/src/demo-sources/chart-basic/material-ui/pie.skip.jsx
View file
Expand Up @@ -4,7 +4,7 @@ import {
Chart,
PieSeries,
} from '@devexpress/dx-react-chart-material-ui';
import Paper from 'material-ui/Paper';
import Paper from '@material-ui/core/Paper';
import { contributors as data } from '../../../demo-data/data-vizualization';

export default class Demo extends React.PureComponent {
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/src/demo-sources/chart-basic/material-ui/scatter.skip.jsx
View file
@@ -1,6 +1,6 @@
/* eslint-disable react/jsx-filename-extension */
import * as React from 'react';
import Paper from 'material-ui/Paper';
import Paper from '@material-ui/core/Paper';
import {
ArgumentAxis,
ValueAxis,
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/src/demo-sources/chart-basic/material-ui/stacked-area.skip.jsx
View file
Expand Up @@ -5,7 +5,7 @@ import {
ValueAxis,
AreaSeries,
} from '@devexpress/dx-react-chart-material-ui';
import Paper from 'material-ui/Paper';
import Paper from '@material-ui/core/Paper';
import { ageStructure } from '../../../demo-data/data-vizualization';

export default class Demo extends React.PureComponent {
Expand Down

0 comments on commit 6045891

Please sign in to comment.