feat: remove modifyResponseExchange and restore graphqlClient to previous spec

Author: robp

apps/marketing/app/[locale]/[[...slug]]/page.tsx

@@ -16,7 +16,6 @@ import { TopicBusinessInfoFieldsFragment } from '#/components/topic-business-inf
 import { TopicProductFragment } from '#/components/topic-product/topic-product';
 import { addContentSourceMaps } from '#/lib/content-source-maps';
 import { graphqlClient } from '#/lib/graphql-client';
-import { getTaxonomyConcepts } from '#/lib/get-taxonomy-concepts';
 import { getLocaleFromPath } from '#/locales/get-locale-from-path';
 import { getStaticParams } from '#/locales/server';
 
@@ -30,12 +29,6 @@ interface Params {
 }
 
 const getPage = async (slug: string, locale: string, preview = false) => {
-  const taxonomyConcepts = await getTaxonomyConcepts(process.env.CONTENTFUL_ORGANIZATION ?? '<missing organization>');
-  const clientData = {
-    locale,
-    taxonomyConcepts,
-  };
-
   const pageQuery = graphql(
     `
       query PageQuery($slug: String, $locale: String, $preview: Boolean) @contentSourceMaps {
@@ -77,7 +70,7 @@ const getPage = async (slug: string, locale: string, preview = false) => {
     ]
   );
 
-  const response = await graphqlClient({ preview, data: clientData }).query(pageQuery, {
+  const response = await graphqlClient(preview).query(pageQuery, {
     locale,
     preview,
     slug,
@@ -100,7 +93,7 @@ const getPageSlugs = async (locale: string) => {
     }
   `);
 
-  const pages = await graphqlClient({ preview: false }).query(pageQuery, {
+  const pages = await graphqlClient(false).query(pageQuery, {
     locale,
   });
 
@@ -131,7 +124,7 @@ const getPageMetadata = async (slug: string, locale: string, preview = false): P
     [ComponentSEOFieldsFragment]
   );
 
-  const response = await graphqlClient({ preview }).query(pageQuery, {
+  const response = await graphqlClient(preview).query(pageQuery, {
     locale,
     preview,
     slug,

apps/marketing/app/[locale]/layout.tsx

@@ -39,7 +39,7 @@ export default async function RootLayout(props: { children: React.ReactNode; par
     [NavigationFieldsFragment]
   );
 
-  const layoutData = await graphqlClient({ preview: isDraftMode }).query(
+  const layoutData = await graphqlClient(isDraftMode).query(
     layoutQuery,
     {
       locale: getLocaleFromPath(locale),

apps/marketing/lib/get-page-slug.ts

@@ -14,7 +14,7 @@ const getPageSlug = async (slug: string, locale: string, preview = false) => {
   `);
 
   return (
-    await graphqlClient({ preview }).query(pageSlugQuery, {
+    await graphqlClient(preview).query(pageSlugQuery, {
       locale,
       preview,
       slug,

apps/marketing/lib/graphql-client.ts

@@ -9,22 +9,10 @@ import { createClient, fetchExchange } from '@urql/core';
 import { persistedExchange } from '@urql/exchange-persisted';
 import memoize from 'lodash/memoize';
 import { mapExchange } from 'urql';
-import type { ConceptProps } from 'contentful-management';
-
-import { modifyResponseExchange } from './modify-response-exchange';
 
 const graphqlEndpoint = `https://graphql.contentful.com/content/v1/spaces/${process.env.CONTENTFUL_SPACE ?? '<missing space>'}/environments/${process.env.CONTENTFUL_ENVIRONMENT ?? '<missing environment>'}`;
 
-interface MakeClientProps {
-  preview?: boolean;
-  data?: {
-    locale?: string;
-    taxonomyConcepts?: ConceptProps[];
-  };
-}
-
-const makeClient = ({ preview, data = {} }: MakeClientProps) => {
-  const { locale, taxonomyConcepts } = data;
+const makeClient = (preview: boolean) => {
   return createClient({
     url: `${graphqlEndpoint}?access_token=${(preview ? process.env.CONTENTFUL_PREVIEW_API : process.env.CONTENTFUL_DELIVERY_API) ?? '<missing token>'}`,
     exchanges: [
@@ -38,10 +26,6 @@ const makeClient = ({ preview, data = {} }: MakeClientProps) => {
       persistedExchange({
         preferGetForPersistedQueries: true,
       }),
-      modifyResponseExchange({
-        locale,
-        taxonomyConcepts,
-      }),
       /**
        * It map seem counter-intuitive, but exchanges are bi-directional, so mapExchange can both pass things to fetch,
        * as well as receive errors back from fetch on it's way back.