Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to not trigger revalidation during prefetch #37201

Merged
merged 4 commits into from
May 29, 2022

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented May 26, 2022

Continuation of #34498 this updates to send a purpose: prefetch header (related w3c discussion) when prefetching data routes and then on the server we skip revalidating when this header is set.

When a client-transition is actually made we send a background HEAD (non-blocking) request to the data route without the purpose: prefetch header which signals a revalidation should occur if the data is stale.

This helps alleviate the number of revalidations occurring currently caused by prefetches as a path can be prefetched but not visited during a session so may not need to be revalidated yet.

Fixes: #17758
x-ref: #20521
x-ref: slack thread

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team. type: next labels May 26, 2022
@ijjk
Copy link
Member Author

ijjk commented May 26, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/purpose-prefetch Change
buildDuration 24.1s 24.1s ⚠️ +26ms
buildDurationCached 8.1s 8.4s ⚠️ +273ms
nodeModulesSize 1.86 GB 1.86 GB ⚠️ +3.53 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js add/purpose-prefetch Change
/ failed reqs 0 0
/ total time (seconds) 5.395 5.66 ⚠️ +0.27
/ avg req/sec 463.43 441.69 ⚠️ -21.74
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 2.187 2.225 ⚠️ +0.04
/error-in-render avg req/sec 1143.24 1123.5 ⚠️ -19.74
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/purpose-prefetch Change
437.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 29.2 kB 29.3 kB ⚠️ +115 B
webpack-HASH.js gzip 1.53 kB 1.54 kB ⚠️ +4 B
Overall change 73 kB 73.1 kB ⚠️ +119 B
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js add/purpose-prefetch Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages Overall decrease ✓
vercel/next.js canary ijjk/next.js add/purpose-prefetch Change
_app-HASH.js gzip 1.37 kB 1.37 kB ⚠️ +1 B
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 309 B 310 B ⚠️ +1 B
css-HASH.js gzip 328 B 327 B -1 B
dynamic-HASH.js gzip 2.7 kB 2.7 kB ⚠️ +1 B
head-HASH.js gzip 359 B 355 B -4 B
hooks-HASH.js gzip 920 B 919 B -1 B
image-HASH.js gzip 5.74 kB 5.74 kB -2 B
index-HASH.js gzip 263 B 264 B ⚠️ +1 B
link-HASH.js gzip 2.73 kB 2.74 kB ⚠️ +2 B
routerDirect..HASH.js gzip 322 B 321 B -1 B
script-HASH.js gzip 392 B 390 B -2 B
withRouter-HASH.js gzip 320 B 318 B -2 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 16.1 kB 16.1 kB -7 B
Client Build Manifests Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/purpose-prefetch Change
_buildManifest.js gzip 459 B 460 B ⚠️ +1 B
Overall change 459 B 460 B ⚠️ +1 B
Rendered Page Sizes
vercel/next.js canary ijjk/next.js add/purpose-prefetch Change
index.html gzip 532 B 532 B
link.html gzip 546 B 546 B
withRouter.html gzip 527 B 527 B
Overall change 1.6 kB 1.6 kB

Diffs

Diff for _buildManifest.js
@@ -1,25 +1,25 @@
 self.__BUILD_MANIFEST = {
   __rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-5d085461d4b7e1ee.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-48e41d26ff0101f8.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-a67fe6de8bb61a7a.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-71b39a0d29d24c94.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-f7a25bc135f661fc.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-ade8b541ba69808a.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-6d59dba2fd31bfed.js"
+    "static\u002Fchunks\u002Fpages\u002Fcss-a95e3bc2c5ca8245.js"
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-22ab8fbf7e5acbc7.js"
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-672cb693b0ca9d7e.js"
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-6ece0649d14938b8.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-e3382ebb932b5bfb.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-c3f8e97eedd82117.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-86d14415a89c2a34.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-e2b7857f2aa86120.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-a5d0da0f39070d96.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-a032795453eaeab0.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-fb01d119272aa01d.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-9669d5861da5e10b.js"
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-c2408dd9a1984376.js"
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-c439c95569fb9033.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-f309dfc4eea310f4.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-8b03818d0ed540a0.js"
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-fb06f1f34bce84ca.js"
   ],
   sortedPages: [
     "\u002F",
Diff for _app-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [888],
   {
-    /***/ 3479: /***/ function(
+    /***/ 122: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_app",
         function() {
-          return __webpack_require__(3653);
+          return __webpack_require__(539);
         }
       ]);
       if (false) {
@@ -18,14 +18,14 @@
       /***/
     },
 
-    /***/ 3653: /***/ function(
+    /***/ 539: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
     ) {
       "use strict";
 
-      var _runtimeJs = _interopRequireDefault(__webpack_require__(739));
+      var _runtimeJs = _interopRequireDefault(__webpack_require__(3994));
       function _assertThisInitialized(self) {
         if (self === void 0) {
           throw new ReferenceError(
@@ -153,7 +153,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault1(__webpack_require__(9496));
-      var _utils = __webpack_require__(8030);
+      var _utils = __webpack_require__(9089);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -282,7 +282,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 179], function() {
-      return __webpack_exec__(3479), __webpack_exec__(7465);
+      return __webpack_exec__(122), __webpack_exec__(1905);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for _error-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [820],
   {
-    /***/ 2929: /***/ function(
+    /***/ 3560: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_error",
         function() {
-          return __webpack_require__(5590);
+          return __webpack_require__(9733);
         }
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(2929);
+      return __webpack_exec__(3560);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for amp-HASH.js
@@ -1,17 +1,17 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [216],
   {
-    /***/ 94: /***/ function(
+    /***/ 7941: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(4634);
+      module.exports = __webpack_require__(79);
 
       /***/
     },
 
-    /***/ 9028: /***/ function(
+    /***/ 8958: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -19,7 +19,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/amp",
         function() {
-          return __webpack_require__(4628);
+          return __webpack_require__(6534);
         }
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 4628: /***/ function(
+    /***/ 6534: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -45,7 +45,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        94
+        7941
       );
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
         next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -69,7 +69,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(9028);
+      return __webpack_exec__(8958);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for css-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [706],
   {
-    /***/ 8281: /***/ function(
+    /***/ 9557: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/css",
         function() {
-          return __webpack_require__(1949);
+          return __webpack_require__(4173);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1949: /***/ function(
+    /***/ 4173: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -29,7 +29,7 @@
         4637
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        1099
+        2467
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,7 +48,7 @@
       /***/
     },
 
-    /***/ 1099: /***/ function(module) {
+    /***/ 2467: /***/ function(module) {
       // extracted by mini-css-extract-plugin
       module.exports = { helloWorld: "css_helloWorld__qqNwY" };
 
@@ -61,7 +61,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(8281);
+      return __webpack_exec__(9557);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for dynamic-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [739],
   {
-    /***/ 2744: /***/ function(
+    /***/ 5695: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/dynamic",
         function() {
-          return __webpack_require__(1697);
+          return __webpack_require__(7800);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1926: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7164: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _defineProperty(obj, key, value) {
@@ -68,7 +68,7 @@
       exports["default"] = dynamic;
       exports.noSSR = noSSR;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadable = _interopRequireDefault(__webpack_require__(4596));
+      var _loadable = _interopRequireDefault(__webpack_require__(4398));
       function dynamic(dynamicOptions, options) {
         var loadableFn = _loadable.default;
         var loadableOptions = {
@@ -171,7 +171,7 @@
       /***/
     },
 
-    /***/ 7063: /***/ function(
+    /***/ 7484: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -198,7 +198,7 @@
       /***/
     },
 
-    /***/ 4596: /***/ function(
+    /***/ 4398: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -259,7 +259,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadableContext = __webpack_require__(7063);
+      var _loadableContext = __webpack_require__(7484);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -582,7 +582,7 @@
       /***/
     },
 
-    /***/ 1697: /***/ function(
+    /***/ 7800: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -599,7 +599,7 @@
         4637
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        1605
+        2123
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -608,13 +608,13 @@
       var DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         function() {
           return __webpack_require__
-            .e(/* import() */ 437)
-            .then(__webpack_require__.bind(__webpack_require__, 7437));
+            .e(/* import() */ 181)
+            .then(__webpack_require__.bind(__webpack_require__, 1181));
         },
         {
           loadableGenerated: {
             webpack: function() {
-              return [/*require.resolve*/ 7437];
+              return [/*require.resolve*/ 1181];
             }
           }
         }
@@ -644,12 +644,12 @@
       /***/
     },
 
-    /***/ 1605: /***/ function(
+    /***/ 2123: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(1926);
+      module.exports = __webpack_require__(7164);
 
       /***/
     },
@@ -751,7 +751,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(2744);
+      return __webpack_exec__(5695);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for head-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [645],
   {
-    /***/ 4337: /***/ function(
+    /***/ 7148: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/head",
         function() {
-          return __webpack_require__(848);
+          return __webpack_require__(6179);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 848: /***/ function(
+    /***/ 6179: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        8915
+        4616
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -71,12 +71,12 @@
       /***/
     },
 
-    /***/ 8915: /***/ function(
+    /***/ 4616: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(4828);
+      module.exports = __webpack_require__(5222);
 
       /***/
     }
@@ -87,7 +87,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4337);
+      return __webpack_exec__(7148);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for hooks-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [757],
   {
-    /***/ 4853: /***/ function(
+    /***/ 3515: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/hooks",
         function() {
-          return __webpack_require__(7084);
+          return __webpack_require__(856);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7084: /***/ function(
+    /***/ 856: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -158,7 +158,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4853);
+      return __webpack_exec__(3515);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for image-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [358],
   {
-    /***/ 7570: /***/ function(
+    /***/ 1487: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function() {
-          return __webpack_require__(3918);
+          return __webpack_require__(2330);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2185: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5239: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -123,12 +123,12 @@
       });
       exports["default"] = Image;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _head = _interopRequireDefault(__webpack_require__(4828));
-      var _imageConfig = __webpack_require__(2204);
-      var _useIntersection = __webpack_require__(6363);
-      var _imageConfigContext = __webpack_require__(1958);
-      var _utils = __webpack_require__(8030);
-      var _normalizeTrailingSlash = __webpack_require__(1872);
+      var _head = _interopRequireDefault(__webpack_require__(5222));
+      var _imageConfig = __webpack_require__(5466);
+      var _useIntersection = __webpack_require__(1311);
+      var _imageConfigContext = __webpack_require__(1801);
+      var _utils = __webpack_require__(9089);
+      var _normalizeTrailingSlash = __webpack_require__(2800);
       function Image(_param) {
         var src = _param.src,
           sizes = _param.sizes,
@@ -1124,7 +1124,7 @@
       /***/
     },
 
-    /***/ 6363: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1311: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -1193,7 +1193,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _requestIdleCallback = __webpack_require__(7307);
       var hasIntersectionObserver = typeof IntersectionObserver !== "undefined";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -1339,7 +1339,7 @@
       /***/
     },
 
-    /***/ 3918: /***/ function(
+    /***/ 2330: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1360,8 +1360,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/react@17.0.2/node_modules/react/jsx-runtime.js
       var jsx_runtime = __webpack_require__(4637);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
-      var next_image = __webpack_require__(8114);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
+      var next_image = __webpack_require__(4033);
       var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
       /* harmony default export */ var nextjs = {
         src: "/_next/static/media/nextjs.cae0b805.png",
@@ -1389,12 +1389,12 @@
       /***/
     },
 
-    /***/ 8114: /***/ function(
+    /***/ 4033: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(2185);
+      module.exports = __webpack_require__(5239);
 
       /***/
     }
@@ -1405,7 +1405,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(7570);
+      return __webpack_exec__(1487);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for index-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [405],
   {
-    /***/ 4786: /***/ function(
+    /***/ 6967: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/",
         function() {
-          return __webpack_require__(7245);
+          return __webpack_require__(9257);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7245: /***/ function(
+    /***/ 9257: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -46,7 +46,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(4786);
+      return __webpack_exec__(6967);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for link-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [644],
   {
-    /***/ 2783: /***/ function(
+    /***/ 9367: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/link",
         function() {
-          return __webpack_require__(3122);
+          return __webpack_require__(7178);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7160: /***/ function(module, exports, __webpack_require__) {
+    /***/ 3952: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -95,10 +95,10 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(1368);
-      var _routerContext = __webpack_require__(9831);
-      var _appRouterContext = __webpack_require__(482);
-      var _useIntersection = __webpack_require__(6363);
+      var _router = __webpack_require__(5920);
+      var _routerContext = __webpack_require__(8940);
+      var _appRouterContext = __webpack_require__(2587);
+      var _useIntersection = __webpack_require__(1311);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -426,7 +426,7 @@
       /***/
     },
 
-    /***/ 6363: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1311: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -495,7 +495,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _requestIdleCallback = __webpack_require__(7307);
       var hasIntersectionObserver = typeof IntersectionObserver !== "undefined";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -641,7 +641,7 @@
       /***/
     },
 
-    /***/ 482: /***/ function(
+    /***/ 2587: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -668,7 +668,7 @@
       /***/
     },
 
-    /***/ 3122: /***/ function(
+    /***/ 7178: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -685,7 +685,7 @@
         4637
       );
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        8168
+        8728
       );
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_link__WEBPACK_IMPORTED_MODULE_1__
@@ -716,12 +716,12 @@
       /***/
     },
 
-    /***/ 8168: /***/ function(
+    /***/ 8728: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(7160);
+      module.exports = __webpack_require__(3952);
 
       /***/
     }
@@ -732,7 +732,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(2783);
+      return __webpack_exec__(9367);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for routerDirect-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [58],
   {
-    /***/ 5863: /***/ function(
+    /***/ 4538: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/routerDirect",
         function() {
-          return __webpack_require__(2550);
+          return __webpack_require__(8080);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2550: /***/ function(
+    /***/ 8080: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        9393
+        7084
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -57,12 +57,12 @@
       /***/
     },
 
-    /***/ 9393: /***/ function(
+    /***/ 7084: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(7465);
+      module.exports = __webpack_require__(1905);
 
       /***/
     }
@@ -73,7 +73,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(5863);
+      return __webpack_exec__(4538);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for script-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [797],
   {
-    /***/ 581: /***/ function(
+    /***/ 2644: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/script",
         function() {
-          return __webpack_require__(6436);
+          return __webpack_require__(9689);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6436: /***/ function(
+    /***/ 9689: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        2311
+        7635
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -70,12 +70,12 @@
       /***/
     },
 
-    /***/ 2311: /***/ function(
+    /***/ 7635: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(5031);
+      module.exports = __webpack_require__(736);
 
       /***/
     }
@@ -86,7 +86,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(581);
+      return __webpack_exec__(2644);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for withRouter-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [807],
   {
-    /***/ 4573: /***/ function(
+    /***/ 5577: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/withRouter",
         function() {
-          return __webpack_require__(5526);
+          return __webpack_require__(237);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5526: /***/ function(
+    /***/ 237: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        9393
+        7084
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,12 +54,12 @@
       /***/
     },
 
-    /***/ 9393: /***/ function(
+    /***/ 7084: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(7465);
+      module.exports = __webpack_require__(1905);
 
       /***/
     }
@@ -70,7 +70,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4573);
+      return __webpack_exec__(5577);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for 437.HASH.js
@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [437],
+  [181],
   {
-    /***/ 7437: /***/ function(
+    /***/ 1181: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
Diff for framework-HASH.js
@@ -19,7 +19,7 @@
  Modernizr 3.0.0pre (Custom Build) | MIT
 */
       var aa = __webpack_require__(9496),
-        m = __webpack_require__(9260),
+        m = __webpack_require__(2048),
         r = __webpack_require__(8051);
       function y(a) {
         for (
@@ -7895,7 +7895,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      __webpack_require__(9260);
+      __webpack_require__(2048);
       var f = __webpack_require__(9496),
         g = 60103;
       exports.Fragment = 60107;
@@ -7948,7 +7948,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var l = __webpack_require__(9260),
+      var l = __webpack_require__(2048),
         n = 60103,
         p = 60106;
       exports.Fragment = 60107;
Diff for main-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [179],
   {
-    /***/ 9260: /***/ function(module) {
+    /***/ 2048: /***/ function(module) {
       "use strict";
 
       var assign = Object.assign.bind(Object);
@@ -13,7 +13,7 @@
       /***/
     },
 
-    /***/ 1326: /***/ function() {
+    /***/ 3071: /***/ function() {
       "trimStart" in String.prototype ||
         (String.prototype.trimStart = String.prototype.trimLeft),
         "trimEnd" in String.prototype ||
@@ -57,7 +57,7 @@
       /***/
     },
 
-    /***/ 1048: /***/ function(module, exports) {
+    /***/ 6736: /***/ function(module, exports) {
       "use strict";
 
       function _instanceof(left, right) {
@@ -255,10 +255,10 @@
       /***/
     },
 
-    /***/ 3185: /***/ function(module, exports, __webpack_require__) {
+    /***/ 571: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
-      var _runtimeJs = _interopRequireDefault(__webpack_require__(739));
+      var _runtimeJs = _interopRequireDefault(__webpack_require__(3994));
       function _arrayLikeToArray(arr, len) {
         if (len == null || len > arr.length) len = arr.length;
         for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
@@ -481,27 +481,27 @@
       exports.initialize = initialize;
       exports.hydrate = hydrate;
       exports.emitter = exports.router = exports.version = void 0;
-      __webpack_require__(1326);
+      __webpack_require__(3071);
       var _react = _interopRequireWildcard1(__webpack_require__(9496));
-      var _headManagerContext = __webpack_require__(7574);
-      var _mitt = _interopRequireDefault1(__webpack_require__(4835));
-      var _routerContext = __webpack_require__(9831);
-      var _router = __webpack_require__(1368);
-      var _isDynamic = __webpack_require__(485);
-      var _querystring = __webpack_require__(5361);
-      var _runtimeConfig = __webpack_require__(975);
-      var _utils = __webpack_require__(8030);
-      var _portal = __webpack_require__(5765);
-      var _headManager = _interopRequireDefault1(__webpack_require__(1048));
-      var _pageLoader = _interopRequireDefault1(__webpack_require__(1153));
+      var _headManagerContext = __webpack_require__(6469);
+      var _mitt = _interopRequireDefault1(__webpack_require__(5569));
+      var _routerContext = __webpack_require__(8940);
+      var _router = __webpack_require__(5920);
+      var _isDynamic = __webpack_require__(580);
+      var _querystring = __webpack_require__(1150);
+      var _runtimeConfig = __webpack_require__(4649);
+      var _utils = __webpack_require__(9089);
+      var _portal = __webpack_require__(558);
+      var _headManager = _interopRequireDefault1(__webpack_require__(6736));
+      var _pageLoader = _interopRequireDefault1(__webpack_require__(4773));
       var _performanceRelayer = _interopRequireDefault1(
-        __webpack_require__(4959)
+        __webpack_require__(7136)
       );
-      var _routeAnnouncer = __webpack_require__(7100);
-      var _router1 = __webpack_require__(7465);
-      var _isError = __webpack_require__(467);
-      var _refresh = __webpack_require__(6887);
-      var _imageConfigContext = __webpack_require__(1958);
+      var _routeAnnouncer = __webpack_require__(8738);
+      var _router1 = __webpack_require__(1905);
+      var _isError = __webpack_require__(6040);
+      var _refresh = __webpack_require__(2453);
+      var _imageConfigContext = __webpack_require__(1801);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -789,7 +789,7 @@
                     if (false) {
                     }
                     if (initialData.scriptLoader) {
-                      initScriptLoader = __webpack_require__(5031)
+                      initScriptLoader = __webpack_require__(736)
                         .initScriptLoader;
                       initScriptLoader(initialData.scriptLoader);
                     }
@@ -1110,7 +1110,7 @@
               : lastAppProps.Component) === ErrorComponent
               ? Promise.resolve()
                   .then(function() {
-                    return _interopRequireWildcard(__webpack_require__(5590));
+                    return _interopRequireWildcard(__webpack_require__(9733));
                   })
                   .then(function(m) {
                     return {
@@ -1534,10 +1534,10 @@
       /***/
     },
 
-    /***/ 2905: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7242: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
-      var _ = __webpack_require__(3185);
+      var _ = __webpack_require__(571);
       window.next = {
         version: _.version,
         // router is initialized later so it has to be live-binded
@@ -1567,14 +1567,14 @@
       /***/
     },
 
-    /***/ 1872: /***/ function(module, exports, __webpack_require__) {
+    /***/ 2800: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.normalizePathTrailingSlash = void 0;
-      var _removeTrailingSlash = __webpack_require__(7658);
+      var _removeTrailingSlash = __webpack_require__(9160);
       var normalizePathTrailingSlash = false
         ? 0
         : _removeTrailingSlash.removeTrailingSlash;
@@ -1594,7 +1594,7 @@
       /***/
     },
 
-    /***/ 1153: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4773: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _classCallCheck(instance, Constructor) {
@@ -1620,14 +1620,14 @@
         value: true
       });
       exports["default"] = void 0;
-      var _router = __webpack_require__(1368);
+      var _router = __webpack_require__(5920);
       var _getAssetPathFromRoute = _interopRequireDefault(
-        __webpack_require__(3031)
+        __webpack_require__(7294)
       );
-      var _isDynamic = __webpack_require__(485);
-      var _parseRelativeUrl = __webpack_require__(1184);
-      var _removeTrailingSlash = __webpack_require__(7658);
-      var _routeLoader = __webpack_require__(6449);
+      var _isDynamic = __webpack_require__(580);
+      var _parseRelativeUrl = __webpack_require__(2657);
+      var _removeTrailingSlash = __webpack_require__(9160);
+      var _routeLoader = __webpack_require__(3051);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -1786,14 +1786,14 @@
       /***/
     },
 
-    /***/ 4959: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7136: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports["default"] = void 0;
-      var _webVitals = __webpack_require__(5583);
+      var _webVitals = __webpack_require__(4867);
       var initialHref = location.href;
       var isRegistered = false;
       var userReportHandler;
@@ -1840,7 +1840,7 @@
       /***/
     },
 
-    /***/ 5765: /***/ function(module, exports, __webpack_require__) {
+    /***/ 558: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -1959,7 +1959,7 @@
       /***/
     },
 
-    /***/ 7808: /***/ function(module, exports) {
+    /***/ 7307: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2005,7 +2005,7 @@
       /***/
     },
 
-    /***/ 7100: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8738: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -2075,7 +2075,7 @@
       exports.RouteAnnouncer = RouteAnnouncer;
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(7465);
+      var _router = __webpack_require__(1905);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2161,7 +2161,7 @@
       /***/
     },
 
-    /***/ 6449: /***/ function(module, exports, __webpack_require__) {
+    /***/ 3051: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2173,10 +2173,10 @@
       exports.getMiddlewareManifest = getMiddlewareManifest;
       exports.createRouteLoader = createRouteLoader;
       var _getAssetPathFromRoute = _interopRequireDefault(
-        __webpack_require__(3031)
+        __webpack_require__(7294)
       );
-      var _trustedTypes = __webpack_require__(915);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _trustedTypes = __webpack_require__(5786);
+      var _requestIdleCallback = __webpack_require__(7307);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2569,7 +2569,7 @@
       /***/
     },
 
-    /***/ 7465: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1905: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -2669,10 +2669,10 @@
       exports.makePublicRouterInstance = makePublicRouterInstance;
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = _interopRequireDefault(__webpack_require__(1368));
-      var _routerContext = __webpack_require__(9831);
-      var _isError = _interopRequireDefault(__webpack_require__(467));
-      var _withRouter = _interopRequireDefault(__webpack_require__(8000));
+      var _router = _interopRequireDefault(__webpack_require__(5920));
+      var _routerContext = __webpack_require__(8940);
+      var _isError = _interopRequireDefault(__webpack_require__(6040));
+      var _withRouter = _interopRequireDefault(__webpack_require__(1460));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2896,7 +2896,7 @@
       /***/
     },
 
-    /***/ 5031: /***/ function(module, exports, __webpack_require__) {
+    /***/ 736: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -2990,9 +2990,9 @@
       exports.initScriptLoader = initScriptLoader;
       exports["default"] = void 0;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _headManagerContext = __webpack_require__(7574);
-      var _headManager = __webpack_require__(1048);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _headManagerContext = __webpack_require__(6469);
+      var _headManager = __webpack_require__(6736);
+      var _requestIdleCallback = __webpack_require__(7307);
       function _defineProperty(obj, key, value) {
         if (key in obj) {
           Object.defineProperty(obj, key, {
@@ -3295,7 +3295,7 @@
       /***/
     },
 
-    /***/ 6887: /***/ function(module, exports, __webpack_require__) {
+    /***/ 2453: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3324,7 +3324,7 @@
       /***/
     },
 
-    /***/ 915: /***/ function(module, exports) {
+    /***/ 5786: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3381,7 +3381,7 @@
       /***/
     },
 
-    /***/ 8000: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1460: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3389,7 +3389,7 @@
       });
       exports["default"] = withRouter;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(7465);
+      var _router = __webpack_require__(1905);
       function withRouter(ComposedComponent) {
         var WithRouterWrapper = function WithRouterWrapper(props) {
           return /*#__PURE__*/ _react.default.createElement(
@@ -3432,7 +3432,7 @@
       /***/
     },
 
-    /***/ 5590: /***/ function(
+    /***/ 9733: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3547,7 +3547,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _head = _interopRequireDefault(__webpack_require__(4828));
+      var _head = _interopRequireDefault(__webpack_require__(5222));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -3697,7 +3697,7 @@
       /***/
     },
 
-    /***/ 2054: /***/ function(
+    /***/ 3131: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3724,7 +3724,7 @@
       /***/
     },
 
-    /***/ 4634: /***/ function(module, exports, __webpack_require__) {
+    /***/ 79: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3733,7 +3733,7 @@
       exports.isInAmpMode = isInAmpMode;
       exports.useAmp = useAmp;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _ampContext = __webpack_require__(2054);
+      var _ampContext = __webpack_require__(3131);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -3773,7 +3773,7 @@
       /***/
     },
 
-    /***/ 1280: /***/ function(__unused_webpack_module, exports) {
+    /***/ 858: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3794,7 +3794,7 @@
       /***/
     },
 
-    /***/ 7574: /***/ function(
+    /***/ 6469: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3821,7 +3821,7 @@
       /***/
     },
 
-    /***/ 4828: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5222: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _defineProperty(obj, key, value) {
@@ -3860,11 +3860,11 @@
       exports.defaultHead = defaultHead;
       exports["default"] = void 0;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _sideEffect = _interopRequireDefault(__webpack_require__(4491));
-      var _ampContext = __webpack_require__(2054);
-      var _headManagerContext = __webpack_require__(7574);
-      var _amp = __webpack_require__(4634);
-      var _utils = __webpack_require__(8030);
+      var _sideEffect = _interopRequireDefault(__webpack_require__(2652));
+      var _ampContext = __webpack_require__(3131);
+      var _headManagerContext = __webpack_require__(6469);
+      var _amp = __webpack_require__(79);
+      var _utils = __webpack_require__(9089);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -4082,7 +4082,7 @@
       /***/
     },
 
-    /***/ 6829: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5044: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4114,7 +4114,7 @@
       /***/
     },
 
-    /***/ 1958: /***/ function(
+    /***/ 1801: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -4126,7 +4126,7 @@
       });
       exports.ImageConfigContext = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _imageConfig = __webpack_require__(2204);
+      var _imageConfig = __webpack_require__(5466);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -4144,7 +4144,7 @@
       /***/
     },
 
-    /***/ 2204: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5466: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4176,7 +4176,7 @@
       /***/
     },
 
-    /***/ 5496: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5990: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4198,7 +4198,7 @@
       /***/
     },
 
-    /***/ 4835: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5569: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -4276,7 +4276,7 @@
       /***/
     },
 
-    /***/ 7134: /***/ function(
+    /***/ 2399: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -4287,8 +4287,8 @@
         value: true
       });
       exports.denormalizePagePath = denormalizePagePath;
-      var _utils = __webpack_require__(5222);
-      var _normalizePathSep = __webpack_require__(3629);
+      var _utils = __webpack_require__(2760);
+      var _normalizePathSep = __webpack_require__(7374);
       function denormalizePagePath(page) {
         var _page = (0, _normalizePathSep).normalizePathSep(page);
         return _page.startsWith("/index/") && !(0, _utils).isDynamicRoute(_page)
@@ -4301,7 +4301,7 @@
       /***/
     },
 
-    /***/ 3629: /***/ function(__unused_webpack_module, exports) {
+    /***/ 7374: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4315,7 +4315,7 @@
       /***/
     },
 
-    /***/ 9831: /***/ function(
+    /***/ 8940: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -4342,14 +4342,14 @@
       /***/
     },
 
-    /***/ 1368: /***/ function(
+    /***/ 5920: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
     ) {
       "use strict";
 
-      var _runtimeJs = _interopRequireDefault(__webpack_require__(739));
+      var _runtimeJs = _interopRequireDefault(__webpack_require__(3994));
       function _arrayLikeToArray(arr, len) {
         if (len == null || len > arr.length) len = arr.length;
         for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
@@ -4535,22 +4535,22 @@
       exports.resolveHref = resolveHref;
       exports.createKey = createKey;
       exports["default"] = void 0;
-      var _normalizeTrailingSlash = __webpack_require__(1872);
-      var _removeTrailingSlash = __webpack_require__(7658);
-      var _routeLoader = __webpack_require__(6449);
-      var _script = __webpack_require__(5031);
-      var _isError = _interopRequireWildcard(__webpack_require__(467));
-      var _denormalizePagePath = __webpack_require__(7134);
-      var _normalizeLocalePath = __webpack_require__(6829);
-      var _mitt = _interopRequireDefault1(__webpack_require__(4835));
-      var _utils = __webpack_require__(8030);
-      var _isDynamic = __webpack_require__(485);
-      var _parseRelativeUrl = __webpack_require__(1184);
-      var _querystring = __webpack_require__(5361);
-      var _resolveRewrites = _interopRequireDefault1(__webpack_require__(6527));
-      var _routeMatcher = __webpack_require__(5510);
-      var _routeRegex = __webpack_require__(3804);
-      var _formatUrl = __webpack_require__(1801);
+      var _normalizeTrailingSlash = __webpack_require__(2800);
+      var _removeTrailingSlash = __webpack_require__(9160);
+      var _routeLoader = __webpack_require__(3051);
+      var _script = __webpack_require__(736);
+      var _isError = _interopRequireWildcard(__webpack_require__(6040));
+      var _denormalizePagePath = __webpack_require__(2399);
+      var _normalizeLocalePath = __webpack_require__(5044);
+      var _mitt = _interopRequireDefault1(__webpack_require__(5569));
+      var _utils = __webpack_require__(9089);
+      var _isDynamic = __webpack_require__(580);
+      var _parseRelativeUrl = __webpack_require__(2657);
+      var _querystring = __webpack_require__(1150);
+      var _resolveRewrites = _interopRequireDefault1(__webpack_require__(9292));
+      var _routeMatcher = __webpack_require__(4041);
+      var _routeRegex = __webpack_require__(2303);
+      var _formatUrl = __webpack_require__(9253);
       function _interopRequireDefault1(obj) {
         return obj && obj.__esModule
           ? obj
@@ -4872,7 +4872,13 @@
           // > receiving cookies, always supply the `credentials: 'same-origin'`
           // > option instead of relying on the default.
           // https://github.com/github/fetch#caveats
-          credentials: "same-origin"
+          credentials: "same-origin",
+          method: opts.method || "GET",
+          headers: opts.isPrefetch
+            ? {
+                purpose: "prefetch"
+              }
+            : {}
         }).then(function(res) {
           if (!res.ok) {
             if (attempts > 1 && res.status >= 500) {
@@ -4890,47 +4896,65 @@
             }
             throw new Error("Failed to load static props");
           }
-          return opts.text ? res.text() : res.json();
+          if (opts.method !== "HEAD") {
+            return opts.text ? res.text() : res.json();
+          }
         });
       }
+      var backgroundCache = {};
       function fetchNextData(
         dataHref,
         isServerRender,
         text,
         inflightCache,
-        persistCache
+        persistCache,
+        isPrefetch
       ) {
         var ref = new URL(dataHref, window.location.href),
           cacheKey = ref.href;
+        var getData = function() {
+          var background =
+            arguments.length > 0 && arguments[0] !== void 0
+              ? arguments[0]
+              : false;
+          return fetchRetry(dataHref, isServerRender ? 3 : 1, {
+            text: text,
+            isPrefetch: isPrefetch,
+            method: background ? "HEAD" : "GET"
+          })
+            .catch(function(err) {
+              // We should only trigger a server-side transition if this was caused
+              // on a client-side transition. Otherwise, we'd get into an infinite
+              // loop.
+              if (!isServerRender) {
+                (0, _routeLoader).markAssetError(err);
+              }
+              throw err;
+            })
+            .then(function(data) {
+              if (!persistCache || "production" !== "production") {
+                delete inflightCache[cacheKey];
+              }
+              return data;
+            })
+            .catch(function(err) {
+              delete inflightCache[cacheKey];
+              throw err;
+            });
+        };
         if (inflightCache[cacheKey] !== undefined) {
+          // we kick off a HEAD request in the background
+          // when a non-prefetch request is made to signal revalidation
+          if (!isPrefetch && persistCache && !backgroundCache[cacheKey]) {
+            backgroundCache[cacheKey] = getData(true)
+              .catch(function() {})
+              .then(function() {
+                delete backgroundCache[cacheKey];
+              });
+          }
           return inflightCache[cacheKey];
         }
-        return (inflightCache[cacheKey] = fetchRetry(
-          dataHref,
-          isServerRender ? 3 : 1,
-          {
-            text: text
-          }
-        )
-          .catch(function(err) {
-            // We should only trigger a server-side transition if this was caused
-            // on a client-side transition. Otherwise, we'd get into an infinite
-            // loop.
-            if (!isServerRender) {
-              (0, _routeLoader).markAssetError(err);
-            }
-            throw err;
-          })
-          .then(function(data) {
-            if (!persistCache || "production" !== "production") {
-              delete inflightCache[cacheKey];
-            }
-            return data;
-          })
-          .catch(function(err) {
-            delete inflightCache[cacheKey];
-            throw err;
-          }));
+        return (inflightCache[cacheKey] = getData());
       }
       function createKey() {
         return Math.random()
@@ -6231,7 +6255,8 @@
                                     _this.isSsr,
                                     false,
                                     __N_SSG ? _this.sdc : _this.sdr,
-                                    !!__N_SSG && !isPreview
+                                    !!__N_SSG && !isPreview,
+                                    false
                                   )
                                 : _this.getInitialProps(Component, {
                                     pathname: pathname,
@@ -6535,6 +6560,7 @@
                                       false,
                                       false,
                                       _this.sdc,
+                                      !_this.isPreview,
                                       true
                                     )
                                   : false;
@@ -6634,13 +6660,18 @@
             key: "_getFlightData",
             value: function _getFlightData(dataHref) {
               // Do not cache RSC flight response since it's not a static resource
-              return fetchNextData(dataHref, true, true, this.sdc, false).then(
-                function(serialized) {
-                  return {
-                    data: serialized
-                  };
-                }
-              );
+              return fetchNextData(
+                dataHref,
+                true,
+                true,
+                this.sdc,
+                false,
+                false
+              ).then(function(serialized) {
+                return {
+                  data: serialized
+                };
+              });
             }
           },
           {
@@ -6955,7 +6986,7 @@
       /***/
     },
 
-    /***/ 1801: /***/ function(
+    /***/ 9253: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -6968,7 +6999,7 @@
       exports.formatUrl = formatUrl;
       exports.formatWithValidation = formatWithValidation;
       exports.urlObjectKeys = void 0;
-      var querystring = _interopRequireWildcard(__webpack_require__(5361));
+      var querystring = _interopRequireWildcard(__webpack_require__(1150));
       function _interopRequireWildcard(obj) {
         if (obj && obj.__esModule) {
           return obj;
@@ -7062,7 +7093,7 @@
       /***/
     },
 
-    /***/ 3031: /***/ function(__unused_webpack_module, exports) {
+    /***/ 7294: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7084,7 +7115,7 @@
       /***/
     },
 
-    /***/ 5222: /***/ function(
+    /***/ 2760: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7106,13 +7137,13 @@
           return _isDynamic.isDynamicRoute;
         }
       });
-      var _sortedRoutes = __webpack_require__(1563);
-      var _isDynamic = __webpack_require__(485); //# sourceMappingURL=index.js.map
+      var _sortedRoutes = __webpack_require__(9580);
+      var _isDynamic = __webpack_require__(580); //# sourceMappingURL=index.js.map
 
       /***/
     },
 
-    /***/ 485: /***/ function(__unused_webpack_module, exports) {
+    /***/ 580: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7128,7 +7159,7 @@
       /***/
     },
 
-    /***/ 1184: /***/ function(
+    /***/ 2657: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7139,8 +7170,8 @@
         value: true
       });
       exports.parseRelativeUrl = parseRelativeUrl;
-      var _utils = __webpack_require__(8030);
-      var _querystring = __webpack_require__(5361);
+      var _utils = __webpack_require__(9089);
+      var _querystring = __webpack_require__(1150);
       function parseRelativeUrl(url, base) {
         var globalBase = new URL(false ? 0 : (0, _utils).getLocationOrigin());
         var resolvedBase = base
@@ -7172,7 +7203,7 @@
       /***/
     },
 
-    /***/ 5361: /***/ function(__unused_webpack_module, exports) {
+    /***/ 1150: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -7306,7 +7337,7 @@
       /***/
     },
 
-    /***/ 7658: /***/ function(__unused_webpack_module, exports) {
+    /***/ 9160: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7320,7 +7351,7 @@
       /***/
     },
 
-    /***/ 5510: /***/ function(
+    /***/ 4041: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7331,7 +7362,7 @@
         value: true
       });
       exports.getRouteMatcher = getRouteMatcher;
-      var _utils = __webpack_require__(8030);
+      var _utils = __webpack_require__(9089);
       function getRouteMatcher(param1) {
         var re = param1.re,
           groups = param1.groups;
@@ -7368,7 +7399,7 @@
       /***/
     },
 
-    /***/ 3804: /***/ function(
+    /***/ 2303: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7412,8 +7443,8 @@
       exports.getNamedRouteRegex = getNamedRouteRegex;
       exports.getMiddlewareRegex = getMiddlewareRegex;
       exports.getNamedMiddlewareRegex = getNamedMiddlewareRegex;
-      var _escapeRegexp = __webpack_require__(1280);
-      var _removeTrailingSlash = __webpack_require__(7658);
+      var _escapeRegexp = __webpack_require__(858);
+      var _removeTrailingSlash = __webpack_require__(9160);
       function getRouteRegex(normalizedRoute) {
         var ref = getParametrizedRoute(normalizedRoute),
           parameterizedRoute = ref.parameterizedRoute,
@@ -7597,7 +7628,7 @@
       /***/
     },
 
-    /***/ 1563: /***/ function(__unused_webpack_module, exports) {
+    /***/ 9580: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -7936,7 +7967,7 @@
       /***/
     },
 
-    /***/ 975: /***/ function(__unused_webpack_module, exports) {
+    /***/ 4649: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7956,7 +7987,7 @@
       /***/
     },
 
-    /***/ 4491: /***/ function(
+    /***/ 2652: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -8202,14 +8233,14 @@
       /***/
     },
 
-    /***/ 8030: /***/ function(
+    /***/ 9089: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
     ) {
       "use strict";
 
-      var _runtimeJs = _interopRequireDefault(__webpack_require__(739));
+      var _ru
Post job cleanup.
[command]/usr/bin/git version
git version 2.36.1
Temporarily overriding HOME='/home/runner/work/_temp/aeb9023f-13a7-4e63-b2e0-80797bf40564' before making global git config changes
Adding repository directory to the temporary git global config as a safe directory
[command]/usr/bin/git config --global --add safe.directory /home/runner/work/next.js/next.js
[command]/usr/bin/git config --local --name-only --get-regexp core\.sshCommand
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :
[command]/usr/bin/git config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader
http.https://github.com/.extraheader
[command]/usr/bin/git config --local --unset-all http.https://github.com/.extraheader
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :
Cleaning up orphan processes
Commit: daaacd07f90c202122c9e95535c5e265e1dab6b8

@ijjk ijjk marked this pull request as ready for review May 26, 2022 03:15
@ijjk ijjk requested a review from styfle May 26, 2022 19:31
@kodiakhq kodiakhq bot merged commit 923fdcd into vercel:canary May 29, 2022
@ijjk ijjk deleted the add/purpose-prefetch branch May 29, 2022 23:05
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enormous number of API requests using Incremental Static Generation with revalidation
2 participants