fix(setupServer): reference interceptors to support fast refresh

kettanaito · kettanaito · commit 1c6adc99a279 · 2022-06-21T15:57:09.000+02:00
diff --git a/src/native/index.ts b/src/native/index.ts
@@ -3,4 +3,4 @@ import { createSetupServer } from '../node/createSetupServer'
 
 // Provision request interception via patching the `XMLHttpRequest` class only
 // in React Native. There is no `http`/`https` modules in that environment.
-export const setupServer = createSetupServer(new XMLHttpRequestInterceptor())
+export const setupServer = createSetupServer(XMLHttpRequestInterceptor)
diff --git a/src/node/createSetupServer.ts b/src/node/createSetupServer.ts
@@ -27,7 +27,7 @@ const DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {
  * Useful to generate identical API using different patches to request issuing modules.
  */
 export function createSetupServer(
-  ...interceptors: Interceptor<HttpRequestEventMap>[]
+  ...interceptors: { new (): Interceptor<HttpRequestEventMap> }[]
 ) {
   const emitter = new StrictEventEmitter<ServerLifecycleEventsMap>()
   const publicEmitter = new StrictEventEmitter<ServerLifecycleEventsMap>()
@@ -62,7 +62,7 @@ export function createSetupServer(
 
     const interceptor = new BatchInterceptor({
       name: 'setup-server',
-      interceptors,
+      interceptors: interceptors.map((Interceptor) => new Interceptor()),
     })
 
     interceptor.on('request', async function setupServerListener(request) {
diff --git a/src/node/setupServer.ts b/src/node/setupServer.ts
@@ -10,6 +10,6 @@ import { createSetupServer } from './createSetupServer'
 export const setupServer = createSetupServer(
   // List each interceptor separately instead of using the "node" preset
   // so that MSW wouldn't bundle the unnecessary classes (i.e. "SocketPolyfill").
-  new ClientRequestInterceptor(),
-  new XMLHttpRequestInterceptor(),
+  ClientRequestInterceptor,
+  XMLHttpRequestInterceptor,
 )

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ import { createSetupServer } from './createSetupServer'`
`10`	`10`	`export const setupServer = createSetupServer(`
`11`	`11`	`// List each interceptor separately instead of using the "node" preset`
`12`	`12`	`// so that MSW wouldn't bundle the unnecessary classes (i.e. "SocketPolyfill").`
`13`		`- new ClientRequestInterceptor(),`
`14`		`- new XMLHttpRequestInterceptor(),`
	`13`	`+ ClientRequestInterceptor,`
	`14`	`+ XMLHttpRequestInterceptor,`
`15`	`15`	`)`