vike-lite-react 1.0.10 → 1.0.12

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

@@ -1,4 +1,4 @@
-import { t as PageContextReactContext } from "./globalContext-BIY5-Fdk.mjs";
+import { t as PageContextReactContext } from "./globalContext-6JEqyfKe.mjs";
 import { jsx } from "react/jsx-runtime";
 //#region src/hooks/PageContextProvider.tsx
 function PageContextProvider({ value, children }) {

package/dist/__internal/client/onRenderClient.mjs

@@ -1,16 +1,9 @@
-import { t as PageContextProvider } from "../../PageContextProvider-C21BRCMp.mjs";
+import { t as PageContextProvider } from "../../PageContextProvider-DfE3nMiU.mjs";
 import { Component, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
-import { matchRoute } from "vike-lite/__internal/shared";
+import { BASE_URL, matchRoute, stripBase } from "vike-lite/__internal/shared";
+import { createLinkClickHandler, createLinkPrefetchHandler, finalizeNavigation } from "vike-lite/__internal/client";
 import { jsx, jsxs } from "react/jsx-runtime";
-//#region src/__internal/shared/stripBase.ts
-function stripBase(pathname) {
-	const { BASE_URL } = import.meta.env;
-	if (BASE_URL === "/" || !pathname.startsWith(BASE_URL)) return pathname;
-	const stripped = pathname.slice(BASE_URL.length);
-	return stripped.startsWith("/") ? stripped : "/" + stripped;
-}
-//#endregion
 //#region src/__internal/client/onRenderClient.tsx
 var RootErrorBoundary = class extends Component {
 	static getDerivedStateFromError(error) {
@@ -37,19 +30,11 @@ function RouterApp(props) {
 	}, []);
 	const matchedRoute = useMemo(() => matchRoute(currentPathname, props.routes), [currentPathname, props.routes]);
 	useEffect(() => {
-		const handleLinkClick = (e) => {
-			if (!(e.target instanceof Element)) return;
-			const target = e.target.closest("a");
-			if (!target?.href || target.target === "_blank" || e.ctrlKey || e.metaKey || e.altKey || e.shiftKey) return;
-			const url = new URL(target.href);
-			if (url.origin !== globalThis.location.origin) return;
-			if (url.pathname === globalThis.location.pathname && url.search === globalThis.location.search) return;
-			e.preventDefault();
-			globalThis.history.pushState({ triggeredBy: "vike-lite" }, "", url.href);
+		const handleLinkClick = createLinkClickHandler((url) => {
 			if (!url.hash) shouldScrollToTop.current = true;
 			setCurrentUrl(url.href);
 			setCurrentPathname(stripBase(url.pathname));
-		};
+		});
 		const prefetchedModules = /* @__PURE__ */ new Set();
 		function prefetchRoute(route) {
 			const modules = [
@@ -65,19 +50,10 @@ function RouterApp(props) {
 				});
 			}
 		}
-		const handleLinkPrefetch = (e) => {
-			if (!(e.target instanceof Element)) return;
-			const target = e.target.closest("a");
-			if (!target?.href) return;
-			if (target.target && target.target !== "_self") return;
-			if (target.hasAttribute("download")) return;
-			const url = new URL(target.href);
-			if (url.origin !== globalThis.location.origin) return;
-			if (url.pathname === globalThis.location.pathname && url.search === globalThis.location.search) return;
+		const handleLinkPrefetch = createLinkPrefetchHandler((url) => {
 			const matched = matchRoute(stripBase(url.pathname), props.routes);
-			if (!matched) return;
-			prefetchRoute(matched.route);
-		};
+			if (matched) prefetchRoute(matched.route);
+		});
 		const handlePopState = () => {
 			setCurrentUrl(globalThis.location.href);
 			setCurrentPathname(stripBase(globalThis.location.pathname));
@@ -112,7 +88,7 @@ function RouterApp(props) {
 	useEffect(() => {
 		const pathname = currentPathname;
 		const isReload = reloadTick > 0;
-		if (isFirstRun.current && !isReload && globalThis.__PAGE_CONTEXT__?.urlPathname === pathname) {
+		if (!isReload && isFirstRun.current && globalThis.__PAGE_CONTEXT__?.urlPathname === pathname) {
 			isFirstRun.current = false;
 			globalThis.__PAGE_CONTEXT__.urlPathname = void 0;
 			return;
@@ -122,52 +98,41 @@ function RouterApp(props) {
 		const signal = controller.signal;
 		const urlFull = currentUrl;
 		const matched = matchedRoute;
+		const renderErrorPage = async (is404, message) => {
+			if (!props.errorRoute) return;
+			const [ErrorPageMod, ErrorLayoutMod, ErrorHeadMod] = await Promise.all([
+				props.errorRoute.Page(),
+				props.errorRoute.Layout?.() ?? null,
+				props.errorRoute.Head?.() ?? null
+			]);
+			if (signal.aborted) return;
+			setPageContext(() => ({
+				...pageContext,
+				urlOriginal: urlFull,
+				urlPathname: pathname,
+				routeParams: {},
+				is404,
+				is500: !is404,
+				errorMessage: message,
+				isClientSide: true,
+				isHydration: false
+			}));
+			setView({
+				Page: ErrorPageMod.Page ?? ErrorPageMod.default,
+				Layout: ErrorLayoutMod?.Layout ?? ErrorLayoutMod?.default ?? null,
+				Head: ErrorHeadMod?.Head ?? ErrorHeadMod?.default ?? null
+			});
+			document.title = is404 ? "Not Found" : "Server Error";
+			finalizeNavigation(shouldScrollToTop.current);
+		};
 		const loadRoute = async () => {
 			const contextOverride = pendingContextOverride.current;
 			pendingContextOverride.current = null;
-			function finalizeNavigation() {
-				if (shouldScrollToTop.current) {
-					globalThis.scrollTo(0, 0);
-					shouldScrollToTop.current = false;
-				} else if (globalThis.location.hash) requestAnimationFrame(() => {
-					try {
-						document.querySelector(decodeURIComponent(globalThis.location.hash))?.scrollIntoView();
-					} catch {}
-				});
-			}
-			const renderErrorPage = async (is404, message) => {
-				if (!props.errorRoute) return;
-				const [ErrorPageMod, ErrorLayoutMod, ErrorHeadMod] = await Promise.all([
-					props.errorRoute.Page(),
-					props.errorRoute.Layout?.() ?? null,
-					props.errorRoute.Head?.() ?? null
-				]);
-				if (signal.aborted) return;
-				setPageContext(() => ({
-					urlOriginal: urlFull,
-					urlPathname: pathname,
-					routeParams: {},
-					is404,
-					is500: !is404,
-					errorMessage: message,
-					isClientSide: true,
-					isHydration: false
-				}));
-				setView({
-					Page: ErrorPageMod.Page ?? ErrorPageMod.default,
-					Layout: ErrorLayoutMod?.Layout ?? ErrorLayoutMod?.default ?? null,
-					Head: ErrorHeadMod?.Head ?? ErrorHeadMod?.default ?? null
-				});
-				document.title = is404 ? "Not Found" : "Server Error";
-				finalizeNavigation();
-			};
 			if (!matched) return renderErrorPage(true);
 			const { route, routeParams } = matched;
 			try {
 				const urlObj = new URL(urlFull);
-				const jsonTarget = pathname === "/" ? "/index" : pathname;
-				const { BASE_URL } = import.meta.env;
-				const jsonUrl = `${BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL}${jsonTarget}.pageContext.json${urlObj.search}`;
+				const jsonUrl = `${BASE_URL}${pathname === "/" ? "/index" : pathname}.pageContext.json${urlObj.search}`;
 				let ctx = null;
 				if (route.data || route.title) {
 					const res = await fetch(jsonUrl, {
@@ -219,7 +184,7 @@ function RouterApp(props) {
 					if (globalThis.location.hash) return;
 					document.querySelector("#root")?.focus({ preventScroll: true });
 				});
-				finalizeNavigation();
+				finalizeNavigation(shouldScrollToTop.current);
 			} catch (error) {
 				if (error.name === "AbortError") return;
 				const message = error.message || "";

package/dist/__internal/server/onRenderHtml.mjs

@@ -1,4 +1,4 @@
-import { t as PageContextProvider } from "../../PageContextProvider-C21BRCMp.mjs";
+import { t as PageContextProvider } from "../../PageContextProvider-DfE3nMiU.mjs";
 import { jsx } from "react/jsx-runtime";
 import { renderToString } from "react-dom/server";
 //#region src/__internal/server/onRenderHtml.tsx

package/dist/globalContext-6JEqyfKe.mjs

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

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import "react";
 import { PageContext, PageContextClient } from "vike-lite";
 //#region src/hooks/useData.d.ts
 declare function useData<Data = unknown>(): [Data, (updater: Data | ((prev: Data) => Data)) => void];

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as PageContextReactContext } from "./globalContext-BIY5-Fdk.mjs";
+import { t as PageContextReactContext } from "./globalContext-6JEqyfKe.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.10",
+  "version": "1.0.12",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -62,8 +62,8 @@
     "@vitejs/plugin-react": "^6.0.3",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "tsdown": "^0.22.8",
-    "vike-lite": "1.15.6",
+    "tsdown": "^0.22.9",
+    "vike-lite": "1.15.9",
     "vite": "^8.1.5"
   },
   "peerDependencies": {

package/dist/globalContext-BIY5-Fdk.mjs

@@ -1,8 +0,0 @@
-import { createContext } from "react";
-//#region src/hooks/globalContext.tsx
-const KEY = "__vike_lite_react_context__";
-const g = globalThis;
-if (!Object.hasOwn(g, KEY)) g[KEY] = createContext(null);
-const PageContextReactContext = g[KEY];
-//#endregion
-export { PageContextReactContext as t };