Remove fetchWithServerCache export and move injected fetch directly u…

…nder context
Shopify · Nov 9, 2022 · 162e2d4 · 162e2d4
1 parent 27ad1ee
commit 162e2d4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/packages/@hydrogen/remix/index.ts b/packages/@hydrogen/remix/index.ts
@@ -4,7 +4,6 @@ import type {Params} from '@remix-run/react';
 export * from '@remix-run/oxygen';
 export {createRequestHandler} from './server';
 export * from './storefront';
-export {fetchWithServerCache} from './cache/fetch';
 export {
   CacheNone,
   CacheShort,

diff --git a/packages/@hydrogen/remix/server.ts b/packages/@hydrogen/remix/server.ts
@@ -32,13 +32,13 @@ export function createRequestHandler(
       return await handleRequest(request, {
         ...options,
         context: {
-          ...context,
-          cache,
-          storefront: createStorefrontClient(storefront, {
+          ...createStorefrontClient(storefront, {
             cache,
             buyerIp: getBuyerIp(request),
             waitUntil: (p: Promise<any>) => context.waitUntil(p),
           }),
+          ...context,
+          cache,
         },
       });
     } catch (e) {

diff --git a/packages/@hydrogen/remix/storefront.ts b/packages/@hydrogen/remix/storefront.ts
@@ -147,25 +147,31 @@ export function createStorefrontClient(
   }
 
   return {
-    query: getStorefrontData,
-    getPublicTokenHeaders,
-    getPrivateTokenHeaders,
-    getStorefrontApiUrl,
-    cache,
-    CacheNone,
-    CacheLong,
-    CacheShort,
-    CacheCustom,
+    storefront: {
+      query: getStorefrontData,
+      getPublicTokenHeaders,
+      getPrivateTokenHeaders,
+      getStorefrontApiUrl,
+      cache,
+      CacheNone,
+      CacheLong,
+      CacheShort,
+      CacheCustom,
+    },
     fetch: (
       url: string,
-      requestInit: RequestInit,
-      fetchOptions: Omit<FetchCacheOptions, 'cacheInstance' | 'waitUntil'>,
+      {
+        hydrogen,
+        ...requestInit
+      }: RequestInit & {
+        hydrogen?: Omit<FetchCacheOptions, 'cacheInstance' | 'waitUntil'>;
+      },
     ) =>
       fetchWithServerCache(url, requestInit, {
         waitUntil,
         cacheKey: [url, requestInit],
         cacheInstance: cache,
-        ...fetchOptions,
+        ...hydrogen,
       }),
   };
 }