@netlify/plugin-nextjs 5.14.7 → 5.15.1

package/dist/build/content/prerendered.js

@@ -192,7 +192,7 @@ var buildPagesCacheValue = async (path, initialRevalidateSeconds, shouldUseEnumK
 });
 var RSC_SEGMENTS_DIR_SUFFIX = ".segments";
 var RSC_SEGMENT_SUFFIX = ".segment.rsc";
-var buildAppCacheValue = async (path, shouldUseAppPageKind) => {
+var buildAppCacheValue = async (path, shouldUseAppPageKind, rscIsRequired = true) => {
   const meta = JSON.parse(await readFile(`${path}.meta`, "utf-8"));
   const html = await readFile(`${path}.html`, "utf-8");
   if (shouldUseAppPageKind) {
@@ -212,9 +212,12 @@ var buildAppCacheValue = async (path, shouldUseAppPageKind) => {
     return {
       kind: "APP_PAGE",
       html,
-      rscData: await readFile(`${path}.rsc`, "base64").catch(
-        () => readFile(`${path}.prefetch.rsc`, "base64")
-      ),
+      rscData: await readFile(`${path}.rsc`, "base64").catch(() => readFile(`${path}.prefetch.rsc`, "base64")).catch((error) => {
+        if (rscIsRequired) {
+          throw error;
+        }
+        return void 0;
+      }),
       segmentData,
       ...meta
     };
@@ -254,6 +257,7 @@ var copyPrerenderedContent = async (ctx) => {
       const shouldUseEnumKind = ctx.nextVersion ? (0, import_semver.satisfies)(ctx.nextVersion, ">=15.0.0-canary.114 <15.0.0-d || >15.0.0-rc.0", {
         includePrerelease: true
       }) : false;
+      let appRouterNotFoundDefinedInPrerenderManifest = false;
       await Promise.all([
         ...Object.entries(manifest.routes).map(
           ([route, meta]) => limitConcurrentPrerenderContentHandling(async () => {
@@ -277,8 +281,12 @@ var copyPrerenderedContent = async (ctx) => {
               case meta.dataRoute?.endsWith(".rsc"):
                 value = await buildAppCacheValue(
                   join(ctx.publishDir, "server/app", key),
-                  shouldUseAppPageKind
+                  shouldUseAppPageKind,
+                  meta.renderingMode !== "PARTIALLY_STATIC"
                 );
+                if (route === "/_not-found") {
+                  appRouterNotFoundDefinedInPrerenderManifest = true;
+                }
                 break;
               case meta.dataRoute === null:
                 value = await buildRouteCacheValue(
@@ -320,7 +328,7 @@ var copyPrerenderedContent = async (ctx) => {
           })
         )
       ]);
-      if (existsSync(join(ctx.publishDir, `server/app/_not-found.html`))) {
+      if (!appRouterNotFoundDefinedInPrerenderManifest && existsSync(join(ctx.publishDir, `server/app/_not-found.html`))) {
         const lastModified = Date.now();
         const key = "/404";
         const value = await buildAppCacheValue(

package/dist/build/skew-protection.js

@@ -56,7 +56,8 @@ function shouldEnableSkewProtection(ctx) {
       enabledOrDisabledReason: "off-default" /* OPT_OUT_DEFAULT */
     };
   }
-  if ((!process.env.DEPLOY_ID || process.env.DEPLOY_ID === "0") && optInOptions.has(enabledOrDisabledReason)) {
+  const token = process.env.NETLIFY_SKEW_PROTECTION_TOKEN || process.env.DEPLOY_ID;
+  if ((!token || token === "0") && optInOptions.has(enabledOrDisabledReason)) {
     return {
       enabled: false,
       enabledOrDisabledReason: enabledOrDisabledReason === "on-env-var" /* OPT_IN_ENV_VAR */ && ctx.constants.IS_LOCAL ? (
@@ -66,16 +67,18 @@ function shouldEnableSkewProtection(ctx) {
         // this is silent disablement to avoid spam logs for users opted in via feature flag
         // that don't explicitly opt in via env var
         "off-no-valid-deploy-id" /* OPT_OUT_NO_VALID_DEPLOY_ID */
-      )
+      ),
+      token
     };
   }
   return {
     enabled: optInOptions.has(enabledOrDisabledReason),
-    enabledOrDisabledReason
+    enabledOrDisabledReason,
+    token
   };
 }
 var setSkewProtection = async (ctx, span) => {
-  const { enabled, enabledOrDisabledReason } = shouldEnableSkewProtection(ctx);
+  const { enabled, enabledOrDisabledReason, token } = shouldEnableSkewProtection(ctx);
   span.setAttribute("skewProtection", enabledOrDisabledReason);
   if (!enabled) {
     if (enabledOrDisabledReason === "off-no-valid-deploy-id-env-var" /* OPT_OUT_NO_VALID_DEPLOY_ID_ENV_VAR */) {
@@ -92,7 +95,7 @@ var setSkewProtection = async (ctx, span) => {
   } else {
     console.log("Setting up Next.js Skew Protection.");
   }
-  process.env.NEXT_DEPLOYMENT_ID = process.env.DEPLOY_ID;
+  process.env.NEXT_DEPLOYMENT_ID = token;
   await mkdir(dirname(ctx.skewProtectionConfigPath), {
     recursive: true
   });

package/dist/run/handlers/tags-handler.cjs

@@ -86,7 +86,7 @@ var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.14.7";
+var version = "5.15.1";
 
 // src/run/handlers/tags-handler.cts
 var import_storage = require("../storage/storage.cjs");

package/package.json

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