Merge branch 'main' into mk/edge-display-name

Author: kodiakhq[bot]

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.24.3",
+  "packages/runtime": "4.25.0",
   "packages/next": "1.3.1"
 }

package-lock.json

@@ -46,7 +46,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.20.3",
+    "@netlify/build": "^27.20.6",
     "@netlify/eslint-config-node": "^7.0.0",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",

package.json

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.25.0](https://github.com/netlify/next-runtime/compare/plugin-nextjs-v4.24.3...plugin-nextjs-v4.25.0) (2022-10-12)
+
+
+### Features
+
+* cache redirects for 60 seconds if no ttl provided ([#1677](https://github.com/netlify/next-runtime/issues/1677)) ([23d8d3b](https://github.com/netlify/next-runtime/commit/23d8d3b8fd2267053d83b4e89716ac0c2cd2ca96))
+
 ## [4.24.3](https://github.com/netlify/next-runtime/compare/plugin-nextjs-v4.24.2...plugin-nextjs-v4.24.3) (2022-10-06)
 
 

packages/runtime/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.24.3",
+  "version": "4.25.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.20.3",
+    "@netlify/build": "^27.20.6",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

packages/runtime/package.json

@@ -131,8 +131,9 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
           // ODBs currently have a minimum TTL of 60 seconds
           result.ttl = Math.max(ttl, 60)
         }
-        // Only cache 404s ephemerally
-        if (ttl === ONE_YEAR_IN_SECONDS && result.statusCode === 404) {
+        const ephemeralCodes = [301, 302, 307, 308, 404]
+        if (ttl === ONE_YEAR_IN_SECONDS && ephemeralCodes.includes(result.statusCode)) {
+          // Only cache for 60s if default TTL provided
           result.ttl = 60
         }
         if (result.ttl > 0) {