@netlify/plugin-nextjs 5.0.0-rc.2 → 5.0.0-rc.4

package/dist/esm-chunks/{chunk-E3NFUTWC.js → chunk-7HI65MAI.js}

@@ -7,21 +7,22 @@
 import {
   copyNextDependencies,
   copyNextServerCode,
+  verifyHandlerDirStructure,
   writeTagsManifest
-} from "./chunk-52WMBYKL.js";
+} from "./chunk-BKDCZVBK.js";
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
 import {
   SERVER_HANDLER_NAME
-} from "./chunk-655Y7ISI.js";
+} from "./chunk-3NYX5FXN.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";
 
 // src/build/functions/server.ts
 var import_fast_glob = __toESM(require_out(), 1);
-import { cp, mkdir, readFile, rm, writeFile } from "fs/promises";
+import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join, relative } from "node:path";
 import { join as posixJoin } from "node:path/posix";
 var copyHandlerDependencies = async (ctx) => {
@@ -39,7 +40,7 @@ var copyHandlerDependencies = async (ctx) => {
           // The distDir must not be the package path therefore we need to rely on the
           // serverHandlerDir instead of the serverHandlerRootDir
           // therefore we need to remove the package path from the filePath
-          join(ctx.serverHandlerDir, relative(ctx.packagePath, filePath)),
+          join(ctx.serverHandlerDir, relative(ctx.relativeAppDir, filePath)),
           {
             recursive: true,
             force: true
@@ -84,7 +85,7 @@ var writePackageMetadata = async (ctx) => {
 };
 var getHandlerFile = async (ctx) => {
   const templatesDir = join(ctx.pluginDir, "dist/build/templates");
-  if (ctx.packagePath.length !== 0) {
+  if (ctx.relativeAppDir.length !== 0) {
     const template = await readFile(join(templatesDir, "handler-monorepo.tmpl.js"), "utf-8");
     return template.replaceAll("{{cwd}}", posixJoin(ctx.lambdaWorkingDirectory)).replace("{{nextServerHandler}}", posixJoin(ctx.nextServerHandler));
   }
@@ -106,6 +107,7 @@ var createServerHandler = async (ctx) => {
     writePackageMetadata(ctx),
     writeHandlerFile(ctx)
   ]);
+  await verifyHandlerDirStructure(ctx);
 };
 
 export {

package/dist/esm-chunks/{chunk-52WMBYKL.js → chunk-BKDCZVBK.js}

@@ -7,6 +7,9 @@
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
+import {
+  verifyNextVersion
+} from "./chunk-7CY6B4WT.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 } 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 {
@@ -161,9 +199,19 @@ var replaceMiddlewareManifest = async (sourcePath, destPath) => {
   const newData = JSON.stringify(newManifest);
   await writeFile(destPath, newData);
 };
+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)) {
+    ctx.failBuild(
+      `Failed creating server handler. BUILD_ID file not found at expected location "${expectedBuildIDPath}".`
+    );
+  }
+};
 
 export {
   copyNextServerCode,
   copyNextDependencies,
-  writeTagsManifest
+  writeTagsManifest,
+  verifyHandlerDirStructure
 };