msw 2.11.2 → 2.11.3

package/lib/browser/index.js

@@ -142,17 +142,16 @@ var DEFAULT_START_OPTIONS = {
 // src/browser/setupWorker/start/createStartHandler.ts
 var import_devUtils6 = require("../core/utils/internal/devUtils");
 
-// node_modules/.pnpm/@open-draft+until@2.1.0/node_modules/@open-draft/until/lib/index.mjs
-var until = async (promise) => {
+// node_modules/.pnpm/until-async@3.0.2/node_modules/until-async/lib/index.js
+async function until(callback) {
   try {
-    const data = await promise().catch((error2) => {
+    return [null, await callback().catch((error2) => {
       throw error2;
-    });
-    return { error: null, data };
+    })];
   } catch (error2) {
-    return { error: error2, data: null };
+    return [error2, null];
   }
-};
+}
 
 // src/browser/setupWorker/start/utils/getWorkerInstance.ts
 var import_devUtils = require("../core/utils/internal/devUtils");
@@ -201,19 +200,17 @@ var getWorkerInstance = async (url, options = {}, findWorker) => {
       existingRegistration
     ];
   }
-  const registrationResult = await until(
-    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
-      ];
-    }
-  );
-  if (registrationResult.error) {
-    const isWorkerMissing = registrationResult.error.message.includes("(404)");
+  const [registrationError, registrationResult] = await until(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
+    ];
+  });
+  if (registrationError) {
+    const isWorkerMissing = registrationError.message.includes("(404)");
     if (isWorkerMissing) {
       const scopeUrl = new URL(options?.scope || "/", location.href);
       throw new Error(
@@ -227,11 +224,11 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
     throw new Error(
       import_devUtils.devUtils.formatMessage(
         "Failed to register the Service Worker:\n\n%s",
-        registrationResult.error.message
+        registrationError.message
       )
     );
   }
-  return registrationResult.data;
+  return registrationResult;
 };
 
 // node_modules/.pnpm/@open-draft+deferred-promise@2.2.0/node_modules/@open-draft/deferred-promise/build/index.mjs
@@ -1655,6 +1652,18 @@ var WorkerChannel = class extends Emitter2 {
   }
 };
 
+// node_modules/.pnpm/@open-draft+until@2.1.0/node_modules/@open-draft/until/lib/index.mjs
+var until2 = async (promise) => {
+  try {
+    const data = await promise().catch((error2) => {
+      throw error2;
+    });
+    return { error: null, data };
+  } catch (error2) {
+    return { error: error2, data: null };
+  }
+};
+
 // node_modules/.pnpm/@mswjs+interceptors@0.39.1/node_modules/@mswjs/interceptors/lib/browser/chunk-L37TY7LC.mjs
 var InterceptorError = class extends Error {
   constructor(message) {
@@ -1817,7 +1826,7 @@ async function handleRequest2(options) {
       );
     }
   }
-  const result = await until(async () => {
+  const result = await until2(async () => {
     const requestListenersPromise = emitAsync(options.emitter, "request", {
       requestId: options.requestId,
       request: options.request,
@@ -1853,7 +1862,7 @@ async function handleRequest2(options) {
           unhandledExceptionController[kResponsePromise].resolve(void 0);
         }
       });
-      const nextResult = await until(
+      const nextResult = await until2(
         () => unhandledExceptionController[kResponsePromise]
       );
       if (nextResult.error) {