vite-plugin-vercel 11.0.0-beta.3 → 11.0.0-beta.5

package/dist/types.d.ts

@@ -17,6 +17,15 @@ interface ViteVercelConfig {
    * @default basic
    */
   bundleStrategy?: "basic" | "nf3";
+  /**
+   * Override vite build environments
+   * @experimental
+   */
+  viteEnvNames?: {
+    client?: string;
+    edge?: string | false;
+    node?: string;
+  };
   /**
    * How long Functions should be allowed to run for every request, in seconds.
    * If left empty, default value for your plan will be used.

package/dist/vite.js

@@ -19,6 +19,16 @@ import { getNodeVersion } from "@vercel/build-utils";
 import { toPathToRegexpV6 } from "convert-route/path-to-regexp-v6";
 import { getTransformedRoutes, mergeRoutes, normalizeRoutes } from "@vercel/routing-utils";
 
+//#region src/utils/buildEnvs.ts
+function getBuildEnvNames(pluginConfig) {
+	return {
+		client: pluginConfig.viteEnvNames?.client ?? "vercel_client",
+		edge: pluginConfig.viteEnvNames?.edge ?? "vercel_edge",
+		node: pluginConfig.viteEnvNames?.node ?? "vercel_node"
+	};
+}
+
+//#endregion
 //#region src/utils/dedupeRoutes.ts
 /**
 * When multiple entries point to the same module, we can deploy them as a single function.
@@ -68,6 +78,7 @@ function entryDestination(root, entry, postfix) {
 //#endregion
 //#region src/plugins/api.ts
 function apiPlugin(pluginConfig) {
+	const envNames = getBuildEnvNames(pluginConfig);
 	const outfiles = [];
 	return {
 		name: "vite-plugin-vercel:api",
@@ -75,7 +86,7 @@ function apiPlugin(pluginConfig) {
 			return createAPI(outfiles, pluginConfig);
 		},
 		applyToEnvironment({ name }) {
-			return name === "vercel_edge" || name === "vercel_node";
+			return name === envNames.edge || name === envNames.node;
 		},
 		writeBundle(_opts, bundle$2) {
 			const root = this.environment.config.root ?? process.cwd();
@@ -153,7 +164,7 @@ const reactEdgePlugin$1 = {
 		}
 	}
 };
-function basicBundlePlugin() {
+function basicBundlePlugin(pluginConfig) {
 	const bundledAssets = /* @__PURE__ */ new Map();
 	const bundledChunks = [];
 	return [{
@@ -179,7 +190,7 @@ function basicBundlePlugin() {
 		closeBundle: {
 			order: "post",
 			async handler() {
-				if (!isVercelLastBuildStep(this.environment)) return;
+				if (!isVercelLastBuildStep(this.environment, pluginConfig)) return;
 				this.environment.logger.info("Creating Vercel bundles...");
 				const outfiles = getVercelAPI(this).getOutFiles();
 				const filesToKeep = [];
@@ -205,7 +216,8 @@ async function bundle$1(pluginContext, bundledAssets, outfile) {
 	const buildOptions = {};
 	buildOptions.output = {
 		format: "esm",
-		legalComments: "none"
+		legalComments: "none",
+		inlineDynamicImports: true
 	};
 	buildOptions.checks = { pluginTimings: false };
 	buildOptions.input = [source];
@@ -295,8 +307,9 @@ function joinAbsolutePosix(env_or_p0, p1, ...p) {
 	if (path.isAbsolute(p1)) return path.posix.join(p1, ...p);
 	return path.posix.join(typeof env_or_p0 === "string" ? env_or_p0 : env_or_p0.config.root, p1, ...p);
 }
-function isVercelLastBuildStep(env) {
-	return (typeof env !== "string" ? env.name : env) === "vercel_node";
+function isVercelLastBuildStep(env, pluginConfig) {
+	const envNames = getBuildEnvNames(pluginConfig);
+	return (typeof env !== "string" ? env.name : env) === envNames.node;
 }
 async function cleanup$1(filesToKeep, bundledChunks) {
 	const toKeep = new Set(filesToKeep);
@@ -323,7 +336,8 @@ async function cleanup$1(filesToKeep, bundledChunks) {
 
 //#endregion
 //#region src/plugins/bundle/nf3.ts
-function nf3BundlePlugin() {
+function nf3BundlePlugin(pluginConfig) {
+	const envNames = getBuildEnvNames(pluginConfig);
 	const externalsPlugin = externals({});
 	delete externalsPlugin.buildEnd;
 	let buildOutput;
@@ -339,7 +353,7 @@ function nf3BundlePlugin() {
 			return env.config.consumer !== "client";
 		},
 		async writeBundle(_, output) {
-			const isEdge = this.environment.name === "vercel_edge";
+			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 entries = Object.entries(output).filter((e) => "isEntry" in e[1] && e[1].isEntry).map((e) => ({
@@ -429,12 +443,13 @@ function removeExtension(subject) {
 //#region src/plugins/clean-outdir.ts
 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 === "vercel_client";
+			return env.name === envNames.client;
 		},
 		buildStart: {
 			order: "pre",
@@ -476,6 +491,7 @@ function getVcConfig(pluginConfig, filename, options) {
 //#region src/plugins/loader.ts
 const re_DUMMY = /* @__PURE__ */ new RegExp(`__DUMMY__$`);
 function loaderPlugin(pluginConfig) {
+	const envNames = getBuildEnvNames(pluginConfig);
 	let root;
 	return [
 		{
@@ -519,7 +535,7 @@ export default def;`;
 			name: "vite-plugin-vercel:build-functions",
 			apply: "build",
 			applyToEnvironment(env) {
-				return env.name === "vercel_node" || env.name === "vercel_edge";
+				return env.name === envNames.node || env.name === envNames.edge;
 			},
 			config: {
 				order: "post",
@@ -530,8 +546,8 @@ export default def;`;
 			configEnvironment: {
 				order: "post",
 				handler(name) {
-					const isEdge = name === "vercel_edge";
-					if (name === "vercel_node" || isEdge) {
+					const isEdge = name === envNames.edge;
+					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])),
@@ -541,17 +557,16 @@ export default def;`;
 				}
 			},
 			async buildStart() {
-				const isEdge = this.environment.name === "vercel_edge";
+				const isEdge = this.environment.name === envNames.edge;
 				const nodeVersion = await getNodeVersion(process.cwd());
 				const entries = dedupeRoutes();
 				for (const entry of entries.filter((e) => (e.vercel?.edge ?? false) === isEdge)) {
-					const isEdge$1 = this.environment.name === "vercel_edge";
 					this.emitFile({
 						type: "asset",
 						fileName: entryDestination(root ?? process.cwd(), entry, ".func/.vc-config.json"),
-						source: JSON.stringify(getVcConfig(pluginConfig, isEdge$1 ? "index.js" : "index.mjs", {
+						source: JSON.stringify(getVcConfig(pluginConfig, isEdge ? "index.js" : "index.mjs", {
 							nodeVersion,
-							edge: isEdge$1,
+							edge: isEdge,
 							streaming: entry.vercel?.streaming
 						}), void 0, 2)
 					});
@@ -588,11 +603,12 @@ export default def;`;
 
 //#endregion
 //#region src/plugins/react-edge.ts
-function reactEdgePlugin() {
+function reactEdgePlugin(pluginConfig) {
+	const envNames = getBuildEnvNames(pluginConfig);
 	return {
 		name: "vite-plugin-vercel:react-edge",
 		applyToEnvironment(env) {
-			return env.name === "vercel_edge";
+			return env.name === envNames.edge;
 		},
 		resolveId: {
 			order: "pre",
@@ -662,19 +678,20 @@ const outDir = path.posix.join(process.cwd(), ".vercel/output");
 const DUMMY = "__DUMMY__";
 let injected = false;
 function setupEnvs(pluginConfig) {
+	const envNames = getBuildEnvNames(pluginConfig);
 	return [
 		{
 			name: "vite-plugin-vercel:setup-envs",
 			buildApp: {
 				order: "post",
 				async handler(builder) {
-					try {
-						await builder.build(builder.environments.vercel_client);
+					if (!builder.environments[envNames.client].isBuilt) try {
+						await builder.build(builder.environments[envNames.client]);
 					} catch (e) {
 						if (e instanceof Error && e.message.includes(`Could not resolve entry module "index.html"`)) {} else throw e;
 					}
-					await builder.build(builder.environments.vercel_edge);
-					await builder.build(builder.environments.vercel_node);
+					if (envNames.edge !== false && !builder.environments[envNames.edge].isBuilt) await builder.build(builder.environments[envNames.edge]);
+					if (!builder.environments[envNames.node].isBuilt) await builder.build(builder.environments[envNames.node]);
 				}
 			},
 			config: {
@@ -685,19 +702,19 @@ function setupEnvs(pluginConfig) {
 						if (pluginConfig.entries) store.entries.push(...pluginConfig.entries);
 					}
 					const outDirOverride = pluginConfig.outDir ? { build: { outDir: pluginConfig.outDir } } : {};
-					return {
-						environments: {
-							vercel_edge: createVercelEnvironmentOptions(outDirOverride),
-							vercel_node: createVercelEnvironmentOptions(outDirOverride),
-							vercel_client: {
-								build: {
-									outDir: path.join(pluginConfig.outDir ?? outDir, "static"),
-									copyPublicDir: true,
-									rollupOptions: { input: getDummyInput() }
-								},
-								consumer: "client"
-							}
+					const environments = {};
+					if (envNames.client) environments[envNames.client] = {
+						build: {
+							outDir: path.join(pluginConfig.outDir ?? outDir, "static"),
+							copyPublicDir: true,
+							rollupOptions: { input: getDummyInput() }
 						},
+						consumer: "client"
+					};
+					if (envNames.edge) environments[envNames.edge] = createVercelEnvironmentOptions(outDirOverride);
+					if (envNames.node) environments[envNames.node] = createVercelEnvironmentOptions(outDirOverride);
+					return {
+						environments,
 						builder: {}
 					};
 				}
@@ -707,10 +724,10 @@ function setupEnvs(pluginConfig) {
 		{
 			name: "vite-plugin-vercel:setup-envs:vercel_edge",
 			applyToEnvironment(env) {
-				return env.name === "vercel_edge";
+				return env.name === envNames.edge;
 			},
 			configEnvironment(name, config, env) {
-				if (name !== "vercel_edge") return;
+				if (name !== envNames.edge) return;
 				return {
 					resolve: {
 						external: edgeExternal,
@@ -746,10 +763,10 @@ function setupEnvs(pluginConfig) {
 		{
 			name: "vite-plugin-vercel:setup-envs:vercel_node",
 			applyToEnvironment(env) {
-				return env.name === "vercel_node";
+				return env.name === envNames.node;
 			},
 			configEnvironment(name, config) {
-				if (name !== "vercel_node") return;
+				if (name !== envNames.node) return;
 				return { optimizeDeps: { ...config.optimizeDeps } };
 			},
 			generateBundle: {
@@ -768,7 +785,7 @@ function setupEnvs(pluginConfig) {
 		{
 			name: "vite-plugin-vercel:setup-envs:vercel_client",
 			applyToEnvironment(env) {
-				return env.name === "vercel_client";
+				return env.name === envNames.client;
 			},
 			generateBundle: { async handler(_opts, bundle$2) {
 				cleanupDummy(bundle$2);
@@ -802,7 +819,9 @@ function createVercelEnvironmentOptions(overrides) {
 			rollupOptions: {
 				input: getDummyInput(),
 				output: {
-					sanitizeFileName: false,
+					sanitizeFileName: (filename) => {
+						return filename.replace("\0", "_");
+					},
 					sourcemap: false
 				}
 			},
@@ -826,12 +845,12 @@ function cleanupDummy(bundle$2) {
 //#region src/plugins/index.ts
 function vercel(pluginConfig = {}) {
 	return [
-		reactEdgePlugin(),
-		vercelCleanupPlugin(),
+		reactEdgePlugin(pluginConfig),
+		vercelCleanupPlugin(pluginConfig),
 		apiPlugin(pluginConfig),
 		...setupEnvs(pluginConfig),
 		...loaderPlugin(pluginConfig),
-		...pluginConfig?.bundleStrategy === "nf3" ? nf3BundlePlugin() : basicBundlePlugin(),
+		...pluginConfig?.bundleStrategy === "nf3" ? nf3BundlePlugin(pluginConfig) : basicBundlePlugin(pluginConfig),
 		catchAll(),
 		devServer()
 	];

package/package.json

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