refactor: rewrite etag #38568

SukkaW · 2022-07-12T20:10:34Z

Rewrite ETag generate function with fnv1a hash.

FNV hashes are designed to be fast while maintaining a low collision rate. The FNV speed allows one to quickly hash lots of data while maintaining a reasonable collision rate (https://softwareengineering.stackexchange.com/questions/49550/which-hashing-algorithm-is-best-for-uniqueness-and-speed/145633).

fastify-etag also uses fnv1a algorithm by default.

cc @shuding: Should experimental-edge also switch to fnv1a for ETag, for consistency?

ijjk · 2022-07-12T20:34:37Z

Failing test suites

Commit: 1f254f6

pnpm testheadless test/e2e/app-dir/rsc-basic.test.ts

app dir - react server components > should support partial hydration with inlined server data in browser

Expand output

● app dir - react server components › should support partial hydration with inlined server data in browser

expect(received).toBe(expected) // Object.is equality

Expected: "next_streaming_fallback"
Received: "next_streaming_data"

  371 |     // Should support partial hydration: the boundary should still be pending
  372 |     // while another part is hydrated already.
> 373 |     expect(await browser.eval(`window.partial_hydration_suspense_result`)).toBe(
      |                                                                            ^
  374 |       'next_streaming_fallback'
  375 |     )
  376 |     expect(await browser.eval(`window.partial_hydration_counter_result`)).toBe(

  at Object.<anonymous> (e2e/app-dir/rsc-basic.test.ts:373:76)

Read more about building and testing Next.js in contributing.md.

ijjk · 2022-07-12T21:04:17Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall decrease ✓

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
buildDuration	21.6s	20.4s	-1.2s
buildDurationCached	7.3s	7.3s	⚠️ +17ms
nodeModulesSize	2.26 GB	2.26 GB	-18 B
nextStartRea..uration (ms)	292ms	290ms	-2ms
nextDevReadyDuration	319ms	309ms	-10ms

Page Load Tests Overall increase ✓

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
/ failed reqs	0	0	✓
/ total time (seconds)	4.739	4.699	-0.04
/ avg req/sec	527.51	532.06	+4.55
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.886	1.889	0
/error-in-render avg req/sec	1325.82	1323.76	⚠️ -2.06

Client Bundles (main, webpack) Overall decrease ✓

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
299.HASH.js gzip	179 B	180 B	⚠️ +1 B
framework-HASH.js gzip	42 kB	42 kB	✓
main-HASH.js gzip	30.7 kB	30.7 kB	-20 B
webpack-HASH.js gzip	1.54 kB	1.54 kB	⚠️ +1 B
Overall change	74.5 kB	74.5 kB	-18 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages Overall decrease ✓

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
_app-HASH.js gzip	831 B	828 B	-3 B
_error-HASH.js gzip	194 B	194 B	✓
amp-HASH.js gzip	495 B	498 B	⚠️ +3 B
css-HASH.js gzip	328 B	328 B	✓
dynamic-HASH.js gzip	2.47 kB	2.47 kB	✓
head-HASH.js gzip	356 B	353 B	-3 B
hooks-HASH.js gzip	805 B	805 B	✓
image-HASH.js gzip	5.21 kB	5.2 kB	-9 B
index-HASH.js gzip	263 B	263 B	✓
link-HASH.js gzip	2.42 kB	2.42 kB	⚠️ +3 B
routerDirect..HASH.js gzip	321 B	320 B	-1 B
script-HASH.js gzip	391 B	392 B	⚠️ +1 B
withRouter-HASH.js gzip	318 B	319 B	⚠️ +1 B
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	14.5 kB	14.5 kB	-8 B

Client Build Manifests

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
_buildManifest.js gzip	459 B	459 B	✓
Overall change	459 B	459 B	✓

Rendered Page Sizes Overall increase ⚠️

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
index.html gzip	519 B	523 B	⚠️ +4 B
link.html gzip	534 B	538 B	⚠️ +4 B
withRouter.html gzip	515 B	517 B	⚠️ +2 B
Overall change	1.57 kB	1.58 kB	⚠️ +10 B

Middleware size

	vercel/next.js canary	SukkaW/next.js rewrite-etag	Change
middleware.js gzip	16.9 kB	16.9 kB	✓
edge-runtime..pack.js gzip	1.83 kB	1.83 kB	✓
Overall change	18.8 kB	18.8 kB	✓

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", {
@@ -95,7 +95,7 @@
       /***/
     },
 
-    /***/ 893: /***/ (__unused_webpack_module, exports) => {
+    /***/ 936: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -133,7 +133,7 @@
       /***/
     },
 
-    /***/ 142: /***/ (__unused_webpack_module, exports) => {
+    /***/ 846: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -165,7 +165,7 @@
       /***/
     },
 
-    /***/ 777: /***/ (
+    /***/ 893: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -176,8 +176,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, ignorePrefix) {
         if (
           locale &&
@@ -197,7 +197,7 @@
       /***/
     },
 
-    /***/ 774: /***/ (
+    /***/ 466: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -208,7 +208,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;
@@ -220,7 +220,7 @@
       /***/
     },
 
-    /***/ 114: /***/ (
+    /***/ 458: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -231,7 +231,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;
@@ -243,17 +243,21 @@
       /***/
     },
 
-    /***/ 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 _removeTrailingSlash = __webpack_require__(675);
-      var _addPathPrefix = __webpack_require__(774);
-      var _addPathSuffix = __webpack_require__(114);
-      var _addLocale = __webpack_require__(777);
+      var _removeTrailingSlash = __webpack_require__(77);
+      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,
@@ -281,7 +285,7 @@
       /***/
     },
 
-    /***/ 763: /***/ (
+    /***/ 769: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -292,9 +296,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 } =
@@ -344,7 +348,7 @@
       /***/
     },
 
-    /***/ 70: /***/ (__unused_webpack_module, exports) => {
+    /***/ 422: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -380,7 +384,7 @@
       /***/
     },
 
-    /***/ 841: /***/ (
+    /***/ 590: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -391,7 +395,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;
@@ -403,7 +407,7 @@
       /***/
     },
 
-    /***/ 564: /***/ (__unused_webpack_module, exports) => {
+    /***/ 52: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -422,7 +426,7 @@
       /***/
     },
 
-    /***/ 565: /***/ (
+    /***/ 344: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -433,7 +437,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);
@@ -447,7 +451,7 @@
       /***/
     },
 
-    /***/ 675: /***/ (__unused_webpack_module, exports) => {
+    /***/ 77: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -461,7 +465,7 @@
       /***/
     },
 
-    /***/ 748: /***/ module => {
+    /***/ 54: /***/ module => {
       var __dirname = "/";
       (() => {
         "use strict";
@@ -589,7 +593,7 @@
       /***/
     },
 
-    /***/ 491: /***/ (module, exports, __webpack_require__) => {
+    /***/ 826: /***/ (module, exports, __webpack_require__) => {
       var __dirname = "/";
       var __WEBPACK_AMD_DEFINE_RESULT__;
       (() => {
@@ -1431,11 +1435,7 @@
       /***/
     },
 
-    /***/ 222: /***/ (
-      __unused_webpack_module,
-      exports,
-      __webpack_require__
-    ) => {
+    /***/ 35: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
       "use strict";
       var __webpack_unused_export__;
 
@@ -1444,13 +1444,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,
@@ -1616,7 +1616,7 @@
       /***/
     },
 
-    /***/ 626: /***/ (__unused_webpack_module, exports) => {
+    /***/ 182: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1657,7 +1657,7 @@
       /***/
     },
 
-    /***/ 685: /***/ (
+    /***/ 322: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1667,10 +1667,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) {
@@ -1891,7 +1891,7 @@
       /***/
     },
 
-    /***/ 508: /***/ (
+    /***/ 256: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1907,8 +1907,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
@@ -2040,7 +2040,7 @@
       /***/
     },
 
-    /***/ 575: /***/ (
+    /***/ 339: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2051,7 +2051,7 @@
         value: true
       });
       exports.waitUntilSymbol = void 0;
-      var _error = __webpack_require__(626);
+      var _error = __webpack_require__(182);
       const responseSymbol = Symbol("response");
       const passThroughSymbol = Symbol("passThrough");
       const waitUntilSymbol = Symbol("waitUntil");
@@ -2104,21 +2104,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 {
@@ -2165,7 +2161,7 @@
       /***/
     },
 
-    /***/ 690: /***/ (
+    /***/ 367: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2175,9 +2171,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 {
@@ -2252,7 +2248,7 @@
       /***/
     },
 
-    /***/ 240: /***/ (
+    /***/ 932: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2266,7 +2262,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
@@ -2294,7 +2290,7 @@
       /***/
     },
 
-    /***/ 229: /***/ (__unused_webpack_module, exports) => {
+    /***/ 880: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2306,7 +2302,7 @@
       /***/
     },
 
-    /***/ 20: /***/ (__unused_webpack_module, exports) => {
+    /***/ 93: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2421,17 +2417,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
       };
 
       /***/
@@ -2441,7 +2437,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-006025f296d93d1f.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-ec6f2dc249481230.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-a331316989d05f14.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-1ecb7a225a122304.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-7c674188292aca70.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-abb2ab71d4fb2340.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-68d7610c482ac563.js"
+    "static\u002Fchunks\u002Fpages\u002Fcss-100e45427e857c65.js"
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-3137f3fcef911984.js"
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-f7dcf0e6a86067b9.js"
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-c040cbe8d466bcb1.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-691547ee2366d57c.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-d0e0710bc503b145.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-be3e9efacb7d72bc.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-d456b89ea2e58ccb.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-0b406ece32365f1b.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-91ab0fd4386a6eb0.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-283f4ef6a5db960d.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-19c824ccc8950973.js"
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-8a036a4ae9e5d6ed.js"
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-c3bfac97d4fbba00.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-d318755acc6c0b22.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-d6891bab587638a3.js"
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-dee19dca16003991.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__(5909);
+          return __webpack_require__(777);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5909: /***/ function(
+    /***/ 777: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -35,7 +35,7 @@
         .Z;
       var _createSuper = __webpack_require__(6320) /* ["default"] */.Z;
       var _runtimeJs = /*#__PURE__*/ _interopRequireDefault(
-        __webpack_require__(739)
+        __webpack_require__(3994)
       );
       Object.defineProperty(exports, "__esModule", {
         value: true
@@ -54,7 +54,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault1(__webpack_require__(9496));
-      var _utils = __webpack_require__(2973);
+      var _utils = __webpack_require__(6326);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -184,7 +184,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 179], function() {
-      return __webpack_exec__(3479), __webpack_exec__(3668);
+      return __webpack_exec__(122), __webpack_exec__(7489);
     });
     /******/ 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__(9103);
+          return __webpack_require__(2509);
         }
       ]);
       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__(2562);
+      module.exports = __webpack_require__(6824);
 
       /***/
     },
 
-    /***/ 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__(6385);
+          return __webpack_require__(9302);
         }
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 2562: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6824: /***/ 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__(2556);
-      var _ampMode = __webpack_require__(7853);
+      var _ampContext = __webpack_require__(5789);
+      var _ampMode = __webpack_require__(9208);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -66,7 +66,7 @@
       /***/
     },
 
-    /***/ 6385: /***/ function(
+    /***/ 9302: /***/ 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__(4347);
+          return __webpack_require__(79);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4347: /***/ function(
+    /***/ 79: /***/ 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__(
-        4542
+        2054
       );
       /* 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 @@
       /***/
     },
 
-    /***/ 4542: /***/ function(module) {
+    /***/ 2054: /***/ 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__(5547);
+          return __webpack_require__(9525);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3005: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6014: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -31,7 +31,7 @@
       exports["default"] = dynamic;
       exports.noSSR = noSSR;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadable = _interopRequireDefault(__webpack_require__(9675));
+      var _loadable = _interopRequireDefault(__webpack_require__(7679));
       function dynamic(dynamicOptions, options) {
         var loadableFn = _loadable.default;
         var loadableOptions = {
@@ -150,7 +150,7 @@
       /***/
     },
 
-    /***/ 577: /***/ function(
+    /***/ 8416: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -177,7 +177,7 @@
       /***/
     },
 
-    /***/ 9675: /***/ function(
+    /***/ 7679: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -194,7 +194,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadableContext = __webpack_require__(577);
+      var _loadableContext = __webpack_require__(8416);
       function _extends() {
         _extends =
           Object.assign ||
@@ -531,7 +531,7 @@
       /***/
     },
 
-    /***/ 5547: /***/ function(
+    /***/ 9525: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -548,7 +548,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__
@@ -557,13 +557,13 @@
       var DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         function() {
           return __webpack_require__
-            .e(/* import() */ 299)
-            .then(__webpack_require__.bind(__webpack_require__, 5299));
+            .e(/* import() */ 128)
+            .then(__webpack_require__.bind(__webpack_require__, 5128));
         },
         {
           loadableGenerated: {
             webpack: function() {
-              return [/*require.resolve*/ 5299];
+              return [/*require.resolve*/ 5128];
             }
           }
         }
@@ -593,12 +593,12 @@
       /***/
     },
 
-    /***/ 1605: /***/ function(
+    /***/ 2123: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3005);
+      module.exports = __webpack_require__(6014);
 
       /***/
     },
@@ -700,7 +700,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__(9288);
+          return __webpack_require__(7481);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 9288: /***/ function(
+    /***/ 7481: /***/ 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__(681);
+      module.exports = __webpack_require__(4790);
 
       /***/
     }
@@ -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__(8367);
+          return __webpack_require__(1253);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8367: /***/ function(
+    /***/ 1253: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -132,7 +132,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

@@ -26,7 +26,7 @@
       /***/
     },
 
-    /***/ 7570: /***/ function(
+    /***/ 1487: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -34,7 +34,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function() {
-          return __webpack_require__(1576);
+          return __webpack_require__(4789);
         }
       ]);
       if (false) {
@@ -43,7 +43,7 @@
       /***/
     },
 
-    /***/ 8976: /***/ function(module, exports, __webpack_require__) {
+    /***/ 361: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -57,12 +57,12 @@
       });
       exports["default"] = Image;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _head = _interopRequireDefault(__webpack_require__(681));
-      var _imageConfig = __webpack_require__(5282);
-      var _useIntersection = __webpack_require__(227);
-      var _imageConfigContext = __webpack_require__(8584);
-      var _utils = __webpack_require__(2973);
-      var _normalizeTrailingSlash = __webpack_require__(3892);
+      var _head = _interopRequireDefault(__webpack_require__(4790));
+      var _imageConfig = __webpack_require__(5676);
+      var _useIntersection = __webpack_require__(5668);
+      var _imageConfigContext = __webpack_require__(76);
+      var _utils = __webpack_require__(6326);
+      var _normalizeTrailingSlash = __webpack_require__(7600);
       function Image(_param) {
         var src = _param.src,
           sizes = _param.sizes,
@@ -1004,7 +1004,7 @@
       /***/
     },
 
-    /***/ 227: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5668: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1016,7 +1016,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(5757);
+      var _requestIdleCallback = __webpack_require__(5617);
       var hasIntersectionObserver = typeof IntersectionObserver === "function";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -1149,7 +1149,7 @@
       /***/
     },
 
-    /***/ 1576: /***/ function(
+    /***/ 4789: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1170,8 +1170,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",
@@ -1199,12 +1199,12 @@
       /***/
     },
 
-    /***/ 8114: /***/ function(
+    /***/ 4033: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(8976);
+      module.exports = __webpack_require__(361);
 
       /***/
     }
@@ -1215,7 +1215,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__(5355);
+          return __webpack_require__(3973);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5355: /***/ function(
+    /***/ 3973: /***/ 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__(4917);
+          return __webpack_require__(1849);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8494: /***/ function(module, exports) {
+    /***/ 1908: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -54,7 +54,7 @@
       /***/
     },
 
-    /***/ 861: /***/ function(module, exports, __webpack_require__) {
+    /***/ 882: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -67,13 +67,13 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(7733);
-      var _addLocale = __webpack_require__(6049);
-      var _routerContext = __webpack_require__(2488);
-      var _appRouterContext = __webpack_require__(1849);
-      var _useIntersection = __webpack_require__(227);
-      var _getDomainLocale = __webpack_require__(8494);
-      var _addBasePath = __webpack_require__(5090);
+      var _router = __webpack_require__(8340);
+      var _addLocale = __webpack_require__(9465);
+      var _routerContext = __webpack_require__(1349);
+      var _appRouterContext = __webpack_require__(3407);
+      var _useIntersection = __webpack_require__(5668);
+      var _getDomainLocale = __webpack_require__(1908);
+      var _addBasePath = __webpack_require__(8126);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -428,7 +428,7 @@
       /***/
     },
 
-    /***/ 227: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5668: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -440,7 +440,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(5757);
+      var _requestIdleCallback = __webpack_require__(5617);
       var hasIntersectionObserver = typeof IntersectionObserver === "function";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -573,7 +573,7 @@
       /***/
     },
 
-    /***/ 1849: /***/ function(
+    /***/ 3407: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -604,7 +604,7 @@
       /***/
     },
 
-    /***/ 4917: /***/ function(
+    /***/ 1849: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -621,7 +621,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__
@@ -652,12 +652,12 @@
       /***/
     },
 
-    /***/ 8168: /***/ function(
+    /***/ 8728: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(861);
+      module.exports = __webpack_require__(882);
 
       /***/
     }
@@ -668,7 +668,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__(7585);
+          return __webpack_require__(7451);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7585: /***/ function(
+    /***/ 7451: /***/ 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__(3668);
+      module.exports = __webpack_require__(7489);
 
       /***/
     }
@@ -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__(6723);
+          return __webpack_require__(5292);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6723: /***/ function(
+    /***/ 5292: /***/ 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__(3948);
+      module.exports = __webpack_require__(3951);
 
       /***/
     }
@@ -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__(667);
+          return __webpack_require__(2161);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 667: /***/ function(
+    /***/ 2161: /***/ 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__(3668);
+      module.exports = __webpack_require__(7489);
 
       /***/
     }
@@ -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 299.HASH.js

@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [299],
+  [128],
   {
-    /***/ 5299: /***/ function(
+    /***/ 5128: /***/ 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

@@ -736,7 +736,7 @@
       /***/
     },
 
-    /***/ 9260: /***/ function(module) {
+    /***/ 2048: /***/ function(module) {
       "use strict";
 
       var assign = Object.assign.bind(Object);
@@ -748,7 +748,7 @@
       /***/
     },
 
-    /***/ 1326: /***/ function() {
+    /***/ 3071: /***/ function() {
       "trimStart" in String.prototype ||
         (String.prototype.trimStart = String.prototype.trimLeft),
         "trimEnd" in String.prototype ||
@@ -792,15 +792,15 @@
       /***/
     },
 
-    /***/ 5090: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8126: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.addBasePath = addBasePath;
-      var _addPathPrefix = __webpack_require__(3795);
-      var _normalizeTrailingSlash = __webpack_require__(3892);
+      var _addPathPrefix = __webpack_require__(6341);
+      var _normalizeTrailingSlash = __webpack_require__(7600);
       var basePath = false || "";
       function addBasePath(path, required) {
         if (false) {
@@ -824,7 +824,7 @@
       /***/
     },
 
-    /***/ 6049: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9465: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -835,7 +835,7 @@
         value: true
       });
       exports.addLocale = void 0;
-      var _normalizeTrailingSlash = __webpack_require__(3892);
+      var _normalizeTrailingSlash = __webpack_require__(7600);
       var addLocale = function(path) {
         for (
           var _len = arguments.length,
@@ -867,7 +867,7 @@
       /***/
     },
 
-    /***/ 4354: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5770: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -906,14 +906,14 @@
       /***/
     },
 
-    /***/ 6926: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6298: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.hasBasePath = hasBasePath;
-      var _pathHasPrefix = __webpack_require__(4298);
+      var _pathHasPrefix = __webpack_require__(7189);
       var basePath = false || "";
       function hasBasePath(path) {
         return (0, _pathHasPrefix).pathHasPrefix(path, basePath);
@@ -933,7 +933,7 @@
       /***/
     },
 
-    /***/ 7172: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4862: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1111,7 +1111,7 @@
       /***/
     },
 
-    /***/ 3215: /***/ function(module, exports, __webpack_require__) {
+    /***/ 864: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1127,7 +1127,7 @@
       var _slicedToArray = __webpack_require__(8693) /* ["default"] */.Z;
       var _createSuper = __webpack_require__(6320) /* ["default"] */.Z;
       var _runtimeJs = /*#__PURE__*/ _interopRequireDefault(
-        __webpack_require__(739)
+        __webpack_require__(3994)
       );
       Object.defineProperty(exports, "__esModule", {
         value: true
@@ -1135,27 +1135,27 @@
       exports.initialize = initialize;
       exports.hydrate = hydrate;
       exports.emitter = exports.router = exports.version = void 0;
-      __webpack_require__(1326);
+      __webpack_require__(3071);
       var _react = _interopRequireWildcard1(__webpack_require__(9496));
-      var _headManagerContext = __webpack_require__(9043);
-      var _mitt = _interopRequireDefault1(__webpack_require__(7097));
-      var _routerContext = __webpack_require__(2488);
-      var _isDynamic = __webpack_require__(7046);
-      var _querystring = __webpack_require__(3742);
-      var _runtimeConfig = __webpack_require__(5780);
-      var _utils = __webpack_require__(2973);
-      var _portal = __webpack_require__(2321);
-      var _headManager = _interopRequireDefault1(__webpack_require__(7172));
-      var _pageLoader = _interopRequireDefault1(__webpack_require__(7822));
+      var _headManagerContext = __webpack_require__(5533);
+      var _mitt = _interopRequireDefault1(__webpack_require__(5228));
+      var _routerContext = __webpack_require__(1349);
+      var _isDynamic = __webpack_require__(8227);
+      var _querystring = __webpack_require__(8418);
+      var _runtimeConfig = __webpack_require__(537);
+      var _utils = __webpack_require__(6326);
+      var _portal = __webpack_require__(1278);
+      var _headManager = _interopRequireDefault1(__webpack_require__(4862));
+      var _pageLoader = _interopRequireDefault1(__webpack_require__(689));
       var _performanceRelayer = _interopRequireDefault1(
-        __webpack_require__(3367)
+        __webpack_require__(5148)
       );
-      var _routeAnnouncer = __webpack_require__(9851);
-      var _router = __webpack_require__(3668);
-      var _isError = __webpack_require__(467);
-      var _imageConfigContext = __webpack_require__(8584);
-      var _removeBasePath = __webpack_require__(8117);
-      var _hasBasePath = __webpack_require__(6926);
+      var _routeAnnouncer = __webpack_require__(6314);
+      var _router = __webpack_require__(7489);
+      var _isError = __webpack_require__(6040);
+      var _imageConfigContext = __webpack_require__(76);
+      var _removeBasePath = __webpack_require__(976);
+      var _hasBasePath = __webpack_require__(6298);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -1456,7 +1456,7 @@
                     if (false) {
                     }
                     if (initialData.scriptLoader) {
-                      initScriptLoader = __webpack_require__(3948)
+                      initScriptLoader = __webpack_require__(3951)
                         .initScriptLoader;
                       initScriptLoader(initialData.scriptLoader);
                     }
@@ -1776,7 +1776,7 @@
               ? Promise.resolve()
                   .then(function() {
                     return /*#__PURE__*/ _interopRequireWildcard(
-                      __webpack_require__(9103)
+                      __webpack_require__(2509)
                     );
                   })
                   .then(function(m) {
@@ -2202,10 +2202,10 @@
       /***/
     },
 
-    /***/ 7205: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9916: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
-      var _ = __webpack_require__(3215);
+      var _ = __webpack_require__(864);
       window.next = {
         version: _.version,
         // router is initialized later so it has to be live-binded
@@ -2235,15 +2235,15 @@
       /***/
     },
 
-    /***/ 3892: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7600: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.normalizePathTrailingSlash = void 0;
-      var _removeTrailingSlash = __webpack_require__(7131);
-      var _parsePath = __webpack_require__(2478);
+      var _removeTrailingSlash = __webpack_require__(390);
+      var _parsePath = __webpack_require__(3429);
       var normalizePathTrailingSlash = function(path) {
         if (!path.startsWith("/")) {
           return path;
@@ -2275,7 +2275,7 @@
       /***/
     },
 
-    /***/ 7822: /***/ function(module, exports, __webpack_require__) {
+    /***/ 689: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2287,16 +2287,16 @@
         value: true
       });
       exports["default"] = void 0;
-      var _addBasePath = __webpack_require__(5090);
-      var _router = __webpack_require__(7733);
+      var _addBasePath = __webpack_require__(8126);
+      var _router = __webpack_require__(8340);
       var _getAssetPathFromRoute = _interopRequireDefault(
-        __webpack_require__(7862)
+        __webpack_require__(8153)
       );
-      var _addLocale = __webpack_require__(6049);
-      var _isDynamic = __webpack_require__(7046);
-      var _parseRelativeUrl = __webpack_require__(860);
-      var _removeTrailingSlash = __webpack_require__(7131);
-      var _routeLoader = __webpack_require__(9042);
+      var _addLocale = __webpack_require__(9465);
+      var _isDynamic = __webpack_require__(8227);
+      var _parseRelativeUrl = __webpack_require__(6893);
+      var _removeTrailingSlash = __webpack_require__(390);
+      var _routeLoader = __webpack_require__(4358);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2448,14 +2448,14 @@
       /***/
     },
 
-    /***/ 3367: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5148: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports["default"] = void 0;
-      var _webVitals = __webpack_require__(5583);
+      var _webVitals = __webpack_require__(4867);
       var initialHref = location.href;
       var isRegistered = false;
       var userReportHandler;
@@ -2503,7 +2503,7 @@
       /***/
     },
 
-    /***/ 2321: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1278: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2565,14 +2565,14 @@
       /***/
     },
 
-    /***/ 8117: /***/ function(module, exports, __webpack_require__) {
+    /***/ 976: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.removeBasePath = removeBasePath;
-      var _hasBasePath = __webpack_require__(6926);
+      var _hasBasePath = __webpack_require__(6298);
       var basePath = false || "";
       function removeBasePath(path) {
         if (false) {
@@ -2596,14 +2596,14 @@
       /***/
     },
 
-    /***/ 6736: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8953: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.removeLocale = removeLocale;
-      var _parsePath = __webpack_require__(2478);
+      var _parsePath = __webpack_require__(3429);
       function removeLocale(path, locale) {
         if (false) {
           var localeLower, pathLower, pathname;
@@ -2625,7 +2625,7 @@
       /***/
     },
 
-    /***/ 5757: /***/ function(module, exports) {
+    /***/ 5617: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2671,7 +2671,7 @@
       /***/
     },
 
-    /***/ 9851: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6314: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2684,7 +2684,7 @@
       exports.RouteAnnouncer = RouteAnnouncer;
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(3668);
+      var _router = __webpack_require__(7489);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2768,7 +2768,7 @@
       /***/
     },
 
-    /***/ 9042: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4358: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2779,10 +2779,10 @@
       exports.getClientBuildManifest = getClientBuildManifest;
       exports.createRouteLoader = createRouteLoader;
       var _getAssetPathFromRoute = _interopRequireDefault(
-        __webpack_require__(7862)
+        __webpack_require__(8153)
       );
-      var _trustedTypes = __webpack_require__(8541);
-      var _requestIdleCallback = __webpack_require__(5757);
+      var _trustedTypes = __webpack_require__(6973);
+      var _requestIdleCallback = __webpack_require__(5617);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -3155,7 +3155,7 @@
       /***/
     },
 
-    /***/ 3668: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7489: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3183,10 +3183,10 @@
       exports.makePublicRouterInstance = makePublicRouterInstance;
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = _interopRequireDefault(__webpack_require__(7733));
-      var _routerContext = __webpack_require__(2488);
-      var _isError = _interopRequireDefault(__webpack_require__(467));
-      var _withRouter = _interopRequireDefault(__webpack_require__(7257));
+      var _router = _interopRequireDefault(__webpack_require__(8340));
+      var _routerContext = __webpack_require__(1349);
+      var _isError = _interopRequireDefault(__webpack_require__(6040));
+      var _withRouter = _interopRequireDefault(__webpack_require__(2847));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -3410,7 +3410,7 @@
       /***/
     },
 
-    /***/ 3948: /***/ function(module, exports, __webpack_require__) {
+    /***/ 3951: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3425,9 +3425,9 @@
       exports.initScriptLoader = initScriptLoader;
       exports["default"] = void 0;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _headManagerContext = __webpack_require__(9043);
-      var _headManager = __webpack_require__(7172);
-      var _requestIdleCallback = __webpack_require__(5757);
+      var _headManagerContext = __webpack_require__(5533);
+      var _headManager = __webpack_require__(4862);
+      var _requestIdleCallback = __webpack_require__(5617);
       function _extends() {
         _extends =
           Object.assign ||
@@ -3716,7 +3716,7 @@
       /***/
     },
 
-    /***/ 8541: /***/ function(modu
Post job cleanup.
[command]/usr/bin/git version
git version 2.37.0
Temporarily overriding HOME='/home/runner/work/_temp/8d7bf5ad-1be4-4ca5-b89d-2f3f5b3e1f62' 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: 92f29c3cc4e9032bbe53df4c95210e06b42e47ab

shuding · 2022-07-12T22:00:51Z

@SukkaW I'm particularly interested in the performance benefits here, is it faster than our current ETag lib?

Should experimental-edge also switch to fnv1a for ETag for consistency?

Yes if we decided to switch! Although we might want to patch fnv1a's source a little bit as we don't have Buffer in the Edge runtime.

SukkaW · 2022-07-13T05:14:55Z

@SukkaW I'm particularly interested in the performance benefits here, is it faster than our current ETag lib?

@shuding

The initial benchmark looks very promising. fnv1a is 20% faster.

Here is the benchmark from Next.js:

Here is the benchmark result of Next.js 12.2 on my machine:

$ npx autocannon localhost:3000 -c 50 -d 60s
Running 60s test @ http://localhost:3000
50 connections


┌─────────┬───────┬───────┬───────┬───────┬──────────┬──────────┬───────┐
│ Stat    │ 2.5%  │ 50%   │ 97.5% │ 99%   │ Avg      │ Stdev    │ Max   │
├─────────┼───────┼───────┼───────┼───────┼──────────┼──────────┼───────┤
│ Latency │ 15 ms │ 32 ms │ 50 ms │ 57 ms │ 30.03 ms │ 10.06 ms │ 95 ms │
└─────────┴───────┴───────┴───────┴───────┴──────────┴──────────┴───────┘
┌───────────┬───────┬─────────┬─────────┬───────┬─────────┬─────────┬───────┐
│ Stat      │ 1%    │ 2.5%    │ 50%     │ 97.5% │ Avg     │ Stdev   │ Min   │
├───────────┼───────┼─────────┼─────────┼───────┼─────────┼─────────┼───────┤
│ Req/Sec   │ 1054  │ 1063    │ 1417    │ 2857  │ 1637.69 │ 512.58  │ 1054  │
├───────────┼───────┼─────────┼─────────┼───────┼─────────┼─────────┼───────┤
│ Bytes/Sec │ 28 MB │ 28.3 MB │ 37.7 MB │ 76 MB │ 43.6 MB │ 13.6 MB │ 28 MB │
└───────────┴───────┴─────────┴─────────┴───────┴─────────┴─────────┴───────┘

Req/Bytes counts sampled once per second.
# of samples: 60

And here is the benchmark result of the PR on my machine:

$ npx autocannon localhost:3000 -c 50 -d 60s
Running 60s test @ http://localhost:3000
50 connections


┌─────────┬───────┬───────┬───────┬───────┬──────────┬─────────┬────────┐
│ Stat    │ 2.5%  │ 50%   │ 97.5% │ 99%   │ Avg      │ Stdev   │ Max    │
├─────────┼───────┼───────┼───────┼───────┼──────────┼─────────┼────────┤
│ Latency │ 17 ms │ 19 ms │ 29 ms │ 34 ms │ 19.68 ms │ 3.55 ms │ 103 ms │
└─────────┴───────┴───────┴───────┴───────┴──────────┴─────────┴────────┘
┌───────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
│ Stat      │ 1%      │ 2.5%    │ 50%     │ 97.5%   │ Avg     │ Stdev   │ Min     │
├───────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤
│ Req/Sec   │ 1328    │ 1819    │ 2515    │ 2655    │ 2478.56 │ 196.54  │ 1328    │
├───────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤
│ Bytes/Sec │ 35.3 MB │ 48.4 MB │ 66.9 MB │ 70.6 MB │ 65.9 MB │ 5.22 MB │ 35.3 MB │
└───────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘

Req/Bytes counts sampled once per second.
# of samples: 60

And here is the flamegraph of Next.js 12.2 during the benchmark:

While here is the flamegraph of the PR during the benchmark:

As you can see, there is less overhead during ETag generation.

shuding · 2022-07-14T12:12:06Z

Looks amazing, huge +1 on merging this!

SukkaW · 2022-07-14T16:17:57Z

Some other notes:

I have switched from sindresorhus' 32-bit fnv1a implementation to tjwebb's 52-bit fnv1a implementation dbe6790 (#38568)
- 52-bit is just below JavaScript's 53-bit integer limit, while the larger hash space provides an even lower chance of collision.
The original etag library uses native Node.js crypto API, while the Next.js built-in generateETag method uses Web Crypto API from Edge Runtime. Both of them have performance overhead. With fast fnv1a implementation, the native performance overhead is being avoided, see my flamegraph above.
Next.js server uses expressjs' serve-static (which also depends on etag) to serve static files, thus the etag package is not eliminated by the PR (hence the nodeModuleSize increases). I might re-implement the serve-static, or switch to Vercel's (amazing) serve-handler in the future PR.

SukkaW requested review from timneutkens, ijjk, shuding, padmaia and huozhi as code owners July 12, 2022 20:10

ijjk added the type: next label Jul 12, 2022

SukkaW marked this pull request as draft July 12, 2022 20:16

refactor: rewrite etag

0a90138

SukkaW force-pushed the rewrite-etag branch from 762d182 to 0a90138 Compare July 12, 2022 20:40

SukkaW added 2 commits July 13, 2022 15:50

refactor: use fnv1a 52bit instead of 32 bit

dbe6790

refactor: use fnv1a etag in edge runtime

c4a1fe1

SukkaW marked this pull request as ready for review July 13, 2022 09:00

chore: remove etag from ncc-compiled

5b7d81d

SukkaW force-pushed the rewrite-etag branch from a2e6857 to 5b7d81d Compare July 13, 2022 09:19

SukkaW and others added 3 commits July 13, 2022 09:44

⚙ Update compiled files

3f29ff5

Merge branch 'canary' into rewrite-etag

018d2b4

Merge branch 'canary' into rewrite-etag

6f667ba

shuding approved these changes Jul 14, 2022

View reviewed changes

kodiakhq bot and others added 6 commits July 14, 2022 17:29

Merge branch 'canary' into rewrite-etag

1a5cb69

Merge branch 'canary' into rewrite-etag

e15dabf

Merge branch 'canary' into rewrite-etag

7b37c57

Merge branch 'canary' into rewrite-etag

8ce351b

Merge branch 'canary' into rewrite-etag

f05f9b4

Merge branch 'canary' into rewrite-etag

e9fd7d0

SukkaW added 2 commits July 17, 2022 12:17

Merge branch 'canary' into rewrite-etag

1f254f6

Merge branch 'canary' into rewrite-etag

92f29c3

kodiakhq bot merged commit 97df2bb into vercel:canary Jul 18, 2022

trevor-fauna mentioned this pull request Jul 19, 2022

Fix export issue in with-fauna example #38812

Merged

2 tasks

github-actions bot locked as resolved and limited conversation to collaborators Aug 17, 2022

SukkaW deleted the rewrite-etag branch October 24, 2023 08:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: rewrite etag #38568

refactor: rewrite etag #38568

SukkaW commented Jul 12, 2022 •

edited

ijjk commented Jul 12, 2022 •

edited

ijjk commented Jul 12, 2022 •

edited

Diffs

shuding commented Jul 12, 2022

SukkaW commented Jul 13, 2022 •

edited

shuding commented Jul 14, 2022

SukkaW commented Jul 14, 2022 •

edited

refactor: rewrite etag #38568

refactor: rewrite etag #38568

Conversation

SukkaW commented Jul 12, 2022 • edited

ijjk commented Jul 12, 2022 • edited

Failing test suites

ijjk commented Jul 12, 2022 • edited

Stats from current PR

Diffs

shuding commented Jul 12, 2022

SukkaW commented Jul 13, 2022 • edited

shuding commented Jul 14, 2022

SukkaW commented Jul 14, 2022 • edited

SukkaW commented Jul 12, 2022 •

edited

ijjk commented Jul 12, 2022 •

edited

ijjk commented Jul 12, 2022 •

edited

SukkaW commented Jul 13, 2022 •

edited

SukkaW commented Jul 14, 2022 •

edited