vite-plugin-vercel 11.0.0-beta.16 → 11.0.0-beta.18

package/dist/vite.js

@@ -543,6 +543,30 @@ function getVcConfig(pluginConfig, filename, options) {
 	});
 }
 
+//#endregion
+//#region src/utils/request.ts
+function getOriginalRequest(request) {
+	const xNowRouteMatchesHeader = request.headers.get("x-now-route-matches");
+	let newUrl = null;
+	let newRequest = request;
+	if (typeof xNowRouteMatchesHeader === "string") {
+		const originalPathBis = new URLSearchParams(xNowRouteMatchesHeader).get("1");
+		if (originalPathBis) newUrl = new URL(originalPathBis, request.url).toString();
+	}
+	if (newUrl) newRequest = new Request(newUrl, {
+		method: request.method,
+		headers: request.headers,
+		body: request.body,
+		mode: request.mode,
+		credentials: request.credentials,
+		cache: request.cache,
+		redirect: request.redirect,
+		referrer: request.referrer,
+		integrity: request.integrity
+	});
+	return newRequest;
+}
+
 //#endregion
 //#region src/plugins/loader.ts
 const re_DUMMY = new RegExp(`__DUMMY__$`);
@@ -584,8 +608,15 @@ function loaderPlugin(pluginConfig) {
 				async handler(id) {
 					const mod = id.replace(re_edge, "");
 					return `import mod from ${JSON.stringify(mod)};
-const def = mod.fetch;
-export default def;`;
+
+${getOriginalRequest.toString()}
+
+const fn = (...args) => {
+  Object.assign(args[0], getOriginalRequest(request));
+  return mod.fetch(...args);
+};
+
+export default fn`;
 				}
 			}
 		},
@@ -605,7 +636,19 @@ export default def;`;
 				async handler(id) {
 					const mod = id.replace(re_node, "");
 					return `import mod from ${JSON.stringify(mod)};
+
+${getOriginalRequest.toString()}
+
+if (mod?.fetch) {
+  const ori = mod.fetch;
+  mod.fetch = (...args) => {
+    Object.assign(args[0], getOriginalRequest(request));
+    return ori(...args);
+  }
+}
+
 const def = mod?.server?.nodeHandler ?? mod;
+
 export default def;`;
 				}
 			}
@@ -745,6 +788,7 @@ function getConfig(pluginConfig) {
 			routes: buildRoutes
 		}]
 	});
+	for (const route of cleanRoutes) wrapRouteInParentheses(route);
 	return vercelOutputConfigSchema.parse({
 		version: 3,
 		...pluginConfig.config,
@@ -752,6 +796,10 @@ function getConfig(pluginConfig) {
 		overrides: { ...pluginConfig.config?.overrides }
 	});
 }
+function wrapRouteInParentheses(route) {
+	if (!route.src || route.src.match(/^\(.*\)$/) || route.src.match(/^\^\(.*\)\$$/)) return;
+	route.src = `(${route.src})`;
+}
 
 //#endregion
 //#region src/utils/const.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "11.0.0-beta.16",
+  "version": "11.0.0-beta.18",
   "type": "module",
   "files": [
     "dist",