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

package/README.md

@@ -17,8 +17,11 @@ How to add new integration test scenarios to the application:
 4. Add your test
 
 > Currently the tests require a built version of the `dist/run/handlers/cache.cjs` so you need to
-> run `npm run build` before executing the integration tests. In addition, the integration tests
-> need to be prepared before first use. You can do this by running `npm run pretest`.
+> run `npm run build` before executing the integration tests.
+
+In addition, the integration tests need to be prepared before first use. You can do this by running
+`npm run pretest`. To speed up this process and build only the fixtures whose name starts with a
+given prefix, run `npm run pretest -- <prefix>`.
 
 ### E2E testing
 

package/dist/build/cache.js

@@ -1,14 +1,14 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   restoreBuildCache,
   saveBuildCache
-} from "../esm-chunks/chunk-GGHAQM5D.js";
-import "../esm-chunks/chunk-RSKIKBZH.js";
+} from "../esm-chunks/chunk-XA2CZH5Y.js";
+import "../esm-chunks/chunk-WELZ7LFO.js";
 export {
   restoreBuildCache,
   saveBuildCache

package/dist/build/content/prerendered.js

@@ -1,15 +1,15 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-S5JXJCXP.js";
-import "../../esm-chunks/chunk-AVWFCGVE.js";
-import "../../esm-chunks/chunk-RSKIKBZH.js";
+} from "../../esm-chunks/chunk-DZM5AUXX.js";
+import "../../esm-chunks/chunk-MFN4GH7U.js";
+import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {
   copyFetchContent,
   copyPrerenderedContent

package/dist/build/content/server.js

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
@@ -8,9 +8,9 @@ import {
   copyNextDependencies,
   copyNextServerCode,
   writeTagsManifest
-} from "../../esm-chunks/chunk-5SZ5JD6J.js";
-import "../../esm-chunks/chunk-AVWFCGVE.js";
-import "../../esm-chunks/chunk-RSKIKBZH.js";
+} from "../../esm-chunks/chunk-6HBXWNZS.js";
+import "../../esm-chunks/chunk-MFN4GH7U.js";
+import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {
   copyNextDependencies,
   copyNextServerCode,

package/dist/build/content/static.js

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
@@ -9,9 +9,9 @@ import {
   copyStaticContent,
   publishStaticDir,
   unpublishStaticDir
-} from "../../esm-chunks/chunk-Z7ZMLVTM.js";
-import "../../esm-chunks/chunk-AVWFCGVE.js";
-import "../../esm-chunks/chunk-RSKIKBZH.js";
+} from "../../esm-chunks/chunk-KMPIVUVT.js";
+import "../../esm-chunks/chunk-MFN4GH7U.js";
+import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {
   copyStaticAssets,
   copyStaticContent,

package/dist/build/functions/edge.js

@@ -1,14 +1,15 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-3PTPU5GO.js";
-import "../../esm-chunks/chunk-TJKO3X6O.js";
-import "../../esm-chunks/chunk-RSKIKBZH.js";
+} from "../../esm-chunks/chunk-XC7T747I.js";
+import "../../esm-chunks/chunk-MFN4GH7U.js";
+import "../../esm-chunks/chunk-IZY5TPZE.js";
+import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {
   createEdgeHandlers
 };

package/dist/build/functions/server.js

@@ -1,16 +1,16 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-ALO2SSMH.js";
-import "../../esm-chunks/chunk-5SZ5JD6J.js";
-import "../../esm-chunks/chunk-AVWFCGVE.js";
-import "../../esm-chunks/chunk-TJKO3X6O.js";
-import "../../esm-chunks/chunk-RSKIKBZH.js";
+} from "../../esm-chunks/chunk-X4Q4MYBW.js";
+import "../../esm-chunks/chunk-6HBXWNZS.js";
+import "../../esm-chunks/chunk-MFN4GH7U.js";
+import "../../esm-chunks/chunk-IZY5TPZE.js";
+import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {
   createServerHandler
 };

package/dist/build/image-cdn.js

@@ -1,13 +1,13 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   setImageConfig
-} from "../esm-chunks/chunk-H46DW7YI.js";
-import "../esm-chunks/chunk-RSKIKBZH.js";
+} from "../esm-chunks/chunk-EPSI5TTB.js";
+import "../esm-chunks/chunk-WELZ7LFO.js";
 export {
   setImageConfig
 };

package/dist/build/plugin-context.js

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
@@ -8,8 +8,8 @@ import {
   EDGE_HANDLER_NAME,
   PluginContext,
   SERVER_HANDLER_NAME
-} from "../esm-chunks/chunk-TJKO3X6O.js";
-import "../esm-chunks/chunk-RSKIKBZH.js";
+} from "../esm-chunks/chunk-IZY5TPZE.js";
+import "../esm-chunks/chunk-WELZ7LFO.js";
 export {
   EDGE_HANDLER_NAME,
   PluginContext,

package/dist/esm-chunks/{chunk-5SZ5JD6J.js → chunk-6HBXWNZS.js}

@@ -1,15 +1,15 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   require_out
-} from "./chunk-AVWFCGVE.js";
+} from "./chunk-MFN4GH7U.js";
 import {
   __toESM
-} from "./chunk-RSKIKBZH.js";
+} from "./chunk-WELZ7LFO.js";
 
 // src/build/content/server.ts
 var import_fast_glob = __toESM(require_out(), 1);
@@ -17,7 +17,7 @@ import { existsSync } from "node:fs";
 import { cp, mkdir, readFile, readdir, readlink, symlink, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 var copyNextServerCode = async (ctx) => {
-  const srcDir = join(ctx.publishDir, "standalone/.next");
+  const srcDir = join(ctx.standaloneDir, ".next");
   const destDir = join(ctx.serverHandlerDir, ".next");
   const paths = await (0, import_fast_glob.default)(
     [`*`, `server/*`, `server/chunks/*`, `server/edge-chunks/*`, `server/+(app|pages)/**/*.js`],
@@ -64,10 +64,28 @@ async function recreateNodeModuleSymlinks(src, dest, org) {
   );
 }
 var copyNextDependencies = async (ctx) => {
-  const srcDir = join(ctx.publishDir, "standalone/node_modules");
-  const destDir = join(ctx.serverHandlerDir, "node_modules");
-  await cp(srcDir, destDir, { recursive: true });
-  await recreateNodeModuleSymlinks(ctx.resolve("node_modules"), destDir);
+  const entries = await readdir(ctx.standaloneDir);
+  const promises = entries.map(async (entry) => {
+    if (entry === "package.json" || entry === ".next") {
+      return;
+    }
+    const src = join(ctx.standaloneDir, entry);
+    const dest = join(ctx.serverHandlerDir, entry);
+    await cp(src, dest, { recursive: true });
+    if (entry === "node_modules") {
+      await recreateNodeModuleSymlinks(ctx.resolve("node_modules"), dest);
+    }
+  });
+  const rootSrcDir = join(ctx.standaloneRootDir, "node_modules");
+  const rootDestDir = join(ctx.serverHandlerRootDir, "node_modules");
+  if (existsSync(rootSrcDir) && ctx.standaloneRootDir !== ctx.standaloneDir) {
+    promises.push(
+      cp(rootSrcDir, rootDestDir, { recursive: true }).then(
+        () => recreateNodeModuleSymlinks(ctx.resolve("node_modules"), rootDestDir)
+      )
+    );
+  }
+  await Promise.all(promises);
 };
 var writeTagsManifest = async (ctx) => {
   const manifest = await ctx.getPrerenderManifest();

package/dist/esm-chunks/{chunk-S5JXJCXP.js → chunk-DZM5AUXX.js}

@@ -1,15 +1,15 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   require_out
-} from "./chunk-AVWFCGVE.js";
+} from "./chunk-MFN4GH7U.js";
 import {
   __toESM
-} from "./chunk-RSKIKBZH.js";
+} from "./chunk-WELZ7LFO.js";
 
 // src/build/content/prerendered.ts
 var import_fast_glob = __toESM(require_out(), 1);

package/dist/esm-chunks/{chunk-H46DW7YI.js → chunk-EPSI5TTB.js}

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     

package/dist/esm-chunks/{chunk-TJKO3X6O.js → chunk-IZY5TPZE.js}

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
@@ -28,6 +28,24 @@ var PluginContext = class {
   get publishDir() {
     return resolve(this.constants.PUBLISH_DIR);
   }
+  /**
+   * Relative package path in non monorepo setups this is an empty string
+   * @example ''
+   * @example 'apps/my-app'
+   */
+  get packagePath() {
+    return this.constants.PACKAGE_PATH || "";
+  }
+  /**
+   * Retrieves the root of the `.next/standalone` directory
+   */
+  get standaloneRootDir() {
+    return join(this.publishDir, "standalone");
+  }
+  /** Retrieves the `.next/standalone/` directory monorepo aware */
+  get standaloneDir() {
+    return join(this.standaloneRootDir, this.constants.PACKAGE_PATH || "");
+  }
   /**
    * Absolute path of the directory that is published and deployed to the Netlify CDN
    * Will be swapped with the publish directory
@@ -51,9 +69,15 @@ var PluginContext = class {
     return this.resolve(".netlify/functions-internal");
   }
   /** Absolute path of the server handler */
-  get serverHandlerDir() {
+  get serverHandlerRootDir() {
     return join(this.serverFunctionsDir, SERVER_HANDLER_NAME);
   }
+  get serverHandlerDir() {
+    return join(this.serverHandlerRootDir, this.constants.PACKAGE_PATH || "");
+  }
+  get nextServerHandler() {
+    return join(this.constants.PACKAGE_PATH || "", "dist/run/handlers/server.js");
+  }
   /**
    * Absolute path of the directory containing the files for deno edge functions
    * `.netlify/edge-functions`

package/dist/esm-chunks/{chunk-4AJYXTWN.js → chunk-K233JI4O.js}

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     

package/dist/esm-chunks/{chunk-Z7ZMLVTM.js → chunk-KMPIVUVT.js}

@@ -1,15 +1,15 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   require_out
-} from "./chunk-AVWFCGVE.js";
+} from "./chunk-MFN4GH7U.js";
 import {
   __toESM
-} from "./chunk-RSKIKBZH.js";
+} from "./chunk-WELZ7LFO.js";
 
 // src/build/content/static.ts
 var import_fast_glob = __toESM(require_out(), 1);

package/dist/esm-chunks/{chunk-AVWFCGVE.js → chunk-MFN4GH7U.js}

@@ -1,13 +1,13 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 import {
   __commonJS,
   __require
-} from "./chunk-RSKIKBZH.js";
+} from "./chunk-WELZ7LFO.js";
 
 // node_modules/fast-glob/out/utils/array.js
 var require_array = __commonJS({

package/dist/esm-chunks/{chunk-B6QMRLBH.js → chunk-NE4HYI2D.js}

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
@@ -8,7 +8,7 @@ import {
   __commonJS,
   __require,
   __toESM
-} from "./chunk-RSKIKBZH.js";
+} from "./chunk-WELZ7LFO.js";
 
 // node_modules/is-promise/index.js
 var require_is_promise = __commonJS({

package/dist/esm-chunks/{chunk-RSKIKBZH.js → chunk-WELZ7LFO.js}

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     

package/dist/esm-chunks/{chunk-ALO2SSMH.js → chunk-X4Q4MYBW.js}

@@ -1,6 +1,6 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
@@ -8,16 +8,16 @@ import {
   copyNextDependencies,
   copyNextServerCode,
   writeTagsManifest
-} from "./chunk-5SZ5JD6J.js";
+} from "./chunk-6HBXWNZS.js";
 import {
   require_out
-} from "./chunk-AVWFCGVE.js";
+} from "./chunk-MFN4GH7U.js";
 import {
   SERVER_HANDLER_NAME
-} from "./chunk-TJKO3X6O.js";
+} from "./chunk-IZY5TPZE.js";
 import {
   __toESM
-} from "./chunk-RSKIKBZH.js";
+} from "./chunk-WELZ7LFO.js";
 
 // src/build/functions/server.ts
 var import_fast_glob = __toESM(require_out(), 1);
@@ -33,21 +33,15 @@ var copyHandlerDependencies = async (ctx) => {
 };
 var writeHandlerManifest = async (ctx) => {
   await writeFile(
-    join(ctx.serverHandlerDir, `${SERVER_HANDLER_NAME}.json`),
+    join(ctx.serverHandlerRootDir, `${SERVER_HANDLER_NAME}.json`),
     JSON.stringify({
       config: {
         name: "Next.js Server Handler",
         generator: `${ctx.pluginName}@${ctx.pluginVersion}`,
         nodeBundler: "none",
-        includedFiles: [
-          `${SERVER_HANDLER_NAME}*`,
-          "package.json",
-          "dist/**",
-          ".next/**",
-          ".netlify/**",
-          "node_modules/**"
-        ],
-        includedFilesBasePath: ctx.serverHandlerDir
+        // the folders can vary in monorepos based on the folder structure of the user so we have to glob all
+        includedFiles: ["**"],
+        includedFilesBasePath: ctx.serverHandlerRootDir
       },
       version: 1
     }),
@@ -55,21 +49,38 @@ var writeHandlerManifest = async (ctx) => {
   );
 };
 var writePackageMetadata = async (ctx) => {
-  await writeFile(join(ctx.serverHandlerDir, "package.json"), JSON.stringify({ type: "module" }));
-};
-var writeHandlerFile = async (ctx) => {
   await writeFile(
-    join(ctx.serverHandlerDir, `${SERVER_HANDLER_NAME}.js`),
-    `
-    import handler from './dist/run/handlers/server.js';
-    export default handler;
-    export const config = {
-      path: '/*',
-      preferStatic: true
-    };
-    `
+    join(ctx.serverHandlerRootDir, "package.json"),
+    JSON.stringify({ type: "module" })
   );
 };
+var getHandlerFile = (ctx) => {
+  const config = `
+export const config = {
+  path: '/*',
+  preferStatic: true,
+}`;
+  if (ctx.packagePath.length !== 0) {
+    return `process.chdir('${join("/var/task", ctx.packagePath)}');
+
+let cachedHandler;
+export default async function(...args) {
+  if (!cachedHandler) {
+    const { default: handler } = await import('./${ctx.nextServerHandler}');
+    cachedHandler = handler;
+  }
+  return cachedHandler(...args)
+};
+
+${config}`;
+  }
+  return `import handler from './dist/run/handlers/server.js';
+export default handler;
+${config}`;
+};
+var writeHandlerFile = async (ctx) => {
+  await writeFile(join(ctx.serverHandlerRootDir, `${SERVER_HANDLER_NAME}.mjs`), getHandlerFile(ctx));
+};
 var createServerHandler = async (ctx) => {
   await rm(ctx.serverFunctionsDir, { recursive: true, force: true });
   await mkdir(join(ctx.serverHandlerDir, ".netlify"), { recursive: true });

package/dist/esm-chunks/chunk-X7XIMV6B.js

@@ -0,0 +1,105 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+import {
+  __commonJS,
+  __require,
+  __toESM
+} from "./chunk-WELZ7LFO.js";
+
+// node_modules/@netlify/functions/dist/lib/system_logger.js
+var require_system_logger = __commonJS({
+  "node_modules/@netlify/functions/dist/lib/system_logger.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.systemLogger = exports.LogLevel = void 0;
+    var process_1 = __require("process");
+    var systemLogTag = "__nfSystemLog";
+    var serializeError = (error) => {
+      const cause = error?.cause instanceof Error ? serializeError(error.cause) : error.cause;
+      return {
+        error: error.message,
+        error_cause: cause,
+        error_stack: error.stack
+      };
+    };
+    var LogLevel2;
+    (function(LogLevel3) {
+      LogLevel3[LogLevel3["Debug"] = 1] = "Debug";
+      LogLevel3[LogLevel3["Log"] = 2] = "Log";
+      LogLevel3[LogLevel3["Error"] = 3] = "Error";
+    })(LogLevel2 = exports.LogLevel || (exports.LogLevel = {}));
+    var SystemLogger = class _SystemLogger {
+      fields;
+      logLevel;
+      constructor(fields = {}, logLevel = LogLevel2.Log) {
+        this.fields = fields;
+        this.logLevel = logLevel;
+      }
+      doLog(logger, message) {
+        if (process_1.env.NETLIFY_DEV && !process_1.env.NETLIFY_ENABLE_SYSTEM_LOGGING) {
+          return;
+        }
+        logger(systemLogTag, JSON.stringify({ msg: message, fields: this.fields }));
+      }
+      log(message) {
+        if (this.logLevel > LogLevel2.Log) {
+          return;
+        }
+        this.doLog(console.log, message);
+      }
+      debug(message) {
+        if (this.logLevel > LogLevel2.Debug) {
+          return;
+        }
+        this.doLog(console.debug, message);
+      }
+      error(message) {
+        if (this.logLevel > LogLevel2.Error) {
+          return;
+        }
+        this.doLog(console.error, message);
+      }
+      withLogLevel(level) {
+        return new _SystemLogger(this.fields, level);
+      }
+      withFields(fields) {
+        return new _SystemLogger({
+          ...this.fields,
+          ...fields
+        }, this.logLevel);
+      }
+      withError(error) {
+        const fields = error instanceof Error ? serializeError(error) : { error };
+        return this.withFields(fields);
+      }
+    };
+    exports.systemLogger = new SystemLogger();
+  }
+});
+
+// node_modules/@netlify/functions/dist/internal.js
+var require_internal = __commonJS({
+  "node_modules/@netlify/functions/dist/internal.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.LogLevel = exports.systemLogger = void 0;
+    var system_logger_js_1 = require_system_logger();
+    Object.defineProperty(exports, "systemLogger", { enumerable: true, get: function() {
+      return system_logger_js_1.systemLogger;
+    } });
+    Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function() {
+      return system_logger_js_1.LogLevel;
+    } });
+  }
+});
+
+// src/run/systemlog.ts
+var import_internal = __toESM(require_internal(), 1);
+
+export {
+  import_internal
+};

package/dist/esm-chunks/{chunk-GGHAQM5D.js → chunk-XA2CZH5Y.js}

@@ -1,11 +1,12 @@
 
-      const require = await (async () => {
-        const { createRequire } = await import("node:module");
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
         return createRequire(import.meta.url);
       })();
     
 
 // src/build/cache.ts
+import { existsSync } from "node:fs";
 import { join } from "node:path";
 var saveBuildCache = async (ctx) => {
   if (await ctx.utils.cache.save(join(ctx.publishDir, "cache"))) {
@@ -15,7 +16,10 @@ var saveBuildCache = async (ctx) => {
   }
 };
 var restoreBuildCache = async (ctx) => {
-  if (await ctx.utils.cache.restore(join(ctx.publishDir, "cache"))) {
+  const { cache } = ctx.utils;
+  if (existsSync(join(ctx.publishDir, "cache"))) {
+    console.log("Next.js cache found.");
+  } else if (await cache.restore(join(ctx.publishDir, "cache"))) {
     console.log("Next.js cache restored.");
   } else {
     console.log("No Next.js cache to restore.");