msw 2.2.3 → 2.2.5

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 confirm = require('@inquirer/confirm')
+const confirm = require('@inquirer/confirm').default
 const invariant = require('./invariant')
 const { SERVICE_WORKER_BUILD_PATH } = require('../config/constants')
 

package/lib/browser/index.js

@@ -122,6 +122,9 @@ function isNodeProcess() {
   return false;
 }
 
+// src/browser/setupWorker/start/createStartHandler.ts
+var import_devUtils7 = require("../core/utils/internal/devUtils.js");
+
 // node_modules/.pnpm/@open-draft+until@2.1.0/node_modules/@open-draft/until/lib/index.mjs
 var until = async (promise) => {
   try {
@@ -134,9 +137,6 @@ var until = async (promise) => {
   }
 };
 
-// src/browser/setupWorker/start/createStartHandler.ts
-var import_devUtils6 = require("../core/utils/internal/devUtils.js");
-
 // src/browser/setupWorker/start/utils/getWorkerInstance.ts
 var import_devUtils = require("../core/utils/internal/devUtils.js");
 
@@ -379,18 +379,22 @@ This exception has been gracefully handled as a 500 response, however, it's stro
   };
 };
 
-// src/browser/utils/requestIntegrityCheck.ts
-async function requestIntegrityCheck(context, serviceWorker) {
+// src/browser/utils/checkWorkerIntegrity.ts
+var import_devUtils5 = require("../core/utils/internal/devUtils.js");
+async function checkWorkerIntegrity(context) {
   context.workerChannel.send("INTEGRITY_CHECK_REQUEST");
-  const { payload: actualChecksum } = await context.events.once(
-    "INTEGRITY_CHECK_RESPONSE"
-  );
-  if (actualChecksum !== "223d191a56023cd36aa88c802961b911") {
-    throw new Error(
-      `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"223d191a56023cd36aa88c802961b911"}).`
+  const { payload } = await context.events.once("INTEGRITY_CHECK_RESPONSE");
+  if (payload.checksum !== "5db7e6e8385dc04e017ac4823e0e9b29") {
+    import_devUtils5.devUtils.warn(
+      `The currently registered Service Worker has been generated by a different version of MSW (${payload.packageVersion}) and may not be fully compatible with the installed version.
+
+It's recommended you update your worker script by running this command:
+
+  \u2022 npx msw init <PUBLIC_DIR>
+
+You can also automate this process and make the worker script update automatically upon the library installations. Read more: https://mswjs.io/docs/cli/init.`
     );
   }
-  return serviceWorker;
 }
 
 // node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
@@ -1083,10 +1087,10 @@ function createResponseListener(context) {
 }
 
 // src/browser/setupWorker/start/utils/validateWorkerScope.ts
-var import_devUtils5 = require("../core/utils/internal/devUtils.js");
+var import_devUtils6 = require("../core/utils/internal/devUtils.js");
 function validateWorkerScope(registration, options) {
   if (!options?.quiet && !location.href.startsWith(registration.scope)) {
-    import_devUtils5.devUtils.warn(
+    import_devUtils6.devUtils.warn(
       `Cannot intercept requests on this page because it's outside of the worker's scope ("${registration.scope}"). If you wish to mock API requests on this page, you must resolve this scope issue.
 
 - (Recommended) Register the worker at the root level ("/") of your application.
@@ -1112,14 +1116,14 @@ var createStartHandler = (context) => {
       );
       const [worker, registration] = instance;
       if (!worker) {
-        const missingWorkerMessage = customOptions?.findWorker ? import_devUtils6.devUtils.formatMessage(
+        const missingWorkerMessage = customOptions?.findWorker ? import_devUtils7.devUtils.formatMessage(
           `Failed to locate the Service Worker registration using a custom "findWorker" predicate.
 
 Please ensure that the custom predicate properly locates the Service Worker registration at "%s".
 More details: https://mswjs.io/docs/api/setup-worker/start#findworker
 `,
           options.serviceWorker.url
-        ) : import_devUtils6.devUtils.formatMessage(
+        ) : import_devUtils7.devUtils.formatMessage(
           `Failed to locate the Service Worker registration.
 
 This most likely means that the worker script URL "%s" cannot resolve against the actual public hostname (%s). This may happen if your application runs behind a proxy, or has a dynamic hostname.
@@ -1138,19 +1142,12 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         }
         window.clearInterval(context.keepAliveInterval);
       });
-      const integrityCheckResult = await until(
-        () => requestIntegrityCheck(context, worker)
-      );
-      if (integrityCheckResult.error) {
-        import_devUtils6.devUtils.error(`Detected outdated Service Worker: ${integrityCheckResult.error.message}
-
-The mocking is still enabled, but it's highly recommended that you update your Service Worker by running:
-
-$ npx msw init <PUBLIC_DIR>
-
-This is necessary to ensure that the Service Worker is in sync with the library to guarantee its stability.
-If this message still persists after updating, please report an issue: https://github.com/open-draft/msw/issues      `);
-      }
+      await checkWorkerIntegrity(context).catch((error2) => {
+        import_devUtils7.devUtils.error(
+          "Error while checking the worker script integrity. Please report this on GitHub (https://github.com/mswjs/msw/issues), including the original error below."
+        );
+        console.error(error2);
+      });
       context.keepAliveInterval = window.setInterval(
         () => context.workerChannel.send("KEEPALIVE_REQUEST"),
         5e3
@@ -1181,16 +1178,16 @@ If this message still persists after updating, please report an issue: https://g
 };
 
 // src/browser/setupWorker/stop/createStop.ts
-var import_devUtils8 = require("../core/utils/internal/devUtils.js");
+var import_devUtils9 = require("../core/utils/internal/devUtils.js");
 
 // src/browser/setupWorker/stop/utils/printStopMessage.ts
-var import_devUtils7 = require("../core/utils/internal/devUtils.js");
+var import_devUtils8 = require("../core/utils/internal/devUtils.js");
 function printStopMessage(args = {}) {
   if (args.quiet) {
     return;
   }
   console.log(
-    `%c${import_devUtils7.devUtils.formatMessage("Mocking disabled.")}`,
+    `%c${import_devUtils8.devUtils.formatMessage("Mocking disabled.")}`,
     "color:orangered;font-weight:bold;"
   );
 }
@@ -1199,7 +1196,7 @@ function printStopMessage(args = {}) {
 var createStop = (context) => {
   return function stop() {
     if (!context.isMockingEnabled) {
-      import_devUtils8.devUtils.warn(
+      import_devUtils9.devUtils.warn(
         'Found a redundant "worker.stop()" call. Note that stopping the worker while mocking already stopped has no effect. Consider removing this "worker.stop()" call.'
       );
       return;
@@ -2290,7 +2287,7 @@ function createFallbackStop(context) {
 }
 
 // src/browser/setupWorker/setupWorker.ts
-var import_devUtils9 = require("../core/utils/internal/devUtils.js");
+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");
 
@@ -2318,7 +2315,7 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
     super(...handlers);
     invariant(
       !isNodeProcess(),
-      import_devUtils9.devUtils.formatMessage(
+      import_devUtils10.devUtils.formatMessage(
         "Failed to execute `setupWorker` in a non-browser environment. Consider using `setupServer` for Node.js environment instead."
       )
     );
@@ -2416,7 +2413,7 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
   }
   async start(options = {}) {
     if (options.waitUntilReady === true) {
-      import_devUtils9.devUtils.warn(
+      import_devUtils10.devUtils.warn(
         'The "waitUntilReady" option has been deprecated. Please remove it from this "worker.start()" call. Follow the recommended Browser integration (https://mswjs.io/docs/integrations/browser) to eliminate any race conditions between the Service Worker registration and any requests made by your application on initial render.'
       );
     }