diff --git a/config/plugins/esbuild/graphQLImportPlugin.ts b/config/plugins/esbuild/graphQLImportPlugin.ts
deleted file mode 100644
index f5f592454..000000000
--- a/config/plugins/esbuild/graphQLImportPlugin.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import fs from 'node:fs'
-import type { Plugin } from 'esbuild'
-
-/**
- * A plugin to replace `require('graphql')` statements with `await import('graphql')`
- * only for ESM bundles. This makes the GraphQL module to be imported lazily
- * while maintaining the CommonJS compatibility.
- * @see https://github.com/mswjs/msw/issues/2254
- */
-export function graphqlImportPlugin(): Plugin {
-  return {
-    name: 'graphql-import-plugin',
-    setup(build) {
-      if (build.initialOptions.format !== 'esm') {
-        return
-      }
-
-      build.onLoad({ filter: /\.ts$/ }, async (args) => {
-        const contents = await fs.promises.readFile(args.path, 'utf-8')
-        const match = /require\(['"]graphql['"]\)/g.exec(contents)
-
-        if (match) {
-          return {
-            loader: 'ts',
-            contents:
-              contents.slice(0, match.index - 1) +
-              `await import('graphql').catch((error) => {console.error('[MSW] Failed to parse a GraphQL query: cannot import the "graphql" module. Please make sure you install it if you wish to intercept GraphQL requests. See the original import error below.'); throw error})` +
-              contents.slice(match.index + match[0].length),
-          }
-        }
-      })
-    },
-  }
-}
diff --git a/config/replaceCoreImports.js b/config/replaceCoreImports.js
index c4dff75d4..9f1570ca1 100644
--- a/config/replaceCoreImports.js
+++ b/config/replaceCoreImports.js
@@ -1,29 +1,39 @@
-const CORE_ESM_IMPORT_PATTERN = /from ["'](#core(.*))["'](;)?/gm
-const CORE_CJS_IMPORT_PATTERN = /require\(["'](#core(.*))["']\)(;)?/gm
+const CORE_ESM_IMPORT_PATTERN = /(from|import)\s+["'](#core(.*?))["'](;)?/gm
+const CORE_CJS_IMPORT_PATTERN = /require\(["'](#core(.*?))["']\)(;)?/gm
 
 function getCoreImportPattern(isEsm) {
   return isEsm ? CORE_ESM_IMPORT_PATTERN : CORE_CJS_IMPORT_PATTERN
 }
 
 export function hasCoreImports(fileContents, isEsm) {
-  return getCoreImportPattern(isEsm).test(fileContents)
+  return fileContents.search(getCoreImportPattern(isEsm)) !== -1
 }
 
 export function replaceCoreImports(moduleFilePath, fileContents, isEsm) {
+  if (isEsm) {
+    return fileContents.replace(
+      CORE_ESM_IMPORT_PATTERN,
+      (_, keyword, __, maybeSubmodulePath, maybeSemicolon) => {
+        const submodulePath = maybeSubmodulePath || '/index'
+        /**
+         * @note Although all .d.ts are considered ESM, append different
+         * file extension for d.mts files.
+         */
+        const extension = moduleFilePath.endsWith('.d.mts') ? '.mjs' : ''
+        const semicolon = maybeSemicolon || ''
+
+        return `${keyword} "../core${submodulePath}${extension}"${semicolon}`
+      },
+    )
+  }
+
   return fileContents.replace(
-    getCoreImportPattern(isEsm),
+    CORE_CJS_IMPORT_PATTERN,
     (_, __, maybeSubmodulePath, maybeSemicolon) => {
       const submodulePath = maybeSubmodulePath || '/index'
-      /**
-       * @note Although all .d.ts are considered ESM, append different
-       * file extension for d.mts files.
-       */
-      const extension = moduleFilePath.endsWith('.d.mts') ? '.mjs' : ''
       const semicolon = maybeSemicolon || ''
 
-      return isEsm
-        ? `from "../core${submodulePath}${extension}"${semicolon}`
-        : `require("../core${submodulePath}")${semicolon}`
+      return `require("../core${submodulePath}")${semicolon}`
     },
   )
 }
diff --git a/package.json b/package.json
index 5cde2b766..06a30ddbb 100644
--- a/package.json
+++ b/package.json
@@ -123,23 +123,11 @@
         "default": "./lib/core/http.js"
       }
     },
-    "./core/graphql": {
-      "module-sync": {
-        "types": "./lib/core/graphql.d.mts",
-        "default": "./lib/core/graphql.mjs"
-      },
-      "module": {
-        "types": "./lib/core/graphql.d.mts",
-        "default": "./lib/core/graphql.mjs"
-      },
-      "import": {
-        "types": "./lib/core/graphql.d.mts",
-        "default": "./lib/core/graphql.mjs"
-      },
-      "default": {
-        "types": "./lib/core/graphql.d.ts",
-        "default": "./lib/core/graphql.js"
-      }
+    "./graphql": {
+      "module-sync": "./lib/graphql/index.mjs",
+      "module": "./lib/graphql/index.mjs",
+      "import": "./lib/graphql/index.mjs",
+      "default": "./lib/graphql/index.js"
     },
     "./core/ws": {
       "module-sync": {
@@ -252,7 +240,6 @@
     "@open-draft/deferred-promise": "^3.0.0",
     "@types/statuses": "^2.0.6",
     "cookie": "^1.1.1",
-    "graphql": "^16.13.2",
     "headers-polyfill": "^5.0.1",
     "is-node-process": "^1.2.0",
     "outvariant": "^1.4.3",
@@ -291,6 +278,7 @@
     "fastify": "^5.8.5",
     "fs-teardown": "^0.3.0",
     "glob": "^13.0.6",
+    "graphql": "^16.13.2",
     "jsdom": "^25.0.1",
     "json-bigint": "^1.0.0",
     "knip": "^6.4.1",
@@ -312,9 +300,13 @@
     "webpack-http-server": "^0.5.0"
   },
   "peerDependencies": {
-    "typescript": ">= 4.8.x"
+    "graphql": ">=16",
+    "typescript": ">=4.8.x"
   },
   "peerDependenciesMeta": {
+    "graphql": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 319491815..12de434b0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,9 +26,6 @@ importers:
       cookie:
         specifier: ^1.1.1
         version: 1.1.1
-      graphql:
-        specifier: ^16.13.2
-        version: 16.13.2
       headers-polyfill:
         specifier: ^5.0.1
         version: 5.0.1
@@ -138,6 +135,9 @@ importers:
       glob:
         specifier: ^13.0.6
         version: 13.0.6
+      graphql:
+        specifier: ^16.13.2
+        version: 16.13.2
       jsdom:
         specifier: ^25.0.1
         version: 25.0.1
diff --git a/src/core/experimental/frames/http-frame.test.ts b/src/core/experimental/frames/http-frame.test.ts
index 933e93365..bf39a2815 100644
--- a/src/core/experimental/frames/http-frame.test.ts
+++ b/src/core/experimental/frames/http-frame.test.ts
@@ -1,5 +1,5 @@
 import { http } from '../../http'
-import { graphql } from '../../graphql'
+import { graphql } from '../../../graphql'
 import { ws } from '../../ws'
 import { bypass } from '../../bypass'
 import type { HttpNetworkFrameEventMap } from './http-frame'
diff --git a/src/core/experimental/frames/websocket-frame.test.ts b/src/core/experimental/frames/websocket-frame.test.ts
index 1dc538cec..8dd7630df 100644
--- a/src/core/experimental/frames/websocket-frame.test.ts
+++ b/src/core/experimental/frames/websocket-frame.test.ts
@@ -1,5 +1,6 @@
+// @vitest-environment node-websocket
 import { http } from '../../http'
-import { graphql } from '../../graphql'
+import { graphql } from '../../../graphql'
 import { ws } from '../../ws'
 import type { WebSocketNetworkFrameEventMap } from './websocket-frame'
 import { WebSocketNetworkFrame } from './websocket-frame'
diff --git a/src/core/experimental/handlers-controller.test.ts b/src/core/experimental/handlers-controller.test.ts
index 62d62395a..6dd4a2c65 100644
--- a/src/core/experimental/handlers-controller.test.ts
+++ b/src/core/experimental/handlers-controller.test.ts
@@ -1,5 +1,5 @@
 import { http } from '../http'
-import { graphql } from '../graphql'
+import { graphql } from '../../graphql'
 import { ws } from '../ws'
 import { getSiblingHandlers } from '../utils/internal/attachSiblingHandlers'
 import { InMemoryHandlersController } from './handlers-controller'
diff --git a/src/core/handlers/RequestHandler.ts b/src/core/handlers/RequestHandler.ts
index 1c4485d59..bff1736fa 100644
--- a/src/core/handlers/RequestHandler.ts
+++ b/src/core/handlers/RequestHandler.ts
@@ -7,11 +7,8 @@ import {
 import type { ResponseResolutionContext } from '../utils/executeHandlers'
 import type { MaybePromise } from '../typeUtils'
 import type { HttpResponse } from '../HttpResponse'
-import {
-  type StrictRequest,
-  type DefaultUnsafeFetchResponse,
-} from '../HttpResponse'
-import type { GraphQLRequestBody } from './GraphQLHandler'
+import type { StrictRequest, DefaultUnsafeFetchResponse } from '../HttpResponse'
+import type { GraphQLRequestBody } from '../../graphql/graphql-handler'
 import { devUtils } from '../utils/internal/devUtils'
 import { getRawSetCookie } from '../utils/HttpResponse/decorators'
 
diff --git a/src/core/index.ts b/src/core/index.ts
index 1f5d542d7..27643b89b 100644
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -6,8 +6,6 @@ export { SetupApi } from './experimental/setup-api'
 export { RequestHandler } from './handlers/RequestHandler'
 export { http } from './http'
 export { HttpHandler, HttpMethods } from './handlers/HttpHandler'
-export { graphql } from './graphql'
-export { GraphQLHandler } from './handlers/GraphQLHandler'
 
 /* WebSocket handler */
 export { ws, type WebSocketLink } from './ws'
@@ -66,26 +64,9 @@ export type {
 } from './handlers/HttpHandler'
 export type { HttpRequestHandler, HttpResponseResolver } from './http'
 
-export type {
-  GraphQLQuery,
-  GraphQLVariables,
-  GraphQLRequestBody,
-  GraphQLResponseBody,
-  GraphQLJsonRequestBody,
-  GraphQLOperationType,
-  GraphQLCustomPredicate,
-} from './handlers/GraphQLHandler'
-export type {
-  GraphQLRequestHandler,
-  GraphQLOperationHandler,
-  GraphQLResponseResolver,
-  GraphQLLinkHandlers,
-} from './graphql'
-
 export type { WebSocketData, WebSocketEventListener } from './ws'
 
 export type { Path, PathParams, Match } from './utils/matching/matchRequestUrl'
-export type { ParsedGraphQLRequest } from './utils/internal/parseGraphQLRequest'
 export type { ResponseResolutionContext } from './utils/executeHandlers'
 
 export {
diff --git a/src/core/utils/executeHandlers.ts b/src/core/utils/executeHandlers.ts
index c740961c2..35ad85160 100644
--- a/src/core/utils/executeHandlers.ts
+++ b/src/core/utils/executeHandlers.ts
@@ -1,5 +1,5 @@
 import type { RequestHandler } from '../handlers/RequestHandler'
-import { type RequestHandlerExecutionResult } from '../handlers/RequestHandler'
+import type { RequestHandlerExecutionResult } from '../handlers/RequestHandler'
 
 export interface HandlersExecutionResult {
   handler: RequestHandler
diff --git a/src/core/utils/internal/isHandlerKind.test.ts b/src/core/utils/internal/isHandlerKind.test.ts
index ae78f5f0a..055159a26 100644
--- a/src/core/utils/internal/isHandlerKind.test.ts
+++ b/src/core/utils/internal/isHandlerKind.test.ts
@@ -1,4 +1,4 @@
-import { GraphQLHandler } from '../../handlers/GraphQLHandler'
+import { GraphQLHandler } from '../../../graphql/graphql-handler'
 import { HttpHandler } from '../../handlers/HttpHandler'
 import { RequestHandler } from '../../handlers/RequestHandler'
 import { WebSocketHandler } from '../../handlers/WebSocketHandler'
diff --git a/src/core/utils/internal/parseGraphQLRequest.test.ts b/src/core/utils/internal/parseGraphQLRequest.test.ts
index dac66d252..669f97ab3 100644
--- a/src/core/utils/internal/parseGraphQLRequest.test.ts
+++ b/src/core/utils/internal/parseGraphQLRequest.test.ts
@@ -3,8 +3,10 @@
  */
 import { encodeBuffer } from '@mswjs/interceptors'
 import { OperationTypeNode } from 'graphql'
-import type { ParsedGraphQLRequest } from './parseGraphQLRequest'
-import { parseGraphQLRequest } from './parseGraphQLRequest'
+import {
+  parseGraphQLRequest,
+  type ParsedGraphQLRequest,
+} from '../../../graphql/parse-graphql-request'
 
 test('returns true given a GraphQL-compatible request', async () => {
   const getRequest = new Request(
diff --git a/src/core/handlers/GraphQLHandler.test.ts b/src/graphql/graphql-handler.test.ts
similarity index 98%
rename from src/core/handlers/GraphQLHandler.test.ts
rename to src/graphql/graphql-handler.test.ts
index ba865d7ad..6054285c6 100644
--- a/src/core/handlers/GraphQLHandler.test.ts
+++ b/src/graphql/graphql-handler.test.ts
@@ -1,13 +1,14 @@
 // @vitest-environment jsdom
 import { createRequestId, encodeBuffer } from '@mswjs/interceptors'
 import { OperationTypeNode, parse } from 'graphql'
-import type {
-  GraphQLRequestBody,
-  GraphQLResolverExtras,
-} from './GraphQLHandler'
-import { GraphQLHandler, isDocumentNode } from './GraphQLHandler'
-import { HttpResponse } from '../HttpResponse'
-import type { ResponseResolver } from './RequestHandler'
+import {
+  isDocumentNode,
+  GraphQLHandler,
+  type GraphQLRequestBody,
+  type GraphQLResolverExtras,
+} from './graphql-handler'
+import { HttpResponse } from '../core/HttpResponse'
+import type { ResponseResolver } from '../core/handlers/RequestHandler'
 
 const resolver: ResponseResolver<GraphQLResolverExtras<{ userId: string }>> = ({
   variables,
diff --git a/src/core/handlers/GraphQLHandler.ts b/src/graphql/graphql-handler.ts
similarity index 93%
rename from src/core/handlers/GraphQLHandler.ts
rename to src/graphql/graphql-handler.ts
index bc0ed1cfb..a8c192a3e 100644
--- a/src/core/handlers/GraphQLHandler.ts
+++ b/src/graphql/graphql-handler.ts
@@ -12,29 +12,29 @@ import {
   type RequestHandlerExecutionResult,
   type RequestHandlerOptions,
   type ResponseResolver,
-} from './RequestHandler'
-import { getTimestamp } from '../utils/logging/getTimestamp'
-import { getStatusCodeColor } from '../utils/logging/getStatusCodeColor'
-import { serializeRequest } from '../utils/logging/serializeRequest'
-import { serializeResponse } from '../utils/logging/serializeResponse'
+} from '#core/handlers/RequestHandler'
+import { getTimestamp } from '#core/utils/logging/getTimestamp'
+import { getStatusCodeColor } from '#core/utils/logging/getStatusCodeColor'
+import { serializeRequest } from '#core/utils/logging/serializeRequest'
+import { serializeResponse } from '#core/utils/logging/serializeResponse'
 import {
-  type Match,
   matchRequestUrl,
+  type Match,
   type Path,
-} from '../utils/matching/matchRequestUrl'
+} from '#core/utils/matching/matchRequestUrl'
 import {
-  type ParsedGraphQLRequest,
-  type GraphQLMultipartRequestBody,
   parseGraphQLRequest,
   parseDocumentNode,
+  type ParsedGraphQLRequest,
+  type GraphQLMultipartRequestBody,
   type ParsedGraphQLQuery,
-} from '../utils/internal/parseGraphQLRequest'
-import { toPublicUrl } from '../utils/request/toPublicUrl'
-import { devUtils } from '../utils/internal/devUtils'
-import { getAllRequestCookies } from '../utils/request/getRequestCookies'
-import { type ResponseResolutionContext } from '../utils/executeHandlers'
-import { kDefaultContentType, type StrictRequest } from '../HttpResponse'
-import { getAllAcceptedMimeTypes } from '../utils/request/getAllAcceptedMimeTypes'
+} from './parse-graphql-request'
+import { toPublicUrl } from '#core/utils/request/toPublicUrl'
+import { devUtils } from '#core/utils/internal/devUtils'
+import { getAllRequestCookies } from '#core/utils/request/getRequestCookies'
+import { kDefaultContentType, type StrictRequest } from '#core/HttpResponse'
+import { getAllAcceptedMimeTypes } from '#core/utils/request/getAllAcceptedMimeTypes'
+import type { ResponseResolutionContext } from '#core/utils/executeHandlers'
 
 export interface DocumentTypeDecoration<
   Result = { [key: string]: any },
diff --git a/src/core/graphql.test.ts b/src/graphql/graphql.test.ts
similarity index 100%
rename from src/core/graphql.test.ts
rename to src/graphql/graphql.test.ts
diff --git a/src/core/graphql.ts b/src/graphql/graphql.ts
similarity index 95%
rename from src/core/graphql.ts
rename to src/graphql/graphql.ts
index ced990fbb..16df704f9 100644
--- a/src/core/graphql.ts
+++ b/src/graphql/graphql.ts
@@ -1,8 +1,8 @@
 import type { OperationTypeNode } from 'graphql'
-import {
-  type ResponseResolver,
-  type RequestHandlerOptions,
-} from './handlers/RequestHandler'
+import type {
+  ResponseResolver,
+  RequestHandlerOptions,
+} from '#core/handlers/RequestHandler'
 import {
   GraphQLHandler,
   type GraphQLVariables,
@@ -11,8 +11,8 @@ import {
   type GraphQLResponseBody,
   type GraphQLQuery,
   type GraphQLPredicate,
-} from './handlers/GraphQLHandler'
-import type { Path } from './utils/matching/matchRequestUrl'
+} from './graphql-handler'
+import type { Path } from '#core/utils/matching/matchRequestUrl'
 
 export type GraphQLRequestHandler = <
   Query extends GraphQLQuery = GraphQLQuery,
diff --git a/src/graphql/index.ts b/src/graphql/index.ts
new file mode 100644
index 000000000..36e71c34b
--- /dev/null
+++ b/src/graphql/index.ts
@@ -0,0 +1,20 @@
+export {
+  graphql,
+  type GraphQLRequestHandler,
+  type GraphQLOperationHandler,
+  type GraphQLResponseResolver,
+  type GraphQLLinkHandlers,
+} from './graphql'
+
+export {
+  GraphQLHandler,
+  type GraphQLQuery,
+  type GraphQLVariables,
+  type GraphQLRequestBody,
+  type GraphQLResponseBody,
+  type GraphQLJsonRequestBody,
+  type GraphQLOperationType,
+  type GraphQLCustomPredicate,
+} from './graphql-handler'
+
+export type { ParsedGraphQLRequest } from './parse-graphql-request'
diff --git a/src/core/utils/internal/parseGraphQLRequest.ts b/src/graphql/parse-graphql-request.ts
similarity index 86%
rename from src/core/utils/internal/parseGraphQLRequest.ts
rename to src/graphql/parse-graphql-request.ts
index 5c81409c6..958abfb38 100644
--- a/src/core/utils/internal/parseGraphQLRequest.ts
+++ b/src/graphql/parse-graphql-request.ts
@@ -1,13 +1,14 @@
-import type {
-  DocumentNode,
-  OperationDefinitionNode,
-  OperationTypeNode,
+import {
+  parse,
+  type DocumentNode,
+  type OperationDefinitionNode,
+  type OperationTypeNode,
 } from 'graphql'
-import type { GraphQLVariables } from '../../handlers/GraphQLHandler'
-import { toPublicUrl } from '../request/toPublicUrl'
-import { devUtils } from './devUtils'
-import { jsonParse } from './jsonParse'
-import { parseMultipartData } from './parseMultipartData'
+import type { GraphQLVariables } from './graphql-handler'
+import { toPublicUrl } from '#core/utils/request/toPublicUrl'
+import { devUtils } from '#core/utils/internal/devUtils'
+import { jsonParse } from '#core/utils/internal/jsonParse'
+import { parseMultipartData } from '#core/utils/internal/parseMultipartData'
 
 interface GraphQLInput {
   query: string | null
@@ -40,15 +41,6 @@ export function parseDocumentNode(node: DocumentNode): ParsedGraphQLQuery {
 }
 
 async function parseQuery(query: string): Promise<ParsedGraphQLQuery | Error> {
-  /**
-   * @note Use `require` to get the "graphql" module here.
-   * It has to be scoped to this function because this module leaks to the
-   * root export. It has to be `require` because tools like Jest have trouble
-   * handling dynamic imports. It gets replaced with a dynamic import on build time.
-   */
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const { parse } = require('graphql')
-
   try {
     const ast = parse(query)
     return parseDocumentNode(ast)
diff --git a/test/browser/graphql-api/anonymous-operation.mocks.ts b/test/browser/graphql-api/anonymous-operation.mocks.ts
index 48796fe35..8a3db03dd 100644
--- a/test/browser/graphql-api/anonymous-operation.mocks.ts
+++ b/test/browser/graphql-api/anonymous-operation.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const worker = setupWorker()
diff --git a/test/browser/graphql-api/anonymous-operation.test.ts b/test/browser/graphql-api/anonymous-operation.test.ts
index a28d84e46..854562fdd 100644
--- a/test/browser/graphql-api/anonymous-operation.test.ts
+++ b/test/browser/graphql-api/anonymous-operation.test.ts
@@ -6,7 +6,7 @@ import { waitFor } from '../../support/waitFor'
 declare namespace window {
   export const msw: {
     worker: import('msw/browser').SetupWorkerApi
-    graphql: typeof import('msw').graphql
+    graphql: typeof import('msw/graphql').graphql
     HttpResponse: typeof import('msw').HttpResponse
   }
 }
diff --git a/test/browser/graphql-api/cookies.mocks.ts b/test/browser/graphql-api/cookies.mocks.ts
index 7cd387da2..54df7a7a8 100644
--- a/test/browser/graphql-api/cookies.mocks.ts
+++ b/test/browser/graphql-api/cookies.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const worker = setupWorker(
diff --git a/test/browser/graphql-api/custom-predicate.mocks.ts b/test/browser/graphql-api/custom-predicate.mocks.ts
index 66779bcf8..c67732cc8 100644
--- a/test/browser/graphql-api/custom-predicate.mocks.ts
+++ b/test/browser/graphql-api/custom-predicate.mocks.ts
@@ -1,4 +1,4 @@
-import { graphql } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const worker = setupWorker()
diff --git a/test/browser/graphql-api/custom-predicate.test.ts b/test/browser/graphql-api/custom-predicate.test.ts
index 93b7040d0..988327769 100644
--- a/test/browser/graphql-api/custom-predicate.test.ts
+++ b/test/browser/graphql-api/custom-predicate.test.ts
@@ -1,5 +1,5 @@
-import type { graphql } from 'msw'
-import type { SetupWorkerApi } from 'msw/browser'
+import { graphql } from 'msw/graphql'
+import { SetupWorkerApi } from 'msw/browser'
 import { gql } from '../../support/graphql'
 import { test, expect } from '../playwright.extend'
 
diff --git a/test/browser/graphql-api/document-node.mocks.ts b/test/browser/graphql-api/document-node.mocks.ts
index 38d66056e..92dce3cc2 100644
--- a/test/browser/graphql-api/document-node.mocks.ts
+++ b/test/browser/graphql-api/document-node.mocks.ts
@@ -1,5 +1,6 @@
 import { parse } from 'graphql'
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const GetUser = parse(`
diff --git a/test/browser/graphql-api/errors.mocks.ts b/test/browser/graphql-api/errors.mocks.ts
index 18b98088a..e0f0c80df 100644
--- a/test/browser/graphql-api/errors.mocks.ts
+++ b/test/browser/graphql-api/errors.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const worker = setupWorker(
diff --git a/test/browser/graphql-api/extensions.mocks.ts b/test/browser/graphql-api/extensions.mocks.ts
index 8981bf8cb..e78e6a097 100644
--- a/test/browser/graphql-api/extensions.mocks.ts
+++ b/test/browser/graphql-api/extensions.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 interface LoginQuery {
diff --git a/test/browser/graphql-api/link.mocks.ts b/test/browser/graphql-api/link.mocks.ts
index 9e25b356e..be26f0c41 100644
--- a/test/browser/graphql-api/link.mocks.ts
+++ b/test/browser/graphql-api/link.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const github = graphql.link('https://api.github.com/graphql')
diff --git a/test/browser/graphql-api/logging.mocks.ts b/test/browser/graphql-api/logging.mocks.ts
index b24f7a270..2d54b5599 100644
--- a/test/browser/graphql-api/logging.mocks.ts
+++ b/test/browser/graphql-api/logging.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 interface GetUserDetailQuery {
diff --git a/test/browser/graphql-api/multipart-data.mocks.ts b/test/browser/graphql-api/multipart-data.mocks.ts
index 4732768e5..50e45bca5 100644
--- a/test/browser/graphql-api/multipart-data.mocks.ts
+++ b/test/browser/graphql-api/multipart-data.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const worker = setupWorker(
diff --git a/test/browser/graphql-api/mutation.mocks.ts b/test/browser/graphql-api/mutation.mocks.ts
index 1a6253433..cdde3df0f 100644
--- a/test/browser/graphql-api/mutation.mocks.ts
+++ b/test/browser/graphql-api/mutation.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 interface LogoutQuery {
diff --git a/test/browser/graphql-api/operation-reference.mocks.ts b/test/browser/graphql-api/operation-reference.mocks.ts
index a0137d52c..c4bee1f8a 100644
--- a/test/browser/graphql-api/operation-reference.mocks.ts
+++ b/test/browser/graphql-api/operation-reference.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const worker = setupWorker(
diff --git a/test/browser/graphql-api/operation.mocks.ts b/test/browser/graphql-api/operation.mocks.ts
index f5ecc0fc4..94db1b815 100644
--- a/test/browser/graphql-api/operation.mocks.ts
+++ b/test/browser/graphql-api/operation.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const worker = setupWorker(
diff --git a/test/browser/graphql-api/query.mocks.ts b/test/browser/graphql-api/query.mocks.ts
index 740a4d8f9..976570f4a 100644
--- a/test/browser/graphql-api/query.mocks.ts
+++ b/test/browser/graphql-api/query.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 interface GetUserDetailQuery {
diff --git a/test/browser/graphql-api/response-patching.mocks.ts b/test/browser/graphql-api/response-patching.mocks.ts
index 09ce40573..edbedddf6 100644
--- a/test/browser/graphql-api/response-patching.mocks.ts
+++ b/test/browser/graphql-api/response-patching.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, bypass, HttpResponse } from 'msw'
+import { bypass, HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 import { createGraphQLClient, gql } from '../../support/graphql'
 
diff --git a/test/browser/graphql-api/variables.mocks.ts b/test/browser/graphql-api/variables.mocks.ts
index cdb2176f7..379142fb6 100644
--- a/test/browser/graphql-api/variables.mocks.ts
+++ b/test/browser/graphql-api/variables.mocks.ts
@@ -1,4 +1,5 @@
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 interface GetGitHubUserQuery {
diff --git a/test/browser/msw-api/setup-worker/listHandlers.mocks.ts b/test/browser/msw-api/setup-worker/listHandlers.mocks.ts
index 9e135d161..624d4c61f 100644
--- a/test/browser/msw-api/setup-worker/listHandlers.mocks.ts
+++ b/test/browser/msw-api/setup-worker/listHandlers.mocks.ts
@@ -1,4 +1,5 @@
-import { http, graphql } from 'msw'
+import { http } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 const resolver = () => void 0
diff --git a/test/browser/setup/webpackHttpServer.ts b/test/browser/setup/webpackHttpServer.ts
index 233259103..1c225f6e4 100644
--- a/test/browser/setup/webpackHttpServer.ts
+++ b/test/browser/setup/webpackHttpServer.ts
@@ -56,13 +56,6 @@ async function startWebpackServer(): Promise<WebpackHttpServer> {
         ],
       },
       resolve: {
-        alias: {
-          'msw/browser': new URL(
-            '../../../lib/browser/index.mjs',
-            import.meta.url,
-          ).pathname,
-          msw: new URL('../../../lib/core/index.mjs', import.meta.url).pathname,
-        },
         extensions: ['.ts', '.js', '.mjs', '.cjs'],
       },
     },
diff --git a/test/node/graphql-api/anonymous-operations.test.ts b/test/node/graphql-api/anonymous-operations.test.ts
index 08c8161fc..55219acd0 100644
--- a/test/node/graphql-api/anonymous-operations.test.ts
+++ b/test/node/graphql-api/anonymous-operations.test.ts
@@ -1,6 +1,7 @@
 // @vitest-environment node
 import { HttpServer } from '@open-draft/test-server/http'
-import { HttpResponse, graphql } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { createGraphQLClient } from '../../support/graphql'
 
diff --git a/test/node/graphql-api/batched-queries.apollo.test.ts b/test/node/graphql-api/batched-queries.apollo.test.ts
index 548770468..ecc10790a 100644
--- a/test/node/graphql-api/batched-queries.apollo.test.ts
+++ b/test/node/graphql-api/batched-queries.apollo.test.ts
@@ -4,8 +4,8 @@
  * @see https://github.com/mswjs/msw/issues/510
  * @see https://www.apollographql.com/docs/router/executing-operations/query-batching
  */
-import type { RequestHandler } from 'msw'
-import { http, graphql, bypass, HttpResponse, getResponse } from 'msw'
+import { http, bypass, HttpResponse, getResponse, RequestHandler } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { HttpServer } from '@open-draft/test-server/http'
 
diff --git a/test/node/graphql-api/batched-queries.batched-execute.test.ts b/test/node/graphql-api/batched-queries.batched-execute.test.ts
index e3bf6b2e8..6e5aa1121 100644
--- a/test/node/graphql-api/batched-queries.batched-execute.test.ts
+++ b/test/node/graphql-api/batched-queries.batched-execute.test.ts
@@ -10,7 +10,8 @@ import {
   print,
   defaultFieldResolver,
 } from 'graphql'
-import { http, HttpResponse, type GraphQLVariables, bypass } from 'msw'
+import { http, HttpResponse, bypass } from 'msw'
+import { type GraphQLVariables } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { HttpServer } from '@open-draft/test-server/http'
 import { createGraphQLClient } from '../../support/graphql'
diff --git a/test/node/graphql-api/compatibility.node.test.ts b/test/node/graphql-api/compatibility.node.test.ts
index b3aad7675..07d64b112 100644
--- a/test/node/graphql-api/compatibility.node.test.ts
+++ b/test/node/graphql-api/compatibility.node.test.ts
@@ -1,6 +1,7 @@
 // @vitest-environment node
 import { graphql as executeGraphql, buildSchema } from 'graphql'
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { createGraphQLClient, gql } from '../../support/graphql'
 
diff --git a/test/node/graphql-api/content-type.test.ts b/test/node/graphql-api/content-type.test.ts
index ade9e60a9..d3b04c305 100644
--- a/test/node/graphql-api/content-type.test.ts
+++ b/test/node/graphql-api/content-type.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { createGraphQLClient } from '../../support/graphql'
 
diff --git a/test/node/graphql-api/cookies.test.ts b/test/node/graphql-api/cookies.test.ts
index 5b059f808..d7560c5d4 100644
--- a/test/node/graphql-api/cookies.test.ts
+++ b/test/node/graphql-api/cookies.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { createGraphQLClient, gql } from '../../support/graphql'
 
diff --git a/test/node/graphql-api/custom-predicate.node.test.ts b/test/node/graphql-api/custom-predicate.node.test.ts
index 5422c213e..d6b47e863 100644
--- a/test/node/graphql-api/custom-predicate.node.test.ts
+++ b/test/node/graphql-api/custom-predicate.node.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { createGraphQLClient, gql } from '../../support/graphql'
 
diff --git a/test/node/graphql-api/extensions.node.test.ts b/test/node/graphql-api/extensions.node.test.ts
index 245ae45e5..6cb65690b 100644
--- a/test/node/graphql-api/extensions.node.test.ts
+++ b/test/node/graphql-api/extensions.node.test.ts
@@ -1,6 +1,7 @@
 // @vitest-environment node
 import { buildSchema, graphql as executeGraphql } from 'graphql'
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { createGraphQLClient, gql } from '../../support/graphql'
 
diff --git a/test/node/graphql-api/response-patching.node.test.ts b/test/node/graphql-api/response-patching.node.test.ts
index ed686f23e..8a2dfe287 100644
--- a/test/node/graphql-api/response-patching.node.test.ts
+++ b/test/node/graphql-api/response-patching.node.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
-import { bypass, graphql, HttpResponse } from 'msw'
+import { bypass, HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { graphql as executeGraphql, buildSchema } from 'graphql'
 import { HttpServer } from '@open-draft/test-server/http'
diff --git a/test/node/graphql-api/typed-document-node.test.ts b/test/node/graphql-api/typed-document-node.test.ts
index b71297430..6c731ad12 100644
--- a/test/node/graphql-api/typed-document-node.test.ts
+++ b/test/node/graphql-api/typed-document-node.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import {
   gql,
diff --git a/test/node/graphql-api/typed-document-string.test.ts b/test/node/graphql-api/typed-document-string.test.ts
index 93cb6100a..5c136438a 100644
--- a/test/node/graphql-api/typed-document-string.test.ts
+++ b/test/node/graphql-api/typed-document-string.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import {
   gql,
diff --git a/test/node/msw-api/setup-server/listHandlers.node.test.ts b/test/node/msw-api/setup-server/listHandlers.node.test.ts
index 674ffbcda..5b2467a49 100644
--- a/test/node/msw-api/setup-server/listHandlers.node.test.ts
+++ b/test/node/msw-api/setup-server/listHandlers.node.test.ts
@@ -1,7 +1,6 @@
-/**
- * @vitest-environment node
- */
-import { http, graphql } from 'msw'
+// @vitest-environment node
+import { http } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 
 const resolver = () => {}
diff --git a/test/node/msw-api/setup-server/scenarios/graphql.node.test.ts b/test/node/msw-api/setup-server/scenarios/graphql.node.test.ts
index e7f31704f..73f2dd972 100644
--- a/test/node/msw-api/setup-server/scenarios/graphql.node.test.ts
+++ b/test/node/msw-api/setup-server/scenarios/graphql.node.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
-import { graphql, HttpResponse } from 'msw'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { createGraphQLClient, gql } from '../../../../support/graphql'
 
diff --git a/test/node/regressions/many-request-handlers-jsdom.test.ts b/test/node/regressions/many-request-handlers-jsdom.test.ts
index 1a46268da..643d3865d 100644
--- a/test/node/regressions/many-request-handlers-jsdom.test.ts
+++ b/test/node/regressions/many-request-handlers-jsdom.test.ts
@@ -1,6 +1,7 @@
 // @vitest-environment jsdom
 import { HttpServer } from '@open-draft/test-server/http'
-import { graphql, http, HttpResponse } from 'msw'
+import { http, HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 
 const httpServer = new HttpServer((app) => {
diff --git a/test/node/regressions/many-request-handlers.test.ts b/test/node/regressions/many-request-handlers.test.ts
index e6188c8e4..a237cedff 100644
--- a/test/node/regressions/many-request-handlers.test.ts
+++ b/test/node/regressions/many-request-handlers.test.ts
@@ -1,6 +1,7 @@
 // @vitest-environment node
 import { HttpServer } from '@open-draft/test-server/http'
-import { graphql, http, HttpResponse } from 'msw'
+import { http, HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 
 const httpServer = new HttpServer((app) => {
diff --git a/test/node/regressions/mixed-graphql-http-with-query-in-body.node.test.ts b/test/node/regressions/mixed-graphql-http-with-query-in-body.node.test.ts
index 8aadaf5c8..7e6cd61a1 100644
--- a/test/node/regressions/mixed-graphql-http-with-query-in-body.node.test.ts
+++ b/test/node/regressions/mixed-graphql-http-with-query-in-body.node.test.ts
@@ -1,7 +1,6 @@
-/**
- * @vitest-environment jsdom
- */
-import { graphql, http, HttpResponse } from 'msw'
+// @vitest-environment jsdom
+import { http, HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 
 const mswGraphql = graphql.link('https://mswjs.com/graphql')
diff --git a/test/support/alias.ts b/test/support/alias.ts
index f94103356..95ba13760 100644
--- a/test/support/alias.ts
+++ b/test/support/alias.ts
@@ -11,6 +11,7 @@ export const mswExports = {
   'msw/node': fromRoot('./lib/node/index.mjs'),
   'msw/native': fromRoot('./lib/native/index.mjs'),
   'msw/browser': fromRoot('./lib/browser/index.mjs'),
+  'msw/graphql': fromRoot('./lib/graphql/index.mjs'),
   msw: fromRoot('./lib/core/index.mjs'),
 }
 
diff --git a/test/typings/custom-handler.test-d.ts b/test/typings/custom-handler.test-d.ts
index 8f4f18aa5..9ede1e247 100644
--- a/test/typings/custom-handler.test-d.ts
+++ b/test/typings/custom-handler.test-d.ts
@@ -1,10 +1,5 @@
-import { it } from 'vitest'
-import {
-  http,
-  graphql,
-  type HttpRequestHandler,
-  type GraphQLRequestHandler,
-} from 'msw'
+import { http, HttpRequestHandler } from 'msw'
+import { type GraphQLRequestHandler, graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 import { setupServer } from 'msw/node'
 
diff --git a/test/typings/custom-resolver.test-d.ts b/test/typings/custom-resolver.test-d.ts
index 801efa16c..73226c450 100644
--- a/test/typings/custom-resolver.test-d.ts
+++ b/test/typings/custom-resolver.test-d.ts
@@ -1,16 +1,18 @@
 import { it, expectTypeOf } from 'vitest'
 import {
   http,
-  graphql,
   delay,
   HttpResponse,
   type HttpResponseResolver,
   type PathParams,
   type DefaultBodyType,
+} from 'msw'
+import {
+  graphql,
   type GraphQLQuery,
   type GraphQLVariables,
   type GraphQLResponseResolver,
-} from 'msw'
+} from 'msw/graphql'
 
 it('custom http resolver has correct parameters type', () => {
   /**
diff --git a/test/typings/graphql-custom-predicate.test-d.ts b/test/typings/graphql-custom-predicate.test-d.ts
index 13e5f802d..58bffdce5 100644
--- a/test/typings/graphql-custom-predicate.test-d.ts
+++ b/test/typings/graphql-custom-predicate.test-d.ts
@@ -3,7 +3,7 @@ import {
   type GraphQLOperationType,
   type GraphQLVariables,
   type GraphQLResponseResolver,
-} from 'msw'
+} from 'msw/graphql'
 
 const resolver: GraphQLResponseResolver<any, any> = () => void 0
 
diff --git a/test/typings/graphql-typed-document-node.test-d.ts b/test/typings/graphql-typed-document-node.test-d.ts
index 291c4705f..bc81d57f1 100644
--- a/test/typings/graphql-typed-document-node.test-d.ts
+++ b/test/typings/graphql-typed-document-node.test-d.ts
@@ -1,5 +1,6 @@
-import { graphql, HttpResponse } from 'msw'
-import { type TypedDocumentNode } from '@graphql-typed-document-node/core'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
+import { TypedDocumentNode } from '@graphql-typed-document-node/core'
 
 const GetUserQuery = {} as TypedDocumentNode<
   {
diff --git a/test/typings/graphql-typed-document-string.test-d.ts b/test/typings/graphql-typed-document-string.test-d.ts
index de81ca5d8..c46ac67aa 100644
--- a/test/typings/graphql-typed-document-string.test-d.ts
+++ b/test/typings/graphql-typed-document-string.test-d.ts
@@ -1,5 +1,6 @@
-import { graphql, HttpResponse } from 'msw'
-import type { DocumentTypeDecoration } from '@graphql-typed-document-node/core'
+import { HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
+import { DocumentTypeDecoration } from '@graphql-typed-document-node/core'
 
 declare function createTypedDocumentString<TResult = any, TVariables = any>(
   query: string,
diff --git a/test/typings/graphql.test-d.ts b/test/typings/graphql.test-d.ts
index 8663d4d75..4a986928e 100644
--- a/test/typings/graphql.test-d.ts
+++ b/test/typings/graphql.test-d.ts
@@ -1,6 +1,7 @@
 import { it, expectTypeOf } from 'vitest'
 import { parse } from 'graphql'
-import { graphql, HttpResponse, passthrough } from 'msw'
+import { HttpResponse, passthrough } from 'msw'
+import { graphql } from 'msw/graphql'
 
 it('graphql mutation can be used without variables generic type', () => {
   graphql.mutation('GetUser', () => {
diff --git a/test/typings/regressions/request-handler-type.test-d.ts b/test/typings/regressions/request-handler-type.test-d.ts
index 8fd74f5b5..171457f73 100644
--- a/test/typings/regressions/request-handler-type.test-d.ts
+++ b/test/typings/regressions/request-handler-type.test-d.ts
@@ -3,14 +3,13 @@
  */
 import {
   http,
-  graphql,
   ws,
   type HttpHandler,
   type RequestHandler,
   type AnyHandler,
   type WebSocketHandler,
-  type GraphQLHandler,
 } from 'msw'
+import { graphql, type GraphQLHandler } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 import { setupWorker } from 'msw/browser'
 
diff --git a/test/typings/setup-server.test-d.ts b/test/typings/setup-server.test-d.ts
index 7e6f58f69..71495fe5c 100644
--- a/test/typings/setup-server.test-d.ts
+++ b/test/typings/setup-server.test-d.ts
@@ -1,4 +1,5 @@
-import { http, HttpResponse, graphql } from 'msw'
+import { http, HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupServer } from 'msw/node'
 
 it('does not produce a type error when called without arguments', () => {
diff --git a/test/typings/setup-worker.test-d.ts b/test/typings/setup-worker.test-d.ts
index 8313f966a..0bd6ea259 100644
--- a/test/typings/setup-worker.test-d.ts
+++ b/test/typings/setup-worker.test-d.ts
@@ -1,4 +1,5 @@
-import { http, HttpResponse, graphql } from 'msw'
+import { http, HttpResponse } from 'msw'
+import { graphql } from 'msw/graphql'
 import { setupWorker } from 'msw/browser'
 
 it('does not produce a type error when called without arguments', () => {
diff --git a/tsup.config.ts b/tsup.config.ts
index 29bfc6d2f..e0e756444 100644
--- a/tsup.config.ts
+++ b/tsup.config.ts
@@ -7,7 +7,6 @@ import {
 } from './config/plugins/esbuild/copyWorkerPlugin'
 import { resolveCoreImportsPlugin } from './config/plugins/esbuild/resolveCoreImportsPlugin'
 import { forceEsmExtensionsPlugin } from './config/plugins/esbuild/forceEsmExtensionsPlugin'
-import { graphqlImportPlugin } from './config/plugins/esbuild/graphQLImportPlugin'
 import packageJson from './package.json'
 
 // Externalize the in-house dependencies so that the user
@@ -25,7 +24,7 @@ const SERVICE_WORKER_CHECKSUM = getWorkerChecksum()
  * This bundles the shims so CJS modules could be used
  * in the browser.
  */
-const shimConfig: Options = {
+const shimConfig = defineConfig({
   name: 'shims',
   platform: 'neutral',
   entry: glob.sync('./src/shims/**/*.ts', {
@@ -39,9 +38,9 @@ const shimConfig: Options = {
   splitting: false,
   sourcemap: false,
   dts: true,
-}
+})
 
-const coreConfig: Options = {
+const coreConfig = defineConfig({
   name: 'core',
   platform: 'neutral',
   entry: glob.sync('./src/core/**/*.ts', {
@@ -58,10 +57,28 @@ const coreConfig: Options = {
   sourcemap: true,
   dts: true,
   tsconfig: path.resolve(__dirname, 'src/tsconfig.core.build.json'),
-  esbuildPlugins: [graphqlImportPlugin(), forceEsmExtensionsPlugin()],
-}
+  esbuildPlugins: [forceEsmExtensionsPlugin()],
+})
 
-const nodeConfig: Options = {
+const graphqlConfig = defineConfig({
+  name: 'graphql',
+  platform: 'neutral',
+  entry: glob.sync('./src/graphql/**/*.ts', {
+    ignore: '**/*.test.ts',
+    posix: true,
+    dotRelative: true,
+  }),
+  external: [mswCore, ecosystemDependencies],
+  format: ['esm', 'cjs'],
+  outDir: './lib/graphql',
+  bundle: false,
+  sourcemap: true,
+  dts: true,
+  tsconfig: path.resolve(__dirname, 'src/tsconfig.core.build.json'),
+  esbuildPlugins: [resolveCoreImportsPlugin(), forceEsmExtensionsPlugin()],
+})
+
+const nodeConfig = defineConfig({
   name: 'node',
   platform: 'node',
   entry: ['./src/node/index.ts'],
@@ -75,9 +92,9 @@ const nodeConfig: Options = {
   dts: true,
   tsconfig: path.resolve(__dirname, 'src/tsconfig.node.build.json'),
   esbuildPlugins: [resolveCoreImportsPlugin(), forceEsmExtensionsPlugin()],
-}
+})
 
-const browserConfig: Options = {
+const browserConfig = defineConfig({
   name: 'browser',
   platform: 'browser',
   entry: ['./src/browser/index.ts'],
@@ -113,9 +130,9 @@ const browserConfig: Options = {
     forceEsmExtensionsPlugin(),
     copyWorkerPlugin(SERVICE_WORKER_CHECKSUM),
   ],
-}
+})
 
-const reactNativeConfig: Options = {
+const reactNativeConfig = defineConfig({
   name: 'react-native',
   platform: 'node',
   entry: ['./src/native/index.ts'],
@@ -128,9 +145,9 @@ const reactNativeConfig: Options = {
   dts: true,
   tsconfig: path.resolve(__dirname, 'src/tsconfig.node.build.json'),
   esbuildPlugins: [resolveCoreImportsPlugin(), forceEsmExtensionsPlugin()],
-}
+})
 
-const iifeConfig: Options = {
+const iifeConfig = defineConfig({
   name: 'iife',
   platform: 'browser',
   globalName: 'MockServiceWorker',
@@ -152,13 +169,14 @@ const iifeConfig: Options = {
     // the worker API must have the the integrity checksum defined.
     SERVICE_WORKER_CHECKSUM: JSON.stringify(SERVICE_WORKER_CHECKSUM),
   },
-}
+})
 
-export default defineConfig([
+export default [
   shimConfig,
   coreConfig,
   nodeConfig,
   reactNativeConfig,
   browserConfig,
   iifeConfig,
-])
+  graphqlConfig,
+]