Merge pull request #122 from weblogixx/master

Bugfix for jsx backwards compatibility
This commit is contained in:
Simon Bailey
2015-06-30 11:34:45 +01:00
+2 -2
View File
@@ -34,7 +34,7 @@ module.exports = {
], ],
resolve: { resolve: {
extensions: ['', '.js'], extensions: ['', '.js', '.jsx'],
alias: { alias: {
'styles': __dirname + '/src/styles', 'styles': __dirname + '/src/styles',
'mixins': __dirname + '/src/mixins', 'mixins': __dirname + '/src/mixins',
@@ -51,7 +51,7 @@ module.exports = {
loader: 'eslint-loader' loader: 'eslint-loader'
}], }],
loaders: [{ loaders: [{
test: /\.js$/, test: /\.(js|jsx)$/,
exclude: /node_modules/, exclude: /node_modules/,
loader: 'babel-loader' loader: 'babel-loader'
}, { }, {