Skip to content

Commit

Permalink
Revert "Use lodash-es for ES modules (apollographql#1344)"
Browse files Browse the repository at this point in the history
This reverts commit 8085a94.

Fixes apollographql#1390
  • Loading branch information
KevinGrandon committed Dec 9, 2017
1 parent e0d38be commit d1cb5c7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
11 changes: 3 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
"transform": {
".*": "./preprocessor.js"
},
"transformIgnorePatterns": [
"<rootDir>/node_modules/(?!(lodash-es|react-native)/)"
],
"moduleFileExtensions": ["ts", "tsx", "js", "json"],
"modulePathIgnorePatterns": [
"<rootDir>/examples",
Expand All @@ -95,8 +92,7 @@
"@types/invariant": "2.2.29",
"@types/isomorphic-fetch": "0.0.34",
"@types/jest": "20.0.8",
"@types/lodash": "4.14.86",
"@types/lodash-es": "4.17.0",
"@types/lodash": "4.14.74",
"@types/node": "8.0.31",
"@types/object-assign": "4.0.30",
"@types/react": "16.0.28",
Expand All @@ -109,9 +105,7 @@
"@types/zen-observable": "0.5.3",
"apollo-cache-inmemory": "1.1.3",
"apollo-client": "2.1.0",
"babel-core": "^6.26.0",
"babel-jest": "20.0.3",
"babel-preset-env": "^1.6.1",
"babel-preset-react-native": "3.0.2",
"bundlesize": "0.14.4",
"cheerio": "0.22.0",
Expand Down Expand Up @@ -166,7 +160,8 @@
"apollo-link": "^1.0.0",
"hoist-non-react-statics": "^2.2.0",
"invariant": "^2.2.1",
"lodash-es": "^4.17.4",
"lodash.flowright": "^3.5.0",
"lodash.pick": "^4.4.0",
"prop-types": "^15.5.8"
}
}
4 changes: 2 additions & 2 deletions src/browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ export { withApollo } from './withApollo';
export { getDataFromTree } from './getDataFromTree';

// expose easy way to join queries from redux
import flowRight from 'lodash-es/flowRight';
export { flowRight as compose };
import * as compose from 'lodash.flowright';
export { compose };
2 changes: 1 addition & 1 deletion src/graphql.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import shallowEqual from './shallowEqual';

const invariant = require('invariant');
const assign = require('object-assign');
import pick from 'lodash-es/pick';
const pick = require('lodash.pick');

const hoistNonReactStatics = require('hoist-non-react-statics');

Expand Down

0 comments on commit d1cb5c7

Please sign in to comment.