msw 0.20.4 → 0.20.5

package/lib/esm/index.js

@@ -60,11 +60,20 @@ exports.until = until.until;
 });
 
 /**
- * Attempts to resolve a Service Worker instance from any of its states:
- * active, installing, or waiting.
+ * Attempts to resolve a Service Worker instance from a given registration,
+ * regardless of its state (active, installing, waiting).
  */
-const getWorkerByRegistration = (registration) => {
-    return registration.active || registration.installing || registration.waiting;
+const getWorkerByRegistration = (registration, absoluteWorkerUrl) => {
+    const allStates = [
+        registration.active,
+        registration.installing,
+        registration.waiting,
+    ];
+    const existingStates = allStates.filter(Boolean);
+    const mockWorker = existingStates.find((worker) => {
+        return worker.scriptURL === absoluteWorkerUrl;
+    });
+    return mockWorker || null;
 };
 
 /**
@@ -85,9 +94,7 @@ const getWorkerInstance = (url, options) => __awaiter(void 0, void 0, void 0, fu
     const [, mockRegistrations] = yield lib.until(() => __awaiter(void 0, void 0, void 0, function* () {
         const registrations = yield navigator.serviceWorker.getRegistrations();
         return registrations.filter((registration) => {
-            const worker = getWorkerByRegistration(registration);
-            // Filter out other workers that can be associated with this page
-            return (worker === null || worker === void 0 ? void 0 : worker.scriptURL) === absoluteWorkerUrl;
+            return getWorkerByRegistration(registration, absoluteWorkerUrl);
         });
     }));
     if (!navigator.serviceWorker.controller && mockRegistrations.length > 0) {
@@ -99,21 +106,24 @@ const getWorkerInstance = (url, options) => __awaiter(void 0, void 0, void 0, fu
         // at this point we are sure it's hard reload that falls into this clause.
         location.reload();
     }
-    const [, existingRegistration] = yield lib.until(() => {
-        return navigator.serviceWorker.getRegistration(url);
-    });
+    const [existingRegistration] = mockRegistrations;
     if (existingRegistration) {
         // Update existing service worker to ensure it's up-to-date
         return existingRegistration.update().then(() => {
             return [
-                getWorkerByRegistration(existingRegistration),
+                getWorkerByRegistration(existingRegistration, absoluteWorkerUrl),
                 existingRegistration,
             ];
         });
     }
     const [error, instance] = yield lib.until(() => __awaiter(void 0, void 0, void 0, function* () {
         const registration = yield navigator.serviceWorker.register(url, options);
-        return [getWorkerByRegistration(registration), registration];
+        return [
+            // Compare existing worker registration by its worker URL,
+            // to prevent irrelevant workers to resolve here (such as Codesandbox worker).
+            getWorkerByRegistration(registration, absoluteWorkerUrl),
+            registration,
+        ];
     }));
     if (error) {
         const isWorkerMissing = error.message.includes('(404)');

package/lib/types/index.d.ts

@@ -3,6 +3,6 @@ export { setupWorker } from './setupWorker/setupWorker';
 export { MockedResponse, ResponseTransformer, response } from './response';
 export { context };
 export { MockedRequest, RequestHandler, RequestParams, RequestQuery, ResponseResolver, ResponseResolverReturnType, AsyncResponseResolverReturnType, defaultContext, } from './handlers/requestHandler';
-export { rest, restContext, RESTMethods } from './rest';
+export { rest, restContext, RESTMethods, ParsedRestRequest } from './rest';
 export { graphql, graphqlContext, GraphQLMockedRequest, GraphQLMockedContext, GraphQLRequestPayload, GraphQLResponseResolver, } from './graphql';
 export { matchRequestUrl } from './utils/matching/matchRequest';

package/lib/types/rest.d.ts

@@ -21,7 +21,7 @@ export declare const restContext: {
     delay: (durationMs?: number | undefined) => import("./response").ResponseTransformer;
     fetch: <ResponseType_1 = any>(input: string | MockedRequest, requestInit?: RequestInit) => Promise<ResponseType_1>;
 };
-interface ParsedRestRequest {
+export interface ParsedRestRequest {
     match: ReturnType<typeof matchRequestUrl>;
 }
 export declare const rest: {
@@ -32,4 +32,3 @@ export declare const rest: {
     patch: (mask: Mask, resolver: ResponseResolver<MockedRequest, typeof restContext>) => RequestHandler<MockedRequest, typeof restContext, ParsedRestRequest>;
     options: (mask: Mask, resolver: ResponseResolver<MockedRequest, typeof restContext>) => RequestHandler<MockedRequest, typeof restContext, ParsedRestRequest>;
 };
-export {};

package/lib/types/setupWorker/start/utils/getWorkerByRegistration.d.ts

@@ -1,5 +1,5 @@
 /**
- * Attempts to resolve a Service Worker instance from any of its states:
- * active, installing, or waiting.
+ * Attempts to resolve a Service Worker instance from a given registration,
+ * regardless of its state (active, installing, waiting).
  */
-export declare const getWorkerByRegistration: (registration: ServiceWorkerRegistration) => ServiceWorker | null;
+export declare const getWorkerByRegistration: (registration: ServiceWorkerRegistration, absoluteWorkerUrl: string) => ServiceWorker | null;

package/lib/umd/index.js

@@ -776,11 +776,20 @@
   });
 
   /**
-   * Attempts to resolve a Service Worker instance from any of its states:
-   * active, installing, or waiting.
+   * Attempts to resolve a Service Worker instance from a given registration,
+   * regardless of its state (active, installing, waiting).
    */
-  const getWorkerByRegistration = (registration) => {
-      return registration.active || registration.installing || registration.waiting;
+  const getWorkerByRegistration = (registration, absoluteWorkerUrl) => {
+      const allStates = [
+          registration.active,
+          registration.installing,
+          registration.waiting,
+      ];
+      const existingStates = allStates.filter(Boolean);
+      const mockWorker = existingStates.find((worker) => {
+          return worker.scriptURL === absoluteWorkerUrl;
+      });
+      return mockWorker || null;
   };
 
   /**
@@ -801,9 +810,7 @@
       const [, mockRegistrations] = yield lib$1.until(() => __awaiter(void 0, void 0, void 0, function* () {
           const registrations = yield navigator.serviceWorker.getRegistrations();
           return registrations.filter((registration) => {
-              const worker = getWorkerByRegistration(registration);
-              // Filter out other workers that can be associated with this page
-              return (worker === null || worker === void 0 ? void 0 : worker.scriptURL) === absoluteWorkerUrl;
+              return getWorkerByRegistration(registration, absoluteWorkerUrl);
           });
       }));
       if (!navigator.serviceWorker.controller && mockRegistrations.length > 0) {
@@ -815,21 +822,24 @@
           // at this point we are sure it's hard reload that falls into this clause.
           location.reload();
       }
-      const [, existingRegistration] = yield lib$1.until(() => {
-          return navigator.serviceWorker.getRegistration(url);
-      });
+      const [existingRegistration] = mockRegistrations;
       if (existingRegistration) {
           // Update existing service worker to ensure it's up-to-date
           return existingRegistration.update().then(() => {
               return [
-                  getWorkerByRegistration(existingRegistration),
+                  getWorkerByRegistration(existingRegistration, absoluteWorkerUrl),
                   existingRegistration,
               ];
           });
       }
       const [error, instance] = yield lib$1.until(() => __awaiter(void 0, void 0, void 0, function* () {
           const registration = yield navigator.serviceWorker.register(url, options);
-          return [getWorkerByRegistration(registration), registration];
+          return [
+              // Compare existing worker registration by its worker URL,
+              // to prevent irrelevant workers to resolve here (such as Codesandbox worker).
+              getWorkerByRegistration(registration, absoluteWorkerUrl),
+              registration,
+          ];
       }));
       if (error) {
           const isWorkerMissing = error.message.includes('(404)');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "0.20.4",
+  "version": "0.20.5",
   "description": "Client-side API mocking using Service Workers.",
   "main": "lib/umd/index.js",
   "module": "lib/esm/index.js",
@@ -69,7 +69,7 @@
     "headers-utils": "^1.2.0",
     "node-fetch": "^2.6.0",
     "node-match-path": "^0.4.4",
-    "node-request-interceptor": "^0.3.4",
+    "node-request-interceptor": "^0.3.5",
     "statuses": "^2.0.0",
     "yargs": "^15.4.1"
   },