archive-gh-me/generator-react-webpack
1
0
Fork 0
mirror of https://github.com/react-webpack-generators/generator-react-webpack.git synced 2025-12-08 18:01:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'exclude-node_modules' of https://github.com/Shraymonks/generator-react-webpack into Shraymonks-exclude-node_modules

Browse Source 
Signed-off-by: Simon Bailey <simon@newtriks.com>

Conflicts:
	templates/common/_webpack.config.js
	templates/common/_webpack.dist.config.js
This commit is contained in:
Simon Bailey 2015-02-17 09:55:40 +00:00
commit c5aa8e1e1a
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/common/_webpack.config.js
View File

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

1
templates/common/_webpack.dist.config.js
View File

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