Commit e3378d0f authored by Ray Schamp's avatar Ray Schamp Committed by GitHub

Merge pull request #662 from rschamp/feature/use-babel-develop

Use babel-loader for jsx transpilation
parents 637b1352 1db52c4e
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
"devDependencies": { "devDependencies": {
"async": "1.5.2", "async": "1.5.2",
"autoprefixer": "6.3.6", "autoprefixer": "6.3.6",
"babel-core": "6.10.4",
"babel-loader": "6.2.4",
"babel-preset-es2015": "6.9.0",
"babel-preset-react": "6.11.1",
"classnames": "2.1.3", "classnames": "2.1.3",
"cookie": "0.2.2", "cookie": "0.2.2",
"copy-webpack-plugin": "0.2.0", "copy-webpack-plugin": "0.2.0",
...@@ -51,7 +55,6 @@ ...@@ -51,7 +55,6 @@
"iso-3166-2": "0.4.0", "iso-3166-2": "0.4.0",
"json-loader": "0.5.2", "json-loader": "0.5.2",
"json2po-stream": "1.0.3", "json2po-stream": "1.0.3",
"jsx-loader": "0.13.2",
"keymirror": "0.1.1", "keymirror": "0.1.1",
"lodash.clone": "3.0.3", "lodash.clone": "3.0.3",
"lodash.defaultsdeep": "3.10.0", "lodash.defaultsdeep": "3.10.0",
......
...@@ -68,7 +68,10 @@ module.exports = { ...@@ -68,7 +68,10 @@ module.exports = {
loaders: [ loaders: [
{ {
test: /\.jsx$/, test: /\.jsx$/,
loader: 'jsx-loader', loader: 'babel',
query: {
presets: ['es2015','react']
},
include: path.resolve(__dirname, 'src') include: path.resolve(__dirname, 'src')
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment