Merge branch 'main' into fix/caching-headers-for-get-static-props-404

Author: orinokai

src/build/content/static.ts

@@ -77,6 +77,20 @@ export const copyStaticAssets = async (ctx: PluginContext): Promise<void> => {
   })
 }
 
+export const setHeadersConfig = async (ctx: PluginContext): Promise<void> => {
+  // https://nextjs.org/docs/app/api-reference/config/next-config-js/headers#cache-control
+  // Next.js sets the Cache-Control header of public, max-age=31536000, immutable for truly
+  // immutable assets. It cannot be overridden. These immutable files contain a SHA-hash in
+  // the file name, so they can be safely cached indefinitely.
+  const { basePath } = ctx.buildConfig
+  ctx.netlifyConfig.headers.push({
+    for: `${basePath}/_next/static/*`,
+    values: {
+      'Cache-Control': 'public, max-age=31536000, immutable',
+    },
+  })
+}
+
 export const copyStaticExport = async (ctx: PluginContext): Promise<void> => {
   await tracer.withActiveSpan('copyStaticExport', async () => {
     if (!ctx.exportDetail?.outDirectory) {

src/index.ts

@@ -11,6 +11,7 @@ import {
   copyStaticContent,
   copyStaticExport,
   publishStaticDir,
+  setHeadersConfig,
   unpublishStaticDir,
 } from './build/content/static.js'
 import { clearStaleEdgeHandlers, createEdgeHandlers } from './build/functions/edge.js'
@@ -66,7 +67,7 @@ export const onBuild = async (options: NetlifyPluginOptions) => {
 
     // static exports only need to be uploaded to the CDN and setup /_next/image handler
     if (ctx.buildConfig.output === 'export') {
-      return Promise.all([copyStaticExport(ctx), setImageConfig(ctx)])
+      return Promise.all([copyStaticExport(ctx), setHeadersConfig(ctx), setImageConfig(ctx)])
     }
 
     await verifyAdvancedAPIRoutes(ctx)
@@ -78,6 +79,7 @@ export const onBuild = async (options: NetlifyPluginOptions) => {
       copyPrerenderedContent(ctx),
       createServerHandler(ctx),
       createEdgeHandlers(ctx),
+      setHeadersConfig(ctx),
       setImageConfig(ctx),
     ])
   })

src/run/headers.ts

@@ -300,6 +300,7 @@ export const setCacheControlHeaders = (
 
   if (
     cacheControl === null &&
+    ['GET', 'HEAD'].includes(request.method) &&
     !headers.has('cdn-cache-control') &&
     !headers.has('netlify-cdn-cache-control') &&
     requestContext.usedFsReadForNonFallback

tests/utils/fixture.ts

@@ -207,6 +207,7 @@ export async function runPluginStep(
       // INTERNAL_EDGE_FUNCTIONS_SRC: '.netlify/edge-functions',
     },
     netlifyConfig: {
+      headers: [],
       redirects: [],
     },
     utils: {

tests/utils/playwright-helpers.ts

@@ -14,6 +14,7 @@ const makeE2EFixture = (
 
 export const test = base.extend<
   {
+    ensureStaticAssetsHaveImmutableCacheControl: void
     takeScreenshot: void
     pollUntilHeadersMatch: (
       url: string,
@@ -91,4 +92,19 @@ export const test = base.extend<
     },
     { auto: true },
   ],
+  ensureStaticAssetsHaveImmutableCacheControl: [
+    async ({ page }, use) => {
+      page.on('response', (response) => {
+        if (response.url().includes('/_next/static/')) {
+          expect(
+            response.headers()['cache-control'],
+            '_next/static assets should have immutable cache control',
+          ).toContain('public,max-age=31536000,immutable')
+        }
+      })
+
+      await use()
+    },
+    { auto: true },
+  ],
 })