From db356cf969f0ea4b82fae88ff5ec6969d14d99dd Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Fri, 24 Jan 2025 14:16:00 +0100 Subject: [PATCH] refactor: getBuildId takes the BuildOptions --- packages/open-next/src/build/createAssets.ts | 2 +- packages/open-next/src/build/generateOutput.ts | 4 +--- packages/open-next/src/build/helper.ts | 7 +++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/open-next/src/build/createAssets.ts b/packages/open-next/src/build/createAssets.ts index bee651bc5..892d8bf3a 100644 --- a/packages/open-next/src/build/createAssets.ts +++ b/packages/open-next/src/build/createAssets.ts @@ -62,7 +62,7 @@ export function createCacheAssets(options: buildHelper.BuildOptions) { const { appBuildOutputPath, outputDir } = options; const packagePath = buildHelper.getPackagePath(options); - const buildId = buildHelper.getBuildId(appBuildOutputPath); + const buildId = buildHelper.getBuildId(options); let useTagCache = false; // Copy pages to cache folder diff --git a/packages/open-next/src/build/generateOutput.ts b/packages/open-next/src/build/generateOutput.ts index c21b08098..b8d80e2f2 100644 --- a/packages/open-next/src/build/generateOutput.ts +++ b/packages/open-next/src/build/generateOutput.ts @@ -292,9 +292,7 @@ export async function generateOutput(options: BuildOptions) { const patterns = "patterns" in value ? value.patterns : ["*"]; patterns.forEach((pattern) => { behaviors.push({ - pattern: prefixer( - pattern.replace(/BUILD_ID/, getBuildId(appBuildOutputPath)), - ), + pattern: prefixer(pattern.replace(/BUILD_ID/, getBuildId(options))), origin: value.placement === "global" ? undefined : key, edgeFunction: value.placement === "global" diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts index f5729a5f1..496989d9c 100644 --- a/packages/open-next/src/build/helper.ts +++ b/packages/open-next/src/build/helper.ts @@ -252,9 +252,12 @@ export function getHtmlPages(dotNextPath: string) { .reduce((acc, page) => acc.add(page), new Set()); } -export function getBuildId(dotNextPath: string) { +export function getBuildId(options: BuildOptions) { return fs - .readFileSync(path.join(dotNextPath, ".next/BUILD_ID"), "utf-8") + .readFileSync( + path.join(options.appBuildOutputPath, ".next/BUILD_ID"), + "utf-8", + ) .trim(); }