Skip to content

Commit 83dcb22

Browse files
authored
Update babel dependencies (#111)
* Update babel dependencies * Use babel-preset-env * Update travis config to use 'stable' node * Use babel-loader with presets: env in webpack test config
1 parent 2a4e626 commit 83dcb22

File tree

7 files changed

+597
-690
lines changed

7 files changed

+597
-690
lines changed

.babelrc

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
{
2-
"presets": ["es2015-loose", "stage-0", "react"],
3-
"env": {
4-
"development": {
5-
"presets": ["react-hmre"]
6-
}
7-
}
8-
}
2+
"presets": [
3+
[
4+
"env",
5+
{
6+
"targets": {
7+
"node": "current"
8+
}
9+
}
10+
],
11+
"stage-1",
12+
"react"
13+
]
14+
}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "4.2.1"
3+
- "stable"
44
script:
55
- npm run lint
66
- npm test

karma.conf.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ module.exports = function karmaConfig(config) {
1515
webpack: webpackConfig,
1616
webpackServer: {
1717
noInfo: true
18-
}
18+
},
19+
plugins: [
20+
'karma-webpack',
21+
'karma-phantomjs-launcher',
22+
'karma-mocha'
23+
]
1924
});
2025
};

package.json

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,15 @@
2929
"devDependencies": {
3030
"@types/react": "*",
3131
"autoprefixer": "^6.0.3",
32-
"babel-cli": "^6.4.0",
33-
"babel-core": "^6.4.0",
34-
"babel-eslint": "^5.0.0-beta6",
35-
"babel-loader": "^6.2.1",
32+
"babel-cli": "^6.4.1",
33+
"babel-core": "^6.24.1",
34+
"babel-eslint": "^7.2.1",
35+
"babel-loader": "^6.4.1",
3636
"babel-plugin-react-transform": "^2.0.0",
37-
"babel-polyfill": "^6.3.14",
38-
"babel-preset-es2015-loose": "^6.1.4",
39-
"babel-preset-react": "^6.3.13",
40-
"babel-preset-react-hmre": "^1.0.1",
41-
"babel-preset-stage-0": "^6.3.13",
37+
"babel-polyfill": "^6.23.0",
38+
"babel-preset-react": "^6.24.1",
39+
"babel-preset-stage-1": "^6.24.1",
40+
"babel-preset-env": "^1.4.0",
4241
"cpx": "^1.2.1",
4342
"cross-env": "^1.0.4",
4443
"css-loader": "^0.21.0",
@@ -51,15 +50,13 @@
5150
"flexboxgrid": "^6.3.0",
5251
"isparta": "^4.0.0",
5352
"jsdom": "^7.0.2",
54-
"karma": "^0.13.3",
55-
"karma-chrome-launcher": "^0.2.0",
56-
"karma-cli": "^0.1.0",
57-
"karma-mocha": "^0.2.0",
58-
"karma-phantomjs-launcher": "~0.2",
59-
"karma-webpack": "^1.7.0",
60-
"mocha": "^2.3.4",
53+
"karma": "^1.6.0",
54+
"karma-mocha": "^1.3.0",
55+
"karma-phantomjs-launcher": "^1.0.4",
56+
"karma-webpack": "^2.0.3",
57+
"mocha": "^3.1.2",
6158
"node-sass": "^3.4.2",
62-
"phantomjs": "^1.9.19",
59+
"phantomjs-prebuilt": "^2.1.14",
6360
"postcss-loader": "^0.7.0",
6461
"react": "^15.5.4",
6562
"react-addons-test-utils": "^15.5.1",
@@ -91,4 +88,4 @@
9188
"react": "^0.14.3 || ^15.5.4"
9289
},
9390
"types": "react-flexbox-grid.d.ts"
94-
}
91+
}

tests.webpack.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
'use strict'; // eslint-disable-line
2+
13
const context = require.context('./test', true, /.spec\.js$/);
24
context.keys().forEach(context);

webpack.config.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = {
66
loaders: [
77
{
88
test: /\.js$/,
9+
loader: 'babel-loader?presets[]=env',
910
exclude: /(node_modules)/,
10-
loader: 'babel'
1111
}, {
1212
test: /(\.scss|\.css)$/,
1313
loader: 'style!css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass'

0 commit comments

Comments
 (0)