vike-lite 1.8.2 → 1.9.1

package/dist/__internal/server.d.mts

@@ -1,4 +1,4 @@
-import { t as Config } from "../index-Dt5n1zWh.mjs";
+import { t as Config } from "../index-ZDN-jKX_.mjs";
 
 //#region src/server/store.d.ts
 interface VikeState {

package/dist/__internal/shared.d.mts

@@ -1,2 +1,2 @@
-import { n as RenderContext, r as matchRoute, t as Config } from "../index-Dt5n1zWh.mjs";
+import { n as RenderContext, r as matchRoute, t as Config } from "../index-ZDN-jKX_.mjs";
 export { Config, RenderContext, matchRoute };

package/dist/client/router.mjs

@@ -10,8 +10,7 @@ function navigate(url, options) {
 	let finalUrl = url;
 	if (finalUrl.startsWith("/")) finalUrl = (BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL) + (finalUrl === "/" ? "" : finalUrl);
 	globalThis.history.pushState(null, "", finalUrl);
-	globalThis.dispatchEvent(new Event("popstate"));
-	if (!options?.keepScrollPosition) globalThis.scrollTo(0, 0);
+	globalThis.dispatchEvent(new CustomEvent("vike-navigate", { detail: { keepScrollPosition: options?.keepScrollPosition } }));
 }
 //#endregion
 export { navigate };

package/dist/{index-Dt5n1zWh.d.mts → index-ZDN-jKX_.d.mts}

@@ -17,6 +17,7 @@ interface RenderContext {
     jsPreloads: string;
     entryClient: string;
   };
+  nonce?: string;
 }
 type Config = {
   onRenderHtml: () => Promise<{

package/dist/index.d.mts

@@ -5,6 +5,7 @@ type PageContext<Data = unknown> = {
   urlPathname: string;
   data?: Data;
   title?: string;
+  nonce?: string;
   is404?: boolean;
   is500?: boolean;
   errorMessage?: string;

package/dist/server.d.mts

@@ -1,4 +1,8 @@
 //#region src/server/renderPage.d.ts
-declare function renderPage(req: Request): Promise<Response>;
+declare function renderPage(req: Request, {
+  nonce
+}?: {
+  nonce?: string;
+}): Promise<Response>;
 //#endregion
 export { renderPage };

package/dist/server.mjs

@@ -20,7 +20,7 @@ const isProd = process.env.NODE_ENV === "production";
 function withBase(file) {
 	return `${BASE_URL.replace(/\/$/, "")}/${file.replace(/^\//, "")}`;
 }
-function getAssets(route) {
+function getAssets(route, nonce) {
 	if (!isProd) return {
 		cssLinks: "",
 		jsPreloads: "",
@@ -52,9 +52,10 @@ function getAssets(route) {
 	const criticalJs = [];
 	const sharedJs = [];
 	for (const [file, isCritical] of jsFiles) (isCritical ? criticalJs : sharedJs).push(file);
+	const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
 	return {
-		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="${withBase(href)}">`).join(""),
-		jsPreloads: [...criticalJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin fetchpriority="high">`), ...sharedJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin>`)].join(""),
+		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="${withBase(href)}"${nonceAttr}>`).join(""),
+		jsPreloads: [...criticalJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin fetchpriority="high"${nonceAttr}>`), ...sharedJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin${nonceAttr}>`)].join(""),
 		entryClient: withBase(manifest[virtualEntryClientKey].file)
 	};
 }
@@ -95,7 +96,7 @@ async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
 		LayoutModule
 	};
 }
-async function renderErrorPage(req, status, urlPathname, error) {
+async function renderErrorPage(req, status, urlPathname, error, nonce) {
 	if (!store.errorRoute) return new Response(status === 404 ? "Not Found" : "Internal Server Error", { status });
 	try {
 		const { default: onRenderHtml } = await store.config.onRenderHtml();
@@ -119,7 +120,8 @@ async function renderErrorPage(req, status, urlPathname, error) {
 			Head: HeadModule ? HeadModule.Head ?? HeadModule.default : void 0,
 			pageTitleTag: `<title>${status === 404 ? "Page Not Found" : "Server Error"}</title>`,
 			serializedContext: serializeContext(pageContext),
-			assets: getAssets(store.errorRoute)
+			assets: getAssets(store.errorRoute, nonce),
+			nonce
 		});
 		return new Response(html, {
 			status,
@@ -130,7 +132,7 @@ async function renderErrorPage(req, status, urlPathname, error) {
 		return new Response(status === 404 ? "Not Found" : "Internal Server Error", { status });
 	}
 }
-async function renderPage(req) {
+async function renderPage(req, { nonce } = {}) {
 	let { pathname } = new URL(req.url);
 	if (BASE_URL !== "/") {
 		const baseSlashed = BASE_URL.endsWith("/") ? BASE_URL : BASE_URL + "/";
@@ -147,7 +149,7 @@ async function renderPage(req) {
 		const resolved = await buildPageContext(targetPathname, req.url, isJsonRequest);
 		if (!resolved) {
 			if (isJsonRequest) return Response.json({ is404: true }, { status: 404 });
-			return renderErrorPage(req, 404, targetPathname);
+			return renderErrorPage(req, 404, targetPathname, nonce);
 		}
 		const { pageContext, route, PageModule, HeadModule, LayoutModule } = resolved;
 		if (isJsonRequest) return Response.json(pageContext);
@@ -159,7 +161,8 @@ async function renderPage(req) {
 			Layout: LayoutModule ? LayoutModule.Layout ?? LayoutModule.default : void 0,
 			pageTitleTag: pageContext.title ? `<title>${pageContext.title}</title>` : "",
 			serializedContext: serializeContext(pageContext),
-			assets: getAssets(route)
+			assets: getAssets(route, nonce),
+			nonce
 		});
 		return new Response(html, {
 			status: 200,
@@ -182,11 +185,11 @@ async function renderPage(req) {
 				isError: true,
 				reason: error.reason
 			}, { status: error.statusCode });
-			return renderErrorPage(req, error.statusCode, targetPathname, error.reason);
+			return renderErrorPage(req, error.statusCode, targetPathname, error.reason, nonce);
 		}
 		console.error("Render Error:", error);
 		if (isJsonRequest) return Response.json({ is500: true }, { status: 500 });
-		return renderErrorPage(req, 500, targetPathname, error);
+		return renderErrorPage(req, 500, targetPathname, error, nonce);
 	}
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.8.2",
+  "version": "1.9.1",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.mjs",