msw 2.11.2 → 2.11.3

package/lib/mockServiceWorker.js

@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.11.2'
+const PACKAGE_VERSION = '2.11.3'
 const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.11.2",
+  "version": "2.11.3",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "type": "commonjs",
   "main": "./lib/core/index.js",
@@ -219,7 +219,6 @@
     "@inquirer/confirm": "^5.0.0",
     "@mswjs/interceptors": "^0.39.1",
     "@open-draft/deferred-promise": "^2.2.0",
-    "@open-draft/until": "^2.1.0",
     "@types/cookie": "^0.6.0",
     "@types/statuses": "^2.0.4",
     "graphql": "^16.8.1",
@@ -232,6 +231,7 @@
     "strict-event-emitter": "^0.5.1",
     "tough-cookie": "^6.0.0",
     "type-fest": "^4.26.1",
+    "until-async": "^3.0.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -283,11 +283,11 @@
     "typescript-eslint": "^8.42.0",
     "undici": "^6.20.0",
     "url-loader": "^4.1.1",
-    "vitest": "^3.1.4",
+    "vitest": "^3.2.4",
     "vitest-environment-miniflare": "^2.14.4",
     "webpack": "^5.95.0",
     "webpack-http-server": "^0.5.0",
-    "msw": "2.11.2"
+    "msw": "2.11.3"
   },
   "peerDependencies": {
     "typescript": ">= 4.8.x"

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

@@ -1,4 +1,4 @@
-import { until } from '@open-draft/until'
+import { until } from 'until-async'
 import { devUtils } from '~/core/utils/internal/devUtils'
 import { getAbsoluteWorkerUrl } from '../../../utils/getAbsoluteWorkerUrl'
 import { getWorkerByRegistration } from './getWorkerByRegistration'
@@ -52,21 +52,22 @@ export const getWorkerInstance = async (
   }
 
   // When the Service Worker wasn't found, register it anew and return the reference.
-  const registrationResult = await until<Error, ServiceWorkerInstanceTuple>(
-    async () => {
-      const registration = await navigator.serviceWorker.register(url, options)
-      return [
-        // Compare existing worker registration by its worker URL,
-        // to prevent irrelevant workers to resolve here (such as Codesandbox worker).
-        getWorkerByRegistration(registration, absoluteWorkerUrl, findWorker),
-        registration,
-      ]
-    },
-  )
+  const [registrationError, registrationResult] = await until<
+    Error,
+    ServiceWorkerInstanceTuple
+  >(async () => {
+    const registration = await navigator.serviceWorker.register(url, options)
+    return [
+      // Compare existing worker registration by its worker URL,
+      // to prevent irrelevant workers to resolve here (such as Codesandbox worker).
+      getWorkerByRegistration(registration, absoluteWorkerUrl, findWorker),
+      registration,
+    ]
+  })
 
   // Handle Service Worker registration errors.
-  if (registrationResult.error) {
-    const isWorkerMissing = registrationResult.error.message.includes('(404)')
+  if (registrationError) {
+    const isWorkerMissing = registrationError.message.includes('(404)')
 
     // Produce a custom error message when given a non-existing Service Worker url.
     // Suggest developers to check their setup.
@@ -87,10 +88,10 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
     throw new Error(
       devUtils.formatMessage(
         'Failed to register the Service Worker:\n\n%s',
-        registrationResult.error.message,
+        registrationError.message,
       ),
     )
   }
 
-  return registrationResult.data
+  return registrationResult
 }

package/src/browser/utils/deferNetworkRequestsUntil.ts

@@ -1,4 +1,4 @@
-import { until } from '@open-draft/until'
+import { until } from 'until-async'
 
 /**
  * Intercepts and defers any requests on the page

package/src/core/utils/handleRequest.ts

@@ -1,4 +1,4 @@
-import { until } from '@open-draft/until'
+import { until } from 'until-async'
 import { Emitter } from 'strict-event-emitter'
 import { LifeCycleEventsMap, SharedOptions } from '../sharedOptions'
 import { RequiredDeep } from '../typeUtils'
@@ -54,7 +54,7 @@ export async function handleRequest(
   }
 
   // Resolve a mocked response from the list of request handlers.
-  const lookupResult = await until(() => {
+  const [lookupError, lookupResult] = await until(() => {
     return executeHandlers({
       request,
       requestId,
@@ -63,19 +63,19 @@ export async function handleRequest(
     })
   })
 
-  if (lookupResult.error) {
+  if (lookupError) {
     // Allow developers to react to unhandled exceptions in request handlers.
     emitter.emit('unhandledException', {
-      error: lookupResult.error,
+      error: lookupError,
       request,
       requestId,
     })
-    throw lookupResult.error
+    throw lookupError
   }
 
   // If the handler lookup returned nothing, no request handler was found
   // matching this request. Report the request as unhandled.
-  if (!lookupResult.data) {
+  if (!lookupResult) {
     await onUnhandledRequest(request, options.onUnhandledRequest)
     emitter.emit('request:unhandled', { request, requestId })
     emitter.emit('request:end', { request, requestId })
@@ -83,7 +83,7 @@ export async function handleRequest(
     return
   }
 
-  const { response } = lookupResult.data
+  const { response } = lookupResult
 
   // When the handled request returned no mocked response, warn the developer,
   // as it may be an oversight on their part. Perform the request as-is.
@@ -110,7 +110,7 @@ export async function handleRequest(
   emitter.emit('request:match', { request, requestId })
 
   const requiredLookupResult =
-    lookupResult.data as RequiredDeep<HandlersExecutionResult>
+    lookupResult as RequiredDeep<HandlersExecutionResult>
 
   handleRequestOptions?.onMockedResponse?.(response, requiredLookupResult)