@vercel/node 5.8.26 → 5.9.0

package/dist/index.js

@@ -72281,6 +72281,14 @@ function getRegExpFromMatchers(matcherOrMatchers) {
   const regExps = matchers.flatMap(getRegExpFromMatcher).join("|");
   return regExps;
 }
+function resolveMiddlewareMatcher(configuredMatcher, sourceMatcher, entrypoint) {
+  if (configuredMatcher !== void 0 && sourceMatcher !== void 0) {
+    throw new Error(
+      `${entrypoint}: \`proxy.matcher\` in vercel.json conflicts with \`config.matcher\` exported from the proxy entrypoint. Configure the matcher in only one location.`
+    );
+  }
+  return configuredMatcher ?? sourceMatcher;
+}
 function getRegExpFromMatcher(matcher, index, allMatchers) {
   if (typeof matcher !== "string") {
     throw new Error(
@@ -72327,6 +72335,14 @@ function validateConfiguredRuntime(runtime, entrypoint) {
     }
   }
 }
+function validateMiddlewareRuntime(runtime, entrypoint, requiredRuntime) {
+  validateConfiguredRuntime(runtime, entrypoint);
+  if (requiredRuntime === "nodejs" && isEdgeRuntime(runtime)) {
+    throw new Error(
+      `${entrypoint}: explicit proxy entrypoints only support the Node.js runtime. Remove \`runtime: ${JSON.stringify(runtime)}\` from the exported \`config\`.`
+    );
+  }
+}
 
 // src/build.ts
 var require_2 = (0, import_module2.createRequire)(__filename);
@@ -72691,8 +72707,14 @@ var build = async ({
   const project = new import_ts_morph.Project();
   const staticConfig = (0, import_static_config.getConfig)(project, entrypointPath);
   const runtime = staticConfig?.runtime;
-  validateConfiguredRuntime(runtime, entrypoint);
-  if (runtime) {
+  validateMiddlewareRuntime(
+    runtime,
+    entrypoint,
+    isMiddleware ? config.middlewareRuntime : void 0
+  );
+  if (isMiddleware && config.middlewareRuntime === "nodejs") {
+    isEdgeFunction = false;
+  } else if (runtime) {
     isEdgeFunction = isEdgeRuntime(runtime);
   }
   checks({
@@ -72716,13 +72738,18 @@ var build = async ({
   let handler = renameTStoJS((0, import_path3.relative)(baseDir, entrypointPath));
   const outputPath = entrypointToOutputPath(entrypoint, config.zeroConfig);
   if (isMiddleware) {
-    const src = getRegExpFromMatchers(staticConfig?.matcher);
+    const matcher = resolveMiddlewareMatcher(
+      config.middlewareMatcher,
+      staticConfig?.matcher,
+      entrypoint
+    );
+    const src = getRegExpFromMatchers(matcher);
     const middlewareRawSrc = [];
-    if (staticConfig?.matcher) {
-      if (Array.isArray(staticConfig.matcher)) {
-        middlewareRawSrc.push(...staticConfig.matcher);
+    if (matcher) {
+      if (Array.isArray(matcher)) {
+        middlewareRawSrc.push(...matcher);
       } else {
-        middlewareRawSrc.push(staticConfig.matcher);
+        middlewareRawSrc.push(matcher);
       }
     }
     routes = [
@@ -73124,6 +73151,13 @@ var startDevServer = async (opts) => {
   }
   const project = new import_ts_morph2.Project();
   const staticConfig = (0, import_static_config2.getConfig)(project, entrypointPath);
+  if (config.middlewareRuntime) {
+    validateMiddlewareRuntime(
+      staticConfig?.runtime,
+      entrypoint,
+      config.middlewareRuntime
+    );
+  }
   const vercelConfigFile = opts.files["vercel.json"];
   let bunVersion;
   try {
@@ -73146,7 +73180,12 @@ var startDevServer = async (opts) => {
   }
   const runtime = bunVersion ? "bun" : "node";
   if (config.middleware === true && typeof meta.requestUrl === "string") {
-    const matchers = new RegExp(getRegExpFromMatchers(staticConfig?.matcher));
+    const matcher = resolveMiddlewareMatcher(
+      config.middlewareMatcher,
+      staticConfig?.matcher,
+      entrypoint
+    );
+    const matchers = new RegExp(getRegExpFromMatchers(matcher));
     const parsed = new URL(meta.requestUrl, "http://localhost");
     if (!matchers.test(parsed.pathname)) {
       return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "5.8.26",
+  "version": "5.9.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -32,7 +32,7 @@
     "tsx": "4.21.0",
     "typescript": "npm:typescript@5.9.3",
     "undici": "5.28.4",
-    "@vercel/build-utils": "13.34.0",
+    "@vercel/build-utils": "13.36.0",
     "@vercel/error-utils": "2.2.0",
     "@vercel/static-config": "3.4.0"
   },
@@ -57,7 +57,7 @@
     "tree-kill": "1.2.2",
     "vite": "^5.1.6",
     "vitest": "^2.0.1",
-    "@vercel/functions": "3.7.5"
+    "@vercel/functions": "3.7.6"
   },
   "scripts": {
     "build": "node build.mjs",