vike-lite-react 1.0.15 → 1.0.17

package/dist/{PageContextProvider-DfE3nMiU.mjs → PageContextProvider-CTiW2Vsa.mjs}

@@ -1,6 +1,6 @@
-import { t as PageContextReactContext } from "./globalContext-6JEqyfKe.mjs";
+import { t as PageContextReactContext } from "./globalContext-CuAgMUAs.mjs";
 import { jsx } from "react/jsx-runtime";
-//#region src/hooks/PageContextProvider.tsx
+//#region src/__internal/shared/PageContextProvider.tsx
 function PageContextProvider({ value, children }) {
 	return /* @__PURE__ */ jsx(PageContextReactContext.Provider, {
 		value,

package/dist/__internal/client/onRenderClient.mjs

@@ -1,8 +1,8 @@
-import { t as PageContextProvider } from "../../PageContextProvider-DfE3nMiU.mjs";
+import { t as PageContextProvider } from "../../PageContextProvider-CTiW2Vsa.mjs";
 import { Component, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
 import { matchRoute, stripBase } from "vike-lite/__internal/shared";
-import { buildPageContextJsonUrl, createLinkClickHandler, createLinkPrefetchHandler, createRoutePrefetcher, fetchPageContextJson, finalizeNavigation, loadViewModules, tryRecoverFromStaleModuleGraph } from "vike-lite/__internal/client";
+import { buildInitialClientContext, buildPageContextJsonUrl, consumeMatchingInitialContext, createLinkClickHandler, createLinkPrefetchHandler, createRoutePrefetcher, fetchPageContextJson, finalizeNavigation, loadViewModules, resolveHydrationView, tryRecoverFromStaleModuleGraph } from "vike-lite/__internal/client";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/__internal/client/onRenderClient.tsx
 var RootErrorBoundary = class extends Component {
@@ -74,9 +74,8 @@ function RouterApp(props) {
 	useEffect(() => {
 		const pathname = currentPathname;
 		const isReload = reloadTick > 0;
-		if (!isReload && isFirstRun.current && globalThis.__PAGE_CONTEXT__?.urlPathname === pathname) {
+		if (!isReload && isFirstRun.current && consumeMatchingInitialContext(pathname)) {
 			isFirstRun.current = false;
-			globalThis.__PAGE_CONTEXT__.urlPathname = void 0;
 			return;
 		}
 		isFirstRun.current = false;
@@ -101,7 +100,7 @@ function RouterApp(props) {
 			}));
 			setView(errorView);
 			document.title = is404 ? "Not Found" : "Server Error";
-			finalizeNavigation(shouldScrollToTop.current);
+			finalizeNavigation(shouldScrollToTop);
 		};
 		const loadRoute = async () => {
 			const contextOverride = pendingContextOverride.current;
@@ -148,7 +147,7 @@ function RouterApp(props) {
 					if (globalThis.location.hash) return;
 					document.querySelector("#root")?.focus({ preventScroll: true });
 				});
-				finalizeNavigation(shouldScrollToTop.current);
+				finalizeNavigation(shouldScrollToTop);
 			} catch (error) {
 				if (error.name === "AbortError") return;
 				const message = error.message || "";
@@ -181,22 +180,9 @@ function RouterApp(props) {
 }
 async function onRenderClient(clientOptions) {
 	const container = document.querySelector("#root");
-	const rawContext = globalThis.__PAGE_CONTEXT__ ?? {};
 	const isHydration = clientOptions.hydration && !!globalThis.__PAGE_CONTEXT__;
-	const initialContext = {
-		...rawContext,
-		isClientSide: true,
-		isHydration
-	};
-	let initialView = {
-		Page: null,
-		Layout: null,
-		Head: null
-	};
-	if (isHydration) {
-		const matched = matchRoute(initialContext.urlPathname ?? globalThis.location.pathname, clientOptions.routes);
-		if (matched) initialView = await loadViewModules(matched.route);
-	}
+	const initialContext = buildInitialClientContext(globalThis.__PAGE_CONTEXT__, isHydration);
+	const initialView = await resolveHydrationView(initialContext, isHydration, clientOptions.routes, clientOptions.errorRoute);
 	const app = /* @__PURE__ */ jsx(RouterApp, {
 		...clientOptions,
 		initialView,

package/dist/__internal/server/onRenderHtml.d.mts

@@ -9,6 +9,6 @@ interface ReactRenderContext extends RenderContext {
   }>;
   hydration: boolean;
 }
-declare function onRenderHtml({ pageContext, Page, Head, Layout, pageTitleTag, serializedContext, assets, hydration }: ReactRenderContext): string;
+declare function onRenderHtml({ pageContext, Page, Head, Layout, pageTitleTag, serializedContext, assets, hydration, nonce }: ReactRenderContext): string;
 //#endregion
 export { ReactRenderContext, onRenderHtml };

package/dist/__internal/server/onRenderHtml.mjs

@@ -1,9 +1,10 @@
-import { t as PageContextProvider } from "../../PageContextProvider-DfE3nMiU.mjs";
+import { t as PageContextProvider } from "../../PageContextProvider-CTiW2Vsa.mjs";
 import { jsx } from "react/jsx-runtime";
 import { renderToString } from "react-dom/server";
 //#region src/__internal/server/onRenderHtml.tsx
-function onRenderHtml({ pageContext, Page, Head, Layout, pageTitleTag, serializedContext, assets, hydration }) {
+function onRenderHtml({ pageContext, Page, Head, Layout, pageTitleTag, serializedContext, assets, hydration, nonce }) {
 	const { cssLinks, jsPreloads, entryClient } = assets;
+	const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
 	const providerValue = {
 		pageContext,
 		setPageContext: () => {}
@@ -20,14 +21,14 @@ ${Head ? renderToString(/* @__PURE__ */ jsx(PageContextProvider, {
 		value: providerValue,
 		children: /* @__PURE__ */ jsx(Head, {})
 	})) : ""}
-<script>window.__PAGE_CONTEXT__=${serializedContext}<\/script>
+<script${nonceAttr}>window.__PAGE_CONTEXT__=${serializedContext}<\/script>
 </head>
 <body>
 <div id="root" tabindex="-1">${hydration ? renderToString(/* @__PURE__ */ jsx(PageContextProvider, {
 		value: providerValue,
 		children: Layout ? /* @__PURE__ */ jsx(Layout, { children: /* @__PURE__ */ jsx(Page, {}) }) : /* @__PURE__ */ jsx(Page, {})
 	})) : ""}</div>
-<script type="module" src="${entryClient}"><\/script>
+<script type="module" src="${entryClient}"${nonceAttr}><\/script>
 </body>
 </html>`;
 }

package/dist/{globalContext-6JEqyfKe.mjs → globalContext-CuAgMUAs.mjs}

@@ -1,5 +1,5 @@
 import { createContext } from "react";
-//#region src/hooks/globalContext.tsx
+//#region src/shared/globalContext.tsx
 const KEY = Symbol.for("vike-lite-react:context");
 const PageContextReactContext = globalThis[KEY] ??= createContext(null);
 //#endregion

package/dist/index.d.mts

@@ -12,7 +12,7 @@ declare function useHydrated(): boolean;
 //#region src/hooks/useUrl.d.ts
 declare function useUrl(): URL;
 //#endregion
-//#region src/hooks/globalContext.d.ts
+//#region src/shared/globalContext.d.ts
 interface PageContextValue {
   pageContext: PageContextClient;
   setPageContext: (updater: (prev: PageContextClient) => PageContextClient) => void;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as PageContextReactContext } from "./globalContext-6JEqyfKe.mjs";
+import { t as PageContextReactContext } from "./globalContext-CuAgMUAs.mjs";
 import { useCallback, useContext, useEffect, useMemo, useState } from "react";
 //#region src/hooks/useData.tsx
 function useData() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite-react",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -56,15 +56,20 @@
     "build": "tsdown"
   },
   "devDependencies": {
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
     "@types/node": "^26.1.1",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^6.0.3",
+    "jsdom": "^29.1.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
     "tsdown": "^0.22.9",
-    "vike-lite": "1.15.13",
-    "vite": "^8.1.5"
+    "vike-lite": "1.15.15",
+    "vite": "^8.1.5",
+    "vitest": "^4.1.10"
   },
   "peerDependencies": {
     "@vitejs/plugin-react": ">=6",