Skip to content

Commit d67548b

Browse files
committed
Update to babel@6
1 parent 98c4663 commit d67548b

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

client/.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"stage": 0
2+
"presets": ["es2015", "stage-0", "react"]
33
}

client/package.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@
3737
},
3838
"dependencies": {
3939
"axios": "^0.7.0",
40-
"babel-core": "^5.8.25",
41-
"babel-loader": "^5.3.2",
40+
"babel": "^6.3.13",
41+
"babel-cli": "^6.3.17",
42+
"babel-core": "^6.3.17",
43+
"babel-loader": "^6.2.0",
44+
"babel-polyfill": "^6.3.14",
45+
"babel-preset-es2015": "^6.3.13",
46+
"babel-preset-react": "^6.3.13",
47+
"babel-preset-stage-0": "^6.3.13",
4248
"bootstrap-sass": "^3.3.5",
4349
"bootstrap-sass-loader": "^1.0.9",
4450
"css-loader": "^0.23.0",
@@ -71,7 +77,7 @@
7177
},
7278
"devDependencies": {
7379
"babel-eslint": "^5.0.0-beta6",
74-
"babel-plugin-react-transform": "^1.1.1",
80+
"babel-plugin-react-transform": "^2.0.0-beta1",
7581
"body-parser": "^1.14.1",
7682
"chai": "^3.4.1",
7783
"chai-immutable": "^1.5.3",

client/webpack.client.base.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = {
1414

1515
// See use of 'vendor' in the CommonsChunkPlugin inclusion below.
1616
vendor: [
17-
'babel-core/polyfill',
17+
'babel-polyfill',
1818
'jquery',
1919
'react',
2020
'react-dom',

client/webpack.client.hot.config.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,20 @@ config.module.loaders.push(
3535
loader: 'babel',
3636
exclude: /node_modules/,
3737
query: {
38-
plugins: ['react-transform'],
39-
extra: {
40-
'react-transform': {
41-
transforms: [
42-
{
43-
transform: 'react-transform-hmr',
44-
imports: ['react'],
45-
locals: ['module'],
46-
},
47-
],
48-
},
49-
},
38+
plugins: [
39+
[
40+
'react-transform',
41+
{
42+
transforms: [
43+
{
44+
transform: 'react-transform-hmr',
45+
imports: ['react'],
46+
locals: ['module'],
47+
},
48+
],
49+
},
50+
],
51+
],
5052
},
5153
},
5254
{ test: /\.css$/, loader: 'style-loader!css-loader' },

0 commit comments

Comments
 (0)