From 8f61c335cb5994cc63fb98563ed1e519b026c3a0 Mon Sep 17 00:00:00 2001 From: Keith Grennan Date: Thu, 6 Sep 2018 00:45:16 -0700 Subject: [PATCH] [with-apollo-auth] Only run getDataFromTree() on server (fix #4775) (#5112) Though it sounds like some folks do run getDataFromTree() on the client in order to avoid loading states, it's non-standard usage and potentially confusing. Also it's inconsistent with the other with-apollo examples. --- examples/with-apollo-auth/lib/withApollo.js | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/with-apollo-auth/lib/withApollo.js b/examples/with-apollo-auth/lib/withApollo.js index 62c746c9..d0f199af 100644 --- a/examples/with-apollo-auth/lib/withApollo.js +++ b/examples/with-apollo-auth/lib/withApollo.js @@ -39,26 +39,26 @@ export default App => { return {} } - // Run all graphql queries in the component tree - // and extract the resulting data - try { - // Run all GraphQL queries - await getDataFromTree( - - ) - } catch (error) { - // Prevent Apollo Client GraphQL errors from crashing SSR. - // Handle them in components via the data.error prop: - // https://www.apollographql.com/docs/react/api/react-apollo.html#graphql-query-data-error - console.error('Error while running `getDataFromTree`', error) - } - if (!process.browser) { + // Run all graphql queries in the component tree + // and extract the resulting data + try { + // Run all GraphQL queries + await getDataFromTree( + + ) + } catch (error) { + // Prevent Apollo Client GraphQL errors from crashing SSR. + // Handle them in components via the data.error prop: + // https://www.apollographql.com/docs/react/api/react-apollo.html#graphql-query-data-error + console.error('Error while running `getDataFromTree`', error) + } + // getDataFromTree does not call componentWillUnmount // head side effect therefore need to be cleared manually Head.rewind()