fix: don't force rewrite in preview mode

demo/netlify.toml

@@ -7,6 +7,7 @@ ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../"
 # cache Cypress binary in local "node_modules" folder
 # so Netlify caches it
 CYPRESS_CACHE_FOLDER = "../node_modules/.CypressBinary"
+EXPERIMENTAL_MOVE_STATIC_PAGES = true
 
 [dev]
 framework = "#static"

src/helpers/config.js

@@ -1,5 +1,5 @@
 // @ts-check
-const { readJSON } = require('fs-extra')
+const { readJSON, existsSync } = require('fs-extra')
 const { join, dirname, relative } = require('pathe')
 const slash = require('slash')
 
@@ -79,14 +79,29 @@ exports.generateRedirects = async ({ netlifyConfig, basePath, i18n }) => {
   if (i18n) {
     netlifyConfig.redirects.push({ from: `${basePath}/:locale/_next/static/*`, to: `/static/:splat`, status: 200 })
   }
+
+  const staticManifest = join(netlifyConfig.build.publish, 'static-manifest.json')
+  if (process.env.EXPERIMENTAL_MOVE_STATIC_PAGES && existsSync(staticManifest)) {
+    // Static page files need to have a forced redirect for preview mode. Otherwise it's non-forced
+    const staticFiles = await readJSON(staticManifest)
+    netlifyConfig.redirects.push(
+      ...staticFiles.map((file) => ({
+        from: `${basePath}/${file}`,
+        to: HANDLER_FUNCTION_PATH,
+        status: 200,
+        force: true,
+        conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
+      })),
+    )
+  }
+
   // This is only used in prod, so dev uses `next dev` directly
   netlifyConfig.redirects.push(
     { from: `${basePath}/_next/static/*`, to: `/static/:splat`, status: 200 },
     {
       from: `${basePath}/*`,
       to: HANDLER_FUNCTION_PATH,
       status: 200,
-      force: true,
       conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
     },
     ...redirects.map((redirect) => ({

test/__snapshots__/index.js.snap

@@ -154,7 +154,6 @@ Array [
         "__next_preview_data",
       ],
     },
-    "force": true,
     "from": "/*",
     "status": 200,
     "to": "/.netlify/functions/___netlify-handler",