Skip to content

Commit a91fae8

Browse files
committed
Package upgrades; babel 6 -> 7
1 parent 7ed0f03 commit a91fae8

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["react", "env"]
2+
"presets": ["@babel/react", "@babel/env"]
33
}

.eslintrc

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
{
22
"extends": [
33
"eslint:recommended",
4+
"plugin:react/recommended",
45
"prettier"
56
],
7+
"settings": {
8+
"react": {
9+
"pragma": "React",
10+
"version": "detect"
11+
}
12+
},
613
"parser": "babel-eslint",
714
"parserOptions": {
815
"ecmaVersion": 6,
@@ -34,16 +41,6 @@
3441
"react",
3542
"import"
3643
],
37-
"overrides": [
38-
{
39-
"files": [
40-
"**/*.percy.{js,jsx}"
41-
],
42-
"env": {
43-
"react-percy/globals": true
44-
}
45-
}
46-
],
4744
"rules": {
4845
"accessor-pairs": [
4946
"error"

package.json

+23-22
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"url": "https://github.com/plotly/react-plotly.js/issues"
1414
},
1515
"scripts": {
16-
"make:lib": "mkdirp lib && babel src --out-dir=lib --ignore __tests__/*.js,__mocks__/*.js --presets=env,react --source-maps --plugins babel-plugin-add-module-exports && mv lib/* ./ && rmdir lib",
17-
"make:dist": "mkdirp dist && browserify src/factory.js -o ./dist/create-plotly-component.js -t [ babelify --presets [ env react ] --plugins add-module-exports ] -t browserify-global-shim --standalone createPlotlyComponent && uglifyjs ./dist/create-plotly-component.js --compress --mangle --output ./dist/create-plotly-component.min.js --source-map filename=dist/create-plotly-component.min.js.map",
16+
"make:lib": "mkdirp lib && babel src --out-dir lib --ignore \"src/__tests__/*.js\",\"src/__mocks__/*.js\" --presets=@babel/preset-env,@babel/preset-react --source-maps && mv lib/* ./ && rmdir lib",
17+
"make:dist": "mkdirp dist && browserify src/factory.js -o ./dist/create-plotly-component.js -t [ babelify --presets [ @babel/preset-env @babel/preset-react ] --plugins [ @babel/plugin-proposal-class-properties ] ] -t browserify-global-shim --standalone createPlotlyComponent && uglifyjs ./dist/create-plotly-component.js --compress --mangle --output ./dist/create-plotly-component.min.js --source-map filename=dist/create-plotly-component.min.js.map",
1818
"clean": "rimraf lib dist react-plotly.js react-plotly.js.map factory.js factory.js.map",
1919
"prepublishOnly": "npm run clean && npm run make:lib && npm run make:dist",
2020
"lint": "prettier --trailing-comma es5 --write \"src/**/*.js\" && eslint src",
@@ -32,34 +32,35 @@
3232
"react"
3333
],
3434
"devDependencies": {
35-
"babel-cli": "^6.24.1",
35+
"@babel/cli": "^7.2.3",
36+
"@babel/core": "^7.3.3",
37+
"@babel/plugin-proposal-class-properties": "^7.3.3",
38+
"@babel/preset-env": "^7.3.1",
39+
"@babel/preset-react": "^7.0.0",
3640
"babel-eslint": "^10.0.1",
37-
"babel-plugin-add-module-exports": "^0.2.1",
38-
"babel-plugin-transform-class-properties": "^6.24.1",
39-
"babel-preset-env": "^1.7.0",
40-
"babel-preset-react": "^6.24.1",
41-
"babelify": "^7.3.0",
42-
"brfs": "^1.4.3",
43-
"browserify": "^14.4.0",
41+
"babelify": "^10.0.0",
42+
"brfs": "^2.0.2",
43+
"browserify": "^16.2.3",
4444
"browserify-global-shim": "^1.0.3",
4545
"cash-mv": "^0.2.0",
46-
"dependency-check": "^2.9.1",
47-
"enzyme": "^2.9.1",
48-
"eslint": "^4.8.0",
46+
"dependency-check": "^3.3.0",
47+
"enzyme": "^3.9.0",
48+
"enzyme-adapter-react-16": "^1.9.1",
49+
"eslint": "^5.14.1",
4950
"eslint-config-prettier": "^4.0.0",
5051
"eslint-plugin-import": "^2.16.0",
51-
"eslint-plugin-react": "^7.4.0",
52+
"eslint-plugin-react": "^7.12.4",
5253
"event-emitter": "^0.3.5",
53-
"jest": "^20.0.4",
54+
"jest": "^24.1.0",
5455
"mkdirp": "^0.5.1",
55-
"nodemon": "^1.11.0",
56-
"onetime": "^1.1.0",
56+
"nodemon": "^1.18.10",
57+
"onetime": "^3.0.0",
5758
"plotly.js": "^1.35.0",
58-
"prettier": "^1.5.3",
59-
"react": "^15.6.1",
59+
"prettier": "^1.16.4",
60+
"react": "^16.8.2",
6061
"react-addons-test-utils": "^15.6.0",
61-
"react-dom": "^15.6.1",
62-
"react-test-renderer": "^15.6.1",
62+
"react-dom": "^16.8.2",
63+
"react-test-renderer": "^16.8.2",
6364
"rimraf": "^2.6.2",
6465
"semver": "^5.4.1",
6566
"uglify-js": "^3.0.26"
@@ -72,6 +73,6 @@
7273
"react": "React"
7374
},
7475
"dependencies": {
75-
"prop-types": "^15.5.10"
76+
"prop-types": "^15.7.2"
7677
}
7778
}

src/__tests__/react-plotly.test.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import React from 'react';
2-
import {mount} from 'enzyme';
2+
import Adapter from 'enzyme-adapter-react-16';
3+
import {mount, configure} from 'enzyme';
34
import createComponent from '../factory';
45
import once from 'onetime';
56

67
describe('<Plotly/>', () => {
78
let Plotly, PlotComponent;
9+
configure({adapter: new Adapter()});
810

911
function createPlot(props) {
1012
return new Promise((resolve, reject) => {

src/factory.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export default function plotComponentFactory(Plotly) {
100100
});
101101
}
102102

103-
componentWillUpdate(nextProps) {
103+
UNSAFE_componentWillUpdate(nextProps) {
104104
this.unmounting = false;
105105

106106
if (nextProps.revision !== void 0 && nextProps.revision === this.props.revision) {

0 commit comments

Comments
 (0)