Skip to content

Commit f5bb4ee

Browse files
committed
chore(build): upgrade to babel 7
Unified browserslistrc with react-grid-layout
1 parent 51191da commit f5bb4ee

File tree

8 files changed

+1676
-1488
lines changed

8 files changed

+1676
-1488
lines changed

.babelrc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
{
22
"presets": [
3-
["es2015", {"loose": true}],
4-
"react"
3+
[
4+
"@babel/preset-env",
5+
{
6+
"loose": true
7+
}
8+
],
9+
"@babel/preset-react",
10+
"@babel/preset-flow"
511
],
612
"plugins": [
7-
"transform-class-properties",
8-
"transform-object-rest-spread",
13+
"@babel/plugin-proposal-class-properties",
14+
"@babel/plugin-proposal-object-rest-spread"
915
]
1016
}

.browserslistrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
> 0.25%
2+
ie 11
3+
not dead

.flowconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[version]
2-
^0.98.0
2+
^0.110.0
33

44
[ignore]
5-
.*/node_modules/babel.*
6-
.*/node_modules/fbjs/.*
5+
.*/node_modules/@babel.*
76
.*/node_modules/express/.*
87
.*/node_modules/serve-index/.*
98
<PROJECT_ROOT>/build/.*

lib/Resizable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import React from 'react';
33
import PropTypes from 'prop-types';
44
import {DraggableCore} from 'react-draggable';
5-
import cloneElement from './cloneElement';
5+
import {cloneElement} from './utils';
66
import type {Element as ReactElement, Node as ReactNode} from 'react';
77

88
type Axis = 'both' | 'x' | 'y' | 'none';

lib/cloneElement.js renamed to lib/utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import React from 'react';
33
import type {Element as ReactElement} from 'react';
44

55
// React.addons.cloneWithProps look-alike that merges style & className.
6-
module.exports = function cloneElement(element: ReactElement<any>, props: Object): ReactElement<any> {
6+
export function cloneElement(element: ReactElement<any>, props: Object): ReactElement<any> {
77
if (props.style && element.props.style) {
88
props.style = {...element.props.style, ...props.style};
99
}
1010
if (props.className && element.props.className) {
1111
props.className = `${element.props.className} ${props.className}`;
1212
}
1313
return React.cloneElement(element, props);
14-
};
14+
}

package.json

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,32 @@
3333
},
3434
"homepage": "https://github.com/STRML/react-resizable",
3535
"devDependencies": {
36-
"babel-cli": "^6.26.0",
37-
"babel-core": "^6.26.0",
38-
"babel-eslint": "^10.0.1",
36+
"@babel/cli": "^7.0.0",
37+
"@babel/core": "^7.0.0",
38+
"@babel/plugin-proposal-class-properties": "^7.0.0",
39+
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
40+
"@babel/preset-env": "^7.0.0",
41+
"@babel/preset-react": "^7.0.0",
42+
"babel-eslint": "^10.0.3",
3943
"babel-loader": "^8.0.6",
40-
"babel-plugin-transform-class-properties": "^6.24.1",
41-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
42-
"babel-preset-es2015": "^6.24.1",
43-
"babel-preset-react": "^6.24.1",
44-
"cross-env": "^5.0.5",
45-
"css-loader": "^2.1.1",
46-
"eslint": "^5.16.0",
47-
"eslint-plugin-react": "^7.4.0",
48-
"flow-bin": "^0.98.1",
49-
"lodash": "^4.3.0",
44+
"cross-env": "^6.0.3",
45+
"css-loader": "^3.2.0",
46+
"eslint": "^6.5.1",
47+
"eslint-plugin-react": "^7.16.0",
48+
"flow-bin": "^0.110.0",
49+
"lodash": "^4.17.15",
5050
"pre-commit": "^1.1.2",
51-
"react": "^16.0.0",
52-
"react-dom": "^16.0.0",
53-
"style-loader": "^0.23.1",
54-
"webpack": "^4.31.0",
55-
"webpack-dev-server": "^3.3.1"
51+
"react": "^16.10.2",
52+
"react-dom": "^16.10.2",
53+
"style-loader": "^1.0.0",
54+
"webpack": "^4.41.2",
55+
"webpack-cli": "^3.3.9",
56+
"webpack-dev-server": "^3.8.2",
57+
"@babel/preset-flow": "^7.0.0"
5658
},
5759
"dependencies": {
5860
"prop-types": "15.x",
59-
"react-draggable": "^3.0.3"
61+
"react-draggable": "^4.0.3"
6062
},
6163
"peerDependencies": {
6264
"react": "0.14.x || 15.x || 16.x",

test/TestLayout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default class TestLayout extends React.Component<{}, {width: number, heig
2626
</div>
2727
</Resizable>
2828
<ResizableBox className="box" width={200} height={200}>
29-
<span className="text">{"<ResizableBox>, same as above."}</span>
29+
<span className="text">{"<ResizableBox>"}</span>
3030
</ResizableBox>
3131
<ResizableBox
3232
className="custom-box box"

0 commit comments

Comments
 (0)