Skip to content

Commit

Permalink
Merge pull request angular-redux#24 from Foxandxss/webpack
Browse files Browse the repository at this point in the history
Simplify webpack config
  • Loading branch information
wbuchwalter committed Sep 18, 2015
2 parents c530cd0 + 0e50370 commit 761ac0e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion examples/counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "ng-redux counter example",
"main": "index.js",
"scripts": {
"start": "webpack && webpack-dev-server --content-base dist/ --hot"
"start": "webpack-dev-server --content-base dist/ --inline"
},
"repository": {
"type": "git",
Expand Down
18 changes: 10 additions & 8 deletions examples/counter/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');

module.exports = {
entry: [
'webpack/hot/dev-server',
'./index.js',
//Remove the following line to remove devTools
'./devTools.js'
Expand All @@ -19,17 +18,20 @@ module.exports = {
template: './index.html',
inject: 'body'
}),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin()
],
resolve: {
extensions: ['', '.ts', '.webpack.js', '.web.js', '.js']
},
devtool: 'source-map',
module: {
loaders: [
{test: /\.js$/, exclude: /node_modules/, loader: "babel-loader"},
{ test: /\.html$/, loader: 'html' }
]
{
test: /\.js$/,
loader: "babel",
exclude: /node_modules/
},
{
test: /\.html$/,
loader: 'html'
}
]
}
};

0 comments on commit 761ac0e

Please sign in to comment.