@vercel/next 4.16.4 → 4.16.6

package/dist/adapter/index.js

@@ -9645,6 +9645,7 @@ async function handleStaticOutputs(outputs, {
   );
 }
 var vercelConfig = JSON.parse(process.env.NEXT_ADAPTER_VERCEL_CONFIG || "{}");
+var hasWarnedAboutDotEnv = false;
 function isGeneratedStep(routeName) {
   return routeName.includes(".well-known/workflow/v1/step") || routeName.includes("api/generated/steps");
 }
@@ -9688,6 +9689,30 @@ async function writeDeterministicRoutesManifest(distDir) {
   await import_promises.default.writeFile(outputManifestPath, JSON.stringify(manifest));
   return outputManifestPath;
 }
+async function getProjectEnvFiles(projectDir) {
+  const envFiles = [];
+  const projectFiles = (await import_promises.default.readdir(projectDir).catch(() => [])).sort();
+  for (const file of projectFiles) {
+    const isEnv = file === ".env" || file.startsWith(".env.");
+    if (!isEnv) {
+      continue;
+    }
+    const statResult = await import_promises.default.lstat(import_node_path.default.join(projectDir, file)).catch(() => {
+      return void 0;
+    });
+    if (statResult?.isFile()) {
+      envFiles.push(file);
+    }
+  }
+  return envFiles;
+}
+function resolveNextEnvLoaderPath(projectDir) {
+  const { createRequire } = require("module");
+  const projectRequire = createRequire(import_node_path.default.join(projectDir, "package.json"));
+  const nextPackagePath = projectRequire.resolve("next/package.json");
+  const requireFromNext = createRequire(nextPackagePath);
+  return requireFromNext.resolve("@next/env");
+}
 async function handleNodeOutputs(nodeOutputs, {
   config,
   distDir,
@@ -9728,6 +9753,27 @@ async function handleNodeOutputs(nodeOutputs, {
     import_node_path.default.posix.relative(repoRoot, distDir),
     "routes-manifest.json"
   );
+  const envFiles = await getProjectEnvFiles(projectDir);
+  const hasProjectEnvFiles = envFiles.length > 0;
+  const envFilePathMap = {};
+  let nextEnvLoaderPathRelativeToProjectDir;
+  for (const envFile of envFiles) {
+    envFilePathMap[import_node_path.default.posix.join(import_node_path.default.posix.relative(repoRoot, projectDir), envFile)] = import_node_path.default.posix.relative(repoRoot, import_node_path.default.join(projectDir, envFile));
+  }
+  if (hasProjectEnvFiles) {
+    if (!hasWarnedAboutDotEnv) {
+      console.warn(
+        "Detected .env file, it is strongly recommended to use Vercel's env handling instead"
+      );
+      hasWarnedAboutDotEnv = true;
+    }
+    const nextEnvLoaderPath = resolveNextEnvLoaderPath(projectDir);
+    envFilePathMap[import_node_path.default.posix.relative(repoRoot, nextEnvLoaderPath)] = import_node_path.default.posix.relative(repoRoot, nextEnvLoaderPath);
+    nextEnvLoaderPathRelativeToProjectDir = import_node_path.default.posix.relative(
+      projectDir,
+      nextEnvLoaderPath
+    );
+  }
   await Promise.all(
     nodeOutputs.map(async (output) => {
       await fsSema.acquire();
@@ -9741,6 +9787,9 @@ async function handleNodeOutputs(nodeOutputs, {
         files[relPath] = import_node_path.default.posix.relative(repoRoot, fsPath);
       }
       files[import_node_path.default.posix.relative(repoRoot, output.filePath)] = import_node_path.default.posix.relative(repoRoot, output.filePath);
+      if (hasProjectEnvFiles) {
+        Object.assign(files, envFilePathMap);
+      }
       if (output.type === import_constants.AdapterOutputType.PAGES) {
         const notFoundOutput = pages404Output || pagesErrorOutput;
         if (notFoundOutput) {
@@ -9767,7 +9816,8 @@ async function handleNodeOutputs(nodeOutputs, {
           projectRelativeDistDir: import_node_path.default.posix.relative(projectDir, distDir),
           prerenderFallbackFalseMap,
           isMiddleware,
-          nextConfig: config
+          nextConfig: config,
+          nextEnvLoaderPathRelativeToProjectDir
         })
       );
       const operationType = output.type === import_constants.AdapterOutputType.APP_PAGE || import_constants.AdapterOutputType.PAGES ? "PAGE" : "API";
@@ -10312,6 +10362,26 @@ function normalizeNextDataRoutes(config, buildId, shouldHandleMiddlewareDataReso
   const basePath = config.basePath || "";
   const trailingSlash = config.trailingSlash || false;
   return [
+    // remove x-nextjs-data header for non _next/data requests
+    {
+      src: path3.posix.join("/", basePath, "/(?!_next/data(?:/|$))(.*)"),
+      has: [
+        {
+          type: "header",
+          key: "x-nextjs-data"
+        }
+      ],
+      transforms: [
+        {
+          type: "request.headers",
+          op: "delete",
+          target: {
+            key: "x-nextjs-data"
+          }
+        }
+      ],
+      continue: true
+    },
     // ensure x-nextjs-data header is always present if we are doing middleware next data resolving
     {
       src: path3.posix.join("/", basePath, "/_next/data/(.*)"),

package/dist/adapter/node-handler.js

@@ -24,8 +24,15 @@ module.exports = __toCommonJS(node_handler_exports);
 const getHandlerSource = (ctx) => `
   process.env.NODE_ENV = 'production';
   process.chdir(__dirname);
-  
-  require('next/setup-node-env')
+
+  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");
@@ -289,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/dist/index.js

@@ -15722,6 +15722,30 @@ ${JSON.stringify(
       ...trailingSlashRedirects,
       ...privateOutputs.routes,
       ...isNextDataServerResolving ? [
+        // remove x-nextjs-data header for non _next/data requests
+        {
+          src: import_path5.default.posix.join(
+            "/",
+            entryDirectory,
+            "/(?!_next/data(?:/|$))(.*)"
+          ),
+          has: [
+            {
+              type: "header",
+              key: "x-nextjs-data"
+            }
+          ],
+          transforms: [
+            {
+              type: "request.headers",
+              op: "delete",
+              target: {
+                key: "x-nextjs-data"
+              }
+            }
+          ],
+          continue: true
+        },
         // ensure x-nextjs-data header is always present
         // if we are doing middleware next data resolving
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.16.4",
+  "version": "4.16.6",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -16,7 +16,7 @@
     "@vercel/nft": "1.5.0"
   },
   "devDependencies": {
-    "@next-community/adapter-vercel": "0.0.1-beta.15",
+    "@next-community/adapter-vercel": "0.0.1-beta.17",
     "@types/aws-lambda": "8.10.19",
     "@types/buffer-crc32": "0.2.0",
     "@types/bytes": "3.1.1",
@@ -53,7 +53,7 @@
     "test-listen": "1.1.0",
     "text-table": "0.2.0",
     "webpack-sources": "3.2.3",
-    "@vercel/build-utils": "13.12.1",
+    "@vercel/build-utils": "13.14.2",
     "@vercel/routing-utils": "6.1.1"
   },
   "scripts": {