@netlify/plugin-nextjs 5.0.0-rc.6 → 5.0.0-rc.8

package/dist/run/next.cjs

@@ -1121,6 +1121,9 @@ var getDeployStore = (options = {}) => {
 var import_fs_monkey = __toESM(require_lib());
 var import_request_context = require("./handlers/request-context.cjs");
 var import_tracer = require("./handlers/tracer.cjs");
+console.time("import next server");
+var { getRequestHandlers } = require("next/dist/server/lib/start-server.js");
+console.timeEnd("import next server");
 var fetchBeforeNextPatchedIt = globalThis.fetch;
 async function getMockedRequestHandlers(...args) {
   const tracer = (0, import_tracer.getTracer)();
@@ -1154,10 +1157,6 @@ async function getMockedRequestHandlers(...args) {
       // eslint-disable-next-line n/global-require, @typescript-eslint/no-var-requires
       require("fs").promises
     );
-    const { getRequestHandlers } = await tracer.withActiveSpan(
-      "import next server",
-      async () => import("next/dist/server/lib/start-server.js")
-    );
     return getRequestHandlers(...args);
   });
 }

package/package.json

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

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

@@ -1,217 +0,0 @@
-
-      var require = await (async () => {
-        var { createRequire } = await import("node:module");
-        return createRequire(import.meta.url);
-      })();
-    
-import {
-  require_out
-} from "./chunk-VZNKO4OO.js";
-import {
-  verifyNextVersion
-} from "./chunk-MGPEWDDD.js";
-import {
-  RUN_CONFIG
-} from "./chunk-UYKENJEU.js";
-import {
-  __toESM
-} from "./chunk-5JVNISGM.js";
-
-// 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,
-  access
-} from "node:fs/promises";
-import { createRequire } from "node:module";
-import { dirname, join, resolve, sep } from "node:path";
-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.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.relativeAppDir}/?`), "") !== reqServerFiles.config.distDir) {
-    reqServerFiles.config.distDir = ctx.nextDistDir;
-    await writeFile(reqServerFilesPath, JSON.stringify(reqServerFiles));
-  }
-  await mkdir(ctx.serverHandlerDir, { recursive: true });
-  await writeFile(
-    join(ctx.serverHandlerDir, RUN_CONFIG),
-    JSON.stringify(reqServerFiles.config),
-    "utf-8"
-  );
-  const srcDir = join(ctx.standaloneDir, 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`],
-    {
-      cwd: srcDir,
-      extglob: true
-    }
-  );
-  await Promise.all(
-    paths.map(async (path) => {
-      const srcPath = join(srcDir, path);
-      const destPath = join(destDir, path);
-      if (path === "server/middleware-manifest.json") {
-        try {
-          await replaceMiddlewareManifest(srcPath, destPath);
-        } catch (error) {
-          throw new Error("Could not patch middleware manifest file", { cause: error });
-        }
-        return;
-      }
-      await cp(srcPath, destPath, { recursive: true, force: true });
-    })
-  );
-};
-async function recreateNodeModuleSymlinks(src, dest, org) {
-  const dirents = await readdir(join(src, org || ""), { withFileTypes: true });
-  await Promise.all(
-    dirents.map(async (dirent) => {
-      if (dirent.name.startsWith("@")) {
-        return recreateNodeModuleSymlinks(src, dest, dirent.name);
-      }
-      if (dirent.isSymbolicLink()) {
-        const symlinkSrc = join(dest, org || "", dirent.name);
-        const symlinkTarget = await readlink(join(src, org || "", dirent.name));
-        const symlinkDest = join(dest, org || "", symlinkTarget);
-        if (existsSync(symlinkDest) && !existsSync(symlinkSrc)) {
-          if (org) {
-            await mkdir(join(dest, org), { recursive: true });
-          }
-          await symlink(symlinkTarget, symlinkSrc);
-        }
-      }
-    })
-  );
-}
-var copyNextDependencies = async (ctx) => {
-  const entries = await readdir(ctx.standaloneDir);
-  const promises = entries.map(async (entry) => {
-    if (entry === "package.json" || entry === ctx.nextDistDir) {
-      return;
-    }
-    const src = join(ctx.standaloneDir, entry);
-    const dest = join(ctx.serverHandlerDir, entry);
-    await cp(src, dest, { recursive: true, verbatimSymlinks: true, force: true });
-    if (entry === "node_modules") {
-      await recreateNodeModuleSymlinks(ctx.resolveFromSiteDir("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, verbatimSymlinks: true }).then(
-        () => recreateNodeModuleSymlinks(resolve("node_modules"), rootDestDir)
-      )
-    );
-  }
-  await Promise.all(promises);
-  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 = serverHandlerRequire.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"
-    );
-  }
-};
-var writeTagsManifest = async (ctx) => {
-  const manifest = await ctx.getPrerenderManifest();
-  const routes = Object.entries(manifest.routes).map(async ([route, definition]) => {
-    let tags;
-    if (definition.dataRoute?.endsWith(".rsc")) {
-      const path = join(ctx.publishDir, `server/app/${route === "/" ? "/index" : route}.meta`);
-      try {
-        const file = await readFile(path, "utf-8");
-        const meta = JSON.parse(file);
-        tags = meta.headers["x-next-cache-tags"];
-      } catch {
-        if (!definition.dataRoute?.endsWith("/default.rsc")) {
-          console.log(`Unable to read cache tags for: ${path}`);
-        }
-      }
-    }
-    if (definition.dataRoute?.endsWith(".json")) {
-      tags = `_N_T_${route}`;
-    }
-    if (definition.dataRoute === null) {
-      tags = definition.initialHeaders?.["x-next-cache-tags"];
-    }
-    return [route, tags];
-  });
-  await writeFile(
-    join(ctx.serverHandlerDir, ".netlify/tags-manifest.json"),
-    JSON.stringify(Object.fromEntries(await Promise.all(routes))),
-    "utf-8"
-  );
-};
-var replaceMiddlewareManifest = async (sourcePath, destPath) => {
-  await mkdir(dirname(destPath), { recursive: true });
-  const data = await readFile(sourcePath, "utf8");
-  const manifest = JSON.parse(data);
-  const newManifest = {
-    ...manifest,
-    middleware: {}
-  };
-  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,
-  verifyHandlerDirStructure
-};

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

@@ -1,94 +0,0 @@
-
-      var require = await (async () => {
-        var { createRequire } = await import("node:module");
-        return createRequire(import.meta.url);
-      })();
-    
-import {
-  require_out
-} from "./chunk-VZNKO4OO.js";
-import {
-  encodeBlobKey
-} from "./chunk-TYCYFZ22.js";
-import {
-  __toESM
-} from "./chunk-5JVNISGM.js";
-
-// src/build/content/static.ts
-var import_fast_glob = __toESM(require_out(), 1);
-import { existsSync } from "node:fs";
-import { cp, mkdir, rename, rm } from "node:fs/promises";
-import { basename, join } from "node:path";
-var copyStaticContent = async (ctx) => {
-  const srcDir = join(ctx.publishDir, "server/pages");
-  const destDir = ctx.blobDir;
-  const paths = await (0, import_fast_glob.default)("**/*.+(html|json)", {
-    cwd: srcDir,
-    extglob: true
-  });
-  try {
-    await Promise.all(
-      paths.filter((path) => !paths.includes(`${path.slice(0, -5)}.json`)).map(async (path) => {
-        await cp(join(srcDir, path), join(destDir, await encodeBlobKey(path)), {
-          recursive: true,
-          force: true
-        });
-      })
-    );
-  } catch (error) {
-    ctx.failBuild("Failed assembling static pages for upload", error);
-  }
-};
-var copyStaticAssets = async (ctx) => {
-  try {
-    await rm(ctx.staticDir, { recursive: true, force: true });
-    const { basePath } = await ctx.getRoutesManifest();
-    if (existsSync(ctx.resolveFromSiteDir("public"))) {
-      await cp(ctx.resolveFromSiteDir("public"), join(ctx.staticDir, basePath), {
-        recursive: true
-      });
-    }
-    if (existsSync(join(ctx.publishDir, "static"))) {
-      await cp(join(ctx.publishDir, "static"), join(ctx.staticDir, basePath, "_next/static"), {
-        recursive: true
-      });
-    }
-  } catch (error) {
-    ctx.failBuild("Failed copying static assets", error);
-  }
-};
-var copyStaticExport = async (ctx) => {
-  try {
-    await rm(ctx.staticDir, { recursive: true, force: true });
-    await cp(ctx.resolveFromSiteDir("out"), ctx.staticDir, { recursive: true });
-  } catch (error) {
-    ctx.failBuild("Failed copying static export", error);
-  }
-};
-var publishStaticDir = async (ctx) => {
-  try {
-    await rm(ctx.tempPublishDir, { recursive: true, force: true });
-    await mkdir(basename(ctx.tempPublishDir), { recursive: true });
-    await rename(ctx.publishDir, ctx.tempPublishDir);
-    await rename(ctx.staticDir, ctx.publishDir);
-  } catch (error) {
-    ctx.failBuild("Failed publishing static content", error instanceof Error ? { error } : {});
-  }
-};
-var unpublishStaticDir = async (ctx) => {
-  try {
-    if (existsSync(ctx.tempPublishDir)) {
-      await rename(ctx.publishDir, ctx.staticDir);
-      await rename(ctx.tempPublishDir, ctx.publishDir);
-    }
-  } catch {
-  }
-};
-
-export {
-  copyStaticContent,
-  copyStaticAssets,
-  copyStaticExport,
-  publishStaticDir,
-  unpublishStaticDir
-};