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

package/dist/build/content/server.js

@@ -8,7 +8,7 @@ import {
   copyNextDependencies,
   copyNextServerCode,
   writeTagsManifest
-} from "../../esm-chunks/chunk-4J4A5OE2.js";
+} from "../../esm-chunks/chunk-52WMBYKL.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";

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/server.js

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

package/dist/esm-chunks/{chunk-4J4A5OE2.js → chunk-52WMBYKL.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 } 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"

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

@@ -8,7 +8,7 @@ import {
   copyNextDependencies,
   copyNextServerCode,
   writeTagsManifest
-} from "./chunk-4J4A5OE2.js";
+} from "./chunk-52WMBYKL.js";
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
@@ -22,17 +22,42 @@ 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 { 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 +86,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");
 };

package/dist/esm-chunks/{chunk-WQIG4U66.js → chunk-MPZEWLBG.js}

@@ -18,7 +18,7 @@ import {
 var import_fast_glob = __toESM(require_out(), 1);
 import { existsSync } from "node:fs";
 import { cp, mkdir, rename, rm } from "node:fs/promises";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 var copyStaticContent = async (ctx) => {
   const srcDir = join(ctx.publishDir, "server/pages");
   const destDir = ctx.blobDir;
@@ -58,7 +58,7 @@ var copyStaticAssets = async (ctx) => {
 var publishStaticDir = async (ctx) => {
   try {
     await rm(ctx.tempPublishDir, { recursive: true, force: true });
-    await mkdir(ctx.tempPublishDir, { recursive: true });
+    await mkdir(basename(ctx.tempPublishDir), { recursive: true });
     await rename(ctx.publishDir, ctx.tempPublishDir);
     await rename(ctx.staticDir, ctx.publishDir);
   } catch (error) {

package/dist/esm-chunks/{package-QW5XSFQ4.js → package-V53S3A76.js}

@@ -8,7 +8,7 @@ import "./chunk-5JVNISGM.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.0.0-rc.1";
+var version = "5.0.0-rc.2";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -57,7 +57,7 @@ var devDependencies = {
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.5.1",
   "@netlify/serverless-functions-api": "^1.10.1",
-  "@netlify/zip-it-and-ship-it": "^9.29.2",
+  "@netlify/zip-it-and-ship-it": "^9.30.0",
   "@opentelemetry/api": "^1.7.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
   "@opentelemetry/resources": "^1.21.0",

package/dist/index.js

@@ -12,14 +12,14 @@ import {
   copyStaticContent,
   publishStaticDir,
   unpublishStaticDir
-} from "./esm-chunks/chunk-WQIG4U66.js";
+} from "./esm-chunks/chunk-MPZEWLBG.js";
 import {
   createEdgeHandlers
 } from "./esm-chunks/chunk-ZZOGIP2V.js";
 import {
   createServerHandler
-} from "./esm-chunks/chunk-GAZUUVZW.js";
-import "./esm-chunks/chunk-4J4A5OE2.js";
+} from "./esm-chunks/chunk-E3NFUTWC.js";
+import "./esm-chunks/chunk-52WMBYKL.js";
 import "./esm-chunks/chunk-VZNKO4OO.js";
 import {
   restoreBuildCache,

package/dist/run/handlers/tracing.js

@@ -52794,7 +52794,7 @@ var import_semantic_conventions = __toESM(require_src2(), 1);
 var import_api = __toESM(require_src(), 1);
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-QW5XSFQ4.js");
+} = await import("../../esm-chunks/package-V53S3A76.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SemanticResourceAttributes.SERVICE_NAME]: name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",