Merge branch 'main' into chore/use-swc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "0.48.1",
+  "version": "0.48.2",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

src/utils/url/getAbsoluteWorkerUrl.test.ts

@@ -3,12 +3,29 @@
  */
 import { getAbsoluteWorkerUrl } from './getAbsoluteWorkerUrl'
 
-describe('getAbsoluteWorkerUrl', () => {
-  describe('given a relative worker URL', () => {
-    it('should return an absolute URL against the current location', () => {
-      expect(getAbsoluteWorkerUrl('./mockServiceWorker.js')).toEqual(
-        'http://localhost/mockServiceWorker.js',
-      )
-    })
+const rawLocation = window.location
+
+afterAll(() => {
+  Object.defineProperty(window, 'location', {
+    value: rawLocation,
+  })
+})
+
+it('returns absolute worker url relatively to the root', () => {
+  expect(getAbsoluteWorkerUrl('./worker.js')).toBe('http://localhost/worker.js')
+})
+
+it('returns an absolute worker url relatively to the current path', () => {
+  Object.defineProperty(window, 'location', {
+    value: {
+      href: 'http://localhost/path/to/page',
+    },
   })
+
+  expect(getAbsoluteWorkerUrl('./worker.js')).toBe(
+    'http://localhost/path/to/worker.js',
+  )
+
+  // Leading slash must still resolve to the root.
+  expect(getAbsoluteWorkerUrl('/worker.js')).toBe('http://localhost/worker.js')
 })

src/utils/url/getAbsoluteWorkerUrl.ts

@@ -2,6 +2,6 @@
  * Returns an absolute Service Worker URL based on the given
  * relative URL (known during the registration).
  */
-export function getAbsoluteWorkerUrl(relativeUrl: string): string {
-  return new URL(relativeUrl, location.origin).href
+export function getAbsoluteWorkerUrl(workerUrl: string): string {
+  return new URL(workerUrl, location.href).href
 }