-
Notifications
You must be signed in to change notification settings - Fork 26.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix shallow routing with rewrites/middleware #37716
Conversation
Shallow route changes did not work for rewritten pages when Middleware was used, although it was possible with static rewrites. This happened because the router has a manifest of the static rewrites, allowing static rewrites to map the route before comparing with the local cache. Middleware rewrites are dynamic and happening on the server, so we can't send a manifest easily. This means that we need to propagate the rewrites from the data requests into the components cache in the router to make sure we have cache hits and don't miss. This commit does exactly that and adds a test to verify that it works. This fixes vercel#37072. *Note:* there's one thing that is somewhat an issue though: if the first page the user lands on is a rewritten page, and will try to make a shallow navigation to the same page--we will make a `fetch` request. This is because we don't have any client cache of the `rewrite` we just had.
Stats from current PRDefault Build (Increase detected
|
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
buildDuration | 21.7s | 20.7s | -994ms |
buildDurationCached | 7.2s | 7.2s | -83ms |
nodeModulesSize | 1.85 GB | 1.85 GB |
Page Load Tests Overall decrease ⚠️
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 4.834 | 4.866 | |
/ avg req/sec | 517.14 | 513.72 | |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 2.212 | 2.249 | |
/error-in-render avg req/sec | 1130.07 | 1111.65 |
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
437.HASH.js gzip | 179 B | 179 B | ✓ |
framework-HASH.js gzip | 42 kB | 42 kB | ✓ |
main-HASH.js gzip | 30 kB | 30.1 kB | |
webpack-HASH.js gzip | 1.53 kB | 1.54 kB | |
Overall change | 73.8 kB | 73.8 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31 kB | 31 kB | ✓ |
Overall change | 31 kB | 31 kB | ✓ |
Client Pages Overall decrease ✓
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
_app-HASH.js gzip | 827 B | 825 B | -2 B |
_error-HASH.js gzip | 194 B | 194 B | ✓ |
amp-HASH.js gzip | 495 B | 496 B | |
css-HASH.js gzip | 328 B | 327 B | -1 B |
dynamic-HASH.js gzip | 2.39 kB | 2.39 kB | -2 B |
head-HASH.js gzip | 359 B | 355 B | -4 B |
hooks-HASH.js gzip | 419 B | 418 B | -1 B |
image-HASH.js gzip | 5.25 kB | 5.25 kB | -1 B |
index-HASH.js gzip | 263 B | 264 B | |
link-HASH.js gzip | 2.4 kB | 2.4 kB | |
routerDirect..HASH.js gzip | 322 B | 321 B | -1 B |
script-HASH.js gzip | 392 B | 390 B | -2 B |
withRouter-HASH.js gzip | 320 B | 318 B | -2 B |
85e02e95b279..7e3.css gzip | 107 B | 107 B | ✓ |
Overall change | 14.1 kB | 14.1 kB | -12 B |
Client Build Manifests
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
_buildManifest.js gzip | 459 B | 459 B | ✓ |
Overall change | 459 B | 459 B | ✓ |
Rendered Page Sizes
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
index.html gzip | 523 B | 522 B | -1 B |
link.html gzip | 536 B | 537 B | |
withRouter.html gzip | 517 B | 517 B | ✓ |
Overall change | 1.58 kB | 1.58 kB | ✓ |
Middleware size Overall decrease ✓
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
middleware-m..st.json gzip | 209 B | 209 B | ✓ |
middleware.js gzip | 16.9 kB | 16.9 kB | -4 B |
edge-runtime..pack.js gzip | 1.79 kB | 1.79 kB | ✓ |
Overall change | 18.9 kB | 18.9 kB | -4 B |
Diffs
Diff for middleware.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[826],
{
- /***/ 776: /***/ (
+ /***/ 457: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -14,7 +14,7 @@
/* harmony export */
});
/* harmony import */ var next_dist_server_web_adapter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 222
+ 35
);
// The condition is true when the "process" module is provided
@@ -24,7 +24,7 @@
__webpack_require__.g.process = process;
}
- var mod = __webpack_require__(724);
+ var mod = __webpack_require__(623);
var handler = mod.middleware || mod.default;
if (typeof handler !== "function") {
@@ -50,7 +50,7 @@
/***/
},
- /***/ 724: /***/ (
+ /***/ 623: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -62,7 +62,7 @@
/* harmony export */
});
/* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 335
+ 897
);
/* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
next_server__WEBPACK_IMPORTED_MODULE_0__
@@ -75,7 +75,7 @@
/***/
},
- /***/ 734: /***/ (__unused_webpack_module, exports) => {
+ /***/ 242: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -97,7 +97,7 @@
/***/
},
- /***/ 893: /***/ (__unused_webpack_module, exports) => {
+ /***/ 936: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -135,7 +135,7 @@
/***/
},
- /***/ 142: /***/ (__unused_webpack_module, exports) => {
+ /***/ 846: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -167,7 +167,7 @@
/***/
},
- /***/ 777: /***/ (
+ /***/ 893: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -178,8 +178,8 @@
value: true
});
exports.addLocale = addLocale;
- var _addPathPrefix = __webpack_require__(774);
- var _pathHasPrefix = __webpack_require__(841);
+ var _addPathPrefix = __webpack_require__(466);
+ var _pathHasPrefix = __webpack_require__(590);
function addLocale(path, locale, defaultLocale) {
if (
locale &&
@@ -198,7 +198,7 @@
/***/
},
- /***/ 774: /***/ (
+ /***/ 466: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -209,7 +209,7 @@
value: true
});
exports.addPathPrefix = addPathPrefix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function addPathPrefix(path, prefix) {
if (!path.startsWith("/") || !prefix) {
return path;
@@ -221,7 +221,7 @@
/***/
},
- /***/ 114: /***/ (
+ /***/ 458: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -232,7 +232,7 @@
value: true
});
exports.addPathSuffix = addPathSuffix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function addPathSuffix(path, suffix) {
if (!path.startsWith("/") || !suffix) {
return path;
@@ -244,16 +244,20 @@
/***/
},
- /***/ 36: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
+ /***/ 613: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.formatNextPathnameInfo = formatNextPathnameInfo;
- var _addPathPrefix = __webpack_require__(774);
- var _addPathSuffix = __webpack_require__(114);
- var _addLocale = __webpack_require__(777);
+ var _addPathPrefix = __webpack_require__(466);
+ var _addPathSuffix = __webpack_require__(458);
+ var _addLocale = __webpack_require__(893);
function formatNextPathnameInfo(info) {
let pathname = (0, _addLocale).addLocale(
info.pathname,
@@ -278,7 +282,7 @@
/***/
},
- /***/ 763: /***/ (
+ /***/ 769: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -289,9 +293,9 @@
value: true
});
exports.getNextPathnameInfo = getNextPathnameInfo;
- var _normalizeLocalePath = __webpack_require__(142);
- var _removePathPrefix = __webpack_require__(565);
- var _pathHasPrefix = __webpack_require__(841);
+ var _normalizeLocalePath = __webpack_require__(846);
+ var _removePathPrefix = __webpack_require__(344);
+ var _pathHasPrefix = __webpack_require__(590);
function getNextPathnameInfo(pathname, options) {
var _nextConfig;
const { basePath, i18n, trailingSlash } =
@@ -347,7 +351,7 @@
/***/
},
- /***/ 70: /***/ (__unused_webpack_module, exports) => {
+ /***/ 422: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -383,7 +387,7 @@
/***/
},
- /***/ 841: /***/ (
+ /***/ 590: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -394,7 +398,7 @@
value: true
});
exports.pathHasPrefix = pathHasPrefix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function pathHasPrefix(path, prefix) {
if (typeof path !== "string") {
return false;
@@ -406,7 +410,7 @@
/***/
},
- /***/ 564: /***/ (__unused_webpack_module, exports) => {
+ /***/ 52: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -425,7 +429,7 @@
/***/
},
- /***/ 565: /***/ (
+ /***/ 344: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -436,7 +440,7 @@
value: true
});
exports.removePathPrefix = removePathPrefix;
- var _pathHasPrefix = __webpack_require__(841);
+ var _pathHasPrefix = __webpack_require__(590);
function removePathPrefix(path, prefix) {
if ((0, _pathHasPrefix).pathHasPrefix(path, prefix)) {
const withoutPrefix = path.slice(prefix.length);
@@ -450,7 +454,7 @@
/***/
},
- /***/ 748: /***/ module => {
+ /***/ 54: /***/ module => {
var __dirname = "/";
(() => {
"use strict";
@@ -578,7 +582,7 @@
/***/
},
- /***/ 491: /***/ (module, exports, __webpack_require__) => {
+ /***/ 826: /***/ (module, exports, __webpack_require__) => {
var __dirname = "/";
var __WEBPACK_AMD_DEFINE_RESULT__;
(() => {
@@ -1420,11 +1424,7 @@
/***/
},
- /***/ 222: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
+ /***/ 35: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
"use strict";
var __webpack_unused_export__;
@@ -1433,13 +1433,13 @@
};
exports.VL = adapter;
exports.OT = blockUnallowedResponse;
- var _error = __webpack_require__(626);
- var _utils = __webpack_require__(20);
- var _fetchEvent = __webpack_require__(575);
- var _request = __webpack_require__(989);
- var _response = __webpack_require__(690);
- var _relativizeUrl = __webpack_require__(564);
- var _nextUrl = __webpack_require__(685);
+ var _error = __webpack_require__(182);
+ var _utils = __webpack_require__(93);
+ var _fetchEvent = __webpack_require__(339);
+ var _request = __webpack_require__(67);
+ var _response = __webpack_require__(367);
+ var _relativizeUrl = __webpack_require__(52);
+ var _nextUrl = __webpack_require__(322);
async function adapter(params) {
const requestUrl = new _nextUrl.NextURL(params.request.url, {
headers: params.request.headers,
@@ -1608,7 +1608,7 @@
/***/
},
- /***/ 626: /***/ (__unused_webpack_module, exports) => {
+ /***/ 182: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -1649,7 +1649,7 @@
/***/
},
- /***/ 685: /***/ (
+ /***/ 322: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -1659,10 +1659,10 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
- var _detectDomainLocale = __webpack_require__(893);
- var _formatNextPathnameInfo = __webpack_require__(36);
- var _getHostname = __webpack_require__(734);
- var _getNextPathnameInfo = __webpack_require__(763);
+ var _detectDomainLocale = __webpack_require__(936);
+ var _formatNextPathnameInfo = __webpack_require__(613);
+ var _getHostname = __webpack_require__(242);
+ var _getNextPathnameInfo = __webpack_require__(769);
const Internal = Symbol("NextURLInternal");
class NextURL {
constructor(input, baseOrOpts, opts) {
@@ -1893,7 +1893,7 @@
/***/
},
- /***/ 508: /***/ (
+ /***/ 256: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -1909,8 +1909,8 @@
return _types.CookieSerializeOptions;
}
});
- var _cookie = _interopRequireDefault(__webpack_require__(748));
- var _types = __webpack_require__(229);
+ var _cookie = _interopRequireDefault(__webpack_require__(54));
+ var _types = __webpack_require__(880);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -2044,7 +2044,7 @@
/***/
},
- /***/ 575: /***/ (
+ /***/ 339: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -2055,7 +2055,7 @@
value: true
});
exports.waitUntilSymbol = void 0;
- var _error = __webpack_require__(626);
+ var _error = __webpack_require__(182);
var _key, _key1;
const responseSymbol = Symbol("response");
const passThroughSymbol = Symbol("passThrough");
@@ -2112,21 +2112,17 @@
/***/
},
- /***/ 989: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
+ /***/ 67: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.INTERNALS = void 0;
- var _nextUrl = __webpack_require__(685);
- var _utils = __webpack_require__(20);
- var _error = __webpack_require__(626);
- var _cookies = __webpack_require__(508);
+ var _nextUrl = __webpack_require__(322);
+ var _utils = __webpack_require__(93);
+ var _error = __webpack_require__(182);
+ var _cookies = __webpack_require__(256);
const INTERNALS = Symbol("internal request");
exports.INTERNALS = INTERNALS;
class NextRequest extends Request {
@@ -2173,7 +2169,7 @@
/***/
},
- /***/ 690: /***/ (
+ /***/ 367: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -2183,9 +2179,9 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
- var _nextUrl = __webpack_require__(685);
- var _utils = __webpack_require__(20);
- var _cookies = __webpack_require__(508);
+ var _nextUrl = __webpack_require__(322);
+ var _utils = __webpack_require__(93);
+ var _cookies = __webpack_require__(256);
const INTERNALS = Symbol("internal response");
const REDIRECTS = new Set([301, 302, 303, 307, 308]);
class NextResponse extends Response {
@@ -2249,7 +2245,7 @@
/***/
},
- /***/ 240: /***/ (
+ /***/ 932: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -2263,7 +2259,7 @@
__webpack_unused_export__ = isBot;
exports.Nf = userAgentFromString;
exports.WE = userAgent;
- var _uaParserJs = _interopRequireDefault(__webpack_require__(491));
+ var _uaParserJs = _interopRequireDefault(__webpack_require__(826));
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -2291,7 +2287,7 @@
/***/
},
- /***/ 229: /***/ (__unused_webpack_module, exports) => {
+ /***/ 880: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2303,7 +2299,7 @@
/***/
},
- /***/ 20: /***/ (__unused_webpack_module, exports) => {
+ /***/ 93: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2418,17 +2414,17 @@
/***/
},
- /***/ 335: /***/ (
+ /***/ 897: /***/ (
module,
__unused_webpack_exports,
__webpack_require__
) => {
module.exports = {
- NextRequest: __webpack_require__(989).NextRequest,
- NextResponse: __webpack_require__(690).NextResponse,
- userAgentFromString: __webpack_require__(240) /* .userAgentFromString */
+ NextRequest: __webpack_require__(67).NextRequest,
+ NextResponse: __webpack_require__(367).NextResponse,
+ userAgentFromString: __webpack_require__(932) /* .userAgentFromString */
.Nf,
- userAgent: __webpack_require__(240) /* .userAgent */.WE
+ userAgent: __webpack_require__(932) /* .userAgent */.WE
};
/***/
@@ -2438,7 +2434,7 @@
// webpackRuntimeModules
/******/ var __webpack_exec__ = moduleId =>
__webpack_require__((__webpack_require__.s = moduleId));
- /******/ var __webpack_exports__ = __webpack_exec__(776);
+ /******/ var __webpack_exports__ = __webpack_exec__(457);
/******/ (_ENTRIES =
typeof _ENTRIES === "undefined"
? {}
Diff for _buildManifest.js
@@ -1,25 +1,25 @@
self.__BUILD_MANIFEST = {
__rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
- "/": ["static\u002Fchunks\u002Fpages\u002Findex-5d085461d4b7e1ee.js"],
- "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-48e41d26ff0101f8.js"],
- "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-6515d1b91fe9c7da.js"],
+ "/": ["static\u002Fchunks\u002Fpages\u002Findex-71b39a0d29d24c94.js"],
+ "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-f7a25bc135f661fc.js"],
+ "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-7e272727af269b98.js"],
"/css": [
"static\u002Fcss\u002F94fdbc56eafa2039.css",
- "static\u002Fchunks\u002Fpages\u002Fcss-6d59dba2fd31bfed.js"
+ "static\u002Fchunks\u002Fpages\u002Fcss-a95e3bc2c5ca8245.js"
],
"/dynamic": [
- "static\u002Fchunks\u002Fpages\u002Fdynamic-149bb8e9114142f1.js"
+ "static\u002Fchunks\u002Fpages\u002Fdynamic-ab1374092ddca24b.js"
],
- "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-6ece0649d14938b8.js"],
- "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-ca038552a2ac93a8.js"],
- "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-b96024db25a24aa3.js"],
- "/link": ["static\u002Fchunks\u002Fpages\u002Flink-6511e00fa79cd72c.js"],
+ "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-e2b7857f2aa86120.js"],
+ "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-5675b3cac226c365.js"],
+ "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-b4267f8b195f0551.js"],
+ "/link": ["static\u002Fchunks\u002Fpages\u002Flink-f71f04094f7bac04.js"],
"/routerDirect": [
- "static\u002Fchunks\u002Fpages\u002FrouterDirect-9669d5861da5e10b.js"
+ "static\u002Fchunks\u002Fpages\u002FrouterDirect-c2408dd9a1984376.js"
],
- "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-c439c95569fb9033.js"],
+ "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-f309dfc4eea310f4.js"],
"/withRouter": [
- "static\u002Fchunks\u002Fpages\u002FwithRouter-8b03818d0ed540a0.js"
+ "static\u002Fchunks\u002Fpages\u002FwithRouter-fb06f1f34bce84ca.js"
],
sortedPages: [
"\u002F",
Diff for _app-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[888],
{
- /***/ 3479: /***/ function(
+ /***/ 122: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/_app",
function() {
- return __webpack_require__(3653);
+ return __webpack_require__(539);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 3653: /***/ function(
+ /***/ 539: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -31,7 +31,7 @@
var _interop_require_default = __webpack_require__(4648) /* ["default"] */
.Z;
var _create_super = __webpack_require__(9504) /* ["default"] */.Z;
- var _runtimeJs = _interop_require_default(__webpack_require__(739));
+ var _runtimeJs = _interop_require_default(__webpack_require__(3994));
Object.defineProperty(exports, "__esModule", {
value: true
});
@@ -49,7 +49,7 @@
});
exports["default"] = void 0;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _utils = __webpack_require__(8030);
+ var _utils = __webpack_require__(9089);
function asyncGeneratorStep(
gen,
resolve,
@@ -178,7 +178,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 179], function() {
- return __webpack_exec__(3479), __webpack_exec__(7465);
+ return __webpack_exec__(122), __webpack_exec__(1905);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for _error-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[820],
{
- /***/ 2929: /***/ function(
+ /***/ 3560: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/_error",
function() {
- return __webpack_require__(5590);
+ return __webpack_require__(9733);
}
]);
if (false) {
@@ -24,7 +24,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [888, 774, 179], function() {
- return __webpack_exec__(2929);
+ return __webpack_exec__(3560);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for amp-HASH.js
@@ -1,17 +1,17 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[216],
{
- /***/ 94: /***/ function(
+ /***/ 7941: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(4634);
+ module.exports = __webpack_require__(79);
/***/
},
- /***/ 9028: /***/ function(
+ /***/ 8958: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -19,7 +19,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/amp",
function() {
- return __webpack_require__(4628);
+ return __webpack_require__(6534);
}
]);
if (false) {
@@ -28,7 +28,7 @@
/***/
},
- /***/ 4634: /***/ function(module, exports, __webpack_require__) {
+ /***/ 79: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -36,8 +36,8 @@
});
exports.useAmp = useAmp;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _ampContext = __webpack_require__(2054);
- var _ampMode = __webpack_require__(1122);
+ var _ampContext = __webpack_require__(3131);
+ var _ampMode = __webpack_require__(868);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -66,7 +66,7 @@
/***/
},
- /***/ 4628: /***/ function(
+ /***/ 6534: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -83,7 +83,7 @@
/* harmony export */
});
/* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 94
+ 7941
);
/* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -107,7 +107,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [888, 774, 179], function() {
- return __webpack_exec__(9028);
+ return __webpack_exec__(8958);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for css-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[706],
{
- /***/ 8281: /***/ function(
+ /***/ 9557: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/css",
function() {
- return __webpack_require__(1949);
+ return __webpack_require__(4173);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 1949: /***/ function(
+ /***/ 4173: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -29,7 +29,7 @@
4637
);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 1099
+ 2467
);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
_css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,7 +48,7 @@
/***/
},
- /***/ 1099: /***/ function(module) {
+ /***/ 2467: /***/ function(module) {
// extracted by mini-css-extract-plugin
module.exports = { helloWorld: "css_helloWorld__qqNwY" };
@@ -61,7 +61,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(8281);
+ return __webpack_exec__(9557);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for dynamic-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[739],
{
- /***/ 2744: /***/ function(
+ /***/ 5695: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/dynamic",
function() {
- return __webpack_require__(1697);
+ return __webpack_require__(7800);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 1926: /***/ function(module, exports, __webpack_require__) {
+ /***/ 7164: /***/ function(module, exports, __webpack_require__) {
"use strict";
var _instanceof = __webpack_require__(3354) /* ["default"] */.Z;
@@ -29,7 +29,7 @@
exports["default"] = dynamic;
exports.noSSR = noSSR;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _loadable = _interopRequireDefault(__webpack_require__(4596));
+ var _loadable = _interopRequireDefault(__webpack_require__(4398));
function dynamic(dynamicOptions, options) {
var loadableFn = _loadable.default;
var loadableOptions = {
@@ -132,7 +132,7 @@
/***/
},
- /***/ 7063: /***/ function(
+ /***/ 7484: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -159,7 +159,7 @@
/***/
},
- /***/ 4596: /***/ function(
+ /***/ 4398: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -174,7 +174,7 @@
});
exports["default"] = void 0;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _loadableContext = __webpack_require__(7063);
+ var _loadableContext = __webpack_require__(7484);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -497,7 +497,7 @@
/***/
},
- /***/ 1697: /***/ function(
+ /***/ 7800: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -514,7 +514,7 @@
4637
);
/* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 1605
+ 2123
);
/* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -523,13 +523,13 @@
var DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
function() {
return __webpack_require__
- .e(/* import() */ 437)
- .then(__webpack_require__.bind(__webpack_require__, 7437));
+ .e(/* import() */ 181)
+ .then(__webpack_require__.bind(__webpack_require__, 1181));
},
{
loadableGenerated: {
webpack: function() {
- return [/*require.resolve*/ 7437];
+ return [/*require.resolve*/ 1181];
}
}
}
@@ -559,12 +559,12 @@
/***/
},
- /***/ 1605: /***/ function(
+ /***/ 2123: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(1926);
+ module.exports = __webpack_require__(7164);
/***/
},
@@ -666,7 +666,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(2744);
+ return __webpack_exec__(5695);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for head-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[645],
{
- /***/ 4337: /***/ function(
+ /***/ 7148: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/head",
function() {
- return __webpack_require__(848);
+ return __webpack_require__(6179);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 848: /***/ function(
+ /***/ 6179: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 8915
+ 4616
);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -71,12 +71,12 @@
/***/
},
- /***/ 8915: /***/ function(
+ /***/ 4616: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(4828);
+ module.exports = __webpack_require__(5222);
/***/
}
@@ -87,7 +87,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(4337);
+ return __webpack_exec__(7148);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for hooks-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[757],
{
- /***/ 4853: /***/ function(
+ /***/ 3515: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/hooks",
function() {
- return __webpack_require__(7084);
+ return __webpack_require__(856);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 7084: /***/ function(
+ /***/ 856: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -101,7 +101,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(4853);
+ return __webpack_exec__(3515);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for image-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[358],
{
- /***/ 7570: /***/ function(
+ /***/ 1487: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/image",
function() {
- return __webpack_require__(3918);
+ return __webpack_require__(2330);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 2185: /***/ function(module, exports, __webpack_require__) {
+ /***/ 5239: /***/ function(module, exports, __webpack_require__) {
"use strict";
var _define_property = __webpack_require__(8806)["default"];
@@ -29,12 +29,12 @@
});
exports["default"] = Image;
var _react = _interopRequireWildcard(__webpack_require__(9496));
- var _head = _interopRequireDefault(__webpack_require__(4828));
- var _imageConfig = __webpack_require__(2204);
- var _useIntersection = __webpack_require__(6363);
- var _imageConfigContext = __webpack_require__(1958);
- var _utils = __webpack_require__(8030);
- var _normalizeTrailingSlash = __webpack_require__(1872);
+ var _head = _interopRequireDefault(__webpack_require__(5222));
+ var _imageConfig = __webpack_require__(5466);
+ var _useIntersection = __webpack_require__(1311);
+ var _imageConfigContext = __webpack_require__(1801);
+ var _utils = __webpack_require__(9089);
+ var _normalizeTrailingSlash = __webpack_require__(2800);
function Image(_param) {
var src = _param.src,
sizes = _param.sizes,
@@ -1030,7 +1030,7 @@
/***/
},
- /***/ 6363: /***/ function(module, exports, __webpack_require__) {
+ /***/ 1311: /***/ function(module, exports, __webpack_require__) {
"use strict";
var _sliced_to_array = __webpack_require__(9574) /* ["default"] */.Z;
@@ -1039,7 +1039,7 @@
});
exports.useIntersection = useIntersection;
var _react = __webpack_require__(9496);
- var _requestIdleCallback = __webpack_require__(7808);
+ var _requestIdleCallback = __webpack_require__(7307);
var hasIntersectionObserver = typeof IntersectionObserver !== "undefined";
function useIntersection(param) {
var rootRef = param.rootRef,
@@ -1185,7 +1185,7 @@
/***/
},
- /***/ 3918: /***/ function(
+ /***/ 2330: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -1206,8 +1206,8 @@
// EXTERNAL MODULE: ./node_modules/.pnpm/react@17.0.2/node_modules/react/jsx-runtime.js
var jsx_runtime = __webpack_require__(4637);
- // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
- var next_image = __webpack_require__(8114);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
+ var next_image = __webpack_require__(4033);
var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
/* harmony default export */ var nextjs = {
src: "/_next/static/media/nextjs.cae0b805.png",
@@ -1235,12 +1235,12 @@
/***/
},
- /***/ 8114: /***/ function(
+ /***/ 4033: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(2185);
+ module.exports = __webpack_require__(5239);
/***/
}
@@ -1251,7 +1251,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(7570);
+ return __webpack_exec__(1487);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for index-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[405],
{
- /***/ 4786: /***/ function(
+ /***/ 6967: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/",
function() {
- return __webpack_require__(7245);
+ return __webpack_require__(9257);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 7245: /***/ function(
+ /***/ 9257: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -46,7 +46,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [888, 774, 179], function() {
- return __webpack_exec__(4786);
+ return __webpack_exec__(6967);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for link-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[644],
{
- /***/ 2783: /***/ function(
+ /***/ 9367: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/link",
function() {
- return __webpack_require__(3122);
+ return __webpack_require__(7178);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 7870: /***/ function(module, exports) {
+ /***/ 7280: /***/ function(module, exports) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -54,7 +54,7 @@
/***/
},
- /***/ 7160: /***/ function(module, exports, __webpack_require__) {
+ /***/ 3952: /***/ function(module, exports, __webpack_require__) {
"use strict";
var _sliced_to_array = __webpack_require__(9574) /* ["default"] */.Z;
@@ -64,13 +64,13 @@
});
exports["default"] = void 0;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _router = __webpack_require__(1368);
- var _addLocale = __webpack_require__(3090);
- var _routerContext = __webpack_require__(9831);
- var _appRouterContext = __webpack_require__(482);
- var _useIntersection = __webpack_require__(6363);
- var _getDomainLocale = __webpack_require__(7870);
- var _addBasePath = __webpack_require__(596);
+ var _router = __webpack_require__(5920);
+ var _addLocale = __webpack_require__(4841);
+ var _routerContext = __webpack_require__(8940);
+ var _appRouterContext = __webpack_require__(2587);
+ var _useIntersection = __webpack_require__(1311);
+ var _getDomainLocale = __webpack_require__(7280);
+ var _addBasePath = __webpack_require__(9154);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -419,7 +419,7 @@
/***/
},
- /***/ 6363: /***/ function(module, exports, __webpack_require__) {
+ /***/ 1311: /***/ function(module, exports, __webpack_require__) {
"use strict";
var _sliced_to_array = __webpack_require__(9574) /* ["default"] */.Z;
@@ -428,7 +428,7 @@
});
exports.useIntersection = useIntersection;
var _react = __webpack_require__(9496);
- var _requestIdleCallback = __webpack_require__(7808);
+ var _requestIdleCallback = __webpack_require__(7307);
var hasIntersectionObserver = typeof IntersectionObserver !== "undefined";
function useIntersection(param) {
var rootRef = param.rootRef,
@@ -574,7 +574,7 @@
/***/
},
- /***/ 482: /***/ function(
+ /***/ 2587: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -601,7 +601,7 @@
/***/
},
- /***/ 3122: /***/ function(
+ /***/ 7178: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -618,7 +618,7 @@
4637
);
/* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 8168
+ 8728
);
/* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_link__WEBPACK_IMPORTED_MODULE_1__
@@ -649,12 +649,12 @@
/***/
},
- /***/ 8168: /***/ function(
+ /***/ 8728: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(7160);
+ module.exports = __webpack_require__(3952);
/***/
}
@@ -665,7 +665,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(2783);
+ return __webpack_exec__(9367);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for routerDirect-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[58],
{
- /***/ 5863: /***/ function(
+ /***/ 4538: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/routerDirect",
function() {
- return __webpack_require__(2550);
+ return __webpack_require__(8080);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 2550: /***/ function(
+ /***/ 8080: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 9393
+ 7084
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -57,12 +57,12 @@
/***/
},
- /***/ 9393: /***/ function(
+ /***/ 7084: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(7465);
+ module.exports = __webpack_require__(1905);
/***/
}
@@ -73,7 +73,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(5863);
+ return __webpack_exec__(4538);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for script-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[797],
{
- /***/ 581: /***/ function(
+ /***/ 2644: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/script",
function() {
- return __webpack_require__(6436);
+ return __webpack_require__(9689);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 6436: /***/ function(
+ /***/ 9689: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 2311
+ 7635
);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -70,12 +70,12 @@
/***/
},
- /***/ 2311: /***/ function(
+ /***/ 7635: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(5031);
+ module.exports = __webpack_require__(736);
/***/
}
@@ -86,7 +86,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(581);
+ return __webpack_exec__(2644);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for withRouter-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[807],
{
- /***/ 4573: /***/ function(
+ /***/ 5577: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/withRouter",
function() {
- return __webpack_require__(5526);
+ return __webpack_require__(237);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 5526: /***/ function(
+ /***/ 237: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 9393
+ 7084
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,12 +54,12 @@
/***/
},
- /***/ 9393: /***/ function(
+ /***/ 7084: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(7465);
+ module.exports = __webpack_require__(1905);
/***/
}
@@ -70,7 +70,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(4573);
+ return __webpack_exec__(5577);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;
Diff for 437.HASH.js
@@ -1,8 +1,8 @@
"use strict";
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
- [437],
+ [181],
{
- /***/ 7437: /***/ function(
+ /***/ 1181: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
Diff for framework-HASH.js
@@ -19,7 +19,7 @@
Modernizr 3.0.0pre (Custom Build) | MIT
*/
var aa = __webpack_require__(9496),
- m = __webpack_require__(9260),
+ m = __webpack_require__(2048),
r = __webpack_require__(8051);
function y(a) {
for (
@@ -7895,7 +7895,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
- __webpack_require__(9260);
+ __webpack_require__(2048);
var f = __webpack_require__(9496),
g = 60103;
exports.Fragment = 60107;
@@ -7948,7 +7948,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
- var l = __webpack_require__(9260),
+ var l = __webpack_require__(2048),
n = 60103,
p = 60106;
exports.Fragment = 60107;
Diff for main-HASH.js
Diff too large to display
Diff for webpack-HASH.js
@@ -159,7 +159,7 @@
/******/ __webpack_require__.u = function(chunkId) {
/******/ // return url for filenames based on template
/******/ return (
- "static/chunks/" + chunkId + "." + "b72a55e4a5d30197" + ".js"
+ "static/chunks/" + chunkId + "." + "040ce93ea5ad99f5" + ".js"
);
/******/
};
Diff for index.html
@@ -11,23 +11,23 @@
src="/_next/static/chunks/polyfills-0d1b80a048d4787e.js"
></script>
<script
- src="/_next/static/chunks/webpack-529d8c2c69cdf0dc.js"
+ src="/_next/static/chunks/webpack-61aca3a754613535.js"
defer=""
></script>
<script
- src="/_next/static/chunks/framework-8755e6e713f733ae.js"
+ src="/_next/static/chunks/framework-044d557c64574856.js"
defer=""
></script>
<script
- src="/_next/static/chunks/main-5e2d251fe1c76e9b.js"
+ src="/_next/static/chunks/main-22000515d2dd4ef8.js"
defer=""
></script>
<script
- src="/_next/static/chunks/pages/_app-d6801db76c87d8c0.js"
+ src="/_next/static/chunks/pages/_app-a1d7e88cadd6d2cc.js"
defer=""
></script>
<script
- src="/_next/static/chunks/pages/index-5d085461d4b7e1ee.js"
+ src="/_next/static/chunks/pages/index-71b39a0d29d24c94.js"
defer=""
></script>
<script src="/_next/static/BUILD_ID/_buildManifest.js" defer=""></script>
Diff for link.html
@@ -11,23 +11,23 @@
src="/_next/static/chunks/polyfills-0d1b80a048d4787e.js"
></script>
<script
- src="/_next/static/chunks/webpack-529d8c2c69cdf0dc.js"
+ src="/_next/static/chunks/webpack-61aca3a754613535.js"
defer=""
></script>
<script
- src="/_next/static/chunks/framework-8755e6e713f733ae.js"
+ src="/_next/static/chunks/framework-044d557c64574856.js"
defer=""
></script>
<script
- src="/_next/static/chunks/main-5e2d251fe1c76e9b.js"
+ src="/_next/static/chunks/main-22000515d2dd4ef8.js"
defer=""
></script>
<script
- src="/_next/static/chunks/pages/_app-d6801db76c87d8c0.js"
+ src="/_next/static/chunks/pages/_app-a1d7e88cadd6d2cc.js"
defer=""
></script>
<script
- src="/_next/static/chunks/pages/link-6511e00fa79cd72c.js"
+ src="/_next/static/chunks/pages/link-f71f04094f7bac04.js"
defer=""
></script>
<script src="/_next/static/BUILD_ID/_buildManifest.js" defer=""></script>
Diff for withRouter.html
@@ -11,23 +11,23 @@
src="/_next/static/chunks/polyfills-0d1b80a048d4787e.js"
></script>
<script
- src="/_next/static/chunks/webpack-529d8c2c69cdf0dc.js"
+ src="/_next/static/chunks/webpack-61aca3a754613535.js"
defer=""
></script>
<script
- src="/_next/static/chunks/framework-8755e6e713f733ae.js"
+ src="/_next/static/chunks/framework-044d557c64574856.js"
defer=""
></script>
<script
- src="/_next/static/chunks/main-5e2d251fe1c76e9b.js"
+ src="/_next/static/chunks/main-22000515d2dd4ef8.js"
defer=""
></script>
<script
- src="/_next/static/chunks/pages/_app-d6801db76c87d8c0.js"
+ src="/_next/static/chunks/pages/_app-a1d7e88cadd6d2cc.js"
defer=""
></script>
<script
- src="/_next/static/chunks/pages/withRouter-8b03818d0ed540a0.js"
+ src="/_next/static/chunks/pages/withRouter-fb06f1f34bce84ca.js"
defer=""
></script>
<script src="/_next/static/BUILD_ID/_buildManifest.js" defer=""></script>
Default Build with SWC (Increase detected ⚠️ )
General Overall increase ⚠️
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
buildDuration | 23s | 23s | |
buildDurationCached | 7.3s | 7.3s | |
nodeModulesSize | 1.85 GB | 1.85 GB |
Page Load Tests Overall increase ✓
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 4.829 | 4.84 | |
/ avg req/sec | 517.67 | 516.57 | |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 2.239 | 2.218 | -0.02 |
/error-in-render avg req/sec | 1116.49 | 1127.28 | +10.79 |
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
437.HASH.js gzip | 178 B | 178 B | ✓ |
framework-HASH.js gzip | 42.7 kB | 42.7 kB | ✓ |
main-HASH.js gzip | 30.5 kB | 30.5 kB | |
webpack-HASH.js gzip | 1.54 kB | 1.54 kB | |
Overall change | 74.8 kB | 74.9 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31 kB | 31 kB | ✓ |
Overall change | 31 kB | 31 kB | ✓ |
Client Pages Overall increase ⚠️
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
_app-HASH.js gzip | 837 B | 835 B | -2 B |
_error-HASH.js gzip | 180 B | 181 B | |
amp-HASH.js gzip | 501 B | 504 B | |
css-HASH.js gzip | 326 B | 325 B | -1 B |
dynamic-HASH.js gzip | 2.59 kB | 2.59 kB | |
head-HASH.js gzip | 358 B | 357 B | -1 B |
hooks-HASH.js gzip | 414 B | 414 B | ✓ |
image-HASH.js gzip | 5.34 kB | 5.34 kB | |
index-HASH.js gzip | 262 B | 262 B | ✓ |
link-HASH.js gzip | 2.48 kB | 2.49 kB | |
routerDirect..HASH.js gzip | 323 B | 321 B | -2 B |
script-HASH.js gzip | 393 B | 392 B | -1 B |
withRouter-HASH.js gzip | 319 B | 317 B | -2 B |
85e02e95b279..7e3.css gzip | 107 B | 107 B | ✓ |
Overall change | 14.4 kB | 14.4 kB |
Client Build Manifests
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
_buildManifest.js gzip | 458 B | 458 B | ✓ |
Overall change | 458 B | 458 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
index.html gzip | 520 B | 523 B | |
link.html gzip | 535 B | 536 B | |
withRouter.html gzip | 515 B | 517 B | |
Overall change | 1.57 kB | 1.58 kB |
Middleware size Overall decrease ✓
vercel/next.js canary | Schniz/next.js fix/37072 | Change | |
---|---|---|---|
middleware-m..st.json gzip | 209 B | 209 B | ✓ |
middleware.js gzip | 16.9 kB | 16.9 kB | -4 B |
edge-runtime..pack.js gzip | 1.79 kB | 1.79 kB | ✓ |
Overall change | 18.9 kB | 18.9 kB | -4 B |
Diffs
Diff for middleware.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[826],
{
- /***/ 776: /***/ (
+ /***/ 457: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -14,7 +14,7 @@
/* harmony export */
});
/* harmony import */ var next_dist_server_web_adapter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 222
+ 35
);
// The condition is true when the "process" module is provided
@@ -24,7 +24,7 @@
__webpack_require__.g.process = process;
}
- var mod = __webpack_require__(724);
+ var mod = __webpack_require__(623);
var handler = mod.middleware || mod.default;
if (typeof handler !== "function") {
@@ -50,7 +50,7 @@
/***/
},
- /***/ 724: /***/ (
+ /***/ 623: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -62,7 +62,7 @@
/* harmony export */
});
/* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 335
+ 897
);
/* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
next_server__WEBPACK_IMPORTED_MODULE_0__
@@ -75,7 +75,7 @@
/***/
},
- /***/ 734: /***/ (__unused_webpack_module, exports) => {
+ /***/ 242: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -97,7 +97,7 @@
/***/
},
- /***/ 893: /***/ (__unused_webpack_module, exports) => {
+ /***/ 936: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -135,7 +135,7 @@
/***/
},
- /***/ 142: /***/ (__unused_webpack_module, exports) => {
+ /***/ 846: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -167,7 +167,7 @@
/***/
},
- /***/ 777: /***/ (
+ /***/ 893: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -178,8 +178,8 @@
value: true
});
exports.addLocale = addLocale;
- var _addPathPrefix = __webpack_require__(774);
- var _pathHasPrefix = __webpack_require__(841);
+ var _addPathPrefix = __webpack_require__(466);
+ var _pathHasPrefix = __webpack_require__(590);
function addLocale(path, locale, defaultLocale) {
if (
locale &&
@@ -198,7 +198,7 @@
/***/
},
- /***/ 774: /***/ (
+ /***/ 466: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -209,7 +209,7 @@
value: true
});
exports.addPathPrefix = addPathPrefix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function addPathPrefix(path, prefix) {
if (!path.startsWith("/") || !prefix) {
return path;
@@ -221,7 +221,7 @@
/***/
},
- /***/ 114: /***/ (
+ /***/ 458: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -232,7 +232,7 @@
value: true
});
exports.addPathSuffix = addPathSuffix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function addPathSuffix(path, suffix) {
if (!path.startsWith("/") || !suffix) {
return path;
@@ -244,16 +244,20 @@
/***/
},
- /***/ 36: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
+ /***/ 613: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.formatNextPathnameInfo = formatNextPathnameInfo;
- var _addPathPrefix = __webpack_require__(774);
- var _addPathSuffix = __webpack_require__(114);
- var _addLocale = __webpack_require__(777);
+ var _addPathPrefix = __webpack_require__(466);
+ var _addPathSuffix = __webpack_require__(458);
+ var _addLocale = __webpack_require__(893);
function formatNextPathnameInfo(info) {
let pathname = (0, _addLocale).addLocale(
info.pathname,
@@ -278,7 +282,7 @@
/***/
},
- /***/ 763: /***/ (
+ /***/ 769: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -289,9 +293,9 @@
value: true
});
exports.getNextPathnameInfo = getNextPathnameInfo;
- var _normalizeLocalePath = __webpack_require__(142);
- var _removePathPrefix = __webpack_require__(565);
- var _pathHasPrefix = __webpack_require__(841);
+ var _normalizeLocalePath = __webpack_require__(846);
+ var _removePathPrefix = __webpack_require__(344);
+ var _pathHasPrefix = __webpack_require__(590);
function getNextPathnameInfo(pathname, options) {
var _nextConfig;
const { basePath, i18n, trailingSlash } =
@@ -347,7 +351,7 @@
/***/
},
- /***/ 70: /***/ (__unused_webpack_module, exports) => {
+ /***/ 422: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -383,7 +387,7 @@
/***/
},
- /***/ 841: /***/ (
+ /***/ 590: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -394,7 +398,7 @@
value: true
});
exports.pathHasPrefix = pathHasPrefix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function pathHasPrefix(path, prefix) {
if (typeof path !== "string") {
return false;
@@ -406,7 +410,7 @@
/***/
},
- /***/ 564: /***/ (__unused_webpack_module, exports) => {
+ /***/ 52: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -425,7 +429,7 @@
/***/
},
- /***/ 565: /***/ (
+ /***/ 344: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -436,7 +440,7 @@
value: true
});
exports.removePathPrefix = removePathPrefix;
- var _pathHasPrefix = __webpack_require__(841);
+ var _pathHasPrefix = __webpack_require__(590);
function removePathPrefix(path, prefix) {
if ((0, _pathHasPrefix).pathHasPrefix(path, prefix)) {
const withoutPrefix = path.slice(prefix.length);
@@ -450,7 +454,7 @@
/***/
},
- /***/ 748: /***/ module => {
+ /***/ 54: /***/ module => {
var __dirname = "/";
(() => {
"use strict";
@@ -578,7 +582,7 @@
/***/
},
- /***/ 491: /***/ (module, exports, __webpack_require__) => {
+ /***/ 826: /***/ (module, exports, __webpack_require__) => {
var __dirname = "/";
var __WEBPACK_AMD_DEFINE_RESULT__;
(() => {
@@ -1420,11 +1424,7 @@
/***/
},
- /***/ 222: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
+ /***/ 35: /***/ (__unused_webpack_module, ex
Post job cleanup.
[command]/usr/bin/git version
git version 2.36.1
Temporarily overriding HOME='/home/runner/work/_temp/1e70182a-4f7f-439d-82ca-98bc94263b86' before making global git config changes
Adding repository directory to the temporary git global config as a safe directory
[command]/usr/bin/git config --global --add safe.directory /home/runner/work/next.js/next.js
[command]/usr/bin/git config --local --name-only --get-regexp core\.sshCommand
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :
[command]/usr/bin/git config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader
http.https://github.com/.extraheader
[command]/usr/bin/git config --local --unset-all http.https://github.com/.extraheader
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :
Cleaning up orphan processes
Commit: 21ff1b05cbadbb3f68ce91115ede7817c2d46afe
# Conflicts: # test/e2e/middleware-general/app/next.config.js
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Amazing! thank you! |
I think this may have introduced a bug when rewriting some dynamic routes to a different page? #38405 In the issue's example, the next.js/packages/next/shared/lib/router/router.ts Lines 1896 to 1900 in 81b554f
|
I seem to be still able to see this issue with v12.2.2. When middleware is present, shallow routing doesn't work. Anyone else seeing the same issue? |
yup... exact same thing here. Our app is broken when i have middleware enabled since the update and try to use shallow routing. |
I have same issue |
Shallow route changes did not work for rewritten pages when Middleware
was used, and made hard refreshes, although it was possible with static rewrites.
This happened because the router has a manifest of the static rewrites,
allowing static rewrites to map the route before comparing with the
local cache.
Middleware rewrites are dynamic and happening on the server, so we
can't send a manifest easily. This means that we need to propagate
the rewrites from the data requests into the components cache in
the router to make sure we have cache hits and don't miss.
This commit does exactly that and adds a test to verify that it works.
This fixes #37072 and fixes #31680
Note: there's one thing that is somewhat an issue though: if the first
page the user lands on is a rewritten page, and will try to make a
shallow navigation to the same page--we will make a
fetch
request.This is because we don't have any client cache of the
rewrite
we justhad.
Bug
fixes #number
contributing.md