@next-community/adapter-vercel 0.0.1-beta.2 → 0.0.1-beta.20

package/dist/node-handler.js

@@ -23,16 +23,16 @@ __export(node_handler_exports, {
 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);
+
+  require('next/setup-node-env');
+
+  if (process.env.__PRIVATE_NEXT_ENV_LOADER_PATH) {
+    const { loadEnvConfig } = require(
+      './' + process.env.__PRIVATE_NEXT_ENV_LOADER_PATH
+    );
+    loadEnvConfig('.', process.env.NODE_ENV === 'development');
+  }
   
   const _n_handler = (${ctx.isMiddleware ? () => {
   const path = require("path");
@@ -43,7 +43,6 @@ const getHandlerSource = (ctx) => `
     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();
@@ -67,17 +66,16 @@ const getHandlerSource = (ctx) => `
     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 dynamicRoutes = dynamicRoutesRaw.map((item) => {
+    return {
+      ...item,
+      namedRegex: new RegExp(item.namedRegex || item.regex)
+    };
+  });
   const staticRoutes = staticRoutesRaw.map((route) => {
     return {
       ...route,
@@ -129,7 +127,6 @@ const getHandlerSource = (ctx) => `
   }
   function matchUrlToPage(urlPathname) {
     urlPathname = normalizeDataPath(urlPathname);
-    console.log("before normalize", urlPathname);
     for (const suffixRegex of [
       /\.segments(\/.*)\.segment\.rsc$/,
       /\.rsc$/
@@ -142,12 +139,10 @@ const getHandlerSource = (ctx) => `
       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
@@ -155,20 +150,12 @@ const getHandlerSource = (ctx) => `
       }
     }
     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,
@@ -205,7 +192,6 @@ const getHandlerSource = (ctx) => `
             `_not-found`,
             "page.js"
           ));
-          console.log("using _not-found.js for render404");
         } catch {
         }
         if (!mod) {
@@ -215,7 +201,6 @@ const getHandlerSource = (ctx) => `
             "pages",
             `404.js`
           ));
-          console.log("using 404.js for render404");
         }
       } catch (_) {
         mod = await require("./" + path.posix.join(
@@ -224,7 +209,6 @@ const getHandlerSource = (ctx) => `
           "pages",
           `_error.js`
         ));
-        console.log("using _error for render404");
       }
       res.statusCode = 404;
       if (mod) {
@@ -232,22 +216,24 @@ const getHandlerSource = (ctx) => `
           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");
       }
     }
   };
+  function fixMojibake(input) {
+    const bytes = new Uint8Array(input.length);
+    for (let i = 0; i < input.length; i++) {
+      bytes[i] = input.charCodeAt(i);
+    }
+    const decoder = new TextDecoder("utf-8");
+    return decoder.decode(bytes);
+  }
   return async function handler(req, res, internalMetadata) {
     try {
       const parsedUrl = new URL(req.url || "/", "http://n");
-      let urlPathname = req.headers["x-matched-path"];
+      const initURL = `https://${req.headers.host || "localhost"}${parsedUrl.pathname}${parsedUrl.search}`;
+      let urlPathname = typeof req.headers["x-matched-path"] === "string" ? fixMojibake(req.headers["x-matched-path"]) : void 0;
       if (typeof urlPathname !== "string") {
-        console.log("no x-matched-path", { url: req.url });
         urlPathname = parsedUrl.pathname || "/";
       }
       const {
@@ -265,14 +251,8 @@ const getHandlerSource = (ctx) => `
         }
       }
       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",
@@ -288,7 +268,8 @@ const getHandlerSource = (ctx) => `
           // to the same directory as the handler file so everything is
           // relative to that/project dir
           relativeProjectDir: ".",
-          locale
+          locale,
+          initURL
         }
       });
     } catch (error) {
@@ -302,7 +283,6 @@ const getHandlerSource = (ctx) => `
   
   ${ctx.isMiddleware ? "" : `
     module.exports.getRequestHandlerWithMetadata = (metadata) => {
-      console.log('using getRequestHandlerWithMetadata', metadata)
       return (req, res) => _n_handler(req, res, metadata)
     }
   `}
@@ -316,6 +296,9 @@ const getHandlerSource = (ctx) => `
 ).replaceAll(
   "process.env.__PRIVATE_NEXT_CONFIG",
   JSON.stringify(ctx.nextConfig)
+).replaceAll(
+  "process.env.__PRIVATE_NEXT_ENV_LOADER_PATH",
+  JSON.stringify(ctx.nextEnvLoaderPathRelativeToProjectDir || "")
 );
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-community/adapter-vercel",
-  "version": "0.0.1-beta.2",
+  "version": "0.0.1-beta.20",
   "type": "commonjs",
   "main": "dist/index.js",
   "files": [
@@ -16,14 +16,14 @@
     "@types/node": "14.18.33",
     "@types/picomatch": "2.3.3",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "12.2.2",
+    "@vercel/build-utils": "13.6.2",
     "@vercel/routing-utils": "5.2.1",
     "async-sema": "3.1.1",
     "bytes": "3.1.2",
     "convert-source-map": "1.8.0",
     "esbuild": "0.25.10",
     "fs-extra": "11.2.0",
-    "next": "16.1.1-canary.18",
+    "next": "16.2.1-canary.34",
     "picomatch": "4.0.1",
     "source-map": "0.7.4",
     "webpack-sources": "3.2.3"