[Segment Cache] Re-implement refresh reducer #84426
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When segment is reused in the "default" parallel route slot, it is not part of the new page. So if the page is refreshed, we must fetch its data from the previous URL, not the new URL. To track this we add the previous URL to a special field in the FlightRouterState. Currently this field is added by addRefreshMarkerToActiveParallelSegments; this updates the "ppr-navigations" module to add it during the main traversal used by navigations, so we can eventually get rid addRefreshMarkerToActiveParallelSegments. Note that we don't need to add the marker to _all_ page segments, just the ones that are not part of the new page.
Failing test suitesCommit: 3b3deb8 | About building and testing Next.js
Expand output● Static Image Component Tests › development mode › Should allow an image with a static src to omit height and width
Expand output● parallel-routes-revalidation › should submit the action and revalidate the page data
Expand output● router autoscrolling on navigation › router.refresh() › should not stop router.push() from scrolling
Expand output● PPR - partial hydration › Static shell, no streaming metadata › should hydrate the shell without waiting for slow suspense boundaries ● PPR - partial hydration › Static shell, streaming metadata › should hydrate the shell without waiting for slow suspense boundaries |
Stats from current PRDefault Build (Increase detected
|
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| buildDuration | 19.9s | 16s | N/A |
| buildDurationCached | 15.3s | 12.1s | N/A |
| nodeModulesSize | 445 MB | 445 MB | |
| nextStartRea..uration (ms) | 668ms | 668ms | ✓ |
Client Bundles (main, webpack)
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| 234bef07-HASH.js gzip | 55 kB | 55 kB | ✓ |
| 5194.HASH.js gzip | 169 B | 169 B | ✓ |
| 8863-HASH.js gzip | 5.17 kB | 5.18 kB | N/A |
| 9304-HASH.js gzip | 45.8 kB | 45.9 kB | N/A |
| framework-HASH.js gzip | 57.7 kB | 57.7 kB | N/A |
| main-app-HASH.js gzip | 261 B | 258 B | N/A |
| main-HASH.js gzip | 36.4 kB | 36.1 kB | N/A |
| webpack-HASH.js gzip | 1.69 kB | 1.69 kB | N/A |
| Overall change | 55.1 kB | 55.1 kB | ✓ |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 39.4 kB | 39.4 kB | ✓ |
| Overall change | 39.4 kB | 39.4 kB | ✓ |
Client Pages
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| _app-HASH.js gzip | 194 B | 193 B | N/A |
| _error-HASH.js gzip | 182 B | 182 B | ✓ |
| css-HASH.js gzip | 335 B | 333 B | N/A |
| dynamic-HASH.js gzip | 1.81 kB | 1.81 kB | N/A |
| edge-ssr-HASH.js gzip | 255 B | 255 B | ✓ |
| head-HASH.js gzip | 350 B | 352 B | N/A |
| hooks-HASH.js gzip | 385 B | 383 B | N/A |
| image-HASH.js gzip | 4.68 kB | 4.67 kB | N/A |
| index-HASH.js gzip | 257 B | 259 B | N/A |
| link-HASH.js gzip | 2.27 kB | 2.27 kB | N/A |
| routerDirect..HASH.js gzip | 320 B | 318 B | N/A |
| script-HASH.js gzip | 387 B | 386 B | N/A |
| withRouter-HASH.js gzip | 315 B | 313 B | N/A |
| 1afbb74e6ecf..834.css gzip | 106 B | 106 B | ✓ |
| Overall change | 543 B | 543 B | ✓ |
Client Build Manifests
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 719 B | 720 B | N/A |
| Overall change | 0 B | 0 B | ✓ |
Rendered Page Sizes
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| index.html gzip | 525 B | 522 B | N/A |
| link.html gzip | 539 B | 537 B | N/A |
| withRouter.html gzip | 521 B | 520 B | N/A |
| Overall change | 0 B | 0 B | ✓ |
Edge SSR bundle Size
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| edge-ssr.js gzip | 121 kB | 121 kB | N/A |
| page.js gzip | 242 kB | 242 kB | N/A |
| Overall change | 0 B | 0 B | ✓ |
Middleware size Overall increase ⚠️
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| middleware-b..fest.js gzip | 636 B | 637 B | N/A |
| middleware-r..fest.js gzip | 156 B | 155 B | N/A |
| middleware.js gzip | 32.7 kB | 32.9 kB | |
| edge-runtime..pack.js gzip | 846 B | 846 B | ✓ |
| Overall change | 33.5 kB | 33.7 kB |
Next Runtimes Overall increase ⚠️
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| app-page-exp...dev.js gzip | 287 kB | 288 kB | |
| app-page-exp..prod.js gzip | 158 kB | 158 kB | |
| app-page-tur...dev.js gzip | 287 kB | 288 kB | |
| app-page-tur..prod.js gzip | 158 kB | 158 kB | |
| app-page-tur...dev.js gzip | 281 kB | 282 kB | |
| app-page-tur..prod.js gzip | 153 kB | 154 kB | |
| app-page.run...dev.js gzip | 281 kB | 282 kB | |
| app-page.run..prod.js gzip | 153 kB | 154 kB | |
| app-route-ex...dev.js gzip | 69.8 kB | 69.8 kB | ✓ |
| app-route-ex..prod.js gzip | 49.1 kB | 49.1 kB | ✓ |
| app-route-tu...dev.js gzip | 69.8 kB | 69.8 kB | ✓ |
| app-route-tu..prod.js gzip | 49.1 kB | 49.1 kB | ✓ |
| app-route-tu...dev.js gzip | 69.2 kB | 69.2 kB | ✓ |
| app-route-tu..prod.js gzip | 48.8 kB | 48.8 kB | ✓ |
| app-route.ru...dev.js gzip | 69.2 kB | 69.2 kB | ✓ |
| app-route.ru..prod.js gzip | 48.7 kB | 48.7 kB | ✓ |
| dist_client_...dev.js gzip | 326 B | 326 B | ✓ |
| dist_client_...dev.js gzip | 328 B | 328 B | ✓ |
| dist_client_...dev.js gzip | 320 B | 320 B | ✓ |
| dist_client_...dev.js gzip | 318 B | 318 B | ✓ |
| pages-api-tu...dev.js gzip | 42.8 kB | 42.8 kB | ✓ |
| pages-api-tu..prod.js gzip | 32.9 kB | 32.9 kB | ✓ |
| pages-api.ru...dev.js gzip | 42.7 kB | 42.7 kB | ✓ |
| pages-api.ru..prod.js gzip | 32.9 kB | 32.9 kB | ✓ |
| pages-turbo....dev.js gzip | 52.5 kB | 52.5 kB | ✓ |
| pages-turbo...prod.js gzip | 40 kB | 40 kB | ✓ |
| pages.runtim...dev.js gzip | 52.5 kB | 52.5 kB | ✓ |
| pages.runtim..prod.js gzip | 40 kB | 40 kB | ✓ |
| server.runti..prod.js gzip | 78 kB | 78 kB | ✓ |
| Overall change | 2.65 MB | 2.65 MB |
build cache
| vercel/next.js canary | acdlite/next.js segment-cache-refresh | Change | |
|---|---|---|---|
| 0.pack gzip | 3.06 MB | 3.06 MB | N/A |
| index.pack gzip | 92.7 kB | 92.1 kB | N/A |
| Overall change | 0 B | 0 B | ✓ |
Diff details
Diff for page.js
Diff too large to display
Diff for middleware.js
Diff too large to display
Diff for edge-ssr.js
Diff too large to display
Diff for css-HASH.js
@@ -1,7 +1,14 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[9813],
{
- /***/ 5267: /***/ (
+ /***/ 1978: /***/ (module) => {
+ // extracted by mini-css-extract-plugin
+ module.exports = { helloWorld: "css_helloWorld__aUdUq" };
+
+ /***/
+ },
+
+ /***/ 6941: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -15,7 +22,7 @@
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
__webpack_require__(7765);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(6320);
+ __webpack_require__(1978);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default =
/*#__PURE__*/ __webpack_require__.n(
_css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -35,14 +42,7 @@
/***/
},
- /***/ 6320: /***/ (module) => {
- // extracted by mini-css-extract-plugin
- module.exports = { helloWorld: "css_helloWorld__aUdUq" };
-
- /***/
- },
-
- /***/ 9643: /***/ (
+ /***/ 8685: /***/ (
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -50,7 +50,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/css",
function () {
- return __webpack_require__(5267);
+ return __webpack_require__(6941);
},
]);
if (false) {
@@ -64,7 +64,7 @@
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(9643)
+ __webpack_exec__(8685)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for dynamic-HASH.js
@@ -1,17 +1,63 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[2291],
{
- /***/ 2406: /***/ (
- module,
- __unused_webpack_exports,
+ /***/ 2839: /***/ (
+ __unused_webpack_module,
+ __webpack_exports__,
__webpack_require__
) => {
- module.exports = __webpack_require__(8949);
+ "use strict";
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+ /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
+ /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
+ /* harmony export */
+ });
+ /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
+ __webpack_require__(7765);
+ /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
+ __webpack_require__(7444);
+ /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
+ /*#__PURE__*/ __webpack_require__.n(
+ next_dynamic__WEBPACK_IMPORTED_MODULE_1__
+ );
+
+ const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
+ () =>
+ __webpack_require__
+ .e(/* import() */ 1376)
+ .then(__webpack_require__.bind(__webpack_require__, 1376))
+ .then((mod) => mod.Hello),
+ {
+ loadableGenerated: {
+ webpack: () => [/*require.resolve*/ 1376],
+ },
+ }
+ );
+ const Page = () =>
+ /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment,
+ {
+ children: [
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("p", {
+ children: "testing next/dynamic size",
+ }),
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
+ DynamicHello,
+ {}
+ ),
+ ],
+ }
+ );
+ var __N_SSP = true;
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = Page;
/***/
},
- /***/ 4466: /***/ (
+ /***/ 4478: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -53,7 +99,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
const _react = /*#__PURE__*/ _interop_require_default._(
__webpack_require__(5977)
);
- const _loadablecontextsharedruntime = __webpack_require__(8452);
+ const _loadablecontextsharedruntime = __webpack_require__(5792);
function resolve(obj) {
return obj && obj.default ? obj.default : obj;
}
@@ -287,63 +333,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
/***/
},
- /***/ 4545: /***/ (
- __unused_webpack_module,
- __webpack_exports__,
- __webpack_require__
- ) => {
- "use strict";
- __webpack_require__.r(__webpack_exports__);
- /* harmony export */ __webpack_require__.d(__webpack_exports__, {
- /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
- /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
- /* harmony export */
- });
- /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
- __webpack_require__(7765);
- /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(2406);
- /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
- /*#__PURE__*/ __webpack_require__.n(
- next_dynamic__WEBPACK_IMPORTED_MODULE_1__
- );
-
- const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
- () =>
- __webpack_require__
- .e(/* import() */ 5194)
- .then(__webpack_require__.bind(__webpack_require__, 5194))
- .then((mod) => mod.Hello),
- {
- loadableGenerated: {
- webpack: () => [/*require.resolve*/ 5194],
- },
- }
- );
- const Page = () =>
- /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment,
- {
- children: [
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("p", {
- children: "testing next/dynamic size",
- }),
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
- DynamicHello,
- {}
- ),
- ],
- }
- );
- var __N_SSP = true;
- /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = Page;
-
- /***/
- },
-
- /***/ 8452: /***/ (
+ /***/ 5792: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -370,24 +360,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
/***/
},
- /***/ 8931: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/dynamic",
- function () {
- return __webpack_require__(4545);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
-
- /***/ 8949: /***/ (module, exports, __webpack_require__) => {
+ /***/ 6153: /***/ (module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -420,7 +393,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
__webpack_require__(5977)
);
const _loadablesharedruntime = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(4466)
+ __webpack_require__(4478)
);
const isServerSide = "object" === "undefined";
// Normalize loader to return the module as form { default: Component } for `React.lazy`.
@@ -519,13 +492,40 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
/***/
},
+
+ /***/ 7444: /***/ (
+ module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ module.exports = __webpack_require__(6153);
+
+ /***/
+ },
+
+ /***/ 9805: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/dynamic",
+ function () {
+ return __webpack_require__(2839);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(8931)
+ __webpack_exec__(9805)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for edge-ssr-HASH.js
@@ -1,24 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[676],
{
- /***/ 4717: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/edge-ssr",
- function () {
- return __webpack_require__(7776);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
-
- /***/ 7776: /***/ (
+ /***/ 170: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -37,13 +20,30 @@
/***/
},
+
+ /***/ 8079: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/edge-ssr",
+ function () {
+ return __webpack_require__(170);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(4717)
+ __webpack_exec__(8079)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for head-HASH.js
@@ -1,34 +1,17 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[5350],
{
- /***/ 943: /***/ (
+ /***/ 1177: /***/ (
module,
__unused_webpack_exports,
__webpack_require__
) => {
- module.exports = __webpack_require__(2554);
+ module.exports = __webpack_require__(8366);
/***/
},
- /***/ 3829: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/head",
- function () {
- return __webpack_require__(4662);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
-
- /***/ 4662: /***/ (
+ /***/ 1992: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -43,7 +26,7 @@
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
__webpack_require__(7765);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(943);
+ __webpack_require__(1177);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default =
/*#__PURE__*/ __webpack_require__.n(
next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -76,13 +59,30 @@
/***/
},
+
+ /***/ 8751: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/head",
+ function () {
+ return __webpack_require__(1992);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(3829)
+ __webpack_exec__(8751)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for hooks-HASH.js
@@ -1,7 +1,24 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[9804],
{
- /***/ 2452: /***/ (
+ /***/ 2227: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/hooks",
+ function () {
+ return __webpack_require__(2770);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
+
+ /***/ 2770: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -59,30 +76,13 @@
/***/
},
-
- /***/ 6105: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/hooks",
- function () {
- return __webpack_require__(2452);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(6105)
+ __webpack_exec__(2227)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for image-HASH.js
Diff too large to display
Diff for link-HASH.js
@@ -1,142 +1,63 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[4672],
{
- /***/ 1585: /***/ (module, exports, __webpack_require__) => {
- "use strict";
-
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "useIntersection", {
- enumerable: true,
- get: function () {
- return useIntersection;
- },
- });
- const _react = __webpack_require__(5977);
- const _requestidlecallback = __webpack_require__(356);
- const hasIntersectionObserver =
- typeof IntersectionObserver === "function";
- const observers = new Map();
- const idList = [];
- function createObserver(options) {
- const id = {
- root: options.root || null,
- margin: options.rootMargin || "",
- };
- const existing = idList.find(
- (obj) => obj.root === id.root && obj.margin === id.margin
- );
- let instance;
- if (existing) {
- instance = observers.get(existing);
- if (instance) {
- return instance;
- }
- }
- const elements = new Map();
- const observer = new IntersectionObserver((entries) => {
- entries.forEach((entry) => {
- const callback = elements.get(entry.target);
- const isVisible =
- entry.isIntersecting || entry.intersectionRatio > 0;
- if (callback && isVisible) {
- callback(isVisible);
- }
- });
- }, options);
- instance = {
- id,
- observer,
- elements,
- };
- idList.push(id);
- observers.set(id, instance);
- return instance;
- }
- function observe(element, callback, options) {
- const { id, observer, elements } = createObserver(options);
- elements.set(element, callback);
- observer.observe(element);
- return function unobserve() {
- elements.delete(element);
- observer.unobserve(element);
- // Destroy observer when there's nothing left to watch:
- if (elements.size === 0) {
- observer.disconnect();
- observers.delete(id);
- const index = idList.findIndex(
- (obj) => obj.root === id.root && obj.margin === id.margin
- );
- if (index > -1) {
- idList.splice(index, 1);
- }
- }
- };
- }
- function useIntersection({ rootRef, rootMargin, disabled }) {
- const isDisabled = disabled || !hasIntersectionObserver;
- const [visible, setVisible] = (0, _react.useState)(false);
- const elementRef = (0, _react.useRef)(null);
- const setElement = (0, _react.useCallback)((element) => {
- elementRef.current = element;
- }, []);
- (0, _react.useEffect)(() => {
- if (hasIntersectionObserver) {
- if (isDisabled || visible) return;
- const element = elementRef.current;
- if (element && element.tagName) {
- const unobserve = observe(
- element,
- (isVisible) => isVisible && setVisible(isVisible),
- {
- root: rootRef?.current,
- rootMargin,
- }
- );
- return unobserve;
- }
- } else {
- if (!visible) {
- const idleCallback = (0,
- _requestidlecallback.requestIdleCallback)(() => setVisible(true));
- return () =>
- (0, _requestidlecallback.cancelIdleCallback)(idleCallback);
- }
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [isDisabled, rootMargin, rootRef, visible, elementRef.current]);
- const resetVisible = (0, _react.useCallback)(() => {
- setVisible(false);
- }, []);
- return [setElement, visible, resetVisible];
- }
- if (
- (typeof exports.default === "function" ||
- (typeof exports.default === "object" && exports.default !== null)) &&
- typeof exports.default.__esModule === "undefined"
- ) {
- Object.defineProperty(exports.default, "__esModule", {
- value: true,
- });
- Object.assign(exports.default, exports);
- module.exports = exports.default;
- } //# sourceMappingURL=use-intersection.js.map
+ /***/ 2783: /***/ (
+ module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ module.exports = __webpack_require__(5926);
/***/
},
- /***/ 2621: /***/ (
- module,
- __unused_webpack_exports,
+ /***/ 4174: /***/ (
+ __unused_webpack_module,
+ __webpack_exports__,
__webpack_require__
) => {
- module.exports = __webpack_require__(5410);
+ "use strict";
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+ /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
+ /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
+ /* harmony export */
+ });
+ /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
+ __webpack_require__(7765);
+ /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
+ __webpack_require__(2783);
+ /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
+ /*#__PURE__*/ __webpack_require__.n(
+ next_link__WEBPACK_IMPORTED_MODULE_1__
+ );
+
+ function aLink(props) {
+ return /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", {
+ children: [
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("h3", {
+ children: "A Link page!",
+ }),
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
+ next_link__WEBPACK_IMPORTED_MODULE_1___default(),
+ {
+ href: "/",
+ children: "Go to /",
+ }
+ ),
+ ],
+ });
+ }
+ var __N_SSP = true;
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = aLink;
/***/
},
- /***/ 5410: /***/ (module, exports, __webpack_require__) => {
+ /***/ 5926: /***/ (module, exports, __webpack_require__) => {
"use strict";
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
@@ -163,16 +84,16 @@
const _react = /*#__PURE__*/ _interop_require_wildcard._(
__webpack_require__(5977)
);
- const _resolvehref = __webpack_require__(224);
- const _islocalurl = __webpack_require__(7746);
- const _formaturl = __webpack_require__(315);
- const _utils = __webpack_require__(8709);
- const _addlocale = __webpack_require__(6358);
- const _routercontextsharedruntime = __webpack_require__(4095);
- const _useintersection = __webpack_require__(1585);
- const _getdomainlocale = __webpack_require__(8802);
- const _addbasepath = __webpack_require__(6151);
- const _usemergedref = __webpack_require__(9100);
+ const _resolvehref = __webpack_require__(6708);
+ const _islocalurl = __webpack_require__(6526);
+ const _formaturl = __webpack_require__(5575);
+ const _utils = __webpack_require__(3497);
+ const _addlocale = __webpack_require__(722);
+ const _routercontextsharedruntime = __webpack_require__(1235);
+ const _useintersection = __webpack_require__(8069);
+ const _getdomainlocale = __webpack_require__(9734);
+ const _addbasepath = __webpack_require__(4419);
+ const _usemergedref = __webpack_require__(6136);
const prefetched = new Set();
function prefetch(router, href, as, options) {
if (false) {
@@ -486,43 +407,7 @@
/***/
},
- /***/ 8802: /***/ (module, exports, __webpack_require__) => {
- "use strict";
-
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "getDomainLocale", {
- enumerable: true,
- get: function () {
- return getDomainLocale;
- },
- });
- const _normalizetrailingslash = __webpack_require__(1652);
- const basePath =
- /* unused pure expression or super */ null && (false || "");
- function getDomainLocale(path, locale, locales, domainLocales) {
- if (false) {
- } else {
- return false;
- }
- }
- if (
- (typeof exports.default === "function" ||
- (typeof exports.default === "object" && exports.default !== null)) &&
- typeof exports.default.__esModule === "undefined"
- ) {
- Object.defineProperty(exports.default, "__esModule", {
- value: true,
- });
- Object.assign(exports.default, exports);
- module.exports = exports.default;
- } //# sourceMappingURL=get-domain-locale.js.map
-
- /***/
- },
-
- /***/ 9100: /***/ (module, exports, __webpack_require__) => {
+ /***/ 6136: /***/ (module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -600,7 +485,7 @@
/***/
},
- /***/ 9693: /***/ (
+ /***/ 7047: /***/ (
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -608,7 +493,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/link",
function () {
- return __webpack_require__(9948);
+ return __webpack_require__(4174);
},
]);
if (false) {
@@ -617,48 +502,163 @@
/***/
},
- /***/ 9948: /***/ (
- __unused_webpack_module,
- __webpack_exports__,
- __webpack_require__
- ) => {
+ /***/ 8069: /***/ (module, exports, __webpack_require__) => {
"use strict";
- __webpack_require__.r(__webpack_exports__);
- /* harmony export */ __webpack_require__.d(__webpack_exports__, {
- /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
- /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
- /* harmony export */
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
});
- /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
- __webpack_require__(7765);
- /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(2621);
- /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
- /*#__PURE__*/ __webpack_require__.n(
- next_link__WEBPACK_IMPORTED_MODULE_1__
+ Object.defineProperty(exports, "useIntersection", {
+ enumerable: true,
+ get: function () {
+ return useIntersection;
+ },
+ });
+ const _react = __webpack_require__(5977);
+ const _requestidlecallback = __webpack_require__(3432);
+ const hasIntersectionObserver =
+ typeof IntersectionObserver === "function";
+ const observers = new Map();
+ const idList = [];
+ function createObserver(options) {
+ const id = {
+ root: options.root || null,
+ margin: options.rootMargin || "",
+ };
+ const existing = idList.find(
+ (obj) => obj.root === id.root && obj.margin === id.margin
);
-
- function aLink(props) {
- return /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", {
- children: [
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("h3", {
- children: "A Link page!",
- }),
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
- next_link__WEBPACK_IMPORTED_MODULE_1___default(),
- {
- href: "/",
- children: "Go to /",
- }
- ),
- ],
+ let instance;
+ if (existing) {
+ instance = observers.get(existing);
+ if (instance) {
+ return instance;
+ }
+ }
+ const elements = new Map();
+ const observer = new IntersectionObserver((entries) => {
+ entries.forEach((entry) => {
+ const callback = elements.get(entry.target);
+ const isVisible =
+ entry.isIntersecting || entry.intersectionRatio > 0;
+ if (callback && isVisible) {
+ callback(isVisible);
+ }
+ });
+ }, options);
+ instance = {
+ id,
+ observer,
+ elements,
+ };
+ idList.push(id);
+ observers.set(id, instance);
+ return instance;
+ }
+ function observe(element, callback, options) {
+ const { id, observer, elements } = createObserver(options);
+ elements.set(element, callback);
+ observer.observe(element);
+ return function unobserve() {
+ elements.delete(element);
+ observer.unobserve(element);
+ // Destroy observer when there's nothing left to watch:
+ if (elements.size === 0) {
+ observer.disconnect();
+ observers.delete(id);
+ const index = idList.findIndex(
+ (obj) => obj.root === id.root && obj.margin === id.margin
+ );
+ if (index > -1) {
+ idList.splice(index, 1);
+ }
+ }
+ };
+ }
+ function useIntersection({ rootRef, rootMargin, disabled }) {
+ const isDisabled = disabled || !hasIntersectionObserver;
+ const [visible, setVisible] = (0, _react.useState)(false);
+ const elementRef = (0, _react.useRef)(null);
+ const setElement = (0, _react.useCallback)((element) => {
+ elementRef.current = element;
+ }, []);
+ (0, _react.useEffect)(() => {
+ if (hasIntersectionObserver) {
+ if (isDisabled || visible) return;
+ const element = elementRef.current;
+ if (element && element.tagName) {
+ const unobserve = observe(
+ element,
+ (isVisible) => isVisible && setVisible(isVisible),
+ {
+ root: rootRef?.current,
+ rootMargin,
+ }
+ );
+ return unobserve;
+ }
+ } else {
+ if (!visible) {
+ const idleCallback = (0,
+ _requestidlecallback.requestIdleCallback)(() => setVisible(true));
+ return () =>
+ (0, _requestidlecallback.cancelIdleCallback)(idleCallback);
+ }
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [isDisabled, rootMargin, rootRef, visible, elementRef.current]);
+ const resetVisible = (0, _react.useCallback)(() => {
+ setVisible(false);
+ }, []);
+ return [setElement, visible, resetVisible];
+ }
+ if (
+ (typeof exports.default === "function" ||
+ (typeof exports.default === "object" && exports.default !== null)) &&
+ typeof exports.default.__esModule === "undefined"
+ ) {
+ Object.defineProperty(exports.default, "__esModule", {
+ value: true,
});
+ Object.assign(exports.default, exports);
+ module.exports = exports.default;
+ } //# sourceMappingURL=use-intersection.js.map
+
+ /***/
+ },
+
+ /***/ 9734: /***/ (module, exports, __webpack_require__) => {
+ "use strict";
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "getDomainLocale", {
+ enumerable: true,
+ get: function () {
+ return getDomainLocale;
+ },
+ });
+ const _normalizetrailingslash = __webpack_require__(504);
+ const basePath =
+ /* unused pure expression or super */ null && (false || "");
+ function getDomainLocale(path, locale, locales, domainLocales) {
+ if (false) {
+ } else {
+ return false;
+ }
}
- var __N_SSP = true;
- /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = aLink;
+ if (
+ (typeof exports.default === "function" ||
+ (typeof exports.default === "object" && exports.default !== null)) &&
+ typeof exports.default.__esModule === "undefined"
+ ) {
+ Object.defineProperty(exports.default, "__esModule", {
+ value: true,
+ });
+ Object.assign(exports.default, exports);
+ module.exports = exports.default;
+ } //# sourceMappingURL=get-domain-locale.js.map
/***/
},
@@ -668,7 +668,7 @@
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(9693)
+ __webpack_exec__(7047)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for script-HASH.js
@@ -1,7 +1,34 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[1209],
{
- /***/ 3699: /***/ (
+ /***/ 1008: /***/ (
+ module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ module.exports = __webpack_require__(2817);
+
+ /***/
+ },
+
+ /***/ 6951: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/script",
+ function () {
+ return __webpack_require__(8889);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
+
+ /***/ 8889: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -16,7 +43,7 @@
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
__webpack_require__(7765);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(4802);
+ __webpack_require__(1008);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default =
/*#__PURE__*/ __webpack_require__.n(
next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -48,40 +75,13 @@
/***/
},
-
- /***/ 4802: /***/ (
- module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- module.exports = __webpack_require__(8661);
-
- /***/
- },
-
- /***/ 7861: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/script",
- function () {
- return __webpack_require__(3699);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(7861)
+ __webpack_exec__(6951)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for 8863-HASH.js
@@ -1,8 +1,8 @@
"use strict";
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
- [8863],
+ [7009],
{
- /***/ 22: /***/ (module, exports, __webpack_require__) => {
+ /***/ 1912: /***/ (module, exports, __webpack_require__) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -12,7 +12,7 @@
return useMergedRef;
},
});
- const _react = __webpack_require__(2786);
+ const _react = __webpack_require__(2224);
function useMergedRef(refA, refB) {
const cleanupA = (0, _react.useRef)(null);
const cleanupB = (0, _react.useRef)(null);
@@ -78,7 +78,65 @@
/***/
},
- /***/ 639: /***/ (__unused_webpack_module, exports) => {
+ /***/ 2843: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "RouterContext", {
+ enumerable: true,
+ get: function () {
+ return RouterContext;
+ },
+ });
+ const _interop_require_default = __webpack_require__(2726);
+ const _react = /*#__PURE__*/ _interop_require_default._(
+ __webpack_require__(2224)
+ );
+ const RouterContext = _react.default.createContext(null);
+ if (false) {
+ } //# sourceMappingURL=router-context.shared-runtime.js.map
+
+ /***/
+ },
+
+ /***/ 3003: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "default", {
+ enumerable: true,
+ get: function () {
+ return _default;
+ },
+ });
+ const _findclosestquality = __webpack_require__(5045);
+ function defaultLoader({ config, src, width, quality }) {
+ if (false) {
+ }
+ const q = (0, _findclosestquality.findClosestQuality)(quality, config);
+ return `${config.path}?url=${encodeURIComponent(
+ src
+ )}&w=${width}&q=${q}${
+ src.startsWith("/_next/static/media/") && false ? 0 : ""
+ }`;
+ }
+ // We use this to determine if the import is the default loader
+ // or a custom loader defined by the user in next.config.js
+ defaultLoader.__next_img_default = true;
+ const _default = defaultLoader; //# sourceMappingURL=image-loader.js.map
+
+ /***/
+ },
+
+ /***/ 5045: /***/ (__unused_webpack_module, exports) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -102,56 +160,7 @@
/***/
},
- /***/ 936: /***/ (__unused_webpack_module, exports) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- 0 && 0;
- function _export(target, all) {
- for (var name in all)
- Object.defineProperty(target, name, {
- enumerable: true,
- get: all[name],
- });
- }
- _export(exports, {
- VALID_LOADERS: function () {
- return VALID_LOADERS;
- },
- imageConfigDefault: function () {
- return imageConfigDefault;
- },
- });
- const VALID_LOADERS = [
- "default",
- "imgix",
- "cloudinary",
- "akamai",
- "custom",
- ];
- const imageConfigDefault = {
- deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
- imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
- path: "/_next/image",
- loader: "default",
- loaderFile: "",
- domains: [],
- disableStaticImages: false,
- minimumCacheTTL: 14400,
- formats: ["image/webp"],
- dangerouslyAllowSVG: false,
- contentSecurityPolicy: `script-src 'none'; frame-src 'none'; sandbox;`,
- contentDispositionType: "attachment",
- localPatterns: undefined,
- remotePatterns: [],
- qualities: [75],
- unoptimized: false,
- }; //# sourceMappingURL=image-config.js.map
-
- /***/
- },
-
- /***/ 1268: /***/ (__unused_webpack_module, exports) => {
+ /***/ 5218: /***/ (__unused_webpack_module, exports) => {
/**
* A shared function, used on both client and server, to generate a SVG blur placeholder.
*/
@@ -190,7 +199,7 @@
/***/
},
- /***/ 1796: /***/ (module, exports, __webpack_require__) => {
+ /***/ 5402: /***/ (module, exports, __webpack_require__) => {
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
value: true,
@@ -211,17 +220,17 @@
return defaultHead;
},
});
- const _interop_require_default = __webpack_require__(8182);
- const _interop_require_wildcard = __webpack_require__(8319);
- const _jsxruntime = __webpack_require__(1050);
+ const _interop_require_default = __webpack_require__(2726);
+ const _interop_require_wildcard = __webpack_require__(2527);
+ const _jsxruntime = __webpack_require__(8204);
const _react = /*#__PURE__*/ _interop_require_wildcard._(
- __webpack_require__(2786)
+ __webpack_require__(2224)
);
const _sideeffect = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(5581)
+ __webpack_require__(9319)
);
- const _headmanagercontextsharedruntime = __webpack_require__(4950);
- const _warnonce = __webpack_require__(2854);
+ const _headmanagercontextsharedruntime = __webpack_require__(3100);
+ const _warnonce = __webpack_require__(4504);
function defaultHead() {
const head = [
/*#__PURE__*/ (0, _jsxruntime.jsx)(
@@ -375,7 +384,7 @@
/***/
},
- /***/ 2843: /***/ (
+ /***/ 6745: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -389,9 +398,9 @@
return getImgProps;
},
});
- const _warnonce = __webpack_require__(2854);
- const _imageblursvg = __webpack_require__(1268);
- const _imageconfig = __webpack_require__(936);
+ const _warnonce = __webpack_require__(4504);
+ const _imageblursvg = __webpack_require__(5218);
+ const _imageconfig = __webpack_require__(9278);
const VALID_LOADING_VALUES =
/* unused pure expression or super */ null && [
"lazy",
@@ -822,166 +831,7 @@
/***/
},
- /***/ 5581: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "default", {
- enumerable: true,
- get: function () {
- return SideEffect;
- },
- });
- const _react = __webpack_require__(2786);
- const isServer = "object" === "undefined";
- const useClientOnlyLayoutEffect = isServer
- ? () => {}
- : _react.useLayoutEffect;
- const useClientOnlyEffect = isServer ? () => {} : _react.useEffect;
- function SideEffect(props) {
- const { headManager, reduceComponentsToState } = props;
- function emitChange() {
- if (headManager && headManager.mountedInstances) {
- const headElements = _react.Children.toArray(
- Array.from(headManager.mountedInstances).filter(Boolean)
- );
- headManager.updateHead(reduceComponentsToState(headElements));
- }
- }
- if (isServer) {
- headManager?.mountedInstances?.add(props.children);
- emitChange();
- }
- useClientOnlyLayoutEffect(() => {
- headManager?.mountedInstances?.add(props.children);
- return () => {
- headManager?.mountedInstances?.delete(props.children);
- };
- });
- // We need to call `updateHead` method whenever the `SideEffect` is trigger in all
- // life-cycles: mount, update, unmount. However, if there are multiple `SideEffect`s
- // being rendered, we only trigger the method from the last one.
- // This is ensured by keeping the last unflushed `updateHead` in the `_pendingUpdate`
- // singleton in the layout effect pass, and actually trigger it in the effect pass.
- useClientOnlyLayoutEffect(() => {
- if (headManager) {
- headManager._pendingUpdate = emitChange;
- }
- return () => {
- if (headManager) {
- headManager._pendingUpdate = emitChange;
- }
- };
- });
- useClientOnlyEffect(() => {
- if (headManager && headManager._pendingUpdate) {
- headManager._pendingUpdate();
- headManager._pendingUpdate = null;
- }
- return () => {
- if (headManager && headManager._pendingUpdate) {
- headManager._pendingUpdate();
- headManager._pendingUpdate = null;
- }
- };
- });
- return null;
- } //# sourceMappingURL=side-effect.js.map
-
- /***/
- },
-
- /***/ 7053: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "RouterContext", {
- enumerable: true,
- get: function () {
- return RouterContext;
- },
- });
- const _interop_require_default = __webpack_require__(8182);
- const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(2786)
- );
- const RouterContext = _react.default.createContext(null);
- if (false) {
- } //# sourceMappingURL=router-context.shared-runtime.js.map
-
- /***/
- },
-
- /***/ 7281: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "default", {
- enumerable: true,
- get: function () {
- return _default;
- },
- });
- const _findclosestquality = __webpack_require__(639);
- function defaultLoader({ config, src, width, quality }) {
- if (false) {
- }
- const q = (0, _findclosestquality.findClosestQuality)(quality, config);
- return `${config.path}?url=${encodeURIComponent(
- src
- )}&w=${width}&q=${q}${
- src.startsWith("/_next/static/media/") && false ? 0 : ""
- }`;
- }
- // We use this to determine if the import is the default loader
- // or a custom loader defined by the user in next.config.js
- defaultLoader.__next_img_default = true;
- const _default = defaultLoader; //# sourceMappingURL=image-loader.js.map
-
- /***/
- },
-
- /***/ 7480: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "ImageConfigContext", {
- enumerable: true,
- get: function () {
- return ImageConfigContext;
- },
- });
- const _interop_require_default = __webpack_require__(8182);
- const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(2786)
- );
- const _imageconfig = __webpack_require__(936);
- const ImageConfigContext = _react.default.createContext(
- _imageconfig.imageConfigDefault
- );
- if (false) {
- } //# sourceMappingURL=image-config-context.shared-runtime.js.map
-
- /***/
- },
-
- /***/ 8863: /***/ (module, exports, __webpack_require__) => {
+ /***/ 7009: /***/ (module, exports, __webpack_require__) => {
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
value: true,
@@ -992,27 +842,27 @@
return Image;
},
});
- const _interop_require_default = __webpack_require__(8182);
- const _interop_require_wildcard = __webpack_require__(8319);
- const _jsxruntime = __webpack_require__(1050);
+ const _interop_require_default = __webpack_require__(2726);
+ const _interop_require_wildcard = __webpack_require__(2527);
+ const _jsxruntime = __webpack_require__(8204);
const _react = /*#__PURE__*/ _interop_require_wildcard._(
- __webpack_require__(2786)
+ __webpack_require__(2224)
);
const _reactdom = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(1407)
+ __webpack_require__(1345)
);
const _head = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(1796)
+ __webpack_require__(5402)
);
- const _getimgprops = __webpack_require__(2843);
- const _imageconfig = __webpack_require__(936);
- const _imageconfigcontextsharedruntime = __webpack_require__(7480);
- const _warnonce = __webpack_require__(2854);
- const _routercontextsharedruntime = __webpack_require__(7053);
+ const _getimgprops = __webpack_require__(6745);
+ const _imageconfig = __webpack_require__(9278);
+ const _imageconfigcontextsharedruntime = __webpack_require__(9690);
+ const _warnonce = __webpack_require__(4504);
+ const _routercontextsharedruntime = __webpack_require__(2843);
const _imageloader = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(7281)
+ __webpack_require__(3003)
);
- const _usemergedref = __webpack_require__(22);
+ const _usemergedref = __webpack_require__(1912);
// This is replaced by webpack define plugin
const configEnv = {
deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -1333,5 +1183,155 @@
/***/
},
+
+ /***/ 9278: /***/ (__unused_webpack_module, exports) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ 0 && 0;
+ function _export(target, all) {
+ for (var name in all)
+ Object.defineProperty(target, name, {
+ enumerable: true,
+ get: all[name],
+ });
+ }
+ _export(exports, {
+ VALID_LOADERS: function () {
+ return VALID_LOADERS;
+ },
+ imageConfigDefault: function () {
+ return imageConfigDefault;
+ },
+ });
+ const VALID_LOADERS = [
+ "default",
+ "imgix",
+ "cloudinary",
+ "akamai",
+ "custom",
+ ];
+ const imageConfigDefault = {
+ deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+ imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
+ path: "/_next/image",
+ loader: "default",
+ loaderFile: "",
+ domains: [],
+ disableStaticImages: false,
+ minimumCacheTTL: 14400,
+ formats: ["image/webp"],
+ dangerouslyAllowSVG: false,
+ contentSecurityPolicy: `script-src 'none'; frame-src 'none'; sandbox;`,
+ contentDispositionType: "attachment",
+ localPatterns: undefined,
+ remotePatterns: [],
+ qualities: [75],
+ unoptimized: false,
+ }; //# sourceMappingURL=image-config.js.map
+
+ /***/
+ },
+
+ /***/ 9319: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "default", {
+ enumerable: true,
+ get: function () {
+ return SideEffect;
+ },
+ });
+ const _react = __webpack_require__(2224);
+ const isServer = "object" === "undefined";
+ const useClientOnlyLayoutEffect = isServer
+ ? () => {}
+ : _react.useLayoutEffect;
+ const useClientOnlyEffect = isServer ? () => {} : _react.useEffect;
+ function SideEffect(props) {
+ const { headManager, reduceComponentsToState } = props;
+ function emitChange() {
+ if (headManager && headManager.mountedInstances) {
+ const headElements = _react.Children.toArray(
+ Array.from(headManager.mountedInstances).filter(Boolean)
+ );
+ headManager.updateHead(reduceComponentsToState(headElements));
+ }
+ }
+ if (isServer) {
+ headManager?.mountedInstances?.add(props.children);
+ emitChange();
+ }
+ useClientOnlyLayoutEffect(() => {
+ headManager?.mountedInstances?.add(props.children);
+ return () => {
+ headManager?.mountedInstances?.delete(props.children);
+ };
+ });
+ // We need to call `updateHead` method whenever the `SideEffect` is trigger in all
+ // life-cycles: mount, update, unmount. However, if there are multiple `SideEffect`s
+ // being rendered, we only trigger the method from the last one.
+ // This is ensured by keeping the last unflushed `updateHead` in the `_pendingUpdate`
+ // singleton in the layout effect pass, and actually trigger it in the effect pass.
+ useClientOnlyLayoutEffect(() => {
+ if (headManager) {
+ headManager._pendingUpdate = emitChange;
+ }
+ return () => {
+ if (headManager) {
+ headManager._pendingUpdate = emitChange;
+ }
+ };
+ });
+ useClientOnlyEffect(() => {
+ if (headManager && headManager._pendingUpdate) {
+ headManager._pendingUpdate();
+ headManager._pendingUpdate = null;
+ }
+ return () => {
+ if (headManager && headManager._pendingUpdate) {
+ headManager._pendingUpdate();
+ headManager._pendingUpdate = null;
+ }
+ };
+ });
+ return null;
+ } //# sourceMappingURL=side-effect.js.map
+
+ /***/
+ },
+
+ /***/ 9690: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "ImageConfigContext", {
+ enumerable: true,
+ get: function () {
+ return ImageConfigContext;
+ },
+ });
+ const _interop_require_default = __webpack_require__(2726);
+ const _react = /*#__PURE__*/ _interop_require_default._(
+ __webpack_require__(2224)
+ );
+ const _imageconfig = __webpack_require__(9278);
+ const ImageConfigContext = _react.default.createContext(
+ _imageconfig.imageConfigDefault
+ );
+ if (false) {
+ } //# sourceMappingURL=image-config-context.shared-runtime.js.map
+
+ /***/
+ },
},
]);Diff for 9304-HASH.js
Diff too large to display
Diff for main-HASH.js
Diff too large to display
Diff for app-page-exp..ntime.dev.js
failed to diffDiff for app-page-exp..time.prod.js
failed to diffDiff for app-page-tur..ntime.dev.js
failed to diffDiff for app-page-tur..time.prod.js
failed to diffDiff for app-page-tur..ntime.dev.js
failed to diffDiff for app-page-tur..time.prod.js
Diff too large to display
Diff for app-page.runtime.dev.js
failed to diffDiff for app-page.runtime.prod.js
Diff too large to display
This re-implements the refresh reducer to use the Segment Cache-style flow, similar to how the navigate reducer already works. Most of the logic can be reused from what was already implemented for navigations. The bulk of the changes are related to the case where a "default" parallel route slot is not present on the current page, and so needs to be refreshed from an older page's URL. Theoretically, this should be the last remaining case where we rely on the lazy fetching logic in LayoutRouter. I think there may still be some error cases where we still rely on that, though. Once these are all addressed, we can remove the lazy-fetching mechanism entirely.
acdlite
force-pushed
the
segment-cache-refresh
branch
from
79c86d8 to
3b3deb8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This re-implements the refresh reducer to use the Segment Cache-style flow, similar to how the navigate reducer already works.
Most of the logic can be reused from what was already implemented for navigations. The bulk of the changes are related to the case where a "default" parallel route slot is not present on the current page, and so needs to be refreshed from an older page's URL.
Theoretically, this should be the last remaining case where we rely on the lazy fetching logic in LayoutRouter. I think there may still be some error cases where we still rely on that, though. Once these are all addressed, we can remove the lazy-fetching mechanism entirely.