@taujs/react 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -56,31 +56,35 @@ type StreamOptions = {
     /** Whether to use cork/uncork for batched writes (default: true) */
     useCork?: boolean;
 };
-type HeadContext<T extends Record<string, unknown> = Record<string, unknown>> = {
+type HeadContext<T extends Record<string, unknown> = Record<string, unknown>, R = unknown> = {
     data: T;
     meta: Record<string, unknown>;
+    routeContext?: R;
 };
 type SSRResult = {
     headContent: string;
     appHtml: string;
     aborted: boolean;
 };
-type StreamCallOptions = StreamOptions & {
+type StreamCallOptions<R> = StreamOptions & {
     logger?: LoggerLike;
+    routeContext?: R;
 };
-declare function createRenderer<T extends Record<string, unknown>>({ appComponent, headContent, streamOptions, logger, enableDebug, }: {
+declare function createRenderer<T extends Record<string, unknown> = Record<string, unknown>, R = unknown>({ appComponent, headContent, streamOptions, logger, enableDebug, }: {
     appComponent: (props: {
         location: string;
+        routeContext?: R;
     }) => React.ReactElement;
-    headContent: (ctx: HeadContext<T>) => string;
+    headContent: (ctx: HeadContext<T, R>) => string;
     enableDebug?: boolean;
     logger?: LoggerLike;
     streamOptions?: StreamOptions;
 }): {
     renderSSR: (initialData: T, location: string, meta?: Record<string, unknown>, signal?: AbortSignal, opts?: {
         logger?: LoggerLike;
+        routeContext?: R;
     }) => Promise<SSRResult>;
-    renderStream: (writable: Writable, callbacks: RenderCallbacks<T> | undefined, initialData: T | Promise<T> | (() => Promise<T>), location: string, bootstrapModules?: string, meta?: Record<string, unknown>, cspNonce?: string, signal?: AbortSignal, opts?: StreamCallOptions) => {
+    renderStream: (writable: Writable, callbacks: RenderCallbacks<T> | undefined, initialData: T | Promise<T> | (() => Promise<T>), location: string, bootstrapModules?: string, meta?: Record<string, unknown>, cspNonce?: string, signal?: AbortSignal, opts?: StreamCallOptions<R>) => {
         abort: () => void;
         done: Promise<void>;
     };

package/dist/index.js

@@ -157,10 +157,13 @@ function hydrateApp({
   onSuccess
 }) {
   const { log, warn, error } = createUILogger(logger, { debugCategory: "ssr", context: { scope: "react-hydration" }, enableDebug });
-  const mountCSR = (rootEl) => {
+  const mountCSR = (rootEl, initialData) => {
     rootEl.innerHTML = "";
+    const store = createSSRStore(initialData);
     const root = createRoot(rootEl);
-    root.render(/* @__PURE__ */ jsx2(React2.StrictMode, { children: appComponent }));
+    root.render(
+      /* @__PURE__ */ jsx2(React2.StrictMode, { children: /* @__PURE__ */ jsx2(SSRStoreProvider, { store, children: appComponent }) })
+    );
   };
   const startHydration = (rootEl, initialData) => {
     if (enableDebug) log("Hydration started");
@@ -193,8 +196,9 @@ function hydrateApp({
     }
     const data = window[dataKey];
     if (data === void 0) {
+      const data2 = {};
       if (enableDebug) warn(`No initial SSR data at window["${dataKey}"]. Mounting CSR.`);
-      mountCSR(rootEl);
+      mountCSR(rootEl, data2);
       return;
     }
     startHydration(rootEl, data);
@@ -374,11 +378,12 @@ function createRenderer({
     let aborted = false;
     const onAbort = () => aborted = true;
     signal?.addEventListener("abort", onAbort, { once: true });
+    const routeContext = opts?.routeContext;
     try {
       log("Starting SSR:", location);
-      const dynamicHead = headContent({ data: initialData, meta });
+      const dynamicHead = headContent({ data: initialData, meta, routeContext });
       const store = createSSRStore(initialData);
-      const html = renderToString(/* @__PURE__ */ jsx3(SSRStoreProvider, { store, children: appComponent({ location }) }));
+      const html = renderToString(/* @__PURE__ */ jsx3(SSRStoreProvider, { store, children: appComponent({ location, routeContext }) }));
       if (aborted) {
         warn("SSR completed after client abort", { location });
         return { headContent: "", appHtml: "", aborted: true };
@@ -405,6 +410,7 @@ function createRenderer({
       context: { scope: "react-streaming" },
       enableDebug
     });
+    const routeContext = opts?.routeContext;
     const effectiveShellTimeout = opts?.shellTimeoutMs ?? shellTimeoutMs;
     const effectiveUseCork = opts?.useCork ?? useCork;
     const controller = createStreamController(writable, { log, warn, error });
@@ -443,7 +449,7 @@ function createRenderer({
     log("Starting stream:", location);
     try {
       const store = createSSRStore(initialData);
-      const appElement = /* @__PURE__ */ jsx3(SSRStoreProvider, { store, children: appComponent({ location }) });
+      const appElement = /* @__PURE__ */ jsx3(SSRStoreProvider, { store, children: appComponent({ location, routeContext }) });
       const stream = renderToPipeableStream(appElement, {
         nonce: cspNonce,
         bootstrapModules: bootstrapModules ? [bootstrapModules] : void 0,
@@ -464,7 +470,7 @@ function createRenderer({
                 });
               }
             }
-            const head = headContent({ data: headData ?? {}, meta });
+            const head = headContent({ data: headData ?? {}, meta, routeContext });
             const canCork = effectiveUseCork && typeof writable.cork === "function" && typeof writable.uncork === "function";
             if (canCork)
               try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/react",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "taujs | τjs",
   "author": "Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",