vike-lite 1.0.16 → 1.0.18

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/vite.mjs

@@ -64,19 +64,17 @@ async function injectFOUCStyles(server, html) {
 	const clientEnv = server.environments.client;
 	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];
+		const url = mod.url.split("?", 1)[0] + "?direct";
 		try {
-			const result = await clientEnv.transformRequest(url + "?direct");
+			const result = await clientEnv.transformRequest(url);
 			if (result?.code) styles.add(result.code);
-		} catch {}
+		} catch (e) {}
 	}
 	if (styles.size === 0) return html;
+	const cssContent = Array.from(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";
@@ -175,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 { default: render } = await onRenderClient();
+          render({ routes, errorRoute });`;
 			if (id === resolvedVirtualSetupId) return `
           import { routes, errorRoute, config } from '${virtualModuleId}';
           import { setVikeState } from 'vike-lite/__internal/server';
@@ -192,24 +189,15 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index.ts", api
 			if (id === resolvedVirtualEntryServerId) {
 				const normalizedServerEntry = path.join(viteConfigRoot, serverEntry).replaceAll("\\", "/");
 				return `import '${virtualSetupId}';
-        export * from '${normalizedServerEntry}'
-        export { default } from '${normalizedServerEntry}'`;
+          export * from '${normalizedServerEntry}';
+          export { default } from '${normalizedServerEntry}';`;
 			}
 		},
 		configureServer(server) {
 			return () => {
 				server.middlewares.use(async (req, res, next) => {
 					try {
-						const ssrEnv = server.environments.ssr;
-						const { routes, errorRoute, config } = await ssrEnv.runner.import(virtualModuleId);
-						const { setVikeState } = await ssrEnv.runner.import("vike-lite/__internal/server");
-						setVikeState({
-							routes,
-							errorRoute,
-							config
-						});
-						const absoluteServerEntry = path.join(viteConfigRoot, serverEntry);
-						const { default: app } = await ssrEnv.runner.import(absoluteServerEntry);
+						const { default: app } = await server.environments.ssr.runner.import(resolvedVirtualEntryServerId);
 						const headers = new Headers();
 						for (const [key, value] of Object.entries(req.headers)) {
 							if (key.startsWith(":")) continue;

package/package.json

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