chore(router): don't prop-drill serdes

wmertens · wmertens · commit 609ac3da5a6a · 2025-09-02T23:15:50.000+02:00
diff --git a/packages/qwik-router/src/buildtime/vite/dev-server.ts b/packages/qwik-router/src/buildtime/vite/dev-server.ts
@@ -9,7 +9,6 @@ import {
   resolveRequestHandlers,
 } from '../../middleware/request-handler/resolve-request-handlers';
 import { getQwikRouterServerData } from '../../middleware/request-handler/response-page';
-import type { QwikSerializer } from '../../middleware/request-handler/types';
 import {
   QDATA_JSON,
   getRouteMatchPathname,
@@ -226,10 +225,6 @@ export function ssrDevMiddleware(ctx: BuildContext, server: ViteDevServer) {
           const serverRequestEv = await fromNodeHttp(url, req, res, 'dev');
           Object.assign(serverRequestEv.platform, ctx.opts.platform);
 
-          const { _deserialize, _serialize, _verifySerializable } =
-            await server.ssrLoadModule('@qwik-serializer');
-          const qwikSerializer: QwikSerializer = { _deserialize, _serialize, _verifySerializable };
-
           const rebuildRouteInfo: RebuildRouteInfoInternal = async (url: URL) => {
             const { serverPlugins, loadedRoute } = await resolveRoute(routeModulePaths, url);
             const requestHandlers = resolveRequestHandlers(
@@ -251,8 +246,7 @@ export function ssrDevMiddleware(ctx: BuildContext, server: ViteDevServer) {
             loadedRoute,
             requestHandlers,
             rebuildRouteInfo,
-            ctx.opts.basePathname,
-            qwikSerializer
+            ctx.opts.basePathname
           );
           const result = await completion;
           if (result != null) {
diff --git a/packages/qwik-router/src/buildtime/vite/plugin.ts b/packages/qwik-router/src/buildtime/vite/plugin.ts
@@ -23,7 +23,6 @@ import type {
 } from './types';
 import { validatePlugin } from './validate-plugin';
 
-const QWIK_SERIALIZER = '@qwik-serializer';
 export const QWIK_ROUTER_CONFIG_ID = '@qwik-router-config';
 const QWIK_ROUTER_ENTRIES_ID = '@qwik-router-entries';
 const QWIK_ROUTER = '@qwik.dev/router';
@@ -160,9 +159,6 @@ function qwikRouterPlugin(userOpts?: QwikRouterVitePluginOptions): any {
     },
 
     resolveId(id) {
-      if (id === QWIK_SERIALIZER) {
-        return join(rootDir!, id);
-      }
       if (id === QWIK_ROUTER_CONFIG_ID || id === QWIK_ROUTER_ENTRIES_ID) {
         return {
           id: join(rootDir!, id),
@@ -184,10 +180,6 @@ function qwikRouterPlugin(userOpts?: QwikRouterVitePluginOptions): any {
           // @qwik-router-entries
           return generateQwikRouterEntries(ctx);
         }
-        const isSerializer = id.endsWith(QWIK_SERIALIZER);
-        if (isSerializer) {
-          return `export {_deserialize, _serialize, _verifySerializable} from '@qwik.dev/core'`;
-        }
         const isRouterConfig = id.endsWith(QWIK_ROUTER_CONFIG_ID);
         const isSwRegister = id.endsWith(QWIK_ROUTER_SW_REGISTER);
         if (isRouterConfig || isSwRegister) {
diff --git a/packages/qwik-router/src/middleware/azure-swa/index.ts b/packages/qwik-router/src/middleware/azure-swa/index.ts
@@ -1,5 +1,4 @@
 import type { AzureFunction, Context, HttpRequest } from '@azure/functions';
-import { _deserialize, _serialize, _verifySerializable } from '@qwik.dev/core/internal';
 import { setServerPlatform } from '@qwik.dev/core/server';
 import type {
   ServerRenderOptions,
@@ -11,7 +10,6 @@ import {
   requestHandler,
 } from '@qwik.dev/router/middleware/request-handler';
 import { parseString } from 'set-cookie-parser';
-import type { QwikSerializer } from '../request-handler/types';
 
 // @qwik.dev/router/middleware/azure-swa
 
@@ -56,11 +54,6 @@ export function createQwikRouter(opts: QwikRouterAzureOptions): AzureFunction {
     console.warn('qwikCityPlan is deprecated. Simply remove it.');
     opts.qwikRouterConfig = opts.qwikCityPlan;
   }
-  const qwikSerializer: QwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable,
-  };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -116,7 +109,7 @@ export function createQwikRouter(opts: QwikRouterAzureOptions): AzureFunction {
       };
 
       // send request to qwik router request handler
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((err) => {
           if (err) {
diff --git a/packages/qwik-router/src/middleware/bun/index.ts b/packages/qwik-router/src/middleware/bun/index.ts
@@ -1,5 +1,4 @@
 /// <reference types="bun" />
-import { _deserialize, _serialize, _verifySerializable } from '@qwik.dev/core/internal';
 import { setServerPlatform } from '@qwik.dev/core/server';
 import type {
   ClientConn,
@@ -26,7 +25,6 @@ export function createQwikRouter(opts: QwikRouterBunOptions) {
   // still missing from bun: last check was bun version 1.1.8
   globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
 
-  const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -66,7 +64,7 @@ export function createQwikRouter(opts: QwikRouterBunOptions) {
       };
 
       // send request to qwik router request handler
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((v) => {
           if (v) {
diff --git a/packages/qwik-router/src/middleware/cloudflare-pages/index.ts b/packages/qwik-router/src/middleware/cloudflare-pages/index.ts
@@ -1,4 +1,3 @@
-import { _deserialize, _serialize, _verifySerializable } from '@qwik.dev/core/internal';
 import { setServerPlatform } from '@qwik.dev/core/server';
 import type {
   ServerRenderOptions,
@@ -27,7 +26,6 @@ export function createQwikRouter(opts: QwikRouterCloudflarePagesOptions) {
   } catch {
     globalThis.TextEncoderStream = _TextEncoderStream_polyfill;
   }
-  const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -92,7 +90,7 @@ export function createQwikRouter(opts: QwikRouterCloudflarePagesOptions) {
       };
 
       // send request to qwik router request handler
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((v) => {
           if (v) {
diff --git a/packages/qwik-router/src/middleware/deno/index.ts b/packages/qwik-router/src/middleware/deno/index.ts
@@ -1,4 +1,3 @@
-import { _deserialize, _serialize, _verifySerializable } from '@qwik.dev/core/internal';
 import { setServerPlatform } from '@qwik.dev/core/server';
 import type {
   ClientConn,
@@ -14,7 +13,6 @@ import {
 import { MIME_TYPES } from '../request-handler/mime-types';
 // @ts-ignore
 import { extname, fromFileUrl, join } from 'https://deno.land/std/path/mod.ts';
-import type { QwikSerializer } from '../request-handler/types';
 
 // @qwik.dev/router/middleware/deno
 
@@ -36,11 +34,6 @@ export function createQwikRouter(opts: QwikRouterDenoOptions) {
     console.warn('qwikCityPlan is deprecated. Simply remove it.');
     opts.qwikRouterConfig = opts.qwikCityPlan;
   }
-  const qwikSerializer: QwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable,
-  };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -80,7 +73,7 @@ export function createQwikRouter(opts: QwikRouterDenoOptions) {
       };
 
       // send request to qwik router request handler
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((v) => {
           if (v) {
diff --git a/packages/qwik-router/src/middleware/netlify-edge/index.ts b/packages/qwik-router/src/middleware/netlify-edge/index.ts
@@ -4,15 +4,13 @@ import type {
   ServerRequestEvent,
 } from '@qwik.dev/router/middleware/request-handler';
 
-import { _deserialize, _serialize, _verifySerializable } from '@qwik.dev/core/internal';
 import { setServerPlatform } from '@qwik.dev/core/server';
 import {
   getNotFound,
   isStaticPath,
   mergeHeadersCookies,
   requestHandler,
 } from '@qwik.dev/router/middleware/request-handler';
-import type { QwikSerializer } from '../request-handler/types';
 
 // @qwik.dev/router/middleware/netlify-edge
 
@@ -23,11 +21,6 @@ export function createQwikRouter(opts: QwikRouterNetlifyOptions) {
     console.warn('qwikCityPlan is deprecated. Simply remove it.');
     opts.qwikRouterConfig = opts.qwikCityPlan;
   }
-  const qwikSerializer: QwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable,
-  };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -65,7 +58,7 @@ export function createQwikRouter(opts: QwikRouterNetlifyOptions) {
       };
 
       // send request to qwik router request handler
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((v) => {
           if (v) {
diff --git a/packages/qwik-router/src/middleware/node/index.ts b/packages/qwik-router/src/middleware/node/index.ts
@@ -1,4 +1,3 @@
-import { _deserialize, _serialize, _verifySerializable } from '@qwik.dev/core/internal';
 import { setServerPlatform } from '@qwik.dev/core/server';
 import type { ClientConn, ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
 import {
@@ -12,7 +11,6 @@ import type { Http2ServerRequest } from 'node:http2';
 import { basename, extname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { MIME_TYPES } from '../request-handler/mime-types';
-import type { QwikSerializer } from '../request-handler/types';
 import { computeOrigin, fromNodeHttp, getUrl } from './http';
 
 // @qwik.dev/router/middleware/node
@@ -24,12 +22,6 @@ export function createQwikRouter(opts: QwikRouterNodeRequestOptions | QwikCityNo
     opts.qwikRouterConfig = opts.qwikCityPlan;
   }
 
-  const qwikSerializer: QwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable,
-  };
-
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -50,7 +42,7 @@ export function createQwikRouter(opts: QwikRouterNodeRequestOptions | QwikCityNo
         'server',
         opts.getClientConn
       );
-      const handled = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handled = await requestHandler(serverRequestEv, opts);
       if (handled) {
         const err = await handled.completion;
         if (err) {
diff --git a/packages/qwik-router/src/middleware/request-handler/middleware.request-handler.api.md b/packages/qwik-router/src/middleware/request-handler/middleware.request-handler.api.md
@@ -5,7 +5,6 @@
 ```ts
 
 import type { Action } from '@qwik.dev/router';
-import type { _deserialize } from '@qwik.dev/core/internal';
 import type { EnvGetter as EnvGetter_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { FailReturn } from '@qwik.dev/router';
 import type { Loader as Loader_2 } from '@qwik.dev/router';
@@ -18,9 +17,7 @@ import { RequestEvent as RequestEvent_2 } from '@qwik.dev/router/middleware/requ
 import type { RequestHandler as RequestHandler_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { ResolveSyncValue as ResolveSyncValue_2 } from '@qwik.dev/router/middleware/request-handler';
 import { SerializationStrategy } from '@qwik.dev/core/internal';
-import type { _serialize } from '@qwik.dev/core/internal';
 import type { ValueOrPromise } from '@qwik.dev/core';
-import type { _verifySerializable } from '@qwik.dev/core/internal';
 
 // @public (undocumented)
 export class AbortMessage {
@@ -171,11 +168,10 @@ export const RequestEvShareQData = "qData";
 // @public (undocumented)
 export type RequestHandler<PLATFORM = QwikRouterPlatform> = (ev: RequestEvent<PLATFORM>) => Promise<void> | void;
 
-// Warning: (ae-forgotten-export) The symbol "QwikSerializer" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "QwikRouterRun" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function requestHandler<T = unknown>(serverRequestEv: ServerRequestEvent<T>, opts: ServerRenderOptions, qwikSerializer: QwikSerializer): Promise<QwikRouterRun<T> | null>;
+export function requestHandler<T = unknown>(serverRequestEv: ServerRequestEvent<T>, opts: ServerRenderOptions): Promise<QwikRouterRun<T> | null>;
 
 // @public (undocumented)
 export interface ResolveSyncValue {
diff --git a/packages/qwik-router/src/middleware/request-handler/request-event.ts b/packages/qwik-router/src/middleware/request-handler/request-event.ts
@@ -1,5 +1,5 @@
 import type { ValueOrPromise } from '@qwik.dev/core';
-import { _UNINITIALIZED, type SerializationStrategy } from '@qwik.dev/core/internal';
+import { _deserialize, _UNINITIALIZED, type SerializationStrategy } from '@qwik.dev/core/internal';
 import { QDATA_KEY } from '../../runtime/src/constants';
 import {
   LoadedRouteProp,
@@ -23,7 +23,6 @@ import { encoder, getRouteLoaderPromise } from './resolve-request-handlers';
 import type {
   CacheControl,
   CacheControlTarget,
-  QwikSerializer,
   RequestEvent,
   RequestEventCommon,
   RequestEventLoader,
@@ -37,7 +36,6 @@ import { IsQData, QDATA_JSON, QDATA_JSON_LEN } from './user-response';
 const RequestEvLoaders = Symbol('RequestEvLoaders');
 const RequestEvMode = Symbol('RequestEvMode');
 const RequestEvRoute = Symbol('RequestEvRoute');
-export const RequestEvQwikSerializer = Symbol('RequestEvQwikSerializer');
 export const RequestEvLoaderSerializationStrategyMap = Symbol(
   'RequestEvLoaderSerializationStrategyMap'
 );
@@ -55,7 +53,6 @@ export function createRequestEvent(
   loadedRoute: LoadedRoute | null,
   requestHandlers: RequestHandler<any>[],
   basePathname: string,
-  qwikSerializer: QwikSerializer,
   resolved: (response: any) => void
 ) {
   const { request, platform, env } = serverRequestEv;
@@ -160,7 +157,6 @@ export function createRequestEvent(
     get [RequestEvRoute]() {
       return loadedRoute;
     },
-    [RequestEvQwikSerializer]: qwikSerializer,
     cookie,
     headers,
     env,
@@ -213,7 +209,7 @@ export function createRequestEvent(
         }
         if (loaders[id] === _UNINITIALIZED) {
           const isDev = getRequestMode(requestEv) === 'dev';
-          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv, isDev, qwikSerializer);
+          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv, isDev);
         }
       }
 
@@ -295,7 +291,7 @@ export function createRequestEvent(
       if (requestData !== undefined) {
         return requestData;
       }
-      return (requestData = parseRequest(requestEv, sharedMap, qwikSerializer));
+      return (requestData = parseRequest(requestEv, sharedMap));
     },
 
     json: (statusCode: number, data: any) => {
@@ -341,7 +337,6 @@ export interface RequestEventInternal extends RequestEvent, RequestEventLoader {
   [RequestEvLoaderSerializationStrategyMap]: Map<string, SerializationStrategy>;
   [RequestEvMode]: ServerRequestMode;
   [RequestEvRoute]: LoadedRoute | null;
-  [RequestEvQwikSerializer]: QwikSerializer;
 
   /**
    * Check if this request is already written to.
@@ -384,8 +379,7 @@ const ABORT_INDEX = Number.MAX_SAFE_INTEGER;
 
 const parseRequest = async (
   { request, method, query }: RequestEventInternal,
-  sharedMap: Map<string, any>,
-  qwikSerializer: QwikSerializer
+  sharedMap: Map<string, any>
 ): Promise<JSONValue | undefined> => {
   const type = request.headers.get('content-type')?.split(/[;,]/, 1)[0].trim() ?? '';
   if (type === 'application/x-www-form-urlencoded' || type === 'multipart/form-data') {
@@ -400,13 +394,13 @@ const parseRequest = async (
       const data = query.get(QDATA_KEY);
       if (data) {
         try {
-          return qwikSerializer._deserialize(decodeURIComponent(data)) as JSONValue;
+          return _deserialize(decodeURIComponent(data)) as JSONValue;
         } catch {
           //
         }
       }
     }
-    return qwikSerializer._deserialize(await request.text()) as JSONValue;
+    return _deserialize(await request.text()) as JSONValue;
   }
   return undefined;
 };
diff --git a/packages/qwik-router/src/middleware/request-handler/request-handler.ts b/packages/qwik-router/src/middleware/request-handler/request-handler.ts
@@ -2,7 +2,7 @@ import type { Render } from '@qwik.dev/core/server';
 import { loadRoute } from '../../runtime/src/routing';
 import type { QwikRouterConfig, RebuildRouteInfoInternal } from '../../runtime/src/types';
 import { renderQwikMiddleware, resolveRequestHandlers } from './resolve-request-handlers';
-import type { QwikSerializer, ServerRenderOptions, ServerRequestEvent } from './types';
+import type { ServerRenderOptions, ServerRequestEvent } from './types';
 import { getRouteMatchPathname, runQwikRouter, type QwikRouterRun } from './user-response';
 
 /**
@@ -17,8 +17,7 @@ let qwikRouterConfigActual: QwikRouterConfig;
  */
 export async function requestHandler<T = unknown>(
   serverRequestEv: ServerRequestEvent<T>,
-  opts: ServerRenderOptions,
-  qwikSerializer: QwikSerializer
+  opts: ServerRenderOptions
 ): Promise<QwikRouterRun<T> | null> {
   const { render, checkOrigin } = opts;
   let { qwikRouterConfig } = opts;
@@ -70,8 +69,7 @@ export async function requestHandler<T = unknown>(
       route,
       requestHandlers,
       rebuildRouteInfo,
-      qwikRouterConfig.basePathname,
-      qwikSerializer
+      qwikRouterConfig.basePathname
     );
   }
   return null;
diff --git a/packages/qwik-router/src/middleware/request-handler/resolve-request-handlers.ts b/packages/qwik-router/src/middleware/request-handler/resolve-request-handlers.ts
diff --git a/packages/qwik-router/src/middleware/request-handler/user-response.ts b/packages/qwik-router/src/middleware/request-handler/user-response.ts
diff --git a/packages/qwik-router/src/middleware/vercel-edge/index.ts b/packages/qwik-router/src/middleware/vercel-edge/index.ts
diff --git a/packages/qwik-router/src/ssg/worker-thread.ts b/packages/qwik-router/src/ssg/worker-thread.ts
