Bust both cache keys

vercel · Aug 19, 2022 · cda77fd · cda77fd
1 parent 1673534
commit cda77fd
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/packages/next/shared/lib/router/router.ts b/packages/next/shared/lib/router/router.ts
@@ -2015,7 +2015,6 @@ export default class Router implements BaseRouter {
             : await fetchNextData({
                 dataHref: this.pageLoader.getDataHref({
                   href: formatWithValidation({ pathname, query }),
-                  skipInterpolation: true,
                   asPath: resolvedAs,
                   locale,
                 }),
@@ -2053,11 +2052,21 @@ export default class Router implements BaseRouter {
       // middleware can skip cache per request with
       // x-middleware-cache: no-cache as well
       if (routeInfo.__N_SSP && fetchNextDataParams.dataHref) {
-        const cacheKey = new URL(
-          fetchNextDataParams.dataHref,
-          window.location.href
-        ).href
-        delete this.sdc[cacheKey]
+        // The data cache can exist under two similar keys: one with
+        // interpolation and one without
+        delete this.sdc[
+          new URL(fetchNextDataParams.dataHref, window.location.href).href
+        ]
+        delete this.sdc[
+          new URL(
+            this.pageLoader.getDataHref({
+              href: formatWithValidation({ pathname, query }),
+              asPath: resolvedAs,
+              locale,
+            }),
+            window.location.href
+          ).href
+        ]
       }
 
       // we kick off a HEAD request in the background