fix tests (doesnt work well in local)

nksaraf · Sep 25, 2023 · 416239a · 416239a
1 parent 66c07a2
commit 416239a
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 162 deletions.
diff --git a/frameworks/solid-start/index.js b/frameworks/solid-start/index.js
@@ -10,7 +10,6 @@ import solid from "vite-plugin-solid";
 
 class SolidStartFileSystemRouter extends BaseFileSystemRouter {
 	toPath(src) {
-		console.log(src);
 		const routePath = cleanPath(src, this.config)
 			// remove the initial slash
 			.slice(1)

diff --git a/frameworks/solid-start/root/routes.ts b/frameworks/solid-start/root/routes.ts
@@ -1,7 +1,5 @@
 import fileRoutes, { RouteModule } from "vinxi/routes";
 
-console.log("fileRoutes", fileRoutes);
-
 const defineRoutes = (fileRoutes: RouteModule[]) => {
 	function processRoute(routes, route, id, full) {
 		const parentRoute = Object.values(routes).find((o) => {

diff --git a/packages/vinxi-react-server/server-action.js b/packages/vinxi-react-server/server-action.js
@@ -75,8 +75,8 @@ export default eventHandler(async (event) => {
 				event.node.res.setHeader("Router", "server");
 
 				return stream;
-			} catch (x) {
-				console.log("errorr", x);
+			} catch (error) {
+				console.error("error during server action", error);
 				// We handle the error on the client
 			}
 			// Refresh the client and return the value

diff --git a/packages/vinxi/lib/app.js b/packages/vinxi/lib/app.js
@@ -23,7 +23,6 @@ export function createApp({
 				router.mode in routerSchema,
 				`Invalid router mode ${router.mode}`,
 			);
-			console.log(router);
 			const result = routerSchema[router.mode].safeParse(router);
 			if (result.success !== true) {
 				const issues = result.error.issues.map((issue) => {

diff --git a/packages/vinxi/lib/dev-server.js b/packages/vinxi/lib/dev-server.js
@@ -46,6 +46,7 @@ export async function createViteServer(config) {
  * @returns {Promise<import("vite").ViteDevServer>}
  */
 export async function createViteHandler(router, app, serveConfig) {
+	const port = await getPort({ port: 9000 + router.order * 10 });
 	const viteDevServer = await createViteServer({
 		configFile: false,
 		base: router.base,
@@ -60,7 +61,7 @@ export async function createViteHandler(router, app, serveConfig) {
 		server: {
 			middlewareMode: true,
 			hmr: {
-				port: await getPort({ port: serveConfig.ws.port + router.order }),
+				port,
 			},
 		},
 	});
@@ -84,7 +85,7 @@ export async function createDevServer(
 		port,
 		dev,
 		ws: {
-			port: wsPort ?? 8989,
+			port: wsPort,
 		},
 	};
 

diff --git a/packages/vinxi/lib/plugins/routes.js b/packages/vinxi/lib/plugins/routes.js
@@ -49,7 +49,6 @@ export function routes() {
 			) {
 				const js = jsCode();
 				const routes = await router.internals.routes?.getRoutes();
-				console.log(routes);
 
 				let routesCode = JSON.stringify(routes ?? [], (k, v) => {
 					if (!v) {

diff --git a/test/templates/react-rsc/app/actions.tsx b/test/templates/react-rsc/app/actions.tsx
@@ -2,7 +2,6 @@
 
 let store = { count: 0 };
 export function sayHello() {
-	console.log("Hello World");
 	store.count++;
 	return store.count;
 }

diff --git a/test/templates/react-rsc/app/react-server.tsx b/test/templates/react-rsc/app/react-server.tsx
@@ -6,30 +6,21 @@ import { eventHandler } from "vinxi/server";
 import App from "./app";
 
 export default eventHandler(async (event) => {
-	console.log("event", event);
 	async function loadModule(id) {
 		if (import.meta.env.DEV) {
-			console.log(import.meta.env.MANIFEST["rsc"].chunks[id].output.path);
 			return await import(
 				import.meta.env.MANIFEST["rsc"].chunks[id].output.path
 			);
 		}
 
-		console.log(id, globalThis.$$chunks);
 		if (globalThis.$$chunks[id + ".js"]) {
 			return globalThis.$$chunks[id + ".js"];
 		}
 		return await import(import.meta.env.MANIFEST["rsc"].chunks[id].output.path);
 	}
-	if (event.node.req.method === "POST") {
-		const {
-			renderToPipeableStream,
-			decodeReply,
-			decodeReplyFromBusboy,
-			decodeAction,
-		} = await import("@vinxi/react-server-dom/server");
-		console.log(event.node.req.headers);
-		const serverReference = event.node.req.headers["server-action"];
+	if (event.method === "POST") {
+		const { decodeReply } = await import("@vinxi/react-server-dom/server");
+		const serverReference = event.headers.get("server-action");
 		if (serverReference) {
 			// This is the client-side case
 			const [filepath, name] = serverReference.split("#");
@@ -42,27 +33,17 @@ export default eventHandler(async (event) => {
 			}
 
 			let args;
-			// if (req.is('multipart/form-data')) {
-			//   // Use busboy to streamingly parse the reply from form-data.
-			//   const bb = busboy({headers: req.headers});
-			//   const reply = decodeReplyFromBusboy(bb, moduleBasePath);
-			//   req.pipe(bb);
-			//   args = await reply;
-			// } else {
 			const text = await new Promise((resolve) => {
 				const requestBody = [];
 				event.node.req.on("data", (chunks) => {
-					console.log(chunks);
 					requestBody.push(chunks);
 				});
 				event.node.req.on("end", () => {
 					resolve(requestBody.join(""));
 				});
 			});
-			console.log(text);
 
 			args = await decodeReply(text);
-			console.log(args, action);
 			// }
 			const result = action.apply(null, args);
 			try {
@@ -77,15 +58,13 @@ export default eventHandler(async (event) => {
 			throw new Error("Invalid request");
 		}
 	}
-	console.log("rendering");
 	const reactServerManifest = import.meta.env.MANIFEST["rsc"];
 	const serverAssets = await reactServerManifest.inputs[
 		reactServerManifest.handler
 	].assets();
 	const clientManifest = import.meta.env.MANIFEST["client"];
 	const assets = await clientManifest.inputs[clientManifest.handler].assets();
 
-	const events = {};
 	const stream = renderToPipeableStream(
 		<App
 			assets={
@@ -97,15 +76,7 @@ export default eventHandler(async (event) => {
 		/>,
 	);
 
-	// @ts-ignore
-	stream._read = () => {};
-	// @ts-ignore
-	stream.on = (event, listener) => {
-		events[event] = listener;
-	};
-
 	event.node.res.setHeader("Content-Type", "text/x-component");
 	event.node.res.setHeader("Router", "rsc");
-
 	return stream;
 });
diff --git a/test/templates/react-rsc/app/server-action.tsx b/test/templates/react-rsc/app/server-action.tsx
@@ -6,16 +6,13 @@ import { eventHandler, sendStream } from "vinxi/server";
 // import App from "./app";
 
 export default eventHandler(async (event) => {
-	console.log("event", event);
 	async function loadModule(id) {
 		if (import.meta.env.DEV) {
-			console.log(import.meta.env.MANIFEST["rsc"].chunks[id].output.path);
 			return await import(
 				import.meta.env.MANIFEST["rsc"].chunks[id].output.path
 			);
 		}
 
-		console.log(id, globalThis.$$chunks);
 		if (globalThis.$$chunks[id + ".js"]) {
 			return globalThis.$$chunks[id + ".js"];
 		}
@@ -41,42 +38,24 @@ export default eventHandler(async (event) => {
 			}
 
 			let args;
-			// if (req.is('multipart/form-data')) {
-			//   // Use busboy to streamingly parse the reply from form-data.
-			//   const bb = busboy({headers: req.headers});
-			//   const reply = decodeReplyFromBusboy(bb, moduleBasePath);
-			//   req.pipe(bb);
-			//   args = await reply;
-			// } else {
 			const text = await new Promise((resolve) => {
 				const requestBody = [];
 				event.node.req.on("data", (chunks) => {
-					console.log(chunks);
 					requestBody.push(chunks);
 				});
 				event.node.req.on("end", () => {
 					resolve(requestBody.join(""));
 				});
 			});
-			console.log(text);
 
 			args = await decodeReply(text);
-			console.log(args, action);
-			// }
 			const result = action.apply(null, args);
 			try {
 				// Wait for any mutations
 				await result;
 				const events = {};
 				const stream = renderToPipeableStream(result);
 
-				// @ts-ignore
-				stream._read = () => {};
-				// @ts-ignore
-				stream.on = (event, listener) => {
-					events[event] = listener;
-				};
-
 				event.node.res.setHeader("Content-Type", "application/json");
 				event.node.res.setHeader("Router", "server");
 
@@ -90,35 +69,4 @@ export default eventHandler(async (event) => {
 			throw new Error("Invalid request");
 		}
 	}
-	console.log("rendering");
-	// const reactServerManifest = import.meta.env.MANIFEST["rsc"];
-	// const serverAssets = await reactServerManifest.inputs[
-	// 	reactServerManifest.handler
-	// ].assets();
-	// const clientManifest = import.meta.env.MANIFEST["client"];
-	// const assets = await clientManifest.inputs[clientManifest.handler].assets();
-
-	// const events = {};
-	// const stream = renderToPipeableStream(
-	// 	<App
-	// 		assets={
-	// 			<Suspense>
-	// 				{serverAssets.map((m) => renderAsset(m))}
-	// 				{assets.map((m) => renderAsset(m))}
-	// 			</Suspense>
-	// 		}
-	// 	/>,
-	// );
-
-	// // @ts-ignore
-	// stream._read = () => {};
-	// // @ts-ignore
-	// stream.on = (event, listener) => {
-	// 	events[event] = listener;
-	// };
-
-	// event.node.res.setHeader("Content-Type", "text/x-component");
-	// event.node.res.setHeader("Router", "rsc");
-
-	// return result;
 });
diff --git a/test/templates/react-rsc/app/server.tsx b/test/templates/react-rsc/app/server.tsx
@@ -1,16 +1,12 @@
 /// <reference types="vinxi/types/server" />
 import viteServer from "#vite-dev-server";
-import { renderAsset } from "@vinxi/react";
 import * as ReactServerDOM from "@vinxi/react-server-dom/client";
 import { createModuleLoader } from "@vinxi/react-server-dom/runtime";
-import React, { Suspense } from "react";
 import { renderToPipeableStream } from "react-dom/server";
-import { H3Event, eventHandler, fetchWithEvent } from "vinxi/server";
+import { H3Event, eventHandler, setHeader } from "vinxi/server";
 
 import { Readable, Writable } from "node:stream";
 
-import App from "./app";
-
 export default eventHandler(async (event) => {
 	globalThis.__vite__ = createModuleLoader(viteServer);
 
@@ -22,23 +18,13 @@ export default eventHandler(async (event) => {
 
 	const writableStream = new Writable({
 		write(chunk, encoding, callback) {
-			console.log("chunk", chunk);
-
 			readable.push(chunk);
 			callback();
 		},
 	});
 	writableStream.setHeader = () => {};
 
 	writableStream.on("finish", () => {
-		// parentPort?.postMessage(
-		//   JSON.stringify({
-		//     chunk: "end",
-		//     id: rest.id,
-		//   })
-		// );
-		console.log("finish");
-
 		readable.push(null);
 		readable.destroy();
 	});
@@ -49,59 +35,15 @@ export default eventHandler(async (event) => {
 
 	const clientManifest = import.meta.env.MANIFEST["client"];
 
-	const events = {};
-	console.log("element", "here");
-
 	const element = await ReactServerDOM.createFromNodeStream(readable);
 
-	console.log("element", element);
-
 	const stream = renderToPipeableStream(element, {
 		bootstrapModules: [
 			clientManifest?.inputs[clientManifest.handler].output.path,
 		].filter(Boolean) as string[],
-		bootstrapScriptContent: `
-			window.base = "${import.meta.env.BASE_URL}";`,
-		// 	{
-		// onAllReady: () => {
-		// 	events["end"]?.();
-		// },
-		// 		bootstrapModules: [
-		// 			clientManifest.inputs[clientManifest.handler].output.path,
-		// 		],
-		// 		bootstrapScriptContent: `window.manifest = ${JSON.stringify(
-		// 			await clientManifest.json(),
-		// 		)}`,
-		// 	},
+		bootstrapScriptContent: `window.base = "${import.meta.env.BASE_URL}";`,
 	});
 
-	// const clientManifest = import.meta.env.MANIFEST["client"];
-	// const assets = await clientManifest.inputs[clientManifest.handler].assets();
-	// const events = {};
-	// const stream = renderToPipeableStream(
-	// 	<App assets={<Suspense>{assets.map((m) => renderAsset(m))}</Suspense>} />,
-	// 	{
-	// 		onAllReady: () => {
-	// 			events["end"]?.();
-	// 		},
-	// 		bootstrapModules: [
-	// 			clientManifest.inputs[clientManifest.handler].output.path,
-	// 		],
-	// 		bootstrapScriptContent: `window.manifest = ${JSON.stringify(
-	// 			await clientManifest.json(),
-	// 		)}`,
-	// 	},
-	// );
-
-	// @ts-ignore
-	stream.on = (event, listener) => {
-		console.log("on", "event", event);
-
-		events[event] = listener;
-	};
-
-	console.log("render");
-
-	event.node.res.setHeader("Content-Type", "text/html");
+	setHeader(event, "Content-Type", "text/html");
 	return stream;
 });
diff --git a/test/templates/react-rsc/index.ts b/test/templates/react-rsc/index.ts
@@ -1,7 +1,6 @@
 import { eventHandler, toWebRequest } from "vinxi/server";
 
 export default eventHandler((event) => {
-	console.log(toWebRequest(event));
 	return new Response(
 		`
     <!DOCTYPE html>

diff --git a/test/templates/react-ssr-fs/app/server.tsx b/test/templates/react-ssr-fs/app/server.tsx
@@ -12,17 +12,13 @@ export default eventHandler(async (event) => {
 	const clientManifest = import.meta.env.MANIFEST["client"];
 	const serverManifest = import.meta.env.MANIFEST["ssr"];
 
-	console.log(fileRoutes);
-
 	const routes = fileRoutes.map((route) => {
 		return {
 			...route,
 			component: lazyRoute(route.$component, clientManifest, serverManifest),
 		};
 	});
 
-	console.log(routes);
-
 	const assets = await clientManifest.inputs[clientManifest.handler].assets();
 	const events = {};