msw 2.7.5 → 2.8.0

package/browser/package.json

@@ -1,5 +1,30 @@
 {
-  "main": "../lib/browser/index.js",
-  "module": "../lib/browser/index.mjs",
-  "types": "../lib/browser/index.d.ts"
+  "type": "module",
+  "main": "../lib/browser/index.mjs",
+  "types": "../lib/browser/index.d.mts",
+  "exports": {
+    ".": {
+      "module-sync": {
+        "types": "./../lib/browser/index.d.mts",
+        "default": "./../lib/browser/index.mjs"
+      },
+      "module": {
+        "types": "./../lib/browser/index.d.mts",
+        "default": "./../lib/browser/index.mjs"
+      },
+      "browser": {
+        "types": "./../lib/browser/index.d.mts",
+        "default": "./../lib/browser/index.mjs"
+      },
+      "import": {
+        "types": "./../lib/browser/index.d.mts",
+        "default": "./../lib/browser/index.mjs"
+      },
+      "default": {
+        "types": "./../lib/browser/index.d.ts",
+        "default": "./../lib/browser/index.js"
+      }
+    },
+    "./package.json": "./package.json"
+  }
 }

package/cli/index.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
-const yargs = require('yargs')
+import yargs from 'yargs'
+import { init } from './init.js'
 
-yargs
+// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+yargs(process.argv.slice(2))
   .usage('$0 <cmd> [args]')
   .command(
     'init',
@@ -27,7 +29,7 @@ yargs
         .example('msw init ./public')
         .example('msw init ./static --save')
     },
-    require('./init'),
+    init,
   )
   .demandCommand()
   .help().argv

package/cli/init.js

@@ -1,11 +1,11 @@
-const fs = require('fs')
-const path = require('path')
-const colors = require('picocolors')
-const confirm = require('@inquirer/confirm').default
-const invariant = require('./invariant')
-const { SERVICE_WORKER_BUILD_PATH } = require('../config/constants')
-
-module.exports = async function init(args) {
+import fs from 'node:fs'
+import path from 'node:path'
+import colors from 'picocolors'
+import confirm from '@inquirer/confirm'
+import { invariant } from './invariant.js'
+import { SERVICE_WORKER_BUILD_PATH } from '../config/constants.js'
+
+export async function init(args) {
   const CWD = args.cwd || process.cwd()
   const publicDir = args._[1] ? normalizePath(args._[1]) : undefined
 
@@ -33,6 +33,7 @@ module.exports = async function init(args) {
     // You can also provide the "--no-save" option, and then "args.save"
     // will equal to false.
     else if (args.save == null) {
+      // eslint-disable-next-line no-console
       console.log(`\
       ${colors.cyan(
         'INFO',
@@ -126,6 +127,7 @@ async function copyWorkerScript(destination, cwd) {
       })
   }
 
+  // eslint-disable-next-line no-console
   console.log('Copying the worker script at "%s"...', absolutePublicDir)
 
   const workerFilename = path.basename(SERVICE_WORKER_BUILD_PATH)
@@ -140,6 +142,7 @@ async function copyWorkerScript(destination, cwd) {
  * @param {Array<string>} paths
  */
 function printSuccessMessage(paths) {
+  // eslint-disable-next-line no-console
   console.log(`
 ${colors.green('Worker script successfully copied!')}
 ${paths.map((path) => colors.gray(`  - ${path}\n`))}
@@ -151,6 +154,7 @@ ${colors.red(colors.bold('https://mswjs.io/docs/getting-started'))}
 }
 
 function printFailureMessage(pathsWithErrors) {
+  // eslint-disable-next-line no-console
   console.error(`\
 ${colors.red('Copying the worker script failed at following paths:')}
 ${pathsWithErrors
@@ -166,6 +170,7 @@ ${pathsWithErrors
 function saveWorkerDirectory(packageJsonPath, publicDir) {
   const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
 
+  // eslint-disable-next-line no-console
   console.log(
     colors.gray('Updating "msw.workerDirectory" at "%s"...'),
     packageJsonPath,

package/cli/invariant.js

@@ -1,7 +1,8 @@
-const colors = require('picocolors')
+import colors from 'picocolors'
 
-module.exports = function invariant(predicate, message, ...args) {
+export function invariant(predicate, message, ...args) {
   if (!predicate) {
+    // eslint-disable-next-line no-console
     console.error(colors.red(message), ...args)
     process.exit(1)
   }

package/cli/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/config/constants.js

@@ -1,17 +1,13 @@
-const path = require('path')
+import url from 'node:url'
+import path from 'node:path'
 
-const SERVICE_WORKER_SOURCE_PATH = path.resolve(
-  __dirname,
-  '../src/mockServiceWorker.js',
+export const SERVICE_WORKER_SOURCE_PATH = url.fileURLToPath(
+  new URL('../src/mockServiceWorker.js', import.meta.url),
 )
 
-const SERVICE_WORKER_BUILD_PATH = path.resolve(
-  __dirname,
-  '../lib',
-  path.basename(SERVICE_WORKER_SOURCE_PATH),
+export const SERVICE_WORKER_BUILD_PATH = url.fileURLToPath(
+  new URL(
+    path.join('../lib', path.basename(SERVICE_WORKER_SOURCE_PATH)),
+    import.meta.url,
+  ),
 )
-
-module.exports = {
-  SERVICE_WORKER_SOURCE_PATH,
-  SERVICE_WORKER_BUILD_PATH,
-}

package/config/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/config/scripts/postinstall.js

@@ -1,6 +1,6 @@
-const fs = require('fs')
-const path = require('path')
-const { execSync } = require('child_process')
+import fs from 'node:fs'
+import path from 'node:path'
+import { execSync } from 'node:child_process'
 
 // When executing the "postinstall" script, the "process.cwd" equals
 // the package directory, not the parent project where the package is installed.

package/lib/browser/index.d.mts

@@ -1,7 +1,7 @@
-import { SharedOptions, LifeCycleEventEmitter, LifeCycleEventsMap } from "../core/sharedOptions";
-import { RequestHandler } from "../core/handlers/RequestHandler";
-import { WebSocketHandler } from "../core/handlers/WebSocketHandler";
-import { SetupApi } from "../core/SetupApi";
+import { SharedOptions, LifeCycleEventEmitter, LifeCycleEventsMap } from "../core/sharedOptions.mjs";
+import { RequestHandler } from "../core/handlers/RequestHandler.mjs";
+import { WebSocketHandler } from "../core/handlers/WebSocketHandler.mjs";
+import { SetupApi } from "../core/SetupApi.mjs";
 
 type FindWorker = (scriptUrl: string, mockServiceWorkerUrl: string) => boolean;
 interface StartOptions extends SharedOptions {

package/lib/browser/index.d.ts

@@ -1,7 +1,7 @@
-import { SharedOptions, LifeCycleEventEmitter, LifeCycleEventsMap } from "../core/sharedOptions";
-import { RequestHandler } from "../core/handlers/RequestHandler";
-import { WebSocketHandler } from "../core/handlers/WebSocketHandler";
-import { SetupApi } from "../core/SetupApi";
+import { SharedOptions, LifeCycleEventEmitter, LifeCycleEventsMap } from "../core/sharedOptions.mjs";
+import { RequestHandler } from "../core/handlers/RequestHandler.mjs";
+import { WebSocketHandler } from "../core/handlers/WebSocketHandler.mjs";
+import { SetupApi } from "../core/SetupApi.mjs";
 
 type FindWorker = (scriptUrl: string, mockServiceWorkerUrl: string) => boolean;
 interface StartOptions extends SharedOptions {

package/lib/browser/index.js

@@ -18,12 +18,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/browser/index.ts
-var browser_exports = {};
-__export(browser_exports, {
+var index_exports = {};
+__export(index_exports, {
   SetupWorkerApi: () => SetupWorkerApi,
   setupWorker: () => setupWorker
 });
-module.exports = __toCommonJS(browser_exports);
+module.exports = __toCommonJS(index_exports);
 
 // node_modules/.pnpm/outvariant@1.4.3/node_modules/outvariant/lib/index.mjs
 var POSITIONALS_EXP = /(%?)(%([sdijo]))/g;
@@ -125,7 +125,7 @@ function isNodeProcess() {
 }
 
 // src/browser/setupWorker/start/createStartHandler.ts
-var import_devUtils7 = require("../core/utils/internal/devUtils.js");
+var import_devUtils7 = 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) => {
@@ -140,7 +140,7 @@ var until = async (promise) => {
 };
 
 // src/browser/setupWorker/start/utils/getWorkerInstance.ts
-var import_devUtils = require("../core/utils/internal/devUtils.js");
+var import_devUtils = require("../core/utils/internal/devUtils");
 
 // src/browser/utils/getAbsoluteWorkerUrl.ts
 function getAbsoluteWorkerUrl(workerUrl) {
@@ -220,10 +220,10 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
 };
 
 // src/browser/setupWorker/start/utils/enableMocking.ts
-var import_devUtils3 = require("../core/utils/internal/devUtils.js");
+var import_devUtils3 = require("../core/utils/internal/devUtils");
 
 // src/browser/setupWorker/start/utils/printStartMessage.ts
-var import_devUtils2 = require("../core/utils/internal/devUtils.js");
+var import_devUtils2 = require("../core/utils/internal/devUtils");
 function printStartMessage(args = {}) {
   if (args.quiet) {
     return;
@@ -298,11 +298,11 @@ function parseWorkerRequest(incomingRequest) {
 }
 
 // src/browser/setupWorker/start/createRequestListener.ts
-var import_RequestHandler = require("../core/handlers/RequestHandler.js");
-var import_handleRequest = require("../core/utils/handleRequest.js");
-var import_devUtils4 = require("../core/utils/internal/devUtils.js");
-var import_toResponseInit = require("../core/utils/toResponseInit.js");
-var import_isHandlerKind = require("../core/utils/internal/isHandlerKind.js");
+var import_RequestHandler = require("../core/handlers/RequestHandler");
+var import_handleRequest = require("../core/utils/handleRequest");
+var import_devUtils4 = require("../core/utils/internal/devUtils");
+var import_toResponseInit = require("../core/utils/toResponseInit");
+var import_isHandlerKind = require("../core/utils/internal/isHandlerKind");
 var createRequestListener = (context, options) => {
   return async (event, message) => {
     const messageChannel = new WorkerChannel(event.ports[0]);
@@ -386,7 +386,7 @@ This exception has been gracefully handled as a 500 response, however, it's stro
 };
 
 // src/browser/utils/checkWorkerIntegrity.ts
-var import_devUtils5 = require("../core/utils/internal/devUtils.js");
+var import_devUtils5 = require("../core/utils/internal/devUtils");
 async function checkWorkerIntegrity(context) {
   context.workerChannel.send("INTEGRITY_CHECK_REQUEST");
   const { payload } = await context.events.once("INTEGRITY_CHECK_RESPONSE");
@@ -1149,7 +1149,7 @@ function createResponseListener(context) {
 }
 
 // src/browser/setupWorker/start/utils/validateWorkerScope.ts
-var import_devUtils6 = require("../core/utils/internal/devUtils.js");
+var import_devUtils6 = require("../core/utils/internal/devUtils");
 function validateWorkerScope(registration, options) {
   if (!options?.quiet && !location.href.startsWith(registration.scope)) {
     import_devUtils6.devUtils.warn(
@@ -1241,10 +1241,10 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
 };
 
 // src/browser/setupWorker/stop/createStop.ts
-var import_devUtils9 = require("../core/utils/internal/devUtils.js");
+var import_devUtils9 = require("../core/utils/internal/devUtils");
 
 // src/browser/setupWorker/stop/utils/printStopMessage.ts
-var import_devUtils8 = require("../core/utils/internal/devUtils.js");
+var import_devUtils8 = require("../core/utils/internal/devUtils");
 function printStopMessage(args = {}) {
   if (args.quiet) {
     return;
@@ -1273,7 +1273,7 @@ var createStop = (context) => {
 };
 
 // src/browser/setupWorker/start/utils/prepareStartHandler.ts
-var import_mergeRight = require("../core/utils/internal/mergeRight.js");
+var import_mergeRight = require("../core/utils/internal/mergeRight");
 var DEFAULT_START_OPTIONS = {
   serviceWorker: {
     url: "/mockServiceWorker.js",
@@ -2622,8 +2622,8 @@ var XMLHttpRequestInterceptor = _XMLHttpRequestInterceptor;
 XMLHttpRequestInterceptor.interceptorSymbol = Symbol("xhr");
 
 // src/browser/setupWorker/start/createFallbackRequestListener.ts
-var import_handleRequest2 = require("../core/utils/handleRequest.js");
-var import_isHandlerKind2 = require("../core/utils/internal/isHandlerKind.js");
+var import_handleRequest2 = require("../core/utils/handleRequest");
+var import_isHandlerKind2 = require("../core/utils/internal/isHandlerKind");
 function createFallbackRequestListener(context, options) {
   const interceptor = new BatchInterceptor({
     name: "fallback",
@@ -2696,9 +2696,9 @@ function createFallbackStop(context) {
 }
 
 // src/browser/setupWorker/setupWorker.ts
-var import_devUtils10 = require("../core/utils/internal/devUtils.js");
-var import_SetupApi = require("../core/SetupApi.js");
-var import_mergeRight2 = require("../core/utils/internal/mergeRight.js");
+var import_devUtils10 = require("../core/utils/internal/devUtils");
+var import_SetupApi = require("../core/SetupApi");
+var import_mergeRight2 = require("../core/utils/internal/mergeRight");
 
 // src/browser/utils/supportsReadableStreamTransfer.ts
 function supportsReadableStreamTransfer() {
@@ -2715,9 +2715,9 @@ function supportsReadableStreamTransfer() {
 }
 
 // src/browser/setupWorker/setupWorker.ts
-var import_webSocketInterceptor = require("../core/ws/webSocketInterceptor.js");
-var import_handleWebSocketEvent = require("../core/ws/handleWebSocketEvent.js");
-var import_attachWebSocketLogger = require("../core/ws/utils/attachWebSocketLogger.js");
+var import_webSocketInterceptor = require("../core/ws/webSocketInterceptor");
+var import_handleWebSocketEvent = require("../core/ws/handleWebSocketEvent");
+var import_attachWebSocketLogger = require("../core/ws/utils/attachWebSocketLogger");
 var SetupWorkerApi = class extends import_SetupApi.SetupApi {
   context;
   startHandler = null;