Skip to content

Commit 3a7bf94

Browse files
committed
upgrade to babel 7 and jest 24
1 parent 907bd14 commit 3a7bf94

File tree

17 files changed

+5844
-5828
lines changed

17 files changed

+5844
-5828
lines changed

babel.config.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
const fs = require('fs')
2+
const path = require('path')
3+
4+
module.exports = {
5+
babelrcRoots: fs
6+
.readdirSync('packages')
7+
.map(dirname => path.join(process.cwd(), 'packages', dirname))
8+
.filter(dirpath => {
9+
const stats = fs.statSync(dirpath)
10+
11+
return stats.isDirectory()
12+
}),
13+
}

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,29 @@
3030
"moduleNameMapper": {
3131
"^.+\\.(css|scss)$": "identity-obj-proxy"
3232
},
33-
"setupTestFrameworkScriptFile": "./packages/selenium-ide/scripts/jest/test.config.js",
33+
"setupFilesAfterEnv": [
34+
"./packages/selenium-ide/scripts/jest/test.config.js"
35+
],
3436
"testMatch": [
3537
"**/packages/**/__test?(s)__/**/*.js?(x)"
3638
]
3739
},
3840
"devDependencies": {
41+
"@babel/core": "^7.3.4",
3942
"babel-eslint": "^10.0.1",
40-
"babel-jest": "^23.6.0",
43+
"babel-jest": "^24.3.1",
4144
"eslint": "^5.8.0",
4245
"eslint-config-prettier": "^3.1.0",
4346
"eslint-plugin-jest": "^21.27.1",
4447
"eslint-plugin-prettier": "^3.0.0",
4548
"eslint-plugin-react": "^7.11.1",
4649
"identity-obj-proxy": "^3.0.0",
47-
"jest": "^23.6.0",
50+
"jest": "^24.3.1",
4851
"lerna": "^3.4.3",
4952
"prettier": "^1.14.3",
5053
"stylelint": "^9.7.1",
5154
"stylelint-config-prettier": "^4.0.0",
5255
"stylelint-config-standard": "^18.2.0",
53-
"stylelint-prettier": "^1.0.3",
54-
"web-ext": "^2.4.0"
56+
"stylelint-prettier": "^1.0.3"
5557
}
5658
}

packages/browser-webdriver/.babelrc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
{
2-
presets: [ "node8" ]
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": {
7+
"node": "8"
8+
}
9+
}
10+
]
11+
]
312
}

packages/browser-webdriver/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"build/webdriver.js"
1414
],
1515
"devDependencies": {
16-
"babel-cli": "^6.26.0",
17-
"babel-preset-node8": "^1.2.0",
16+
"@babel/cli": "^7.2.3",
17+
"@babel/preset-env": "^7.3.4",
1818
"browserify": "^16.2.2",
1919
"selenium-webdriver": "3.6.0",
2020
"watchify": "^3.11.0"

packages/browser-webdriver/yarn.lock

Lines changed: 1454 additions & 408 deletions
Large diffs are not rendered by default.

packages/selenium-ide/.babelrc

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
{
2-
"presets": ["env",
3-
"react"
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": {
7+
"node": "8",
8+
"chrome": "60",
9+
"firefox": "56"
10+
}
11+
}
12+
],
13+
"@babel/preset-react"
414
],
515
"plugins": [
6-
"transform-decorators-legacy",
7-
"transform-decorators",
8-
"transform-object-rest-spread",
9-
["transform-class-properties", { "loose": true }],
10-
["babel-plugin-transform-builtin-extend", {
11-
"globals": ["Error", "Array"]
12-
}],
13-
"react-hot-loader/babel",
14-
["babel-plugin-transform-runtime", {
15-
"helpers": false,
16-
"polyfill": false,
17-
"regenerator": true
18-
}]
16+
["@babel/plugin-proposal-decorators", { "legacy": true }],
17+
["@babel/plugin-proposal-class-properties", { "loose": true }]
1918
]
2019
}

packages/selenium-ide/package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@
1515
"watch": "yarn build:dev -w"
1616
},
1717
"devDependencies": {
18+
"@babel/core": "^7.3.4",
19+
"@babel/plugin-proposal-class-properties": "^7.3.4",
20+
"@babel/plugin-proposal-decorators": "^7.3.0",
21+
"@babel/plugin-transform-runtime": "^7.3.4",
22+
"@babel/preset-env": "^7.3.4",
23+
"@babel/preset-react": "^7.0.0",
1824
"autoprefixer": "^7.1.4",
19-
"babel-core": "^6.26.0",
20-
"babel-loader": "^7.1.2",
21-
"babel-plugin-transform-builtin-extend": "^1.1.2",
22-
"babel-plugin-transform-class-properties": "^6.24.1",
23-
"babel-plugin-transform-decorators": "^6.24.1",
24-
"babel-plugin-transform-decorators-legacy": "^1.3.4",
25-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
26-
"babel-plugin-transform-runtime": "^6.23.0",
27-
"babel-preset-env": "^1.6.0",
28-
"babel-preset-react": "^6.24.1",
25+
"babel-loader": "^8.0.5",
2926
"closure-loader": "0.6.0",
3027
"copy-webpack-plugin": "^4.0.1",
3128
"css-loader": "^0.28.7",

packages/selenium-ide/scripts/jest/test.config.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ import 'jest-dom/extend-expect' // matchers for view tests
22

33
window.HTMLElement.prototype.scrollTo = jest.fn()
44

5-
window.MutationObserver = () => {
6-
return {
7-
observe: jest.fn(),
8-
disconnect: jest.fn(),
5+
class MutationObserver {
6+
constructor() {
7+
this.observe = jest.fn()
8+
this.disconnect = jest.fn()
99
}
1010
}
11+
12+
window.MutationObserver = MutationObserver

packages/selenium-ide/webpack.config.babel.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import path from 'path'
19-
import webpack from 'webpack'
20-
import HtmlWebpackPlugin from 'html-webpack-plugin'
21-
import ExtractTextPlugin from 'extract-text-webpack-plugin'
22-
import CopyWebpackPlugin from 'copy-webpack-plugin'
23-
import UglifyJsPlugin from 'uglifyjs-webpack-plugin'
24-
import autoprefixer from 'autoprefixer'
18+
const path = require('path')
19+
const webpack = require('webpack')
20+
const HtmlWebpackPlugin = require('html-webpack-plugin')
21+
const ExtractTextPlugin = require('extract-text-webpack-plugin')
22+
const CopyWebpackPlugin = require('copy-webpack-plugin')
23+
const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
24+
const autoprefixer = require('autoprefixer')
2525

2626
const isProduction = process.env.NODE_ENV === 'production'
2727

28-
export default {
28+
module.exports = {
2929
context: path.resolve(__dirname, 'src'),
3030
devtool: isProduction ? 'source-map' : 'cheap-eval-source-map',
3131
entry: {

0 commit comments

Comments
 (0)