Skip to content

Commit

Permalink
Use lodash v4.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdalton committed Feb 1, 2016
1 parent 6c39092 commit e7295c3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 49 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
},
"homepage": "http://rackt.github.io/redux",
"dependencies": {
"lodash": "^4.1.0",
"loose-envify": "^1.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/combineReducers.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/createStore.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isPlainObject from './utils/isPlainObject'
import isPlainObject from 'lodash/isPlainObject'

/**
* These are private action types reserved by Redux.
Expand Down
24 changes: 0 additions & 24 deletions src/utils/isPlainObject.js

This file was deleted.

22 changes: 0 additions & 22 deletions test/utils/isPlainObject.spec.js

This file was deleted.

10 changes: 9 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,18 @@ var config = {
libraryTarget: 'umd'
},
plugins : [
{
apply: function apply(compiler) {
compiler.parser.plugin('expression global', function expressionGlobalPlugin() {
this.state.module.addVariable('global', "(function() { return this; }()) || Function('return this')()")
return false
});
}
},
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(env)
})
})
]
};

Expand Down

0 comments on commit e7295c3

Please sign in to comment.