feat: support for prerendering route page

gracile-web · Jun 8, 2024 · 72b0079 · 72b0079
1 parent f1ad2cc
commit 72b0079
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 20 deletions.
diff --git a/packages/engine/src/build/static.ts b/packages/engine/src/build/static.ts
@@ -123,7 +123,7 @@ export async function renderRoutes({
 						serverMode,
 					});
 
-					const htmlString = output ? await streamToString(output) : '';
+					const htmlString = output ? await streamToString(output) : null;
 
 					const existing = renderedRoutes.find(
 						(rendered) => rendered?.name === name,
@@ -133,16 +133,18 @@ export async function renderRoutes({
 							`${c.red(`"${existing.name}" page was defined twice!`)}\n`,
 						);
 
-					renderedRoutes.push({
+					const savePrerender = routeModule.prerender || null;
+					const rendered = {
 						// NOTE:
 						// Vite's internal build-html plugin only expects *absolute* ids.
 						// See https://github.com/vitejs/vite/issues/13406#issuecomment-1801659561
-
 						absoluteId: join(root, name),
+
 						name,
 						html: htmlString,
-						savePrerender: route.prerender,
-					});
+						savePrerender,
+					} satisfies RenderedRouteDefinition;
+					renderedRoutes.push(rendered);
 				}),
 			);
 		}),

diff --git a/packages/engine/src/render/route-template.ts b/packages/engine/src/render/route-template.ts
@@ -166,7 +166,9 @@ export async function renderRouteTemplate({
 	if (
 		(serverMode === false && routeInfos.routeModule.template) ||
 		//
-		(serverMode && routeInfos.routeModule.template && mode !== 'build')
+		(serverMode &&
+			routeInfos.routeModule.template &&
+			(mode !== 'build' || routeInfos.routeModule.prerender === true))
 	) {
 		const routeOutput = await Promise.resolve(
 			routeInfos.routeModule.template?.(context),

diff --git a/packages/engine/src/routes/collect.ts b/packages/engine/src/routes/collect.ts
@@ -129,8 +129,8 @@ export async function collectRoutes(
 
 			hasParams: routeWithPatterns.hasParams,
 			pageAssets: [],
-			// NOTE: Not implemented!
-			prerender: null,
+			// NOTE: Not implemented here!
+			// prerender: null,
 		});
 	});
 

diff --git a/packages/engine/src/routes/route.ts b/packages/engine/src/routes/route.ts
@@ -175,7 +175,7 @@ export interface Route {
 	pattern: URLPattern;
 	hasParams: boolean;
 	pageAssets: string[];
-	prerender: boolean | null;
+	// prerender: boolean | null;
 }
 
 // -----------------------------------------------------------------------------

diff --git a/packages/engine/src/server/request.ts b/packages/engine/src/server/request.ts
@@ -55,7 +55,6 @@ export function createGracileMiddleware({
 		// Typing workaround
 		if (!req.url) throw Error('Incorrect url');
 		if (!req.method) throw Error('Incorrect method');
-		const nodeRequest = { ...req, url: req.url, method: req.method };
 
 		logger.info(`[${c.yellow(req.method)}] ${c.yellow(req.url)}`, {
 			timestamp: true,
@@ -71,7 +70,9 @@ export function createGracileMiddleware({
 			return next();
 
 		const requestPonyfilled = (await Promise.resolve(
-			adapter.handleNodeRequest(nodeRequest),
+			adapter.handleNodeRequest(
+				req as IncomingMessage & { url: string; method: string },
+			),
 		)) as unknown as Request;
 
 		async function renderPageFn(

diff --git a/packages/engine/src/vite/plugins/build-routes.ts b/packages/engine/src/vite/plugins/build-routes.ts
@@ -23,7 +23,11 @@ export const buildRoutes = async ({
 		serverMode,
 		root,
 	});
-	const inputList = renderedRoutes.map((input) => input.name);
+
+	const inputList = renderedRoutes
+		.filter((i) => i.html)
+		.map((input) => input.name);
+
 	return {
 		routes,
 		renderedRoutes,
@@ -64,7 +68,8 @@ export const buildRoutes = async ({
 				resolveId(id) {
 					if (id.endsWith('.html')) {
 						const input = renderedRoutes.find((i) => i.name === id);
-						return input ? input.absoluteId : null;
+
+						if (input) return input.absoluteId;
 					}
 					return null;
 				},
@@ -111,13 +116,13 @@ export const buildRoutes = async ({
 							const route = renderedRoutes.find((r) => {
 								return r.name === fileKey;
 							});
-							if (route) {
-								route.handlerAssets = collectedAssets;
-							}
+							if (route) route.handlerAssets = collectedAssets;
 
-							if (route?.savePrerender !== true)
+							if (route?.savePrerender !== true) {
 								// eslint-disable-next-line no-param-reassign, @typescript-eslint/no-dynamic-delete
 								delete bundle[fileKey];
+								if (route?.html) route.html = null;
+							}
 						}
 					}
 				},

diff --git a/packages/engine/src/vite/plugins/virtual-routes.ts b/packages/engine/src/vite/plugins/virtual-routes.ts
@@ -15,6 +15,16 @@ export function virtualRoutes({
 	const virtualModuleId = 'gracile:routes';
 	const resolvedVirtualModuleId = `\0${virtualModuleId}`;
 
+	// TODO: Remove handler when prerendering route
+	const routesWithoutPrerender = [...routes];
+	const renderedRoutesWithoutPrerender = renderedRoutes;
+	// const routesWithoutPrerender = [...routes].filter(
+	// 	([, r]) => r.prerender !== true,
+	// );
+	// const renderedRoutesWithoutPrerender = renderedRoutes.filter(
+	// 	(r) => r.savePrerender !== true,
+	// );
+
 	return [
 		{
 			name: 'gracile-server-routes',
@@ -29,11 +39,11 @@ export function virtualRoutes({
 			load(id) {
 				if (id === resolvedVirtualModuleId) {
 					return `
-const routes = new Map(${JSON.stringify([...routes], null, 2)})
+const routes = new Map(${JSON.stringify(routesWithoutPrerender, null, 2)})
 
 const routeImports = new Map(
 	[
-	  ${[...routes]
+	  ${routesWithoutPrerender
 			.map(
 				([pattern, route]) =>
 					`['${pattern}', () => import('/${route.filePath}')],`,
@@ -44,7 +54,7 @@ const routeImports = new Map(
 
 const routeAssets = new Map(${JSON.stringify(
 						[
-							...renderedRoutes.map((r) => [
+							...renderedRoutesWithoutPrerender.map((r) => [
 								`/${r.name.replace(/index\.html$/, '')}`,
 								r.handlerAssets,
 							]),