Merge branch 'main' into feat/3.0

Author: kettanaito

src/browser/utils/deserializeRequest.ts

@@ -1,11 +1,12 @@
 import { pruneGetRequestBody } from './pruneGetRequestBody'
+import type { IncomingWorkerRequest } from './workerChannel'
 
 /**
  * Converts a given request received from the Service Worker
  * into a Fetch `Request` instance.
  */
 export function deserializeRequest(
-  serializedRequest: ServiceWorkerIncomingRequest,
+  serializedRequest: IncomingWorkerRequest,
 ): Request {
   return new Request(serializedRequest.url, {
     ...serializedRequest,

src/browser/utils/pruneGetRequestBody.ts

@@ -1,13 +1,13 @@
-import type { ServiceWorkerIncomingRequest } from '../glossary'
+import type { IncomingWorkerRequest } from './workerChannel'
 
-type Input = Pick<ServiceWorkerIncomingRequest, 'method' | 'body'>
+type Input = Pick<IncomingWorkerRequest, 'method' | 'body'>
 
 /**
  * Ensures that an empty GET request body is always represented as `undefined`.
  */
 export function pruneGetRequestBody(
   request: Input,
-): ServiceWorkerIncomingRequest['body'] {
+): IncomingWorkerRequest['body'] | undefined {
   // Force HEAD/GET request body to always be empty.
   // The worker reads any request's body as ArrayBuffer,
   // and you cannot re-construct a GET/HEAD Request