ff-stream-web

commit 5470843f43958b0de59e550efa9c7805ee912ac5
parent b92bd0a825c66790804818393dedbfabca8620c4
Author: nodkz <nodkz@mail.ru>
Date:   Thu, 21 Jan 2016 19:11:22 +0600

Change `lodash.merge` and `lodash.clonedeep` to `extend` module.

Diffstat:
M
package.json
 | 
3
+--
M
tools/webpack.config.js
 | 
7
+++----

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
@@ -44,6 +44,7 @@
     "eslint-config-airbnb": "^3.1.0",
     "eslint-loader": "^1.2.0",
     "eslint-plugin-react": "^3.15.0",
+    "extend": "^3.0.0",
     "file-loader": "^0.8.5",
     "gaze": "^0.5.2",
     "git-repository": "^0.1.1",
@@ -51,8 +52,6 @@
     "jest-cli": "^0.8.2",
     "jscs": "^2.8.0",
     "json-loader": "^0.5.4",
-    "lodash.clonedeep": "4.0.1",
-    "lodash.merge": "^4.0.1",
     "mkdirp": "^0.5.1",
     "ncp": "^2.0.0",
     "postcss": "^5.0.14",
diff --git a/tools/webpack.config.js b/tools/webpack.config.js
@@ -9,8 +9,7 @@
 
 import path from 'path';
 import webpack from 'webpack';
-import merge from 'lodash.merge';
-import cloneDeep from 'lodash.clonedeep';
+import extend from 'extend';
 import AssetsPlugin from 'assets-webpack-plugin';
 
 const DEBUG = !process.argv.includes('--release');
@@ -110,7 +109,7 @@ const config = {
 // Configuration for the client-side bundle (client.js)
 // -----------------------------------------------------------------------------
 
-const clientConfig = merge({}, cloneDeep(config), {
+const clientConfig = extend(true, {}, config, {
   entry: './src/client.js',
   output: {
     path: path.join(__dirname, '../build/public'),
@@ -147,7 +146,7 @@ const clientConfig = merge({}, cloneDeep(config), {
 // Configuration for the server-side bundle (server.js)
 // -----------------------------------------------------------------------------
 
-const serverConfig = merge({}, cloneDeep(config), {
+const serverConfig = extend(true, {}, config, {
   entry: './src/server.js',
   output: {
     path: './build',