msw 2.4.12 → 2.5.0

package/lib/mockServiceWorker.js

@@ -8,8 +8,8 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.4.12'
-const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
+const PACKAGE_VERSION = '2.5.0'
+const INTEGRITY_CHECKSUM = '07a8241b182f8a246a7cd39894799a9e'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -62,7 +62,12 @@ self.addEventListener('message', async function (event) {
 
       sendToClient(client, {
         type: 'MOCKING_ENABLED',
-        payload: true,
+        payload: {
+          client: {
+            id: client.id,
+            frameType: client.frameType,
+          },
+        },
       })
       break
     }
@@ -155,6 +160,10 @@ async function handleRequest(event, requestId) {
 async function resolveMainClient(event) {
   const client = await self.clients.get(event.clientId)
 
+  if (activeClientIds.has(event.clientId)) {
+    return client
+  }
+
   if (client?.frameType === 'top-level') {
     return client
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.4.12",
+  "version": "2.5.0",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -116,7 +116,7 @@
     "@bundled-es-modules/cookie": "^2.0.0",
     "@bundled-es-modules/statuses": "^1.0.1",
     "@bundled-es-modules/tough-cookie": "^0.1.6",
-    "@inquirer/confirm": "^3.0.0",
+    "@inquirer/confirm": "^4.0.0",
     "@mswjs/interceptors": "^0.36.5",
     "@open-draft/until": "^2.1.0",
     "@types/cookie": "^0.6.0",

package/src/browser/setupWorker/glossary.ts

@@ -53,7 +53,12 @@ export type ServiceWorkerIncomingResponse = Pick<
  * Map of the events that can be received from the Service Worker.
  */
 export interface ServiceWorkerIncomingEventsMap {
-  MOCKING_ENABLED: boolean
+  MOCKING_ENABLED: {
+    client: {
+      id: string
+      frameType: string
+    }
+  }
   INTEGRITY_CHECK_RESPONSE: {
     packageVersion: string
     checksum: string

package/src/browser/setupWorker/start/utils/enableMocking.ts

@@ -10,7 +10,7 @@ export async function enableMocking(
   options: StartOptions,
 ) {
   context.workerChannel.send('MOCK_ACTIVATE')
-  await context.events.once('MOCKING_ENABLED')
+  const { payload } = await context.events.once('MOCKING_ENABLED')
 
   // Warn the developer on multiple "worker.start()" calls.
   // While this will not affect the worker in any way,
@@ -28,5 +28,6 @@ export async function enableMocking(
     quiet: options.quiet,
     workerScope: context.registration?.scope,
     workerUrl: context.worker?.scriptURL,
+    client: payload.client,
   })
 }

package/src/browser/setupWorker/start/utils/printStartMessage.ts

@@ -1,3 +1,4 @@
+import type { ServiceWorkerIncomingEventsMap } from 'browser/setupWorker/glossary'
 import { devUtils } from '~/core/utils/internal/devUtils'
 
 export interface PrintStartMessageArgs {
@@ -5,6 +6,7 @@ export interface PrintStartMessageArgs {
   message?: string
   workerUrl?: string
   workerScope?: string
+  client?: ServiceWorkerIncomingEventsMap['MOCKING_ENABLED']['client']
 }
 
 /**
@@ -41,6 +43,11 @@ export function printStartMessage(args: PrintStartMessageArgs = {}) {
     console.log('Worker scope:', args.workerScope)
   }
 
+  if (args.client) {
+    // eslint-disable-next-line no-console
+    console.log('Client ID: %s (%s)', args.client.id, args.client.frameType)
+  }
+
   // eslint-disable-next-line no-console
   console.groupEnd()
 }

package/src/mockServiceWorker.js

@@ -62,7 +62,12 @@ self.addEventListener('message', async function (event) {
 
       sendToClient(client, {
         type: 'MOCKING_ENABLED',
-        payload: true,
+        payload: {
+          client: {
+            id: client.id,
+            frameType: client.frameType,
+          },
+        },
       })
       break
     }
@@ -155,6 +160,10 @@ async function handleRequest(event, requestId) {
 async function resolveMainClient(event) {
   const client = await self.clients.get(event.clientId)
 
+  if (activeClientIds.has(event.clientId)) {
+    return client
+  }
+
   if (client?.frameType === 'top-level') {
     return client
   }