@vercel/next 4.20.2 → 4.20.4

package/dist/adapter/index.js

@@ -9665,7 +9665,7 @@ async function handleStaticOutputs(outputs, {
       const srcExtension = import_node_path.default.extname(output.filePath);
       const isHtml = srcExtension === ".html";
       if (isHtml) {
-        vercelConfig2.overrides[import_node_path.default.posix.join("./", output.pathname + ".html")] = {
+        vercelConfig2.overrides[import_node_path.default.posix.join("./", `${output.pathname}.html`)] = {
           contentType: "text/html; charset=utf-8",
           path: import_node_path.default.posix.join("./", output.pathname)
         };
@@ -9856,6 +9856,7 @@ async function handleNodeOutputs(nodeOutputs, {
       nextEnvLoaderPath
     );
   }
+  const usesSrcDir = await usesSrcDirectory(projectDir);
   await Promise.all(
     nodeOutputs.map(async (output) => {
       await fsSema.acquire();
@@ -9914,11 +9915,12 @@ async function handleNodeOutputs(nodeOutputs, {
       if (filesHashes) {
         filesHashes["___next_launcher.cjs"] = sha256(handlerSource);
       }
-      const operationType = output.type === import_constants.AdapterOutputType.APP_PAGE || import_constants.AdapterOutputType.PAGES ? "PAGE" : "API";
+      const operationType = output.type === import_constants.AdapterOutputType.APP_PAGE || output.type === import_constants.AdapterOutputType.PAGES ? "PAGE" : "API";
       const sourceFile = await getSourceFilePathFromPage({
         workPath: projectDir,
         page: output.sourcePage,
-        pageExtensions: config.pageExtensions || []
+        pageExtensions: config.pageExtensions || [],
+        usesSrcDir
       });
       const vercelConfigOpts = await (0, import_build_utils.getLambdaOptionsFromFunction)({
         sourceFile,
@@ -10229,39 +10231,29 @@ async function handleMiddleware(output, ctx) {
   }
   return routes;
 }
-var _usesSrcCache;
 async function usesSrcDirectory(workPath) {
-  if (!_usesSrcCache) {
-    const sourcePages = import_node_path.default.join(workPath, "src", "pages");
-    try {
-      if ((await import_promises.default.stat(sourcePages)).isDirectory()) {
-        _usesSrcCache = true;
-      }
-    } catch (_err) {
-      _usesSrcCache = false;
-    }
-  }
-  if (!_usesSrcCache) {
-    const sourceAppdir = import_node_path.default.join(workPath, "src", "app");
+  for (const dir of [
+    import_node_path.default.join(workPath, "src", "pages"),
+    import_node_path.default.join(workPath, "src", "app")
+  ]) {
     try {
-      if ((await import_promises.default.stat(sourceAppdir)).isDirectory()) {
-        _usesSrcCache = true;
+      if ((await import_promises.default.stat(dir)).isDirectory()) {
+        return true;
       }
     } catch (_err) {
-      _usesSrcCache = false;
     }
   }
-  return Boolean(_usesSrcCache);
+  return false;
 }
 function isDirectory(path3) {
-  return import_fs_extra3.default.existsSync(path3) && import_fs_extra3.default.lstatSync(path3).isDirectory();
+  return import_fs_extra3.default.lstatSync(path3, { throwIfNoEntry: false })?.isDirectory() ?? false;
 }
 async function getSourceFilePathFromPage({
   workPath,
   page,
-  pageExtensions
+  pageExtensions,
+  usesSrcDir
 }) {
-  const usesSrcDir = await usesSrcDirectory(workPath);
   const extensionsToTry = pageExtensions || ["js", "jsx", "ts", "tsx"];
   for (const pageType of [
     // middleware is not nested in pages/app
@@ -10376,10 +10368,10 @@ function modifyWithRewriteHeaders(rewrites, {
     rewrite.headers = {
       ...rewrite.headers,
       ...pathname ? {
-        ["x-nextjs-rewritten-path"]: pathname
+        "x-nextjs-rewritten-path": pathname
       } : {},
       ...query ? {
-        ["x-nextjs-rewritten-query"]: query
+        "x-nextjs-rewritten-query": query
       } : {}
     };
   }
@@ -10624,8 +10616,10 @@ if(${cookieCheck}){
 var myAdapter = {
   name: "Vercel",
   async modifyConfig(config, ctx) {
-    if (ctx.phase === import_constants2.PHASE_PRODUCTION_BUILD && process.env.VERCEL_IMMUTABLE_STATIC_FILES_ENABLED === "1") {
-      config.experimental.supportsImmutableAssets = true;
+    if (ctx.phase === import_constants2.PHASE_PRODUCTION_BUILD) {
+      config.experimental.supportsImmutableAssets = // Default to true, allow users to opt-out
+      (config.experimental.supportsImmutableAssets ?? true) && // AND with infra support to allow disabling via feature flag if necessary.
+      process.env.VERCEL_IMMUTABLE_STATIC_FILES_ENABLED === "1";
     }
     if (process.env.VERCEL_HASH_SALT != null) {
       config.experimental.outputHashSalt = (config.experimental.outputHashSalt ?? "") + process.env.VERCEL_HASH_SALT;

package/dist/adapter/node-handler.js

@@ -43,7 +43,7 @@ const getHandlerSource = (ctx) => `
     return fromSymbol[SYMBOL_FOR_REQ_CONTEXT]?.get?.() ?? {};
   }
   return async function handler(request) {
-    let middlewareHandler = await require("./" + path.posix.join(relativeDistDir, "server", "middleware.js"));
+    let middlewareHandler = await require(`./${path.posix.join(relativeDistDir, "server", "middleware.js")}`);
     middlewareHandler = middlewareHandler.handler || middlewareHandler;
     const context = getRequestContext();
     const response = await middlewareHandler(request, {
@@ -65,7 +65,7 @@ const getHandlerSource = (ctx) => `
     dynamicRoutes: dynamicRoutesRaw,
     staticRoutes: staticRoutesRaw,
     i18n
-  } = require("./" + path.posix.join(relativeDistDir, "routes-manifest.json"));
+  } = require(`./${path.posix.join(relativeDistDir, "routes-manifest.json")}`);
   const matchOperatorsRegex = /[|\\{}()[\]^$+*?.-]/g;
   function escapeStringRegexp(str) {
     return str.replace(matchOperatorsRegex, "\\$&");
@@ -79,9 +79,7 @@ const getHandlerSource = (ctx) => `
   const staticRoutes = staticRoutesRaw.map((route) => {
     return {
       ...route,
-      namedRegex: new RegExp(
-        "^" + escapeStringRegexp(route.page) + "$"
-      )
+      namedRegex: new RegExp(`^${escapeStringRegexp(route.page)}$`)
     };
   });
   let appPathRoutesManifest = {};

package/dist/index.js

@@ -13445,7 +13445,8 @@ async function getNodeMiddleware({
   prerenderBypassToken,
   isCorrectMiddlewareOrder,
   functionsConfigManifest,
-  requiredServerFilesManifest
+  requiredServerFilesManifest,
+  instrumentationHookBuildTrace
 }) {
   const middlewareFunctionConfig = functionsConfigManifest?.functions["/_middleware"];
   if (!middlewareFunctionConfig || !middlewareFunctionConfig.matchers) {
@@ -13506,6 +13507,22 @@ async function getNodeMiddleware({
       console.log("outside base dir", absolutePath);
     }
   });
+  if (instrumentationHookBuildTrace) {
+    instrumentationHookBuildTrace.files.map((file) => {
+      fileList.push(
+        import_path3.default.relative(
+          baseDir,
+          import_path3.default.join(entryPath, outputDirectory, "server", file)
+        )
+      );
+    });
+    fileList.push(
+      import_path3.default.relative(
+        baseDir,
+        import_path3.default.join(entryPath, outputDirectory, "server", "instrumentation.js")
+      )
+    );
+  }
   const reasons = /* @__PURE__ */ new Map();
   const tracedFiles = Object.fromEntries(
     (await Promise.all(
@@ -14739,13 +14756,13 @@ async function serverBuild({
     })
   ]);
   const experimentalStreamingLambdaPaths = /* @__PURE__ */ new Map();
+  let instrumentationHookBuildTrace;
   if (hasLambdas) {
     const initialTracingLabel = "Traced Next.js server files in";
     console.time(initialTracingLabel);
     let initialFileList;
     let initialFileReasons;
     let nextServerBuildTrace;
-    let instrumentationHookBuildTrace;
     const useBundledServer = import_semver4.default.gte(
       nextVersion,
       BUNDLED_SERVER_NEXT_VERSION
@@ -15522,7 +15539,8 @@ ${JSON.stringify(
     prerenderBypassToken: prerenderManifest.bypassToken,
     isCorrectMiddlewareOrder,
     functionsConfigManifest,
-    requiredServerFilesManifest
+    requiredServerFilesManifest,
+    instrumentationHookBuildTrace
   });
   const middleware = await getMiddlewareBundle({
     config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.20.2",
+  "version": "4.20.4",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -16,7 +16,7 @@
     "@vercel/nft": "1.10.0"
   },
   "devDependencies": {
-    "@next-community/adapter-vercel": "0.0.1-beta.22",
+    "@next-community/adapter-vercel": "0.0.1-beta.24",
     "@types/aws-lambda": "8.10.19",
     "@types/buffer-crc32": "0.2.0",
     "@types/bytes": "3.1.1",
@@ -54,7 +54,7 @@
     "vitest": "2.0.3",
     "webpack-sources": "3.2.3",
     "@vercel/routing-utils": "6.4.0",
-    "@vercel/build-utils": "13.32.2"
+    "@vercel/build-utils": "13.32.3"
   },
   "scripts": {
     "build": "node build.mjs",