vite-plugin-vercel 3.0.2 → 4.0.1

package/README.md

@@ -4,6 +4,19 @@ 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).
 
+## Install
+```bash
+npm i -D vite-plugin-vercel
+```
+```bash
+yarn add -D vite-plugin-vercel
+```
+```bash
+pnpm add -D vite-plugin-vercel
+```
+```bash
+bun add -D vite-plugin-vercel
+```
 ## Features
 
 - [x] [SSG/Static files](https://vercel.com/docs/build-output-api/v3/primitives#static-files)

package/dist/index.cjs

@@ -458,6 +458,10 @@ function getSourceAndDestination(destination) {
   }
   return import_path3.default.posix.resolve("/", destination, ":match*");
 }
+var RE_BRACKETS = /^\[([^/]+)\]$/gm;
+function replaceBrackets(source) {
+  return source.split("/").map((segment) => segment.replace(RE_BRACKETS, ":$1")).join("/");
+}
 async function removeDefaultExport(filepath) {
   const mod = await (0, import_magicast.loadFile)(filepath);
   try {
@@ -529,7 +533,7 @@ async function buildEndpoints(resolvedConfig) {
   );
   return {
     rewrites: entries.filter((e) => e.addRoute !== false).map((e) => e.destination.replace(/\.func$/, "")).map((destination) => ({
-      source: getSourceAndDestination(destination),
+      source: replaceBrackets(getSourceAndDestination(destination)),
       destination: getSourceAndDestination(destination)
     })),
     isr: Object.fromEntries(isrEntries),
@@ -660,6 +664,27 @@ async function getIsrConfig(resolvedConfig) {
 
 // src/index.ts
 var import_path6 = __toESM(require("path"), 1);
+function vercelPluginCleanup() {
+  let resolvedConfig;
+  return {
+    apply: "build",
+    name: "vite-plugin-vercel:cleanup",
+    enforce: "pre",
+    configResolved(config) {
+      resolvedConfig = config;
+    },
+    writeBundle: {
+      order: "pre",
+      sequential: true,
+      async handler() {
+        var _a;
+        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+          await cleanOutputDirectory(resolvedConfig);
+        }
+      }
+    }
+  };
+}
 function vercelPlugin() {
   let resolvedConfig;
   let vikeFound = false;
@@ -678,28 +703,31 @@ function vercelPlugin() {
         resolvedConfig.vercel.distContainsOnlyStatic = !vikeFound;
       }
     },
-    async writeBundle() {
-      var _a;
-      if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
-        await cleanOutputDirectory(resolvedConfig);
-        if (vikeFound) {
-          return;
+    writeBundle: {
+      order: "post",
+      sequential: true,
+      async handler() {
+        var _a;
+        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+          if (vikeFound) {
+            return;
+          }
         }
+        const overrides = await execPrerender(resolvedConfig);
+        const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
+        const { rewrites, isr, headers } = await buildEndpoints(resolvedConfig);
+        rewrites.push(...await buildPrerenderConfigs(resolvedConfig, isr));
+        await writeConfig(
+          resolvedConfig,
+          rewrites,
+          {
+            ...userOverrides,
+            ...overrides
+          },
+          headers
+        );
+        await copyDistToStatic(resolvedConfig);
       }
-      const overrides = await execPrerender(resolvedConfig);
-      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
-      const { rewrites, isr, headers } = await buildEndpoints(resolvedConfig);
-      rewrites.push(...await buildPrerenderConfigs(resolvedConfig, isr));
-      await writeConfig(
-        resolvedConfig,
-        rewrites,
-        {
-          ...userOverrides,
-          ...overrides
-        },
-        headers
-      );
-      await copyDistToStatic(resolvedConfig);
     }
   };
 }
@@ -767,5 +795,9 @@ async function tryImportVpvv() {
   }
 }
 function allPlugins(options = {}) {
-  return [vercelPlugin(), options.smart !== false ? tryImportVpvv() : null];
+  return [
+    vercelPluginCleanup(),
+    vercelPlugin(),
+    options.smart !== false ? tryImportVpvv() : null
+  ];
 }

package/dist/index.d.cts

@@ -438,22 +438,22 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     environment: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     regions: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strict", z.ZodTypeAny, {
-    runtime: string;
     handler: string;
+    runtime: string;
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
     regions?: string[] | undefined;
 }, {
-    runtime: string;
     handler: string;
+    runtime: string;
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
     regions?: string[] | undefined;
 }>, z.ZodObject<{
-    runtime: z.ZodString;
     handler: z.ZodString;
+    runtime: z.ZodString;
     memory: z.ZodOptional<z.ZodNumber>;
     maxDuration: z.ZodOptional<z.ZodNumber>;
     environment: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
@@ -463,8 +463,8 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     shouldAddSourcemapSupport: z.ZodOptional<z.ZodBoolean>;
     awsLambdaHandler: z.ZodOptional<z.ZodString>;
 }, "strict", z.ZodTypeAny, {
-    runtime: string;
     handler: string;
+    runtime: string;
     launcherType: "Nodejs";
     memory?: number | undefined;
     maxDuration?: number | undefined;
@@ -474,8 +474,8 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     shouldAddSourcemapSupport?: boolean | undefined;
     awsLambdaHandler?: string | undefined;
 }, {
-    runtime: string;
     handler: string;
+    runtime: string;
     launcherType: "Nodejs";
     memory?: number | undefined;
     maxDuration?: number | undefined;

package/dist/index.d.ts

@@ -438,22 +438,22 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     environment: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     regions: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strict", z.ZodTypeAny, {
-    runtime: string;
     handler: string;
+    runtime: string;
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
     regions?: string[] | undefined;
 }, {
-    runtime: string;
     handler: string;
+    runtime: string;
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
     regions?: string[] | undefined;
 }>, z.ZodObject<{
-    runtime: z.ZodString;
     handler: z.ZodString;
+    runtime: z.ZodString;
     memory: z.ZodOptional<z.ZodNumber>;
     maxDuration: z.ZodOptional<z.ZodNumber>;
     environment: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
@@ -463,8 +463,8 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     shouldAddSourcemapSupport: z.ZodOptional<z.ZodBoolean>;
     awsLambdaHandler: z.ZodOptional<z.ZodString>;
 }, "strict", z.ZodTypeAny, {
-    runtime: string;
     handler: string;
+    runtime: string;
     launcherType: "Nodejs";
     memory?: number | undefined;
     maxDuration?: number | undefined;
@@ -474,8 +474,8 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     shouldAddSourcemapSupport?: boolean | undefined;
     awsLambdaHandler?: string | undefined;
 }, {
-    runtime: string;
     handler: string;
+    runtime: string;
     launcherType: "Nodejs";
     memory?: number | undefined;
     maxDuration?: number | undefined;

package/dist/index.js

@@ -428,6 +428,10 @@ function getSourceAndDestination(destination) {
   }
   return path3.posix.resolve("/", destination, ":match*");
 }
+var RE_BRACKETS = /^\[([^/]+)\]$/gm;
+function replaceBrackets(source) {
+  return source.split("/").map((segment) => segment.replace(RE_BRACKETS, ":$1")).join("/");
+}
 async function removeDefaultExport(filepath) {
   const mod = await loadFile(filepath);
   try {
@@ -499,7 +503,7 @@ async function buildEndpoints(resolvedConfig) {
   );
   return {
     rewrites: entries.filter((e) => e.addRoute !== false).map((e) => e.destination.replace(/\.func$/, "")).map((destination) => ({
-      source: getSourceAndDestination(destination),
+      source: replaceBrackets(getSourceAndDestination(destination)),
       destination: getSourceAndDestination(destination)
     })),
     isr: Object.fromEntries(isrEntries),
@@ -630,6 +634,27 @@ async function getIsrConfig(resolvedConfig) {
 
 // src/index.ts
 import path6 from "path";
+function vercelPluginCleanup() {
+  let resolvedConfig;
+  return {
+    apply: "build",
+    name: "vite-plugin-vercel:cleanup",
+    enforce: "pre",
+    configResolved(config) {
+      resolvedConfig = config;
+    },
+    writeBundle: {
+      order: "pre",
+      sequential: true,
+      async handler() {
+        var _a;
+        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+          await cleanOutputDirectory(resolvedConfig);
+        }
+      }
+    }
+  };
+}
 function vercelPlugin() {
   let resolvedConfig;
   let vikeFound = false;
@@ -648,28 +673,31 @@ function vercelPlugin() {
         resolvedConfig.vercel.distContainsOnlyStatic = !vikeFound;
       }
     },
-    async writeBundle() {
-      var _a;
-      if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
-        await cleanOutputDirectory(resolvedConfig);
-        if (vikeFound) {
-          return;
+    writeBundle: {
+      order: "post",
+      sequential: true,
+      async handler() {
+        var _a;
+        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+          if (vikeFound) {
+            return;
+          }
         }
+        const overrides = await execPrerender(resolvedConfig);
+        const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
+        const { rewrites, isr, headers } = await buildEndpoints(resolvedConfig);
+        rewrites.push(...await buildPrerenderConfigs(resolvedConfig, isr));
+        await writeConfig(
+          resolvedConfig,
+          rewrites,
+          {
+            ...userOverrides,
+            ...overrides
+          },
+          headers
+        );
+        await copyDistToStatic(resolvedConfig);
       }
-      const overrides = await execPrerender(resolvedConfig);
-      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
-      const { rewrites, isr, headers } = await buildEndpoints(resolvedConfig);
-      rewrites.push(...await buildPrerenderConfigs(resolvedConfig, isr));
-      await writeConfig(
-        resolvedConfig,
-        rewrites,
-        {
-          ...userOverrides,
-          ...overrides
-        },
-        headers
-      );
-      await copyDistToStatic(resolvedConfig);
     }
   };
 }
@@ -737,7 +765,11 @@ async function tryImportVpvv() {
   }
 }
 function allPlugins(options = {}) {
-  return [vercelPlugin(), options.smart !== false ? tryImportVpvv() : null];
+  return [
+    vercelPluginCleanup(),
+    vercelPlugin(),
+    options.smart !== false ? tryImportVpvv() : null
+  ];
 }
 export {
   allPlugins as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "3.0.2",
+  "version": "4.0.1",
   "type": "module",
   "files": [
     "dist",
@@ -22,7 +22,7 @@
   "peerDependencies": {
     "vike": "*",
     "vite": "^4.4 || ^5.0.2",
-    "@vite-plugin-vercel/vike": "3.0.1"
+    "@vite-plugin-vercel/vike": "4.0.1"
   },
   "peerDependenciesMeta": {
     "@vite-plugin-vercel/vike": {
@@ -41,7 +41,7 @@
     "typescript": "^5.3.3",
     "vike": "^0.4.160",
     "vite": "^5.0.12",
-    "@vite-plugin-vercel/vike": "3.0.1"
+    "@vite-plugin-vercel/vike": "4.0.1"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",