msw 2.7.6 → 2.8.0

package/package.json

@@ -1,67 +1,162 @@
 {
   "name": "msw",
-  "version": "2.7.6",
+  "version": "2.8.0",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
+  "type": "commonjs",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
   "types": "./lib/core/index.d.ts",
   "exports": {
     ".": {
-      "types": "./lib/core/index.d.ts",
-      "require": "./lib/core/index.js",
-      "import": "./lib/core/index.mjs",
-      "default": "./lib/core/index.js"
+      "module-sync": {
+        "types": "./lib/core/index.d.mts",
+        "default": "./lib/core/index.mjs"
+      },
+      "module": {
+        "types": "./lib/core/index.d.mts",
+        "default": "./lib/core/index.mjs"
+      },
+      "react-native": {
+        "import": {
+          "types": "./lib/core/index.d.mts",
+          "default": "./lib/core/index.mjs"
+        },
+        "default": {
+          "types": "./lib/core/index.d.ts",
+          "default": "./lib/core/index.js"
+        }
+      },
+      "import": {
+        "types": "./lib/core/index.d.mts",
+        "default": "./lib/core/index.mjs"
+      },
+      "default": {
+        "types": "./lib/core/index.d.ts",
+        "default": "./lib/core/index.js"
+      }
     },
     "./browser": {
-      "types": "./lib/browser/index.d.ts",
+      "module-sync": {
+        "types": "./lib/browser/index.d.mts",
+        "default": "./lib/browser/index.mjs"
+      },
+      "module": {
+        "types": "./lib/browser/index.d.mts",
+        "default": "./lib/browser/index.mjs"
+      },
       "browser": {
-        "require": "./lib/browser/index.js",
-        "import": "./lib/browser/index.mjs"
+        "types": "./lib/browser/index.d.mts",
+        "default": "./lib/browser/index.mjs"
+      },
+      "import": {
+        "types": "./lib/browser/index.d.mts",
+        "default": "./lib/browser/index.mjs"
       },
       "node": null,
-      "require": "./lib/browser/index.js",
-      "import": "./lib/browser/index.mjs",
-      "default": "./lib/browser/index.js"
+      "react-native": null,
+      "default": {
+        "types": "./lib/browser/index.d.ts",
+        "default": "./lib/browser/index.js"
+      }
     },
     "./node": {
-      "types": "./lib/node/index.d.ts",
+      "browser": null,
+      "react-native": null,
+      "module-sync": {
+        "types": "./lib/node/index.d.mts",
+        "default": "./lib/node/index.mjs"
+      },
+      "module": {
+        "types": "./lib/node/index.d.mts",
+        "default": "./lib/node/index.mjs"
+      },
       "node": {
         "require": "./lib/node/index.js",
         "import": "./lib/node/index.mjs"
       },
-      "browser": null,
-      "require": "./lib/node/index.js",
-      "import": "./lib/node/index.mjs",
-      "default": "./lib/node/index.mjs"
+      "import": {
+        "types": "./lib/node/index.d.mts",
+        "default": "./lib/node/index.mjs"
+      },
+      "default": {
+        "types": "./lib/node/index.d.ts",
+        "default": "./lib/node/index.js"
+      }
     },
     "./native": {
-      "types": "./lib/native/index.d.ts",
+      "browser": null,
       "react-native": {
-        "require": "./lib/native/index.js",
-        "import": "./lib/native/index.mjs"
+        "import": {
+          "types": "./lib/native/index.d.mts",
+          "default": "./lib/native/index.mjs"
+        },
+        "default": {
+          "types": "./lib/native/index.d.ts",
+          "default": "./lib/native/index.js"
+        }
       },
-      "browser": null,
-      "require": "./lib/native/index.js",
-      "import": "./lib/native/index.mjs",
-      "default": "./lib/native/index.js"
+      "import": {
+        "types": "./lib/native/index.d.mts",
+        "default": "./lib/native/index.mjs"
+      },
+      "default": {
+        "types": "./lib/native/index.d.ts",
+        "default": "./lib/native/index.js"
+      }
     },
     "./core/http": {
-      "types": "./lib/core/http.d.ts",
-      "require": "./lib/core/http.js",
-      "import": "./lib/core/http.mjs",
-      "default": "./lib/core/http.js"
+      "module-sync": {
+        "types": "./lib/core/http.d.mts",
+        "default": "./lib/core/http.mjs"
+      },
+      "module": {
+        "types": "./lib/core/http.d.mts",
+        "default": "./lib/core/http.mjs"
+      },
+      "import": {
+        "types": "./lib/core/http.d.mts",
+        "default": "./lib/core/http.mjs"
+      },
+      "default": {
+        "types": "./lib/core/http.d.ts",
+        "default": "./lib/core/http.js"
+      }
     },
     "./core/graphql": {
-      "types": "./lib/core/graphql.d.ts",
-      "require": "./lib/core/graphql.js",
-      "import": "./lib/core/graphql.mjs",
-      "default": "./lib/core/graphql.js"
+      "module-sync": {
+        "types": "./lib/core/graphql.d.mts",
+        "default": "./lib/core/graphql.mjs"
+      },
+      "module": {
+        "types": "./lib/core/graphql.d.mts",
+        "default": "./lib/core/graphql.mjs"
+      },
+      "import": {
+        "types": "./lib/core/graphql.d.mts",
+        "default": "./lib/core/graphql.mjs"
+      },
+      "default": {
+        "types": "./lib/core/graphql.d.ts",
+        "default": "./lib/core/graphql.js"
+      }
     },
     "./core/ws": {
-      "types": "./lib/core/ws.d.ts",
-      "require": "./lib/core/ws.js",
-      "import": "./lib/core/ws.mjs",
-      "default": "./lib/core/ws.js"
+      "module-sync": {
+        "types": "./lib/core/ws.d.mts",
+        "default": "./lib/core/ws.mjs"
+      },
+      "module": {
+        "types": "./lib/core/ws.d.mts",
+        "default": "./lib/core/ws.mjs"
+      },
+      "import": {
+        "types": "./lib/core/ws.d.mts",
+        "default": "./lib/core/ws.mjs"
+      },
+      "default": {
+        "types": "./lib/core/ws.d.ts",
+        "default": "./lib/core/ws.js"
+      }
     },
     "./mockServiceWorker.js": "./lib/mockServiceWorker.js",
     "./package.json": "./package.json"
@@ -83,7 +178,7 @@
   "homepage": "https://mswjs.io",
   "repository": {
     "type": "git",
-    "url": "https://github.com/mswjs/msw"
+    "url": "git+https://github.com/mswjs/msw.git"
   },
   "author": {
     "name": "Artem Zakharchenko",
@@ -92,6 +187,7 @@
   "license": "MIT",
   "funding": "https://github.com/sponsors/mswjs",
   "files": [
+    "config/package.json",
     "config/constants.js",
     "config/scripts/postinstall.js",
     "cli",
@@ -156,7 +252,7 @@
     "cross-env": "^7.0.3",
     "cross-fetch": "^4.0.0",
     "cz-conventional-changelog": "3.3.0",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.3",
     "esbuild-loader": "^4.2.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
@@ -171,17 +267,19 @@
     "lint-staged": "^15.2.10",
     "page-with": "^0.6.1",
     "prettier": "^3.4.2",
+    "publint": "^0.3.12",
     "regenerator-runtime": "^0.14.1",
     "rimraf": "^6.0.1",
     "simple-git-hooks": "^2.9.0",
-    "tsup": "^8.3.0",
+    "tsup": "^8.4.0",
     "typescript": "^5.5.2",
     "undici": "^6.20.0",
     "url-loader": "^4.1.1",
-    "vitest": "^2.1.8",
+    "vitest": "^3.1.3",
     "vitest-environment-miniflare": "^2.14.4",
     "webpack": "^5.95.0",
-    "webpack-http-server": "^0.5.0"
+    "webpack-http-server": "^0.5.0",
+    "msw": "2.8.0"
   },
   "peerDependencies": {
     "typescript": ">= 4.8.x"
@@ -207,18 +305,18 @@
     "lint": "eslint \"{cli,src}/**/*.ts\"",
     "build": "pnpm clean && cross-env NODE_ENV=production tsup && pnpm patch:dts",
     "patch:dts": "node \"./config/scripts/patch-ts.js\"",
-    "check:exports": "node \"./config/scripts/validate-esm.js\"",
+    "publint": "publint",
     "test": "pnpm test:unit && pnpm test:node && pnpm test:browser && pnpm test:native",
     "test:unit": "vitest",
-    "test:node": "vitest --config=./test/node/vitest.config.mts",
-    "test:native": "vitest --config=./test/native/vitest.config.mts",
+    "test:node": "vitest --config=./test/node/vitest.config.ts",
+    "test:native": "vitest --config=./test/native/vitest.config.ts",
     "test:browser": "playwright test -c ./test/browser/playwright.config.ts",
-    "test:modules:node": "vitest --config=./test/modules/node/vitest.config.mts",
+    "test:modules:node": "vitest run --config=./test/modules/node/vitest.config.ts",
     "test:modules:browser": "playwright test -c ./test/modules/browser/playwright.config.ts",
-    "test:e2e": "vitest run --config=./test/e2e/vitest.config.mts",
-    "test:ts": "vitest --typecheck --config=./test/typings/vitest.config.mts",
+    "test:e2e": "vitest run --config=./test/e2e/vitest.config.ts",
+    "test:ts": "vitest --config=./test/typings/vitest.config.ts",
     "release": "release publish",
-    "postinstall": "node -e \"try{require('./config/scripts/postinstall')}catch(e){}\"",
+    "postinstall": "node -e \"try{import('./config/scripts/postinstall.js')}catch(e){}\"",
     "knip": "knip"
   }
 }

package/src/core/HttpResponse.ts

@@ -6,22 +6,20 @@ import {
   normalizeResponseInit,
 } from './utils/HttpResponse/decorators'
 
-const bodyType = Symbol('bodyType')
-
 export interface HttpResponseInit extends ResponseInit {
   type?: ResponseType
 }
 
-export interface StrictRequest<BodyType extends DefaultBodyType>
-  extends Request {
+const bodyType: unique symbol = Symbol('bodyType')
+
+export interface StrictRequest<BodyType extends JsonBodyType> extends Request {
   json(): Promise<BodyType>
 }
 
 /**
  * Opaque `Response` type that supports strict body type.
  */
-export interface StrictResponse<BodyType extends DefaultBodyType>
-  extends Response {
+interface StrictResponse<BodyType extends DefaultBodyType> extends Response {
   readonly [bodyType]: BodyType
 }
 
@@ -36,12 +34,15 @@ export interface StrictResponse<BodyType extends DefaultBodyType>
  *
  * @see {@link https://mswjs.io/docs/api/http-response `HttpResponse` API reference}
  */
-export class HttpResponse extends FetchResponse {
-  readonly [bodyType]: any
+export class HttpResponse<BodyType extends DefaultBodyType>
+  extends FetchResponse
+  implements StrictResponse<BodyType>
+{
+  [bodyType]: BodyType = null as any
 
-  constructor(body?: BodyInit | null, init?: HttpResponseInit) {
+  constructor(body?: NoInfer<BodyType> | null, init?: HttpResponseInit) {
     const responseInit = normalizeResponseInit(init)
-    super(body, responseInit)
+    super(body as BodyInit, responseInit)
     decorateResponse(this, responseInit)
   }
 
@@ -54,7 +55,7 @@ export class HttpResponse extends FetchResponse {
   static text<BodyType extends string>(
     body?: NoInfer<BodyType> | null,
     init?: HttpResponseInit,
-  ): StrictResponse<BodyType> {
+  ): HttpResponse<BodyType> {
     const responseInit = normalizeResponseInit(init)
 
     if (!responseInit.headers.has('Content-Type')) {
@@ -71,7 +72,7 @@ export class HttpResponse extends FetchResponse {
       )
     }
 
-    return new HttpResponse(body, responseInit) as StrictResponse<BodyType>
+    return new HttpResponse(body, responseInit)
   }
 
   /**
@@ -81,9 +82,9 @@ export class HttpResponse extends FetchResponse {
    * HttpResponse.json({ error: 'Not Authorized' }, { status: 401 })
    */
   static json<BodyType extends JsonBodyType>(
-    body?: NoInfer<BodyType> | null,
+    body?: NoInfer<BodyType> | null | undefined,
     init?: HttpResponseInit,
-  ): StrictResponse<BodyType> {
+  ): HttpResponse<BodyType> {
     const responseInit = normalizeResponseInit(init)
 
     if (!responseInit.headers.has('Content-Type')) {
@@ -103,10 +104,7 @@ export class HttpResponse extends FetchResponse {
       )
     }
 
-    return new HttpResponse(
-      responseText,
-      responseInit,
-    ) as StrictResponse<BodyType>
+    return new HttpResponse(responseText as BodyType, responseInit)
   }
 
   /**

package/src/core/graphql.ts

@@ -111,7 +111,7 @@ const standardGraphQLHandlers = {
    *   return HttpResponse.json({ data: { name: 'John' } })
    * })
    *
-   * @see {@link https://mswjs.io/docs/api/graphql#graphloperationresolver `graphql.operation()` API reference}
+   * @see {@link https://mswjs.io/docs/api/graphql#graphqloperationresolver `graphql.operation()` API reference}
    */
   operation: createGraphQLOperationHandler('*'),
 }

package/src/core/handlers/RequestHandler.ts

@@ -6,7 +6,7 @@ import {
 } from '../utils/internal/isIterable'
 import type { ResponseResolutionContext } from '../utils/executeHandlers'
 import type { MaybePromise } from '../typeUtils'
-import { StrictRequest, StrictResponse } from '..//HttpResponse'
+import type { HttpResponse, StrictRequest } from '..//HttpResponse'
 import type { HandlerKind } from './common'
 
 export type DefaultRequestMultipartBody = Record<
@@ -44,7 +44,7 @@ export type ResponseResolverReturnType<
 > =
   | ([ResponseBodyType] extends [undefined]
       ? Response
-      : StrictResponse<ResponseBodyType>)
+      : HttpResponse<ResponseBodyType>)
   | undefined
   | void
 
@@ -139,7 +139,7 @@ export abstract class RequestHandler<
         MaybeAsyncResponseResolverReturnType<any>,
         MaybeAsyncResponseResolverReturnType<any>
       >
-  private resolverIteratorResult?: Response | StrictResponse<any>
+  private resolverIteratorResult?: Response | HttpResponse<any>
   private options?: HandlerOptions
 
   constructor(args: RequestHandlerArgs<HandlerInfo, HandlerOptions>) {
@@ -324,9 +324,11 @@ export abstract class RequestHandler<
     return async (info): Promise<ResponseResolverReturnType<any>> => {
       if (!this.resolverIterator) {
         const result = await resolver(info)
+
         if (!isIterable(result)) {
           return result
         }
+
         this.resolverIterator =
           Symbol.iterator in result
             ? result[Symbol.iterator]()

package/src/core/passthrough.ts

@@ -1,4 +1,4 @@
-import type { StrictResponse } from './HttpResponse'
+import type { HttpResponse } from './HttpResponse'
 
 /**
  * Performs the intercepted request as-is.
@@ -14,12 +14,12 @@ import type { StrictResponse } from './HttpResponse'
  *
  * @see {@link https://mswjs.io/docs/api/passthrough `passthrough()` API reference}
  */
-export function passthrough(): StrictResponse<any> {
+export function passthrough(): HttpResponse<any> {
   return new Response(null, {
     status: 302,
     statusText: 'Passthrough',
     headers: {
       'x-msw-intention': 'passthrough',
     },
-  }) as StrictResponse<any>
+  }) as HttpResponse<any>
 }

package/src/native/index.ts

@@ -15,7 +15,7 @@ export function setupServer(
   // Provision request interception via patching the `XMLHttpRequest` class only
   // in React Native. There is no `http`/`https` modules in that environment.
   return new SetupServerCommonApi(
-    [FetchInterceptor, XMLHttpRequestInterceptor],
+    [new FetchInterceptor(), new XMLHttpRequestInterceptor()],
     handlers,
   )
 }

package/src/node/SetupServerApi.ts

@@ -1,4 +1,5 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
+import type { HttpRequestEventMap, Interceptor } from '@mswjs/interceptors'
 import { ClientRequestInterceptor } from '@mswjs/interceptors/ClientRequest'
 import { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'
 import { FetchInterceptor } from '@mswjs/interceptors/fetch'
@@ -47,16 +48,19 @@ class AsyncHandlersController implements HandlersController {
     return handlers.concat(initialHandlers)
   }
 }
-
 export class SetupServerApi
   extends SetupServerCommonApi
   implements SetupServer
 {
-  constructor(handlers: Array<RequestHandler | WebSocketHandler>) {
-    super(
-      [ClientRequestInterceptor, XMLHttpRequestInterceptor, FetchInterceptor],
-      handlers,
-    )
+  constructor(
+    handlers: Array<RequestHandler | WebSocketHandler>,
+    interceptors: Array<Interceptor<HttpRequestEventMap>> = [
+      new ClientRequestInterceptor(),
+      new XMLHttpRequestInterceptor(),
+      new FetchInterceptor(),
+    ],
+  ) {
+    super(interceptors, handlers)
 
     this.handlersController = new AsyncHandlersController(handlers)
   }

package/src/node/SetupServerCommonApi.ts

@@ -37,14 +37,14 @@ export class SetupServerCommonApi
   private resolvedOptions: RequiredDeep<SharedOptions>
 
   constructor(
-    interceptors: Array<{ new (): Interceptor<HttpRequestEventMap> }>,
+    interceptors: Array<Interceptor<HttpRequestEventMap>>,
     handlers: Array<RequestHandler | WebSocketHandler>,
   ) {
     super(...handlers)
 
     this.interceptor = new BatchInterceptor({
       name: 'setup-server',
-      interceptors: interceptors.map((Interceptor) => new Interceptor()),
+      interceptors,
     })
 
     this.resolvedOptions = {} as RequiredDeep<SharedOptions>

package/src/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}