review

Author: sommeeeer

packages/open-next/src/build/createServerBundle.ts

@@ -302,9 +302,7 @@ async function generateBundle(
       outfile: path.join(outputPath, packagePath, `index.${outfileExt}`),
       banner: {
         js: [
-          needsGlobalOutputDir(options)
-            ? `globalThis.outputDir = "${outputDir}";`
-            : "",
+          `globalThis.monorepoPackagePath = "${packagePath}";`,
           "import process from 'node:process';",
           "import { Buffer } from 'node:buffer';",
           "import { createRequire as topLevelCreateRequire } from 'module';",
@@ -397,13 +395,3 @@ async function minifyServerBundle(outputDir: string) {
     mangle: true,
   });
 }
-
-// Check if we need the outputDir in any dev override
-// Remember to update this if you add a new override that needs the outputDir
-function needsGlobalOutputDir(options: buildHelper.BuildOptions) {
-  return (
-    options.config.default?.override?.wrapper === "express-dev" ||
-    options.config.default.override?.incrementalCache === "fs-dev" ||
-    options.config.default.override?.tagCache === "fs-dev"
-  );
-}

packages/open-next/src/overrides/incrementalCache/fs-dev.ts

@@ -4,7 +4,14 @@ import fs from "node:fs/promises";
 import path from "node:path";
 
 const buildId = process.env.NEXT_BUILD_ID;
-const basePath = path.join(globalThis.outputDir, `cache/${buildId}`);
+const basePath = path.join(
+  globalThis.monorepoPackagePath
+    .split("/")
+    .filter(Boolean)
+    .map(() => "../")
+    .join(""),
+  `../../cache/${buildId}`,
+);
 
 const getCacheKey = (key: string) => {
   return path.join(basePath, `${key}.cache`);

packages/open-next/src/overrides/tagCache/fs-dev.ts

@@ -4,8 +4,12 @@ import fs from "node:fs";
 import path from "node:path";
 
 const tagFile = path.join(
-  globalThis.outputDir,
-  "dynamodb-provider/dynamodb-cache.json",
+  globalThis.monorepoPackagePath
+    .split("/")
+    .filter(Boolean)
+    .map(() => "../")
+    .join(""),
+  "../../dynamodb-provider/dynamodb-cache.json",
 );
 const tagContent = fs.readFileSync(tagFile, "utf-8");
 

packages/open-next/src/overrides/wrappers/express-dev.ts

@@ -4,13 +4,22 @@ import express from "express";
 import type { StreamCreator } from "types/open-next.js";
 import type { WrapperHandler } from "types/overrides.js";
 
+const outputDir = path.join(
+  globalThis.monorepoPackagePath
+    .split("/")
+    .filter(Boolean)
+    .map(() => "../")
+    .join(""),
+  "../../",
+);
+
 const wrapper: WrapperHandler = async (handler, converter) => {
   const app = express();
   // To serve static assets
-  app.use(express.static(path.join(globalThis.outputDir, "assets")));
+  app.use(express.static(path.join(outputDir, "assets")));
 
   const imageHandlerPath = path.join(
-    globalThis.outputDir,
+    outputDir,
     "image-optimization-function/index.mjs",
   );
 

packages/open-next/src/types/global.ts

@@ -222,7 +222,8 @@ declare global {
   ) => Promise<void>;
 
   /**
-   * This is for dev overrides that needs the output directory.
+   * This is the relative package path of the monorepo. It will be an empty string "" in normal repos.
+   * ex. `packages/web`
    */
-  var outputDir: string;
+  var monorepoPackagePath: string;
 }