tidy up before tests

Author: omerman

packages/qwik-city/src/buildtime/vite/dev-server.ts

@@ -18,6 +18,7 @@ import { matchRoute } from '../../runtime/src/route-matcher';
 import { getMenuLoader } from '../../runtime/src/routing';
 import type {
   ActionInternal,
+  ApplyRewriteInternal,
   ContentMenu,
   LoadedRoute,
   LoaderInternal,
@@ -227,7 +228,7 @@ export function ssrDevMiddleware(ctx: BuildContext, server: ViteDevServer) {
             await server.ssrLoadModule('@qwik-serializer');
           const qwikSerializer = { _deserializeData, _serializeData, _verifySerializable };
 
-          const applyRewrite = async (url: URL) => {
+          const applyRewrite: ApplyRewriteInternal = async (url: URL) => {
             const { serverPlugins, loadedRoute } = await resolveRoute(routeModulePaths, url);
             const requestHandlers = resolveRequestHandlers(
               serverPlugins,

packages/qwik-city/src/middleware/request-handler/request-handler.ts

@@ -1,6 +1,6 @@
 import type { Render } from '@builder.io/qwik/server';
 import { loadRoute } from '../../runtime/src/routing';
-import type { QwikCityPlan } from '../../runtime/src/types';
+import type { ApplyRewriteInternal, QwikCityPlan } from '../../runtime/src/types';
 import { renderQwikMiddleware, resolveRequestHandlers } from './resolve-request-handlers';
 import type { QwikSerializer, ServerRenderOptions, ServerRequestEvent } from './types';
 import { getRouteMatchPathname, runQwikCity, type QwikCityRun } from './user-response';
@@ -25,12 +25,32 @@ export async function requestHandler<T = unknown>(
     checkOrigin ?? true,
     render
   );
+
   if (routeAndHandlers) {
     const [route, requestHandlers] = routeAndHandlers;
+
+    const applyRewrite: ApplyRewriteInternal = async (url: URL) => {
+      const routeAndHandlers = await loadRequestHandlers(
+        qwikCityPlan,
+        url.pathname,
+        serverRequestEv.request.method,
+        checkOrigin ?? true,
+        render
+      );
+
+      if (routeAndHandlers) {
+        const [loadedRoute, requestHandlers] = routeAndHandlers;
+        return { loadedRoute, requestHandlers };
+      } else {
+        return { loadedRoute: null, requestHandlers: [] };
+      }
+    };
+
     return runQwikCity(
       serverRequestEv,
       route,
       requestHandlers,
+      applyRewrite,
       qwikCityPlan.trailingSlash,
       qwikCityPlan.basePathname,
       qwikSerializer

packages/qwik-city/src/middleware/request-handler/user-response.ts

@@ -1,5 +1,5 @@
 import type { RequestEvent, RequestHandler } from '@builder.io/qwik-city';
-import type { LoadedRoute } from '../../runtime/src/types';
+import type { ApplyRewriteInternal, LoadedRoute } from '../../runtime/src/types';
 import { ServerError, getErrorHtml, minimalHtmlResponse } from './error-handler';
 import { AbortMessage, RedirectMessage } from './redirect-handler';
 import {
@@ -36,9 +36,7 @@ export function runQwikCity<T>(
   serverRequestEv: ServerRequestEvent<T>,
   loadedRoute: LoadedRoute | null,
   requestHandlers: RequestHandler<any>[],
-  applyRewrite: (
-    url: URL
-  ) => Promise<{ loadedRoute: LoadedRoute; requestHandlers: RequestHandler<any>[] }>,
+  applyRewrite: ApplyRewriteInternal,
   trailingSlash = true,
   basePathname = '/',
   qwikSerializer: QwikSerializer
@@ -66,9 +64,7 @@ export function runQwikCity<T>(
 
 async function runNext(
   requestEv: RequestEventInternal,
-  applyRewrite: (
-    url: URL
-  ) => Promise<{ loadedRoute: LoadedRoute; requestHandlers: RequestHandler<any>[] }>,
+  applyRewrite: ApplyRewriteInternal,
   resolve: (value: any) => void
 ) {
   async function _runNext(

packages/qwik-city/src/runtime/src/types.ts

@@ -81,6 +81,10 @@ export type RouteStateInternal = {
   scroll?: boolean;
 };
 
+export type ApplyRewriteInternal = (
+  url: URL
+) => Promise<{ loadedRoute: LoadedRoute | null; requestHandlers: RequestHandler<any>[] }>;
+
 /**
  * @param url - The URL that the user is trying to navigate to, or a number to indicate the user is
  *   trying to navigate back/forward in the application history. If it is missing, the event is sent