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

package/dist/build/content/prerendered.js

@@ -7,7 +7,7 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-67EWAGDQ.js";
+} from "../../esm-chunks/chunk-LWQKZVSS.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";

package/dist/build/content/server.js

@@ -7,13 +7,15 @@
 import {
   copyNextDependencies,
   copyNextServerCode,
+  verifyHandlerDirStructure,
   writeTagsManifest
-} from "../../esm-chunks/chunk-4J4A5OE2.js";
+} from "../../esm-chunks/chunk-GFISNHVP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   copyNextDependencies,
   copyNextServerCode,
+  verifyHandlerDirStructure,
   writeTagsManifest
 };

package/dist/build/content/static.js

@@ -9,7 +9,7 @@ import {
   copyStaticContent,
   publishStaticDir,
   unpublishStaticDir
-} from "../../esm-chunks/chunk-WQIG4U66.js";
+} from "../../esm-chunks/chunk-MPZEWLBG.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";

package/dist/build/functions/edge.js

@@ -6,7 +6,7 @@
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-ZZOGIP2V.js";
+} from "../../esm-chunks/chunk-ATFMKC2X.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-655Y7ISI.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";

package/dist/build/functions/server.js

@@ -6,8 +6,8 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-GAZUUVZW.js";
-import "../../esm-chunks/chunk-4J4A5OE2.js";
+} from "../../esm-chunks/chunk-A6CMEU53.js";
+import "../../esm-chunks/chunk-GFISNHVP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-655Y7ISI.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";

package/dist/esm-chunks/{chunk-GAZUUVZW.js → chunk-A6CMEU53.js}

@@ -7,8 +7,9 @@
 import {
   copyNextDependencies,
   copyNextServerCode,
+  verifyHandlerDirStructure,
   writeTagsManifest
-} from "./chunk-4J4A5OE2.js";
+} from "./chunk-GFISNHVP.js";
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
@@ -21,18 +22,43 @@ import {
 
 // src/build/functions/server.ts
 var import_fast_glob = __toESM(require_out(), 1);
-import { cp, mkdir, readFile, rm, writeFile } from "fs/promises";
-import { join } from "node:path";
+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) => {
+  const promises = [];
+  const { included_files: includedFiles = [] } = ctx.netlifyConfig.functions?.["*"] || {};
+  if (includedFiles.length !== 0) {
+    const resolvedFiles = await Promise.all(
+      includedFiles.map((globPattern) => (0, import_fast_glob.glob)(globPattern, { cwd: process.cwd() }))
+    );
+    for (const filePath of resolvedFiles.flat()) {
+      promises.push(
+        cp(
+          join(process.cwd(), filePath),
+          // the serverHandlerDir is aware of the dist dir.
+          // 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)),
+          {
+            recursive: true,
+            force: true
+          }
+        )
+      );
+    }
+  }
   const fileList = await (0, import_fast_glob.glob)("dist/**/*", { cwd: ctx.pluginDir });
-  await Promise.all(
-    [...fileList].map(
-      (path) => cp(join(ctx.pluginDir, path), join(ctx.serverHandlerDir, ".netlify", path), {
+  for (const filePath of fileList) {
+    promises.push(
+      cp(join(ctx.pluginDir, filePath), join(ctx.serverHandlerDir, ".netlify", filePath), {
         recursive: true,
         force: true
       })
-    )
-  );
+    );
+  }
+  await Promise.all(promises);
 };
 var writeHandlerManifest = async (ctx) => {
   await writeFile(
@@ -61,7 +87,7 @@ var getHandlerFile = async (ctx) => {
   const templatesDir = join(ctx.pluginDir, "dist/build/templates");
   if (ctx.packagePath.length !== 0) {
     const template = await readFile(join(templatesDir, "handler-monorepo.tmpl.js"), "utf-8");
-    return template.replaceAll("{{cwd}}", ctx.lambdaWorkingDirectory).replace("{{nextServerHandler}}", ctx.nextServerHandler);
+    return template.replaceAll("{{cwd}}", posixJoin(ctx.lambdaWorkingDirectory)).replace("{{nextServerHandler}}", posixJoin(ctx.nextServerHandler));
   }
   return await readFile(join(templatesDir, "handler.tmpl.js"), "utf-8");
 };
@@ -81,6 +107,7 @@ var createServerHandler = async (ctx) => {
     writePackageMetadata(ctx),
     writeHandlerFile(ctx)
   ]);
+  await verifyHandlerDirStructure(ctx);
 };
 
 export {

package/dist/esm-chunks/{chunk-ZZOGIP2V.js → chunk-ATFMKC2X.js}

@@ -393,7 +393,7 @@ var require_dist = __commonJS({
 var import_fast_glob = __toESM(require_out(), 1);
 var import_path_to_regexp = __toESM(require_dist(), 1);
 import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { dirname, join, relative } from "node:path";
+import { dirname, join } from "node:path";
 var writeEdgeManifest = async (ctx, manifest) => {
   await mkdir(ctx.edgeFunctionsDir, { recursive: true });
   await writeFile(join(ctx.edgeFunctionsDir, "manifest.json"), JSON.stringify(manifest, null, 2));
@@ -459,38 +459,31 @@ var writeHandlerFile = async (ctx, { matchers, name }) => {
 var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
   const srcDir = join(ctx.standaloneDir, ctx.nextDistDir);
   const destDir = join(ctx.edgeFunctionsDir, getHandlerName({ name }));
-  await Promise.all(
-    files.map(async (file) => {
-      if (file === `server/${name}.js`) {
-        const edgeRuntimeDir = join(ctx.pluginDir, "edge-runtime");
-        const shimPath = join(edgeRuntimeDir, "shim/index.js");
-        const shim = await readFile(shimPath, "utf8");
-        const importsDir = relative(dirname(join(srcDir, file)), join(srcDir, "server"));
-        const importsSrc = `${importsDir || "."}/edge-runtime-webpack.js`;
-        const imports = `import '${importsSrc}';`;
-        const exports = `export default _ENTRIES["middleware_${name}"].default;`;
-        const parts = [shim, imports];
-        if (wasm?.length) {
-          parts.push(
-            `import { decode as _base64Decode } from "../edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts";`
-          );
-          for (const wasmChunk of wasm ?? []) {
-            const data = await readFile(join(srcDir, wasmChunk.filePath));
-            parts.push(
-              `const ${wasmChunk.name} = _base64Decode(${JSON.stringify(
-                data.toString("base64")
-              )}).buffer`
-            );
-          }
-        }
-        const entrypoint = await readFile(join(srcDir, file), "utf8");
-        await mkdir(dirname(join(destDir, file)), { recursive: true });
-        await writeFile(join(destDir, file), [...parts, entrypoint, exports].join("\n;"));
-      } else {
-        await cp(join(srcDir, file), join(destDir, file));
-      }
-    })
-  );
+  const edgeRuntimeDir = join(ctx.pluginDir, "edge-runtime");
+  const shimPath = join(edgeRuntimeDir, "shim/index.js");
+  const shim = await readFile(shimPath, "utf8");
+  const parts = [shim];
+  if (wasm?.length) {
+    parts.push(
+      `import { decode as _base64Decode } from "../edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts";`
+    );
+    for (const wasmChunk of wasm ?? []) {
+      const data = await readFile(join(srcDir, wasmChunk.filePath));
+      parts.push(
+        `const ${wasmChunk.name} = _base64Decode(${JSON.stringify(
+          data.toString("base64")
+        )}).buffer`
+      );
+    }
+  }
+  for (const file of files) {
+    const entrypoint = await readFile(join(srcDir, file), "utf8");
+    parts.push(`;// Concatenated file: ${file} 
+`, entrypoint);
+  }
+  const exports = `export default _ENTRIES["middleware_${name}"].default;`;
+  await mkdir(dirname(join(destDir, `server/${name}.js`)), { recursive: true });
+  await writeFile(join(destDir, `server/${name}.js`), [...parts, exports].join("\n"));
 };
 var createEdgeHandler = async (ctx, definition) => {
   await copyHandlerDependencies(ctx, definition);

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

@@ -19,7 +19,9 @@ 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 { createRequire } from "node:module";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, resolve, sep } from "node:path";
+import { sep as posixSep, relative as posixRelative } from "node:path/posix";
+var toPosixPath = (path) => path.split(sep).join(posixSep);
 var copyNextServerCode = async (ctx) => {
   const reqServerFilesPath = join(
     ctx.standaloneRootDir,
@@ -27,7 +29,7 @@ var copyNextServerCode = async (ctx) => {
     "required-server-files.json"
   );
   const reqServerFiles = JSON.parse(await readFile(reqServerFilesPath, "utf-8"));
-  if (ctx.distDir.replace(new RegExp(`^${ctx.packagePath}/?`), "") !== reqServerFiles.config.distDir) {
+  if (toPosixPath(ctx.distDir).replace(new RegExp(`^${ctx.packagePath}/?`), "") !== reqServerFiles.config.distDir) {
     reqServerFiles.config.distDir = ctx.nextDistDir;
     await writeFile(reqServerFilesPath, JSON.stringify(reqServerFiles));
   }
@@ -38,7 +40,7 @@ var copyNextServerCode = async (ctx) => {
     "utf-8"
   );
   const srcDir = join(ctx.standaloneDir, ctx.nextDistDir);
-  const nextFolder = ctx.distDir === ctx.buildConfig.distDir ? ctx.distDir : ctx.nextDistDir;
+  const nextFolder = toPosixPath(ctx.distDir) === toPosixPath(ctx.buildConfig.distDir) ? ctx.distDir : ctx.nextDistDir;
   const destDir = join(ctx.serverHandlerDir, nextFolder);
   const paths = await (0, import_fast_glob.default)(
     [`*`, `server/*`, `server/chunks/*`, `server/edge-chunks/*`, `server/+(app|pages)/**/*.js`],
@@ -109,8 +111,9 @@ var copyNextDependencies = async (ctx) => {
   await Promise.all(promises);
   const require2 = createRequire(ctx.serverHandlerDir);
   try {
-    require2.resolve("styled-jsx");
-    require2.resolve("next");
+    const nextEntryAbsolutePath = require2.resolve("next");
+    const nextRequire = createRequire(nextEntryAbsolutePath);
+    nextRequire.resolve("styled-jsx");
   } catch {
     throw new Error(
       "node_modules are not installed correctly, if you are using pnpm please set the public hoist pattern to: `public-hoist-pattern[]=*`.\nRefer to your docs for more details: https://docs.netlify.com/integrations/frameworks/next-js/overview/#pnpm-support"
@@ -158,9 +161,53 @@ 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)) {
+    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}`
+    );
+  }
+};
 
 export {
   copyNextServerCode,
   copyNextDependencies,
-  writeTagsManifest
+  writeTagsManifest,
+  verifyHandlerDirStructure
 };