@zubyjs/react 1.0.40 → 1.0.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zubyjs/react",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "description": "Zuby.js JsxProvider for react",
   "type": "module",
   "main": "index.js",

package/router.js

@@ -2,8 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Router as WouterRouter, Route as WouterRoute, Switch as WouterSwitch } from 'wouter';
 export { useRoute, useRouter, useParams, useLocation, Link, Redirect, } from 'wouter';
 import { useParams } from 'wouter';
-import { Suspense, lazy } from 'react';
-import { createElement } from 'react';
+import { createElement, Suspense, lazy } from 'react';
 import { useFetch } from './hooks/index.js';
 let pages;
 let apps;
@@ -44,10 +43,10 @@ export default function Router({ context }) {
 export function Page({ page, context }) {
     context.statusCode = 200;
     context.params = useParams();
-    if (typeof window !== 'undefined') {
+    if (typeof window !== 'undefined' && !context.isInitialPath) {
         context.props = useFetch(`/_props${context.url.pathname}`);
     }
-    return _jsx(page.component, { context: context });
+    return _jsx(page.component, { ...context.props, context: context });
 }
 export function Error({ error, context }) {
     context.statusCode = 404;

package/templates/entry.js

@@ -5,7 +5,9 @@ import { hydrateRoot, createRoot } from 'react-dom/client';
 import Router from '@zubyjs/react/router.js';
 import { ZubyPageContext } from 'zuby/pageContext/index.js';
 if (typeof window !== 'undefined') {
-    const pageContext = new ZubyPageContext();
+    const pageContext = new ZubyPageContext({
+        ...(globalThis?.initialPageContext || {}),
+    });
     const appElement = document.getElementById('app');
     if (appElement.hasChildNodes()) {
         hydrateRoot(appElement, _jsx(Router, { context: pageContext }));

package/templates/innerLayout.d.ts

@@ -1,3 +1,5 @@
-export default function InnerLayout({ innerHtml }: {
+import { ZubyPageContext } from 'zuby/pageContext/index.js';
+export default function InnerLayout({ innerHtml, context, }: {
     innerHtml: string;
+    context: ZubyPageContext;
 }): import("react/jsx-runtime").JSX.Element;

package/templates/innerLayout.js

@@ -1,4 +1,9 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-export default function InnerLayout({ innerHtml }) {
-    return _jsx("div", { id: "app", dangerouslySetInnerHTML: { __html: innerHtml } });
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+export default function InnerLayout({ innerHtml, context, }) {
+    return (_jsxs(_Fragment, { children: [_jsx("div", { id: "app", dangerouslySetInnerHTML: { __html: innerHtml } }), _jsx("script", { type: "text/javascript", dangerouslySetInnerHTML: {
+                    __html: `globalThis.initialPageContext=${JSON.stringify({
+                        props: context.props,
+                        initialPath: context.url.pathname,
+                    })};`,
+                } })] }));
 }