Merge pull request #611 from jdalton/lodash

Use lodash v4

package.json

@@ -59,6 +59,7 @@
   },
   "homepage": "http://rackt.github.io/redux",
   "dependencies": {
+    "lodash": "^4.1.0",
     "loose-envify": "^1.1.0"
   },
   "devDependencies": {

src/combineReducers.js

@@ -1,5 +1,5 @@
 import { ActionTypes } from './createStore'
-import isPlainObject from './utils/isPlainObject'
+import isPlainObject from 'lodash/isPlainObject'
 import warning from './utils/warning'
 
 function getUndefinedStateErrorMessage(key, action) {

src/createStore.js

@@ -1,4 +1,4 @@
-import isPlainObject from './utils/isPlainObject'
+import isPlainObject from 'lodash/isPlainObject'
 
 /**
  * These are private action types reserved by Redux.

webpack.config.base.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var webpack = require('webpack');
+
 module.exports = {
   module: {
     loaders: [
@@ -10,7 +12,7 @@ module.exports = {
     library: 'Redux',
     libraryTarget: 'umd'
   },
-  resolve: {
-    extensions: ['', '.js']
-  }
+  plugins: [
+    new webpack.optimize.OccurenceOrderPlugin()
+  ]
 };

webpack.config.development.js

@@ -1,14 +1,13 @@
 'use strict';
 
+var _ = require('lodash');
 var webpack = require('webpack');
 var baseConfig = require('./webpack.config.base');
 
-var config = Object.create(baseConfig);
-config.plugins = [
-  new webpack.optimize.OccurenceOrderPlugin(),
-  new webpack.DefinePlugin({
-    'process.env.NODE_ENV': JSON.stringify('development')
-  })
-];
-
-module.exports = config;
+module.exports = _.merge({}, baseConfig, {
+  plugins: baseConfig.plugins.concat(
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': '"development"'
+    })
+  )
+});

webpack.config.production.js

@@ -1,20 +1,22 @@
 'use strict';
 
+var _ = require('lodash');
 var webpack = require('webpack');
 var baseConfig = require('./webpack.config.base');
 
-var config = Object.create(baseConfig);
-config.plugins = [
-  new webpack.optimize.OccurenceOrderPlugin(),
-  new webpack.DefinePlugin({
-    'process.env.NODE_ENV': JSON.stringify('production')
-  }),
-  new webpack.optimize.UglifyJsPlugin({
-    compressor: {
-      screw_ie8: true,
-      warnings: false
-    }
-  })
-];
-
-module.exports = config;
+module.exports = _.merge({}, baseConfig, {
+  plugins: baseConfig.plugins.concat(
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': '"production"'
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compressor: {
+        pure_getters: true,
+        unsafe: true,
+        unsafe_comps: true,
+        screw_ie8: true,
+        warnings: false
+      }
+    })
+  )
+});