@bagaar/ember-graphql-mocking 0.8.0 → 0.10.0

package/CHANGELOG.md

@@ -5,6 +5,41 @@
 
 
 
+
+
+## v0.10.0 (2024-02-08)
+
+#### :boom: Breaking Change
+* [#195](https://github.com/Bagaar/ember-graphql-mocking/pull/195) Remove automatic inclusion/exclusion of msw's worker file ([@bertdeblock](https://github.com/bertdeblock))
+* [#194](https://github.com/Bagaar/ember-graphql-mocking/pull/194) Convert to TS ([@bertdeblock](https://github.com/bertdeblock))
+* [#193](https://github.com/Bagaar/ember-graphql-mocking/pull/193) Don't leak msw `worker.start` return value ([@bertdeblock](https://github.com/bertdeblock))
+
+#### :rocket: Enhancement
+* [#194](https://github.com/Bagaar/ember-graphql-mocking/pull/194) Convert to TS ([@bertdeblock](https://github.com/bertdeblock))
+
+#### :bug: Bug Fix
+* [#193](https://github.com/Bagaar/ember-graphql-mocking/pull/193) Don't leak msw `worker.start` return value ([@bertdeblock](https://github.com/bertdeblock))
+
+#### Committers: 1
+- Bert De Block ([@bertdeblock](https://github.com/bertdeblock))
+
+## v0.9.0 (2023-11-27)
+
+#### :boom: Breaking Change
+* [#191](https://github.com/Bagaar/ember-graphql-mocking/pull/191) Support MSW v2 ([@bertdeblock](https://github.com/bertdeblock))
+* [#189](https://github.com/Bagaar/ember-graphql-mocking/pull/189) Drop support for Ember v4.4 ([@bertdeblock](https://github.com/bertdeblock))
+* [#177](https://github.com/Bagaar/ember-graphql-mocking/pull/177) Drop support for Node.js v16 ([@bertdeblock](https://github.com/bertdeblock))
+
+#### :rocket: Enhancement
+* [#191](https://github.com/Bagaar/ember-graphql-mocking/pull/191) Support MSW v2 ([@bertdeblock](https://github.com/bertdeblock))
+
+#### :house: Internal
+* [#176](https://github.com/Bagaar/ember-graphql-mocking/pull/176) Update dependencies ([@bertdeblock](https://github.com/bertdeblock))
+* [#175](https://github.com/Bagaar/ember-graphql-mocking/pull/175) Update to Ember v5.4 ([@bertdeblock](https://github.com/bertdeblock))
+
+#### Committers: 1
+- Bert De Block ([@bertdeblock](https://github.com/bertdeblock))
+
 ## v0.8.0 (2023-07-06)
 
 #### :boom: Breaking Change

package/README.md

@@ -1,17 +1,16 @@
 # Ember GraphQL Mocking
 
 [![CI](https://github.com/Bagaar/ember-graphql-mocking/workflows/CI/badge.svg)](https://github.com/Bagaar/ember-graphql-mocking/actions?query=workflow%3ACI)
-[![Code Style: Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
-[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
+[![NPM Version](https://badge.fury.io/js/%40bagaar%2Fember-graphql-mocking.svg)](https://badge.fury.io/js/%40bagaar%2Fember-graphql-mocking)
 
 Ember addon for mocking GraphQL requests using [Mock Service Worker (MSW)](https://github.com/mswjs/msw).
 
 ## Compatibility
 
-- Ember.js v4.4 or above
-- Ember CLI v4.4 or above
-- Node.js v16 or above
-- MSW v1 or above
+- Ember.js v4.8 or above
+- Ember CLI v4.8 or above
+- Node.js v18 or above
+- MSW v2 or above
 
 ## Installation
 
@@ -57,7 +56,8 @@ setup(QUnit.assert);
 start();
 ```
 
-> **NOTE:** Make sure to use `QUnit.begin`, as `setupEmberGraphqlMocking` returns a Promise.
+> [!NOTE]
+> Make sure to use `QUnit.begin`, as `setupEmberGraphqlMocking` returns a Promise.
 
 If you want to pass along additional [start options](https://mswjs.io/docs/api/setup-worker/start#options)
 to MSW's service worker, you can do so by defining an `mswStartOptions` object:
@@ -82,7 +82,8 @@ QUnit.begin(() =>
 
 `mockResolvers` accepts an object that consists of one or more resolvers. The key must be the name of the mocked operation, the value can either be a response object _or_ a function that returns a response object.
 
-> **NOTE:** Make sure that your operations are [named](https://graphql.org/learn/queries/#operation-name) in order for `@bagaar/ember-graphql-mocking` to function properly.
+> [!NOTE]
+> Make sure that your operations are [named](https://graphql.org/learn/queries/#operation-name) in order for `@bagaar/ember-graphql-mocking` to function properly.
 
 ```javascript
 // tests/acceptance/my-acceptance-test.js
@@ -116,9 +117,11 @@ module('Acceptance | ember graphql mocking', function (hooks) {
 });
 ```
 
-> **NOTE:** Calling `mockResolvers` multiple times within a single test, will simply merge all resolvers into a single root.
+> [!NOTE]
+> Calling `mockResolvers` multiple times within a single test, will simply merge all resolvers into a single root.
 
-💡 Working versions of these code examples can be found in [this addon's `tests` folder](./tests/).
+> [!NOTE]
+> Working versions of these code examples can be found in [this addon's `tests` folder](./tests/).
 
 ## Contributing
 

package/addon-test-support/index.ts

@@ -0,0 +1,125 @@
+import { assert } from '@ember/debug';
+import { type setupApplicationTest } from 'ember-qunit';
+import { buildASTSchema, graphql, type DocumentNode } from 'graphql';
+import merge from 'lodash.merge';
+import { graphql as mswGraphql, HttpResponse } from 'msw';
+import { setupWorker, type SetupWorker, type StartOptions } from 'msw/browser';
+
+interface Options {
+  mswStartOptions: StartOptions;
+}
+
+type WindowWithTestem = typeof window & { Testem: unknown };
+
+const IS_TESTEM = Boolean((window as WindowWithTestem).Testem);
+const DEFAULT_OPTIONS: Options = {
+  mswStartOptions: {
+    quiet: IS_TESTEM,
+    serviceWorker: {
+      options: {
+        scope: IS_TESTEM ? window.location.pathname : '/tests',
+      },
+    },
+  },
+};
+
+let isSetupGraphqlTestCalled = false;
+let root: object | null = null;
+let worker: SetupWorker | null = null;
+
+export async function setupEmberGraphqlMocking(
+  schemaDocument: DocumentNode,
+  providedOptions?: Options,
+) {
+  const options = merge({}, DEFAULT_OPTIONS, providedOptions);
+
+  createWorker();
+  createGraphqlOperationHandler(schemaDocument);
+
+  await startWorker(options.mswStartOptions);
+}
+
+export function setupGraphqlTest(
+  hooks: Parameters<typeof setupApplicationTest>[0],
+) {
+  assert(
+    'Cannot call `setupGraphqlTest` without providing the `hooks` argument. Please make sure to call `setupGraphqlTest(hooks);`.',
+    hooks,
+  );
+
+  hooks.before(() => {
+    isSetupGraphqlTestCalled = true;
+  });
+
+  hooks.after(() => {
+    isSetupGraphqlTestCalled = false;
+  });
+
+  hooks.afterEach(clearRoot);
+}
+
+export function mockResolvers(resolvers: object) {
+  assert(
+    'Cannot call `mockResolvers` before calling `setupGraphqlTest`. Please make sure to call `setupGraphqlTest(hooks);`.',
+    isSetupGraphqlTestCalled,
+  );
+
+  root = { ...root, ...resolvers };
+}
+
+export function getWorker() {
+  assert(
+    'Cannot call `getWorker` before calling `setupEmberGraphqlMocking`. Please make sure to call `setupEmberGraphqlMocking(yourSchemaDocument[, yourProvidedOptions]);`.',
+    worker,
+  );
+
+  return worker;
+}
+
+export function destroyWorker() {
+  assert(
+    'Cannot call `destroyWorker` before calling `setupEmberGraphqlMocking`. Please make sure to call `setupEmberGraphqlMocking(yourSchemaDocument[, yourProvidedOptions]);`.',
+    worker,
+  );
+
+  worker.stop();
+
+  worker = null;
+}
+
+function createWorker() {
+  worker = setupWorker();
+}
+
+function createGraphqlOperationHandler(schemaDocument: DocumentNode) {
+  assert('[BUG] `worker` is not set.', worker);
+
+  const schema = buildASTSchema(schemaDocument);
+  const graphqlOperation = mswGraphql.operation(async ({ request }) => {
+    const { query, variables } = (await request.json()) || {
+      query: '',
+      variables: {},
+    };
+
+    const { data, errors } = await graphql({
+      rootValue: root,
+      schema,
+      source: query,
+      variableValues: variables,
+    });
+
+    return HttpResponse.json({ data, errors });
+  });
+
+  worker.use(graphqlOperation);
+}
+
+async function startWorker(mswStartOptions: Options['mswStartOptions']) {
+  assert('[BUG] `worker` is not set.', worker);
+
+  await worker.start(mswStartOptions);
+}
+
+function clearRoot() {
+  root = null;
+}

package/declarations/addon-test-support/index.d.ts

@@ -0,0 +1,13 @@
+import { type setupApplicationTest } from 'ember-qunit';
+import { type DocumentNode } from 'graphql';
+import { type SetupWorker, type StartOptions } from 'msw/browser';
+interface Options {
+    mswStartOptions: StartOptions;
+}
+export declare function setupEmberGraphqlMocking(schemaDocument: DocumentNode, providedOptions?: Options): Promise<void>;
+export declare function setupGraphqlTest(hooks: Parameters<typeof setupApplicationTest>[0]): void;
+export declare function mockResolvers(resolvers: object): void;
+export declare function getWorker(): SetupWorker;
+export declare function destroyWorker(): void;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/declarations/addon-test-support/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../addon-test-support/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAA2B,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAGrE,OAAO,EAAe,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAE/E,UAAU,OAAO;IACf,eAAe,EAAE,YAAY,CAAC;CAC/B;AAoBD,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,YAAY,EAC5B,eAAe,CAAC,EAAE,OAAO,iBAQ1B;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,QAgBlD;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,QAO9C;AAED,wBAAgB,SAAS,gBAOxB;AAED,wBAAgB,aAAa,SAS5B"}

package/index.js

@@ -3,19 +3,9 @@
 module.exports = {
   name: require('./package').name,
 
-  treeForPublic(tree) {
-    const host = this._findHost();
-    const shouldExcludePublicFiles = host.env === 'production';
-
-    if (shouldExcludePublicFiles) {
-      return;
-    }
-
-    const funnel = require('broccoli-funnel');
-    const mergeTrees = require('broccoli-merge-trees');
-
-    return mergeTrees([tree, funnel(host.trees.public)], {
-      overwrite: true,
-    });
+  options: {
+    'ember-cli-babel': {
+      enableTypeScriptTransform: true,
+    },
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bagaar/ember-graphql-mocking",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Ember addon for mocking GraphQL requests using Mock Service Worker (MSW).",
   "keywords": [
     "ember-addon"
@@ -8,6 +8,21 @@
   "repository": "https://github.com/Bagaar/ember-graphql-mocking",
   "license": "MIT",
   "author": "Bagaar",
+  "typesVersions": {
+    "*": {
+      "test-support": [
+        "declarations/addon-test-support/index.d.ts"
+      ],
+      "test-support/*": [
+        "declarations/addon-test-support/*",
+        "declarations/addon-test-support/*/index.d.ts"
+      ],
+      "*": [
+        "declarations/addon/*",
+        "declarations/addon/*/index.d.ts"
+      ]
+    }
+  },
   "directories": {
     "doc": "doc",
     "test": "tests"
@@ -22,6 +37,9 @@
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
+    "lint:types": "tsc --noEmit",
+    "prepack": "tsc --project tsconfig.declarations.json",
+    "postpack": "rimraf declarations",
     "prepare": "husky install",
     "start": "ember serve",
     "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
@@ -34,68 +52,73 @@
     ]
   },
   "dependencies": {
-    "broccoli-funnel": "^3.0.5",
-    "broccoli-merge-trees": "^4.2.0",
-    "ember-auto-import": "^2.6.3",
-    "ember-cli-babel": "^7.26.11",
-    "graphql": "^16.7.1",
+    "@babel/core": "^7.23.3",
+    "ember-auto-import": "^2.7.0",
+    "ember-cli-babel": "^8.2.0",
     "lodash.merge": "^4.6.2"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.22.5",
-    "@babel/plugin-proposal-decorators": "^7.22.5",
-    "@commitlint/cli": "^17.6.6",
-    "@commitlint/config-conventional": "^17.6.6",
+    "@apollo/client": "^3.9.4",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
     "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^3.1.0",
-    "@embroider/test-setup": "^3.0.1",
+    "@ember/test-helpers": "^3.2.1",
+    "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@release-it-plugins/lerna-changelog": "^5.0.0",
+    "@release-it-plugins/lerna-changelog": "^6.0.0",
+    "@tsconfig/ember": "^3.0.3",
+    "@types/lodash.merge": "^4.6.9",
+    "@types/qunit": "^2.19.10",
+    "@types/rsvp": "^4.0.9",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.2.0",
-    "ember-apollo-client": "^4.1.1",
-    "ember-cli": "~5.1.0",
-    "ember-cli-clean-css": "^2.0.0",
+    "concurrently": "^8.2.2",
+    "ember-cli": "~5.6.0",
+    "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.2",
-    "ember-cli-htmlbars": "^6.2.0",
+    "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^7.0.0",
-    "ember-qunit": "^7.0.0",
-    "ember-resolver": "^10.1.1",
-    "ember-source": "~5.1.1",
+    "ember-page-title": "^8.2.0",
+    "ember-qunit": "^8.0.2",
+    "ember-resolver": "^11.0.1",
+    "ember-source": "~5.6.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.11.0",
-    "ember-try": "^2.0.0",
-    "eslint": "^8.43.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-ember": "^11.9.0",
-    "eslint-plugin-n": "^16.0.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-qunit": "^8.0.0",
-    "husky": "^8.0.3",
+    "ember-template-lint": "^5.13.0",
+    "ember-try": "^3.0.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^12.0.0",
+    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-qunit": "^8.0.1",
+    "graphql": "^16.8.1",
+    "husky": "^9.0.10",
     "loader.js": "^4.7.0",
-    "msw": "^1.2.2",
-    "prettier": "^2.8.8",
-    "qunit": "^2.19.4",
-    "qunit-dom": "^2.0.0",
-    "release-it": "^15.11.0",
-    "stylelint": "^15.9.0",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^3.0.0",
-    "webpack": "^5.88.1"
+    "msw": "^2.0.9",
+    "prettier": "^3.2.4",
+    "qunit": "^2.20.0",
+    "qunit-dom": "^3.0.0",
+    "release-it": "^17.0.3",
+    "rimraf": "^5.0.1",
+    "stylelint": "^16.2.1",
+    "stylelint-config-standard": "^36.0.0",
+    "stylelint-prettier": "^5.0.0",
+    "typescript": "^5.3.3",
+    "webpack": "^5.89.0"
   },
   "peerDependencies": {
-    "ember-source": "^4.4.0 || ^5.0.0",
-    "msw": "^1.0.1"
+    "ember-qunit": "^8.0.0",
+    "ember-source": ">= 4.8.0",
+    "graphql": "^16.0.0",
+    "msw": "^2.0.0"
   },
   "engines": {
-    "node": "16.* || >= 18"
+    "node": ">= 18"
   },
   "publishConfig": {
     "access": "public",
@@ -108,7 +131,7 @@
     "configPath": "tests/dummy/config"
   },
   "msw": {
-    "workerDirectory": "public"
+    "workerDirectory": "tests/dummy/public"
   },
   "release-it": {
     "plugins": {

package/addon-test-support/index.js

@@ -1,83 +0,0 @@
-import { assert } from '@ember/debug';
-import { buildASTSchema, graphql } from 'graphql';
-import merge from 'lodash.merge';
-import { graphql as mswGraphql, setupWorker } from 'msw';
-
-const IS_TESTEM = Boolean(window.Testem);
-const DEFAULT_OPTIONS = {
-  mswStartOptions: {
-    quiet: IS_TESTEM,
-    serviceWorker: {
-      options: {
-        scope: IS_TESTEM ? window.location.pathname : '/tests',
-      },
-    },
-  },
-};
-
-let isSetupGraphqlTestCalled = false;
-let root = null;
-let worker = null;
-
-export function setupEmberGraphqlMocking(schemaDocument, providedOptions) {
-  const options = merge({}, DEFAULT_OPTIONS, providedOptions);
-
-  createWorker();
-  createGraphqlOperationHandler(schemaDocument);
-
-  return startWorker(options.mswStartOptions);
-}
-
-export function setupGraphqlTest(hooks) {
-  hooks.before(() => (isSetupGraphqlTestCalled = true));
-  hooks.after(() => (isSetupGraphqlTestCalled = false));
-  hooks.afterEach(clearRoot);
-}
-
-export function mockResolvers(resolvers) {
-  assert(
-    'Cannot call `mockResolvers` before calling `setupGraphqlTest`. Please make sure to call `setupGraphqlTest(hooks);`.',
-    isSetupGraphqlTestCalled
-  );
-
-  root = { ...root, ...resolvers };
-}
-
-export function getWorker() {
-  return worker;
-}
-
-export function destroyWorker() {
-  worker.stop();
-
-  worker = null;
-}
-
-function createWorker() {
-  worker = setupWorker();
-}
-
-function createGraphqlOperationHandler(schemaDocument) {
-  const schema = buildASTSchema(schemaDocument);
-  const graphqlOperation = mswGraphql.operation(async (req, res, ctx) => {
-    const { query } = await req.json();
-    const queryResult = await graphql({
-      rootValue: root,
-      schema,
-      source: query,
-      variableValues: req.variables,
-    });
-
-    return res(ctx.data(queryResult.data), ctx.errors(queryResult.errors));
-  });
-
-  worker.use(graphqlOperation);
-}
-
-function startWorker(mswStartOptions) {
-  return worker.start(mswStartOptions);
-}
-
-function clearRoot() {
-  root = null;
-}

package/public/mockServiceWorker.js

@@ -1,303 +0,0 @@
-/* eslint-disable */
-/* tslint:disable */
-
-/**
- * Mock Service Worker (1.2.2).
- * @see https://github.com/mswjs/msw
- * - Please do NOT modify this file.
- * - Please do NOT serve this file on production.
- */
-
-const INTEGRITY_CHECKSUM = '3d6b9f06410d179a7f7404d4bf4c3c70'
-const activeClientIds = new Set()
-
-self.addEventListener('install', function () {
-  self.skipWaiting()
-})
-
-self.addEventListener('activate', function (event) {
-  event.waitUntil(self.clients.claim())
-})
-
-self.addEventListener('message', async function (event) {
-  const clientId = event.source.id
-
-  if (!clientId || !self.clients) {
-    return
-  }
-
-  const client = await self.clients.get(clientId)
-
-  if (!client) {
-    return
-  }
-
-  const allClients = await self.clients.matchAll({
-    type: 'window',
-  })
-
-  switch (event.data) {
-    case 'KEEPALIVE_REQUEST': {
-      sendToClient(client, {
-        type: 'KEEPALIVE_RESPONSE',
-      })
-      break
-    }
-
-    case 'INTEGRITY_CHECK_REQUEST': {
-      sendToClient(client, {
-        type: 'INTEGRITY_CHECK_RESPONSE',
-        payload: INTEGRITY_CHECKSUM,
-      })
-      break
-    }
-
-    case 'MOCK_ACTIVATE': {
-      activeClientIds.add(clientId)
-
-      sendToClient(client, {
-        type: 'MOCKING_ENABLED',
-        payload: true,
-      })
-      break
-    }
-
-    case 'MOCK_DEACTIVATE': {
-      activeClientIds.delete(clientId)
-      break
-    }
-
-    case 'CLIENT_CLOSED': {
-      activeClientIds.delete(clientId)
-
-      const remainingClients = allClients.filter((client) => {
-        return client.id !== clientId
-      })
-
-      // Unregister itself when there are no more clients
-      if (remainingClients.length === 0) {
-        self.registration.unregister()
-      }
-
-      break
-    }
-  }
-})
-
-self.addEventListener('fetch', function (event) {
-  const { request } = event
-  const accept = request.headers.get('accept') || ''
-
-  // Bypass server-sent events.
-  if (accept.includes('text/event-stream')) {
-    return
-  }
-
-  // Bypass navigation requests.
-  if (request.mode === 'navigate') {
-    return
-  }
-
-  // Opening the DevTools triggers the "only-if-cached" request
-  // that cannot be handled by the worker. Bypass such requests.
-  if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
-    return
-  }
-
-  // Bypass all requests when there are no active clients.
-  // Prevents the self-unregistered worked from handling requests
-  // after it's been deleted (still remains active until the next reload).
-  if (activeClientIds.size === 0) {
-    return
-  }
-
-  // Generate unique request ID.
-  const requestId = Math.random().toString(16).slice(2)
-
-  event.respondWith(
-    handleRequest(event, requestId).catch((error) => {
-      if (error.name === 'NetworkError') {
-        console.warn(
-          '[MSW] Successfully emulated a network error for the "%s %s" request.',
-          request.method,
-          request.url,
-        )
-        return
-      }
-
-      // At this point, any exception indicates an issue with the original request/response.
-      console.error(
-        `\
-[MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
-        request.method,
-        request.url,
-        `${error.name}: ${error.message}`,
-      )
-    }),
-  )
-})
-
-async function handleRequest(event, requestId) {
-  const client = await resolveMainClient(event)
-  const response = await getResponse(event, client, requestId)
-
-  // Send back the response clone for the "response:*" life-cycle events.
-  // Ensure MSW is active and ready to handle the message, otherwise
-  // this message will pend indefinitely.
-  if (client && activeClientIds.has(client.id)) {
-    ;(async function () {
-      const clonedResponse = response.clone()
-      sendToClient(client, {
-        type: 'RESPONSE',
-        payload: {
-          requestId,
-          type: clonedResponse.type,
-          ok: clonedResponse.ok,
-          status: clonedResponse.status,
-          statusText: clonedResponse.statusText,
-          body:
-            clonedResponse.body === null ? null : await clonedResponse.text(),
-          headers: Object.fromEntries(clonedResponse.headers.entries()),
-          redirected: clonedResponse.redirected,
-        },
-      })
-    })()
-  }
-
-  return response
-}
-
-// Resolve the main client for the given event.
-// Client that issues a request doesn't necessarily equal the client
-// that registered the worker. It's with the latter the worker should
-// communicate with during the response resolving phase.
-async function resolveMainClient(event) {
-  const client = await self.clients.get(event.clientId)
-
-  if (client?.frameType === 'top-level') {
-    return client
-  }
-
-  const allClients = await self.clients.matchAll({
-    type: 'window',
-  })
-
-  return allClients
-    .filter((client) => {
-      // Get only those clients that are currently visible.
-      return client.visibilityState === 'visible'
-    })
-    .find((client) => {
-      // Find the client ID that's recorded in the
-      // set of clients that have registered the worker.
-      return activeClientIds.has(client.id)
-    })
-}
-
-async function getResponse(event, client, requestId) {
-  const { request } = event
-  const clonedRequest = request.clone()
-
-  function passthrough() {
-    // Clone the request because it might've been already used
-    // (i.e. its body has been read and sent to the client).
-    const headers = Object.fromEntries(clonedRequest.headers.entries())
-
-    // Remove MSW-specific request headers so the bypassed requests
-    // comply with the server's CORS preflight check.
-    // Operate with the headers as an object because request "Headers"
-    // are immutable.
-    delete headers['x-msw-bypass']
-
-    return fetch(clonedRequest, { headers })
-  }
-
-  // Bypass mocking when the client is not active.
-  if (!client) {
-    return passthrough()
-  }
-
-  // Bypass initial page load requests (i.e. static assets).
-  // The absence of the immediate/parent client in the map of the active clients
-  // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
-  // and is not ready to handle requests.
-  if (!activeClientIds.has(client.id)) {
-    return passthrough()
-  }
-
-  // Bypass requests with the explicit bypass header.
-  // Such requests can be issued by "ctx.fetch()".
-  if (request.headers.get('x-msw-bypass') === 'true') {
-    return passthrough()
-  }
-
-  // Notify the client that a request has been intercepted.
-  const clientMessage = await sendToClient(client, {
-    type: 'REQUEST',
-    payload: {
-      id: requestId,
-      url: request.url,
-      method: request.method,
-      headers: Object.fromEntries(request.headers.entries()),
-      cache: request.cache,
-      mode: request.mode,
-      credentials: request.credentials,
-      destination: request.destination,
-      integrity: request.integrity,
-      redirect: request.redirect,
-      referrer: request.referrer,
-      referrerPolicy: request.referrerPolicy,
-      body: await request.text(),
-      bodyUsed: request.bodyUsed,
-      keepalive: request.keepalive,
-    },
-  })
-
-  switch (clientMessage.type) {
-    case 'MOCK_RESPONSE': {
-      return respondWithMock(clientMessage.data)
-    }
-
-    case 'MOCK_NOT_FOUND': {
-      return passthrough()
-    }
-
-    case 'NETWORK_ERROR': {
-      const { name, message } = clientMessage.data
-      const networkError = new Error(message)
-      networkError.name = name
-
-      // Rejecting a "respondWith" promise emulates a network error.
-      throw networkError
-    }
-  }
-
-  return passthrough()
-}
-
-function sendToClient(client, message) {
-  return new Promise((resolve, reject) => {
-    const channel = new MessageChannel()
-
-    channel.port1.onmessage = (event) => {
-      if (event.data && event.data.error) {
-        return reject(event.data.error)
-      }
-
-      resolve(event.data)
-    }
-
-    client.postMessage(message, [channel.port2])
-  })
-}
-
-function sleep(timeMs) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, timeMs)
-  })
-}
-
-async function respondWithMock(response) {
-  await sleep(response.delay)
-  return new Response(response.body, response)
-}