vike-lite 1.0.17 → 1.0.19

package/README.md

@@ -17,18 +17,19 @@ Add Vite plugin
 
 ```ts
 // vite.config.ts
+import type { UserConfig } from 'vite'
 import vikeLite from 'vike-lite/vite'
 
 export default {
   plugins: [
     vikeLite()
   ]
-}
+} satisfies UserConfig
 ```
 
-#### Hooks
+### 🪝 Hooks
 
-### renderPage
+#### renderPage
 ```ts
 // /server/index.ts
 import { cors } from 'hono/cors'

package/dist/__internal/server.mjs

@@ -1,2 +1,2 @@
-import { n as store, t as setVikeState } from "../store-CU7IkMCz.mjs";
+import { n as store, t as setVikeState } from "../store-CfUB1COP.mjs";
 export { setVikeState, store };

package/dist/server.mjs

@@ -1,5 +1,5 @@
 import { t as matchRoute } from "./matchRoute-BONrLRYy.mjs";
-import { n as store } from "./store-CU7IkMCz.mjs";
+import { n as store } from "./store-CfUB1COP.mjs";
 //#region src/utils/serializeContext.ts
 const ESCAPE_LOOKUP = {
 	"&": String.raw`\u0026`,
@@ -34,12 +34,15 @@ function getAssets(pageModuleId) {
 	};
 	const cssFiles = /* @__PURE__ */ new Set();
 	const jsFiles = /* @__PURE__ */ new Set();
+	const visitedKeys = /* @__PURE__ */ new Set();
 	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);
 		const chunk = manifest[key];
 		if (!chunk) throw new Error(`Asset not found in manifest for key: ${key}`);
 		jsFiles.add(chunk.file);
@@ -52,7 +55,7 @@ function getAssets(pageModuleId) {
 	return {
 		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="/${href}">`).join(""),
 		jsPreloads: [...jsFiles].map((href) => `<link rel="modulepreload" href="/${href}">`).join(""),
-		entryClient: "/" + manifest[virtualEntryClientKey].file
+		entryClient: `/${manifest[virtualEntryClientKey].file}`
 	};
 }
 async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {

package/dist/{store-CU7IkMCz.mjs → store-CfUB1COP.mjs}

@@ -1,21 +1,20 @@
 //#region src/server/store.ts
 const STORE_KEY = "_vike_lite";
-const g = globalThis;
-if (!g[STORE_KEY]) g[STORE_KEY] = {
+if (!Object.hasOwn(globalThis, STORE_KEY)) globalThis[STORE_KEY] = {
 	routes: [],
 	errorRoute: null,
 	config: null,
 	manifest: void 0
 };
 const store = new Proxy({}, {
-	get: (_, prop) => g[STORE_KEY][prop],
+	get: (_, prop) => globalThis[STORE_KEY][prop],
 	set: (_, prop, value) => {
-		g[STORE_KEY][prop] = value;
+		globalThis[STORE_KEY][prop] = value;
 		return true;
 	}
 });
 function setVikeState(newState) {
-	Object.assign(g[STORE_KEY], newState);
+	Object.assign(globalThis[STORE_KEY], newState);
 }
 //#endregion
 export { store as n, setVikeState as t };

package/dist/vite.mjs

@@ -54,31 +54,27 @@ function generateRoutes(pagesAbsPath) {
 		errorRoute
 	};
 }
-const cssCache = /* @__PURE__ */ new Map();
 /**
 * Anti-FOUC: Inspect all known SSR modules, ask the client environment
 * to translate them into plain text (thanks to ?direct) and return them.
 */
 async function injectFOUCStyles(server, html) {
+	const styles = /* @__PURE__ */ new Set();
 	const ssrEnv = server.environments.ssr;
 	const clientEnv = server.environments.client;
-	const styles = /* @__PURE__ */ new Set();
-	for (const mod of ssrEnv.moduleGraph.idToModuleMap.values()) if (mod.file && /\.(css|scss|sass|less|styl|stylus)($|\?)/.test(mod.file)) {
-		let css = cssCache.get(mod.file);
-		if (!css) try {
-			const url = mod.url.split("?", 1)[0] + "?direct";
-			css = (await clientEnv.transformRequest(url))?.code ?? "";
-			cssCache.set(mod.file, css);
+	for (const mod of ssrEnv.moduleGraph.idToModuleMap.values()) {
+		if (!(mod.file && /\.(css|scss|sass|less|styl|stylus)($|\?)/.test(mod.file))) continue;
+		const url = mod.url.split("?", 1)[0] + "?direct";
+		try {
+			const result = await clientEnv.transformRequest(url);
+			if (result?.code) styles.add(result.code);
 		} catch {}
-		if (css) styles.add(css);
 	}
 	if (styles.size === 0) return html;
+	const cssContent = [...styles].join("");
 	const headEndIndex = html.lastIndexOf("</head>");
-	const bodyEndIndex = html.lastIndexOf("</body>");
-	let cssContent = "";
-	for (const s of styles) cssContent += s;
-	const inlineCss = `<style type="text/css" data-vite-dev-fouc>${cssContent}</style>`;
-	return html.slice(0, headEndIndex) + inlineCss + html.slice(headEndIndex, bodyEndIndex) + `<script type="module" data-vite-dev-fouc-cleanup>requestAnimationFrame(()=>{document.querySelectorAll('[data-vite-dev-fouc]').forEach(el=>el.remove());document.currentScript?.remove();})<\/script>` + html.slice(bodyEndIndex);
+	if (headEndIndex === -1) return html;
+	return `${html.slice(0, headEndIndex)}<style type="text/css" data-vite-dev-fouc>${cssContent}</style>${html.slice(headEndIndex)}`;
 }
 function routerPlugin({ pagesDir = "pages", serverEntry = "server/index.ts", apiPrefix = "/api" } = {}) {
 	const isProd = process.env.NODE_ENV === "production";
@@ -177,11 +173,10 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index.ts", api
 				const manifestPath = path.join(viteConfigRoot, "../dist/client/.vite/manifest.json");
 				return `export default ${fs.readFileSync(manifestPath, "utf8")}`;
 			}
-			if (id === resolvedVirtualEntryClientId) return `
-          import { routes, errorRoute } from '${virtualModuleId}';
+			if (id === resolvedVirtualEntryClientId) return `import { routes, errorRoute } from '${virtualModuleId}';
           import { onRenderClient } from '${virtualAdapterId}';
-          onRenderClient().then((module) => { module.default({ routes, errorRoute })});
-        `;
+          const render = await onRenderClient();
+          await render({ routes, errorRoute });`;
 			if (id === resolvedVirtualSetupId) return `
           import { routes, errorRoute, config } from '${virtualModuleId}';
           import { setVikeState } from 'vike-lite/__internal/server';
@@ -243,9 +238,6 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index.ts", api
 					}
 				});
 			};
-		},
-		handleHotUpdate(ctx) {
-			if (/\.(css|scss|sass|less|styl|stylus)$/.test(ctx.file)) cssCache.delete(ctx.file);
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.mjs",
@@ -43,10 +43,10 @@
     "od": "yarn outdated"
   },
   "devDependencies": {
-    "@types/node": "^26.0.0",
+    "@types/node": "^26.0.1",
     "@yarnpkg/sdks": "^3.3.0",
-    "eslint": "^10.5.0",
-    "eslint-plugin-unicorn": "^68.0.0",
+    "eslint": "^10.6.0",
+    "eslint-plugin-unicorn": "^69.0.0",
     "tsdown": "^0.22.3",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.62.0",