fix: static html blobs if distDir is different than default .next

Author: pieh

src/run/config.ts

@@ -19,7 +19,7 @@ export const getRunConfig = async () => {
   return JSON.parse(await readFile(resolve(PLUGIN_DIR, RUN_CONFIG_FILE), 'utf-8')) as RunConfig
 }
 
-type NextConfigForMultipleVersions = NextConfigComplete & {
+export type NextConfigForMultipleVersions = NextConfigComplete & {
   experimental: NextConfigComplete['experimental'] & {
     // those are pre 14.1.0 options that were moved out of experimental in // https://github.com/vercel/next.js/pull/57953/files#diff-c49c4767e6ed8627e6e1b8f96b141ee13246153f5e9142e1da03450c8e81e96fL311
 
@@ -62,4 +62,6 @@ export const setRunConfig = (config: NextConfigForMultipleVersions) => {
 
   // set config
   process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(config)
+
+  return config
 }

src/run/handlers/server.ts

@@ -24,11 +24,11 @@ import { setupWaitUntil } from './wait-until.cjs'
 setFetchBeforeNextPatchedIt(globalThis.fetch)
 // configure globals that Next.js make use of before we start importing any Next.js code
 // as some globals are consumed at import time
-const { nextConfig, enableUseCacheHandler } = await getRunConfig()
+const { nextConfig: initialNextConfig, enableUseCacheHandler } = await getRunConfig()
 if (enableUseCacheHandler) {
   configureUseCacheHandlers()
 }
-setRunConfig(nextConfig)
+const nextConfig = setRunConfig(initialNextConfig)
 setupWaitUntil()
 
 const nextImportPromise = import('../next.cjs')
@@ -71,7 +71,7 @@ export default async (
       const { getMockedRequestHandler } = await nextImportPromise
       const url = new URL(request.url)
 
-      nextHandler = await getMockedRequestHandler({
+      nextHandler = await getMockedRequestHandler(nextConfig, {
         port: Number(url.port) || 443,
         hostname: url.hostname,
         dir: process.cwd(),

src/run/next.cts

@@ -1,12 +1,13 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 import fs from 'node:fs/promises'
-import { relative, resolve } from 'node:path'
+import { relative, resolve, join } from 'node:path'
 
 // @ts-expect-error no types installed
 import { patchFs } from 'fs-monkey'
 
 import { HtmlBlob } from '../shared/blob-types.cjs'
 
+import type { NextConfigForMultipleVersions } from './config.js'
 import { getRequestContext } from './handlers/request-context.cjs'
 import { getTracer } from './handlers/tracer.cjs'
 import { getMemoizedKeyValueStoreBackedByRegionalBlobStore } from './storage/storage.cjs'
@@ -79,7 +80,10 @@ ResponseCache.prototype.get = function get(...getArgs: unknown[]) {
 
 type FS = typeof import('fs')
 
-export async function getMockedRequestHandler(...args: Parameters<typeof getRequestHandlers>) {
+export async function getMockedRequestHandler(
+  nextConfig: NextConfigForMultipleVersions,
+  ...args: Parameters<typeof getRequestHandlers>
+) {
   const initContext = { initializingServer: true }
   /**
    * Using async local storage to identify operations happening as part of server initialization
@@ -101,8 +105,9 @@ export async function getMockedRequestHandler(...args: Parameters<typeof getRequ
         // only try to get .html files from the blob store
         if (typeof path === 'string' && path.endsWith('.html')) {
           const cacheStore = getMemoizedKeyValueStoreBackedByRegionalBlobStore()
-          const relPath = relative(resolve('.next/server/pages'), path)
+          const relPath = relative(resolve(nextConfig.distDir, 'server/pages'), path)
           const file = await cacheStore.get<HtmlBlob>(relPath, 'staticHtml.get')
+          console.log('trying to read path', { path, relPath, file })
           if (file !== null) {
             if (file.isFullyStaticPage) {
               const requestContext = getRequestContext()