From 937d9bfa016f13c457faca407352aa6a82243428 Mon Sep 17 00:00:00 2001
From: Dorseuil Nicolas <nicodorseuil@yahoo.fr>
Date: Wed, 8 May 2024 11:56:29 +0200
Subject: [PATCH 1/3] fix package version

---
 packages/open-next/src/build.ts        | 15 ++-------------
 packages/open-next/src/build/helper.ts | 11 +++++++----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/packages/open-next/src/build.ts b/packages/open-next/src/build.ts
index 5aed56f1d..1a828d081 100755
--- a/packages/open-next/src/build.ts
+++ b/packages/open-next/src/build.ts
@@ -213,19 +213,8 @@ function printHeader(header: string) {
 }
 
 function printNextjsVersion() {
-  const { appPath } = options;
-  cp.spawnSync(
-    "node",
-    [
-      "-e",
-      `"console.info('Next.js v' + require('next/package.json').version)"`,
-    ],
-    {
-      stdio: "inherit",
-      cwd: appPath,
-      shell: true,
-    },
-  );
+  const { nextVersion } = options;
+  logger.info(`Next.js version : ${nextVersion}`);
 }
 
 function printOpenNextVersion() {
diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts
index 9dfab8d84..0fe01ad03 100644
--- a/packages/open-next/src/build/helper.ts
+++ b/packages/open-next/src/build/helper.ts
@@ -36,7 +36,7 @@ export function normalizeOptions(config: OpenNextConfig, root: string) {
   }
   return {
     openNextVersion: getOpenNextVersion(),
-    nextVersion: getNextVersion(nextPackageJsonPath),
+    nextVersion: getNextVersion(appPath),
     nextPackageJsonPath,
     appPath,
     appBuildOutputPath: buildOutputPath,
@@ -209,9 +209,12 @@ export function getOpenNextVersion(): string {
   return require(path.join(__dirname, "../../package.json")).version;
 }
 
-export function getNextVersion(nextPackageJsonPath: string): string {
-  const version = require(nextPackageJsonPath)?.dependencies?.next;
-  // require('next/package.json').version
+export function getNextVersion(appPath: string): string {
+  // We cannot just require("next/package.json") because it could be executed in a different directory
+  const nextPackageJsonPath = require.resolve("next/package.json", {
+    paths: [appPath],
+  });
+  const version = require(nextPackageJsonPath)?.version;
 
   if (!version) {
     throw new Error("Failed to find Next version");

From cd126a50443bd3e54e91a81cdd5f4f253c66912d Mon Sep 17 00:00:00 2001
From: Dorseuil Nicolas <nicodorseuil@yahoo.fr>
Date: Sun, 12 May 2024 13:19:35 +0200
Subject: [PATCH 2/3] change variable name

---
 packages/open-next/src/build.ts        | 4 ++--
 packages/open-next/src/build/helper.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/open-next/src/build.ts b/packages/open-next/src/build.ts
index 1a828d081..746d263d2 100755
--- a/packages/open-next/src/build.ts
+++ b/packages/open-next/src/build.ts
@@ -187,7 +187,7 @@ function setStandaloneBuildMode(monorepoRoot: string) {
 }
 
 function buildNextjsApp(packager: "npm" | "yarn" | "pnpm" | "bun") {
-  const { nextPackageJsonPath } = options;
+  const { appPackageJsonPath } = options;
   const command =
     config.buildCommand ??
     (["bun", "npm"].includes(packager)
@@ -195,7 +195,7 @@ function buildNextjsApp(packager: "npm" | "yarn" | "pnpm" | "bun") {
       : `${packager} build`);
   cp.execSync(command, {
     stdio: "inherit",
-    cwd: path.dirname(nextPackageJsonPath),
+    cwd: path.dirname(appPackageJsonPath),
   });
 }
 
diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts
index 0fe01ad03..f9edda197 100644
--- a/packages/open-next/src/build/helper.ts
+++ b/packages/open-next/src/build/helper.ts
@@ -25,19 +25,19 @@ export function normalizeOptions(config: OpenNextConfig, root: string) {
   );
   const outputDir = path.join(buildOutputPath, ".open-next");
 
-  let nextPackageJsonPath: string;
+  let appPackageJsonPath: string;
   if (config.packageJsonPath) {
     const _pkgPath = path.join(process.cwd(), config.packageJsonPath);
-    nextPackageJsonPath = _pkgPath.endsWith("package.json")
+    appPackageJsonPath = _pkgPath.endsWith("package.json")
       ? _pkgPath
       : path.join(_pkgPath, "./package.json");
   } else {
-    nextPackageJsonPath = findNextPackageJsonPath(appPath, root);
+    appPackageJsonPath = findNextPackageJsonPath(appPath, root);
   }
   return {
     openNextVersion: getOpenNextVersion(),
     nextVersion: getNextVersion(appPath),
-    nextPackageJsonPath,
+    appPackageJsonPath,
     appPath,
     appBuildOutputPath: buildOutputPath,
     appPublicPath: path.join(appPath, "public"),

From 54579f9444089c07ad2b162b829db2058b31d5fd Mon Sep 17 00:00:00 2001
From: conico974 <nicodorseuil@yahoo.fr>
Date: Sun, 12 May 2024 14:39:48 +0200
Subject: [PATCH 3/3] Create giant-pianos-float.md

---
 .changeset/giant-pianos-float.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/giant-pianos-float.md

diff --git a/.changeset/giant-pianos-float.md b/.changeset/giant-pianos-float.md
new file mode 100644
index 000000000..7723abca5
--- /dev/null
+++ b/.changeset/giant-pianos-float.md
@@ -0,0 +1,5 @@
+---
+"open-next": patch
+---
+
+Fix next version check