Skip to content
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

add apollo state func #18436

Closed
wants to merge 1 commit into from
Closed

add apollo state func #18436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions examples/with-apollo/lib/apolloClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { useMemo } from 'react'
import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client'
import { concatPagination } from '@apollo/client/utilities'

export const APOLLO_STATE_PROP_NAME = '__APOLLO_STATE__'

let apolloClient

function createApolloClient() {
Expand Down Expand Up @@ -43,7 +45,20 @@ export function initializeApollo(initialState = null) {
return _apolloClient
}

export function useApollo(initialState) {
const store = useMemo(() => initializeApollo(initialState), [initialState])
export function addApolloState(client, pageProps) {
return {
...pageProps,
props: {
...pageProps.props,
[APOLLO_STATE_PROP_NAME]: client.cache.extract(),
},
}
Comment on lines +49 to +55
Copy link
Member

@lfades lfades Nov 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be easier to understand and provider the same result, just an idea, you don't have to merge it.

This also has the added benefit that if you don't define props: {} then it won't be added to pageProps and Next.js will throw as expected.

Suggested change
return {
...pageProps,
props: {
...pageProps.props,
[APOLLO_STATE_PROP_NAME]: client.cache.extract(),
},
}
if (pageProps?.props) {
pageProps.props[APOLLO_STATE_PROP_NAME] = client.cache.extract()
}
return pageProps

}

export function useApollo(pageProps) {
const store = useMemo(
() => initializeApollo(pageProps[APOLLO_STATE_PROP_NAME]),
[pageProps]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[pageProps]
[pageProps[APOLLO_STATE_PROP_NAME]]

)
return store
}
2 changes: 1 addition & 1 deletion examples/with-apollo/pages/_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ApolloProvider } from '@apollo/client'
import { useApollo } from '../lib/apolloClient'

export default function App({ Component, pageProps }) {
const apolloClient = useApollo(pageProps.initialApolloState)
const apolloClient = useApollo(pageProps)

return (
<ApolloProvider client={apolloClient}>
Expand Down
10 changes: 4 additions & 6 deletions examples/with-apollo/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PostList, {
ALL_POSTS_QUERY,
allPostsQueryVars,
} from '../components/PostList'
import { initializeApollo } from '../lib/apolloClient'
import { initializeApollo, addApolloState } from '../lib/apolloClient'

const IndexPage = () => (
<App>
Expand All @@ -25,12 +25,10 @@ export async function getStaticProps() {
variables: allPostsQueryVars,
})

return {
props: {
initialApolloState: apolloClient.cache.extract(),
},
return addApolloState(apolloClient, {
props: {},
revalidate: 1,
}
})
}

export default IndexPage