hadars 0.2.1 → 0.2.2-rc.0

package/src/utils/Head.tsx

@@ -246,14 +246,23 @@ export function useServerData<T>(key: string | string[], fn: () => Promise<T> |
             // render is registered against the same deferred before the fetch starts.
             queueMicrotask(async () => {
                 try {
-                    const res = await fetch(pathKey, {
-                        headers: { 'Accept': 'application/json' },
-                    });
-                    if (res.ok) {
-                        const json = await res.json() as { serverData: Record<string, unknown> };
-                        for (const [k, v] of Object.entries(json.serverData ?? {})) {
-                            clientServerDataCache.set(k, v);
-                        }
+                    let json: { serverData: Record<string, unknown> } | null = null;
+
+                    if ((globalThis as any).__hadarsStatic) {
+                        // Static export: the __hadarsStatic flag was embedded in the
+                        // page by `hadars export static`. Fetch the pre-generated
+                        // index.json sidecar directly — no live SSR server exists.
+                        const sidecarUrl = pathKey.replace(/\/$/, '') + '/index.json';
+                        const res = await fetch(sidecarUrl).catch(() => null);
+                        if (res?.ok) json = await res.json().catch(() => null);
+                    } else {
+                        // Live server: request the current URL with Accept: application/json.
+                        const res = await fetch(pathKey, { headers: { 'Accept': 'application/json' } });
+                        if (res.ok) json = await res.json();
+                    }
+
+                    for (const [k, v] of Object.entries(json?.serverData ?? {})) {
+                        clientServerDataCache.set(k, v);
                     }
                 } finally {
                     fetchedPaths.add(pathKey);

package/src/utils/clientScript.tsx

@@ -22,6 +22,15 @@ const getProps = () => {
 const main = async () => {
     let props = getProps();
 
+    // Extract the static-export flag before it reaches user code. When set,
+    // useServerData fetches index.json sidecars directly on client navigation
+    // instead of requesting the live SSR server with Accept: application/json.
+    if ((props as any).__hadarsStatic) {
+        (globalThis as any).__hadarsStatic = true;
+        const { __hadarsStatic: _, ...rest } = props as any;
+        props = rest;
+    }
+
     // Seed the useServerData client cache from server-resolved values before
     // hydration so that hooks return the same data on the first render.
     if (props.__serverData && typeof props.__serverData === 'object') {

package/src/utils/response.tsx

@@ -1,5 +1,5 @@
 import type React from "react";
-import type { AppHead, HadarsRequest, HadarsEntryBase, HadarsEntryModule, HadarsProps, AppContext } from "../types/hadars";
+import type { AppHead, HadarsRequest, HadarsEntryBase, HadarsEntryModule, HadarsProps, AppContext, HadarsStaticContext } from "../types/hadars";
 import { renderToString, renderPreflight, createElement } from '../slim-react/index';
 
 interface ReactResponseOptions {
@@ -10,6 +10,7 @@ interface ReactResponseOptions {
         getInitProps: HadarsEntryModule<HadarsEntryBase>['getInitProps'];
         getFinalProps: HadarsEntryModule<HadarsEntryBase>['getFinalProps'];
     }
+    staticCtx?: HadarsStaticContext;
 }
 
 // ── Head HTML serialisation ────────────────────────────────────────────────
@@ -71,7 +72,7 @@ export const getReactResponse = async (
     };
 
     let props: HadarsEntryBase = {
-        ...(getInitProps ? await getInitProps(req) : {}),
+        ...(getInitProps ? await getInitProps(req, opts.staticCtx) : {}),
         location: req.location,
         context,
     } as HadarsEntryBase;
@@ -118,7 +119,7 @@ export const getReactResponse = async (
     };
 
     const finalize = async (): Promise<{ clientProps: Record<string, unknown> }> => {
-        const { context: _, ...restProps } = getFinalProps ? await getFinalProps(props) : props;
+        const restProps = getFinalProps ? await getFinalProps(props) : props;
         const serverData: Record<string, unknown> = {};
         let hasServerData = false;
         for (const [key, entry] of unsuspend.cache) {