vite-plugin-vercel 0.1.0 → 0.1.3

package/README.md

@@ -2,9 +2,29 @@
 
 This is a **Work In Progress** Vercel adapter for [`vite`](https://vitejs.dev/).
 
+Its purpose is to help you bundle your application in `.vercel` folder as supported by
+[Vercel API v3](https://vercel.com/docs/build-output-api/v3).
+
+## Features
+
+- [x] [SSG/Static files support](https://vercel.com/docs/build-output-api/v3#vercel-primitives/static-files)
+  - see [`prerender` config](/packages/vercel/src/types.ts#L33)
+- [x] [SSR/Serverless functions support](https://vercel.com/docs/build-output-api/v3#vercel-primitives/serverless-functions)
+  - `.[jt]s` files under the `<root>/api` folder of your project are automatically bundled as Serverless functions under `.vercel/output/functions/api/*.func`
+  - see [`additionalEndpoints` config](/packages/vercel/src/types.ts#L54)
+- [x] [ISR/Prerender functions support](https://vercel.com/docs/build-output-api/v3#vercel-primitives/prerender-functions)
+  - see [`isr` config](/packages/vercel/src/types.ts#L81). Also see implementation of [vite-plugin-ssr](/packages/vite-plugin-ssr/vite-plugin-ssr.ts) for example
+- [ ] [Edge functions support](https://vercel.com/docs/build-output-api/v3#vercel-primitives/edge-functions)
+- [ ] [Images optimization support](https://vercel.com/docs/build-output-api/v3#build-output-configuration/supported-properties/images)
+- [ ] [Preview mode support](https://vercel.com/docs/build-output-api/v3#features/preview-mode)
+- [x] [Advanced config override](/packages/vercel/src/types.ts#L15)
+  - [ ] Complete config override
+
 ## Usage
 
-Install as a dev dependency and add it to your Vite config like this:
+First, make sure `ENABLE_VC_BUILD=1` is declared as an Environment Variable in your deployment configuration.
+
+Then, install this package as a dev dependency and add it to your Vite config like this:
 
 ```ts
 import { defineConfig } from 'vite';
@@ -21,30 +41,18 @@ export default defineConfig({
 [vite-plugin-ssr](https://vite-plugin-ssr.com/) will support this plugin when stable.
 In the meantime, you can add experimental support yourself.
 
-First copy [prerender](../../prerender) folder to the root of your project.
-Then, update your vercel config:
+Install `@magne4000/vite-plugin-vercel-ssr` package, and update your vite config:
 
 ```ts
-// vercel.config.ts
-// A TS config is prefered if your project is of { type: "module" }
-
-import module from 'module';
+// vite.config.ts
 import { defineConfig } from 'vite';
 import ssr from 'vite-plugin-ssr/plugin';
 import vercel from 'vite-plugin-vercel';
-
-// FIX esbuild bug https://github.com/evanw/esbuild/pull/2067
-// probably not necessary when `./prerender/vite-plugin-ssr` will be included in `vite-plugin-ssr`
-// eslint-disable-next-line no-undef
-globalThis.require = module.createRequire(import.meta.url);
+import vercelSsr from '@magne4000/vite-plugin-vercel-ssr';
 
 export default defineConfig(async ({ command, mode }) => {
-  // Dynamic import to bypass esbuild compilation issue.
-  // If you are not using ESM, could me move as a top synchronous import
-  const vitePluginSsrVercelPlugin = await import('./prerender/vite-plugin-ssr');
-
   return {
-    plugins: [ssr(), vercel(), vitePluginSsrVercelPlugin.default()],
+    plugins: [ssr(), vercel(), vercelSsr()],
     build: {
       polyfillDynamicImport: false,
     },
@@ -54,3 +62,11 @@ export default defineConfig(async ({ command, mode }) => {
   };
 });
 ```
+
+### Config
+
+See [TS types](/packages/vercel/src/types.ts#L15) for details.
+
+## Demo
+
+https://test-vite-vercel-plugin.vercel.app/

package/dist/index.cjs

@@ -1,38 +1,10 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -73,9 +45,9 @@ function getOutput(config, suffix) {
   var _a, _b;
   return import_path.default.join(((_a = config.vercel) == null ? void 0 : _a.outDir) ? "" : getRoot(config), ((_b = config.vercel) == null ? void 0 : _b.outDir) ?? ".vercel/output", suffix ?? "");
 }
-function pathRelativeToApi(filePath, config) {
+function pathRelativeTo(filePath, config, rel) {
   const root = getRoot(config);
-  return (0, import_vite.normalizePath)(import_path.default.relative(import_path.default.join(root, "api"), filePath));
+  return (0, import_vite.normalizePath)(import_path.default.relative(import_path.default.join(root, rel), filePath));
 }
 async function copyDir(src, dest) {
   await import_promises.default.mkdir(dest, { recursive: true });
@@ -171,29 +143,51 @@ var vercelOutputConfigSchema = import_zod.z.object({
 // src/config.ts
 var import_promises2 = __toESM(require("fs/promises"), 1);
 var import_routing_utils = require("@vercel/routing-utils");
-function getConfig(resolvedConfig, config) {
-  var _a, _b, _c, _d, _e;
-  const { routes } = (0, import_routing_utils.getTransformedRoutes)({
+function reorderEnforce(arr) {
+  return [
+    ...arr.filter((r) => r.enforce === "pre"),
+    ...arr.filter((r) => !r.enforce),
+    ...arr.filter((r) => r.enforce === "post")
+  ];
+}
+function getConfig(resolvedConfig, rewrites, overrides) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  const _rewrites = [
+    ...((_a = resolvedConfig.vercel) == null ? void 0 : _a.rewrites) ?? [],
+    ...rewrites ?? []
+  ];
+  const { routes, error } = (0, import_routing_utils.getTransformedRoutes)({
     nowConfig: {
-      cleanUrls: true
+      cleanUrls: ((_b = resolvedConfig.vercel) == null ? void 0 : _b.cleanUrls) ?? true,
+      trailingSlash: (_c = resolvedConfig.vercel) == null ? void 0 : _c.trailingSlash,
+      rewrites: reorderEnforce(_rewrites),
+      redirects: ((_d = resolvedConfig.vercel) == null ? void 0 : _d.redirects) ? reorderEnforce((_e = resolvedConfig.vercel) == null ? void 0 : _e.redirects) : void 0
     }
   });
-  return vercelOutputConfigSchema.parse(__spreadProps(__spreadValues({
-    version: 3
-  }, (_a = resolvedConfig.vercel) == null ? void 0 : _a.config), {
+  if (error) {
+    throw error;
+  }
+  if (((_g = (_f = resolvedConfig.vercel) == null ? void 0 : _f.config) == null ? void 0 : _g.routes) && resolvedConfig.vercel.config.routes.length > 0) {
+    console.warn("It is discouraged to use `vercel.config.routes` to override routes. Prefer using `vercel.rewrites` and `vercel.redirects`.");
+  }
+  return vercelOutputConfigSchema.parse({
+    version: 3,
+    ...(_h = resolvedConfig.vercel) == null ? void 0 : _h.config,
     routes: [
       ...routes ?? [],
-      ...(config == null ? void 0 : config.routes) ?? [],
-      ...((_c = (_b = resolvedConfig.vercel) == null ? void 0 : _b.config) == null ? void 0 : _c.routes) ?? []
+      ...((_j = (_i = resolvedConfig.vercel) == null ? void 0 : _i.config) == null ? void 0 : _j.routes) ?? []
     ],
-    overrides: __spreadValues(__spreadValues({}, (_e = (_d = resolvedConfig.vercel) == null ? void 0 : _d.config) == null ? void 0 : _e.overrides), config == null ? void 0 : config.overrides)
-  }));
+    overrides: {
+      ...(_l = (_k = resolvedConfig.vercel) == null ? void 0 : _k.config) == null ? void 0 : _l.overrides,
+      ...overrides
+    }
+  });
 }
 function getConfigDestination(resolvedConfig) {
   return import_path2.default.join(getOutput(resolvedConfig), "config.json");
 }
-async function writeConfig(resolvedConfig, config) {
-  await import_promises2.default.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, config), void 0, 2), "utf-8");
+async function writeConfig(resolvedConfig, rewrites, overrides) {
+  await import_promises2.default.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, rewrites, overrides), void 0, 2), "utf-8");
 }
 
 // src/build.ts
@@ -243,20 +237,26 @@ var vercelOutputVcConfigSchema = import_zod2.z.union([
 var import_promises3 = __toESM(require("fs/promises"), 1);
 function getAdditionalEndpoints(resolvedConfig) {
   var _a;
-  return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => __spreadProps(__spreadValues({}, e), {
-    destination: e.destination + ".func"
+  return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
+    ...e,
+    addRoute: e.addRoute ?? true,
+    destination: import_path3.default.resolve("/", e.destination) + ".func"
   }));
 }
 function getEntries(resolvedConfig) {
   const apiEntries = import_fast_glob.default.sync(`${getRoot(resolvedConfig)}/api/**/*.*([a-zA-Z0-9])`).filter((filepath) => !import_path3.default.basename(filepath).startsWith("_"));
-  return apiEntries.reduce((entryPoints, filePath) => {
-    const outFilePath = pathRelativeToApi(filePath, resolvedConfig);
+  if (apiEntries.length > 0) {
+    console.warn("@vercel/build is currently force building /api files itself, with no way to disable it. In order to avoid double compilation, you should temporarily rename /api to /_api while using this plugin. /_api functions are compiled under .vercel/output/functions/api/*.func as if they were in /api.");
+  }
+  const otherApiEntries = import_fast_glob.default.sync(`${getRoot(resolvedConfig)}/_api/**/*.*([a-zA-Z0-9])`).filter((filepath) => !import_path3.default.basename(filepath).startsWith("_"));
+  return [...apiEntries, ...otherApiEntries].reduce((entryPoints, filePath) => {
+    const outFilePath = pathRelativeTo(filePath, resolvedConfig, filePath.includes("/_api/") ? "_api" : "api");
     const parsed = import_path3.default.parse(outFilePath);
-    const entry = {
+    entryPoints.push({
       source: filePath,
-      destination: `api/${import_path3.default.join(parsed.dir, parsed.name)}.func`
-    };
-    entryPoints.push(entry);
+      destination: `api/${import_path3.default.posix.join(parsed.dir, parsed.name)}.func`,
+      addRoute: true
+    });
     return entryPoints;
   }, getAdditionalEndpoints(resolvedConfig));
 }
@@ -298,11 +298,21 @@ async function writeVcConfig(resolvedConfig, destination) {
     shouldAddHelpers: true
   }), void 0, 2), "utf-8");
 }
+function getSourceAndDestination(destination) {
+  if (destination.startsWith("api/")) {
+    return import_path3.default.posix.resolve("/", destination);
+  }
+  return import_path3.default.posix.resolve("/", destination, ":match*");
+}
 async function buildEndpoints(resolvedConfig) {
   const entries = getEntries(resolvedConfig);
   for (const entry of entries) {
     await buildFn(resolvedConfig, entry);
   }
+  return entries.filter((e) => e.addRoute !== false).map((e) => e.destination.replace(/\.func$/, "")).map((destination) => ({
+    source: getSourceAndDestination(destination),
+    destination: getSourceAndDestination(destination)
+  }));
 }
 
 // src/prerender.ts
@@ -333,9 +343,10 @@ async function writePrerenderConfig(resolvedConfig, destination, isr) {
   const parsed = import_path4.default.parse(destination);
   const outfile = import_path4.default.join(getOutput(resolvedConfig, "functions"), parsed.dir, parsed.name + ".prerender-config.json");
   await import_promises4.default.mkdir(import_path4.default.join(getOutput(resolvedConfig, "functions"), parsed.dir), { recursive: true });
-  await import_promises4.default.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse(__spreadValues({
-    group: group++
-  }, isr)), void 0, 2), "utf-8");
+  await import_promises4.default.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse({
+    group: group++,
+    ...isr
+  }), void 0, 2), "utf-8");
 }
 function getPrerenderSymlinkInfo(resolvedConfig, destination, target) {
   const parsed = import_path4.default.parse(destination);
@@ -349,8 +360,7 @@ async function buildPrerenderConfigs(resolvedConfig) {
   const isr = await getIsrConfig(resolvedConfig);
   const entries = Object.entries(isr);
   const rewrites = [];
-  for (const _a of entries) {
-    const [destination, _b] = _a, _c = _b, { symlink, route } = _c, isr2 = __objRest(_c, ["symlink", "route"]);
+  for (const [destination, { symlink, route, ...isr2 }] of entries) {
     await writePrerenderConfig(resolvedConfig, destination, isr2);
     if (symlink) {
       const info = getPrerenderSymlinkInfo(resolvedConfig, destination, symlink);
@@ -358,8 +368,8 @@ async function buildPrerenderConfigs(resolvedConfig) {
     }
     if (route) {
       rewrites.push({
-        src: `(${route})`,
-        dest: `${destination}/?__original_path=$1`
+        source: `(${route})`,
+        destination: `${destination}/?__original_path=$1`
       });
     }
   }
@@ -375,6 +385,7 @@ async function getIsrConfig(resolvedConfig) {
 }
 
 // src/index.ts
+var import_path5 = __toESM(require("path"), 1);
 function vercelPlugin() {
   let resolvedConfig;
   return {
@@ -398,12 +409,13 @@ function vercelPlugin() {
       var _a;
       if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr))
         return;
+      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
       const overrides = await execPrerender(resolvedConfig);
-      await buildEndpoints(resolvedConfig);
-      const rewrites = await buildPrerenderConfigs(resolvedConfig);
-      await writeConfig(resolvedConfig, {
-        routes: [{ handle: "filesystem" }, ...rewrites],
-        overrides
+      const rewrites = await buildEndpoints(resolvedConfig);
+      rewrites.push(...await buildPrerenderConfigs(resolvedConfig));
+      await writeConfig(resolvedConfig, rewrites, {
+        ...userOverrides,
+        ...overrides
       });
     }
   };
@@ -417,6 +429,28 @@ async function cleanOutputDirectory(resolvedConfig) {
     force: true
   });
 }
+async function computeStaticHtmlOverrides(resolvedConfig) {
+  const staticAbsolutePath = getOutput(resolvedConfig, "static");
+  const files = await getStaticHtmlFiles(resolvedConfig, staticAbsolutePath);
+  return files.reduce((acc, curr) => {
+    const relPath = import_path5.default.relative(staticAbsolutePath, curr);
+    const parsed = import_path5.default.parse(relPath);
+    const pathJoined = import_path5.default.join(parsed.dir, parsed.name);
+    acc[relPath] = {
+      path: pathJoined
+    };
+    return acc;
+  }, {});
+}
+async function getStaticHtmlFiles(resolvedConfig, src) {
+  const entries = await import_promises5.default.readdir(src, { withFileTypes: true });
+  const htmlFiles = [];
+  for (const entry of entries) {
+    const srcPath = import_path5.default.join(src, entry.name);
+    entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(resolvedConfig, srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
+  }
+  return htmlFiles;
+}
 function allPlugins() {
   return [vercelPlugin()];
 }

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { ResolvedConfig, Plugin } from 'vite';
 import { StdinOptions, BuildOptions } from 'esbuild';
 import { z } from 'zod';
+import { VercelConfig } from '@vercel/routing-utils';
 
 /**
  * Schema definition for `.vercel/output/config.json`
@@ -513,6 +514,12 @@ declare const vercelOutputPrerenderConfigSchema: z.ZodObject<{
 }>;
 declare type VercelOutputPrerenderConfig = z.infer<typeof vercelOutputPrerenderConfigSchema>;
 
+declare type ViteVercelRewrite = NonNullable<VercelConfig['rewrites']>[number] & {
+    enforce?: 'pre' | 'post';
+};
+declare type ViteVercelRedirect = NonNullable<VercelConfig['redirects']>[number] & {
+    enforce?: 'pre' | 'post';
+};
 interface ViteVercelConfig {
     /**
      * How long Functions should be allowed to run for every request in seconds.
@@ -552,6 +559,10 @@ interface ViteVercelConfig {
      * }
      * ```
      */
+    rewrites?: ViteVercelRewrite[];
+    redirects?: ViteVercelRedirect[];
+    cleanUrls?: VercelConfig['cleanUrls'];
+    trailingSlash?: VercelConfig['trailingSlash'];
     additionalEndpoints?: ViteVercelApiEntry[];
     /**
      * Advanced configuration to override .vercel/output/config.json
@@ -608,8 +619,13 @@ interface ViteVercelApiEntry {
      * Override esbuild options
      */
     buildOptions?: BuildOptions;
+    /**
+     * Automatically add a route for the function (mimics defaults Vercel behavior)
+     * Set to `false` to disable
+     */
+    addRoute?: boolean;
 }
 
 declare function allPlugins(): Plugin[];
 
-export { VercelOutputConfig, VercelOutputIsr, VercelOutputPrerenderConfig, VercelOutputVcConfig, ViteVercelApiEntry, ViteVercelConfig, ViteVercelPrerenderFn, ViteVercelPrerenderRoute, allPlugins as default };
+export { VercelOutputConfig, VercelOutputIsr, VercelOutputPrerenderConfig, VercelOutputVcConfig, ViteVercelApiEntry, ViteVercelConfig, ViteVercelPrerenderFn, ViteVercelPrerenderRoute, ViteVercelRedirect, ViteVercelRewrite, allPlugins as default };

package/dist/index.js

@@ -1,34 +1,4 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
+"use strict";
 
 // src/index.ts
 import fs5 from "fs/promises";
@@ -50,9 +20,9 @@ function getOutput(config, suffix) {
   var _a, _b;
   return path.join(((_a = config.vercel) == null ? void 0 : _a.outDir) ? "" : getRoot(config), ((_b = config.vercel) == null ? void 0 : _b.outDir) ?? ".vercel/output", suffix ?? "");
 }
-function pathRelativeToApi(filePath, config) {
+function pathRelativeTo(filePath, config, rel) {
   const root = getRoot(config);
-  return normalizePath(path.relative(path.join(root, "api"), filePath));
+  return normalizePath(path.relative(path.join(root, rel), filePath));
 }
 async function copyDir(src, dest) {
   await fs.mkdir(dest, { recursive: true });
@@ -148,29 +118,51 @@ var vercelOutputConfigSchema = z.object({
 // src/config.ts
 import fs2 from "fs/promises";
 import { getTransformedRoutes } from "@vercel/routing-utils";
-function getConfig(resolvedConfig, config) {
-  var _a, _b, _c, _d, _e;
-  const { routes } = getTransformedRoutes({
+function reorderEnforce(arr) {
+  return [
+    ...arr.filter((r) => r.enforce === "pre"),
+    ...arr.filter((r) => !r.enforce),
+    ...arr.filter((r) => r.enforce === "post")
+  ];
+}
+function getConfig(resolvedConfig, rewrites, overrides) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  const _rewrites = [
+    ...((_a = resolvedConfig.vercel) == null ? void 0 : _a.rewrites) ?? [],
+    ...rewrites ?? []
+  ];
+  const { routes, error } = getTransformedRoutes({
     nowConfig: {
-      cleanUrls: true
+      cleanUrls: ((_b = resolvedConfig.vercel) == null ? void 0 : _b.cleanUrls) ?? true,
+      trailingSlash: (_c = resolvedConfig.vercel) == null ? void 0 : _c.trailingSlash,
+      rewrites: reorderEnforce(_rewrites),
+      redirects: ((_d = resolvedConfig.vercel) == null ? void 0 : _d.redirects) ? reorderEnforce((_e = resolvedConfig.vercel) == null ? void 0 : _e.redirects) : void 0
     }
   });
-  return vercelOutputConfigSchema.parse(__spreadProps(__spreadValues({
-    version: 3
-  }, (_a = resolvedConfig.vercel) == null ? void 0 : _a.config), {
+  if (error) {
+    throw error;
+  }
+  if (((_g = (_f = resolvedConfig.vercel) == null ? void 0 : _f.config) == null ? void 0 : _g.routes) && resolvedConfig.vercel.config.routes.length > 0) {
+    console.warn("It is discouraged to use `vercel.config.routes` to override routes. Prefer using `vercel.rewrites` and `vercel.redirects`.");
+  }
+  return vercelOutputConfigSchema.parse({
+    version: 3,
+    ...(_h = resolvedConfig.vercel) == null ? void 0 : _h.config,
     routes: [
       ...routes ?? [],
-      ...(config == null ? void 0 : config.routes) ?? [],
-      ...((_c = (_b = resolvedConfig.vercel) == null ? void 0 : _b.config) == null ? void 0 : _c.routes) ?? []
+      ...((_j = (_i = resolvedConfig.vercel) == null ? void 0 : _i.config) == null ? void 0 : _j.routes) ?? []
     ],
-    overrides: __spreadValues(__spreadValues({}, (_e = (_d = resolvedConfig.vercel) == null ? void 0 : _d.config) == null ? void 0 : _e.overrides), config == null ? void 0 : config.overrides)
-  }));
+    overrides: {
+      ...(_l = (_k = resolvedConfig.vercel) == null ? void 0 : _k.config) == null ? void 0 : _l.overrides,
+      ...overrides
+    }
+  });
 }
 function getConfigDestination(resolvedConfig) {
   return path2.join(getOutput(resolvedConfig), "config.json");
 }
-async function writeConfig(resolvedConfig, config) {
-  await fs2.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, config), void 0, 2), "utf-8");
+async function writeConfig(resolvedConfig, rewrites, overrides) {
+  await fs2.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, rewrites, overrides), void 0, 2), "utf-8");
 }
 
 // src/build.ts
@@ -220,20 +212,26 @@ var vercelOutputVcConfigSchema = z2.union([
 import fs3 from "fs/promises";
 function getAdditionalEndpoints(resolvedConfig) {
   var _a;
-  return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => __spreadProps(__spreadValues({}, e), {
-    destination: e.destination + ".func"
+  return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
+    ...e,
+    addRoute: e.addRoute ?? true,
+    destination: path3.resolve("/", e.destination) + ".func"
   }));
 }
 function getEntries(resolvedConfig) {
   const apiEntries = glob.sync(`${getRoot(resolvedConfig)}/api/**/*.*([a-zA-Z0-9])`).filter((filepath) => !path3.basename(filepath).startsWith("_"));
-  return apiEntries.reduce((entryPoints, filePath) => {
-    const outFilePath = pathRelativeToApi(filePath, resolvedConfig);
+  if (apiEntries.length > 0) {
+    console.warn("@vercel/build is currently force building /api files itself, with no way to disable it. In order to avoid double compilation, you should temporarily rename /api to /_api while using this plugin. /_api functions are compiled under .vercel/output/functions/api/*.func as if they were in /api.");
+  }
+  const otherApiEntries = glob.sync(`${getRoot(resolvedConfig)}/_api/**/*.*([a-zA-Z0-9])`).filter((filepath) => !path3.basename(filepath).startsWith("_"));
+  return [...apiEntries, ...otherApiEntries].reduce((entryPoints, filePath) => {
+    const outFilePath = pathRelativeTo(filePath, resolvedConfig, filePath.includes("/_api/") ? "_api" : "api");
     const parsed = path3.parse(outFilePath);
-    const entry = {
+    entryPoints.push({
       source: filePath,
-      destination: `api/${path3.join(parsed.dir, parsed.name)}.func`
-    };
-    entryPoints.push(entry);
+      destination: `api/${path3.posix.join(parsed.dir, parsed.name)}.func`,
+      addRoute: true
+    });
     return entryPoints;
   }, getAdditionalEndpoints(resolvedConfig));
 }
@@ -275,11 +273,21 @@ async function writeVcConfig(resolvedConfig, destination) {
     shouldAddHelpers: true
   }), void 0, 2), "utf-8");
 }
+function getSourceAndDestination(destination) {
+  if (destination.startsWith("api/")) {
+    return path3.posix.resolve("/", destination);
+  }
+  return path3.posix.resolve("/", destination, ":match*");
+}
 async function buildEndpoints(resolvedConfig) {
   const entries = getEntries(resolvedConfig);
   for (const entry of entries) {
     await buildFn(resolvedConfig, entry);
   }
+  return entries.filter((e) => e.addRoute !== false).map((e) => e.destination.replace(/\.func$/, "")).map((destination) => ({
+    source: getSourceAndDestination(destination),
+    destination: getSourceAndDestination(destination)
+  }));
 }
 
 // src/prerender.ts
@@ -310,9 +318,10 @@ async function writePrerenderConfig(resolvedConfig, destination, isr) {
   const parsed = path4.parse(destination);
   const outfile = path4.join(getOutput(resolvedConfig, "functions"), parsed.dir, parsed.name + ".prerender-config.json");
   await fs4.mkdir(path4.join(getOutput(resolvedConfig, "functions"), parsed.dir), { recursive: true });
-  await fs4.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse(__spreadValues({
-    group: group++
-  }, isr)), void 0, 2), "utf-8");
+  await fs4.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse({
+    group: group++,
+    ...isr
+  }), void 0, 2), "utf-8");
 }
 function getPrerenderSymlinkInfo(resolvedConfig, destination, target) {
   const parsed = path4.parse(destination);
@@ -326,8 +335,7 @@ async function buildPrerenderConfigs(resolvedConfig) {
   const isr = await getIsrConfig(resolvedConfig);
   const entries = Object.entries(isr);
   const rewrites = [];
-  for (const _a of entries) {
-    const [destination, _b] = _a, _c = _b, { symlink, route } = _c, isr2 = __objRest(_c, ["symlink", "route"]);
+  for (const [destination, { symlink, route, ...isr2 }] of entries) {
     await writePrerenderConfig(resolvedConfig, destination, isr2);
     if (symlink) {
       const info = getPrerenderSymlinkInfo(resolvedConfig, destination, symlink);
@@ -335,8 +343,8 @@ async function buildPrerenderConfigs(resolvedConfig) {
     }
     if (route) {
       rewrites.push({
-        src: `(${route})`,
-        dest: `${destination}/?__original_path=$1`
+        source: `(${route})`,
+        destination: `${destination}/?__original_path=$1`
       });
     }
   }
@@ -352,6 +360,7 @@ async function getIsrConfig(resolvedConfig) {
 }
 
 // src/index.ts
+import path5 from "path";
 function vercelPlugin() {
   let resolvedConfig;
   return {
@@ -375,12 +384,13 @@ function vercelPlugin() {
       var _a;
       if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr))
         return;
+      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
       const overrides = await execPrerender(resolvedConfig);
-      await buildEndpoints(resolvedConfig);
-      const rewrites = await buildPrerenderConfigs(resolvedConfig);
-      await writeConfig(resolvedConfig, {
-        routes: [{ handle: "filesystem" }, ...rewrites],
-        overrides
+      const rewrites = await buildEndpoints(resolvedConfig);
+      rewrites.push(...await buildPrerenderConfigs(resolvedConfig));
+      await writeConfig(resolvedConfig, rewrites, {
+        ...userOverrides,
+        ...overrides
       });
     }
   };
@@ -394,6 +404,28 @@ async function cleanOutputDirectory(resolvedConfig) {
     force: true
   });
 }
+async function computeStaticHtmlOverrides(resolvedConfig) {
+  const staticAbsolutePath = getOutput(resolvedConfig, "static");
+  const files = await getStaticHtmlFiles(resolvedConfig, staticAbsolutePath);
+  return files.reduce((acc, curr) => {
+    const relPath = path5.relative(staticAbsolutePath, curr);
+    const parsed = path5.parse(relPath);
+    const pathJoined = path5.join(parsed.dir, parsed.name);
+    acc[relPath] = {
+      path: pathJoined
+    };
+    return acc;
+  }, {});
+}
+async function getStaticHtmlFiles(resolvedConfig, src) {
+  const entries = await fs5.readdir(src, { withFileTypes: true });
+  const htmlFiles = [];
+  for (const entry of entries) {
+    const srcPath = path5.join(src, entry.name);
+    entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(resolvedConfig, srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
+  }
+  return htmlFiles;
+}
 function allPlugins() {
   return [vercelPlugin()];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "type": "module",
   "files": [
     "dist",
@@ -23,20 +23,20 @@
     "vite": "^2.9.9"
   },
   "devDependencies": {
-    "@types/node": "^17.0.34",
-    "@typescript-eslint/eslint-plugin": "^5.24.0",
-    "@typescript-eslint/parser": "^5.24.0",
-    "eslint": "^8.15.0",
-    "eslint-plugin-solid": "^0.4.7",
-    "tsup": "^5.12.8",
-    "typescript": "^4.6.4"
+    "@types/node": "^16.11.41",
+    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "@typescript-eslint/parser": "^5.29.0",
+    "eslint": "^8.18.0",
+    "tsup": "^6.1.2",
+    "typescript": "^4.7.4",
+    "vite": "^2.9.12"
   },
   "dependencies": {
-    "@brillout/libassert": "^0.5.6",
-    "@vercel/routing-utils": "^1.13.2",
-    "esbuild": "^0.14.39",
+    "@brillout/libassert": "^0.5.8",
+    "@vercel/routing-utils": "^1.13.4",
+    "esbuild": "^0.14.47",
     "fast-glob": "^3.2.11",
-    "zod": "^3.16.0"
+    "zod": "^3.17.3"
   },
   "scripts": {
     "build": "tsup",