vike-lite 1.8.1 → 1.9.0

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,37 +20,42 @@ 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: "",
 		entryClient: withBase("@id/virtual:entry-client")
 	};
 	const cssFiles = /* @__PURE__ */ new Set();
-	const jsFiles = /* @__PURE__ */ new Set();
-	const visitedKeys = /* @__PURE__ */ new Set();
+	const jsFiles = /* @__PURE__ */ new Map();
 	const { manifest } = store;
 	function getVirtualEntryClientKey() {
 		for (const key in manifest) if (manifest[key].isEntry) return key;
 		throw new Error("entry-client not found in manifest");
 	}
-	function collectAssets(key) {
-		if (visitedKeys.has(key)) return;
-		visitedKeys.add(key);
+	function collectAssets(key, isCritical) {
 		const chunk = manifest[key];
-		jsFiles.add(chunk.file);
+		if (!chunk) return;
+		const current = jsFiles.get(chunk.file);
+		if (current === true) return;
+		if (current === false && !isCritical) return;
+		jsFiles.set(chunk.file, isCritical);
 		if (chunk.css) for (const css of chunk.css) cssFiles.add(css);
-		if (chunk.imports) for (const imp of chunk.imports) collectAssets(imp);
+		if (chunk.imports) for (const imp of chunk.imports) collectAssets(imp, false);
 	}
 	const virtualEntryClientKey = getVirtualEntryClientKey();
-	collectAssets(virtualEntryClientKey);
+	collectAssets(virtualEntryClientKey, true);
 	const { page, layout, head } = route;
-	collectAssets(page);
-	if (head) collectAssets(head);
-	if (layout) collectAssets(layout);
+	collectAssets(page, true);
+	if (head) collectAssets(head, true);
+	if (layout) collectAssets(layout, true);
+	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: [...jsFiles].map((href) => `<link rel="modulepreload" href="${withBase(href)}">`).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)
 	};
 }
@@ -91,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();
@@ -115,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,
@@ -126,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 + "/";
@@ -143,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);
@@ -155,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,
@@ -178,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/dist/vite.mjs

@@ -135,12 +135,45 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 							input: virtualEntryClientId,
 							output: {
 								format: "esm",
+								hoistTransitiveImports: false,
 								entryFileNames: "assets/[name].[hash].js",
 								chunkFileNames: (chunkInfo) => {
 									if (chunkInfo.facadeModuleId?.includes(`/${pagesDir}/`)) return "assets/pages/[name].[hash].js";
 									return "assets/chunks/[name].[hash].js";
 								},
-								assetFileNames: "assets/static/[name].[hash][extname]"
+								assetFileNames: "assets/static/[name].[hash][extname]",
+								codeSplitting: { groups: [
+									{
+										name: "framework",
+										test: /[\\/]vike-lite(?:-\w+)?[\\/]|[\\/](?:solid-js|@solidjs)[\\/]|^\0virtual:vike-lite/,
+										priority: 30
+									},
+									{
+										name: "vendor",
+										test(moduleId) {
+											if (/[\\/](node_modules|\.yarn)[\\/]/.test(moduleId)) return true;
+											return !moduleId.startsWith("\0") && !moduleId.startsWith(viteConfigRoot);
+										},
+										priority: 20,
+										minSize: 2e4
+									},
+									{
+										name(moduleId) {
+											const match = moduleId.match(new RegExp(String.raw`[\\/]${pagesDir}[\\/]([^\\/]+)[\\/]`));
+											return match ? `page-${match[1]}` : "shared";
+										},
+										test: new RegExp(String.raw`[\\/]${pagesDir}[\\/]`),
+										priority: 10
+									},
+									{
+										name(moduleId) {
+											const match = moduleId.match(new RegExp(String.raw`[\\/]${pagesDir}[\\/]([^\\/]+)[\\/]`));
+											return match ? `css-${match[1]}` : "css-shared";
+										},
+										test: /\.css$/,
+										priority: 5
+									}
+								] }
 							}
 						}
 					} },

package/package.json

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