msw 2.0.0 → 2.0.2

package/README.md

@@ -1,6 +1,12 @@
-> [!IMPORTANT]\
 > **MSW 2.0 is finally here! 🎉** Read the [Release notes](https://github.com/mswjs/msw/releases/tag/v2.0.0) and please follow the [**Migration guidelines**](https://mswjs.io/docs/migrations/1.x-to-2.x) to upgrade. If you're having any questions while upgrading, please reach out in our [Discord server](https://kettanaito.com/discord).
+>
+> We've also recorded the most comprehensive introduction to MSW ever. Learn how to mock APIs like a pro in our official video course:
+
+<a href="https://egghead.io/courses/mock-rest-and-graphql-apis-with-mock-service-worker-8d471ece?af=8mci9b" target="_blank">
+  <img src="media/egghead-banner.png" alt="Mock REST and GraphQL APIs with Mock Service Worker" />
+</a>
 
+<br />
 <br />
 
 <p align="center">
@@ -17,13 +23,15 @@
   <a href="https://www.npmjs.com/package/msw" target="_blank">
     <img src="https://img.shields.io/npm/dm/msw?style=for-the-badge&color=black" alt="Downloads per month" />
   </a>
-   <a href="https://kcd.im/discord" target="_blank">
+   <a href="https://kettanaito.com/discord" target="_blank">
     <img src="https://img.shields.io/badge/chat-online-green?style=for-the-badge&color=black" alt="Discord server" />
   </a>
 </p>
 
 <br />
 
+<br />
+
 ## Features
 
 - **Seamless**. A dedicated layer of requests interception at your disposal. Keep your application's code and tests unaware of whether something is mocked or not.
@@ -117,7 +125,7 @@ There's no such thing as Service Workers in Node.js. Instead, MSW implements a [
 
 ### Usage example
 
-Take a look at the example of an integration test in Jest that uses [React Testing Library](https://github.com/testing-library/react-testing-library) and Mock Service Worker:
+Take a look at the example of an integration test in Vitest that uses [React Testing Library](https://github.com/testing-library/react-testing-library) and Mock Service Worker:
 
 ```js
 // test/Dashboard.test.js
@@ -205,6 +213,11 @@ Mock Service Worker is trusted by hundreds of thousands of engineers around the
         </picture>
       </a>
     </td>
+     <td>
+      <a href="https://www.codacy.com/" target="_blank">
+        <img src="media/sponsors/codacy.svg" alt="Codacy" height="64" />
+      </a>
+    </td>
   </tr>
 </table>
 

package/lib/browser/index.js

@@ -261,6 +261,7 @@ var createRequestListener = (context, options) => {
           onMockedResponse(_0, _1) {
             return __async(this, arguments, function* (response, { handler, parsedResult }) {
               const responseClone = response.clone();
+              const responseCloneForLogs = response.clone();
               const responseInit = (0, import_toResponseInit.toResponseInit)(response);
               if (context.supports.readableStreamTransfer) {
                 const responseStream = response.body;
@@ -278,10 +279,10 @@ var createRequestListener = (context, options) => {
                 }));
               }
               if (!options.quiet) {
-                context.emitter.once("response:mocked", ({ response: response2 }) => {
+                context.emitter.once("response:mocked", () => {
                   handler.log({
                     request: requestCloneForLogs,
-                    response: response2,
+                    response: responseCloneForLogs,
                     parsedResult
                   });
                 });

package/lib/browser/index.mjs

@@ -237,6 +237,7 @@ var createRequestListener = (context, options) => {
           onMockedResponse(_0, _1) {
             return __async(this, arguments, function* (response, { handler, parsedResult }) {
               const responseClone = response.clone();
+              const responseCloneForLogs = response.clone();
               const responseInit = toResponseInit(response);
               if (context.supports.readableStreamTransfer) {
                 const responseStream = response.body;
@@ -254,10 +255,10 @@ var createRequestListener = (context, options) => {
                 }));
               }
               if (!options.quiet) {
-                context.emitter.once("response:mocked", ({ response: response2 }) => {
+                context.emitter.once("response:mocked", () => {
                   handler.log({
                     request: requestCloneForLogs,
-                    response: response2,
+                    response: responseCloneForLogs,
                     parsedResult
                   });
                 });

package/lib/core/handlers/GraphQLHandler.js

@@ -129,11 +129,10 @@ Consider naming this operation or using "graphql.operation()" request handler to
       const statusColor = (0, import_getStatusCodeColor.getStatusCodeColor)(loggedResponse.status);
       const requestInfo = ((_a = args.parsedResult) == null ? void 0 : _a.operationName) ? `${(_b = args.parsedResult) == null ? void 0 : _b.operationType} ${(_c = args.parsedResult) == null ? void 0 : _c.operationName}` : `anonymous ${(_d = args.parsedResult) == null ? void 0 : _d.operationType}`;
       console.groupCollapsed(
-        import_devUtils.devUtils.formatMessage("%s %s (%c%s%c)"),
-        (0, import_getTimestamp.getTimestamp)(),
-        `${requestInfo}`,
+        import_devUtils.devUtils.formatMessage(
+          `${(0, import_getTimestamp.getTimestamp)()} ${requestInfo} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`
+        ),
         `color:${statusColor}`,
-        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request:", loggedRequest);

package/lib/core/handlers/GraphQLHandler.mjs

@@ -110,11 +110,10 @@ Consider naming this operation or using "graphql.operation()" request handler to
       const statusColor = getStatusCodeColor(loggedResponse.status);
       const requestInfo = ((_a = args.parsedResult) == null ? void 0 : _a.operationName) ? `${(_b = args.parsedResult) == null ? void 0 : _b.operationType} ${(_c = args.parsedResult) == null ? void 0 : _c.operationName}` : `anonymous ${(_d = args.parsedResult) == null ? void 0 : _d.operationType}`;
       console.groupCollapsed(
-        devUtils.formatMessage("%s %s (%c%s%c)"),
-        getTimestamp(),
-        `${requestInfo}`,
+        devUtils.formatMessage(
+          `${getTimestamp()} ${requestInfo} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`
+        ),
         `color:${statusColor}`,
-        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request:", loggedRequest);

package/lib/core/handlers/HttpHandler.js

@@ -132,12 +132,10 @@ class HttpHandler extends import_RequestHandler.RequestHandler {
       const loggedResponse = yield (0, import_serializeResponse.serializeResponse)(args.response);
       const statusColor = (0, import_getStatusCodeColor.getStatusCodeColor)(loggedResponse.status);
       console.groupCollapsed(
-        import_devUtils.devUtils.formatMessage("%s %s %s (%c%s%c)"),
-        (0, import_getTimestamp.getTimestamp)(),
-        args.request.method,
-        publicUrl,
+        import_devUtils.devUtils.formatMessage(
+          `${(0, import_getTimestamp.getTimestamp)()} ${args.request.method} ${publicUrl} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`
+        ),
         `color:${statusColor}`,
-        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request", loggedRequest);

package/lib/core/handlers/HttpHandler.mjs

@@ -112,12 +112,10 @@ class HttpHandler extends RequestHandler {
       const loggedResponse = yield serializeResponse(args.response);
       const statusColor = getStatusCodeColor(loggedResponse.status);
       console.groupCollapsed(
-        devUtils.formatMessage("%s %s %s (%c%s%c)"),
-        getTimestamp(),
-        args.request.method,
-        publicUrl,
+        devUtils.formatMessage(
+          `${getTimestamp()} ${args.request.method} ${publicUrl} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`
+        ),
         `color:${statusColor}`,
-        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request", loggedRequest);

package/lib/core/handlers/RequestHandler.js

@@ -105,12 +105,11 @@ class RequestHandler {
    */
   run(args) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
       if (this.isUsed && ((_a = this.options) == null ? void 0 : _a.once)) {
         return null;
       }
       const mainRequestRef = args.request.clone();
-      this.isUsed = true;
       const parsedResult = yield this.parse({
         request: args.request,
         resolutionContext: args.resolutionContext
@@ -123,6 +122,10 @@ class RequestHandler {
       if (!shouldInterceptRequest) {
         return null;
       }
+      if (this.isUsed && ((_b = this.options) == null ? void 0 : _b.once)) {
+        return null;
+      }
+      this.isUsed = true;
       const executeResolver = this.wrapResolver(this.resolver);
       const resolverExtras = this.extendResolverArgs({
         request: args.request,

package/lib/core/handlers/RequestHandler.mjs

@@ -84,12 +84,11 @@ class RequestHandler {
    */
   run(args) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
       if (this.isUsed && ((_a = this.options) == null ? void 0 : _a.once)) {
         return null;
       }
       const mainRequestRef = args.request.clone();
-      this.isUsed = true;
       const parsedResult = yield this.parse({
         request: args.request,
         resolutionContext: args.resolutionContext
@@ -102,6 +101,10 @@ class RequestHandler {
       if (!shouldInterceptRequest) {
         return null;
       }
+      if (this.isUsed && ((_b = this.options) == null ? void 0 : _b.once)) {
+        return null;
+      }
+      this.isUsed = true;
       const executeResolver = this.wrapResolver(this.resolver);
       const resolverExtras = this.extendResolverArgs({
         request: args.request,

package/lib/iife/index.js

@@ -547,12 +547,11 @@ var MockServiceWorker = (() => {
      */
     run(args) {
       return __async(this, null, function* () {
-        var _a3;
+        var _a3, _b2;
         if (this.isUsed && ((_a3 = this.options) == null ? void 0 : _a3.once)) {
           return null;
         }
         const mainRequestRef = args.request.clone();
-        this.isUsed = true;
         const parsedResult = yield this.parse({
           request: args.request,
           resolutionContext: args.resolutionContext
@@ -565,6 +564,10 @@ var MockServiceWorker = (() => {
         if (!shouldInterceptRequest) {
           return null;
         }
+        if (this.isUsed && ((_b2 = this.options) == null ? void 0 : _b2.once)) {
+          return null;
+        }
+        this.isUsed = true;
         const executeResolver = this.wrapResolver(this.resolver);
         const resolverExtras = this.extendResolverArgs({
           request: args.request,
@@ -2380,12 +2383,10 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
         const loggedResponse = yield serializeResponse(args.response);
         const statusColor = getStatusCodeColor(loggedResponse.status);
         console.groupCollapsed(
-          devUtils.formatMessage("%s %s %s (%c%s%c)"),
-          getTimestamp(),
-          args.request.method,
-          publicUrl,
+          devUtils.formatMessage(
+            `${getTimestamp()} ${args.request.method} ${publicUrl} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`
+          ),
           `color:${statusColor}`,
-          `${loggedResponse.status} ${loggedResponse.statusText}`,
           "color:inherit"
         );
         console.log("Request", loggedRequest);
@@ -5566,11 +5567,10 @@ Consider naming this operation or using "graphql.operation()" request handler to
         const statusColor = getStatusCodeColor(loggedResponse.status);
         const requestInfo = ((_a3 = args.parsedResult) == null ? void 0 : _a3.operationName) ? `${(_b2 = args.parsedResult) == null ? void 0 : _b2.operationType} ${(_c = args.parsedResult) == null ? void 0 : _c.operationName}` : `anonymous ${(_d = args.parsedResult) == null ? void 0 : _d.operationType}`;
         console.groupCollapsed(
-          devUtils.formatMessage("%s %s (%c%s%c)"),
-          getTimestamp(),
-          `${requestInfo}`,
+          devUtils.formatMessage(
+            `${getTimestamp()} ${requestInfo} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`
+          ),
           `color:${statusColor}`,
-          `${loggedResponse.status} ${loggedResponse.statusText}`,
           "color:inherit"
         );
         console.log("Request:", loggedRequest);
@@ -6366,6 +6366,7 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
             onMockedResponse(_0, _1) {
               return __async(this, arguments, function* (response, { handler, parsedResult }) {
                 const responseClone = response.clone();
+                const responseCloneForLogs = response.clone();
                 const responseInit = toResponseInit(response);
                 if (context.supports.readableStreamTransfer) {
                   const responseStream = response.body;
@@ -6383,10 +6384,10 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
                   }));
                 }
                 if (!options.quiet) {
-                  context.emitter.once("response:mocked", ({ response: response2 }) => {
+                  context.emitter.once("response:mocked", () => {
                     handler.log({
                       request: requestCloneForLogs,
-                      response: response2,
+                      response: responseCloneForLogs,
                       parsedResult
                     });
                   });

package/lib/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (2.0.0).
+ * Mock Service Worker (2.0.2).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.

package/lib/native/index.js

@@ -54,9 +54,9 @@ var import_mergeRight = require("../core/utils/internal/mergeRight.js");
 var import_handleRequest = require("../core/utils/handleRequest.js");
 var import_devUtils = require("../core/utils/internal/devUtils.js");
 
-// src/node/utils/isNodeException.ts
-function isNodeException(error) {
-  return error instanceof Error && "code" in error;
+// src/node/utils/isNodeExceptionLike.ts
+function isNodeExceptionLike(error) {
+  return !!error && typeof error === "object" && "code" in error;
 }
 
 // src/node/SetupServerApi.ts
@@ -85,7 +85,7 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
             request.signal
           );
         } catch (error) {
-          if (!(isNodeException(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
+          if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
             throw error;
           }
         }

package/lib/native/index.mjs

@@ -34,9 +34,9 @@ import { mergeRight } from '../core/utils/internal/mergeRight.mjs';
 import { handleRequest } from '../core/utils/handleRequest.mjs';
 import { devUtils } from '../core/utils/internal/devUtils.mjs';
 
-// src/node/utils/isNodeException.ts
-function isNodeException(error) {
-  return error instanceof Error && "code" in error;
+// src/node/utils/isNodeExceptionLike.ts
+function isNodeExceptionLike(error) {
+  return !!error && typeof error === "object" && "code" in error;
 }
 
 // src/node/SetupServerApi.ts
@@ -65,7 +65,7 @@ var SetupServerApi = class extends SetupApi {
             request.signal
           );
         } catch (error) {
-          if (!(isNodeException(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
+          if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
             throw error;
           }
         }

package/lib/node/index.js

@@ -54,9 +54,9 @@ var import_mergeRight = require("../core/utils/internal/mergeRight.js");
 var import_handleRequest = require("../core/utils/handleRequest.js");
 var import_devUtils = require("../core/utils/internal/devUtils.js");
 
-// src/node/utils/isNodeException.ts
-function isNodeException(error) {
-  return error instanceof Error && "code" in error;
+// src/node/utils/isNodeExceptionLike.ts
+function isNodeExceptionLike(error) {
+  return !!error && typeof error === "object" && "code" in error;
 }
 
 // src/node/SetupServerApi.ts
@@ -85,7 +85,7 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
             request.signal
           );
         } catch (error) {
-          if (!(isNodeException(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
+          if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
             throw error;
           }
         }

package/lib/node/index.mjs

@@ -31,9 +31,9 @@ import { mergeRight } from '../core/utils/internal/mergeRight.mjs';
 import { handleRequest } from '../core/utils/handleRequest.mjs';
 import { devUtils } from '../core/utils/internal/devUtils.mjs';
 
-// src/node/utils/isNodeException.ts
-function isNodeException(error) {
-  return error instanceof Error && "code" in error;
+// src/node/utils/isNodeExceptionLike.ts
+function isNodeExceptionLike(error) {
+  return !!error && typeof error === "object" && "code" in error;
 }
 
 // src/node/SetupServerApi.ts
@@ -62,7 +62,7 @@ var SetupServerApi = class extends SetupApi {
             request.signal
           );
         } catch (error) {
-          if (!(isNodeException(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
+          if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
             throw error;
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -123,11 +123,9 @@
     "@ossjs/release": "^0.8.0",
     "@playwright/test": "^1.30.0",
     "@swc/core": "^1.3.35",
-    "@swc/jest": "^0.2.24",
     "@types/express": "^4.17.17",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^8.1.0",
-    "@types/jest": "^29.4.0",
     "@types/json-bigint": "^1.0.1",
     "@types/node": "18.x",
     "@types/node-fetch": "^2.5.11",
@@ -150,8 +148,7 @@
     "fs-extra": "^10.0.0",
     "fs-teardown": "^0.3.0",
     "glob": "^9.3.4",
-    "jest": "^29.4.3",
-    "jest-environment-jsdom": "^29.4.3",
+    "jsdom": "^22.1.0",
     "json-bigint": "^1.0.0",
     "lint-staged": "^13.0.3",
     "page-with": "^0.6.1",
@@ -164,6 +161,7 @@
     "typescript": "^5.0.2",
     "undici": "^5.20.0",
     "url-loader": "^4.1.1",
+    "vitest": "^0.34.6",
     "webpack": "^5.68.0",
     "webpack-dev-server": "^3.11.2",
     "webpack-http-server": "^0.5.0"
@@ -193,15 +191,14 @@
     "start": "tsup --watch",
     "clean": "rimraf ./lib",
     "lint": "eslint \"{cli,config,src,test}/**/*.ts\"",
-    "prebuild": "rimraf ./lib",
     "build": "pnpm clean && cross-env NODE_ENV=production tsup && pnpm patch:dts",
     "patch:dts": "node \"./config/scripts/patch-ts.js\"",
     "check:exports": "node \"./config/scripts/validate-esm.js\"",
     "test": "pnpm test:unit && pnpm test:node && pnpm test:browser",
-    "test:unit": "cross-env BABEL_ENV=test jest --maxWorkers=3",
-    "test:node": "jest --config=./test/jest.config.js --forceExit",
+    "test:unit": "vitest",
+    "test:node": "vitest run --config=./test/node/vitest.config.ts",
     "test:browser": "playwright test -c ./test/browser/playwright.config.ts",
-    "test:modules:node": "jest --config=./test/modules/node/jest.config.js",
+    "test:modules:node": "vitest run --config=./test/modules/node/vitest.config.ts",
     "test:modules:browser": "playwright test -c ./test/modules/browser/playwright.config.ts",
     "test:ts": "ts-node test/typings/run.ts",
     "release": "release publish",

package/lib/core/http.spec.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/lib/core/http.spec.js

@@ -1,15 +0,0 @@
-"use strict";
-var import_http = require("./http.js");
-test("exports all REST API methods", () => {
-  expect(import_http.http).toBeDefined();
-  expect(Object.keys(import_http.http)).toEqual([
-    "all",
-    "head",
-    "get",
-    "post",
-    "put",
-    "delete",
-    "patch",
-    "options"
-  ]);
-});

package/lib/core/http.spec.mjs

@@ -1,14 +0,0 @@
-import { http } from './http.mjs';
-test("exports all REST API methods", () => {
-  expect(http).toBeDefined();
-  expect(Object.keys(http)).toEqual([
-    "all",
-    "head",
-    "get",
-    "post",
-    "put",
-    "delete",
-    "patch",
-    "options"
-  ]);
-});