Skip to content

Commit 121b063

Browse files
author
Daniel Karlsson
committed
Merge branch 'release/2.2.1'
2 parents fdaec96 + b8cf740 commit 121b063

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
],
1111
"react"
1212
],
13-
"plugins": ["transform-class-properties"]
13+
"plugins": ["transform-class-properties", "transform-object-rest-spread"]
1414
}

bin/server.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const server = new webpackDevServer(webpack(internalServer.webpackConf(process.a
1919
version: false,
2020
hash: false,
2121
},
22+
disableHostCheck: true,
2223
proxy: internalServer.proxy(process.argv),
2324
publicPath: config.publicPath,
2425
});

internals/server/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require('babel-register')({
1818
],
1919
'react'
2020
],
21-
'plugins': ['transform-class-properties']
21+
'plugins': ['transform-class-properties', 'transform-object-rest-spread']
2222
});
2323

2424
const ReactDOMServer = require('react-dom/server')

internals/test/.setup-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require('babel-register')({
1010
],
1111
"react"
1212
],
13-
"plugins": ["transform-class-properties"]
13+
"plugins": ["transform-class-properties", "transform-object-rest-spread"]
1414
});
1515

1616
var jsdom = require('jsdom').jsdom;

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"babel-eslint": "^7.2.3",
4444
"babel-loader": "^7.0.0",
4545
"babel-plugin-transform-class-properties": "^6.24.1",
46+
"babel-plugin-transform-object-rest-spread": "^6.23.0",
4647
"babel-preset-env": "^1.5.2",
4748
"babel-preset-react": "^6.23.0",
4849
"babel-register": "^6.24.0",

0 commit comments

Comments
 (0)