Skip to content

Commit

Permalink
feat: update deps (#1542)
Browse files Browse the repository at this point in the history
  • Loading branch information
SergeyAlexeev authored Nov 1, 2018
1 parent 2b8a1fe commit f32f1b2
Show file tree
Hide file tree
Showing 57 changed files with 2,893 additions and 1,620 deletions.
8 changes: 4 additions & 4 deletions packages/dx-chart-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-jest": "^23.4.2",
"babel-jest": "^23.6.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"core-js": "^2.5.7",
"eslint": "^5.6.1",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.0",
"eslint-plugin-jest": "^21.26.2",
"jest": "^23.6.0",
"rollup": "^0.66.2",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-license": "^0.7.0"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/dx-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-jest": "^23.4.2",
"babel-jest": "^23.6.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"core-js": "^2.5.7",
"eslint": "^5.6.1",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.0",
"eslint-plugin-jest": "^21.26.2",
"jest": "^23.6.0",
"rollup": "^0.66.2",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-license": "^0.7.0"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/dx-demo-shell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"core-js": "^2.5.7",
"eslint": "^5.6.1",
"eslint": "^5.8.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-jest": "^21.26.2",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.11.1",
"mustache": "^3.0.0",
"rollup": "^0.66.2",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-css-only": "^0.4.0",
"rollup-plugin-node-resolve": "^3.4.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/dx-grid-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
"devDependencies": {
"@devexpress/dx-core": "1.8.0",
"babel-core": "^6.26.3",
"babel-jest": "^23.4.2",
"babel-jest": "^23.6.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"core-js": "^2.5.7",
"eslint": "^5.6.1",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.0",
"eslint-plugin-jest": "^21.26.2",
"jest": "^23.6.0",
"rollup": "^0.66.2",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-license": "^0.7.0"
},
Expand Down
20 changes: 10 additions & 10 deletions packages/dx-react-chart-bootstrap4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,30 @@
"@devexpress/dx-react-core": "1.8.0",
"@devexpress/dx-testing": "1.8.0",
"babel-core": "^6.26.3",
"babel-jest": "^23.4.2",
"babel-jest": "^23.6.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.15",
"babel-plugin-transform-react-remove-prop-types": "^0.4.19",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"core-js": "^2.5.7",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "^1.2.0",
"eslint": "^5.6.1",
"enzyme": "3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"eslint": "^5.8.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-jest": "^21.26.2",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.11.1",
"jest": "^23.6.0",
"react": "^16.5.2",
"react-dom": "^16.5.2",
"react-test-renderer": "^16.5.2",
"reactstrap": "^6.4.0",
"rollup": "^0.66.2",
"reactstrap": "^6.5.0",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-css-only": "^0.4.0",
"rollup-plugin-license": "^0.7.0",
Expand All @@ -88,6 +88,6 @@
"@devexpress/dx-react-chart": "1.8.0-beta.1",
"@devexpress/dx-react-core": "1.8.0-beta.1",
"react": ">=16.3.0",
"reactstrap": "^6.4.0"
"reactstrap": "^6.5.0"
}
}
4 changes: 4 additions & 0 deletions packages/dx-react-chart-demos/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ module.exports = {
'^.+\\.jsx?$': 'babel-jest',
'^.+\\.tsx?$': 'ts-jest',
},
transformIgnorePatterns: [
'/node_modules/',
'/dist/',
],
moduleNameMapper: {
'\\.(css|svg)$': path.join(__dirname, './stub-module.js'),
},
Expand Down
40 changes: 20 additions & 20 deletions packages/dx-react-chart-demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"@devexpress/dx-react-chart": "1.8.0",
"@devexpress/dx-react-chart-bootstrap4": "1.8.0",
"@devexpress/dx-react-chart-material-ui": "1.8.0",
"@material-ui/core": "^3.1.2",
"@material-ui/core": "^3.3.2",
"@material-ui/icons": "^3.0.1",
"@types/react": "^16.4.11",
"@types/react-dom": "^16.0.7",
"@types/react": "^16.4.18",
"@types/react-dom": "^16.0.9",
"core-js": "^2.5.7",
"d3-format": "^1.3.2",
"d3-scale": "^2.1.2",
Expand All @@ -42,11 +42,11 @@
"react": "^16.5.2",
"react-bootstrap": "^0.32.4",
"react-dom": "^16.5.2",
"react-frame-component": "^4.0.1",
"react-redux": "^5.0.7",
"react-frame-component": "^4.0.2",
"react-redux": "^5.1.0",
"react-router-dom": "^4.3.1",
"reactstrap": "^6.4.0",
"redux": "^4.0.0",
"reactstrap": "^6.5.0",
"redux": "^4.0.1",
"seamless-immutable": "^7.1.4",
"svg-sprite-loader": "^4.1.2",
"tslint": "^5.11.0",
Expand All @@ -56,10 +56,10 @@
},
"devDependencies": {
"@devexpress/dx-testing": "1.8.0",
"@types/jest": "^23.3.2",
"@types/jest": "^23.3.8",
"awesome-typescript-loader": "^5.2.1",
"babel-core": "^6.26.3",
"babel-jest": "^23.4.2",
"babel-jest": "^23.6.0",
"babel-loader": "^7.1.5",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
Expand All @@ -68,27 +68,27 @@
"babel-preset-react": "^6.24.1",
"concurrently": "^4.0.1",
"css-loader": "^1.0.0",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "^1.2.0",
"eslint": "^5.6.1",
"enzyme": "3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"eslint": "^5.8.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-jest": "^21.26.2",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.11.1",
"jest": "^23.6.0",
"mustache": "^3.0.0",
"node-static": "^0.7.11",
"nodemon": "^1.18.4",
"nodemon": "^1.18.5",
"react-test-renderer": "^16.5.2",
"source-map-loader": "^0.2.4",
"style-loader": "^0.23.0",
"ts-jest": "^23.10.3",
"typescript": "^3.1.1",
"webpack": "^4.20.2",
"style-loader": "^0.23.1",
"ts-jest": "^23.10.4",
"typescript": "^3.1.3",
"webpack": "^4.23.1",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.9",
"webpack-dev-server": "^3.1.10",
"write-file-webpack-plugin": "^4.4.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class Demo extends React.PureComponent {
<Stack offset={offset} />
</Chart>
<div className={classes.div}>
<Typography component="h5" variant="headline" className={classes.typography}>Series Type</Typography>
<Typography component="h5" variant="h5" className={classes.typography}>Series Type</Typography>
<FormControl>
<NativeSelect onChange={this.changeSeriesType} defaultValue={1}>
<option value={1}>Stacked Area</option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class Demo extends React.PureComponent {
))}
</div>
<div className={classes.div}>
<Typography component="h5" variant="headline" className={classes.typography}>Scheme</Typography>
<Typography component="h5" variant="h5" className={classes.typography}>Scheme</Typography>
<FormControl>
<NativeSelect onChange={this.changeScheme} defaultValue={0}>
<option value={0}>schemeCategory10</option>
Expand Down
2 changes: 2 additions & 0 deletions packages/dx-react-chart-demos/src/demo-sources/demo.test.jsxt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jest.spyOn(Element.prototype, 'getBBox').mockImplementation(() => ({
}));

window.fetch = jest.fn().mockImplementation(() => new Promise(() => {}));
// eslint-disable-next-line
window.__MUI_USE_NEXT_TYPOGRAPHY_VARIANTS__ = true;

it('should not fail', () => {
expect(() => { mount(<Demo />); })
Expand Down
2 changes: 2 additions & 0 deletions packages/dx-react-chart-demos/src/demo-sources/demo.test.tsxt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jest.spyOn((Element.prototype as any), 'getBBox').mockImplementation(() => ({
}));

window.fetch = jest.fn().mockImplementation(() => new Promise(() => { /**/ }));
(window as any).__MUI_USE_NEXT_TYPOGRAPHY_VARIANTS__ = true;

it('should not fail', () => {
expect(() => { mount(<Demo />); })
.not.toThrow();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ const Text = (props) => {
const { text, subtext, ...restProps } = props;
return (
<div {...restProps}>
<Typography component="h3" variant="headline">
<Typography component="h3" variant="h5">
{text}
</Typography>
<Typography variant="subheading">{subtext}</Typography>
<Typography variant="subtitle1">{subtext}</Typography>
</div>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@ const lightTheme = createMuiTheme({
type: 'light',
primary: blue,
},
typography: {
useNextVariants: true,
},
});

const darkTheme = createMuiTheme({
palette: {
type: 'dark',
primary: blue,
},
typography: {
useNextVariants: true,
},
});

const DemoContainer = ({ theme, children }) => (
Expand Down
18 changes: 9 additions & 9 deletions packages/dx-react-chart-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@
"devDependencies": {
"@devexpress/dx-react-core": "1.8.0",
"@devexpress/dx-testing": "1.8.0",
"@material-ui/core": "^3.1.2",
"@material-ui/core": "^3.3.2",
"@material-ui/icons": "^3.0.1",
"babel-core": "^6.26.3",
"babel-jest": "^23.4.2",
"babel-jest": "^23.6.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.15",
"babel-plugin-transform-react-remove-prop-types": "^0.4.19",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"core-js": "^2.5.7",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "^1.2.0",
"eslint": "^5.6.1",
"enzyme": "3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"eslint": "^5.8.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.24.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-jest": "^21.26.2",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.11.1",
"jest": "^23.6.0",
"jss": "^9.8.7",
Expand All @@ -73,7 +73,7 @@
"react": "^16.5.2",
"react-dom": "^16.5.2",
"react-test-renderer": "^16.5.2",
"rollup": "^0.66.2",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-license": "^0.7.0",
"rollup-plugin-node-resolve": "^3.4.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export class Text extends React.PureComponent {
render() {
const { text, ...restProps } = this.props;
return (
<Typography component="h3" variant="headline" {...restProps}>
<Typography component="h3" variant="h5" {...restProps}>
{text}
</Typography>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('Text', () => {
expect(component)
.toBe('h3');
expect(variant)
.toBe('headline');
.toBe('h5');
expect(text)
.toBe('chart');
});
Expand Down
6 changes: 0 additions & 6 deletions packages/dx-react-chart/docs/guides/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ Install the dx-react-chart package and its dependencies using the following comm
npm i --save @devexpress/dx-react-core.npm-tag() @devexpress/dx-react-chart.npm-tag()
```

*Note: [react](https://www.npmjs.com/package/react) >=16.3.0 and [react-dom](https://www.npmjs.com/package/react) >=16.3.0 are peer dependencies.*

This package does not contain visual components. In the examples below, visual components are rendered using the Material-UI package. However, you can use any of the following:

- Material-UI
Expand All @@ -24,8 +22,6 @@ This package does not contain visual components. In the examples below, visual c
npm i --save @devexpress/dx-react-chart-material-ui.npm-tag()
```

*Note: [@material-ui/core](https://www.npmjs.com/package/@material-ui/core) >=1.1.0 and [@material-ui/icons](https://www.npmjs.com/package/@material-ui/icons) >=1.1.0 are peer dependencies.*

Make sure that the [Material-UI](https://material-ui.com/) dependencies are installed and properly configured. Check the Material-UI's [Getting Started](https://material-ui.com/getting-started/installation) article for configuration details.

- Bootstrap 4
Expand All @@ -34,8 +30,6 @@ This package does not contain visual components. In the examples below, visual c
npm i --save @devexpress/dx-react-chart-bootstrap4.npm-tag()
```

*Note: [reactstrap](https://www.npmjs.com/package/reactstrap) >=6.3.0 is a peer dependency.*

Make sure that [reactstrap](https://reactstrap.github.io/) dependencies are installed and properly configured. Check the reactstrap's [Getting Started](https://reactstrap.github.io/) article for configuration details. You also need the [OpenIconic](https://useiconic.com/open) icons in your project.

Add the DevExtreme React Chart styles in the root .js file:
Expand Down
Loading

0 comments on commit f32f1b2

Please sign in to comment.