fix: don't set signal on fetch unless provided to client.fetch (#…

…298)
sanity-io · Aug 17, 2023 · e1d5210 · e1d5210
1 parent 7f64b79
commit e1d5210
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
   },
   "dependencies": {
     "@sanity/eventsource": "^5.0.0",
-    "get-it": "^8.4.2",
+    "get-it": "^8.4.3",
     "rxjs": "^7.0.0"
   },
   "devDependencies": {

diff --git a/src/data/dataMethods.ts b/src/data/dataMethods.ts
@@ -70,7 +70,12 @@ export function _fetch<R, Q extends QueryParams>(
 ): Observable<RawQueryResponse<R> | R> {
   const mapResponse =
     options.filterResponse === false ? (res: Any) => res : (res: Any) => res.result
-  const {cache, next, ...opts} = options
+  const {cache, next, ...opts} = {
+    // Opt out of setting a `signal` on an internal `fetch` if one isn't provided.
+    // This is necessary in React Server Components to avoid opting out of Request Memoization.
+    useAbortSignal: typeof options.signal !== 'undefined',
+    ...options,
+  }
   const reqOpts =
     typeof cache !== 'undefined' || typeof next !== 'undefined'
       ? {...opts, fetch: {cache, next}}
@@ -235,6 +240,7 @@ export function _dataRequest(
     canUseCdn: isQuery,
     signal: options.signal,
     fetch: options.fetch,
+    useAbortSignal: options.useAbortSignal,
   }
 
   return _requestObservable(client, httpRequest, reqOptions).pipe(