Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

refactor dev overlay into hot reloader #41231

Merged
merged 8 commits into from Oct 7, 2022
Merged

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Oct 6, 2022

Move react-dev-overlay into hot reloader client components, and let it imported by app router. So then we don't need to have hot reloader and react tree as adjacent sibilings but the overlay with error boundary is wrapping the react tree

migrate dev overlay

fix typing

fix lock file

remove logs

revert precompile
@ijjk ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Oct 6, 2022
@ijjk
Copy link
Member

ijjk commented Oct 6, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary huozhi/next.js dev-overlay Change
buildDuration 42.1s 40.2s -1.9s
buildDurationCached 16.1s 10.8s -5.3s
nodeModulesSize 92.3 MB 92.3 MB -4.04 kB
nextStartRea..uration (ms) 346ms 380ms ⚠️ +34ms
nextDevReadyDuration 410ms 420ms ⚠️ +10ms
Page Load Tests Overall increase ✓
vercel/next.js canary huozhi/next.js dev-overlay Change
/ failed reqs 0 0
/ total time (seconds) 12.91 12.737 -0.17
/ avg req/sec 193.65 196.28 +2.63
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 8.181 8.227 ⚠️ +0.05
/error-in-render avg req/sec 305.59 303.89 ⚠️ -1.7
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary huozhi/next.js dev-overlay Change
27.HASH.js gzip 177 B 179 B ⚠️ +2 B
791-HASH.js gzip 12.3 kB 12.3 kB -1 B
app-internal..HASH.js gzip 409 B 408 B -1 B
framework-HASH.js gzip 48.7 kB 48.7 kB
main-app-HASH.js gzip 4.1 kB 4.1 kB ⚠️ +3 B
main-HASH.js gzip 31.2 kB 31.2 kB ⚠️ +25 B
webpack-HASH.js gzip 1.73 kB 1.73 kB -3 B
Overall change 98.6 kB 98.6 kB ⚠️ +25 B
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js dev-overlay Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages Overall decrease ✓
vercel/next.js canary huozhi/next.js dev-overlay Change
_app-HASH.js gzip 202 B 201 B -1 B
_error-HASH.js gzip 195 B 194 B -1 B
amp-HASH.js gzip 493 B 492 B -1 B
css-HASH.js gzip 327 B 328 B ⚠️ +1 B
dynamic-HASH.js gzip 2.03 kB 2.03 kB ⚠️ +2 B
edge-ssr-HASH.js gzip 272 B 272 B
head-HASH.js gzip 355 B 357 B ⚠️ +2 B
hooks-HASH.js gzip 805 B 804 B -1 B
image-HASH.js gzip 4.89 kB 4.89 kB ⚠️ +3 B
index-HASH.js gzip 262 B 264 B ⚠️ +2 B
link-HASH.js gzip 2.37 kB 2.36 kB -10 B
routerDirect..HASH.js gzip 322 B 320 B -2 B
script-HASH.js gzip 391 B 391 B
withRouter-HASH.js gzip 319 B 318 B -1 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 13.3 kB 13.3 kB -7 B
Client Build Manifests Overall decrease ✓
vercel/next.js canary huozhi/next.js dev-overlay Change
_buildManifest.js gzip 482 B 480 B -2 B
Overall change 482 B 480 B -2 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary huozhi/next.js dev-overlay Change
index.html gzip 512 B 513 B ⚠️ +1 B
link.html gzip 526 B 527 B ⚠️ +1 B
withRouter.html gzip 507 B 508 B ⚠️ +1 B
Overall change 1.54 kB 1.55 kB ⚠️ +3 B
Edge SSR bundle Size Overall decrease ✓
vercel/next.js canary huozhi/next.js dev-overlay Change
edge-ssr.js gzip 57.9 kB 57.9 kB -7 B
page.js gzip 87.7 kB 87.6 kB -62 B
Overall change 146 kB 145 kB -69 B
Middleware size Overall decrease ✓
vercel/next.js canary huozhi/next.js dev-overlay Change
middleware-b..fest.js gzip 608 B 605 B -3 B
middleware-r..fest.js gzip 145 B 145 B
middleware.js gzip 18.3 kB 18.3 kB -5 B
edge-runtime..pack.js gzip 1.83 kB 1.83 kB
Overall change 20.9 kB 20.9 kB -8 B

Diffs

Diff for page.js

Diff too large to display

Diff for middleware-b..-manifest.js
@@ -7,96 +7,96 @@ self.__BUILD_MANIFEST = {
     "static/BUILD_ID/_ssgManifest.js"
   ],
   rootMainFiles: [
-    "static/chunks/webpack-ff882831ec0849af.js",
-    "static/chunks/framework-b11e50df1bb3c9a6.js",
-    "static/chunks/791-7e8faf689db96725.js",
-    "static/chunks/main-app-cefd198640b7d0f0.js"
+    "static/chunks/webpack-2c4117ebc42a0173.js",
+    "static/chunks/framework-1c550577ef415f93.js",
+    "static/chunks/575-08da569bcec2377c.js",
+    "static/chunks/main-app-702eb2f9a99fffb4.js"
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/index-8f8df33b6b56a893.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/index-05aab9219f31b17e.js"
     ],
     "/_app": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/_app-4c8f8db28ded8df4.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/_app-6949af07e56e49b7.js"
     ],
     "/_error": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/_error-a05ed569030d31cf.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/_error-205cf4435d5ba48b.js"
     ],
     "/amp": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/amp-96e086d56d84ecf3.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/amp-6a7082101c10b2eb.js"
     ],
     "/css": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-428970b9517fb836.js"
+      "static/chunks/pages/css-f197b4212dd3ac17.js"
     ],
     "/dynamic": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/dynamic-a0721d65b4a79d61.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/dynamic-fac852909072e207.js"
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/edge-ssr-75aef063be641ae2.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/edge-ssr-14f1db2c51bd6d3c.js"
     ],
     "/head": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/head-d37064300b3c4db4.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/head-3a161ed8d6ff708b.js"
     ],
     "/hooks": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/hooks-f42908d1274536db.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/hooks-d4b75595d8872d26.js"
     ],
     "/image": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/image-c45ddbbdf40183b7.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/image-0c67288cb6d10629.js"
     ],
     "/link": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/link-c918f506590dfa3e.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/link-613e7f1618930a6f.js"
     ],
     "/routerDirect": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/routerDirect-b5e7495986c1e9ee.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/routerDirect-c7389de6fab068c3.js"
     ],
     "/script": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/script-076b8f5bf519ceb6.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/script-ec437cd8939c3756.js"
     ],
     "/withRouter": [
-      "static/chunks/webpack-ff882831ec0849af.js",
-      "static/chunks/framework-b11e50df1bb3c9a6.js",
-      "static/chunks/main-94ec9d9a99329142.js",
-      "static/chunks/pages/withRouter-572b4af651a903bd.js"
+      "static/chunks/webpack-2c4117ebc42a0173.js",
+      "static/chunks/framework-1c550577ef415f93.js",
+      "static/chunks/main-c2c2bfa0980c88e1.js",
+      "static/chunks/pages/withRouter-63d31065422c4eeb.js"
     ]
   },
   ampFirstPages: []
Diff for middleware-r..-manifest.js
@@ -1,6 +1,6 @@
 self.__REACT_LOADABLE_MANIFEST = {
   "dynamic.js -> ../components/hello": {
-    id: 2774,
-    files: ["static/chunks/27.084ec41a5ec09432.js"]
+    id: 3201,
+    files: ["static/chunks/201.8fecc5db6af0c0fc.js"]
   }
 };
Diff for middleware.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 3802: /***/ (
+    /***/ 2945: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -14,13 +14,13 @@
         /* harmony export */
       });
       /* harmony import */ var next_dist_server_web_adapter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        9965
+        4402
       );
 
       (0,
       next_dist_server_web_adapter__WEBPACK_IMPORTED_MODULE_0__ /* .enhanceGlobals */.gL)();
 
-      var mod = __webpack_require__(5702);
+      var mod = __webpack_require__(3594);
       var handler = mod.middleware || mod.default;
 
       if (typeof handler !== "function") {
@@ -46,7 +46,7 @@
       /***/
     },
 
-    /***/ 5702: /***/ (
+    /***/ 3594: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -58,7 +58,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        8646
+        253
       );
       /* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
         next_server__WEBPACK_IMPORTED_MODULE_0__
@@ -71,7 +71,7 @@
       /***/
     },
 
-    /***/ 2941: /***/ (__unused_webpack_module, exports) => {
+    /***/ 658: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -91,7 +91,7 @@
       /***/
     },
 
-    /***/ 733: /***/ (__unused_webpack_module, exports) => {
+    /***/ 2911: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -129,7 +129,7 @@
       /***/
     },
 
-    /***/ 5236: /***/ (__unused_webpack_module, exports) => {
+    /***/ 7324: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -161,7 +161,7 @@
       /***/
     },
 
-    /***/ 2098: /***/ (
+    /***/ 7773: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -172,8 +172,8 @@
         value: true
       });
       exports.addLocale = addLocale;
-      var _addPathPrefix = __webpack_require__(7620);
-      var _pathHasPrefix = __webpack_require__(929);
+      var _addPathPrefix = __webpack_require__(3366);
+      var _pathHasPrefix = __webpack_require__(7838);
       function addLocale(path, locale, defaultLocale, ignorePrefix) {
         if (
           locale &&
@@ -193,7 +193,7 @@
       /***/
     },
 
-    /***/ 7620: /***/ (
+    /***/ 3366: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -204,7 +204,7 @@
         value: true
       });
       exports.addPathPrefix = addPathPrefix;
-      var _parsePath = __webpack_require__(5956);
+      var _parsePath = __webpack_require__(6003);
       function addPathPrefix(path, prefix) {
         if (!path.startsWith("/") || !prefix) {
           return path;
@@ -216,7 +216,7 @@
       /***/
     },
 
-    /***/ 1315: /***/ (
+    /***/ 6734: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -227,7 +227,7 @@
         value: true
       });
       exports.addPathSuffix = addPathSuffix;
-      var _parsePath = __webpack_require__(5956);
+      var _parsePath = __webpack_require__(6003);
       function addPathSuffix(path, suffix) {
         if (!path.startsWith("/") || !suffix) {
           return path;
@@ -239,7 +239,7 @@
       /***/
     },
 
-    /***/ 5468: /***/ (
+    /***/ 9209: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -250,10 +250,10 @@
         value: true
       });
       exports.formatNextPathnameInfo = formatNextPathnameInfo;
-      var _removeTrailingSlash = __webpack_require__(1861);
-      var _addPathPrefix = __webpack_require__(7620);
-      var _addPathSuffix = __webpack_require__(1315);
-      var _addLocale = __webpack_require__(2098);
+      var _removeTrailingSlash = __webpack_require__(5303);
+      var _addPathPrefix = __webpack_require__(3366);
+      var _addPathSuffix = __webpack_require__(6734);
+      var _addLocale = __webpack_require__(7773);
       function formatNextPathnameInfo(info) {
         let pathname = (0, _addLocale).addLocale(
           info.pathname,
@@ -281,7 +281,7 @@
       /***/
     },
 
-    /***/ 142: /***/ (
+    /***/ 4199: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -292,9 +292,9 @@
         value: true
       });
       exports.getNextPathnameInfo = getNextPathnameInfo;
-      var _normalizeLocalePath = __webpack_require__(5236);
-      var _removePathPrefix = __webpack_require__(2046);
-      var _pathHasPrefix = __webpack_require__(929);
+      var _normalizeLocalePath = __webpack_require__(7324);
+      var _removePathPrefix = __webpack_require__(7457);
+      var _pathHasPrefix = __webpack_require__(7838);
       function getNextPathnameInfo(pathname, options) {
         var _nextConfig;
         const { basePath, i18n, trailingSlash } =
@@ -344,7 +344,7 @@
       /***/
     },
 
-    /***/ 5956: /***/ (__unused_webpack_module, exports) => {
+    /***/ 6003: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -378,7 +378,7 @@
       /***/
     },
 
-    /***/ 929: /***/ (
+    /***/ 7838: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -389,7 +389,7 @@
         value: true
       });
       exports.pathHasPrefix = pathHasPrefix;
-      var _parsePath = __webpack_require__(5956);
+      var _parsePath = __webpack_require__(6003);
       function pathHasPrefix(path, prefix) {
         if (typeof path !== "string") {
           return false;
@@ -401,7 +401,7 @@
       /***/
     },
 
-    /***/ 3754: /***/ (__unused_webpack_module, exports) => {
+    /***/ 1448: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -420,7 +420,7 @@
       /***/
     },
 
-    /***/ 2046: /***/ (
+    /***/ 7457: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -431,7 +431,7 @@
         value: true
       });
       exports.removePathPrefix = removePathPrefix;
-      var _pathHasPrefix = __webpack_require__(929);
+      var _pathHasPrefix = __webpack_require__(7838);
       function removePathPrefix(path, prefix) {
         if ((0, _pathHasPrefix).pathHasPrefix(path, prefix)) {
           const withoutPrefix = path.slice(prefix.length);
@@ -445,7 +445,7 @@
       /***/
     },
 
-    /***/ 1861: /***/ (__unused_webpack_module, exports) => {
+    /***/ 5303: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -459,7 +459,7 @@
       /***/
     },
 
-    /***/ 1948: /***/ module => {
+    /***/ 965: /***/ module => {
       var __dirname = "/";
       (() => {
         "use strict";
@@ -587,7 +587,7 @@
       /***/
     },
 
-    /***/ 3980: /***/ (module, exports, __webpack_require__) => {
+    /***/ 4803: /***/ (module, exports, __webpack_require__) => {
       var __dirname = "/";
       var __WEBPACK_AMD_DEFINE_RESULT__;
       (() => {
@@ -1429,7 +1429,7 @@
       /***/
     },
 
-    /***/ 2831: /***/ (__unused_webpack_module, exports) => {
+    /***/ 8784: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1471,7 +1471,7 @@
       /***/
     },
 
-    /***/ 9965: /***/ (
+    /***/ 4402: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1485,14 +1485,14 @@
       exports.VL = adapter;
       exports.OT = blockUnallowedResponse;
       exports.gL = enhanceGlobals;
-      var _error = __webpack_require__(3975);
-      var _utils = __webpack_require__(1657);
-      var _fetchEvent = __webpack_require__(1745);
-      var _request = __webpack_require__(3371);
-      var _response = __webpack_require__(9062);
-      var _relativizeUrl = __webpack_require__(3754);
-      var _nextUrl = __webpack_require__(130);
-      var _internalUtils = __webpack_require__(2831);
+      var _error = __webpack_require__(6140);
+      var _utils = __webpack_require__(4867);
+      var _fetchEvent = __webpack_require__(1222);
+      var _request = __webpack_require__(6751);
+      var _response = __webpack_require__(1244);
+      var _relativizeUrl = __webpack_require__(1448);
+      var _nextUrl = __webpack_require__(7329);
+      var _internalUtils = __webpack_require__(8784);
       class NextRequestHint extends _request.NextRequest {
         constructor(params) {
           super(params.input, params.init);
@@ -1722,7 +1722,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3975: /***/ (__unused_webpack_module, exports) => {
+    /***/ 6140: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1763,7 +1763,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 130: /***/ (
+    /***/ 7329: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1773,10 +1773,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _detectDomainLocale = __webpack_require__(733);
-      var _formatNextPathnameInfo = __webpack_require__(5468);
-      var _getHostname = __webpack_require__(2941);
-      var _getNextPathnameInfo = __webpack_require__(142);
+      var _detectDomainLocale = __webpack_require__(2911);
+      var _formatNextPathnameInfo = __webpack_require__(9209);
+      var _getHostname = __webpack_require__(658);
+      var _getNextPathnameInfo = __webpack_require__(4199);
       const REGEX_LOCALHOST_HOSTNAME = /(?!^https?:\/\/)(127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}|::1|localhost)/;
       function parseURL(url, base) {
         return new URL(
@@ -2001,7 +2001,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3265: /***/ (
+    /***/ 1552: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2011,7 +2011,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _cookie = _interopRequireDefault(__webpack_require__(1948));
+      var _cookie = _interopRequireDefault(__webpack_require__(965));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2146,7 +2146,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1745: /***/ (
+    /***/ 1222: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2157,7 +2157,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.waitUntilSymbol = void 0;
-      var _error = __webpack_require__(3975);
+      var _error = __webpack_require__(6140);
       const responseSymbol = Symbol("response");
       const passThroughSymbol = Symbol("passThrough");
       const waitUntilSymbol = Symbol("waitUntil");
@@ -2210,7 +2210,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3371: /***/ (
+    /***/ 6751: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2221,10 +2221,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.INTERNALS = void 0;
-      var _nextUrl = __webpack_require__(130);
-      var _utils = __webpack_require__(1657);
-      var _error = __webpack_require__(3975);
-      var _cookies = __webpack_require__(3265);
+      var _nextUrl = __webpack_require__(7329);
+      var _utils = __webpack_require__(4867);
+      var _error = __webpack_require__(6140);
+      var _cookies = __webpack_require__(1552);
       const INTERNALS = Symbol("internal request");
       exports.INTERNALS = INTERNALS;
       class NextRequest extends Request {
@@ -2305,7 +2305,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 9062: /***/ (
+    /***/ 1244: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2315,9 +2315,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _nextUrl = __webpack_require__(130);
-      var _utils = __webpack_require__(1657);
-      var _cookies = __webpack_require__(3265);
+      var _nextUrl = __webpack_require__(7329);
+      var _utils = __webpack_require__(4867);
+      var _cookies = __webpack_require__(1552);
       const INTERNALS = Symbol("internal response");
       const REDIRECTS = new Set([301, 302, 303, 307, 308]);
       class NextResponse extends Response {
@@ -2407,7 +2407,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1264: /***/ (
+    /***/ 4112: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2421,7 +2421,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       __webpack_unused_export__ = isBot;
       exports.Nf = userAgentFromString;
       exports.WE = userAgent;
-      var _uaParserJs = _interopRequireDefault(__webpack_require__(3980));
+      var _uaParserJs = _interopRequireDefault(__webpack_require__(4803));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2449,7 +2449,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1657: /***/ (__unused_webpack_module, exports) => {
+    /***/ 4867: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2564,14 +2564,14 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 8646: /***/ (module, exports, __webpack_require__) => {
+    /***/ 253: /***/ (module, exports, __webpack_require__) => {
       const serverExports = {
-        NextRequest: __webpack_require__(3371).NextRequest,
-        NextResponse: __webpack_require__(9062).NextResponse,
+        NextRequest: __webpack_require__(6751).NextRequest,
+        NextResponse: __webpack_require__(1244).NextResponse,
         userAgentFromString: __webpack_require__(
-          1264
+          4112
         ) /* .userAgentFromString */.Nf,
-        userAgent: __webpack_require__(1264) /* .userAgent */.WE
+        userAgent: __webpack_require__(4112) /* .userAgent */.WE
       };
 
       if (typeof URLPattern !== "undefined") {
@@ -2597,7 +2597,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = moduleId =>
       __webpack_require__((__webpack_require__.s = moduleId));
-    /******/ var __webpack_exports__ = __webpack_exec__(3802);
+    /******/ var __webpack_exports__ = __webpack_exec__(2945);
     /******/ (_ENTRIES =
       typeof _ENTRIES === "undefined"
         ? {}
Diff for edge-ssr.js

Diff too large to display

Diff for _buildManifest.js
@@ -1,28 +1,28 @@
 self.__BUILD_MANIFEST = {
   __rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-8f8df33b6b56a893.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-a05ed569030d31cf.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-96e086d56d84ecf3.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-05aab9219f31b17e.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-205cf4435d5ba48b.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-6a7082101c10b2eb.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-428970b9517fb836.js"
+    "static\u002Fchunks\u002Fpages\u002Fcss-f197b4212dd3ac17.js"
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-a0721d65b4a79d61.js"
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-fac852909072e207.js"
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-75aef063be641ae2.js"
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-14f1db2c51bd6d3c.js"
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-d37064300b3c4db4.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-f42908d1274536db.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-c45ddbbdf40183b7.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-c918f506590dfa3e.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-3a161ed8d6ff708b.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-d4b75595d8872d26.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-0c67288cb6d10629.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-613e7f1618930a6f.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-b5e7495986c1e9ee.js"
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-c7389de6fab068c3.js"
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-076b8f5bf519ceb6.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-ec437cd8939c3756.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-572b4af651a903bd.js"
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-63d31065422c4eeb.js"
   ],
   sortedPages: [
     "\u002F",
Diff for _app-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [888],
   {
-    /***/ 8351: /***/ function(
+    /***/ 7006: /***/ 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__(4181);
+          return __webpack_require__(1969);
         }
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 179], function() {
-      return __webpack_exec__(8351), __webpack_exec__(2670);
+      return __webpack_exec__(7006), __webpack_exec__(1897);
     });
     /******/ 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],
   {
-    /***/ 9548: /***/ function(
+    /***/ 3020: /***/ 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__(6787);
+          return __webpack_require__(1581);
         }
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(9548);
+      return __webpack_exec__(3020);
     });
     /******/ 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],
   {
-    /***/ 3485: /***/ function(
+    /***/ 7481: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3840);
+      module.exports = __webpack_require__(6240);
 
       /***/
     },
 
-    /***/ 6530: /***/ function(
+    /***/ 2880: /***/ 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__(3815);
+          return __webpack_require__(5810);
         }
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 3840: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6240: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -38,8 +38,8 @@
       var _interop_require_default = __webpack_require__(7022) /* ["default"] */
         .Z;
       var _react = _interop_require_default(__webpack_require__(6273));
-      var _ampContext = __webpack_require__(6799);
-      var _ampMode = __webpack_require__(6032);
+      var _ampContext = __webpack_require__(7825);
+      var _ampMode = __webpack_require__(6357);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampMode).isInAmpMode(
@@ -61,7 +61,7 @@
       /***/
     },
 
-    /***/ 3815: /***/ function(
+    /***/ 5810: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -78,7 +78,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        3485
+        7481
       );
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
         next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -102,7 +102,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(6530);
+      return __webpack_exec__(2880);
     });
     /******/ 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],
   {
-    /***/ 631: /***/ function(
+    /***/ 1737: /***/ 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__(9817);
+          return __webpack_require__(2146);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 9817: /***/ function(
+    /***/ 2146: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -29,7 +29,7 @@
         1760
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        5550
+        3892
       );
       /* 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 @@
       /***/
     },
 
-    /***/ 5550: /***/ function(module) {
+    /***/ 3892: /***/ 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__(631);
+      return __webpack_exec__(1737);
     });
     /******/ 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],
   {
-    /***/ 8963: /***/ function(
+    /***/ 9051: /***/ 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__(26);
+          return __webpack_require__(3768);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 292: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4517: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -34,7 +34,7 @@
       var _interop_require_default = __webpack_require__(7022) /* ["default"] */
         .Z;
       var _react = _interop_require_default(__webpack_require__(6273));
-      var _loadable = _interop_require_default(__webpack_require__(9749));
+      var _loadable = _interop_require_default(__webpack_require__(7792));
       function dynamic(dynamicOptions, options) {
         var loadableFn = _loadable.default;
         var loadableOptions = (options == null
@@ -137,7 +137,7 @@
       /***/
     },
 
-    /***/ 3824: /***/ function(
+    /***/ 4511: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -159,7 +159,7 @@
       /***/
     },
 
-    /***/ 9749: /***/ function(
+    /***/ 7792: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -179,7 +179,7 @@
       var _interop_require_default = __webpack_require__(7022) /* ["default"] */
         .Z;
       var _react = _interop_require_default(__webpack_require__(6273));
-      var _loadableContext = __webpack_require__(3824);
+      var _loadableContext = __webpack_require__(4511);
       var useSyncExternalStore = (true ? __webpack_require__(6273) : 0)
         .useSyncExternalStore;
       var ALL_INITIALIZERS = [];
@@ -493,7 +493,7 @@
       /***/
     },
 
-    /***/ 26: /***/ function(
+    /***/ 3768: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -510,7 +510,7 @@
         1760
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        6706
+        9477
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -519,13 +519,13 @@
       var DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         function() {
           return __webpack_require__
-            .e(/* import() */ 27)
-            .then(__webpack_require__.bind(__webpack_require__, 2774));
+            .e(/* import() */ 201)
+            .then(__webpack_require__.bind(__webpack_require__, 3201));
         },
         {
           loadableGenerated: {
             webpack: function() {
-              return [/*require.resolve*/ 2774];
+              return [/*require.resolve*/ 3201];
             }
           }
         }
@@ -555,12 +555,12 @@
       /***/
     },
 
-    /***/ 6706: /***/ function(
+    /***/ 9477: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(292);
+      module.exports = __webpack_require__(4517);
 
       /***/
     }
@@ -571,7 +571,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(8963);
+      return __webpack_exec__(9051);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for edge-ssr-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [800],
   {
-    /***/ 529: /***/ function(
+    /***/ 3839: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/edge-ssr",
         function() {
-          return __webpack_require__(1366);
+          return __webpack_require__(4428);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1366: /***/ function(
+    /***/ 4428: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -50,7 +50,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(529);
+      return __webpack_exec__(3839);
     });
     /******/ 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],
   {
-    /***/ 8780: /***/ function(
+    /***/ 2116: /***/ 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__(5268);
+          return __webpack_require__(6355);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5268: /***/ function(
+    /***/ 6355: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         1760
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        8722
+        8631
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -71,12 +71,12 @@
       /***/
     },
 
-    /***/ 8722: /***/ function(
+    /***/ 8631: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(8985);
+      module.exports = __webpack_require__(2792);
 
       /***/
     }
@@ -87,7 +87,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(8780);
+      return __webpack_exec__(2116);
     });
     /******/ 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],
   {
-    /***/ 4076: /***/ function(
+    /***/ 1042: /***/ 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__(4903);
+          return __webpack_require__(1467);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4903: /***/ function(
+    /***/ 1467: /***/ 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__(4076);
+      return __webpack_exec__(1042);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for image-HASH.js
@@ -26,7 +26,7 @@
       /***/
     },
 
-    /***/ 7735: /***/ function(
+    /***/ 7865: /***/ 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__(7375);
+          return __webpack_require__(8908);
         }
       ]);
       if (false) {
@@ -43,7 +43,7 @@
       /***/
     },
 
-    /***/ 4998: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9022: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -66,12 +66,12 @@
         5997
       ) /* ["default"] */.Z;
       var _react = _interop_require_wildcard(__webpack_require__(6273));
-      var _head = _interop_require_default(__webpack_require__(8985));
-      var _imageConfig = __webpack_require__(5167);
-      var _useIntersection = __webpack_require__(4173);
-      var _imageConfigContext = __webpack_require__(9692);
-      var _utils = __webpack_require__(400);
-      var _normalizeTrailingSlash = __webpack_require__(5212);
+      var _head = _interop_require_default(__webpack_require__(2792));
+      var _imageConfig = __webpack_require__(6615);
+      var _useIntersection = __webpack_require__(636);
+      var _imageConfigContext = __webpack_require__(907);
+      var _utils = __webpack_require__(632);
+      var _normalizeTrailingSlash = __webpack_require__(4267);
       function Image(_param) {
         var src = _param.src,
           sizes = _param.sizes,
@@ -929,7 +929,7 @@
       /***/
     },
 
-    /***/ 4173: /***/ function(module, exports, __webpack_require__) {
+    /***/ 636: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -941,7 +941,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(6273);
-      var _requestIdleCallback = __webpack_require__(9874);
+      var _requestIdleCallback = __webpack_require__(8332);
       var hasIntersectionObserver = typeof IntersectionObserver === "function";
       var observers = new Map();
       var idList = [];
@@ -1066,7 +1066,7 @@
       /***/
     },
 
-    /***/ 7375: /***/ function(
+    /***/ 8908: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1087,8 +1087,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/react@0.0.0-experimental-cb5084d1c-20220924/node_modules/react/jsx-runtime.js
       var jsx_runtime = __webpack_require__(1760);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_bah4pvzs5m2jsombgoz6nngonm/node_modules/next/image.js
-      var next_image = __webpack_require__(1769);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_bah4pvzs5m2jsombgoz6nngonm/node_modules/next/image.js
+      var next_image = __webpack_require__(3608);
       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",
@@ -1118,12 +1118,12 @@
       /***/
     },
 
-    /***/ 1769: /***/ function(
+    /***/ 3608: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(4998);
+      module.exports = __webpack_require__(9022);
 
       /***/
     }
@@ -1134,7 +1134,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(7735);
+      return __webpack_exec__(7865);
     });
     /******/ 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],
   {
-    /***/ 2047: /***/ function(
+    /***/ 1239: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/",
         function() {
-          return __webpack_require__(5444);
+          return __webpack_require__(6544);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5444: /***/ function(
+    /***/ 6544: /***/ 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__(2047);
+      return __webpack_exec__(1239);
     });
     /******/ 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],
   {
-    /***/ 9279: /***/ function(
+    /***/ 485: /***/ 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__(1747);
+          return __webpack_require__(6837);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1311: /***/ function(module, exports) {
+    /***/ 2258: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -54,7 +54,7 @@
       /***/
     },
 
-    /***/ 3478: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8636: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -72,13 +72,13 @@
         5997
       ) /* ["default"] */.Z;
       var _react = _interop_require_default(__webpack_require__(6273));
-      var _router = __webpack_require__(8678);
-      var _addLocale = __webpack_require__(9579);
-      var _routerContext = __webpack_require__(2170);
-      var _appRouterContext = __webpack_require__(2313);
-      var _useIntersection = __webpack_require__(4173);
-      var _getDomainLocale = __webpack_require__(1311);
-      var _addBasePath = __webpack_require__(7878);
+      var _router = __webpack_require__(739);
+      var _addLocale = __webpack_require__(775);
+      var _routerContext = __webpack_require__(1853);
+      var _appRouterContext = __webpack_require__(9935);
+      var _useIntersection = __webpack_require__(636);
+      var _getDomainLocale = __webpack_require__(2258);
+      var _addBasePath = __webpack_require__(8758);
       ("client");
       var prefetched = {};
       function prefetch(router, href, as, options) {
@@ -429,7 +429,7 @@
       /***/
     },
 
-    /***/ 4173: /***/ function(module, exports, __webpack_require__) {
+    /***/ 636: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -441,7 +441,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(6273);
-      var _requestIdleCallback = __webpack_require__(9874);
+      var _requestIdleCallback = __webpack_require__(8332);
       var hasIntersectionObserver = typeof IntersectionObserver === "function";
       var observers = new Map();
       var idList = [];
@@ -566,7 +566,7 @@
       /***/
     },
 
-    /***/ 2313: /***/ function(
+    /***/ 9935: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -594,7 +594,7 @@
       /***/
     },
 
-    /***/ 1747: /***/ function(
+    /***/ 6837: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -611,7 +611,7 @@
         1760
       );
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        7892
+        1777
       );
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_link__WEBPACK_IMPORTED_MODULE_1__
@@ -642,12 +642,12 @@
       /***/
     },
 
-    /***/ 7892: /***/ function(
+    /***/ 1777: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3478);
+      module.exports = __webpack_require__(8636);
 
       /***/
     }
@@ -658,7 +658,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(9279);
+      return __webpack_exec__(485);
     });
     /******/ 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],
   {
-    /***/ 5847: /***/ function(
+    /***/ 4500: /***/ 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__(7646);
+          return __webpack_require__(7359);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7646: /***/ function(
+    /***/ 7359: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         1760
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        3318
+        9073
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -56,12 +56,12 @@
       /***/
     },
 
-    /***/ 3318: /***/ function(
+    /***/ 9073: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(2670);
+      module.exports = __webpack_require__(1897);
 
       /***/
     }
@@ -72,7 +72,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(5847);
+      return __webpack_exec__(4500);
     });
     /******/ 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],
   {
-    /***/ 7992: /***/ function(
+    /***/ 7140: /***/ 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__(7821);
+          return __webpack_require__(8186);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7821: /***/ function(
+    /***/ 8186: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         1760
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        3785
+        4861
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -70,12 +70,12 @@
       /***/
     },
 
-    /***/ 3785: /***/ function(
+    /***/ 4861: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = false ? 0 : __webpack_require__(2460);
+      module.exports = false ? 0 : __webpack_require__(3512);
 
       /***/
     }
@@ -86,7 +86,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(7992);
+      return __webpack_exec__(7140);
     });
     /******/ 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],
   {
-    /***/ 5996: /***/ function(
+    /***/ 3377: /***/ 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__(1177);
+          return __webpack_require__(6716);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1177: /***/ function(
+    /***/ 6716: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         1760
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        3318
+        9073
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,12 +54,12 @@
       /***/
     },
 
-    /***/ 3318: /***/ function(
+    /***/ 9073: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(2670);
+      module.exports = __webpack_require__(1897);
 
       /***/
     }
@@ -70,7 +70,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(5996);
+      return __webpack_exec__(3377);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for 27.HASH.js
@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [27],
+  [201],
   {
-    /***/ 2774: /***/ function(
+    /***/ 3201: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
Diff for 791-HASH.js
@@ -1,6 +1,6 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [791],
+  [575],
   {
     /***/ 8286: /***/ function(__unused_webpack_module, exports) {
       Object.defineProperty(exports, "__esModule", {
@@ -711,7 +711,7 @@
       /***/
     },
 
-    /***/ 4019: /***/ function(module, exports, __webpack_require__) {
+    /***/ 615: /***/ function(module, exports, __webpack_require__) {
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
@@ -727,16 +727,16 @@
         8889
       ) /* ["default"] */.Z;
       var _react = _interop_require_wildcard(__webpack_require__(6273));
-      var _reactServerDomWebpack = __webpack_require__(6769);
-      var _appRouterContext = __webpack_require__(2313);
-      var _reducer = __webpack_require__(4392);
-      var _hooksClientContext = __webpack_require__(7410);
-      var _useReducerWithDevtools = __webpack_require__(2354);
+      var _reactServerDomWebpack = __webpack_require__(2418);
+      var _appRouterContext = __webpack_require__(9935);
+      var _reducer = __webpack_require__(1822);
+      var _hooksClientContext = __webpack_require__(6202);
+      var _useReducerWithDevtools = __webpack_require__(8824);
       function AppRouter(param) {
         var initialTree = param.initialTree,
           initialCanonicalUrl = param.initialCanonicalUrl,
           children = param.children,
-          hotReloader = param.hotReloader;
+          assetPrefix = param.assetPrefix;
         var initialState = (0, _react).useMemo(
           function() {
             return {
@@ -1042,12 +1042,15 @@
                       url: canonicalUrl
                     }
                   },
-                  /*#__PURE__*/ _react.default.createElement(
-                    ErrorOverlay,
-                    null,
-                    cache.subTreeData
-                  ),
-                  hotReloader
+                  HotReloader
+                    ? /*#__PURE__*/ _react.default.createElement(
+                        HotReloader,
+                        {
+                          assetPrefix: assetPrefix
+                        },
+                        cache.subTreeData
+                      )
+                    : cache.subTreeData
                 )
               )
             )
@@ -1060,6 +1063,7 @@
         // TODO-APP: handle .rsc for static export case
         return urlWithoutFlightParameters;
       }
+      var HotReloader = true ? null : 0;
       function fetchServerResponse(url, flightRouterState, prefetch) {
         return _fetchServerResponse.apply(this, arguments);
       }
@@ -1115,20 +1119,6 @@
         });
         return _fetchServerResponse.apply(this, arguments);
       }
-      /**
-       * Renders development error overlay when NODE_ENV is development.
-       */ function ErrorOverlay(param) {
-        var children = param.children;
-        if (true) {
-          return /*#__PURE__*/ _react.default.createElement(
-            _react.default.Fragment,
-            null,
-            children
-          );
-        } else {
-          var ReactDevOverlay;
-        }
-      }
       // Ensure the initialParallelRoutes are not combined because of double-rendering in the browser with Strict Mode.
       // TODO-APP: move this back into AppRouter
       var initialParallelRoutes = false ? 0 : new Map();
@@ -1148,7 +1138,7 @@
       /***/
     },
 
-    /***/ 7410: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6202: /***/ function(module, exports, __webpack_require__) {
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
@@ -1179,7 +1169,7 @@
       /***/
     },
 
-    /***/ 8636: /***/ function(module, exports) {
+    /***/ 436: /***/ function(module, exports) {
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
@@ -1215,7 +1205,7 @@
       /***/
     },
 
-    /***/ 2791: /***/ function(module, exports, __webpack_require__) {
+    /***/ 2575: /***/ function(module, exports, __webpack_require__) {
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
@@ -1236,10 +1226,10 @@
         8889
       ) /* ["default"] */.Z;
       var _react = _interop_require_wildcard(__webpack_require__(6273));
-      var _appRouterContext = __webpack_require__(2313);
-      var _appRouterClient = __webpack_require__(4019);
-      var _infinitePromise = __webpack_require__(8636);
-      var _matchSegments = __webpack_require__(8630);
+      var _appRouterContext = __webpack_require__(9935);
+      var _appRouterClient = __webpack_require__(615);
+      var _infinitePromise = __webpack_require__(436);
+      var _matchSegments = __webpack_require__(8660);
       function OuterLayoutRouter(param) {
         var parallelRouterKey = param.parallelRouterKey,
           segmentPath = param.segmentPath,
@@ -1798,7 +1788,7 @@
       /***/
     },
 
-    /***/ 8630: /***/ function(module, exports) {
+    /***/ 8660: /***/ function(module, exports) {
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
@@ -1836,7 +1826,7 @@
       /***/
     },
 
-    /***/ 4392: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1822: /***/ function(module, exports, __webpack_require__) {
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
@@ -1848,8 +1838,8 @@
       });
       exports.reducer = exports.ACTION_PREFETCH = exports.ACTION_SERVER_PATCH = exports.ACTION_RESTORE = exports.ACTION_NAVIGATE = exports.ACTION_RELOAD
Post job cleanup.
[command]/usr/bin/git version
git version 2.37.3
Temporarily overriding HOME='/home/runner/work/_temp/87e25f35-7375-4570-961e-2c3eb7cb1bdc' 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: ae17c94a0ad8f35cd71b942f5c3c1e571ec426f7

@huozhi huozhi marked this pull request as ready for review October 6, 2022 21:35
@huozhi huozhi marked this pull request as draft October 6, 2022 21:51
@ijjk
Copy link
Member

ijjk commented Oct 6, 2022

Failing test suites

Commit: dd10790

pnpm testheadless test/e2e/app-dir/app-edge.test.ts

  • app-dir edge SSR > should handle edge only routes
Expand output

● app-dir edge SSR › should handle edge only routes

expect(received).toContain(expected) // indexOf

Expected substring: "<p>app-edge-ssr</p>"
Received string:    "<!DOCTYPE html><html id=\"__next_error__\"><head><script src=\"/_next/static/chunks/polyfills.js\" nomodule=\"\"></script></head><body><script src=\"/_next/static/chunks/webpack.js\" async=\"\"></script><script src=\"/_next/static/chunks/main-app.js\" async=\"\"></script></body></html><script>(self.__next_s=self.__next_s||[]).push([0])</script><script>(self.__next_s=self.__next_s||[]).push([1,\"M1:{\\\"id\\\":\\\"./node_modules/.pnpm/file+..+next-repo-53cf07b4bed495931c00af0af46e2df2_cp2jcz3x25y66wyl5e5r4trbvm/node_modules/next/dist/client/components/app-router.client.js\\\",\\\"name\\\":\\\"default\\\",\\\"chunks\\\":[\\\"app-internals:app-internals\\\"],\\\"async\\\":false}\\nM2:{\\\"id\\\":\\\"./node_modules/.pnpm/file+..+next-repo-53cf07b4bed495931c00af0af46e2df2_cp2jcz3x25y66wyl5e5r4trbvm/node_modules/next/dist/client/components/layout-router.client.js\\\",\\\"name\\\":\\\"default\\\",\\\"chunks\\\":[\\\"app-internals:app-internals\\\"],\\\"async\\\":false}\\nM3:{\\\"id\\\":\\\"./node_mo\"])</script><script>(self.__next_s=self.__next_s||[]).push([1,\"dules/.pnpm/file+..+next-repo-53cf07b4bed495931c00af0af46e2df2_cp2jcz3x25y66wyl5e5r4trbvm/node_modules/next/dist/client/components/render-from-template-context.client.js\\\",\\\"name\\\":\\\"default\\\",\\\"chunks\\\":[\\\"app-internals:app-internals\\\"],\\\"async\\\":false}\\nM4:{\\\"id\\\":\\\"./app/app-edge/layout.tsx\\\",\\\"chunks\\\":[\\\"app/app-edge/layout:app/app-edge/layout\\\"],\\\"name\\\":\\\"default\\\",\\\"async\\\":true}\\n\"])</script><script>(self.__next_s=self.__next_s||[]).push([1,\"J0:[\\\"$\\\",\\\"@1\\\",null,{\\\"assetPrefix\\\":\\\"\\\",\\\"initialCanonicalUrl\\\":\\\"/app-edge\\\",\\\"initialTree\\\":[\\\"\\\",{\\\"children\\\":[\\\"app-edge\\\",{\\\"children\\\":[\\\"\\\",{}]}]}],\\\"children\\\":[[],[],[\\\"$\\\",\\\"html\\\",null,{\\\"children\\\":[[\\\"$\\\",\\\"head\\\",null,{}],[\\\"$\\\",\\\"body\\\",null,{\\\"children\\\":[\\\"$\\\",\\\"@2\\\",null,{\\\"parallelRouterKey\\\":\\\"children\\\",\\\"segmentPath\\\":[\\\"children\\\"],\\\"hasLoading\\\":false,\\\"template\\\":[\\\"$\\\",\\\"@3\\\",null,{}],\\\"childProp\\\":{\\\"current\\\":[[],[],[\\\"$\\\",\\\"@4\\\",null,{\\\"children\\\":[\\\"$\\\",\\\"@2\\\",null,{\\\"parallelRouterKey\\\":\\\"children\\\",\\\"segmentPath\\\":[\\\"children\\\",\\\"app-edge\\\",\\\"children\\\"],\\\"hasLoading\\\":false,\\\"template\\\":[\\\"$\\\",\\\"@3\\\",null,{}],\\\"childProp\\\":{\\\"current\\\":[[],[],[\\\"$\\\",\\\"p\\\",null,{\\\"children\\\":\\\"app-edge-ssr\\\"}]],\\\"segment\\\":\\\"\\\"},\\\"rootLayoutIncluded\\\":true}],\\\"params\\\":{}}]],\\\"segment\\\":\\\"app-edge\\\"},\\\"rootLayoutIncluded\\\":true}]}]]}]]}]\\n\"])</script>"

  33 |   it('should handle edge only routes', async () => {
  34 |     const appHtml = await renderViaHTTP(next.url, '/app-edge')
> 35 |     expect(appHtml).toContain('<p>app-edge-ssr</p>')
     |                     ^
  36 |
  37 |     const pageHtml = await renderViaHTTP(next.url, '/pages-edge')
  38 |     expect(pageHtml).toContain('<p>pages-edge-ssr</p>')

  at Object.<anonymous> (e2e/app-dir/app-edge.test.ts:35:21)

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

@huozhi huozhi marked this pull request as ready for review October 6, 2022 22:36
@kodiakhq kodiakhq bot merged commit a415f34 into vercel:canary Oct 7, 2022
@huozhi huozhi deleted the dev-overlay branch October 7, 2022 13:43
Kikobeats pushed a commit to Kikobeats/next.js that referenced this pull request Oct 24, 2022
Move react-dev-overlay into hot reloader client components, and let it imported by app router. So then we don't need to have hot reloader and react tree as adjacent sibilings but the overlay with error boundary is wrapping the react tree


Co-authored-by: Tim Neutkens <6324199+timneutkens@users.noreply.github.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants