refactor: fixes

Author: vicb

packages/open-next/src/build.ts

@@ -1,3 +1,5 @@
+import url from "node:url";
+
 import {
   buildNextjsApp,
   setStandaloneBuildMode,
@@ -12,7 +14,7 @@ import { createServerBundle } from "./build/createServerBundle.js";
 import { createWarmerBundle } from "./build/createWarmerBundle.js";
 import { generateOutput } from "./build/generateOutput.js";
 import * as buildHelper from "./build/helper.js";
-import { printHeader } from "./build/utils.js";
+import { printHeader, showWarningOnWindows } from "./build/utils.js";
 import logger from "./logger.js";
 
 export type PublicFiles = {
@@ -23,9 +25,10 @@ export async function build(
   openNextConfigPath?: string,
   nodeExternals?: string,
 ) {
-  buildHelper.showWarningOnWindows();
+  showWarningOnWindows();
 
   const baseDir = process.cwd();
+  const distDir = url.fileURLToPath(new URL(".", import.meta.url));
 
   const { config, buildDir } = await compileOpenNextConfig(
     baseDir,
@@ -34,11 +37,7 @@ export async function build(
   );
 
   // Initialize options
-  const options = buildHelper.normalizeOptions(
-    config,
-    import.meta.url,
-    buildDir,
-  );
+  const options = buildHelper.normalizeOptions(config, distDir, buildDir);
   logger.setLevel(options.debug ? "debug" : "info");
 
   // Pre-build validation

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

@@ -1,6 +1,5 @@
 import fs from "node:fs";
 import { createRequire } from "node:module";
-import os from "node:os";
 import path from "node:path";
 import url from "node:url";
 
@@ -20,7 +19,7 @@ export type BuildOptions = ReturnType<typeof normalizeOptions>;
 
 export function normalizeOptions(
   config: OpenNextConfig,
-  buildScriptPath: string,
+  distDir: string,
   tempBuildDir: string,
 ) {
   const appPath = path.join(process.cwd(), config.appPath || ".");
@@ -55,7 +54,7 @@ export function normalizeOptions(
     monorepoRoot,
     nextVersion: getNextVersion(appPath),
     openNextVersion: getOpenNextVersion(),
-    openNextDistDir: url.fileURLToPath(new URL(".", buildScriptPath)),
+    openNextDistDir: distDir,
     outputDir,
     packager,
     tempBuildDir,
@@ -312,21 +311,6 @@ export function copyEnvFile(
   }
 }
 
-/**
- * Displays a warning on windows platform.
- */
-export function showWarningOnWindows() {
-  if (os.platform() !== "win32") return;
-
-  logger.warn("OpenNext is not fully compatible with Windows.");
-  logger.warn(
-    "For optimal performance, it is recommended to use Windows Subsystem for Linux (WSL).",
-  );
-  logger.warn(
-    "While OpenNext may function on Windows, it could encounter unpredictable failures during runtime.",
-  );
-}
-
 /**
  * Check we are in a Nextjs app by looking for the Nextjs config file.
  */

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

@@ -1,3 +1,5 @@
+import os from "node:os";
+
 import logger from "../logger.js";
 
 export function printHeader(header: string) {
@@ -12,3 +14,18 @@ export function printHeader(header: string) {
     ].join("\n"),
   );
 }
+
+/**
+ * Displays a warning on windows platform.
+ */
+export function showWarningOnWindows() {
+  if (os.platform() !== "win32") return;
+
+  logger.warn("OpenNext is not fully compatible with Windows.");
+  logger.warn(
+    "For optimal performance, it is recommended to use Windows Subsystem for Linux (WSL).",
+  );
+  logger.warn(
+    "While OpenNext may function on Windows, it could encounter unpredictable failures during runtime.",
+  );
+}