Skip to content

Commit 3ed9a25

Browse files
authored
Upgrade Babel and Jest (PR #16)
1 parent df4d7c0 commit 3ed9a25

File tree

5 files changed

+3168
-2085
lines changed

5 files changed

+3168
-2085
lines changed

.babelrc

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,37 @@
11
{
2+
"assumptions": {
3+
"setPublicClassFields": true
4+
},
25
"presets": [
3-
"react"
6+
"@babel/preset-react"
47
],
58
"env": {
69
"es6": {
710
"presets": [
811
[
9-
"es2015",
12+
"@babel/preset-env",
1013
{
11-
"modules": false
14+
"modules": false,
15+
"targets": "defaults",
1216
}
1317
]
1418
],
15-
"plugins": [
16-
"transform-class-properties"
17-
]
1819
},
1920
"es5": {
2021
"presets": [
21-
"es2015"
22+
["@babel/preset-env", {
23+
"targets": "defaults",
24+
}]
2225
],
23-
"plugins": [
24-
"transform-class-properties"
25-
]
2626
},
2727
"test": {
2828
"presets": [
2929
[
30-
"env",
30+
"@babel/preset-env",
3131
{
32-
"targets": {
33-
"node": 6
34-
}
32+
"targets": { "node": "current" },
3533
}
3634
]
37-
],
38-
"plugins": [
39-
"transform-class-properties"
4035
]
4136
}
4237
}

examples/webpack.config.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,16 @@ const config = {
3131
use: [{
3232
loader: 'babel-loader',
3333
options: {
34-
presets: [
35-
'react',
36-
['env', {
34+
assumptions: {
35+
setPublicClassFields: true
36+
},
37+
presets: [
38+
'@babel/preset-react',
39+
['@babel/preset-env', {
3740
modules: false,
38-
targets: {
39-
browsers: 'IE >= 11, Edge >= 12, FireFox >= 38, Chrome >= 47, Opera >= 34, Safari >= 8'
40-
}
41+
targets: "defaults",
4142
}]
4243
],
43-
plugins: [
44-
'transform-class-properties'
45-
]
4644
}
4745
}],
4846
include: [

package.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,15 @@
5555
"react-dom": "^0.14.0 || ^15.0.0 || ^16.0.1"
5656
},
5757
"devDependencies": {
58-
"babel-cli": "~6.26.0",
59-
"babel-core": "~6.26.3",
60-
"babel-eslint": "~7.2.1",
61-
"babel-jest": "~21.2.0",
62-
"babel-loader": "~7.1.1",
63-
"babel-minify-webpack-plugin": "~0.2.0",
64-
"babel-preset-env": "~1.7.0",
65-
"babel-preset-es2015": "~6.24.1",
66-
"babel-preset-react": "~6.24.1",
67-
"babel-preset-stage-2": "~6.24.1",
68-
"babel-register": "~6.26.0",
58+
"@babel/cli": "^7.15.4",
59+
"@babel/core": "^7.15.5",
60+
"@babel/preset-env": "^7.15.4",
61+
"@babel/preset-react": "^7.14.5",
62+
"@babel/preset-stage-2": "^7.8.3",
63+
"babel-eslint": "^10.1.0",
64+
"babel-jest": "~27.1.0",
65+
"babel-loader": "~8.2.2",
66+
"babel-minify-webpack-plugin": "~0.3.1",
6967
"coveralls": "~3.0.3",
7068
"cross-env": "~6.0.3",
7169
"css-loader": "~0.28.7",
@@ -81,8 +79,7 @@
8179
"history": "~4.10.1",
8280
"html-webpack-plugin": "~2.30.1",
8381
"http-server": "~0.11.1",
84-
"jest": "~21.2.1",
85-
"jsdom": "~11.3.0",
82+
"jest": "~27.1.0",
8683
"prop-types": "~15.7.2",
8784
"react": "~16.8.4",
8885
"react-dom": "~16.8.4",
@@ -104,6 +101,7 @@
104101
],
105102
"collectCoverageFrom": [
106103
"**/src/**/*.js"
107-
]
104+
],
105+
"testEnvironment": "jsdom"
108106
}
109107
}

webpack.config.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ module.exports = {
1515
test: /\.js$/,
1616
loader: "babel-loader",
1717
options: {
18+
assumptions: {
19+
setPublicClassFields: true
20+
},
1821
presets: [
19-
'react',
20-
['es2015', {
21-
modules: false
22+
'@babel/preset-react',
23+
['@babel/preset-env', {
24+
modules: false,
25+
targets: "defaults",
2226
}]
2327
],
24-
plugins: [
25-
'transform-class-properties'
26-
]
2728
},
2829
include: [
2930
path.resolve(__dirname, './src')

0 commit comments

Comments
 (0)