review

Author: sommeeeer

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

@@ -1,17 +1,11 @@
-import type { IncrementalCache } from "types/overrides.js";
-
 import fs from "node:fs/promises";
 import path from "node:path";
 
+import type { IncrementalCache } from "types/overrides.js";
+import { getOutputDir } from "utils/normalize-path";
+
 const buildId = process.env.NEXT_BUILD_ID;
-const basePath = path.join(
-  globalThis.monorepoPackagePath
-    .split("/")
-    .filter(Boolean)
-    .map(() => "../")
-    .join(""),
-  `../../cache/${buildId}`,
-);
+const basePath = path.join(getOutputDir(), `../../cache/${buildId}`);
 
 const getCacheKey = (key: string) => {
   return path.join(basePath, `${key}.cache`);

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

@@ -1,14 +1,11 @@
-import type { TagCache } from "types/overrides";
-
 import fs from "node:fs";
 import path from "node:path";
 
+import type { TagCache } from "types/overrides";
+import { getOutputDir } from "utils/normalize-path";
+
 const tagFile = path.join(
-  globalThis.monorepoPackagePath
-    .split("/")
-    .filter(Boolean)
-    .map(() => "../")
-    .join(""),
+  getOutputDir(),
   "../../dynamodb-provider/dynamodb-cache.json",
 );
 const tagContent = fs.readFileSync(tagFile, "utf-8");

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

@@ -3,24 +3,16 @@ 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(""),
-  "../../",
-);
+import { getOutputDir } from "utils/normalize-path";
 
 const wrapper: WrapperHandler = async (handler, converter) => {
   const app = express();
   // To serve static assets
-  app.use(express.static(path.join(outputDir, "assets")));
+  app.use(express.static(path.join(getOutputDir(), "../../assets")));
 
   const imageHandlerPath = path.join(
-    outputDir,
-    "image-optimization-function/index.mjs",
+    getOutputDir(),
+    "../../image-optimization-function/index.mjs",
   );
 
   const imageHandler = await import(imageHandlerPath).then((m) => m.handler);

packages/open-next/src/utils/normalize-path.ts

@@ -1,3 +1,15 @@
+import path from "node:path";
+
 export function normalizePath(path: string) {
   return path.replace(/\\/g, "/");
 }
+
+export function getOutputDir() {
+  return path.join(
+    globalThis.monorepoPackagePath
+      .split("/")
+      .filter(Boolean)
+      .map(() => "..")
+      .join("/"),
+  );
+}