vite-plugin-vercel 11.0.0-beta.8 → 11.0.0

package/README.md

@@ -1,14 +1,8 @@
 # vite-plugin-vercel
 
-> [!NOTE]
-> You are on the [Vite Environment API](https://vite.dev/guide/api-environment.html#environment-configuration) beta branch (v10). Check out [v9 branch](https://github.com/magne4000/vite-plugin-vercel/tree/v9) for current stable version.
-
 Vercel adapter for [Vite](https://vitejs.dev/).
 
-Bundle your Vite application as supported by [Vercel Output API (v3)](https://vercel.com/docs/build-output-api/v3).
-
-> [!NOTE]
-> This plugin is mostly a re-export of [`@photonjs/vercel`](https://github.com/photon-js/photon/tree/main/packages/adapter-vercel)
+Bundle your Vite application as supported by [Vercel Output API](https://vercel.com/docs/build-output-api).
 
 ## Install
 
@@ -68,7 +62,7 @@ export default defineConfig({
 ```
 
 > [!NOTE]
-> `@vercel/build` currently forces the building of files in the _/api_ folder, with no way to disable this behavior.
+> `@vercel/build` forces the building of files in the _/api_ folder, with no way to disable this behavior.
 > It's recommended to place your files in a different folder.
 
 ### Configure endpoints
@@ -114,7 +108,7 @@ import vercel from 'vite-plugin-vercel';
 
 export default defineConfig({
   plugins: [vercel({
-    // All the followings optional
+    // All the followings are optional
 
     /**
      * How long Functions should be allowed to run for every request, in seconds.
@@ -165,7 +159,7 @@ export default defineConfig({
     trailingSlash: true,
     /**
      * Use `getVercelEntries` for mapping your filesystem routes to entries.
-     * If you are interfacing this plugin with a framework, entries can also be added through the Photon API
+     * If you are interfacing this plugin with a framework, entries can also be added through the {@link https://github.com/photon-js/universal-deploy | universal-deploy} API
      */
     entries: {
       root: {
@@ -209,7 +203,7 @@ Related documentation: https://vercel.com/docs/edge-network/headers/request-head
 
 ## Migrations
 
-- [Migration from v9 to v10](https://github.com/magne4000/vite-plugin-vercel/blob/main/MIGRATION.md)
+- [Migration from v9 to v11](https://github.com/magne4000/vite-plugin-vercel/blob/main/MIGRATION.md)
 
 ## Demo
 

package/dist/api.js

@@ -1,3 +1,65 @@
-import { n as getVercelAPI, t as createAPI } from "./api-DR2y7JVQ.js";
+import { t as assert } from "./assert-vtiLgQIb.js";
 
+//#region src/api.ts
+function createAPI(outfiles, pluginConfig) {
+	return {
+		getOutFiles() {
+			return outfiles;
+		},
+		get config() {
+			pluginConfig.config ??= {};
+			return pluginConfig.config;
+		},
+		get defaultMaxDuration() {
+			return pluginConfig.defaultMaxDuration;
+		},
+		set defaultMaxDuration(value) {
+			pluginConfig.defaultMaxDuration = value;
+		},
+		get expiration() {
+			return pluginConfig.expiration;
+		},
+		set expiration(value) {
+			pluginConfig.expiration = value;
+		},
+		get rewrites() {
+			pluginConfig.rewrites ??= [];
+			return pluginConfig.rewrites;
+		},
+		get headers() {
+			pluginConfig.headers ??= [];
+			return pluginConfig.headers;
+		},
+		get redirects() {
+			pluginConfig.redirects ??= [];
+			return pluginConfig.redirects;
+		},
+		get cleanUrls() {
+			return pluginConfig.cleanUrls;
+		},
+		set cleanUrls(value) {
+			pluginConfig.cleanUrls = value;
+		},
+		get trailingSlash() {
+			return pluginConfig.trailingSlash;
+		},
+		set trailingSlash(value) {
+			pluginConfig.trailingSlash = value;
+		},
+		get defaultSupportsResponseStreaming() {
+			return pluginConfig.defaultSupportsResponseStreaming;
+		},
+		set defaultSupportsResponseStreaming(value) {
+			pluginConfig.defaultSupportsResponseStreaming = value;
+		}
+	};
+}
+function getVercelAPI(pluginContextOrServer) {
+	const vpv = ("environment" in pluginContextOrServer ? pluginContextOrServer.environment.config : pluginContextOrServer.config).plugins.find((p) => p.name === "vite-plugin-vercel:api");
+	assert(vpv, "Could not find vite-plugin-vercel:api plugin");
+	assert(vpv.api, "Missing `api`. Make sure vite-plugin-vercel is up-to-date");
+	return vpv.api("environment" in pluginContextOrServer ? pluginContextOrServer : void 0);
+}
+
+//#endregion
 export { createAPI, getVercelAPI };

package/dist/assert-vtiLgQIb.js

@@ -0,0 +1,8 @@
+//#region src/utils/assert.ts
+function assert(condition, errorMessage) {
+	if (condition) return;
+	throw new Error(`[vite-plugin-vercel] ${errorMessage}`);
+}
+
+//#endregion
+export { assert as t };

package/dist/index.d.ts

@@ -1,18 +1,31 @@
 import { EntryMeta } from "@universal-deploy/store";
 
 //#region src/index.d.ts
-
+interface GetVercelEntriesOptions {
+  /**
+   * Map entries to URL patterns
+   * @example
+   *  // When dir: "endpoints/myapi" and destination: "api"
+   *  //  endpoints/myapi/page.ts -> /api/page
+   *  //  endpoints/myapi/name/[name].ts -> /api/name/*
+   */
+  destination?: string;
+  /**
+   * If true, parse entries exports for per-file settings.
+   * Entries can export `edge`, `isr`, `headers` and `streaming`. See README for more details
+   *
+   * @default true
+   */
+  tryParseExports?: boolean;
+}
 /**
  * Scans the filesystem for entry points.
- * @experimental
+ * @beta
  */
 declare function getVercelEntries(dir: string, {
   destination,
   tryParseExports
-}: {
-  destination?: string | undefined;
-  tryParseExports?: boolean | undefined;
-}): Promise<EntryMeta[]>;
+}: GetVercelEntriesOptions): Promise<EntryMeta[]>;
 declare function extractExports(filepath: string): Promise<{
   edge?: boolean | undefined;
   headers?: Record<string, string> | undefined;
@@ -22,4 +35,4 @@ declare function extractExports(filepath: string): Promise<{
   } | undefined;
 } | null>;
 //#endregion
-export { extractExports, getVercelEntries };
+export { GetVercelEntriesOptions, extractExports, getVercelEntries };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as pathRelativeTo } from "./path-B4ThGm96.js";
+import { t as pathRelativeTo } from "./path-DoLvGKnz.js";
 import path from "node:path";
 import { vercelEndpointExports } from "@vite-plugin-vercel/schemas";
 import { fromNextFs } from "convert-route/next-fs";
@@ -10,7 +10,7 @@ import { normalizePath } from "vite";
 //#region src/index.ts
 /**
 * Scans the filesystem for entry points.
-* @experimental
+* @beta
 */
 async function getVercelEntries(dir, { destination = dir, tryParseExports = true }) {
 	const normalizedDir = normalizePath(dir);
@@ -31,7 +31,7 @@ async function getVercelEntries(dir, { destination = dir, tryParseExports = true
 		if (xports?.isr) entry.vercel.isr = xports.isr;
 		if (xports?.headers) entry.vercel.headers = xports.headers;
 		if (xports?.streaming) entry.vercel.streaming = xports.streaming;
-		entry.pattern = entryToRou3(key);
+		entry.route = entryToRou3(key);
 		if (key.includes("[...")) entry.vercel.enforce = "post";
 		entryPoints.push(entry);
 	}

package/dist/vite.js

@@ -1,16 +1,18 @@
-import { t as pathRelativeTo$1 } from "./path-B4ThGm96.js";
-import { n as getVercelAPI, r as assert, t as createAPI } from "./api-DR2y7JVQ.js";
+import { t as pathRelativeTo$1 } from "./path-DoLvGKnz.js";
+import { t as assert } from "./assert-vtiLgQIb.js";
+import { createAPI, getVercelAPI } from "./api.js";
 import { builtinModules } from "node:module";
 import path from "node:path";
 import { vercelOutputConfigSchema, vercelOutputPrerenderConfigSchema, vercelOutputVcConfigSchema } from "@vite-plugin-vercel/schemas";
 import { fromRou3 } from "convert-route/rou3";
 import { BuildEnvironment, createRunnableDevEnvironment, mergeConfig, normalizePath } from "vite";
-import { catchAll, devServer } from "@universal-deploy/store/vite";
-import { store } from "@universal-deploy/store";
+import { catchAll, devServer } from "@universal-deploy/vite";
+import { addEntry, getAllEntries } from "@universal-deploy/store";
 import fs, { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { copyFile, cp, rmdir, unlink } from "node:fs/promises";
 import { findRoot } from "@manypkg/find-root";
 import { nodeFileTrace, resolve } from "@vercel/nft";
+import { transform } from "oxc-transform";
 import { build } from "rolldown";
 import { cpus } from "node:os";
 import { externals } from "nf3/plugin";
@@ -36,20 +38,65 @@ function getBuildEnvNames(pluginConfig) {
 */
 function dedupeRoutes() {
 	const entriesToKeep = [];
-	const entriesGroupedByModuleId = groupBy(store.entries, (e) => e.id);
+	const entriesGroupedByModuleId = groupBy(getAllEntries(), (e) => e.id);
 	for (const entries of entriesGroupedByModuleId.values()) {
 		let groupedEntry;
 		for (const entry of entries) if (entry.vercel && Object.keys(entry.vercel).length > 0) {
-			if (!Array.isArray(entry.pattern)) entry.pattern = [entry.pattern];
+			if (!Array.isArray(entry.route)) entry.route = [entry.route];
 			entriesToKeep.push(entry);
 		} else if (!groupedEntry) {
 			groupedEntry = structuredClone(entry);
-			if (!Array.isArray(groupedEntry.pattern)) groupedEntry.pattern = [groupedEntry.pattern];
+			if (!Array.isArray(groupedEntry.route)) groupedEntry.route = [groupedEntry.route];
 			entriesToKeep.push(groupedEntry);
-		} else groupedEntry.pattern.push(...[entry.pattern].flat());
+		} else groupedEntry.route.push(...[entry.route].flat());
 	}
 	return entriesToKeep;
 }
+/**
+* Sorts routes by specificity.
+*
+* Specificity rules:
+* 1. Segment type priority at each position: Static > Dynamic/Param > Catch-all.
+* 2. Total route length: Longer routes are generally more specific.
+* 3. Prefix match exception: A shorter static route is more specific than a longer route
+*    that only adds a catch-all segment to the same prefix.
+* 4. Alphabetical order: Final tie-breaker for static segments at the same position.
+*
+* @param routes - Array of routes to sort.
+* @returns A new array of routes sorted from most specific to least specific.
+*/
+function sortRoutes(routes) {
+	return [...routes].sort((a, b) => {
+		const lenA = a.pathname.length;
+		const lenB = b.pathname.length;
+		const commonLen = Math.min(lenA, lenB);
+		for (let i = 0; i < commonLen; i++) {
+			const segA = a.pathname[i];
+			const segB = b.pathname[i];
+			if (segA.value && !segB.value) return -1;
+			if (!segA.value && segB.value) return 1;
+			if (segA.value && segB.value) {
+				if (segA.value !== segB.value) {
+					if (lenA !== lenB) return lenB - lenA;
+					return segA.value.localeCompare(segB.value);
+				}
+			}
+			if (!segA.optional && segB.optional) return -1;
+			if (segA.optional && !segB.optional) return 1;
+			if (segA.catchAll && segB.catchAll) {
+				if (!segA.catchAll.greedy && segB.catchAll.greedy) return -1;
+				if (segA.catchAll.greedy && !segB.catchAll.greedy) return 1;
+			}
+			if (segA.catchAll && !segB.catchAll) return 1;
+			if (!segA.catchAll && segB.catchAll) return -1;
+		}
+		if (lenA !== lenB) {
+			if (lenA > lenB) return a.pathname[lenB].catchAll ? 1 : -1;
+			return b.pathname[lenA].catchAll ? -1 : 1;
+		}
+		return 0;
+	});
+}
 function groupBy(list, fn, selector) {
 	return Array.from(list).reduce((acc, curr) => {
 		const key = fn(curr);
@@ -68,13 +115,36 @@ function removeExtension$1(subject) {
 
 //#endregion
 //#region src/utils/destination.ts
+function parseViteId(id) {
+	const [path, query] = id.split("?");
+	return {
+		path: decodeURIComponent(path),
+		query
+	};
+}
+function extractBestPath({ path, query }) {
+	if (!query) return path;
+	return query.split("&").map(decodeURIComponent).find((p) => p.includes("/")) || path;
+}
+function shortenPath(path, maxSegments = 2) {
+	return removeExtension$1(path.split(/[\\/]/).filter(Boolean).slice(-maxSegments).join("_"));
+}
+function mapPath(path, maxSegments = 2) {
+	const nodeModuleMatch = path.match(/node_modules[\\/](.+?)([\\/].*)?$/);
+	if (nodeModuleMatch) return `${nodeModuleMatch[1].split(/[\\/]/)[0]}_${removeExtension$1(nodeModuleMatch[2]?.split(/[\\/]/).pop() || "index")}`;
+	return shortenPath(path, maxSegments);
+}
+function hashString(str, length = 6) {
+	let hash = 5381;
+	for (let i = 0; i < str.length; i++) hash = hash * 33 ^ str.charCodeAt(i);
+	hash = hash >>> 0;
+	return hash.toString(36).slice(0, length);
+}
+function uniqueViteName(id, entry, maxSegments = 2) {
+	return removeExtension$1(`${mapPath(extractBestPath(parseViteId(id)), maxSegments)}_${hashString(JSON.stringify(entry))}`.replace(/[^a-zA-Z0-9\-_[\]/]/g, "-"));
+}
 function entryDestinationDefault(root, entry) {
-	let rel = pathRelativeTo$1(entry.id, root);
-	if (rel.includes("node_modules")) {
-		const split = rel.split("node_modules");
-		rel = split[split.length - 1];
-	}
-	return `${removeExtension$1(rel).replace(/[^a-zA-Z0-9\-_[\]/]/g, "-")}`;
+	return uniqueViteName(pathRelativeTo$1(entry.id, root), entry);
 }
 function entryDestination(root, entry, postfix) {
 	return `${path.posix.join("functions/", entryDestinationDefault(root, entry))}${postfix}`;
@@ -93,10 +163,10 @@ function apiPlugin(pluginConfig) {
 		applyToEnvironment({ name }) {
 			return name === envNames.edge || name === envNames.node;
 		},
-		writeBundle(_opts, bundle$2) {
+		writeBundle(_opts, bundle) {
 			const root = this.environment.config.root ?? process.cwd();
 			const entryMapByDestination = new Map(dedupeRoutes().map((e) => [entryDestination(root, e, ".func/index"), e]));
-			for (const [key, value] of Object.entries(bundle$2)) if (value.type === "chunk" && entryMapByDestination.has(removeExtension$1(key))) outfiles.push({
+			for (const [key, value] of Object.entries(bundle)) if (value.type === "chunk" && entryMapByDestination.has(removeExtension$1(key))) outfiles.push({
 				type: "chunk",
 				root: this.environment.config.root,
 				outdir: this.environment.config.build.outDir,
@@ -177,8 +247,8 @@ function basicBundlePlugin(pluginConfig) {
 		name: "vite-plugin-vercel:bundle",
 		enforce: "post",
 		apply: "build",
-		generateBundle(_opts, bundle$2) {
-			for (const b of Object.values(bundle$2)) {
+		generateBundle(_opts, bundle) {
+			for (const b of Object.values(bundle)) {
 				const outFile = joinAbsolute(this.environment, this.environment.config.build.outDir, b.fileName);
 				if (b.type === "asset") {
 					const originalFileNames = b.originalFileNames.map((relativePath) => path.resolve(this.environment.config.root, relativePath));
@@ -199,9 +269,9 @@ function basicBundlePlugin(pluginConfig) {
 				if (!isVercelLastBuildStep(this.environment, pluginConfig)) return;
 				this.environment.logger.info("Creating Vercel bundles...");
 				const outfiles = getVercelAPI(this).getOutFiles();
-				const filesToKeep = [];
-				for (const outfile of outfiles) if (outfile.type === "chunk") filesToKeep.push(...await bundle$1(this, bundledAssets, outfile));
-				await cleanup$1(filesToKeep, bundledChunks);
+				const filesToKeepP = [];
+				for (const outfile of outfiles) if (outfile.type === "chunk") filesToKeepP.push(bundle$1(this, bundledAssets, outfile));
+				await cleanup$1((await Promise.all(filesToKeepP)).flat(), bundledChunks);
 			}
 		},
 		sharedDuringBuild: true
@@ -222,8 +292,8 @@ async function bundle$1(pluginContext, bundledAssets, outfile) {
 	const buildOptions = {};
 	buildOptions.output = {
 		format: "esm",
-		legalComments: "none",
-		inlineDynamicImports: true
+		comments: { legal: false },
+		codeSplitting: false
 	};
 	buildOptions.checks = { pluginTimings: false };
 	buildOptions.input = [source];
@@ -243,13 +313,6 @@ async function bundle$1(pluginContext, bundledAssets, outfile) {
 	} else {
 		buildOptions.platform = "node";
 		buildOptions.output.file = destination.replace(/\.js$/, ".mjs");
-		buildOptions.output.banner = `import { createRequire as topLevelCreateRequire } from 'node:module';
-import { dirname as topLevelDirname } from 'node:path';
-import { fileURLToPath as topLevelFileURLToPath } from 'node:url';
-var require = topLevelCreateRequire(import.meta.url);
-var __filename = topLevelFileURLToPath(import.meta.url);
-var __dirname = topLevelDirname(__filename);
-`;
 	}
 	try {
 		await build(buildOptions);
@@ -275,23 +338,9 @@ var __dirname = topLevelDirname(__filename);
 			"**/node_modules/webpack5/**/*"
 		],
 		async readFile(filepath) {
-			if (filepath.endsWith(".ts") || filepath.endsWith(".tsx")) return (await build({
-				output: {
-					format: "esm",
-					minify: false
-				},
-				external: /.*/,
-				platform: "node",
-				logLevel: "info",
-				plugins: [],
-				transform: { define: {
-					"process.env.NODE_ENV": "\"production\"",
-					"import.meta.env.NODE_ENV": "\"production\""
-				} },
-				input: [entryFilePath],
-				write: false
-			})).output[0].code;
-			return readFileSync(filepath, "utf-8");
+			const code = readFileSync(filepath, "utf-8");
+			if (filepath.endsWith(".ts") || filepath.endsWith(".tsx")) return (await transform(filepath, code, { target: "es2022" })).code;
+			return code;
 		}
 	});
 	for (const file of fileList) if (reasons.has(file) && reasons.get(file)?.type.includes("asset") && !file.endsWith(".js") && !file.endsWith(".cjs") && !file.endsWith(".mjs") && !file.endsWith("package.json")) {
@@ -343,6 +392,7 @@ async function cleanup$1(filesToKeep, bundledChunks) {
 //#endregion
 //#region src/plugins/bundle/nf3.ts
 function nf3BundlePlugin(pluginConfig) {
+	console.warn("[vite-plugin-vercel] bundleStrategy 'nf3' is highly experimental. Use at your own risk; support is not provided for related issues.");
 	const envNames = getBuildEnvNames(pluginConfig);
 	const externalsPlugin = externals({});
 	delete externalsPlugin.buildEnd;
@@ -361,15 +411,15 @@ function nf3BundlePlugin(pluginConfig) {
 		async writeBundle(_, output) {
 			const isEdge = this.environment.name === envNames.edge;
 			const config = this.environment.config;
-			const outDir$1 = normalizePath(path.isAbsolute(config.build.outDir) ? config.build.outDir : path.join(config.root, config.build.outDir));
+			const outDir = normalizePath(path.isAbsolute(config.build.outDir) ? config.build.outDir : path.join(config.root, config.build.outDir));
 			const entries = Object.entries(output).filter((e) => "isEntry" in e[1] && e[1].isEntry).map((e) => ({
 				name: e[1].name,
 				fileName: e[1].fileName,
-				outPath: path.join(outDir$1, e[1].fileName)
+				outPath: path.join(outDir, e[1].fileName)
 			}));
 			if (entries.length === 0) return;
 			const outPaths = entries.map((entry) => entry.outPath);
-			const input = Object.fromEntries(outPaths.map((e) => [removeExtension(pathRelativeTo(e, outDir$1)), e]));
+			const input = Object.fromEntries(outPaths.map((e) => [removeExtension(pathRelativeTo(e, outDir)), e]));
 			const limit = pLimit(Math.max(1, Math.ceil(cpus().length / 2)));
 			const nonVitePlugins = this.environment.config.plugins.filter((p) => {
 				return !p.name.startsWith("vite:") && p.name !== "alias" && p.name !== "commonjs" && p.name !== "nitro:externals";
@@ -378,12 +428,12 @@ function nf3BundlePlugin(pluginConfig) {
 				return rest;
 			});
 			const localOutput = (await Promise.all(Object.values(input).map((entryPath) => limit(async () => {
-				const outDir$2 = path.dirname(entryPath);
+				const outDir = path.dirname(entryPath);
 				return { output: (await bundle({
 					plugins: nonVitePlugins,
 					isEdge,
 					input: { index: entryPath },
-					outDir: outDir$2,
+					outDir,
 					externals: {
 						conditions: this.environment.config.resolve.conditions,
 						rootDir: this.environment.config.root,
@@ -396,7 +446,7 @@ function nf3BundlePlugin(pluginConfig) {
 					}
 				})).output.map((o) => ({
 					...o,
-					fileName: path.join(outDir$2, o.fileName)
+					fileName: path.join(outDir, o.fileName)
 				})) };
 			})))).flatMap((r) => r.output);
 			buildOutput = buildOutput ? [...buildOutput, ...localOutput] : localOutput;
@@ -447,23 +497,20 @@ function removeExtension(subject) {
 
 //#endregion
 //#region src/plugins/clean-outdir.ts
+const outDir$1 = path.posix.join(process.cwd(), ".vercel/output");
 function vercelCleanupPlugin(pluginConfig) {
 	let alreadyRun = false;
-	const envNames = getBuildEnvNames(pluginConfig);
 	return {
 		apply: "build",
 		name: "vite-plugin-vercel:cleanup",
 		enforce: "pre",
-		applyToEnvironment(env) {
-			return env.name === envNames.client;
-		},
 		buildStart: {
 			order: "pre",
 			sequential: true,
 			handler() {
 				if (alreadyRun) return;
 				alreadyRun = true;
-				cleanOutputDirectory(pluginConfig?.outDir && path.isAbsolute(pluginConfig.outDir) ? pluginConfig.outDir : path.join(this.environment.config.root, pluginConfig?.outDir ?? ".vercel/output"));
+				cleanOutputDirectory(pluginConfig.outDir ?? outDir$1);
 			}
 		},
 		sharedDuringBuild: true
@@ -493,9 +540,32 @@ function getVcConfig(pluginConfig, filename, options) {
 	});
 }
 
+//#endregion
+//#region src/utils/request.ts
+function getOriginalRequest(request) {
+	const xOriginalPath = request.headers.get("x-original-path");
+	let newUrl = null;
+	let newRequest = request;
+	if (typeof xOriginalPath === "string") newUrl = new URL(xOriginalPath, request.url).toString();
+	if (newUrl && request.url !== 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 = /* @__PURE__ */ new RegExp(`__DUMMY__$`);
+const re_DUMMY = new RegExp(`__DUMMY__$`);
+const re_edge = /[?&]vercel_edge\b/;
+const re_node = /[?&]vercel_node\b/;
 function loaderPlugin(pluginConfig) {
 	const envNames = getBuildEnvNames(pluginConfig);
 	let root;
@@ -520,19 +590,57 @@ function loaderPlugin(pluginConfig) {
 			name: "vite-plugin-vercel:load-edge",
 			apply: "build",
 			resolveId: {
-				filter: { id: [/\?edge$/] },
+				filter: { id: re_edge },
 				async handler(id, importer, opts) {
-					const resolved = await this.resolve(id.replace(/\?edge$/, ""), importer, opts);
+					const resolved = await this.resolve(id.replace(re_edge, ""), importer, opts);
 					if (!resolved) return null;
-					return `${resolved.id}?edge`;
+					return `${resolved.id}?vercel_edge`;
 				}
 			},
 			load: {
-				filter: { id: [/\?edge$/] },
+				filter: { id: re_edge },
 				async handler(id) {
-					const mod = id.replace(/\?edge$/, "");
+					const mod = id.replace(re_edge, "");
 					return `import mod from ${JSON.stringify(mod)};
-const def = mod.fetch;
+
+${getOriginalRequest.toString()}
+
+const fn = (r) => {
+  return mod.fetch(getOriginalRequest(r));
+};
+
+export default fn`;
+				}
+			}
+		},
+		{
+			name: "vite-plugin-vercel:load-node",
+			apply: "build",
+			resolveId: {
+				filter: { id: re_node },
+				async handler(id, importer, opts) {
+					const resolved = await this.resolve(id.replace(re_node, ""), importer, opts);
+					if (!resolved) return null;
+					return `${resolved.id}?vercel_node`;
+				}
+			},
+			load: {
+				filter: { id: re_node },
+				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 = (r) => {
+    return ori(getOriginalRequest(r));
+  }
+}
+
+const def = mod?.server?.nodeHandler ?? mod;
+
 export default def;`;
 				}
 			}
@@ -556,8 +664,11 @@ export default def;`;
 					if (name === envNames.node || isEdge) {
 						const entries = dedupeRoutes().filter((e) => (e.vercel?.edge ?? false) === isEdge);
 						return { build: { rollupOptions: {
-							input: Object.fromEntries(entries.map((e) => [entryDestination(root ?? process.cwd(), e, ".func/index"), isEdge ? `${e.id}?edge` : e.id])),
-							output: { hoistTransitiveImports: false }
+							input: Object.fromEntries(entries.map((e) => [entryDestination(root ?? process.cwd(), e, ".func/index"), isEdge ? `${e.id}?vercel_edge` : `${e.id}?vercel_node`])),
+							output: {
+								hoistTransitiveImports: false,
+								entryFileNames: "[name].js"
+							}
 						} } };
 					}
 				}
@@ -582,8 +693,8 @@ export default def;`;
 						source: JSON.stringify(vercelOutputPrerenderConfigSchema.parse(entry.vercel.isr), void 0, 2)
 					});
 					pluginConfig.rewrites ??= [];
-					for (const pattern of [entry.pattern].flat()) {
-						const source = toPathToRegexpV6(fromRou3(pattern));
+					for (const ir of sortRoutes([entry.route].flat().map((p) => fromRou3(p)))) {
+						const source = toPathToRegexpV6(ir);
 						pluginConfig.rewrites.push({
 							enforce: entry.vercel?.enforce,
 							source,
@@ -645,7 +756,13 @@ function getConfig(pluginConfig) {
 			return r;
 		})),
 		redirects: pluginConfig.redirects ? reorderEnforce(pluginConfig.redirects) : void 0,
-		headers: pluginConfig.headers
+		headers: [{
+			source: "/(.*)",
+			headers: [{
+				key: "x-original-path",
+				value: "/$1"
+			}]
+		}, ...pluginConfig.headers ?? []]
 	});
 	if (error) throw error;
 	if (pluginConfig.config?.routes && pluginConfig.config.routes.length > 0 && !pluginConfig.config.routes.every((r) => "continue" in r && r.continue)) console.warn("Did you forget to add `\"continue\": true` to your routes? See https://vercel.com/docs/build-output-api/v3/configuration#source-route\nIf not, it is discouraged to use `routes` config to override routes. Prefer using `rewrites` and `redirects`.");
@@ -708,7 +825,9 @@ function setupEnvs(pluginConfig) {
 				handler() {
 					if (!injected) {
 						injected = true;
-						if (pluginConfig.entries) store.entries.push(...pluginConfig.entries);
+						if (pluginConfig.entries) pluginConfig.entries.forEach((entry) => {
+							addEntry(entry);
+						});
 					}
 					const outDirOverride = pluginConfig.outDir ? { build: { outDir: pluginConfig.outDir } } : {};
 					const environments = {};
@@ -716,7 +835,8 @@ function setupEnvs(pluginConfig) {
 						build: {
 							outDir: path.join(pluginConfig.outDir ?? outDir, "static"),
 							copyPublicDir: true,
-							rollupOptions: { input: getDummyInput() }
+							rollupOptions: { input: getDummyInput() },
+							emptyOutDir: false
 						},
 						consumer: "client"
 					};
@@ -746,8 +866,9 @@ function setupEnvs(pluginConfig) {
 						target: "es2022",
 						rollupOptions: {
 							input: {},
-							treeshake: { preset: "smallest" }
-						}
+							treeshake: true
+						},
+						rolldownOptions: {}
 					},
 					optimizeDeps: {
 						...config.optimizeDeps,
@@ -763,8 +884,8 @@ function setupEnvs(pluginConfig) {
 			},
 			generateBundle: {
 				order: "post",
-				async handler(_opts, bundle$2) {
-					cleanupDummy(bundle$2);
+				async handler(_opts, bundle) {
+					cleanupDummy(bundle);
 				}
 			},
 			sharedDuringBuild: true
@@ -780,8 +901,8 @@ function setupEnvs(pluginConfig) {
 			},
 			generateBundle: {
 				order: "post",
-				async handler(_opts, bundle$2) {
-					cleanupDummy(bundle$2);
+				async handler(_opts, bundle) {
+					cleanupDummy(bundle);
 					this.emitFile({
 						type: "asset",
 						fileName: "config.json",
@@ -796,8 +917,8 @@ function setupEnvs(pluginConfig) {
 			applyToEnvironment(env) {
 				return env.name === envNames.client;
 			},
-			generateBundle: { async handler(_opts, bundle$2) {
-				cleanupDummy(bundle$2);
+			generateBundle: { async handler(_opts, bundle) {
+				cleanupDummy(bundle);
 				const topLevelConfig = this.environment.getTopLevelConfig();
 				const clientEnv = topLevelConfig.environments.client;
 				if (clientEnv) try {
@@ -845,9 +966,9 @@ function createVercelEnvironmentOptions(overrides) {
 function getDummyInput() {
 	return { [DUMMY]: `${virtualEntry}:${DUMMY}` };
 }
-function cleanupDummy(bundle$2) {
-	const dummy = Object.keys(bundle$2).find((key) => key.includes("_DUMMY_"));
-	if (dummy) delete bundle$2[dummy];
+function cleanupDummy(bundle) {
+	const dummy = Object.keys(bundle).find((key) => key.includes("_DUMMY_"));
+	if (dummy) delete bundle[dummy];
 }
 
 //#endregion
@@ -864,7 +985,6 @@ function vercel(pluginConfig = {}) {
 		devServer()
 	];
 }
-var plugins_default = vercel;
 
 //#endregion
-export { plugins_default as default, vercel };
+export { vercel as default, vercel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "11.0.0-beta.8",
+  "version": "11.0.0",
   "type": "module",
   "files": [
     "dist",
@@ -26,29 +26,31 @@
     "@types/node": "^22.19.3",
     "@universal-middleware/express": "^0.4.22",
     "@vercel/node": "^5.5.15",
-    "tsdown": "^0.18.4",
+    "tsdown": "^0.20.3",
     "typescript": "^5.9.3",
     "vite": "^7.2.4",
     "vitest": "^4.0.16"
   },
   "dependencies": {
     "@manypkg/find-root": "^3.1.0",
-    "@universal-deploy/store": "^0.0.2",
+    "@universal-deploy/store": "^0.2.0",
+    "@universal-deploy/vite": "^0.1.0",
     "@universal-middleware/core": "^0.4.13",
     "@universal-middleware/vercel": "^0.4.29",
     "@vercel/build-utils": "^13.2.3",
-    "@vercel/nft": "^1.1.1",
+    "@vercel/nft": "^1.2.0",
     "@vercel/routing-utils": "^5.3.1",
-    "@vite-plugin-vercel/schemas": "latest",
     "convert-route": "^1.0.0",
     "fast-glob": "^3.3.3",
     "magicast": "^0.5.1",
-    "nf3": "^0.3.1",
+    "nf3": "^0.3.4",
+    "oxc-transform": "^0.108.0",
     "p-limit": "^7.2.0",
     "path-to-regexp": "^8.3.0",
-    "rolldown": "^1.0.0-beta.58",
+    "rolldown": "^1.0.0-rc.4",
     "strip-ansi": "^7.1.2",
-    "vite-plugin-wasm": "^3.5.0"
+    "vite-plugin-wasm": "^3.5.0",
+    "@vite-plugin-vercel/schemas": "^1.0.0"
   },
   "scripts": {
     "dev": "tsdown --watch",

package/dist/api-DR2y7JVQ.js

@@ -1,70 +0,0 @@
-//#region src/utils/assert.ts
-function assert(condition, errorMessage) {
-	if (condition) return;
-	throw new Error(`[vite-plugin-vercel] ${errorMessage}`);
-}
-
-//#endregion
-//#region src/api.ts
-function createAPI(outfiles, pluginConfig) {
-	return {
-		getOutFiles() {
-			return outfiles;
-		},
-		get config() {
-			pluginConfig.config ??= {};
-			return pluginConfig.config;
-		},
-		get defaultMaxDuration() {
-			return pluginConfig.defaultMaxDuration;
-		},
-		set defaultMaxDuration(value) {
-			pluginConfig.defaultMaxDuration = value;
-		},
-		get expiration() {
-			return pluginConfig.expiration;
-		},
-		set expiration(value) {
-			pluginConfig.expiration = value;
-		},
-		get rewrites() {
-			pluginConfig.rewrites ??= [];
-			return pluginConfig.rewrites;
-		},
-		get headers() {
-			pluginConfig.headers ??= [];
-			return pluginConfig.headers;
-		},
-		get redirects() {
-			pluginConfig.redirects ??= [];
-			return pluginConfig.redirects;
-		},
-		get cleanUrls() {
-			return pluginConfig.cleanUrls;
-		},
-		set cleanUrls(value) {
-			pluginConfig.cleanUrls = value;
-		},
-		get trailingSlash() {
-			return pluginConfig.trailingSlash;
-		},
-		set trailingSlash(value) {
-			pluginConfig.trailingSlash = value;
-		},
-		get defaultSupportsResponseStreaming() {
-			return pluginConfig.defaultSupportsResponseStreaming;
-		},
-		set defaultSupportsResponseStreaming(value) {
-			pluginConfig.defaultSupportsResponseStreaming = value;
-		}
-	};
-}
-function getVercelAPI(pluginContextOrServer) {
-	const vpv = ("environment" in pluginContextOrServer ? pluginContextOrServer.environment.config : pluginContextOrServer.config).plugins.find((p) => p.name === "vite-plugin-vercel:api");
-	assert(vpv, "Could not find vite-plugin-vercel:api plugin");
-	assert(vpv.api, "Missing `api`. Make sure vite-plugin-vercel is up-to-date");
-	return vpv.api("environment" in pluginContextOrServer ? pluginContextOrServer : void 0);
-}
-
-//#endregion
-export { getVercelAPI as n, assert as r, createAPI as t };