@vercel/next 4.14.0 → 4.14.1

package/dist/index.js

@@ -11962,48 +11962,53 @@ async function usesSrcDirectory(workPath) {
 async function getSourceFilePathFromPage({
   workPath,
   page,
-  pageExtensions
+  pageExtensions,
+  nextVersion
 }) {
   const usesSrcDir = await usesSrcDirectory(workPath);
   const extensionsToTry = pageExtensions || ["js", "jsx", "ts", "tsx"];
-  for (const pageType of [
-    // middleware is not nested in pages/app
-    ...page === "middleware" ? [""] : ["pages", "app"]
-  ]) {
-    let fsPath = import_path3.default.join(workPath, pageType, page);
-    if (usesSrcDir) {
-      fsPath = import_path3.default.join(workPath, "src", pageType, page);
-    }
-    if (import_fs_extra3.default.existsSync(fsPath)) {
-      return import_path3.default.relative(workPath, fsPath);
-    }
-    const extensionless = fsPath.replace(import_path3.default.extname(fsPath), "");
-    for (const ext of extensionsToTry) {
-      fsPath = `${extensionless}.${ext}`;
-      if (pageType === "app" && extensionless === import_path3.default.join(workPath, `${usesSrcDir ? "src/" : ""}app/index`)) {
-        fsPath = `${extensionless.replace(/index$/, "page")}.${ext}`;
+  const isNextJs16Plus = nextVersion && import_semver.default.gte(nextVersion, "16.0.0");
+  const pagesToCheck = page === "middleware" && isNextJs16Plus ? ["proxy", "middleware"] : [page];
+  for (const pageToCheck of pagesToCheck) {
+    for (const pageType of [
+      // middleware/proxy is not nested in pages/app
+      ...pageToCheck === "middleware" || pageToCheck === "proxy" ? [""] : ["pages", "app"]
+    ]) {
+      let fsPath = import_path3.default.join(workPath, pageType, pageToCheck);
+      if (usesSrcDir) {
+        fsPath = import_path3.default.join(workPath, "src", pageType, pageToCheck);
       }
       if (import_fs_extra3.default.existsSync(fsPath)) {
         return import_path3.default.relative(workPath, fsPath);
       }
-    }
-    if (isDirectory(extensionless)) {
-      if (pageType === "pages") {
-        for (const ext of extensionsToTry) {
-          fsPath = import_path3.default.join(extensionless, `index.${ext}`);
-          if (import_fs_extra3.default.existsSync(fsPath)) {
-            return import_path3.default.relative(workPath, fsPath);
-          }
+      const extensionless = fsPath.replace(import_path3.default.extname(fsPath), "");
+      for (const ext of extensionsToTry) {
+        fsPath = `${extensionless}.${ext}`;
+        if (pageType === "app" && extensionless === import_path3.default.join(workPath, `${usesSrcDir ? "src/" : ""}app/index`)) {
+          fsPath = `${extensionless.replace(/index$/, "page")}.${ext}`;
         }
-      } else {
-        for (const ext of extensionsToTry) {
-          fsPath = import_path3.default.join(extensionless, `page.${ext}`);
-          if (import_fs_extra3.default.existsSync(fsPath)) {
-            return import_path3.default.relative(workPath, fsPath);
+        if (import_fs_extra3.default.existsSync(fsPath)) {
+          return import_path3.default.relative(workPath, fsPath);
+        }
+      }
+      if (isDirectory(extensionless)) {
+        if (pageType === "pages") {
+          for (const ext of extensionsToTry) {
+            fsPath = import_path3.default.join(extensionless, `index.${ext}`);
+            if (import_fs_extra3.default.existsSync(fsPath)) {
+              return import_path3.default.relative(workPath, fsPath);
+            }
           }
-          fsPath = import_path3.default.join(extensionless, `route.${ext}`);
-          if (import_fs_extra3.default.existsSync(fsPath)) {
-            return import_path3.default.relative(workPath, fsPath);
+        } else {
+          for (const ext of extensionsToTry) {
+            fsPath = import_path3.default.join(extensionless, `page.${ext}`);
+            if (import_fs_extra3.default.existsSync(fsPath)) {
+              return import_path3.default.relative(workPath, fsPath);
+            }
+            fsPath = import_path3.default.join(extensionless, `route.${ext}`);
+            if (import_fs_extra3.default.existsSync(fsPath)) {
+              return import_path3.default.relative(workPath, fsPath);
+            }
           }
         }
       }
@@ -12015,6 +12020,9 @@ async function getSourceFilePathFromPage({
   if (page === "/_global-error/page") {
     return "";
   }
+  if (page === "middleware" && isNextJs16Plus) {
+    return "";
+  }
   if (!INTERNAL_PAGES.includes(page)) {
     console.log(
       `WARNING: Unable to find source file for page ${page} with extensions: ${extensionsToTry.join(
@@ -13143,7 +13151,8 @@ async function getNodeMiddleware({
   const sourceFile = await getSourceFilePathFromPage({
     workPath: entryPath,
     page: normalizeSourceFilePageFromManifest("/middleware", "middleware", {}),
-    pageExtensions
+    pageExtensions,
+    nextVersion
   });
   const vercelConfigOpts = await (0, import_build_utils.getLambdaOptionsFromFunction)({
     sourceFile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.14.0",
+  "version": "4.14.1",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -31,7 +31,7 @@
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
     "@vercel/build-utils": "12.2.0",
-    "@vercel/routing-utils": "5.2.0",
+    "@vercel/routing-utils": "5.2.1",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "bytes": "3.1.2",