Merge remote-tracking branch 'origin/main' into michalpiechowiak/frb-…

…1360-v15-canary-dynamic-routes-with-fallback-true-are-failing
opennextjs · Oct 16, 2024 · 724bd32 · 724bd32
2 parents f9b4de6 + 7e5253d
commit 724bd32
Show file tree

Hide file tree

Showing 15 changed files with 655 additions and 215 deletions.
diff --git a/e2e-report/package-lock.json b/e2e-report/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,13 +50,13 @@
   "devDependencies": {
     "@fastly/http-compute-js": "1.1.4",
     "@netlify/blobs": "^8.0.1",
-    "@netlify/build": "^29.55.1",
+    "@netlify/build": "^29.55.2",
     "@netlify/edge-bundler": "^12.2.3",
     "@netlify/edge-functions": "^2.11.0",
     "@netlify/eslint-config-node": "^7.0.1",
     "@netlify/functions": "^2.8.2",
-    "@netlify/serverless-functions-api": "^1.30.0",
-    "@netlify/zip-it-and-ship-it": "^9.40.0",
+    "@netlify/serverless-functions-api": "^1.30.1",
+    "@netlify/zip-it-and-ship-it": "^9.40.2",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
     "@opentelemetry/resources": "^1.24.0",

diff --git a/src/run/handlers/server.ts b/src/run/handlers/server.ts
@@ -112,7 +112,7 @@ export default async (request: Request, context: FutureContext) => {
 
     await adjustDateHeader({ headers: response.headers, request, span, tracer, requestContext })
 
-    setCacheControlHeaders(response.headers, request, requestContext)
+    setCacheControlHeaders(response, request, requestContext)
     setCacheTagsHeaders(response.headers, requestContext)
     setVaryHeaders(response.headers, request, nextConfig)
     setCacheStatusHeader(response.headers)