Add scroll restoration handling after render is complete #13914
Merged
Conversation
This file contains 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
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 11.5s | 11.6s | |
| nodeModulesSize | 66 MB | 66 MB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 1.88 | 1.978 | |
| / avg req/sec | 1329.65 | 1263.85 | -65.8 |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.195 | 1.109 | -0.09 |
| /error-in-render avg req/sec | 2091.73 | 2254.87 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | 10.8 kB | |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | 7.2 kB | |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| index.html gzip | 901 B | 901 B | ✓ |
| link.html gzip | 906 B | 906 B | ✓ |
| withRouter.html gzip | 894 B | 895 B | |
| Overall change | 2.7 kB | 2.7 kB |
Diffs
Diff for de003c3a9d30..492ddeda7.js
@@ -707,10 +707,50 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _slicedToArray = __webpack_require__("J4zp");
+ var _defineProperty = __webpack_require__("lSNA");
+
var _classCallCheck = __webpack_require__("lwsE");
var _createClass = __webpack_require__("W8MJ");
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -1204,6 +1244,23 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+ var _history$state = history.state,
+ curUrl = _history$state.url,
+ curAs = _history$state.as,
+ curOptions = _history$state.options;
+
+ _this2.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ scrollY: window.scrollY
+ }
+ )
+ );
_this2.changeState(method, url, as, options);
@@ -1220,6 +1277,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (options.scrollY) {
+ window.scrollTo(0, options.scrollY);
+ }
+
return resolve(true);
});
}, reject);
@@ -2005,6 +2067,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ ls82: /***/ function(module, exports, __webpack_require__) {
/**
* Copyright (c) 2014-present, Facebook, Inc.Diff for de003c3a9d30..36.module.js
@@ -583,6 +583,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/ elyg: /***/ function(module, exports, __webpack_require__) {
"use strict";
+ var _defineProperty = __webpack_require__("lSNA");
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -1036,6 +1076,23 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+ var {
+ url: curUrl,
+ as: curAs,
+ options: curOptions
+ } = history.state;
+ this.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ scrollY: window.scrollY
+ }
+ )
+ );
this.changeState(method, url, as, options);
if (false) {
@@ -1049,6 +1106,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (options.scrollY) {
+ window.scrollTo(0, options.scrollY);
+ }
+
return resolve(true);
});
},
@@ -1647,6 +1709,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ nOHt: /***/ function(module, exports, __webpack_require__) {
"use strict";Diff for index.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c8db6e7351695637e7ad.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c31f3e0b9847c99f2340.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c8db6e7351695637e7ad.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c8db6e7351695637e7ad.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -110,13 +110,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c31f3e0b9847c99f2340.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c8db6e7351695637e7ad.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c8db6e7351695637e7ad.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c31f3e0b9847c99f2340.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c8db6e7351695637e7ad.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 12.5s | 12.7s | |
| nodeModulesSize | 66 MB | 66 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | N/A | N/A |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..3fb8.js gzip | N/A | 10.8 kB | N/A |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..dule.js gzip | N/A | 7.2 kB | N/A |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _error.js | 874 kB | 874 kB | ✓ |
| 404.html | 4.13 kB | 4.13 kB | ✓ |
| hooks.html | 3.71 kB | 3.71 kB | ✓ |
| index.js | 875 kB | 875 kB | ✓ |
| link.js | 913 kB | 914 kB | |
| routerDirect.js | 905 kB | 907 kB | |
| withRouter.js | 905 kB | 907 kB | |
| Overall change | 4.48 MB | 4.48 MB |
Timer
requested changes
Jun 8, 2020
Timer
reviewed
Jun 8, 2020
Timer
reviewed
Jun 8, 2020
Timer
reviewed
Jun 8, 2020
This comment has been minimized.
This comment has been minimized.
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 12.3s | 12.4s | |
| nodeModulesSize | 66 MB | 66 MB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.191 | 2.137 | -0.05 |
| / avg req/sec | 1141.09 | 1169.83 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.404 | 1.35 | -0.05 |
| /error-in-render avg req/sec | 1780.84 | 1851.64 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | 10.9 kB | |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | 7.26 kB | |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| index.html gzip | 901 B | 901 B | ✓ |
| link.html gzip | 906 B | 907 B | |
| withRouter.html gzip | 894 B | 894 B | ✓ |
| Overall change | 2.7 kB | 2.7 kB |
Diffs
Diff for de003c3a9d30..492ddeda7.js
@@ -707,10 +707,50 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _slicedToArray = __webpack_require__("J4zp");
+ var _defineProperty = __webpack_require__("lSNA");
+
var _classCallCheck = __webpack_require__("lwsE");
var _createClass = __webpack_require__("W8MJ");
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -770,6 +810,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -989,7 +1032,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1205,6 +1253,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
Router.events.emit("beforeHistoryChange", as);
+ if (manualScrollRestoration && history.state) {
+ var _history$state = history.state,
+ curUrl = _history$state.url,
+ curAs = _history$state.as,
+ curOptions = _history$state.options;
+
+ _this2.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
_this2.changeState(method, url, as, options);
if (false) {
@@ -1220,6 +1289,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
}, reject);
@@ -2005,6 +2079,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ ls82: /***/ function(module, exports, __webpack_require__) {
/**
* Copyright (c) 2014-present, Facebook, Inc.Diff for de003c3a9d30..36.module.js
@@ -583,6 +583,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/ elyg: /***/ function(module, exports, __webpack_require__) {
"use strict";
+ var _defineProperty = __webpack_require__("lSNA");
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -641,6 +681,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -851,7 +894,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1036,6 +1084,28 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+
+ if (manualScrollRestoration && history.state) {
+ var {
+ url: curUrl,
+ as: curAs,
+ options: curOptions
+ } = history.state;
+ this.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
this.changeState(method, url, as, options);
if (false) {
@@ -1049,6 +1119,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
},
@@ -1647,6 +1722,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ nOHt: /***/ function(module, exports, __webpack_require__) {
"use strict";Diff for index.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -110,13 +110,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 12.9s | 12.7s | -185ms |
| nodeModulesSize | 66 MB | 66 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | N/A | N/A |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..4b11.js gzip | N/A | 10.9 kB | N/A |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..dule.js gzip | N/A | 7.26 kB | N/A |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _error.js | 874 kB | 874 kB | ✓ |
| 404.html | 4.13 kB | 4.13 kB | ✓ |
| hooks.html | 3.71 kB | 3.71 kB | ✓ |
| index.js | 875 kB | 875 kB | ✓ |
| link.js | 913 kB | 914 kB | |
| routerDirect.js | 905 kB | 907 kB | |
| withRouter.js | 905 kB | 907 kB | |
| Overall change | 4.48 MB | 4.49 MB |
This comment has been minimized.
This comment has been minimized.
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 13s | 12.7s | -326ms |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.194 | 2.179 | -0.02 |
| / avg req/sec | 1139.48 | 1147.29 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.448 | 1.355 | -0.09 |
| /error-in-render avg req/sec | 1726.06 | 1845.22 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | 10.9 kB | |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 56.9 kB | 57.3 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | 7.28 kB | |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 52.4 kB | 52.8 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| index.html gzip | 901 B | 901 B | ✓ |
| link.html gzip | 906 B | 906 B | ✓ |
| withRouter.html gzip | 894 B | 895 B | |
| Overall change | 2.7 kB | 2.7 kB |
Diffs
Diff for de003c3a9d30..492ddeda7.js
@@ -707,10 +707,50 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _slicedToArray = __webpack_require__("J4zp");
+ var _defineProperty = __webpack_require__("lSNA");
+
var _classCallCheck = __webpack_require__("lwsE");
var _createClass = __webpack_require__("W8MJ");
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -770,6 +810,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -989,7 +1032,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1205,6 +1253,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
Router.events.emit("beforeHistoryChange", as);
+ if (manualScrollRestoration && history.state) {
+ var _history$state = history.state,
+ curUrl = _history$state.url,
+ curAs = _history$state.as,
+ curOptions = _history$state.options;
+
+ _this2.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
_this2.changeState(method, url, as, options);
if (false) {
@@ -1220,6 +1289,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ requestAnimationFrame(function() {
+ window.scrollTo(options._N_X, options._N_Y);
+ });
+ }
+
return resolve(true);
});
}, reject);
@@ -2005,6 +2081,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ ls82: /***/ function(module, exports, __webpack_require__) {
/**
* Copyright (c) 2014-present, Facebook, Inc.Diff for de003c3a9d30..36.module.js
@@ -583,6 +583,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/ elyg: /***/ function(module, exports, __webpack_require__) {
"use strict";
+ var _defineProperty = __webpack_require__("lSNA");
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -641,6 +681,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -851,7 +894,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1036,6 +1084,28 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+
+ if (manualScrollRestoration && history.state) {
+ var {
+ url: curUrl,
+ as: curAs,
+ options: curOptions
+ } = history.state;
+ this.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
this.changeState(method, url, as, options);
if (false) {
@@ -1049,6 +1119,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ requestAnimationFrame(() => {
+ window.scrollTo(options._N_X, options._N_Y);
+ });
+ }
+
return resolve(true);
});
},
@@ -1647,6 +1724,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ nOHt: /***/ function(module, exports, __webpack_require__) {
"use strict";Diff for index.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.5eb473ef2cfbfc2f2003.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.84c6e2281231b4a6fe2e.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.5eb473ef2cfbfc2f2003.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.5eb473ef2cfbfc2f2003.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -110,13 +110,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.84c6e2281231b4a6fe2e.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.5eb473ef2cfbfc2f2003.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.5eb473ef2cfbfc2f2003.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.84c6e2281231b4a6fe2e.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.5eb473ef2cfbfc2f2003.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 13.9s | 13.7s | -271ms |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | N/A | N/A |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..43e8.js gzip | N/A | 10.9 kB | N/A |
| Overall change | 56.9 kB | 57.3 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..dule.js gzip | N/A | 7.28 kB | N/A |
| Overall change | 52.4 kB | 52.8 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _error.js | 874 kB | 874 kB | ✓ |
| 404.html | 4.13 kB | 4.13 kB | ✓ |
| hooks.html | 3.71 kB | 3.71 kB | ✓ |
| index.js | 875 kB | 875 kB | ✓ |
| link.js | 913 kB | 915 kB | |
| routerDirect.js | 905 kB | 907 kB | |
| withRouter.js | 905 kB | 907 kB | |
| Overall change | 4.48 MB | 4.49 MB |
Failing test suitestest/integration/scroll-restoration/test/index.test.js
Expand output● Scroll Restoration Support › dev mode › should restore the scroll position on navigating back ● Scroll Restoration Support › server mode › should restore the scroll position on navigating back ● Scroll Restoration Support › serverless mode › should restore the scroll position on navigating back |
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 12.8s | 12.7s | -134ms |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Page Load Tests Overall decrease ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.153 | 2.149 | 0 |
| / avg req/sec | 1160.92 | 1163.26 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.426 | 1.435 | |
| /error-in-render avg req/sec | 1753.37 | 1742.66 | -10.71 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | 10.9 kB | |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | 7.26 kB | |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| index.html gzip | 901 B | 901 B | ✓ |
| link.html gzip | 906 B | 907 B | |
| withRouter.html gzip | 894 B | 894 B | ✓ |
| Overall change | 2.7 kB | 2.7 kB |
Diffs
Diff for de003c3a9d30..492ddeda7.js
@@ -707,10 +707,50 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _slicedToArray = __webpack_require__("J4zp");
+ var _defineProperty = __webpack_require__("lSNA");
+
var _classCallCheck = __webpack_require__("lwsE");
var _createClass = __webpack_require__("W8MJ");
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -770,6 +810,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -989,7 +1032,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1205,6 +1253,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
Router.events.emit("beforeHistoryChange", as);
+ if (manualScrollRestoration && history.state) {
+ var _history$state = history.state,
+ curUrl = _history$state.url,
+ curAs = _history$state.as,
+ curOptions = _history$state.options;
+
+ _this2.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
_this2.changeState(method, url, as, options);
if (false) {
@@ -1220,6 +1289,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
}, reject);
@@ -2005,6 +2079,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ ls82: /***/ function(module, exports, __webpack_require__) {
/**
* Copyright (c) 2014-present, Facebook, Inc.Diff for de003c3a9d30..36.module.js
@@ -583,6 +583,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/ elyg: /***/ function(module, exports, __webpack_require__) {
"use strict";
+ var _defineProperty = __webpack_require__("lSNA");
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -641,6 +681,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -851,7 +894,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1036,6 +1084,28 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+
+ if (manualScrollRestoration && history.state) {
+ var {
+ url: curUrl,
+ as: curAs,
+ options: curOptions
+ } = history.state;
+ this.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
this.changeState(method, url, as, options);
if (false) {
@@ -1049,6 +1119,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
},
@@ -1647,6 +1722,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ nOHt: /***/ function(module, exports, __webpack_require__) {
"use strict";Diff for index.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -110,13 +110,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 13.6s | 13.9s | |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | N/A | N/A |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..4b11.js gzip | N/A | 10.9 kB | N/A |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..dule.js gzip | N/A | 7.26 kB | N/A |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _error.js | 874 kB | 874 kB | ✓ |
| 404.html | 4.13 kB | 4.13 kB | ✓ |
| hooks.html | 3.71 kB | 3.71 kB | ✓ |
| index.js | 875 kB | 875 kB | ✓ |
| link.js | 913 kB | 914 kB | |
| routerDirect.js | 905 kB | 907 kB | |
| withRouter.js | 905 kB | 907 kB | |
| Overall change | 4.48 MB | 4.49 MB |
Timer
approved these changes
Jun 9, 2020
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 12s | 11.4s | -629ms |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.07 | 2.088 | |
| / avg req/sec | 1207.67 | 1197.57 | -10.1 |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.457 | 1.397 | -0.06 |
| /error-in-render avg req/sec | 1716.23 | 1789.42 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | 10.9 kB | |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | 7.26 kB | |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| index.html gzip | 901 B | 901 B | ✓ |
| link.html gzip | 906 B | 907 B | |
| withRouter.html gzip | 894 B | 894 B | ✓ |
| Overall change | 2.7 kB | 2.7 kB |
Diffs
Diff for de003c3a9d30..492ddeda7.js
@@ -707,10 +707,50 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _slicedToArray = __webpack_require__("J4zp");
+ var _defineProperty = __webpack_require__("lSNA");
+
var _classCallCheck = __webpack_require__("lwsE");
var _createClass = __webpack_require__("W8MJ");
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -770,6 +810,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -989,7 +1032,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1205,6 +1253,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
Router.events.emit("beforeHistoryChange", as);
+ if (manualScrollRestoration && history.state) {
+ var _history$state = history.state,
+ curUrl = _history$state.url,
+ curAs = _history$state.as,
+ curOptions = _history$state.options;
+
+ _this2.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
_this2.changeState(method, url, as, options);
if (false) {
@@ -1220,6 +1289,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
}, reject);
@@ -2005,6 +2079,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ ls82: /***/ function(module, exports, __webpack_require__) {
/**
* Copyright (c) 2014-present, Facebook, Inc.Diff for de003c3a9d30..36.module.js
@@ -583,6 +583,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/ elyg: /***/ function(module, exports, __webpack_require__) {
"use strict";
+ var _defineProperty = __webpack_require__("lSNA");
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -641,6 +681,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -851,7 +894,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1036,6 +1084,28 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+
+ if (manualScrollRestoration && history.state) {
+ var {
+ url: curUrl,
+ as: curAs,
+ options: curOptions
+ } = history.state;
+ this.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
this.changeState(method, url, as, options);
if (false) {
@@ -1049,6 +1119,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
},
@@ -1647,6 +1722,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ nOHt: /***/ function(module, exports, __webpack_require__) {
"use strict";Diff for index.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -110,13 +110,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 13s | 13s | |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | N/A | N/A |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..4b11.js gzip | N/A | 10.9 kB | N/A |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..dule.js gzip | N/A | 7.26 kB | N/A |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _error.js | 874 kB | 874 kB | ✓ |
| 404.html | 4.13 kB | 4.13 kB | ✓ |
| hooks.html | 3.71 kB | 3.71 kB | ✓ |
| index.js | 875 kB | 875 kB | ✓ |
| link.js | 913 kB | 914 kB | |
| routerDirect.js | 905 kB | 907 kB | |
| withRouter.js | 905 kB | 907 kB | |
| Overall change | 4.48 MB | 4.49 MB |
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 12.8s | 12.8s | -76ms |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.336 | 2.167 | -0.17 |
| / avg req/sec | 1070.17 | 1153.56 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.443 | 1.389 | -0.05 |
| /error-in-render avg req/sec | 1732.44 | 1800.28 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | 10.9 kB | |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | 7.26 kB | |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| index.html gzip | 901 B | 901 B | ✓ |
| link.html gzip | 906 B | 907 B | |
| withRouter.html gzip | 894 B | 894 B | ✓ |
| Overall change | 2.7 kB | 2.7 kB |
Diffs
Diff for de003c3a9d30..492ddeda7.js
@@ -707,10 +707,50 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _slicedToArray = __webpack_require__("J4zp");
+ var _defineProperty = __webpack_require__("lSNA");
+
var _classCallCheck = __webpack_require__("lwsE");
var _createClass = __webpack_require__("W8MJ");
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -770,6 +810,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -989,7 +1032,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1205,6 +1253,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
Router.events.emit("beforeHistoryChange", as);
+ if (manualScrollRestoration && history.state) {
+ var _history$state = history.state,
+ curUrl = _history$state.url,
+ curAs = _history$state.as,
+ curOptions = _history$state.options;
+
+ _this2.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
_this2.changeState(method, url, as, options);
if (false) {
@@ -1220,6 +1289,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
}, reject);
@@ -2005,6 +2079,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ ls82: /***/ function(module, exports, __webpack_require__) {
/**
* Copyright (c) 2014-present, Facebook, Inc.Diff for de003c3a9d30..36.module.js
@@ -583,6 +583,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/ elyg: /***/ function(module, exports, __webpack_require__) {
"use strict";
+ var _defineProperty = __webpack_require__("lSNA");
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -641,6 +681,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -851,7 +894,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1036,6 +1084,28 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+
+ if (manualScrollRestoration && history.state) {
+ var {
+ url: curUrl,
+ as: curAs,
+ options: curOptions
+ } = history.state;
+ this.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
this.changeState(method, url, as, options);
if (false) {
@@ -1049,6 +1119,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
},
@@ -1647,6 +1722,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ nOHt: /***/ function(module, exports, __webpack_require__) {
"use strict";Diff for index.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -110,13 +110,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 13.4s | 13.6s | |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | N/A | N/A |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..4b11.js gzip | N/A | 10.9 kB | N/A |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..dule.js gzip | N/A | 7.26 kB | N/A |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _error.js | 874 kB | 874 kB | ✓ |
| 404.html | 4.13 kB | 4.13 kB | ✓ |
| hooks.html | 3.71 kB | 3.71 kB | ✓ |
| index.js | 875 kB | 875 kB | ✓ |
| link.js | 913 kB | 914 kB | |
| routerDirect.js | 905 kB | 907 kB | |
| withRouter.js | 905 kB | 907 kB | |
| Overall change | 4.48 MB | 4.49 MB |
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 12.3s | 12.5s | |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.151 | 2.15 | 0 |
| / avg req/sec | 1162.1 | 1162.58 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.448 | 1.378 | -0.07 |
| /error-in-render avg req/sec | 1726.57 | 1814.84 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | 10.9 kB | |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | 7.26 kB | |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| index.html gzip | 901 B | 901 B | ✓ |
| link.html gzip | 906 B | 907 B | |
| withRouter.html gzip | 894 B | 894 B | ✓ |
| Overall change | 2.7 kB | 2.7 kB |
Diffs
Diff for de003c3a9d30..492ddeda7.js
@@ -707,10 +707,50 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _slicedToArray = __webpack_require__("J4zp");
+ var _defineProperty = __webpack_require__("lSNA");
+
var _classCallCheck = __webpack_require__("lwsE");
var _createClass = __webpack_require__("W8MJ");
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -770,6 +810,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -989,7 +1032,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1205,6 +1253,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
Router.events.emit("beforeHistoryChange", as);
+ if (manualScrollRestoration && history.state) {
+ var _history$state = history.state,
+ curUrl = _history$state.url,
+ curAs = _history$state.as,
+ curOptions = _history$state.options;
+
+ _this2.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
_this2.changeState(method, url, as, options);
if (false) {
@@ -1220,6 +1289,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
}, reject);
@@ -2005,6 +2079,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ ls82: /***/ function(module, exports, __webpack_require__) {
/**
* Copyright (c) 2014-present, Facebook, Inc.Diff for de003c3a9d30..36.module.js
@@ -583,6 +583,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/ elyg: /***/ function(module, exports, __webpack_require__) {
"use strict";
+ var _defineProperty = __webpack_require__("lSNA");
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly)
+ symbols = symbols.filter(function(sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+ return keys;
+ }
+
+ function _objectSpread(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+ if (i % 2) {
+ ownKeys(Object(source), true).forEach(function(key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(
+ target,
+ Object.getOwnPropertyDescriptors(source)
+ );
+ } else {
+ ownKeys(Object(source)).forEach(function(key) {
+ Object.defineProperty(
+ target,
+ key,
+ Object.getOwnPropertyDescriptor(source, key)
+ );
+ });
+ }
+ }
+ return target;
+ }
+
exports.__esModule = true;
exports.addBasePath = addBasePath;
exports.delBasePath = delBasePath;
@@ -641,6 +681,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
};
}
+ var manualScrollRestoration =
+ true && "scrollRestoration" in window.history;
+
function fetchNextData(pathname, query, isServerRender, cb) {
var attempts = isServerRender ? 3 : 1;
@@ -851,7 +894,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
);
}
- window.addEventListener("popstate", this.onPopState);
+ window.addEventListener("popstate", this.onPopState); // enable custom scroll restoration handling when available
+ // otherwise fallback to browser's default handling
+
+ if (manualScrollRestoration) {
+ window.history.scrollRestoration = "manual";
+ }
}
} // @deprecated backwards compatibility even though it's a private method.
@@ -1036,6 +1084,28 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("beforeHistoryChange", as);
+
+ if (manualScrollRestoration && history.state) {
+ var {
+ url: curUrl,
+ as: curAs,
+ options: curOptions
+ } = history.state;
+ this.changeState(
+ "replaceState",
+ curUrl,
+ curAs,
+ _objectSpread(
+ _objectSpread({}, curOptions),
+ {},
+ {
+ _N_X: window.scrollX,
+ _N_Y: window.scrollY
+ }
+ )
+ );
+ }
+
this.changeState(method, url, as, options);
if (false) {
@@ -1049,6 +1119,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
Router.events.emit("routeChangeComplete", as);
+
+ if (manualScrollRestoration && "_N_X" in options) {
+ window.scrollTo(options._N_X, options._N_Y);
+ }
+
return resolve(true);
});
},
@@ -1647,6 +1722,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
/***/
},
+ /***/ lSNA: /***/ function(module, exports) {
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ module.exports = _defineProperty;
+
+ /***/
+ },
+
/***/ nOHt: /***/ function(module, exports, __webpack_require__) {
"use strict";Diff for index.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -110,13 +110,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -18,7 +18,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -105,13 +105,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.22a0a091d06492ddeda7.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.7d58880f5e575b3ee36f.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3c0e78228684b57e6b36.module.js"
+ src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.c9c4494d45b20185ecd7.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| buildDuration | 13.2s | 13.2s | -18ms |
| nodeModulesSize | 64.9 MB | 64.9 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.js gzip | 6.49 kB | 6.49 kB | ✓ |
| webpack-HASH.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..ec24.js gzip | 10.5 kB | N/A | N/A |
| framework.HASH.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..4b11.js gzip | N/A | 10.9 kB | N/A |
| Overall change | 56.9 kB | 57.2 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| main-HASH.module.js gzip | 5.58 kB | 5.58 kB | ✓ |
| webpack-HASH..dule.js gzip | 746 B | 746 B | ✓ |
| de003c3a9d30..dule.js gzip | 6.92 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39.1 kB | 39.1 kB | ✓ |
| de003c3a9d30..dule.js gzip | N/A | 7.26 kB | N/A |
| Overall change | 52.4 kB | 52.7 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 26.3 kB | 26.3 kB | ✓ |
| Overall change | 26.3 kB | 26.3 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.js gzip | 1.26 kB | 1.26 kB | ✓ |
| _error.js gzip | 3.25 kB | 3.25 kB | ✓ |
| hooks.js gzip | 881 B | 881 B | ✓ |
| index.js gzip | 222 B | 222 B | ✓ |
| link.js gzip | 2.05 kB | 2.05 kB | ✓ |
| routerDirect.js gzip | 279 B | 279 B | ✓ |
| withRouter.js gzip | 278 B | 278 B | ✓ |
| Overall change | 8.22 kB | 8.22 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _app.module.js gzip | 604 B | 604 B | ✓ |
| _error.module.js gzip | 2.04 kB | 2.04 kB | ✓ |
| hooks.module.js gzip | 383 B | 383 B | ✓ |
| index.module.js gzip | 223 B | 223 B | ✓ |
| link.module.js gzip | 1.52 kB | 1.52 kB | ✓ |
| routerDirect..dule.js gzip | 281 B | 281 B | ✓ |
| withRouter.m..dule.js gzip | 278 B | 278 B | ✓ |
| Overall change | 5.33 kB | 5.33 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 171 B | 171 B | ✓ |
| _buildManife..dule.js gzip | 180 B | 180 B | ✓ |
| Overall change | 351 B | 351 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js add/scroll-restoration | Change | |
|---|---|---|---|
| _error.js | 874 kB | 874 kB | ✓ |
| 404.html | 4.13 kB | 4.13 kB | ✓ |
| hooks.html | 3.71 kB | 3.71 kB | ✓ |
| index.js | 875 kB | 875 kB | ✓ |
| link.js | 913 kB | 914 kB | |
| routerDirect.js | 905 kB | 907 kB | |
| withRouter.js | 905 kB | 907 kB | |
| Overall change | 4.48 MB | 4.49 MB |
rokinsky
pushed a commit
to rokinsky/next.js
that referenced
this pull request
Jul 11, 2020
This adds scroll restoration handling to make sure the correct scroll position is restored after navigating back/forward to a page and the rendering hasn't completed by the time the default browser scroll restoration has taken place. An initial failing test case was added which is working with the changes in this PR, if there are any other cases that should be added let me know and I can make sure we have them to ensure we don't regress on this behavior --- Fixes vercel#12530
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 adds scroll restoration handling to make sure the correct scroll position is restored after navigating back/forward to a page and the rendering hasn't completed by the time the default browser scroll restoration has taken place.
An initial failing test case was added which is working with the changes in this PR, if there are any other cases that should be added let me know and I can make sure we have them to ensure we don't regress on this behavior
Fixes #12530