add search to cache key

Author: codehz

example/pages/index.tsx

@@ -1,5 +1,5 @@
-import { Link, navigate, useLink } from "bun-react-ssr/router";
+import { Link } from "bun-react-ssr/router";
 
 export default function Index() {
-  return <Link href="/test">index</Link>;
+  return <Link href="/test?test">index</Link>;
 }

hydrate.tsx

@@ -1,8 +1,8 @@
 import { Suspense } from "react";
 import { hydrateRoot } from "react-dom/client";
 import { RouterHost } from "./router";
-import { ServerSideProps } from "./types";
 import { getRouteMatcher } from "./router/utils/get-route-matcher";
+import { ServerSideProps } from "./types";
 
 const globalX = globalThis as unknown as {
   __PAGES_DIR__: string;
@@ -16,7 +16,7 @@ const match = getRouteMatcher(globalX.__ROUTES__);
 export async function hydrate(
   Shell: React.ComponentType<{ children: React.ReactElement } & ServerSideProps>
 ) {
-  const matched = match(globalX.__INITIAL_ROUTE__)!;
+  const matched = match(globalX.__INITIAL_ROUTE__.split("?")[0])!;
   const Initial = await import(matched.value);
   return hydrateRoot(
     document,

index.tsx

@@ -47,7 +47,7 @@ export class StaticRouters {
       bootstrapModules?: string[];
     }
   ) {
-    const { pathname } = new URL(request.url);
+    const { pathname, search } = new URL(request.url);
     const staticResponse = await serveFromDir({
       directory: this.buildDir,
       path: pathname,
@@ -92,7 +92,7 @@ export class StaticRouters {
         bootstrapScriptContent: [
           preloadScript,
           `__PAGES_DIR__=${JSON.stringify(this.pageDir)}`,
-          `__INITIAL_ROUTE__=${JSON.stringify(serverSide.pathname)}`,
+          `__INITIAL_ROUTE__=${JSON.stringify(serverSide.pathname + search)}`,
           `__ROUTES__=${this.#routes_dump}`,
           `__SERVERSIDE_PROPS__=${stringified}`,
         ]

router/index.tsx

@@ -48,7 +48,7 @@ export const RouterHost = ({
   Shell: React.ComponentType<{ children: React.ReactElement }>;
 }) => {
   const pathname = useLocationProperty(
-    () => location.pathname,
+    () => location.pathname + location.search,
     () => globalX.__INITIAL_ROUTE__
   );
   const [current, setCurrent] = useState(children);
@@ -58,7 +58,7 @@ export const RouterHost = ({
       (async () => {
         const currentVersion = ++version.current;
         const [module, props] = await Promise.all([
-          import(match(pathname)!.value),
+          import(match(pathname.split("?")[0])!.value),
           cachedFetchServerSideProps(pathname),
         ]);
         if (currentVersion === version.current) {