Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

Rolled back on the lodash-es changes #1393

Merged
merged 2 commits into from
Dec 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Change log

### vNext
### 2.0.4
- rolled back on the lodash-es changes from
[#1344](https://github.com/apollographql/react-apollo/pull/1344) due to build
errors reported on slack
[#1393](https://github.com/apollographql/react-apollo/pull/1393)

### 2.0.3
- Use lodash-es to allow lodash functions to be used in ES modules [#1344](https://github.com/apollographql/react-apollo/pull/1344)
- turn back on flow checking

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-apollo",
"version": "2.0.1",
"version": "2.0.4",
"description": "React data container for Apollo Client",
"main": "lib/react-apollo.umd.js",
"module": "./lib/index.js",
Expand Down Expand Up @@ -96,7 +96,6 @@
"@types/isomorphic-fetch": "0.0.34",
"@types/jest": "20.0.8",
"@types/lodash": "4.14.86",
"@types/lodash-es": "4.17.0",
"@types/node": "8.0.31",
"@types/object-assign": "4.0.30",
"@types/react": "16.0.28",
Expand Down Expand Up @@ -166,7 +165,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 };
11 changes: 7 additions & 4 deletions 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 Expand Up @@ -306,8 +306,9 @@ export default function graphql<
`The operation '${operation.name}' wrapping '${getDisplayName(
WrappedComponent,
)}' ` +
`is expecting a variable: '${variable.name
.value}' but it was not found in the props ` +
`is expecting a variable: '${
variable.name.value
}' but it was not found in the props ` +
`passed to '${graphQLDisplayName}'`,
);
}
Expand Down Expand Up @@ -445,7 +446,9 @@ export default function graphql<
const clashingKeys = Object.keys(observableQueryFields(results.data));
invariant(
clashingKeys.length === 0,
`the result of the '${graphQLDisplayName}' operation contains keys that ` +
`the result of the '${
graphQLDisplayName
}' operation contains keys that ` +
`conflict with the return object.` +
clashingKeys.map(k => `'${k}'`).join(', ') +
` not allowed.`,
Expand Down