use buildId from adapter context and don't read on our own

Author: pieh

src/adapter/build/netlify-adapter-context.ts

@@ -1,18 +1,7 @@
-import { readFile } from 'fs/promises'
-import { join } from 'path/posix'
-
-import type { FrameworksAPIConfig, OnBuildCompleteContext } from './types.js'
-
-export function createNetlifyAdapterContext(nextAdapterContext: OnBuildCompleteContext) {
-  let buildId: string | undefined
+import type { FrameworksAPIConfig } from './types.js'
 
+export function createNetlifyAdapterContext() {
   return {
-    async getBuildId() {
-      if (!buildId) {
-        buildId = await readFile(join(nextAdapterContext.distDir, 'BUILD_ID'), 'utf-8')
-      }
-      return buildId
-    },
     frameworksAPIConfig: undefined as FrameworksAPIConfig | undefined,
     preparedOutputs: {
       staticAssets: [] as string[],

src/adapter/build/routing.ts

@@ -3,7 +3,12 @@ import { join } from 'node:path/posix'
 
 import { glob } from 'fast-glob'
 
-import type { RoutingRule, RoutingRuleRedirect, RoutingRuleRewrite } from '../run/routing.js'
+import type {
+  RoutingRule,
+  RoutingRuleApply,
+  RoutingRuleRedirect,
+  RoutingRuleRewrite,
+} from '../run/routing.js'
 
 import {
   DISPLAY_NAME_ROUTING,
@@ -80,10 +85,18 @@ export function convertDynamicRouteToRoutingRule(
   } satisfies RoutingRuleRewrite
 }
 
+const matchOperatorsRegex = /[|\\{}()[\]^$+*?.-]/g
+
+export function escapeStringRegexp(str: string): string {
+  return str.replace(matchOperatorsRegex, '\\$&')
+}
+
 export async function generateRoutingRules(
   nextAdapterContext: OnBuildCompleteContext,
   netlifyAdapterContext: NetlifyAdapterContext,
 ) {
+  const escapedBuildId = escapeStringRegexp(nextAdapterContext.buildId)
+
   const hasMiddleware = Boolean(nextAdapterContext.outputs.middleware)
   const hasPages =
     nextAdapterContext.outputs.pages.length !== 0 ||
@@ -148,7 +161,7 @@ export async function generateRoutingRules(
         {
           description: 'Normalize _next/data',
           match: {
-            path: `^${nextAdapterContext.config.basePath}/_next/data/${await netlifyAdapterContext.getBuildId()}/(.*)\\.json`,
+            path: `^${nextAdapterContext.config.basePath}/_next/data/${escapedBuildId}/(.*)\\.json`,
             has: [
               {
                 type: 'header',
@@ -211,7 +224,7 @@ export async function generateRoutingRules(
           },
           apply: {
             type: 'rewrite',
-            destination: `${nextAdapterContext.config.basePath}/_next/data/${await netlifyAdapterContext.getBuildId()}/$1.json`,
+            destination: `${nextAdapterContext.config.basePath}/_next/data/${nextAdapterContext.buildId}/$1.json`,
           },
         },
       ]
@@ -432,8 +445,44 @@ export async function generateRoutingRules(
     // apply normal dynamic routes
     ...dynamicRoutes, // originally: ...convertedDynamicRoutes,
 
-    // apply x-nextjs-matched-path header and __next_data_catchall rewrite
-    // if middleware + pages
+    ...(hasMiddleware && hasPages
+      ? [
+          // apply x-nextjs-matched-path header
+          // if middleware + pages
+          {
+            description: 'Apply x-nextjs-matched-path header if middleware + pages',
+            match: {
+              path: `^${join(
+                '/',
+                nextAdapterContext.config.basePath,
+                '/_next/data/',
+                escapedBuildId,
+                '/(.*).json',
+              )}`,
+            },
+            apply: {
+              type: 'apply',
+              headers: {
+                'x-nextjs-matched-path': '/$1',
+              },
+            },
+            continue: true,
+          } satisfies RoutingRuleApply,
+          {
+            // apply __next_data_catchall rewrite
+            // if middleware + pages
+            description: 'Apply __next_data_catchall rewrite if middleware + pages',
+            match: {
+              path: ``,
+            },
+            apply: {
+              type: 'rewrite',
+              destination: '__next_data_catchall',
+              statusCode: 200,
+            },
+          } satisfies RoutingRule,
+        ]
+      : []),
 
     {
       // originally: handle: 'hit' },

src/adapter/build/static-assets.ts

@@ -19,7 +19,7 @@ export async function onBuildComplete(
           NEXT_RUNTIME_STATIC_ASSETS,
           '_next',
           'data',
-          await netlifyAdapterContext.getBuildId(),
+          nextAdapterContext.buildId,
           // eslint-disable-next-line unicorn/no-nested-ternary
           `${distPathname === '/' ? 'index' : distPathname.endsWith('/') ? distPathname.slice(0, -1) : distPathname}.json`,
         )
@@ -65,5 +65,19 @@ export async function onBuildComplete(
     await cp('public', NEXT_RUNTIME_STATIC_ASSETS, {
       recursive: true,
     })
+    // TODO: glob things to add to preparedOutputs.staticAssets
+  }
+
+  const hasMiddleware = Boolean(nextAdapterContext.outputs.middleware)
+  const hasPages =
+    nextAdapterContext.outputs.pages.length !== 0 ||
+    nextAdapterContext.outputs.pagesApi.length !== 0
+
+  if (hasMiddleware && hasPages) {
+    // create empty __next_data_catchall json file used for fully static pages
+    await writeFile(join(NEXT_RUNTIME_STATIC_ASSETS, '__next_data_catchall.json'), '{}')
+    netlifyAdapterContext.preparedOutputs.staticAssets.push('__next_data_catchall.json')
+    netlifyAdapterContext.preparedOutputs.staticAssetsAliases.__next_data_catchall =
+      '__next_data_catchall.json'
   }
 }