wassname/react-webpack-template
1
0
Fork 0
mirror of https://github.com/wassname/react-webpack-template.git synced 2026-08-15 12:45:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverted fix for config merge.

Browse Source
This commit is contained in:
Chris
2015-10-29 08:34:29 +01:00
parent 831fb6f8b9
commit 33150f0cf6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cfg/dev.js
+2 -2
View File
@@ -7,7 +7,7 @@ var baseConfig = require('./base');
// Add needed plugins here // Add needed plugins here
var BowerWebpackPlugin = require('bower-webpack-plugin'); var BowerWebpackPlugin = require('bower-webpack-plugin');
var config = _.merge(baseConfig, { var config = _.merge({
entry: [ entry: [
'webpack-dev-server/client?http://127.0.0.1:8000', 'webpack-dev-server/client?http://127.0.0.1:8000',
'webpack/hot/only-dev-server', 'webpack/hot/only-dev-server',
@@ -22,7 +22,7 @@ var config = _.merge(baseConfig, {
searchResolveModulesDirectories: false searchResolveModulesDirectories: false
}) })
] ]
}); }, baseConfig);
// Add needed loaders // Add needed loaders
config.module.loaders.push({ config.module.loaders.push({
cfg/dist.js
+2 -2
View File
@@ -7,7 +7,7 @@ var baseConfig = require('./base');
// Add needed plugins here // Add needed plugins here
var BowerWebpackPlugin = require('bower-webpack-plugin'); var BowerWebpackPlugin = require('bower-webpack-plugin');
var config = _.merge(baseConfig, { var config = _.merge({
entry: path.join(__dirname, '../src/components/run'), entry: path.join(__dirname, '../src/components/run'),
cache: false, cache: false,
devtool: 'sourcemap', devtool: 'sourcemap',
@@ -24,7 +24,7 @@ var config = _.merge(baseConfig, {
new webpack.optimize.AggressiveMergingPlugin(), new webpack.optimize.AggressiveMergingPlugin(),
new webpack.NoErrorsPlugin() new webpack.NoErrorsPlugin()
] ]
}); }, baseConfig);
config.module.loaders.push({ config.module.loaders.push({
test: /\.(js|jsx)$/, test: /\.(js|jsx)$/,