vite-plugin-vercel 3.0.1 → 4.0.0

package/dist/index.cjs

@@ -33,7 +33,7 @@ __export(src_exports, {
   default: () => allPlugins
 });
 module.exports = __toCommonJS(src_exports);
-var import_promises4 = __toESM(require("fs/promises"), 1);
+var import_promises5 = __toESM(require("fs/promises"), 1);
 
 // src/utils.ts
 var import_vite = require("vite");
@@ -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),
@@ -544,7 +548,7 @@ async function buildEndpoints(resolvedConfig) {
 }
 
 // src/prerender.ts
-var import_path4 = __toESM(require("path"), 1);
+var import_path5 = __toESM(require("path"), 1);
 
 // src/schemas/config/prerender-config.ts
 var import_zod4 = require("zod");
@@ -557,7 +561,22 @@ var vercelOutputPrerenderConfigSchema = import_zod4.z.object({
 }).strict();
 
 // src/prerender.ts
+var import_promises4 = __toESM(require("fs/promises"), 1);
+
+// src/helpers.ts
 var import_promises3 = __toESM(require("fs/promises"), 1);
+var import_path4 = __toESM(require("path"), 1);
+async function copyDir(src, dest) {
+  await import_promises3.default.mkdir(dest, { recursive: true });
+  const entries = await import_promises3.default.readdir(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = import_path4.default.join(src, entry.name);
+    const destPath = import_path4.default.join(dest, entry.name);
+    entry.isDirectory() ? await copyDir(srcPath, destPath) : await import_promises3.default.copyFile(srcPath, destPath);
+  }
+}
+
+// src/prerender.ts
 function execPrerender(resolvedConfig) {
   var _a;
   const prerender = (_a = resolvedConfig.vercel) == null ? void 0 : _a.prerender;
@@ -568,17 +587,17 @@ function execPrerender(resolvedConfig) {
 }
 var group = 1;
 async function writePrerenderConfig(resolvedConfig, destination, isr) {
-  const parsed = import_path4.default.parse(destination);
-  const outfile = import_path4.default.join(
+  const parsed = import_path5.default.parse(destination);
+  const outfile = import_path5.default.join(
     getOutput(resolvedConfig, "functions"),
     parsed.dir,
     parsed.name + ".prerender-config.json"
   );
-  await import_promises3.default.mkdir(
-    import_path4.default.join(getOutput(resolvedConfig, "functions"), parsed.dir),
+  await import_promises4.default.mkdir(
+    import_path5.default.join(getOutput(resolvedConfig, "functions"), parsed.dir),
     { recursive: true }
   );
-  await import_promises3.default.writeFile(
+  await import_promises4.default.writeFile(
     outfile,
     JSON.stringify(
       vercelOutputPrerenderConfigSchema.parse({
@@ -592,15 +611,15 @@ async function writePrerenderConfig(resolvedConfig, destination, isr) {
   );
 }
 function getPrerenderSymlinkInfo(resolvedConfig, destination, target) {
-  const parsed = import_path4.default.parse(destination);
-  const targetParsed = import_path4.default.parse(target);
+  const parsed = import_path5.default.parse(destination);
+  const targetParsed = import_path5.default.parse(target);
   return {
-    target: import_path4.default.join(
+    target: import_path5.default.join(
       getOutput(resolvedConfig, "functions"),
       targetParsed.dir,
       targetParsed.name + ".func"
     ),
-    link: import_path4.default.join(
+    link: import_path5.default.join(
       getOutput(resolvedConfig, "functions"),
       parsed.dir,
       parsed.name + ".func"
@@ -634,15 +653,6 @@ async function buildPrerenderConfigs(resolvedConfig, extractedIsr) {
   }
   return rewrites;
 }
-async function copyDir(src, dest) {
-  await import_promises3.default.mkdir(dest, { recursive: true });
-  const entries = await import_promises3.default.readdir(src, { withFileTypes: true });
-  for (const entry of entries) {
-    const srcPath = import_path4.default.join(src, entry.name);
-    const destPath = import_path4.default.join(dest, entry.name);
-    entry.isDirectory() ? await copyDir(srcPath, destPath) : await import_promises3.default.copyFile(srcPath, destPath);
-  }
-}
 async function getIsrConfig(resolvedConfig) {
   var _a;
   const isr = ((_a = resolvedConfig.vercel) == null ? void 0 : _a.isr) ?? {};
@@ -653,7 +663,7 @@ async function getIsrConfig(resolvedConfig) {
 }
 
 // src/index.ts
-var import_path5 = __toESM(require("path"), 1);
+var import_path6 = __toESM(require("path"), 1);
 function vercelPlugin() {
   let resolvedConfig;
   let vikeFound = false;
@@ -662,10 +672,15 @@ function vercelPlugin() {
     name: "vite-plugin-vercel",
     enforce: "post",
     configResolved(config) {
+      var _a;
       resolvedConfig = config;
       vikeFound = resolvedConfig.plugins.some(
         (p) => p.name.match("^vite-plugin-ssr:|^vike:")
       );
+      if (typeof ((_a = resolvedConfig.vercel) == null ? void 0 : _a.distContainsOnlyStatic) === "undefined") {
+        resolvedConfig.vercel ??= {};
+        resolvedConfig.vercel.distContainsOnlyStatic = !vikeFound;
+      }
     },
     async writeBundle() {
       var _a;
@@ -688,15 +703,25 @@ function vercelPlugin() {
         },
         headers
       );
+      await copyDistToStatic(resolvedConfig);
     }
   };
 }
 async function cleanOutputDirectory(resolvedConfig) {
-  await import_promises4.default.rm(getOutput(resolvedConfig), {
+  await import_promises5.default.rm(getOutput(resolvedConfig), {
     recursive: true,
     force: true
   });
-  await import_promises4.default.mkdir(getOutput(resolvedConfig), { recursive: true });
+  await import_promises5.default.mkdir(getOutput(resolvedConfig), { recursive: true });
+}
+async function copyDistToStatic(resolvedConfig) {
+  var _a;
+  if ((_a = resolvedConfig.vercel) == null ? void 0 : _a.distContainsOnlyStatic) {
+    await copyDir(
+      resolvedConfig.build.outDir,
+      getOutput(resolvedConfig, "static")
+    );
+  }
 }
 async function computeStaticHtmlOverrides(resolvedConfig) {
   const staticAbsolutePath = getOutput(resolvedConfig, "static");
@@ -707,9 +732,9 @@ async function computeStaticHtmlOverrides(resolvedConfig) {
     ...publicFiles.map((f) => f.replace(publicDir, 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);
+    const relPath = import_path6.default.relative(staticAbsolutePath, curr);
+    const parsed = import_path6.default.parse(relPath);
+    const pathJoined = import_path6.default.join(parsed.dir, parsed.name);
     acc[relPath] = {
       path: pathJoined
     };
@@ -718,14 +743,14 @@ async function computeStaticHtmlOverrides(resolvedConfig) {
 }
 async function getStaticHtmlFiles(src) {
   try {
-    await import_promises4.default.stat(src);
+    await import_promises5.default.stat(src);
   } catch (e) {
     return [];
   }
-  const entries = await import_promises4.default.readdir(src, { withFileTypes: true });
+  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);
+    const srcPath = import_path6.default.join(src, entry.name);
     entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
   }
   return htmlFiles;

package/dist/index.d.cts

@@ -607,6 +607,13 @@ interface ViteVercelConfig {
      * @protected
      */
     outDir?: string;
+    /**
+     * By default, Vite generates static files under `dist` folder.
+     * But usually, when used through a Framework, such as Vike,
+     * this folder can contain anything, requiring custom integration.
+     * Set this to false is you create a plugin for a Framework.
+     */
+    distContainsOnlyStatic?: boolean;
 }
 interface VercelOutputIsr extends VercelOutputPrerenderConfig {
     symlink?: string;

package/dist/index.d.ts

@@ -607,6 +607,13 @@ interface ViteVercelConfig {
      * @protected
      */
     outDir?: string;
+    /**
+     * By default, Vite generates static files under `dist` folder.
+     * But usually, when used through a Framework, such as Vike,
+     * this folder can contain anything, requiring custom integration.
+     * Set this to false is you create a plugin for a Framework.
+     */
+    distContainsOnlyStatic?: boolean;
 }
 interface VercelOutputIsr extends VercelOutputPrerenderConfig {
     symlink?: string;

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import fs4 from "fs/promises";
+import fs5 from "fs/promises";
 
 // src/utils.ts
 import { normalizePath } from "vite";
@@ -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),
@@ -514,7 +518,7 @@ async function buildEndpoints(resolvedConfig) {
 }
 
 // src/prerender.ts
-import path4 from "path";
+import path5 from "path";
 
 // src/schemas/config/prerender-config.ts
 import { z as z4 } from "zod";
@@ -527,7 +531,22 @@ var vercelOutputPrerenderConfigSchema = z4.object({
 }).strict();
 
 // src/prerender.ts
+import fs4 from "fs/promises";
+
+// src/helpers.ts
 import fs3 from "fs/promises";
+import path4 from "path";
+async function copyDir(src, dest) {
+  await fs3.mkdir(dest, { recursive: true });
+  const entries = await fs3.readdir(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path4.join(src, entry.name);
+    const destPath = path4.join(dest, entry.name);
+    entry.isDirectory() ? await copyDir(srcPath, destPath) : await fs3.copyFile(srcPath, destPath);
+  }
+}
+
+// src/prerender.ts
 function execPrerender(resolvedConfig) {
   var _a;
   const prerender = (_a = resolvedConfig.vercel) == null ? void 0 : _a.prerender;
@@ -538,17 +557,17 @@ function execPrerender(resolvedConfig) {
 }
 var group = 1;
 async function writePrerenderConfig(resolvedConfig, destination, isr) {
-  const parsed = path4.parse(destination);
-  const outfile = path4.join(
+  const parsed = path5.parse(destination);
+  const outfile = path5.join(
     getOutput(resolvedConfig, "functions"),
     parsed.dir,
     parsed.name + ".prerender-config.json"
   );
-  await fs3.mkdir(
-    path4.join(getOutput(resolvedConfig, "functions"), parsed.dir),
+  await fs4.mkdir(
+    path5.join(getOutput(resolvedConfig, "functions"), parsed.dir),
     { recursive: true }
   );
-  await fs3.writeFile(
+  await fs4.writeFile(
     outfile,
     JSON.stringify(
       vercelOutputPrerenderConfigSchema.parse({
@@ -562,15 +581,15 @@ async function writePrerenderConfig(resolvedConfig, destination, isr) {
   );
 }
 function getPrerenderSymlinkInfo(resolvedConfig, destination, target) {
-  const parsed = path4.parse(destination);
-  const targetParsed = path4.parse(target);
+  const parsed = path5.parse(destination);
+  const targetParsed = path5.parse(target);
   return {
-    target: path4.join(
+    target: path5.join(
       getOutput(resolvedConfig, "functions"),
       targetParsed.dir,
       targetParsed.name + ".func"
     ),
-    link: path4.join(
+    link: path5.join(
       getOutput(resolvedConfig, "functions"),
       parsed.dir,
       parsed.name + ".func"
@@ -604,15 +623,6 @@ async function buildPrerenderConfigs(resolvedConfig, extractedIsr) {
   }
   return rewrites;
 }
-async function copyDir(src, dest) {
-  await fs3.mkdir(dest, { recursive: true });
-  const entries = await fs3.readdir(src, { withFileTypes: true });
-  for (const entry of entries) {
-    const srcPath = path4.join(src, entry.name);
-    const destPath = path4.join(dest, entry.name);
-    entry.isDirectory() ? await copyDir(srcPath, destPath) : await fs3.copyFile(srcPath, destPath);
-  }
-}
 async function getIsrConfig(resolvedConfig) {
   var _a;
   const isr = ((_a = resolvedConfig.vercel) == null ? void 0 : _a.isr) ?? {};
@@ -623,7 +633,7 @@ async function getIsrConfig(resolvedConfig) {
 }
 
 // src/index.ts
-import path5 from "path";
+import path6 from "path";
 function vercelPlugin() {
   let resolvedConfig;
   let vikeFound = false;
@@ -632,10 +642,15 @@ function vercelPlugin() {
     name: "vite-plugin-vercel",
     enforce: "post",
     configResolved(config) {
+      var _a;
       resolvedConfig = config;
       vikeFound = resolvedConfig.plugins.some(
         (p) => p.name.match("^vite-plugin-ssr:|^vike:")
       );
+      if (typeof ((_a = resolvedConfig.vercel) == null ? void 0 : _a.distContainsOnlyStatic) === "undefined") {
+        resolvedConfig.vercel ??= {};
+        resolvedConfig.vercel.distContainsOnlyStatic = !vikeFound;
+      }
     },
     async writeBundle() {
       var _a;
@@ -658,15 +673,25 @@ function vercelPlugin() {
         },
         headers
       );
+      await copyDistToStatic(resolvedConfig);
     }
   };
 }
 async function cleanOutputDirectory(resolvedConfig) {
-  await fs4.rm(getOutput(resolvedConfig), {
+  await fs5.rm(getOutput(resolvedConfig), {
     recursive: true,
     force: true
   });
-  await fs4.mkdir(getOutput(resolvedConfig), { recursive: true });
+  await fs5.mkdir(getOutput(resolvedConfig), { recursive: true });
+}
+async function copyDistToStatic(resolvedConfig) {
+  var _a;
+  if ((_a = resolvedConfig.vercel) == null ? void 0 : _a.distContainsOnlyStatic) {
+    await copyDir(
+      resolvedConfig.build.outDir,
+      getOutput(resolvedConfig, "static")
+    );
+  }
 }
 async function computeStaticHtmlOverrides(resolvedConfig) {
   const staticAbsolutePath = getOutput(resolvedConfig, "static");
@@ -677,9 +702,9 @@ async function computeStaticHtmlOverrides(resolvedConfig) {
     ...publicFiles.map((f) => f.replace(publicDir, 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);
+    const relPath = path6.relative(staticAbsolutePath, curr);
+    const parsed = path6.parse(relPath);
+    const pathJoined = path6.join(parsed.dir, parsed.name);
     acc[relPath] = {
       path: pathJoined
     };
@@ -688,14 +713,14 @@ async function computeStaticHtmlOverrides(resolvedConfig) {
 }
 async function getStaticHtmlFiles(src) {
   try {
-    await fs4.stat(src);
+    await fs5.stat(src);
   } catch (e) {
     return [];
   }
-  const entries = await fs4.readdir(src, { withFileTypes: true });
+  const entries = await fs5.readdir(src, { withFileTypes: true });
   const htmlFiles = [];
   for (const entry of entries) {
-    const srcPath = path5.join(src, entry.name);
+    const srcPath = path6.join(src, entry.name);
     entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
   }
   return htmlFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "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.0"
   },
   "peerDependenciesMeta": {
     "@vite-plugin-vercel/vike": {
@@ -33,21 +33,21 @@
     }
   },
   "devDependencies": {
-    "@types/node": "^16.18.71",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
+    "@types/node": "^16.18.76",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
     "eslint": "^8.56.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vike": "^0.4.157",
-    "vite": "^5.0.11",
-    "@vite-plugin-vercel/vike": "3.0.1"
+    "vike": "^0.4.160",
+    "vite": "^5.0.12",
+    "@vite-plugin-vercel/vike": "4.0.0"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",
-    "@vercel/build-utils": "^7.5.0",
+    "@vercel/build-utils": "^7.5.1",
     "@vercel/routing-utils": "^3.1.0",
-    "esbuild": "^0.19.11",
+    "esbuild": "^0.19.12",
     "eval": "^0.1.8",
     "fast-glob": "^3.3.2",
     "magicast": "^0.3.3",