Merge pull request #71 from nksaraf/req-url

fix: reset req.url for vite middleware
nksaraf · Dec 30, 2023 · d086609 · d086609
2 parents 4630198 + aa08e9e
commit d086609
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/.changeset/seven-emus-help.md b/.changeset/seven-emus-help.md
@@ -0,0 +1,5 @@
+---
+"vinxi": patch
+---
+
+fix: reset req.url for vite middleware
diff --git a/packages/vinxi/lib/router-modes.js b/packages/vinxi/lib/router-modes.js
@@ -142,9 +142,25 @@ const routerModes = {
 			},
 			handler: async (router, app, serveConfig) => {
 				const { createViteHandler } = await import("./dev-server.js");
+				const { joinURL } = await import("ufo");
 				const { fromNodeMiddleware, eventHandler } = await import("h3");
 				const viteDevServer = await createViteHandler(router, app, serveConfig);
 
+				viteDevServer.middlewares.stack.unshift({
+					route: "",
+					handle: async (req, res, next) => {
+						// console.log(req.url, req.originalURL)
+						req.__preViteUrl = req.url;
+						req.url = joinURL(
+							app.config.server.baseURL ?? "",
+							router.base,
+							req.url,
+						);
+						await next();
+						req.url = req.__preViteUrl;
+					},
+				});
+
 				return {
 					route: router.base,
 					handler: eventHandler({
@@ -203,7 +219,9 @@ const routerModes = {
 				return await ROUTER_MODE_DEV_PLUGINS.handler(router);
 			},
 			handler: async (router, app, serveConfig) => {
-				const { eventHandler } = await import("../runtime/server.js");
+				const { eventHandler, fromNodeMiddleware } = await import(
+					"../runtime/server.js"
+				);
 				if (router.mode === "handler" && router.worker && isMainThread) {
 					if (!router.internals.appWorker) {
 						const { AppWorkerClient } = await import("./app-worker-client.js");
@@ -237,7 +255,13 @@ const routerModes = {
 
 				const { createViteHandler } = await import("./dev-server.js");
 				const viteServer = await createViteHandler(router, app, serveConfig);
+				const viteHandler = fromNodeMiddleware(viteServer.middlewares);
+
 				const handler = eventHandler(async (event) => {
+					await viteHandler(event);
+					if (event.handled) {
+						return;
+					}
 					const { default: handler } = await viteServer.ssrLoadModule(
 						handlerModule(router),
 					);
@@ -304,9 +328,24 @@ const routerModes = {
 					fromNodeMiddleware,
 					getRequestURL,
 				} = await import("../runtime/server.js");
-
+				const { joinURL } = await import("ufo");
 				const viteDevServer = await createViteHandler(router, app, serveConfig);
 
+				viteDevServer.middlewares.stack.unshift({
+					route: "",
+					handle: async (req, res, next) => {
+						// console.log(req.url, req.originalURL)
+						req.__preViteUrl = req.url;
+						req.url = joinURL(
+							app.config.server.baseURL ?? "",
+							router.base,
+							req.url,
+						);
+						await next();
+						req.url = req.__preViteUrl;
+					},
+				});
+
 				if (router.handler.endsWith(".html")) {
 					return [
 						{