msw 2.1.6 → 2.2.0

package/cli/init.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const chalk = require('chalk')
 const { until } = require('@open-draft/until')
-const inquirer = require('inquirer')
+const confirm = require('@inquirer/confirm')
 const invariant = require('./invariant')
 const { SERVICE_WORKER_BUILD_PATH } = require('../config/constants')
 
@@ -180,18 +180,14 @@ function saveWorkerDirectory(packageJsonPath, publicDir) {
 }
 
 function promptWorkerDirectoryUpdate(message, packageJsonPath, publicDir) {
-  return inquirer
-    .prompt({
-      type: 'confirm',
-      name: 'saveWorkerDirectory',
+  return confirm({
+    theme: {
       prefix: chalk.yellowBright('?'),
-      message,
-    })
-    .then((answers) => {
-      if (!answers.saveWorkerDirectory) {
-        return
-      }
-
+    },
+    message,
+  }).then((answer) => {
+    if (answer) {
       saveWorkerDirectory(packageJsonPath, publicDir)
-    })
+    }
+  })
 }

package/lib/browser/index.js

@@ -310,7 +310,7 @@ var createRequestListener = (context, options) => {
       await (0, import_handleRequest.handleRequest)(
         request,
         requestId,
-        context.requestHandlers,
+        context.getRequestHandlers(),
         options,
         context.emitter,
         {
@@ -393,7 +393,7 @@ async function requestIntegrityCheck(context, serviceWorker) {
   return serviceWorker;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
 var encoder = new TextEncoder();
 function encodeBuffer(text) {
   return encoder.encode(text);
@@ -856,7 +856,7 @@ var _Emitter = class {
 var Emitter = _Emitter;
 Emitter.defaultMaxListeners = 10;
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-WZQN3FMY.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-WZQN3FMY.mjs
 var IS_PATCHED_MODULE = Symbol("isPatchedModule");
 function getGlobalSymbol(symbol) {
   return (
@@ -1001,7 +1001,7 @@ var Interceptor = class {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/index.mjs
 var BatchInterceptor = class extends Interceptor {
   constructor(options) {
     BatchInterceptor.symbol = Symbol(options.name);
@@ -1064,6 +1064,13 @@ function createResponseListener(context) {
       isResponseWithoutBody(responseJson.status) ? null : responseJson.body,
       responseJson
     );
+    if (!response.url) {
+      Object.defineProperty(response, "url", {
+        value: request.url,
+        enumerable: true,
+        writable: false
+      });
+    }
     context.emitter.emit(
       responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
       {
@@ -1285,7 +1292,7 @@ var DeferredPromise = class extends Promise {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-72HT65NX.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-72HT65NX.mjs
 function uuidv4() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
     const r = Math.random() * 16 | 0;
@@ -1330,7 +1337,7 @@ async function emitAsync(emitter, eventName, ...data) {
   }
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-44V5AUD6.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-XQZ6GVNB.mjs
 function isPropertyAccessible(obj, key) {
   try {
     obj[key];
@@ -1382,13 +1389,15 @@ var _FetchInterceptor = class extends Interceptor {
       this.logger.info("awaiting for the mocked response...");
       const signal = interactiveRequest.signal;
       const requestAborted = new DeferredPromise();
-      signal.addEventListener(
-        "abort",
-        () => {
-          requestAborted.reject(signal.reason);
-        },
-        { once: true }
-      );
+      if (signal) {
+        signal.addEventListener(
+          "abort",
+          () => {
+            requestAborted.reject(signal.reason);
+          },
+          { once: true }
+        );
+      }
       const resolverResult = await until(async () => {
         const listenersFinished = emitAsync(this.emitter, "request", {
           request: interactiveRequest,
@@ -1429,14 +1438,13 @@ var _FetchInterceptor = class extends Interceptor {
           request: interactiveRequest,
           requestId
         });
-        const response = new Response(mockedResponse.body, mockedResponse);
-        Object.defineProperty(response, "url", {
+        Object.defineProperty(mockedResponse, "url", {
           writable: false,
           enumerable: true,
           configurable: false,
           value: request.url
         });
-        return response;
+        return mockedResponse;
       }
       this.logger.info("no mocked response received!");
       return pureFetch(request).then((response) => {
@@ -1476,7 +1484,7 @@ function createNetworkError(cause) {
   });
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-DZVB7JEV.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-DZVB7JEV.mjs
 function concatArrayBuffer(left, right) {
   const result = new Uint8Array(left.byteLength + right.byteLength);
   result.set(left, 0);
@@ -2220,7 +2228,7 @@ function createFallbackRequestListener(context, options) {
     const response = await (0, import_handleRequest2.handleRequest)(
       request,
       requestId,
-      context.requestHandlers,
+      context.getRequestHandlers(),
       options,
       context.emitter,
       {
@@ -2324,8 +2332,10 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
       isMockingEnabled: false,
       startOptions: null,
       worker: null,
+      getRequestHandlers: () => {
+        return this.handlersController.currentHandlers();
+      },
       registration: null,
-      requestHandlers: this.currentHandlers,
       requests: /* @__PURE__ */ new Map(),
       emitter: this.emitter,
       workerChannel: {
@@ -2400,11 +2410,6 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
         readableStreamTransfer: supportsReadableStreamTransfer()
       }
     };
-    Object.defineProperties(context, {
-      requestHandlers: {
-        get: () => this.currentHandlers
-      }
-    });
     this.startHandler = context.supports.serviceWorkerApi ? createFallbackStart(context) : createStartHandler(context);
     this.stopHandler = context.supports.serviceWorkerApi ? createFallbackStop(context) : createStop(context);
     return context;