vite-plugin-vercel 6.0.1 → 7.0.1

package/dist/index.cjs

@@ -280,7 +280,6 @@ var vercelOutputVcConfigSchema = import_zod2.z.union([
 
 // src/build.ts
 var import_promises2 = __toESM(require("fs/promises"), 1);
-var import_eval = __toESM(require("eval"), 1);
 
 // src/schemas/exports.ts
 var import_zod3 = require("zod");
@@ -367,7 +366,11 @@ var standardBuildOptions = {
     "require-resolve-not-external": "verbose"
   },
   minify: false,
-  plugins: []
+  plugins: [],
+  define: {
+    "process.env.NODE_ENV": '"production"',
+    "import.meta.env.NODE_ENV": '"production"'
+  }
 };
 async function buildFn(resolvedConfig, entry, buildOptions) {
   var _a;
@@ -514,39 +517,28 @@ 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 {
-    delete mod.exports.default;
-  } catch (_) {
-  }
-  return (0, import_magicast.generateCode)(mod).code;
+function isPrimitive(test) {
+  return test !== Object(test);
+}
+function _eval(code) {
+  const func = new Function(`{ return function(){ return ${code} } };`);
+  return func.call(null).call(null);
+}
+function evalExport(exp) {
+  if (!exp) return;
+  const code = isPrimitive(exp) ? exp : (0, import_magicast.generateCode)(exp).code;
+  return _eval(code);
 }
 async function extractExports(filepath) {
-  var _a;
   try {
-    const contents = await removeDefaultExport(filepath);
-    const buildOptions = {
-      ...standardBuildOptions,
-      format: "cjs",
-      minify: false,
-      write: false,
-      legalComments: "none"
-    };
-    buildOptions.stdin = {
-      sourcefile: filepath,
-      contents,
-      loader: filepath.endsWith(".ts") ? "ts" : filepath.endsWith(".tsx") ? "tsx" : filepath.endsWith(".js") ? "js" : filepath.endsWith(".jsx") ? "jsx" : "default",
-      resolveDir: (0, import_path3.dirname)(filepath)
-    };
-    buildOptions.banner = {
-      js: `const __filename = ${JSON.stringify(filepath)};
-const __dirname = ${JSON.stringify((0, import_path3.dirname)(filepath))};
-`
+    const mod = await (0, import_magicast.loadFile)(filepath);
+    const subject = {
+      edge: evalExport(mod.exports.edge),
+      headers: evalExport(mod.exports.headers),
+      streaming: evalExport(mod.exports.streaming),
+      isr: evalExport(mod.exports.isr)
     };
-    const output = await (0, import_esbuild.build)(buildOptions);
-    const bundle = new TextDecoder().decode((_a = output.outputFiles[0]) == null ? void 0 : _a.contents);
-    return vercelEndpointExports.parse((0, import_eval.default)(bundle, filepath, {}, true));
+    return vercelEndpointExports.parse(subject);
   } catch (e) {
     console.warn(`Warning: failed to read exports of '${filepath}'`, e);
   }
@@ -840,25 +832,26 @@ async function getStaticHtmlFiles(src) {
   }
   return htmlFiles;
 }
-async function tryImportVpvv() {
+async function tryImportVpvv(options) {
   try {
     await import("vike/plugin");
     const vpvv = await import("@vite-plugin-vercel/vike");
-    return vpvv.default();
+    return vpvv.default(options);
   } catch (e) {
     try {
       await import("vite-plugin-ssr/plugin");
       const vpvv = await import("@vite-plugin-vercel/vike");
-      return vpvv.default();
+      return vpvv.default(options);
     } catch (e2) {
       return null;
     }
   }
 }
 function allPlugins(options = {}) {
+  const { smart, ...rest } = options;
   return [
     vercelPluginCleanup(),
     vercelPlugin(),
-    options.smart !== false ? tryImportVpvv() : null
+    smart !== false ? tryImportVpvv(rest) : null
   ];
 }

package/dist/index.d.cts

@@ -678,8 +678,6 @@ interface ViteVercelApiEntry {
     streaming?: boolean;
 }
 
-declare function allPlugins(options?: {
-    smart?: boolean;
-}): PluginOption[];
+declare function allPlugins(options?: any): PluginOption[];
 
 export { type VercelOutputConfig, type VercelOutputIsr, type VercelOutputPrerenderConfig, type VercelOutputVcConfig, type ViteVercelApiEntry, type ViteVercelConfig, type ViteVercelPrerenderFn, type ViteVercelPrerenderRoute, type ViteVercelRedirect, type ViteVercelRewrite, allPlugins as default };

package/dist/index.d.ts

@@ -678,8 +678,6 @@ interface ViteVercelApiEntry {
     streaming?: boolean;
 }
 
-declare function allPlugins(options?: {
-    smart?: boolean;
-}): PluginOption[];
+declare function allPlugins(options?: any): PluginOption[];
 
 export { type VercelOutputConfig, type VercelOutputIsr, type VercelOutputPrerenderConfig, type VercelOutputVcConfig, type ViteVercelApiEntry, type ViteVercelConfig, type ViteVercelPrerenderFn, type ViteVercelPrerenderRoute, type ViteVercelRedirect, type ViteVercelRewrite, allPlugins as default };

package/dist/index.js

@@ -205,7 +205,7 @@ async function writeConfig(resolvedConfig, rewrites, overrides, headers) {
 
 // src/build.ts
 import glob from "fast-glob";
-import path3, { basename, dirname } from "path";
+import path3, { basename } from "path";
 import { build } from "esbuild";
 
 // src/assert.ts
@@ -250,7 +250,6 @@ var vercelOutputVcConfigSchema = z2.union([
 
 // src/build.ts
 import fs2, { copyFile } from "fs/promises";
-import _eval from "eval";
 
 // src/schemas/exports.ts
 import { z as z3 } from "zod";
@@ -337,7 +336,11 @@ var standardBuildOptions = {
     "require-resolve-not-external": "verbose"
   },
   minify: false,
-  plugins: []
+  plugins: [],
+  define: {
+    "process.env.NODE_ENV": '"production"',
+    "import.meta.env.NODE_ENV": '"production"'
+  }
 };
 async function buildFn(resolvedConfig, entry, buildOptions) {
   var _a;
@@ -484,39 +487,28 @@ 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 {
-    delete mod.exports.default;
-  } catch (_) {
-  }
-  return generateCode(mod).code;
+function isPrimitive(test) {
+  return test !== Object(test);
+}
+function _eval(code) {
+  const func = new Function(`{ return function(){ return ${code} } };`);
+  return func.call(null).call(null);
+}
+function evalExport(exp) {
+  if (!exp) return;
+  const code = isPrimitive(exp) ? exp : generateCode(exp).code;
+  return _eval(code);
 }
 async function extractExports(filepath) {
-  var _a;
   try {
-    const contents = await removeDefaultExport(filepath);
-    const buildOptions = {
-      ...standardBuildOptions,
-      format: "cjs",
-      minify: false,
-      write: false,
-      legalComments: "none"
-    };
-    buildOptions.stdin = {
-      sourcefile: filepath,
-      contents,
-      loader: filepath.endsWith(".ts") ? "ts" : filepath.endsWith(".tsx") ? "tsx" : filepath.endsWith(".js") ? "js" : filepath.endsWith(".jsx") ? "jsx" : "default",
-      resolveDir: dirname(filepath)
-    };
-    buildOptions.banner = {
-      js: `const __filename = ${JSON.stringify(filepath)};
-const __dirname = ${JSON.stringify(dirname(filepath))};
-`
+    const mod = await loadFile(filepath);
+    const subject = {
+      edge: evalExport(mod.exports.edge),
+      headers: evalExport(mod.exports.headers),
+      streaming: evalExport(mod.exports.streaming),
+      isr: evalExport(mod.exports.isr)
     };
-    const output = await build(buildOptions);
-    const bundle = new TextDecoder().decode((_a = output.outputFiles[0]) == null ? void 0 : _a.contents);
-    return vercelEndpointExports.parse(_eval(bundle, filepath, {}, true));
+    return vercelEndpointExports.parse(subject);
   } catch (e) {
     console.warn(`Warning: failed to read exports of '${filepath}'`, e);
   }
@@ -810,26 +802,27 @@ async function getStaticHtmlFiles(src) {
   }
   return htmlFiles;
 }
-async function tryImportVpvv() {
+async function tryImportVpvv(options) {
   try {
     await import("vike/plugin");
     const vpvv = await import("@vite-plugin-vercel/vike");
-    return vpvv.default();
+    return vpvv.default(options);
   } catch (e) {
     try {
       await import("vite-plugin-ssr/plugin");
       const vpvv = await import("@vite-plugin-vercel/vike");
-      return vpvv.default();
+      return vpvv.default(options);
     } catch (e2) {
       return null;
     }
   }
 }
 function allPlugins(options = {}) {
+  const { smart, ...rest } = options;
   return [
     vercelPluginCleanup(),
     vercelPlugin(),
-    options.smart !== false ? tryImportVpvv() : null
+    smart !== false ? tryImportVpvv(rest) : null
   ];
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "6.0.1",
+  "version": "7.0.1",
   "type": "module",
   "files": [
     "dist",
@@ -22,7 +22,7 @@
   "peerDependencies": {
     "vike": "*",
     "vite": "^4.4 || ^5.0.2",
-    "@vite-plugin-vercel/vike": "6.0.1"
+    "@vite-plugin-vercel/vike": "7.0.1"
   },
   "peerDependenciesMeta": {
     "@vite-plugin-vercel/vike": {
@@ -34,26 +34,25 @@
   },
   "devDependencies": {
     "@types/node": "^18.19.31",
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
-    "@typescript-eslint/parser": "^7.7.0",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
     "eslint": "^8.57.0",
-    "tsup": "^8.0.2",
-    "typescript": "^5.4.5",
-    "vike": "^0.4.171",
-    "vite": "^5.2.10",
-    "@vite-plugin-vercel/vike": "6.0.1"
+    "tsup": "^8.1.0",
+    "typescript": "^5.5.3",
+    "vike": "^0.4.178",
+    "vite": "^5.3.2",
+    "@vite-plugin-vercel/vike": "7.0.1"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",
-    "@manypkg/find-root": "^2.2.1",
-    "@vercel/build-utils": "^7.12.0",
-    "@vercel/nft": "^0.26.4",
+    "@manypkg/find-root": "^2.2.2",
+    "@vercel/build-utils": "^8.2.2",
+    "@vercel/nft": "^0.27.2",
     "@vercel/routing-utils": "^3.1.0",
-    "esbuild": "^0.20.2",
-    "eval": "^0.1.8",
+    "esbuild": "^0.23.0",
     "fast-glob": "^3.3.2",
     "magicast": "^0.3.4",
-    "zod": "^3.23.0"
+    "zod": "^3.23.8"
   },
   "scripts": {
     "build": "tsup",