@vercel/next 4.15.15 → 4.15.17

package/dist/adapter/node-handler.js

@@ -0,0 +1,323 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var node_handler_exports = {};
+__export(node_handler_exports, {
+  getHandlerSource: () => getHandlerSource
+});
+module.exports = __toCommonJS(node_handler_exports);
+const getHandlerSource = (ctx) => `
+  process.env.NODE_ENV = 'production';
+  require('next/dist/server/node-environment');
+  require('next/dist/server/node-polyfill-crypto');
+  
+  try {
+    // this can fail to install if styled-jsx is not discoverable
+    // but this is tolerable as the require-hook is handling edge cases
+    require('next/dist/server/require-hook');
+  } catch (_) {}
+  
+  process.chdir(__dirname);
+  
+  const _n_handler = (${ctx.isMiddleware ? () => {
+  const path = require("path");
+  const relativeDistDir = process.env.__PRIVATE_RELATIVE_DIST_DIR;
+  const SYMBOL_FOR_REQ_CONTEXT = Symbol.for("@vercel/request-context");
+  function getRequestContext() {
+    const fromSymbol = globalThis;
+    return fromSymbol[SYMBOL_FOR_REQ_CONTEXT]?.get?.() ?? {};
+  }
+  return async function handler(request) {
+    console.log("middleware handler", request);
+    let middlewareHandler = await require("./" + path.posix.join(relativeDistDir, "server", "middleware.js"));
+    middlewareHandler = middlewareHandler.handler || middlewareHandler;
+    const context = getRequestContext();
+    const response = await middlewareHandler(request, {
+      waitUntil: context.waitUntil,
+      requestMeta: {
+        // we use '.' for relative project dir since we process.chdir
+        // to the same directory as the handler file so everything is
+        // relative to that/project dir
+        relativeProjectDir: "."
+      }
+    });
+    return response;
+  };
+} : (() => {
+  const path = require("path");
+  const relativeDistDir = process.env.__PRIVATE_RELATIVE_DIST_DIR;
+  const prerenderFallbackFalseMap = process.env.__PRIVATE_PRERENDER_FALLBACK_MAP;
+  const {
+    dynamicRoutes: dynamicRoutesRaw,
+    staticRoutes: staticRoutesRaw,
+    i18n
+  } = require("./" + path.posix.join(relativeDistDir, "routes-manifest.json"));
+  const hydrateRoutesManifestItem = (item) => {
+    return {
+      ...item,
+      namedRegex: new RegExp(item.namedRegex || item.regex)
+    };
+  };
+  const matchOperatorsRegex = /[|\\{}()[\]^$+*?.-]/g;
+  function escapeStringRegexp(str) {
+    return str.replace(matchOperatorsRegex, "\\$&");
+  }
+  const dynamicRoutes = dynamicRoutesRaw.map(hydrateRoutesManifestItem);
+  const staticRoutes = staticRoutesRaw.map((route) => {
+    return {
+      ...route,
+      namedRegex: new RegExp(
+        "^" + escapeStringRegexp(route.page) + "$"
+      )
+    };
+  });
+  let appPathRoutesManifest = {};
+  try {
+    appPathRoutesManifest = require("./" + path.posix.join(
+      relativeDistDir,
+      "app-path-routes-manifest.json"
+    ));
+  } catch (_) {
+  }
+  const inversedAppRoutesManifest = Object.entries(
+    appPathRoutesManifest
+  ).reduce(
+    (manifest, [originalKey, normalizedKey]) => {
+      manifest[normalizedKey] = originalKey;
+      return manifest;
+    },
+    {}
+  );
+  function normalizeLocalePath(pathname, locales) {
+    if (!locales) return { pathname };
+    const lowercasedLocales = locales.map(
+      (locale) => locale.toLowerCase()
+    );
+    const segments = pathname.split("/", 2);
+    if (!segments[1]) return { pathname };
+    const segment = segments[1].toLowerCase();
+    const index = lowercasedLocales.indexOf(segment);
+    if (index < 0) return { pathname };
+    const detectedLocale = locales[index];
+    pathname = pathname.slice(detectedLocale.length + 1) || "/";
+    return { pathname, locale: detectedLocale };
+  }
+  function normalizeDataPath(pathname) {
+    if (!(pathname || "/").startsWith("/_next/data")) {
+      return pathname;
+    }
+    pathname = pathname.replace(/\/_next\/data\/[^/]{1,}/, "").replace(/\.json$/, "");
+    if (pathname === "/index") {
+      return "/";
+    }
+    return pathname;
+  }
+  function matchUrlToPage(urlPathname) {
+    urlPathname = normalizeDataPath(urlPathname);
+    console.log("before normalize", urlPathname);
+    for (const suffixRegex of [
+      /\.segments(\/.*)\.segment\.rsc$/,
+      /\.rsc$/
+    ]) {
+      urlPathname = urlPathname.replace(suffixRegex, "");
+    }
+    const urlPathnameWithLocale = urlPathname;
+    const normalizeResult = normalizeLocalePath(
+      urlPathname,
+      i18n?.locales
+    );
+    urlPathname = normalizeResult.pathname;
+    console.log("after normalize", normalizeResult);
+    urlPathname = urlPathname.replace(/\/$/, "") || "/";
+    const combinedRoutes = [...staticRoutes, ...dynamicRoutes];
+    for (const route of combinedRoutes) {
+      if (route.page === urlPathname) {
+        console.log("matched direct page", route);
+        return {
+          matchedPathname: inversedAppRoutesManifest[route.page] || route.page,
+          locale: normalizeResult.locale
+        };
+      }
+    }
+    for (const route of [...staticRoutes, ...dynamicRoutes]) {
+      console.log("testing", route.namedRegex, "against", urlPathname);
+      const matches = urlPathname.match(route.namedRegex);
+      if (matches || urlPathname === "/index" && route.namedRegex.test("/")) {
+        const fallbackFalseMap = prerenderFallbackFalseMap[route.page];
+        if (fallbackFalseMap && !(fallbackFalseMap.includes(urlPathname) || fallbackFalseMap.includes(urlPathnameWithLocale))) {
+          console.log("fallback: false but not prerendered", {
+            page: route.page,
+            urlPathname,
+            urlPathnameWithLocale,
+            paths: Object.values(fallbackFalseMap)
+          });
+          continue;
+        }
+        console.log("matched route", route, urlPathname, matches);
+        return {
+          matchedPathname: inversedAppRoutesManifest[route.page] || route.page,
+          locale: normalizeResult.locale,
+          matches
+        };
+      }
+    }
+    return {
+      matchedPathname: inversedAppRoutesManifest[urlPathname] || urlPathname,
+      locale: normalizeResult.locale
+    };
+  }
+  const SYMBOL_FOR_REQ_CONTEXT = Symbol.for("@vercel/request-context");
+  function getRequestContext() {
+    const fromSymbol = globalThis;
+    return fromSymbol[SYMBOL_FOR_REQ_CONTEXT]?.get?.() ?? {};
+  }
+  const RouterServerContextSymbol = Symbol.for(
+    "@next/router-server-methods"
+  );
+  const routerServerGlobal = globalThis;
+  if (!routerServerGlobal[RouterServerContextSymbol]) {
+    routerServerGlobal[RouterServerContextSymbol] = {};
+  }
+  routerServerGlobal[RouterServerContextSymbol]["."] = {
+    async render404(req, res) {
+      let mod;
+      try {
+        try {
+          mod = await require("./" + path.posix.join(
+            relativeDistDir,
+            "server",
+            "app",
+            `_not-found`,
+            "page.js"
+          ));
+          console.log("using _not-found.js for render404");
+        } catch {
+        }
+        if (!mod) {
+          mod = await require("./" + path.posix.join(
+            relativeDistDir,
+            "server",
+            "pages",
+            `404.js`
+          ));
+          console.log("using 404.js for render404");
+        }
+      } catch (_) {
+        mod = await require("./" + path.posix.join(
+          relativeDistDir,
+          "server",
+          "pages",
+          `_error.js`
+        ));
+        console.log("using _error for render404");
+      }
+      res.statusCode = 404;
+      if (mod) {
+        await mod.handler(req, res, {
+          waitUntil: getRequestContext().waitUntil
+        });
+      } else {
+        console.log(
+          "failed to find 404 module",
+          await require("fs").promises.readdir(
+            path.posix.join(relativeDistDir, "server", "pages")
+          ).catch((err) => err)
+        );
+        res.end("This page could not be found");
+      }
+    }
+  };
+  return async function handler(req, res, internalMetadata) {
+    try {
+      const parsedUrl = new URL(req.url || "/", "http://n");
+      let urlPathname = req.headers["x-matched-path"];
+      if (typeof urlPathname !== "string") {
+        console.log("no x-matched-path", { url: req.url });
+        urlPathname = parsedUrl.pathname || "/";
+      }
+      const {
+        matchedPathname: page,
+        locale,
+        matches
+      } = matchUrlToPage(urlPathname);
+      const isAppDir = page.match(/\/(page|route)$/);
+      let addedMatchesToUrl = false;
+      for (const matchKey in matches?.groups || {}) {
+        const matchValue = matches?.groups?.[matchKey];
+        if (!parsedUrl.searchParams.has(matchKey) && matchValue) {
+          parsedUrl.searchParams.set(matchKey, matchValue);
+          addedMatchesToUrl = true;
+        }
+      }
+      if (addedMatchesToUrl) {
+        console.log("updating URL with new matches", matches, req.url);
+        req.url = `${parsedUrl.pathname}${parsedUrl.searchParams.size > 0 ? "?" : ""}${parsedUrl.searchParams.toString()}`;
+      }
+      console.log("invoking handler", {
+        page,
+        url: req.url,
+        matchedPath: req.headers["x-matched-path"]
+      });
+      const mod = await require("./" + path.posix.join(
+        relativeDistDir,
+        "server",
+        isAppDir ? "app" : "pages",
+        `${page === "/" ? "index" : page}.js`
+      ));
+      await mod.handler(req, res, {
+        waitUntil: getRequestContext().waitUntil,
+        requestMeta: {
+          ...internalMetadata,
+          minimalMode: true,
+          // we use '.' for relative project dir since we process.chdir
+          // to the same directory as the handler file so everything is
+          // relative to that/project dir
+          relativeProjectDir: ".",
+          locale
+        }
+      });
+    } catch (error) {
+      console.error(`Failed to handle ${req.url}`, error);
+      throw error;
+    }
+  };
+}).toString()})()
+  
+  module.exports = _n_handler
+  
+  ${ctx.isMiddleware ? "" : `
+    module.exports.getRequestHandlerWithMetadata = (metadata) => {
+      console.log('using getRequestHandlerWithMetadata', metadata)
+      return (req, res) => _n_handler(req, res, metadata)
+    }
+  `}
+  
+  `.replaceAll(
+  "process.env.__PRIVATE_RELATIVE_DIST_DIR",
+  `"${ctx.projectRelativeDistDir}"`
+).replaceAll(
+  "process.env.__PRIVATE_PRERENDER_FALLBACK_MAP",
+  JSON.stringify(ctx.prerenderFallbackFalseMap)
+).replaceAll(
+  "process.env.__PRIVATE_NEXT_CONFIG",
+  JSON.stringify(ctx.nextConfig)
+);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getHandlerSource
+});

package/dist/index.js

@@ -11815,20 +11815,15 @@ async function getRequiredServerFilesManifest(entryPath, outputDirectory) {
   const manifestData = JSON.parse(
     await import_fs_extra3.default.readFile(pathRequiredServerFilesManifest, "utf8")
   );
-  const requiredServerFiles = {
-    files: [],
-    ignore: [],
-    config: {},
-    appDir: manifestData.appDir,
-    relativeAppDir: manifestData.relativeAppDir
-  };
   switch (manifestData.version) {
     case 1: {
-      requiredServerFiles.files = manifestData.files;
-      requiredServerFiles.ignore = manifestData.ignore;
-      requiredServerFiles.config = manifestData.config;
-      requiredServerFiles.appDir = manifestData.appDir;
-      break;
+      return {
+        files: manifestData.files,
+        ignore: manifestData.ignore,
+        config: manifestData.config,
+        appDir: manifestData.appDir,
+        relativeAppDir: manifestData.relativeAppDir
+      };
     }
     default: {
       throw new Error(
@@ -11836,7 +11831,6 @@ async function getRequiredServerFilesManifest(entryPath, outputDirectory) {
       );
     }
   }
-  return requiredServerFiles;
 }
 async function getPrerenderManifest(entryPath, outputDirectory) {
   const pathPrerenderManifest = import_path3.default.join(
@@ -12980,13 +12974,27 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
             routeFileNoExt + prefetchSegmentDirSuffix
           );
           const segmentAllowQuery = isAppClientParamParsingEnabled ? htmlAllowQuery : allowQuery;
+          let segmentInitialHeaders = initialHeaders;
+          if ((isBlocking || isFallback) && "headers" in meta && typeof meta.headers === "object" && meta.headers !== null) {
+            const metaHeaders = meta.headers;
+            const hasMissingMetaHeader = !segmentInitialHeaders || Object.keys(metaHeaders).some(
+              (key) => segmentInitialHeaders?.[key] == null
+            );
+            if (hasMissingMetaHeader) {
+              segmentInitialHeaders = {
+                ...metaHeaders,
+                ...segmentInitialHeaders
+              };
+            }
+          }
           for (const segmentPath of meta.segmentPaths) {
             const outputSegmentPath = import_path3.default.join(
               outputPathPage + prefetchSegmentDirSuffix,
               segmentPath
             ) + prefetchSegmentSuffix;
             let fallback = null;
-            if (segmentAllowQuery && segmentAllowQuery.length === 0) {
+            const shouldAttachSegmentFallback = segmentAllowQuery && (segmentAllowQuery.length === 0 || isAppClientParamParsingEnabled);
+            if (shouldAttachSegmentFallback) {
               const fsPath = import_path3.default.join(
                 segmentsDir,
                 segmentPath + prefetchSegmentSuffix
@@ -13007,7 +13015,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
               bypassToken: prerenderManifest.bypassToken,
               experimentalBypassFor: void 0,
               initialHeaders: {
-                ...initialHeaders,
+                ...segmentInitialHeaders,
                 vary: rscVaryHeader,
                 "content-type": rscContentTypeHeader,
                 [rscDidPostponeHeader]: "2"
@@ -16669,6 +16677,13 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
   if (isServerMode) {
     env.NODE_ENV = "production";
   }
+  if (
+    // integration tests expect outputs object
+    !process.env.NEXT_BUILDER_INTEGRATION && process.env.NEXT_ENABLE_ADAPTER
+  ) {
+    env.NEXT_ADAPTER_PATH = import_path6.default.join(__dirname, "adapter/index.js");
+    env.NEXT_ADAPTER_VERCEL_CONFIG = JSON.stringify(config);
+  }
   const shouldRunCompileStep = Boolean(buildCommand) || Boolean(buildScriptName);
   builderSpan.setAttributes({
     build: JSON.stringify(shouldRunCompileStep)
@@ -16724,7 +16739,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
   }
   if (buildOutputVersion) {
     return {
-      buildOutputPath: import_path6.default.join(outputDirectory, "output"),
+      buildOutputPath: import_path6.default.join(entryPath, outputDirectory, "output"),
       buildOutputVersion
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.15.15",
+  "version": "4.15.17",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -16,6 +16,7 @@
     "@vercel/nft": "1.1.1"
   },
   "devDependencies": {
+    "@next-community/adapter-vercel": "0.0.1-beta.1",
     "@types/aws-lambda": "8.10.19",
     "@types/buffer-crc32": "0.2.0",
     "@types/bytes": "3.1.1",
@@ -25,7 +26,7 @@
     "@types/glob": "7.1.3",
     "@types/jest": "29.5.5",
     "@types/next-server": "8.0.0",
-    "@types/node": "14.18.33",
+    "@types/node": "20.11.0",
     "@types/resolve-from": "5.0.1",
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
@@ -52,7 +53,7 @@
     "test-listen": "1.1.0",
     "text-table": "0.2.0",
     "webpack-sources": "3.2.3",
-    "@vercel/build-utils": "13.2.9",
+    "@vercel/build-utils": "13.2.16",
     "@vercel/routing-utils": "5.3.2"
   },
   "scripts": {