Merge branch 'Shraymonks-exclude-node_modules'

This commit is contained in:
Simon Bailey 2015-02-17 09:56:07 +00:00
commit b5c6fb113f
2 changed files with 2 additions and 0 deletions

View File

@ -38,6 +38,7 @@ module.exports = {
}], }],
loaders: [{ loaders: [{
test: /\.js$/, test: /\.js$/,
exclude: /node_modules/,
loader: 'react-hot!<% if (es6) { %>babel!<% }%>jsx-loader?harmony' loader: 'react-hot!<% if (es6) { %>babel!<% }%>jsx-loader?harmony'
},<% if (stylesLanguage === 'sass') { %> { },<% if (stylesLanguage === 'sass') { %> {
test: /\.sass/, test: /\.sass/,

View File

@ -45,6 +45,7 @@ module.exports = {
loaders: [{ loaders: [{
test: /\.js$/, test: /\.js$/,
exclude: /node_modules/,
loader: '<% if (es6) { %>babel!<% }%>jsx-loader?harmony' loader: '<% if (es6) { %>babel!<% }%>jsx-loader?harmony'
}, { }, {
test: /\.css$/, test: /\.css$/,