@netlify/plugin-nextjs 5.0.0-rc.3 → 5.0.0-rc.5

package/dist/esm-chunks/{chunk-GFISNHVP.js → chunk-CSTSA3JJ.js}

@@ -7,6 +7,9 @@
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
+import {
+  verifyNextVersion
+} from "./chunk-MGPEWDDD.js";
 import {
   RUN_CONFIG
 } from "./chunk-UYKENJEU.js";
@@ -17,19 +20,43 @@ import {
 // src/build/content/server.ts
 var import_fast_glob = __toESM(require_out(), 1);
 import { existsSync } from "node:fs";
-import { cp, mkdir, readFile, readdir, readlink, symlink, writeFile } from "node:fs/promises";
+import {
+  cp,
+  mkdir,
+  readFile,
+  readdir,
+  readlink,
+  symlink,
+  writeFile,
+  access
+} from "node:fs/promises";
 import { createRequire } from "node:module";
 import { dirname, join, resolve, sep } from "node:path";
-import { sep as posixSep, relative as posixRelative } from "node:path/posix";
+import { sep as posixSep, join as posixJoin } from "node:path/posix";
 var toPosixPath = (path) => path.split(sep).join(posixSep);
+function isError(error) {
+  return error instanceof Error;
+}
 var copyNextServerCode = async (ctx) => {
   const reqServerFilesPath = join(
     ctx.standaloneRootDir,
-    ctx.relPublishDir,
+    ctx.relativeAppDir,
+    ctx.requiredServerFiles.config.distDir,
     "required-server-files.json"
   );
+  try {
+    await access(reqServerFilesPath);
+  } catch (error) {
+    if (isError(error) && error.code === "ENOENT") {
+      ctx.failBuild(
+        `Failed creating server handler. required-server-files.json file not found at expected location "${reqServerFilesPath}". Your repository setup is currently not yet supported.`
+      );
+    } else {
+      throw error;
+    }
+  }
   const reqServerFiles = JSON.parse(await readFile(reqServerFilesPath, "utf-8"));
-  if (toPosixPath(ctx.distDir).replace(new RegExp(`^${ctx.packagePath}/?`), "") !== reqServerFiles.config.distDir) {
+  if (toPosixPath(ctx.distDir).replace(new RegExp(`^${ctx.relativeAppDir}/?`), "") !== reqServerFiles.config.distDir) {
     reqServerFiles.config.distDir = ctx.nextDistDir;
     await writeFile(reqServerFilesPath, JSON.stringify(reqServerFiles));
   }
@@ -96,7 +123,7 @@ var copyNextDependencies = async (ctx) => {
     const dest = join(ctx.serverHandlerDir, entry);
     await cp(src, dest, { recursive: true, verbatimSymlinks: true, force: true });
     if (entry === "node_modules") {
-      await recreateNodeModuleSymlinks(ctx.resolve("node_modules"), dest);
+      await recreateNodeModuleSymlinks(ctx.resolveFromSiteDir("node_modules"), dest);
     }
   });
   const rootSrcDir = join(ctx.standaloneRootDir, "node_modules");
@@ -109,9 +136,20 @@ var copyNextDependencies = async (ctx) => {
     );
   }
   await Promise.all(promises);
-  const require2 = createRequire(ctx.serverHandlerDir);
+  const serverHandlerRequire = createRequire(posixJoin(ctx.serverHandlerDir, ":internal:"));
+  let nextVersion;
+  try {
+    const { version } = serverHandlerRequire("next/package.json");
+    if (version) {
+      nextVersion = version;
+    }
+  } catch {
+  }
+  if (nextVersion) {
+    verifyNextVersion(ctx, nextVersion);
+  }
   try {
-    const nextEntryAbsolutePath = require2.resolve("next");
+    const nextEntryAbsolutePath = serverHandlerRequire.resolve("next");
     const nextRequire = createRequire(nextEntryAbsolutePath);
     nextRequire.resolve("styled-jsx");
   } catch {
@@ -165,42 +203,8 @@ var verifyHandlerDirStructure = async (ctx) => {
   const runConfig = JSON.parse(await readFile(join(ctx.serverHandlerDir, RUN_CONFIG), "utf-8"));
   const expectedBuildIDPath = join(ctx.serverHandlerDir, runConfig.distDir, "BUILD_ID");
   if (!existsSync(expectedBuildIDPath)) {
-    let additionalGuidance = "";
-    try {
-      const paths = await (0, import_fast_glob.default)("**/BUILD_ID", {
-        cwd: ctx.serverHandlerRootDir,
-        dot: true,
-        absolute: true,
-        ignore: ["**/node_modules/**"]
-      });
-      const potentiallyNeededPackagePaths = paths.map((path) => {
-        const relativePathToBuildID = posixRelative(
-          toPosixPath(ctx.serverHandlerDir),
-          toPosixPath(path)
-        );
-        const removedDistDirBuildId = relativePathToBuildID.replace(
-          new RegExp(`/?${toPosixPath(runConfig.distDir)}/BUILD_ID$`),
-          ""
-        );
-        return removedDistDirBuildId === relativePathToBuildID ? "" : removedDistDirBuildId;
-      }).filter(Boolean);
-      if (potentiallyNeededPackagePaths.length !== 0) {
-        additionalGuidance = `
-
-It looks like your site is part of monorepo and Netlify is currently not configured correctly for this case.
-
-Current package path: ${ctx.packagePath ? `"${ctx.packagePath}"` : "<not set>"}
-Package path candidates:
-${potentiallyNeededPackagePaths.map((path) => ` - "${path}"`).join(
-          "\n"
-        )}
-
-Refer to https://docs.netlify.com/configure-builds/monorepos/ for more information about monorepo configuration.`;
-      }
-    } catch {
-    }
     ctx.failBuild(
-      `Failed creating server handler. BUILD_ID file not found at expected location "${expectedBuildIDPath}".${additionalGuidance}`
+      `Failed creating server handler. BUILD_ID file not found at expected location "${expectedBuildIDPath}".`
     );
   }
 };