feat: remove redirect from qdata

Author: Varixo

packages/qwik-router/src/middleware/request-handler/qdata-endpoints.ts

@@ -9,7 +9,6 @@ import { IsQData } from './user-response';
 export interface QData {
   status: number;
   href: string;
-  redirect?: string;
   isRewrite?: boolean;
 }
 
@@ -24,14 +23,12 @@ export async function qDataHandler(requestEv: RequestEvent) {
   }
 
   const status = requestEv.status();
-  const redirectLocation = requestEv.headers.get('Location');
 
   requestEv.headers.set('Content-Type', 'application/json; charset=utf-8');
 
   const qData: QData = {
     status,
     href: getPathname(requestEv.url),
-    redirect: redirectLocation ?? undefined,
     isRewrite: requestEv.sharedMap.get(RequestEvIsRewrite),
   };
 

packages/qwik-router/src/runtime/src/constants.ts

@@ -1,10 +1,7 @@
-import type { ClientPageData } from './types';
 import type { SerializationStrategy } from '@qwik.dev/core/internal';
 
 export const MODULE_CACHE = /*#__PURE__*/ new WeakMap<any, any>();
 
-export const CLIENT_DATA_CACHE = new Map<string, Promise<ClientPageData | undefined>>();
-
 export const QACTION_KEY = 'qaction';
 export const QACTION_FORMAT_KEY = 'format';
 

packages/qwik-router/src/runtime/src/qwik-router-component.tsx

@@ -30,7 +30,7 @@ import {
   type SerializationStrategy,
 } from '@qwik.dev/core/internal';
 import { clientNavigate } from './client-navigate';
-import { CLIENT_DATA_CACHE, DEFAULT_LOADERS_SERIALIZATION_STRATEGY, Q_ROUTE } from './constants';
+import { DEFAULT_LOADERS_SERIALIZATION_STRATEGY, Q_ROUTE } from './constants';
 import {
   ContentContext,
   ContentInternalContext,
@@ -555,7 +555,6 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
               }
             }
           }
-          CLIENT_DATA_CACHE.clear();
 
           const win = window as ClientSPAWindow;
           if (!win._qRouterSPA) {

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

@@ -18,6 +18,7 @@ import type {
 } from '@qwik.dev/router/middleware/request-handler';
 import type * as v from 'valibot';
 import type * as z from 'zod';
+import type { QData } from '../../middleware/request-handler/qdata-endpoints';
 import type { Q_ROUTE } from './constants';
 
 export type {
@@ -343,10 +344,9 @@ export interface ClientActionData {
   data: unknown;
 }
 
-export interface ClientPageData extends Omit<EndpointResponse, 'loadersSerializationStrategy'> {
-  href: string;
-  redirect?: string;
-  isRewrite?: boolean;
+export interface ClientPageData extends QData {
+  loaders: Record<string, unknown>;
+  action?: ClientActionData;
 }
 
 export interface LoaderData {

packages/qwik-router/src/runtime/src/use-endpoint.ts

@@ -85,10 +85,6 @@ export const loadClientData = async (
           location.href = url.href;
           return;
         }
-        if (clientData.redirect) {
-          // server function asked for redirect
-          location.href = clientData.redirect;
-        }
         return clientData;
       });
     } else {
@@ -111,8 +107,7 @@ export const loadClientData = async (
         : undefined,
       href: v?.href ?? pagePathname,
       status: v?.status ?? 200,
-      redirect: v?.redirect,
-      isRewrite: v?.isRewrite,
+      isRewrite: v?.isRewrite ?? false,
     } satisfies ClientPageData;
   });
 };