msw 2.1.7 → 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,
         {
@@ -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",
       {
@@ -2221,7 +2228,7 @@ function createFallbackRequestListener(context, options) {
     const response = await (0, import_handleRequest2.handleRequest)(
       request,
       requestId,
-      context.requestHandlers,
+      context.getRequestHandlers(),
       options,
       context.emitter,
       {
@@ -2325,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: {
@@ -2401,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;