feat!: support for MSW 2.0

examples/mocks/index.ts

@@ -1,4 +1,4 @@
-import { rest } from 'msw'
+import { http, HttpResponse } from 'msw'
 
 interface LoginBody {
   username: string
@@ -10,16 +10,13 @@ interface LoginResponse {
 }
 
 export const handlers = [
-  rest.post<LoginBody, LoginResponse>('/login', (req, res, ctx) => {
-    const { username } = req.body
-    return res(
-      ctx.json({
-        username,
-        firstName: 'John',
-      }),
-    )
+  http.post<LoginBody, LoginResponse>('/login', async ({ request }) => {
+    const user = await request.json()
+    const { username } = user
+
+    return HttpResponse.json({ username, firstName: 'John' })
   }),
-  rest.post('/logout', (_req, res, ctx) => {
-    return res(ctx.json({ message: 'logged out' }))
+  http.post('/logout', () => {
+    return HttpResponse.json({ message: 'logged out' })
   }),
 ]

examples/tsconfig.json

@@ -1,6 +1,9 @@
 {
   "compilerOptions": {
     "outDir": "lib",
+    "target": "ES2015",
+    "module": "CommonJS",
+    "moduleResolution": "node",
     "declaration": false,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true

package.json

@@ -48,25 +48,30 @@
     "@ossjs/release": "^0.5.0",
     "@types/express": "^4.17.17",
     "@types/jest": "^27.0.2",
+    "@types/node": "^20.8.7",
     "@types/node-fetch": "^2.5.11",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
-    "@typescript-eslint/parser": "^5.54.1",
+    "@typescript-eslint/parser": "^6.9.0",
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^7.0.4",
-    "jest": "^27.3.1",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^11.2.6",
-    "msw": "^1.1.0",
+    "msw": "^2.0.0",
     "node-fetch": "^2.6.1",
     "prettier": "^2.8.4",
     "rimraf": "^4.4.0",
-    "ts-jest": "^27.0.7",
-    "typescript": "^4.3.5",
-    "whatwg-fetch": "^3.6.2"
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.0.0"
   },
   "peerDependencies": {
     "headers-polyfill": "^3.0.4",
-    "msw": ">=1.0.0"
+    "msw": ">=2.0.0"
+  },
+  "engines": {
+    "node": ">=18",
+    "packageManager": "yarn"
   }
-}
+}

src/middleware.ts

@@ -1,36 +1,46 @@
-import { Emitter } from 'strict-event-emitter'
-import { Headers } from 'headers-polyfill'
-import { RequestHandler as ExpressMiddleware } from 'express'
-import { RequestHandler, handleRequest, MockedRequest } from 'msw'
 import { encodeBuffer } from '@mswjs/interceptors'
+import { Headers } from 'headers-polyfill'
+import { handleRequest } from 'msw'
+import { Emitter } from 'strict-event-emitter'
+import { Readable } from 'node:stream'
+import crypto from 'node:crypto'
+import { ReadableStream } from 'node:stream/web'
+
+import type { RequestHandler as ExpressMiddleware } from 'express'
+import type { LifeCycleEventsMap, RequestHandler } from 'msw'
 
-const emitter = new Emitter()
+const emitter = new Emitter<LifeCycleEventsMap>()
 
 export function createMiddleware(
   ...handlers: RequestHandler[]
 ): ExpressMiddleware {
   return async (req, res, next) => {
     const serverOrigin = `${req.protocol}://${req.get('host')}`
+    const method = req.method || 'GET'
 
     // Ensure the request body input passed to the MockedRequest
     // is always a string. Custom middleware like "express.json()"
     // may coerce "req.body" to be an Object.
     const requestBody =
       typeof req.body === 'string' ? req.body : JSON.stringify(req.body)
 
-    const mockedRequest = new MockedRequest(
+    const mockedRequest = new Request(
       // Treat all relative URLs as the ones coming from the server.
       new URL(req.url, serverOrigin),
       {
         method: req.method,
         headers: new Headers(req.headers as HeadersInit),
         credentials: 'omit',
-        body: encodeBuffer(requestBody),
+        // Request with GET/HEAD method cannot have body.
+        body: ['GET', 'HEAD'].includes(method)
+          ? undefined
+          : encodeBuffer(requestBody),
       },
     )
 
     await handleRequest(
       mockedRequest,
+      crypto.randomUUID(),
       handlers,
       {
         onUnhandledRequest: () => null,
@@ -44,8 +54,8 @@ export function createMiddleware(
            */
           baseUrl: serverOrigin,
         },
-        onMockedResponse(mockedResponse) {
-          const { status, statusText, headers, body, delay } = mockedResponse
+        onMockedResponse: async (mockedResponse) => {
+          const { status, statusText, headers } = mockedResponse
 
           res.statusCode = status
           res.statusMessage = statusText
@@ -54,12 +64,12 @@ export function createMiddleware(
             res.setHeader(name, value)
           })
 
-          if (delay) {
-            setTimeout(() => res.send(body), delay)
-            return
+          if (mockedResponse.body) {
+            const stream = Readable.fromWeb(
+              mockedResponse.body as ReadableStream,
+            )
+            stream.pipe(res)
           }
-
-          res.send(body)
         },
         onPassthroughResponse() {
           next()

src/server.ts

@@ -1,8 +1,8 @@
 import express from 'express'
-import { RequestHandler } from 'msw'
+import { HttpHandler } from 'msw'
 import { createMiddleware } from './middleware'
 
-export function createServer(...handlers: RequestHandler[]) {
+export function createServer(...handlers: HttpHandler[]) {
   const app = express()
 
   app.use(express.json())

test/middleware.test.ts

@@ -3,18 +3,22 @@
  */
 import fetch from 'node-fetch'
 import { HttpServer } from '@open-draft/test-server/http'
-import { rest } from 'msw'
+import { http, HttpResponse } from 'msw'
 import { createMiddleware } from '../src'
 
 const httpServer = new HttpServer((app) => {
   // Apply the HTTP middleware to this Express server
   // so that any matching request is resolved from the mocks.
   app.use(
     createMiddleware(
-      rest.get('/user', (_req, res, ctx) => {
-        return res(
-          ctx.set('x-my-header', 'value'),
-          ctx.json({ firstName: 'John' }),
+      http.get('/user', () => {
+        return HttpResponse.json(
+          { firstName: 'John' },
+          {
+            headers: {
+              'x-my-header': 'value',
+            },
+          },
         )
       }),
     ),
@@ -33,12 +37,20 @@ afterAll(async () => {
   await httpServer.close()
 })
 
-it('returns the mocked response when requesting the middleware', async () => {
-  const res = await fetch(httpServer.http.url('/user'))
-  const json = await res.json()
+afterEach(() => {
+  jest.resetAllMocks()
+})
 
-  expect(res.headers.get('x-my-header')).toEqual('value')
-  expect(json).toEqual({ firstName: 'John' })
+it('returns the mocked response when requesting the middleware', async () => {
+  try {
+    const res = await fetch(httpServer.http.url('/user'))
+    const json = await res.json()
+
+    expect(res.headers.get('x-my-header')).toEqual('value')
+    expect(json).toEqual({ firstName: 'John' })
+  } catch (e) {
+    console.log(e)
+  }
 })
 
 it('returns the original response given no matching request handler', async () => {

test/reusing-handlers.test.ts

@@ -1,9 +1,9 @@
 /**
- * @jest-environment jsdom
+ * @jest-environment node
  */
-import 'whatwg-fetch'
+import fetch from 'node-fetch'
 import { HttpServer } from '@open-draft/test-server/http'
-import { PathParams, rest } from 'msw'
+import { HttpResponse, http } from 'msw'
 import { setupServer } from 'msw/node'
 import { createMiddleware } from '../src'
 
@@ -12,8 +12,8 @@ interface UserResponse {
 }
 
 const handlers = [
-  rest.get<any, PathParams, UserResponse>('/user', (req, res, ctx) => {
-    return res(ctx.json({ firstName: 'John' }))
+  http.get('http://localhost/user', () => {
+    return HttpResponse.json({ firstName: 'John' }, {})
   }),
 ]
 
@@ -31,6 +31,7 @@ beforeAll(async () => {
 
 afterEach(() => {
   jest.resetAllMocks()
+  server.resetHandlers()
 })
 
 afterAll(async () => {
@@ -40,25 +41,14 @@ afterAll(async () => {
 })
 
 it('returns the mocked response from the middleware', async () => {
-  const res = await fetch(httpServer.http.url('/user'))
+  const res = await fetch(httpServer.http.url('http://localhost/user'))
   const json = await res.json()
 
   expect(json).toEqual<UserResponse>({ firstName: 'John' })
-
-  // MSW should still prints warnings because matching in a JSDOM context
-  // wasn't successful. This isn't a typical use case, as you won't be
-  // combining a running test with an HTTP server and a middleware.
-  const warnings = (console.warn as jest.Mock).mock.calls.map((args) => args[0])
-  expect(warnings).toEqual(
-    expect.arrayContaining([
-      expect.stringMatching(new RegExp(`GET ${httpServer.http.url('/user')}`)),
-      expect.stringMatching(new RegExp(`GET ${httpServer.http.url('/user')}`)),
-    ]),
-  )
 })
 
 it('returns the mocked response from JSDOM', async () => {
-  const res = await fetch('/user')
+  const res = await fetch('http://localhost/user')
   const json = await res.json()
 
   expect(json).toEqual<UserResponse>({ firstName: 'John' })

test/with-express-json.test.ts

@@ -4,21 +4,37 @@
 import fetch from 'node-fetch'
 import express from 'express'
 import { HttpServer } from '@open-draft/test-server/http'
-import { rest } from 'msw'
+import { HttpResponse, http } from 'msw'
 import { createMiddleware } from '../src'
 
 const httpServer = new HttpServer((app) => {
+  // Apply a request body JSON middleware.
+  app.use(express.json())
+
   app.use(
     createMiddleware(
-      rest.post('/user', async (req, res, ctx) => {
-        const { firstName } = await req.json()
-        return res(ctx.set('x-my-header', 'value'), ctx.json({ firstName }))
+      http.post<never, { firstName: string }>('/user', async ({ request }) => {
+        const { firstName } = await request.json()
+
+        return HttpResponse.json(
+          { firstName },
+          {
+            headers: {
+              'x-my-header': 'value',
+            },
+          },
+        )
       }),
     ),
   )
 
-  // Apply a request body JSON middleware.
-  app.use(express.json())
+  app.use((_req, res) => {
+    res.status(404).json({
+      error: 'Mock not found',
+    })
+  })
+
+  return app
 })
 
 beforeAll(async () => {