Skip to content

Commit e0973aa

Browse files
committed
Merge branch 'feat/3.0' into fix/in-flight-via-pending-responses
2 parents 31d3e96 + 914daa4 commit e0973aa

16 files changed

Lines changed: 665 additions & 415 deletions

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,15 @@
246246
"sideEffects": false,
247247
"dependencies": {
248248
"@inquirer/confirm": "^6.0.11",
249-
"@mswjs/interceptors": "^0.41.3",
249+
"@msw/url": "^0.1.0",
250+
"@mswjs/interceptors": "^0.41.4",
250251
"@open-draft/deferred-promise": "^3.0.0",
251252
"@types/statuses": "^2.0.6",
252253
"cookie": "^1.1.1",
253254
"graphql": "^16.13.2",
254255
"headers-polyfill": "^5.0.1",
255256
"is-node-process": "^1.2.0",
256257
"outvariant": "^1.4.3",
257-
"path-to-regexp": "^6.3.0",
258258
"picocolors": "^1.1.1",
259259
"rettime": "^0.11.7",
260260
"statuses": "^2.0.2",

pnpm-lock.yaml

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { pruneGetRequestBody } from './pruneGetRequestBody'
1+
import { FetchRequest } from '@mswjs/interceptors'
22
import type { IncomingWorkerRequest } from './workerChannel'
33

44
/**
@@ -8,8 +8,7 @@ import type { IncomingWorkerRequest } from './workerChannel'
88
export function deserializeRequest(
99
serializedRequest: IncomingWorkerRequest,
1010
): Request {
11-
return new Request(serializedRequest.url, {
11+
return new FetchRequest(serializedRequest.url, {
1212
...serializedRequest,
13-
body: pruneGetRequestBody(serializedRequest),
1413
})
1514
}

src/browser/utils/pruneGetRequestBody.test.ts

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/browser/utils/pruneGetRequestBody.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/core/experimental/define-network.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ export interface DefineNetworkOptions<
4747
onUnhandledFrame?: UnhandledFrameHandle
4848
}
4949

50-
export interface NetworkApi<Sources extends Array<NetworkSource<any>>>
51-
extends NetworkHandlersApi {
50+
export interface NetworkApi<
51+
Sources extends Array<NetworkSource<any>>,
52+
> extends NetworkHandlersApi {
5253
readyState: NetworkReadyState
5354
/**
5455
* Enable the network interception and handling.

0 commit comments

Comments
 (0)