From b3f99eb73e1476e7d3e57a0d97cd5f2d9e8d8026 Mon Sep 17 00:00:00 2001 From: Martin Jul Date: Tue, 27 Oct 2015 23:27:18 +0100 Subject: [PATCH] Fix override order for base.js and dev.js / dist.js --- cfg/dev.js | 4 ++-- cfg/dist.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg/dev.js b/cfg/dev.js index e9ef819..3710704 100644 --- a/cfg/dev.js +++ b/cfg/dev.js @@ -7,7 +7,7 @@ var baseConfig = require('./base'); // Add needed plugins here var BowerWebpackPlugin = require('bower-webpack-plugin'); -var config = _.merge({ +var config = _.merge(baseConfig, { entry: [ 'webpack-dev-server/client?http://127.0.0.1:8000', 'webpack/hot/only-dev-server', @@ -22,7 +22,7 @@ var config = _.merge({ searchResolveModulesDirectories: false }) ] -}, baseConfig); +}); // Add needed loaders config.module.loaders.push({ diff --git a/cfg/dist.js b/cfg/dist.js index 23fccf2..a105bf8 100644 --- a/cfg/dist.js +++ b/cfg/dist.js @@ -7,7 +7,7 @@ var baseConfig = require('./base'); // Add needed plugins here var BowerWebpackPlugin = require('bower-webpack-plugin'); -var config = _.merge({ +var config = _.merge(baseConfig, { entry: path.join(__dirname, '../src/components/run'), cache: false, devtool: 'sourcemap', @@ -24,7 +24,7 @@ var config = _.merge({ new webpack.optimize.AggressiveMergingPlugin(), new webpack.NoErrorsPlugin() ] -}, baseConfig); +}); config.module.loaders.push({ test: /\.(js|jsx)$/,