Skip to content

Commit

Permalink
Merge pull request #189 from existentialism/lodash
Browse files Browse the repository at this point in the history
Switch to lodash
  • Loading branch information
lelandrichardson committed Feb 15, 2016
2 parents 13341ef + 78febd9 commit dd655c4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 9 deletions.
3 changes: 1 addition & 2 deletions docs/guides/jest.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Using Jest with Enzyme

If you are using Jest with enzyme and using Jest's "automocking" feature, you will need to mark
If you are using Jest with enzyme and using Jest's "automocking" feature, you will need to mark
several modules to be unmocked in your `package.json`:

```js
Expand All @@ -16,7 +16,6 @@ several modules to be unmocked in your `package.json`:
"enzyme",
"cheerio",
"htmlparser2",
"underscore",
"lodash",
"domhandler",
"object.assign",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
"dependencies": {
"cheerio": "^0.20.0",
"is-subset": "^0.1.1",
"lodash": "^4.0.0",
"object.assign": "^4.0.3",
"object.values": "^1.0.3",
"underscore": "^1.8.3"
"object.values": "^1.0.3"
},
"devDependencies": {
"babel-cli": "^6.3.17",
Expand Down
4 changes: 3 additions & 1 deletion src/Debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import {
import {
propsOfNode,
} from './Utils';
import { without, escape, compact } from 'underscore';
import without from 'lodash/without';
import escape from 'lodash/escape';
import compact from 'lodash/compact';
import { REACT013, REACT014 } from './version';
import objectValues from 'object.values';

Expand Down
2 changes: 1 addition & 1 deletion src/MountedTraversal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isEmpty } from 'underscore';
import isEmpty from 'lodash/isEmpty';
import isSubset from 'is-subset';
import {
coercePropValue,
Expand Down
4 changes: 3 additions & 1 deletion src/ReactWrapper.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React from 'react';
import cheerio from 'cheerio';
import { flatten, unique, compact } from 'underscore';
import flatten from 'lodash/flatten';
import unique from 'lodash/uniq';
import compact from 'lodash/compact';
import createWrapperComponent from './ReactWrapperComponent';
import {
instHasClassName,
Expand Down
2 changes: 1 addition & 1 deletion src/ShallowTraversal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { isEmpty } from 'underscore';
import isEmpty from 'lodash/isEmpty';
import isSubset from 'is-subset';
import {
coercePropValue,
Expand Down
4 changes: 3 additions & 1 deletion src/ShallowWrapper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';
import { flatten, unique, compact } from 'underscore';
import flatten from 'lodash/flatten';
import unique from 'lodash/uniq';
import compact from 'lodash/compact';
import cheerio from 'cheerio';
import {
nodeEqual,
Expand Down

0 comments on commit dd655c4

Please sign in to comment.