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
commit 9026dffdf7

View File

@ -34,7 +34,7 @@ module.exports = {
],
resolve: {
extensions: ['', '.js'],
extensions: ['', '.js', '.jsx'],
alias: {
'styles': __dirname + '/src/styles',
'mixins': __dirname + '/src/mixins',
@ -51,7 +51,7 @@ module.exports = {
loader: 'eslint-loader'
}],
loaders: [{
test: /\.js$/,
test: /\.(js|jsx)$/,
exclude: /node_modules/,
loader: 'babel-loader'
}, {