Skip to content

Commit 724bd32

Browse files
committed
Merge remote-tracking branch 'origin/main' into michalpiechowiak/frb-1360-v15-canary-dynamic-routes-with-fallback-true-are-failing
2 parents f9b4de6 + 7e5253d commit 724bd32

15 files changed

+655
-215
lines changed

e2e-report/package-lock.json

+318-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

+69-69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
"devDependencies": {
5151
"@fastly/http-compute-js": "1.1.4",
5252
"@netlify/blobs": "^8.0.1",
53-
"@netlify/build": "^29.55.1",
53+
"@netlify/build": "^29.55.2",
5454
"@netlify/edge-bundler": "^12.2.3",
5555
"@netlify/edge-functions": "^2.11.0",
5656
"@netlify/eslint-config-node": "^7.0.1",
5757
"@netlify/functions": "^2.8.2",
58-
"@netlify/serverless-functions-api": "^1.30.0",
59-
"@netlify/zip-it-and-ship-it": "^9.40.0",
58+
"@netlify/serverless-functions-api": "^1.30.1",
59+
"@netlify/zip-it-and-ship-it": "^9.40.2",
6060
"@opentelemetry/api": "^1.8.0",
6161
"@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
6262
"@opentelemetry/resources": "^1.24.0",

src/run/handlers/server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export default async (request: Request, context: FutureContext) => {
112112

113113
await adjustDateHeader({ headers: response.headers, request, span, tracer, requestContext })
114114

115-
setCacheControlHeaders(response.headers, request, requestContext)
115+
setCacheControlHeaders(response, request, requestContext)
116116
setCacheTagsHeaders(response.headers, requestContext)
117117
setVaryHeaders(response.headers, request, nextConfig)
118118
setCacheStatusHeader(response.headers)

0 commit comments

Comments
 (0)