Skip to content

Update Apollo Example #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 26, 2017
Merged

Update Apollo Example #888

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3038bc0
Add minimal apollo example
Jan 15, 2017
fa622c7
Update apollo example README
Jan 15, 2017
0c7cb55
Update apollo example demo link in README
Jan 15, 2017
bd93b96
Fix button styles
Jan 15, 2017
31fba6b
Fix show more button
Jan 16, 2017
4666091
Alias demo url
Jan 17, 2017
f366e7a
Include the data field on the Apollo store when hydrating
Jan 17, 2017
106effc
Revert
Jan 17, 2017
2dc3cf0
Include the data field on the Apollo store when hydrating per tpreuss…
Jan 17, 2017
dea2641
Merge remote-tracking branch 'upstream/master'
Jan 19, 2017
292ca82
Merge remote-tracking branch 'upstream/master'
Jan 21, 2017
bca6518
Add example to faq section in README
Jan 21, 2017
8605d77
Sort by newest; Add active state to buttons
Jan 21, 2017
e2efe97
Make optimization suggestions
Jan 22, 2017
e6d777a
Use process.browser; inline props
Jan 22, 2017
30de697
Pass wrapped component's initial props into component heirarchy if th…
Jan 25, 2017
89df730
Merge remote-tracking branch 'upstream/master'
Jan 26, 2017
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
12 changes: 9 additions & 3 deletions examples/with-apollo/lib/withData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ export default (Component) => (
const client = initClient(headers)
const store = initStore(client, client.initialState)

const props = {
url: { query: ctx.query, pathname: ctx.pathname },
...await (Component.getInitialProps ? Component.getInitialProps(ctx) : {})
}

if (!process.browser) {
const app = (
<ApolloProvider client={client} store={store}>
<Component url={{ query: ctx.query, pathname: ctx.pathname }} />
<Component {...props} />
</ApolloProvider>
)
await getDataFromTree(app)
Expand All @@ -28,7 +33,8 @@ export default (Component) => (
data: state.apollo.data
}
},
headers
headers,
...props
}
}

Expand All @@ -41,7 +47,7 @@ export default (Component) => (
render () {
return (
<ApolloProvider client={this.client} store={this.store}>
<Component url={this.props.url} />
<Component {...this.props} />
</ApolloProvider>
)
}
Expand Down