vite-plugin-vercel 7.0.2 → 8.0.1

package/dist/index.cjs

@@ -42,10 +42,9 @@ function getRoot(config) {
   return (0, import_vite.normalizePath)(config.root || process.cwd());
 }
 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",
+    config.vercel?.outDir ? "" : getRoot(config),
+    config.vercel?.outDir ?? ".vercel/output",
     suffix ?? ""
   );
 }
@@ -159,23 +158,22 @@ function reorderEnforce(arr) {
   ];
 }
 function getConfig(resolvedConfig, rewrites, overrides, headers) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const _rewrites = [
     // User provided config always comes first
-    ...((_a = resolvedConfig.vercel) == null ? void 0 : _a.rewrites) ?? [],
+    ...resolvedConfig.vercel?.rewrites ?? [],
     ...rewrites ?? []
   ];
   const { routes, error } = (0, import_routing_utils.getTransformedRoutes)({
-    cleanUrls: ((_b = resolvedConfig.vercel) == null ? void 0 : _b.cleanUrls) ?? true,
-    trailingSlash: (_c = resolvedConfig.vercel) == null ? void 0 : _c.trailingSlash,
+    cleanUrls: resolvedConfig.vercel?.cleanUrls ?? true,
+    trailingSlash: resolvedConfig.vercel?.trailingSlash,
     rewrites: reorderEnforce(_rewrites),
-    redirects: ((_d = resolvedConfig.vercel) == null ? void 0 : _d.redirects) ? reorderEnforce((_e = resolvedConfig.vercel) == null ? void 0 : _e.redirects) : void 0,
+    redirects: resolvedConfig.vercel?.redirects ? reorderEnforce(resolvedConfig.vercel?.redirects) : void 0,
     headers
   });
   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 && !resolvedConfig.vercel.config.routes.every(
+  if (resolvedConfig.vercel?.config?.routes && resolvedConfig.vercel.config.routes.length > 0 && !resolvedConfig.vercel.config.routes.every(
     (r) => "continue" in r && r.continue
   )) {
     console.warn(
@@ -184,7 +182,7 @@ function getConfig(resolvedConfig, rewrites, overrides, headers) {
   }
   let userRoutes = [];
   let buildRoutes = [];
-  if ((_i = (_h = resolvedConfig.vercel) == null ? void 0 : _h.config) == null ? void 0 : _i.routes) {
+  if (resolvedConfig.vercel?.config?.routes) {
     const norm = (0, import_routing_utils.normalizeRoutes)(resolvedConfig.vercel.config.routes);
     if (norm.error) {
       throw norm.error;
@@ -210,10 +208,10 @@ function getConfig(resolvedConfig, rewrites, overrides, headers) {
   });
   return vercelOutputConfigSchema.parse({
     version: 3,
-    ...(_j = resolvedConfig.vercel) == null ? void 0 : _j.config,
+    ...resolvedConfig.vercel?.config,
     routes: cleanRoutes,
     overrides: {
-      ...(_l = (_k = resolvedConfig.vercel) == null ? void 0 : _k.config) == null ? void 0 : _l.overrides,
+      ...resolvedConfig.vercel?.config?.overrides,
       ...overrides
     }
   });
@@ -235,6 +233,7 @@ async function writeConfig(resolvedConfig, rewrites, overrides, headers) {
 
 // src/build.ts
 var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_module = require("module");
 var import_path3 = __toESM(require("path"), 1);
 var import_esbuild = require("esbuild");
 
@@ -298,8 +297,7 @@ var import_build_utils = require("@vercel/build-utils");
 var import_nft = require("@vercel/nft");
 var import_find_root = require("@manypkg/find-root");
 function getAdditionalEndpoints(resolvedConfig) {
-  var _a;
-  return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
+  return (resolvedConfig.vercel?.additionalEndpoints ?? []).map((e) => ({
     ...e,
     addRoute: e.addRoute ?? true,
     // path.resolve removes the trailing slash if any
@@ -373,7 +371,6 @@ var standardBuildOptions = {
   }
 };
 async function buildFn(resolvedConfig, entry, buildOptions) {
-  var _a;
   assert(
     entry.destination.length > 0,
     `Endpoint ${typeof entry.source === "string" ? entry.source : "-"} does not have build destination`
@@ -405,14 +402,17 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
     }
   }
   if (entry.edge) {
+    delete options.platform;
+    options.external = [...import_module.builtinModules, ...import_module.builtinModules.map((m) => `node:${m}`)];
     options.conditions = [
       "edge-light",
+      "worker",
       "browser",
       "module",
       "import",
       "require"
     ];
-    (_a = options.plugins) == null ? void 0 : _a.push(edgeWasmPlugin);
+    options.plugins?.push(edgeWasmPlugin);
     options.format = "esm";
   } else if (options.format === "esm") {
     options.banner = {
@@ -478,7 +478,6 @@ const __dirname = VPV_dirname(__filename);
   return output;
 }
 async function writeVcConfig(resolvedConfig, destination, filename, options) {
-  var _a, _b;
   const vcConfig = import_path3.default.join(
     getOutput(resolvedConfig, "functions"),
     destination,
@@ -495,10 +494,10 @@ async function writeVcConfig(resolvedConfig, destination, filename, options) {
         } : {
           runtime: nodeVersion.runtime,
           handler: filename,
-          maxDuration: (_a = resolvedConfig.vercel) == null ? void 0 : _a.defaultMaxDuration,
+          maxDuration: resolvedConfig.vercel?.defaultMaxDuration,
           launcherType: "Nodejs",
           shouldAddHelpers: true,
-          supportsResponseStreaming: options.streaming ?? ((_b = resolvedConfig.vercel) == null ? void 0 : _b.defaultSupportsResponseStreaming)
+          supportsResponseStreaming: options.streaming ?? resolvedConfig.vercel?.defaultSupportsResponseStreaming
         }
       ),
       void 0,
@@ -631,12 +630,11 @@ async function copyDir(src, dest) {
 
 // src/prerender.ts
 function execPrerender(resolvedConfig) {
-  var _a;
-  const prerender = (_a = resolvedConfig.vercel) == null ? void 0 : _a.prerender;
+  const prerender = resolvedConfig.vercel?.prerender;
   if (prerender === false) {
     return;
   }
-  return prerender == null ? void 0 : prerender(resolvedConfig);
+  return prerender?.(resolvedConfig);
 }
 var group = 1;
 async function writePrerenderConfig(resolvedConfig, destination, isr) {
@@ -707,8 +705,7 @@ async function buildPrerenderConfigs(resolvedConfig, extractedIsr) {
   return rewrites;
 }
 async function getIsrConfig(resolvedConfig) {
-  var _a;
-  const isr = ((_a = resolvedConfig.vercel) == null ? void 0 : _a.isr) ?? {};
+  const isr = resolvedConfig.vercel?.isr ?? {};
   if (typeof isr === "function") {
     return await isr();
   }
@@ -730,8 +727,7 @@ function vercelPluginCleanup() {
       order: "pre",
       sequential: true,
       async handler() {
-        var _a;
-        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+        if (!resolvedConfig.build?.ssr) {
           await cleanOutputDirectory(resolvedConfig);
         }
       }
@@ -746,12 +742,11 @@ 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") {
+      if (typeof resolvedConfig.vercel?.distContainsOnlyStatic === "undefined") {
         resolvedConfig.vercel ??= {};
         resolvedConfig.vercel.distContainsOnlyStatic = !vikeFound;
       }
@@ -760,8 +755,7 @@ function vercelPlugin() {
       order: "post",
       sequential: true,
       async handler() {
-        var _a;
-        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+        if (!resolvedConfig.build?.ssr) {
           if (vikeFound) {
             return;
           }
@@ -792,8 +786,7 @@ async function cleanOutputDirectory(resolvedConfig) {
   await import_promises5.default.mkdir(getOutput(resolvedConfig), { recursive: true });
 }
 async function copyDistToStatic(resolvedConfig) {
-  var _a;
-  if ((_a = resolvedConfig.vercel) == null ? void 0 : _a.distContainsOnlyStatic) {
+  if (resolvedConfig.vercel?.distContainsOnlyStatic) {
     await copyDir(
       resolvedConfig.build.outDir,
       getOutput(resolvedConfig, "static")

package/dist/index.js

@@ -8,10 +8,9 @@ function getRoot(config) {
   return normalizePath(config.root || process.cwd());
 }
 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",
+    config.vercel?.outDir ? "" : getRoot(config),
+    config.vercel?.outDir ?? ".vercel/output",
     suffix ?? ""
   );
 }
@@ -129,23 +128,22 @@ function reorderEnforce(arr) {
   ];
 }
 function getConfig(resolvedConfig, rewrites, overrides, headers) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const _rewrites = [
     // User provided config always comes first
-    ...((_a = resolvedConfig.vercel) == null ? void 0 : _a.rewrites) ?? [],
+    ...resolvedConfig.vercel?.rewrites ?? [],
     ...rewrites ?? []
   ];
   const { routes, error } = getTransformedRoutes({
-    cleanUrls: ((_b = resolvedConfig.vercel) == null ? void 0 : _b.cleanUrls) ?? true,
-    trailingSlash: (_c = resolvedConfig.vercel) == null ? void 0 : _c.trailingSlash,
+    cleanUrls: resolvedConfig.vercel?.cleanUrls ?? true,
+    trailingSlash: resolvedConfig.vercel?.trailingSlash,
     rewrites: reorderEnforce(_rewrites),
-    redirects: ((_d = resolvedConfig.vercel) == null ? void 0 : _d.redirects) ? reorderEnforce((_e = resolvedConfig.vercel) == null ? void 0 : _e.redirects) : void 0,
+    redirects: resolvedConfig.vercel?.redirects ? reorderEnforce(resolvedConfig.vercel?.redirects) : void 0,
     headers
   });
   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 && !resolvedConfig.vercel.config.routes.every(
+  if (resolvedConfig.vercel?.config?.routes && resolvedConfig.vercel.config.routes.length > 0 && !resolvedConfig.vercel.config.routes.every(
     (r) => "continue" in r && r.continue
   )) {
     console.warn(
@@ -154,7 +152,7 @@ function getConfig(resolvedConfig, rewrites, overrides, headers) {
   }
   let userRoutes = [];
   let buildRoutes = [];
-  if ((_i = (_h = resolvedConfig.vercel) == null ? void 0 : _h.config) == null ? void 0 : _i.routes) {
+  if (resolvedConfig.vercel?.config?.routes) {
     const norm = normalizeRoutes(resolvedConfig.vercel.config.routes);
     if (norm.error) {
       throw norm.error;
@@ -180,10 +178,10 @@ function getConfig(resolvedConfig, rewrites, overrides, headers) {
   });
   return vercelOutputConfigSchema.parse({
     version: 3,
-    ...(_j = resolvedConfig.vercel) == null ? void 0 : _j.config,
+    ...resolvedConfig.vercel?.config,
     routes: cleanRoutes,
     overrides: {
-      ...(_l = (_k = resolvedConfig.vercel) == null ? void 0 : _k.config) == null ? void 0 : _l.overrides,
+      ...resolvedConfig.vercel?.config?.overrides,
       ...overrides
     }
   });
@@ -205,6 +203,7 @@ async function writeConfig(resolvedConfig, rewrites, overrides, headers) {
 
 // src/build.ts
 import glob from "fast-glob";
+import { builtinModules } from "module";
 import path3, { basename } from "path";
 import { build } from "esbuild";
 
@@ -268,8 +267,7 @@ import { getNodeVersion } from "@vercel/build-utils";
 import { nodeFileTrace } from "@vercel/nft";
 import { findRoot } from "@manypkg/find-root";
 function getAdditionalEndpoints(resolvedConfig) {
-  var _a;
-  return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
+  return (resolvedConfig.vercel?.additionalEndpoints ?? []).map((e) => ({
     ...e,
     addRoute: e.addRoute ?? true,
     // path.resolve removes the trailing slash if any
@@ -343,7 +341,6 @@ var standardBuildOptions = {
   }
 };
 async function buildFn(resolvedConfig, entry, buildOptions) {
-  var _a;
   assert(
     entry.destination.length > 0,
     `Endpoint ${typeof entry.source === "string" ? entry.source : "-"} does not have build destination`
@@ -375,14 +372,17 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
     }
   }
   if (entry.edge) {
+    delete options.platform;
+    options.external = [...builtinModules, ...builtinModules.map((m) => `node:${m}`)];
     options.conditions = [
       "edge-light",
+      "worker",
       "browser",
       "module",
       "import",
       "require"
     ];
-    (_a = options.plugins) == null ? void 0 : _a.push(edgeWasmPlugin);
+    options.plugins?.push(edgeWasmPlugin);
     options.format = "esm";
   } else if (options.format === "esm") {
     options.banner = {
@@ -448,7 +448,6 @@ const __dirname = VPV_dirname(__filename);
   return output;
 }
 async function writeVcConfig(resolvedConfig, destination, filename, options) {
-  var _a, _b;
   const vcConfig = path3.join(
     getOutput(resolvedConfig, "functions"),
     destination,
@@ -465,10 +464,10 @@ async function writeVcConfig(resolvedConfig, destination, filename, options) {
         } : {
           runtime: nodeVersion.runtime,
           handler: filename,
-          maxDuration: (_a = resolvedConfig.vercel) == null ? void 0 : _a.defaultMaxDuration,
+          maxDuration: resolvedConfig.vercel?.defaultMaxDuration,
           launcherType: "Nodejs",
           shouldAddHelpers: true,
-          supportsResponseStreaming: options.streaming ?? ((_b = resolvedConfig.vercel) == null ? void 0 : _b.defaultSupportsResponseStreaming)
+          supportsResponseStreaming: options.streaming ?? resolvedConfig.vercel?.defaultSupportsResponseStreaming
         }
       ),
       void 0,
@@ -601,12 +600,11 @@ async function copyDir(src, dest) {
 
 // src/prerender.ts
 function execPrerender(resolvedConfig) {
-  var _a;
-  const prerender = (_a = resolvedConfig.vercel) == null ? void 0 : _a.prerender;
+  const prerender = resolvedConfig.vercel?.prerender;
   if (prerender === false) {
     return;
   }
-  return prerender == null ? void 0 : prerender(resolvedConfig);
+  return prerender?.(resolvedConfig);
 }
 var group = 1;
 async function writePrerenderConfig(resolvedConfig, destination, isr) {
@@ -677,8 +675,7 @@ async function buildPrerenderConfigs(resolvedConfig, extractedIsr) {
   return rewrites;
 }
 async function getIsrConfig(resolvedConfig) {
-  var _a;
-  const isr = ((_a = resolvedConfig.vercel) == null ? void 0 : _a.isr) ?? {};
+  const isr = resolvedConfig.vercel?.isr ?? {};
   if (typeof isr === "function") {
     return await isr();
   }
@@ -700,8 +697,7 @@ function vercelPluginCleanup() {
       order: "pre",
       sequential: true,
       async handler() {
-        var _a;
-        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+        if (!resolvedConfig.build?.ssr) {
           await cleanOutputDirectory(resolvedConfig);
         }
       }
@@ -716,12 +712,11 @@ 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") {
+      if (typeof resolvedConfig.vercel?.distContainsOnlyStatic === "undefined") {
         resolvedConfig.vercel ??= {};
         resolvedConfig.vercel.distContainsOnlyStatic = !vikeFound;
       }
@@ -730,8 +725,7 @@ function vercelPlugin() {
       order: "post",
       sequential: true,
       async handler() {
-        var _a;
-        if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+        if (!resolvedConfig.build?.ssr) {
           if (vikeFound) {
             return;
           }
@@ -762,8 +756,7 @@ async function cleanOutputDirectory(resolvedConfig) {
   await fs5.mkdir(getOutput(resolvedConfig), { recursive: true });
 }
 async function copyDistToStatic(resolvedConfig) {
-  var _a;
-  if ((_a = resolvedConfig.vercel) == null ? void 0 : _a.distContainsOnlyStatic) {
+  if (resolvedConfig.vercel?.distContainsOnlyStatic) {
     await copyDir(
       resolvedConfig.build.outDir,
       getOutput(resolvedConfig, "static")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "7.0.2",
+  "version": "8.0.1",
   "type": "module",
   "files": [
     "dist",
@@ -25,7 +25,7 @@
   "peerDependencies": {
     "vike": "*",
     "vite": "^4.4 || ^5.0.2",
-    "@vite-plugin-vercel/vike": "7.0.1"
+    "@vite-plugin-vercel/vike": "8.0.1"
   },
   "peerDependenciesMeta": {
     "@vite-plugin-vercel/vike": {
@@ -37,20 +37,20 @@
   },
   "devDependencies": {
     "@types/node": "^18.19.31",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.15.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "eslint": "^8.57.0",
-    "tsup": "^8.1.0",
-    "typescript": "^5.5.3",
-    "vike": "^0.4.178",
-    "vite": "^5.3.2",
-    "@vite-plugin-vercel/vike": "7.0.1"
+    "tsup": "^8.2.4",
+    "typescript": "^5.5.4",
+    "vike": "^0.4.183",
+    "vite": "^5.4.0",
+    "@vite-plugin-vercel/vike": "8.0.1"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",
     "@manypkg/find-root": "^2.2.2",
-    "@vercel/build-utils": "^8.2.2",
-    "@vercel/nft": "^0.27.2",
+    "@vercel/build-utils": "^8.3.6",
+    "@vercel/nft": "^0.27.3",
     "@vercel/routing-utils": "^3.1.0",
     "esbuild": "^0.23.0",
     "fast-glob": "^3.3.2",