Merge branch 'canary' into typescript-eslint-recommended-internal

vercel · Jul 31, 2023 · fd0a6b1 · fd0a6b1
2 parents 1dd34cb + 7182d4d
commit fd0a6b1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -1583,14 +1583,20 @@ export async function renderToHTMLOrFlight(
                       src:
                         `${assetPrefix}/_next/` +
                         src +
-                        getAssetQueryString(false),
+                        // Always include the timestamp query in development
+                        // as Safari caches them during the same session, no
+                        // matter what cache headers are set.
+                        getAssetQueryString(true),
                       integrity: subresourceIntegrityManifest[src],
                     }))
                   : buildManifest.rootMainFiles.map(
                       (src) =>
                         `${assetPrefix}/_next/` +
                         src +
-                        getAssetQueryString(false)
+                        // Always include the timestamp query in development
+                        // as Safari caches them during the same session, no
+                        // matter what cache headers are set.
+                        getAssetQueryString(true)
                     )),
               ],
             },