msw 2.7.3 → 2.7.4

package/lib/mockServiceWorker.js

@@ -8,7 +8,7 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.7.3'
+const PACKAGE_VERSION = '2.7.4'
 const INTEGRITY_CHECKSUM = '00729d72e3b82faf54ca8b9621dbb96f'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",

package/src/browser/utils/getAbsoluteWorkerUrl.test.ts

@@ -1,6 +1,4 @@
-/**
- * @vitest-environment jsdom
- */
+// @vitest-environment jsdom
 import { getAbsoluteWorkerUrl } from './getAbsoluteWorkerUrl'
 
 const rawLocation = window.location

package/src/core/handlers/GraphQLHandler.ts

@@ -72,6 +72,7 @@ export type GraphQLResponseBody<BodyType extends DefaultBodyType> =
   | {
       data?: BodyType | null
       errors?: readonly Partial<GraphQLError>[] | null
+      extensions?: Record<string, any>
     }
   | null
   | undefined

package/src/core/utils/url/getAbsoluteUrl.test.ts

@@ -1,29 +1,47 @@
-/**
- * @vitest-environment jsdom
- */
+// @vitest-environment jsdom
 import { getAbsoluteUrl } from './getAbsoluteUrl'
 
-it('rebases a relative URL against the current "baseURI" (default)', () => {
-  expect(getAbsoluteUrl('/reviews')).toEqual('http://localhost/reviews')
+const rawLocation = window.location
+
+afterAll(() => {
+  Object.defineProperty(window, 'location', {
+    value: rawLocation,
+  })
+})
+
+it('resolves a relative URL against the current location (default)', () => {
+  expect(getAbsoluteUrl('/reviews')).toBe('http://localhost/reviews')
+})
+
+it('supports relative URLs starting with search parameters', () => {
+  Object.defineProperty(window, 'location', {
+    value: {
+      href: 'http://localhost/nested',
+    },
+  })
+
+  expect(getAbsoluteUrl('?resourceId=abc-123')).toBe(
+    'http://localhost/nested?resourceId=abc-123',
+  )
 })
 
-it('rebases a relative URL against a custom base URL', () => {
-  expect(getAbsoluteUrl('/user', 'https://api.github.com')).toEqual(
+it('resolves a relative URL against a custom base URL', () => {
+  expect(getAbsoluteUrl('/user', 'https://api.github.com')).toBe(
     'https://api.github.com/user',
   )
 })
 
 it('returns a given absolute URL as-is', () => {
-  expect(getAbsoluteUrl('https://api.mswjs.io/users')).toEqual(
+  expect(getAbsoluteUrl('https://api.mswjs.io/users')).toBe(
     'https://api.mswjs.io/users',
   )
 })
 
 it('returns an absolute URL given a relative path without a leading slash', () => {
-  expect(getAbsoluteUrl('users')).toEqual('http://localhost/users')
+  expect(getAbsoluteUrl('users')).toBe('http://localhost/users')
 })
 
 it('returns a path with a pattern as-is', () => {
-  expect(getAbsoluteUrl(':api/user')).toEqual('http://localhost/:api/user')
-  expect(getAbsoluteUrl('*/resource/*')).toEqual('*/resource/*')
+  expect(getAbsoluteUrl(':api/user')).toBe('http://localhost/:api/user')
+  expect(getAbsoluteUrl('*/resource/*')).toBe('*/resource/*')
 })

package/src/core/utils/url/getAbsoluteUrl.ts

@@ -16,8 +16,7 @@ export function getAbsoluteUrl(path: string, baseUrl?: string): string {
 
   // Resolve a relative request URL against a given custom "baseUrl"
   // or the document baseURI (in the case of browser/browser-like environments).
-  const origin =
-    baseUrl || (typeof document !== 'undefined' && document.baseURI)
+  const origin = baseUrl || (typeof location !== 'undefined' && location.href)
 
   return origin
     ? // Encode and decode the path to preserve escaped characters.