vite-plugin-vercel 4.0.2 → 5.0.1

package/dist/index.cjs

@@ -293,6 +293,8 @@ var vercelEndpointExports = import_zod3.z.object({
 // src/build.ts
 var import_magicast = require("magicast");
 var import_build_utils = require("@vercel/build-utils");
+var import_nft = require("@vercel/nft");
+var import_workspace_root = require("workspace-root");
 function getAdditionalEndpoints(resolvedConfig) {
   var _a;
   return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
@@ -325,8 +327,8 @@ function getEntries(resolvedConfig) {
     return entryPoints;
   }, getAdditionalEndpoints(resolvedConfig));
 }
-var wasmPlugin = {
-  name: "wasm",
+var edgeWasmPlugin = {
+  name: "edge-wasm-vercel",
   setup(build2) {
     build2.onResolve({ filter: /\.wasm/ }, (args) => {
       return {
@@ -354,30 +356,33 @@ var vercelOgPlugin = (ctx) => {
 var standardBuildOptions = {
   bundle: true,
   target: "es2020",
-  format: "cjs",
+  format: "esm",
   platform: "node",
   logLevel: "info",
   logOverride: {
     "ignored-bare-import": "verbose",
     "require-resolve-not-external": "verbose"
   },
-  minify: true,
-  plugins: [wasmPlugin]
+  minify: false,
+  plugins: []
 };
 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`
   );
+  const options = Object.assign({}, standardBuildOptions);
+  if (buildOptions) {
+    Object.assign(options, buildOptions);
+  }
+  const filename = entry.edge || options.format === "cjs" ? "index.js" : "index.mjs";
   const outfile = import_path3.default.join(
     getOutput(resolvedConfig, "functions"),
     entry.destination,
-    "index.js"
+    filename
   );
-  const options = Object.assign({}, standardBuildOptions, { outfile });
-  if (buildOptions) {
-    Object.assign(options, buildOptions);
-  }
+  Object.assign(options, { outfile });
   if (!options.stdin) {
     if (typeof entry.source === "string") {
       options.entryPoints = [entry.source];
@@ -401,29 +406,69 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
       "import",
       "require"
     ];
+    (_a = options.plugins) == null ? void 0 : _a.push(edgeWasmPlugin);
     options.format = "esm";
+  } else if (options.format === "esm") {
+    options.banner = {
+      js: `import { createRequire } from 'node:module';
+import path from 'node:path';
+import url from 'node:url';
+const require = createRequire(import.meta.url);
+const __filename = url.fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+`
+    };
   }
   const ctx = { found: false, index: "" };
   options.plugins.push(vercelOgPlugin(ctx));
   const output = await (0, import_esbuild.build)(options);
-  if (ctx.found && ctx.index) {
-    const dir = (0, import_path3.dirname)(ctx.index);
-    const externalFiles = await (0, import_fast_glob.default)(`${dir}/*.{ttf,wasm}`);
-    for (const f of externalFiles) {
-      await (0, import_promises2.copyFile)(
-        f,
-        import_path3.default.join(
-          getOutput(resolvedConfig, "functions"),
-          entry.destination,
-          (0, import_path3.basename)(f)
-        )
-      );
+  if (typeof entry.source == "string") {
+    const base = (0, import_workspace_root.workspaceRootSync)(resolvedConfig.root) || resolvedConfig.root;
+    const { fileList, reasons } = await (0, import_nft.nodeFileTrace)([entry.source], {
+      base,
+      processCwd: resolvedConfig.root,
+      mixedModules: true,
+      ignore: [
+        "**/node_modules/react{,-dom,-dom-server-turbopack}/**/*.development.js",
+        "**/*.d.ts",
+        "**/*.map",
+        "**/node_modules/webpack5/**/*"
+      ],
+      async readFile(filepath) {
+        if (filepath.endsWith(".ts") || filepath.endsWith(".tsx")) {
+          const result = await (0, import_esbuild.build)({
+            ...standardBuildOptions,
+            entryPoints: [entry.source],
+            bundle: false,
+            write: false
+          });
+          return result.outputFiles[0].text;
+        }
+        return import_promises2.default.readFile(filepath, "utf-8");
+      }
+    });
+    for (const file of fileList) {
+      if (reasons.has(file) && reasons.get(file).type.includes("asset") && !file.endsWith(".js") && !file.endsWith(".cjs") && !file.endsWith(".mjs") && !file.endsWith("package.json")) {
+        await (0, import_promises2.copyFile)(
+          import_path3.default.join(base, file),
+          import_path3.default.join(
+            getOutput(resolvedConfig, "functions"),
+            entry.destination,
+            (0, import_path3.basename)(file)
+          )
+        );
+      }
     }
   }
-  await writeVcConfig(resolvedConfig, entry.destination, Boolean(entry.edge));
+  await writeVcConfig(
+    resolvedConfig,
+    entry.destination,
+    Boolean(entry.edge),
+    filename
+  );
   return output;
 }
-async function writeVcConfig(resolvedConfig, destination, edge) {
+async function writeVcConfig(resolvedConfig, destination, edge, filename) {
   var _a;
   const vcConfig = import_path3.default.join(
     getOutput(resolvedConfig, "functions"),
@@ -437,10 +482,10 @@ async function writeVcConfig(resolvedConfig, destination, edge) {
       vercelOutputVcConfigSchema.parse(
         edge ? {
           runtime: "edge",
-          entrypoint: "index.js"
+          entrypoint: filename
         } : {
           runtime: nodeVersion.runtime,
-          handler: "index.js",
+          handler: filename,
           maxDuration: (_a = resolvedConfig.vercel) == null ? void 0 : _a.defaultMaxDuration,
           launcherType: "Nodejs",
           shouldAddHelpers: true
@@ -476,6 +521,7 @@ async function extractExports(filepath) {
     const contents = await removeDefaultExport(filepath);
     const buildOptions = {
       ...standardBuildOptions,
+      format: "cjs",
       minify: false,
       write: false,
       legalComments: "none"

package/dist/index.js

@@ -263,6 +263,8 @@ var vercelEndpointExports = z3.object({
 // src/build.ts
 import { generateCode, loadFile } from "magicast";
 import { getNodeVersion } from "@vercel/build-utils";
+import { nodeFileTrace } from "@vercel/nft";
+import { workspaceRootSync } from "workspace-root";
 function getAdditionalEndpoints(resolvedConfig) {
   var _a;
   return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
@@ -295,8 +297,8 @@ function getEntries(resolvedConfig) {
     return entryPoints;
   }, getAdditionalEndpoints(resolvedConfig));
 }
-var wasmPlugin = {
-  name: "wasm",
+var edgeWasmPlugin = {
+  name: "edge-wasm-vercel",
   setup(build2) {
     build2.onResolve({ filter: /\.wasm/ }, (args) => {
       return {
@@ -324,30 +326,33 @@ var vercelOgPlugin = (ctx) => {
 var standardBuildOptions = {
   bundle: true,
   target: "es2020",
-  format: "cjs",
+  format: "esm",
   platform: "node",
   logLevel: "info",
   logOverride: {
     "ignored-bare-import": "verbose",
     "require-resolve-not-external": "verbose"
   },
-  minify: true,
-  plugins: [wasmPlugin]
+  minify: false,
+  plugins: []
 };
 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`
   );
+  const options = Object.assign({}, standardBuildOptions);
+  if (buildOptions) {
+    Object.assign(options, buildOptions);
+  }
+  const filename = entry.edge || options.format === "cjs" ? "index.js" : "index.mjs";
   const outfile = path3.join(
     getOutput(resolvedConfig, "functions"),
     entry.destination,
-    "index.js"
+    filename
   );
-  const options = Object.assign({}, standardBuildOptions, { outfile });
-  if (buildOptions) {
-    Object.assign(options, buildOptions);
-  }
+  Object.assign(options, { outfile });
   if (!options.stdin) {
     if (typeof entry.source === "string") {
       options.entryPoints = [entry.source];
@@ -371,29 +376,69 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
       "import",
       "require"
     ];
+    (_a = options.plugins) == null ? void 0 : _a.push(edgeWasmPlugin);
     options.format = "esm";
+  } else if (options.format === "esm") {
+    options.banner = {
+      js: `import { createRequire } from 'node:module';
+import path from 'node:path';
+import url from 'node:url';
+const require = createRequire(import.meta.url);
+const __filename = url.fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+`
+    };
   }
   const ctx = { found: false, index: "" };
   options.plugins.push(vercelOgPlugin(ctx));
   const output = await build(options);
-  if (ctx.found && ctx.index) {
-    const dir = dirname(ctx.index);
-    const externalFiles = await glob(`${dir}/*.{ttf,wasm}`);
-    for (const f of externalFiles) {
-      await copyFile(
-        f,
-        path3.join(
-          getOutput(resolvedConfig, "functions"),
-          entry.destination,
-          basename(f)
-        )
-      );
+  if (typeof entry.source == "string") {
+    const base = workspaceRootSync(resolvedConfig.root) || resolvedConfig.root;
+    const { fileList, reasons } = await nodeFileTrace([entry.source], {
+      base,
+      processCwd: resolvedConfig.root,
+      mixedModules: true,
+      ignore: [
+        "**/node_modules/react{,-dom,-dom-server-turbopack}/**/*.development.js",
+        "**/*.d.ts",
+        "**/*.map",
+        "**/node_modules/webpack5/**/*"
+      ],
+      async readFile(filepath) {
+        if (filepath.endsWith(".ts") || filepath.endsWith(".tsx")) {
+          const result = await build({
+            ...standardBuildOptions,
+            entryPoints: [entry.source],
+            bundle: false,
+            write: false
+          });
+          return result.outputFiles[0].text;
+        }
+        return fs2.readFile(filepath, "utf-8");
+      }
+    });
+    for (const file of fileList) {
+      if (reasons.has(file) && reasons.get(file).type.includes("asset") && !file.endsWith(".js") && !file.endsWith(".cjs") && !file.endsWith(".mjs") && !file.endsWith("package.json")) {
+        await copyFile(
+          path3.join(base, file),
+          path3.join(
+            getOutput(resolvedConfig, "functions"),
+            entry.destination,
+            basename(file)
+          )
+        );
+      }
     }
   }
-  await writeVcConfig(resolvedConfig, entry.destination, Boolean(entry.edge));
+  await writeVcConfig(
+    resolvedConfig,
+    entry.destination,
+    Boolean(entry.edge),
+    filename
+  );
   return output;
 }
-async function writeVcConfig(resolvedConfig, destination, edge) {
+async function writeVcConfig(resolvedConfig, destination, edge, filename) {
   var _a;
   const vcConfig = path3.join(
     getOutput(resolvedConfig, "functions"),
@@ -407,10 +452,10 @@ async function writeVcConfig(resolvedConfig, destination, edge) {
       vercelOutputVcConfigSchema.parse(
         edge ? {
           runtime: "edge",
-          entrypoint: "index.js"
+          entrypoint: filename
         } : {
           runtime: nodeVersion.runtime,
-          handler: "index.js",
+          handler: filename,
           maxDuration: (_a = resolvedConfig.vercel) == null ? void 0 : _a.defaultMaxDuration,
           launcherType: "Nodejs",
           shouldAddHelpers: true
@@ -446,6 +491,7 @@ async function extractExports(filepath) {
     const contents = await removeDefaultExport(filepath);
     const buildOptions = {
       ...standardBuildOptions,
+      format: "cjs",
       minify: false,
       write: false,
       legalComments: "none"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "4.0.2",
+  "version": "5.0.1",
   "type": "module",
   "files": [
     "dist",
@@ -22,7 +22,7 @@
   "peerDependencies": {
     "vike": "*",
     "vite": "^4.4 || ^5.0.2",
-    "@vite-plugin-vercel/vike": "4.0.2"
+    "@vite-plugin-vercel/vike": "5.0.1"
   },
   "peerDependenciesMeta": {
     "@vite-plugin-vercel/vike": {
@@ -34,23 +34,25 @@
   },
   "devDependencies": {
     "@types/node": "^16.18.76",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "eslint": "^8.57.0",
     "tsup": "^8.0.2",
     "typescript": "^5.4.2",
     "vike": "^0.4.165",
     "vite": "^5.1.6",
-    "@vite-plugin-vercel/vike": "4.0.2"
+    "@vite-plugin-vercel/vike": "5.0.1"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",
-    "@vercel/build-utils": "^7.8.0",
+    "@vercel/build-utils": "^7.9.1",
+    "@vercel/nft": "^0.26.4",
     "@vercel/routing-utils": "^3.1.0",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.20.2",
     "eval": "^0.1.8",
     "fast-glob": "^3.3.2",
     "magicast": "^0.3.3",
+    "workspace-root": "^3.2.0",
     "zod": "^3.22.4"
   },
   "scripts": {