Life improvements

examples/with-typescript-graphql/lib/with-apolo.tsx → examples/with-typescript-graphql/lib/with-apollo.tsx

@@ -16,7 +16,7 @@ type WithApolloPageContext = {
   apolloClient: TApolloClient
 } & NextPageContext
 
-let apolloClient: TApolloClient
+let globalApolloClient: TApolloClient
 
 /**
  * Creates and provides the apolloContext
@@ -126,11 +126,11 @@ function initApolloClient(initialState?: any) {
   }
 
   // Reuse client on the client-side
-  if (!apolloClient) {
-    apolloClient = createApolloClient(initialState)
+  if (!globalApolloClient) {
+    globalApolloClient = createApolloClient(initialState)
   }
 
-  return apolloClient
+  return globalApolloClient
 }
 
 /**

examples/with-typescript-graphql/next.config.js

@@ -1,21 +1,17 @@
-module.exports = withTypeScriptGraphQL()
+module.exports = {
+  webpack(config, options) {
+    config.module.rules.push({
+      test: /\.graphql$/,
+      exclude: /node_modules/,
+      use: [options.defaultLoaders.babel, { loader: 'graphql-let/loader' }],
+    })
 
-function withTypeScriptGraphQL(nextConfig = {}) {
-  return Object.assign({}, nextConfig, {
-    webpack(config, options) {
-      config.module.rules.push({
-        test: /\.graphql$/,
-        exclude: /node_modules/,
-        use: [options.defaultLoaders.babel, { loader: 'graphql-let/loader' }],
-      })
+    config.module.rules.push({
+      test: /\.graphqls$/,
+      exclude: /node_modules/,
+      loader: 'graphql-tag/loader',
+    })
 
-      config.module.rules.push({
-        test: /\.graphqls$/,
-        exclude: /node_modules/,
-        loader: 'graphql-tag/loader',
-      })
-
-      return config
-    },
-  })
+    return config
+  },
 }

examples/with-typescript-graphql/package.json

@@ -3,6 +3,12 @@
   "version": "0.1.0",
   "author": "",
   "license": "ISC",
+  "scripts": {
+    "codegen": "graphql-let",
+    "dev": "yarn codegen && next",
+    "build": "yarn codegen && next build",
+    "start": "next start"
+  },
   "dependencies": {
     "@apollo/react-common": "3.1.3",
     "@apollo/react-components": "^3.1.3",
@@ -27,11 +33,5 @@
     "@types/react": "^16.9.17",
     "graphql-let": "^0.3.2",
     "typescript": "^3.7.4"
-  },
-  "scripts": {
-    "codegen": "graphql-let",
-    "dev": "yarn codegen && next",
-    "build": "yarn codegen && next build",
-    "start": "next start"
   }
 }

examples/with-typescript-graphql/pages/index.tsx

@@ -1,6 +1,6 @@
-import withApolo from '../lib/with-apolo'
+import withApollo from '../lib/with-apollo'
 import Link from 'next/link'
-import { useViewerQuery } from './viewer.graphql'
+import { useViewerQuery } from '../lib/viewer.graphql'
 
 const Index = () => {
   const { data } = useViewerQuery()
@@ -21,4 +21,4 @@ const Index = () => {
   return <div>...</div>
 }
 
-export default withApolo(Index)
+export default withApollo(Index)