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

Allow Middleware to set its matcher #37177

Merged

Conversation

Schniz
Copy link
Contributor

@Schniz Schniz commented May 25, 2022

This PR will allow Middleware to set its matcher through export const config = { matching: ... }

Related

Feature

  • Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
  • Related issues linked using fixes #number
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

@ijjk
Copy link
Member

ijjk commented May 25, 2022

Failing test suites

Commit: 5a269bb

yarn testheadless test/e2e/middleware-can-set-the-matcher-in-its-config/index.test.ts

  • Middleware can set the matcher in its config > using RegExp > does not add the header for root request
  • Middleware can set the matcher in its config > using a path pattern > does not add the header for root request
Expand output

● Middleware can set the matcher in its config › using a path pattern › does not add the header for root request

expect(received).toBeNull()

Received: "true"

  39 |     it('does not add the header for root request', async () => {
  40 |       const response = await fetchViaHTTP(next.url, '/')
> 41 |       expect(response.headers.get('X-From-Middleware')).toBeNull()
     |                                                         ^
  42 |       expect(await response.text()).toContain('root page')
  43 |     })
  44 |

  at Object.<anonymous> (e2e/middleware-can-set-the-matcher-in-its-config/index.test.ts:41:57)

● Middleware can set the matcher in its config › using RegExp › does not add the header for root request

expect(received).toBeNull()

Received: "true"

  85 |     it('does not add the header for root request', async () => {
  86 |       const response = await fetchViaHTTP(next.url, '/')
> 87 |       expect(response.headers.get('X-From-Middleware')).toBeNull()
     |                                                         ^
  88 |       expect(await response.text()).toContain('root page')
  89 |     })
  90 |

  at Object.<anonymous> (e2e/middleware-can-set-the-matcher-in-its-config/index.test.ts:87:57)
      at runMicrotasks (<anonymous>)

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

@ijjk
Copy link
Member

ijjk commented May 25, 2022

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary Schniz/next.js middleware-can-set-matcher-in-its-config Change
buildDuration 25.9s 26.5s ⚠️ +687ms
buildDurationCached 9.2s 8.8s -375ms
nodeModulesSize 1.85 GB 1.85 GB ⚠️ +11.9 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary Schniz/next.js middleware-can-set-matcher-in-its-config Change
/ failed reqs 0 0
/ total time (seconds) 5.928 5.99 ⚠️ +0.06
/ avg req/sec 421.73 417.35 ⚠️ -4.38
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 2.245 2.385 ⚠️ +0.14
/error-in-render avg req/sec 1113.42 1048.08 ⚠️ -65.34
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary Schniz/next.js middleware-can-set-matcher-in-its-config Change
437.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 29.7 kB 29.7 kB ⚠️ +1 B
webpack-HASH.js gzip 1.53 kB 1.54 kB ⚠️ +4 B
Overall change 73.4 kB 73.4 kB ⚠️ +5 B
Legacy Client Bundles (polyfills)
vercel/next.js canary Schniz/next.js middleware-can-set-matcher-in-its-config Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages Overall decrease ✓
vercel/next.js canary Schniz/next.js middleware-can-set-matcher-in-its-config Change
_app-HASH.js gzip 1.37 kB 1.37 kB ⚠️ +1 B
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 495 B 496 B ⚠️ +1 B
css-HASH.js gzip 328 B 327 B -1 B
dynamic-HASH.js gzip 2.7 kB 2.7 kB ⚠️ +1 B
head-HASH.js gzip 359 B 355 B -4 B
hooks-HASH.js gzip 920 B 919 B -1 B
image-HASH.js gzip 5.74 kB 5.74 kB -2 B
index-HASH.js gzip 263 B 264 B ⚠️ +1 B
link-HASH.js gzip 2.85 kB 2.85 kB ⚠️ +4 B
routerDirect..HASH.js gzip 322 B 321 B -1 B
script-HASH.js gzip 392 B 390 B -2 B
withRouter-HASH.js gzip 320 B 318 B -2 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 16.4 kB 16.4 kB -5 B
Client Build Manifests Overall increase ⚠️
vercel/next.js canary Schniz/next.js middleware-can-set-matcher-in-its-config Change
_buildManifest.js gzip 458 B 459 B ⚠️ +1 B
Overall change 458 B 459 B ⚠️ +1 B
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary Schniz/next.js middleware-can-set-matcher-in-its-config Change
index.html gzip 533 B 533 B
link.html gzip 547 B 546 B -1 B
withRouter.html gzip 528 B 527 B -1 B
Overall change 1.61 kB 1.61 kB -2 B

Diffs

Diff for _buildManifest.js
@@ -1,25 +1,25 @@
 self.__BUILD_MANIFEST = {
   __rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-5d085461d4b7e1ee.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-48e41d26ff0101f8.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-6515d1b91fe9c7da.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-71b39a0d29d24c94.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-f7a25bc135f661fc.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-7e272727af269b98.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-6d59dba2fd31bfed.js"
+    "static\u002Fchunks\u002Fpages\u002Fcss-a95e3bc2c5ca8245.js"
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-22ab8fbf7e5acbc7.js"
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-672cb693b0ca9d7e.js"
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-6ece0649d14938b8.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-e3382ebb932b5bfb.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-c3f8e97eedd82117.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-04612f6fd262d0f0.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-e2b7857f2aa86120.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-a5d0da0f39070d96.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-a032795453eaeab0.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-cd9947d21ef7c72e.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-9669d5861da5e10b.js"
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-c2408dd9a1984376.js"
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-c439c95569fb9033.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-f309dfc4eea310f4.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-8b03818d0ed540a0.js"
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-fb06f1f34bce84ca.js"
   ],
   sortedPages: [
     "\u002F",
Diff for _app-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [888],
   {
-    /***/ 3479: /***/ function(
+    /***/ 122: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_app",
         function() {
-          return __webpack_require__(3653);
+          return __webpack_require__(539);
         }
       ]);
       if (false) {
@@ -18,14 +18,14 @@
       /***/
     },
 
-    /***/ 3653: /***/ function(
+    /***/ 539: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
     ) {
       "use strict";
 
-      var _runtimeJs = _interopRequireDefault(__webpack_require__(739));
+      var _runtimeJs = _interopRequireDefault(__webpack_require__(3994));
       function _assertThisInitialized(self) {
         if (self === void 0) {
           throw new ReferenceError(
@@ -153,7 +153,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault1(__webpack_require__(9496));
-      var _utils = __webpack_require__(8030);
+      var _utils = __webpack_require__(9089);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -282,7 +282,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 179], function() {
-      return __webpack_exec__(3479), __webpack_exec__(7465);
+      return __webpack_exec__(122), __webpack_exec__(1905);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for _error-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [820],
   {
-    /***/ 2929: /***/ function(
+    /***/ 3560: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_error",
         function() {
-          return __webpack_require__(5590);
+          return __webpack_require__(9733);
         }
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(2929);
+      return __webpack_exec__(3560);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for amp-HASH.js
@@ -1,17 +1,17 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [216],
   {
-    /***/ 94: /***/ function(
+    /***/ 7941: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(4634);
+      module.exports = __webpack_require__(79);
 
       /***/
     },
 
-    /***/ 9028: /***/ function(
+    /***/ 8958: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -19,7 +19,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/amp",
         function() {
-          return __webpack_require__(4628);
+          return __webpack_require__(6534);
         }
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 4634: /***/ function(module, exports, __webpack_require__) {
+    /***/ 79: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -36,8 +36,8 @@
       });
       exports.useAmp = useAmp;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _ampContext = __webpack_require__(2054);
-      var _ampMode = __webpack_require__(1122);
+      var _ampContext = __webpack_require__(3131);
+      var _ampMode = __webpack_require__(868);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -66,7 +66,7 @@
       /***/
     },
 
-    /***/ 4628: /***/ function(
+    /***/ 6534: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -83,7 +83,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        94
+        7941
       );
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
         next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -107,7 +107,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(9028);
+      return __webpack_exec__(8958);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for css-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [706],
   {
-    /***/ 8281: /***/ function(
+    /***/ 9557: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/css",
         function() {
-          return __webpack_require__(1949);
+          return __webpack_require__(4173);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1949: /***/ function(
+    /***/ 4173: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -29,7 +29,7 @@
         4637
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        1099
+        2467
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,7 +48,7 @@
       /***/
     },
 
-    /***/ 1099: /***/ function(module) {
+    /***/ 2467: /***/ function(module) {
       // extracted by mini-css-extract-plugin
       module.exports = { helloWorld: "css_helloWorld__qqNwY" };
 
@@ -61,7 +61,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(8281);
+      return __webpack_exec__(9557);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for dynamic-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [739],
   {
-    /***/ 2744: /***/ function(
+    /***/ 5695: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/dynamic",
         function() {
-          return __webpack_require__(1697);
+          return __webpack_require__(7800);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1926: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7164: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _defineProperty(obj, key, value) {
@@ -68,7 +68,7 @@
       exports["default"] = dynamic;
       exports.noSSR = noSSR;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadable = _interopRequireDefault(__webpack_require__(4596));
+      var _loadable = _interopRequireDefault(__webpack_require__(4398));
       function dynamic(dynamicOptions, options) {
         var loadableFn = _loadable.default;
         var loadableOptions = {
@@ -171,7 +171,7 @@
       /***/
     },
 
-    /***/ 7063: /***/ function(
+    /***/ 7484: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -198,7 +198,7 @@
       /***/
     },
 
-    /***/ 4596: /***/ function(
+    /***/ 4398: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -259,7 +259,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadableContext = __webpack_require__(7063);
+      var _loadableContext = __webpack_require__(7484);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -582,7 +582,7 @@
       /***/
     },
 
-    /***/ 1697: /***/ function(
+    /***/ 7800: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -599,7 +599,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__
@@ -608,13 +608,13 @@
       var DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         function() {
           return __webpack_require__
-            .e(/* import() */ 437)
-            .then(__webpack_require__.bind(__webpack_require__, 7437));
+            .e(/* import() */ 181)
+            .then(__webpack_require__.bind(__webpack_require__, 1181));
         },
         {
           loadableGenerated: {
             webpack: function() {
-              return [/*require.resolve*/ 7437];
+              return [/*require.resolve*/ 1181];
             }
           }
         }
@@ -644,12 +644,12 @@
       /***/
     },
 
-    /***/ 1605: /***/ function(
+    /***/ 2123: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(1926);
+      module.exports = __webpack_require__(7164);
 
       /***/
     },
@@ -751,7 +751,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(2744);
+      return __webpack_exec__(5695);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for head-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [645],
   {
-    /***/ 4337: /***/ function(
+    /***/ 7148: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/head",
         function() {
-          return __webpack_require__(848);
+          return __webpack_require__(6179);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 848: /***/ function(
+    /***/ 6179: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        8915
+        4616
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -71,12 +71,12 @@
       /***/
     },
 
-    /***/ 8915: /***/ function(
+    /***/ 4616: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(4828);
+      module.exports = __webpack_require__(5222);
 
       /***/
     }
@@ -87,7 +87,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4337);
+      return __webpack_exec__(7148);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for hooks-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [757],
   {
-    /***/ 4853: /***/ function(
+    /***/ 3515: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/hooks",
         function() {
-          return __webpack_require__(7084);
+          return __webpack_require__(856);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7084: /***/ function(
+    /***/ 856: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -158,7 +158,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4853);
+      return __webpack_exec__(3515);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for image-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [358],
   {
-    /***/ 7570: /***/ function(
+    /***/ 1487: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function() {
-          return __webpack_require__(3918);
+          return __webpack_require__(2330);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2185: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5239: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -123,12 +123,12 @@
       });
       exports["default"] = Image;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _head = _interopRequireDefault(__webpack_require__(4828));
-      var _imageConfig = __webpack_require__(2204);
-      var _useIntersection = __webpack_require__(6363);
-      var _imageConfigContext = __webpack_require__(1958);
-      var _utils = __webpack_require__(8030);
-      var _normalizeTrailingSlash = __webpack_require__(1872);
+      var _head = _interopRequireDefault(__webpack_require__(5222));
+      var _imageConfig = __webpack_require__(5466);
+      var _useIntersection = __webpack_require__(1311);
+      var _imageConfigContext = __webpack_require__(1801);
+      var _utils = __webpack_require__(9089);
+      var _normalizeTrailingSlash = __webpack_require__(2800);
       function Image(_param) {
         var src = _param.src,
           sizes = _param.sizes,
@@ -1124,7 +1124,7 @@
       /***/
     },
 
-    /***/ 6363: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1311: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -1193,7 +1193,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _requestIdleCallback = __webpack_require__(7307);
       var hasIntersectionObserver = typeof IntersectionObserver !== "undefined";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -1339,7 +1339,7 @@
       /***/
     },
 
-    /***/ 3918: /***/ function(
+    /***/ 2330: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1360,8 +1360,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",
@@ -1389,12 +1389,12 @@
       /***/
     },
 
-    /***/ 8114: /***/ function(
+    /***/ 4033: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(2185);
+      module.exports = __webpack_require__(5239);
 
       /***/
     }
@@ -1405,7 +1405,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(7570);
+      return __webpack_exec__(1487);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for index-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [405],
   {
-    /***/ 4786: /***/ function(
+    /***/ 6967: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/",
         function() {
-          return __webpack_require__(7245);
+          return __webpack_require__(9257);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7245: /***/ function(
+    /***/ 9257: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -46,7 +46,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(4786);
+      return __webpack_exec__(6967);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for link-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [644],
   {
-    /***/ 2783: /***/ function(
+    /***/ 9367: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/link",
         function() {
-          return __webpack_require__(3122);
+          return __webpack_require__(7178);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7870: /***/ function(module, exports) {
+    /***/ 7280: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -54,7 +54,7 @@
       /***/
     },
 
-    /***/ 7160: /***/ function(module, exports, __webpack_require__) {
+    /***/ 3952: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -131,13 +131,13 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(1368);
-      var _addLocale = __webpack_require__(3090);
-      var _routerContext = __webpack_require__(9831);
-      var _appRouterContext = __webpack_require__(482);
-      var _useIntersection = __webpack_require__(6363);
-      var _getDomainLocale = __webpack_require__(7870);
-      var _addBasePath = __webpack_require__(596);
+      var _router = __webpack_require__(5920);
+      var _addLocale = __webpack_require__(4841);
+      var _routerContext = __webpack_require__(8940);
+      var _appRouterContext = __webpack_require__(2587);
+      var _useIntersection = __webpack_require__(1311);
+      var _getDomainLocale = __webpack_require__(7280);
+      var _addBasePath = __webpack_require__(9154);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -486,7 +486,7 @@
       /***/
     },
 
-    /***/ 6363: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1311: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -555,7 +555,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _requestIdleCallback = __webpack_require__(7307);
       var hasIntersectionObserver = typeof IntersectionObserver !== "undefined";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -701,7 +701,7 @@
       /***/
     },
 
-    /***/ 482: /***/ function(
+    /***/ 2587: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -728,7 +728,7 @@
       /***/
     },
 
-    /***/ 3122: /***/ function(
+    /***/ 7178: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -745,7 +745,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__
@@ -776,12 +776,12 @@
       /***/
     },
 
-    /***/ 8168: /***/ function(
+    /***/ 8728: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(7160);
+      module.exports = __webpack_require__(3952);
 
       /***/
     }
@@ -792,7 +792,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(2783);
+      return __webpack_exec__(9367);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for routerDirect-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [58],
   {
-    /***/ 5863: /***/ function(
+    /***/ 4538: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/routerDirect",
         function() {
-          return __webpack_require__(2550);
+          return __webpack_require__(8080);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2550: /***/ function(
+    /***/ 8080: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        9393
+        7084
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -57,12 +57,12 @@
       /***/
     },
 
-    /***/ 9393: /***/ function(
+    /***/ 7084: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(7465);
+      module.exports = __webpack_require__(1905);
 
       /***/
     }
@@ -73,7 +73,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(5863);
+      return __webpack_exec__(4538);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for script-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [797],
   {
-    /***/ 581: /***/ function(
+    /***/ 2644: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/script",
         function() {
-          return __webpack_require__(6436);
+          return __webpack_require__(9689);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6436: /***/ function(
+    /***/ 9689: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        2311
+        7635
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -70,12 +70,12 @@
       /***/
     },
 
-    /***/ 2311: /***/ function(
+    /***/ 7635: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(5031);
+      module.exports = __webpack_require__(736);
 
       /***/
     }
@@ -86,7 +86,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(581);
+      return __webpack_exec__(2644);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for withRouter-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [807],
   {
-    /***/ 4573: /***/ function(
+    /***/ 5577: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/withRouter",
         function() {
-          return __webpack_require__(5526);
+          return __webpack_require__(237);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5526: /***/ function(
+    /***/ 237: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        9393
+        7084
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,12 +54,12 @@
       /***/
     },
 
-    /***/ 9393: /***/ function(
+    /***/ 7084: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(7465);
+      module.exports = __webpack_require__(1905);
 
       /***/
     }
@@ -70,7 +70,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4573);
+      return __webpack_exec__(5577);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for 437.HASH.js
@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [437],
+  [181],
   {
-    /***/ 7437: /***/ function(
+    /***/ 1181: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
Diff for framework-HASH.js
@@ -19,7 +19,7 @@
  Modernizr 3.0.0pre (Custom Build) | MIT
 */
       var aa = __webpack_require__(9496),
-        m = __webpack_require__(9260),
+        m = __webpack_require__(2048),
         r = __webpack_require__(8051);
       function y(a) {
         for (
@@ -7895,7 +7895,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      __webpack_require__(9260);
+      __webpack_require__(2048);
       var f = __webpack_require__(9496),
         g = 60103;
       exports.Fragment = 60107;
@@ -7948,7 +7948,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var l = __webpack_require__(9260),
+      var l = __webpack_require__(2048),
         n = 60103,
         p = 60106;
       exports.Fragment = 60107;
Diff for main-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [179],
   {
-    /***/ 9260: /***/ function(module) {
+    /***/ 2048: /***/ function(module) {
       "use strict";
 
       var assign = Object.assign.bind(Object);
@@ -13,7 +13,7 @@
       /***/
     },
 
-    /***/ 1326: /***/ function() {
+    /***/ 3071: /***/ function() {
       "trimStart" in String.prototype ||
         (String.prototype.trimStart = String.prototype.trimLeft),
         "trimEnd" in String.prototype ||
@@ -57,15 +57,15 @@
       /***/
     },
 
-    /***/ 596: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9154: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.addBasePath = addBasePath;
-      var _addPathPrefix = __webpack_require__(8186);
-      var _normalizeTrailingSlash = __webpack_require__(1872);
+      var _addPathPrefix = __webpack_require__(7677);
+      var _normalizeTrailingSlash = __webpack_require__(2800);
       var basePath = false || "";
       function addBasePath(path, required) {
         if (false) {
@@ -89,7 +89,7 @@
       /***/
     },
 
-    /***/ 3090: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4841: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -136,7 +136,7 @@
         value: true
       });
       exports.addLocale = void 0;
-      var _normalizeTrailingSlash = __webpack_require__(1872);
+      var _normalizeTrailingSlash = __webpack_require__(2800);
       var addLocale = function(path) {
         for (
           var _len = arguments.length,
@@ -168,7 +168,7 @@
       /***/
     },
 
-    /***/ 382: /***/ function(module, exports) {
+    /***/ 3881: /***/ function(module, exports) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -243,14 +243,14 @@
       /***/
     },
 
-    /***/ 2900: /***/ function(module, exports, __webpack_require__) {
+    /***/ 729: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.hasBasePath = hasBasePath;
-      var _pathHasPrefix = __webpack_require__(5580);
+      var _pathHasPrefix = __webpack_require__(8910);
       var basePath = false || "";
       function hasBasePath(path) {
         return (0, _pathHasPrefix).pathHasPrefix(path, basePath);
@@ -270,7 +270,7 @@
       /***/
     },
 
-    /***/ 1048: /***/ function(module, exports) {
+    /***/ 6736: /***/ function(module, exports) {
       "use strict";
 
       function _instanceof(left, right) {
@@ -468,10 +468,10 @@
       /***/
     },
 
-    /***/ 3185: /***/ function(module, exports, __webpack_require__) {
+    /***/ 571: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
-      var _runtimeJs = _interopRequireDefault(__webpack_require__(739));
+      var _runtimeJs = _interopRequireDefault(__webpack_require__(3994));
       function _arrayLikeToArray(arr, len) {
         if (len == null || len > arr.length) len = arr.length;
         for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
@@ -694,27 +694,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__(7574);
-      var _mitt = _interopRequireDefault1(__webpack_require__(4835));
-      var _routerContext = __webpack_require__(9831);
-      var _isDynamic = __webpack_require__(485);
-      var _querystring = __webpack_require__(5361);
-      var _runtimeConfig = __webpack_require__(975);
-      var _utils = __webpack_require__(8030);
-      var _portal = __webpack_require__(5765);
-      var _headManager = _interopRequireDefault1(__webpack_require__(1048));
-      var _pageLoader = _interopRequireDefault1(__webpack_require__(1153));
+      var _headManagerContext = __webpack_require__(6469);
+      var _mitt = _interopRequireDefault1(__webpack_require__(5569));
+      var _routerContext = __webpack_require__(8940);
+      var _isDynamic = __webpack_require__(580);
+      var _querystring = __webpack_require__(1150);
+      var _runtimeConfig = __webpack_require__(4649);
+      var _utils = __webpack_require__(9089);
+      var _portal = __webpack_require__(558);
+      var _headManager = _interopRequireDefault1(__webpack_require__(6736));
+      var _pageLoader = _interopRequireDefault1(__webpack_require__(4773));
       var _performanceRelayer = _interopRequireDefault1(
-        __webpack_require__(4959)
+        __webpack_require__(7136)
       );
-      var _routeAnnouncer = __webpack_require__(7100);
-      var _router = __webpack_require__(7465);
-      var _isError = __webpack_require__(467);
-      var _imageConfigContext = __webpack_require__(1958);
-      var _removeBasePath = __webpack_require__(589);
-      var _hasBasePath = __webpack_require__(2900);
+      var _routeAnnouncer = __webpack_require__(8738);
+      var _router = __webpack_require__(1905);
+      var _isError = __webpack_require__(6040);
+      var _imageConfigContext = __webpack_require__(1801);
+      var _removeBasePath = __webpack_require__(9186);
+      var _hasBasePath = __webpack_require__(729);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -1002,7 +1002,7 @@
                     if (false) {
                     }
                     if (initialData.scriptLoader) {
-                      initScriptLoader = __webpack_require__(5031)
+                      initScriptLoader = __webpack_require__(736)
                         .initScriptLoader;
                       initScriptLoader(initialData.scriptLoader);
                     }
@@ -1323,7 +1323,7 @@
               : lastAppProps.Component) === ErrorComponent
               ? Promise.resolve()
                   .then(function() {
-                    return _interopRequireWildcard(__webpack_require__(5590));
+                    return _interopRequireWildcard(__webpack_require__(9733));
                   })
                   .then(function(m) {
                     return {
@@ -1748,10 +1748,10 @@
       /***/
     },
 
-    /***/ 2905: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7242: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
-      var _ = __webpack_require__(3185);
+      var _ = __webpack_require__(571);
       window.next = {
         version: _.version,
         // router is initialized later so it has to be live-binded
@@ -1781,15 +1781,15 @@
       /***/
     },
 
-    /***/ 1872: /***/ function(module, exports, __webpack_require__) {
+    /***/ 2800: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.normalizePathTrailingSlash = void 0;
-      var _removeTrailingSlash = __webpack_require__(7658);
-      var _parsePath = __webpack_require__(5396);
+      var _removeTrailingSlash = __webpack_require__(9160);
+      var _parsePath = __webpack_require__(3146);
       var normalizePathTrailingSlash = function(path) {
         if (!path.startsWith("/")) {
           return path;
@@ -1821,7 +1821,7 @@
       /***/
     },
 
-    /***/ 1153: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4773: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _classCallCheck(instance, Constructor) {
@@ -1847,16 +1847,16 @@
         value: true
       });
       exports["default"] = void 0;
-      var _addBasePath = __webpack_require__(596);
-      var _router = __webpack_require__(1368);
+      var _addBasePath = __webpack_require__(9154);
+      var _router = __webpack_require__(5920);
       var _getAssetPathFromRoute = _interopRequireDefault(
-        __webpack_require__(3031)
+        __webpack_require__(7294)
       );
-      var _addLocale = __webpack_require__(3090);
-      var _isDynamic = __webpack_require__(485);
-      var _parseRelativeUrl = __webpack_require__(1184);
-      var _removeTrailingSlash = __webpack_require__(7658);
-      var _routeLoader = __webpack_require__(6449);
+      var _addLocale = __webpack_require__(4841);
+      var _isDynamic = __webpack_require__(580);
+      var _parseRelativeUrl = __webpack_require__(2657);
+      var _removeTrailingSlash = __webpack_require__(9160);
+      var _routeLoader = __webpack_require__(3051);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2015,14 +2015,14 @@
       /***/
     },
 
-    /***/ 4959: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7136: /***/ 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;
@@ -2069,7 +2069,7 @@
       /***/
     },
 
-    /***/ 5765: /***/ function(module, exports, __webpack_require__) {
+    /***/ 558: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -2188,14 +2188,14 @@
       /***/
     },
 
-    /***/ 589: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9186: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.removeBasePath = removeBasePath;
-      var _hasBasePath = __webpack_require__(2900);
+      var _hasBasePath = __webpack_require__(729);
       var basePath = false || "";
       function removeBasePath(path) {
         if (false) {
@@ -2219,14 +2219,14 @@
       /***/
     },
 
-    /***/ 9710: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4077: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.removeLocale = removeLocale;
-      var _parsePath = __webpack_require__(5396);
+      var _parsePath = __webpack_require__(3146);
       function removeLocale(path, locale) {
         if (false) {
           var localeLower, pathLower, pathname;
@@ -2248,7 +2248,7 @@
       /***/
     },
 
-    /***/ 7808: /***/ function(module, exports) {
+    /***/ 7307: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2294,7 +2294,7 @@
       /***/
     },
 
-    /***/ 7100: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8738: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -2364,7 +2364,7 @@
       exports.RouteAnnouncer = RouteAnnouncer;
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(7465);
+      var _router = __webpack_require__(1905);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2450,7 +2450,7 @@
       /***/
     },
 
-    /***/ 6449: /***/ function(module, exports, __webpack_require__) {
+    /***/ 3051: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2462,10 +2462,10 @@
       exports.getMiddlewareManifest = getMiddlewareManifest;
       exports.createRouteLoader = createRouteLoader;
       var _getAssetPathFromRoute = _interopRequireDefault(
-        __webpack_require__(3031)
+        __webpack_require__(7294)
       );
-      var _trustedTypes = __webpack_require__(915);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _trustedTypes = __webpack_require__(5786);
+      var _requestIdleCallback = __webpack_require__(7307);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2858,7 +2858,7 @@
       /***/
     },
 
-    /***/ 7465: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1905: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -2958,10 +2958,10 @@
       exports.makePublicRouterInstance = makePublicRouterInstance;
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = _interopRequireDefault(__webpack_require__(1368));
-      var _routerContext = __webpack_require__(9831);
-      var _isError = _interopRequireDefault(__webpack_require__(467));
-      var _withRouter = _interopRequireDefault(__webpack_require__(8000));
+      var _router = _interopRequireDefault(__webpack_require__(5920));
+      var _routerContext = __webpack_require__(8940);
+      var _isError = _interopRequireDefault(__webpack_require__(6040));
+      var _withRouter = _interopRequireDefault(__webpack_require__(1460));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -3185,7 +3185,7 @@
       /***/
     },
 
-    /***/ 5031: /***/ function(module, exports, __webpack_require__) {
+    /***/ 736: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -3279,9 +3279,9 @@
       exports.initScriptLoader = initScriptLoader;
       exports["default"] = void 0;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _headManagerContext = __webpack_require__(7574);
-      var _headManager = __webpack_require__(1048);
-      var _requestIdleCallback = __webpack_require__(7808);
+      var _headManagerContext = __webpack_require__(6469);
+      var _headManager = __webpack_require__(6736);
+      var _requestIdleCallback = __webpack_require__(7307);
       function _defineProperty(obj, key, value) {
         if (key in obj) {
           Object.defineProperty(obj, key, {
@@ -3584,7 +3584,7 @@
       /***/
     },
 
-    /***/ 915: /***/ function(module, exports) {
+    /***/ 5786: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3641,7 +3641,7 @@
       /***/
     },
 
-    /***/ 8000: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1460: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3649,7 +3649,7 @@
       });
       exports["default"] = withRouter;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(7465);
+      var _router = __webpack_require__(1905);
       function withRouter(ComposedComponent) {
         var WithRouterWrapper = function WithRouterWrapper(props) {
           return /*#__PURE__*/ _react.default.createElement(
@@ -3692,7 +3692,7 @@
       /***/
     },
 
-    /***/ 5590: /***/ function(
+    /***/ 9733: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3807,7 +3807,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _head = _interopRequireDefault(__webpack_require__(4828));
+      var _head = _interopRequireDefault(__webpack_require__(5222));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -3957,7 +3957,7 @@
       /***/
     },
 
-    /***/ 2054: /***/ function(
+    /***/ 3131: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3984,7 +3984,7 @@
       /***/
     },
 
-    /***/ 1122: /***/ function(__unused_webpack_module, exports) {
+    /***/ 868: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4006,7 +4006,7 @@
       /***/
     },
 
-    /***/ 1280: /***/ function(__unused_webpack_module, exports) {
+    /***/ 858: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4027,7 +4027,7 @@
       /***/
     },
 
-    /***/ 7574: /***/ function(
+    /***/ 6469: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -4054,7 +4054,7 @@
       /***/
     },
 
-    /***/ 4828: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5222: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       function _defineProperty(obj, key, value) {
@@ -4093,11 +4093,11 @@
       exports.defaultHead = defaultHead;
       exports["default"] = void 0;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _sideEffect = _interopRequireDefault(__webpack_require__(4491));
-      var _ampContext = __webpack_require__(2054);
-      var _headManagerContext = __webpack_require__(7574);
-      var _ampMode = __webpack_require__(1122);
-      var _utils = __webpack_require__(8030);
+      var _sideEffect = _interopRequireDefault(__webpack_require__(2652));
+      var _ampContext = __webpack_require__(3131);
+      var _headManagerContext = __webpack_require__(6469);
+      var _ampMode = __webpack_require__(868);
+      var _utils = __webpack_require__(9089);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -4315,7 +4315,7 @@
       /***/
     },
 
-    /***/ 6829: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5044: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4347,7 +4347,7 @@
       /***/
     },
 
-    /***/ 1958: /***/ function(
+    /***/ 1801: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -4359,7 +4359,7 @@
       });
       exports.ImageConfigContext = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _imageConfig = __webpack_require__(2204);
+      var _imageConfig = __webpack_require__(5466);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -4377,7 +4377,7 @@
       /***/
     },
 
-    /***/ 2204: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5466: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4409,7 +4409,7 @@
       /***/
     },
 
-    /***/ 5496: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5990: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4441,7 +4441,7 @@
       /***/
     },
 
-    /***/ 4835: /***/ function(__unused_webpack_module, exports) {
+    /***/ 5569: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -4519,7 +4519,7 @@
       /***/
     },
 
-    /***/ 7134: /***/ function(
+    /***/ 2399: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -4530,8 +4530,8 @@
         value: true
       });
       exports.denormalizePagePath = denormalizePagePath;
-      var _utils = __webpack_require__(5222);
-      var _normalizePathSep = __webpack_require__(3629);
+      var _utils = __webpack_require__(2760);
+      var _normalizePathSep = __webpack_require__(7374);
       function denormalizePagePath(page) {
         var _page = (0, _normalizePathSep).normalizePathSep(page);
         return _page.startsWith("/index/") && !(0, _utils).isDynamicRoute(_page)
@@ -4544,7 +4544,7 @@
       /***/
     },
 
-    /***/ 3629: /***/ function(__unused_webpack_module, exports) {
+    /***/ 7374: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -4558,7 +4558,7 @@
       /***/
     },
 
-    /***/ 9831: /***/ function(
+    /***/ 8940: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -4585,14 +4585,14 @@
       /***/
     },
 
-    /***/ 1368: /***/ function(
+    /***/ 5920: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
     ) {
       "use strict";
 
-      var _runtimeJs = _interopRequireDefault(__webpack_require__(739));
+      var _runtimeJs = _interopRequireDefault(__webpack_require__(3994));
       function _arrayLikeToArray(arr, len) {
         if (len == null || len > arr.length) len = arr.length;
         for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
@@ -4772,29 +4772,29 @@
       exports.resolveHref = resolveHref;
       exports.createKey = createKey;
       exports["default"] = void 0;
-      var _normalizeTrailingSlash = __webpack_require__(1872);
-      var _removeTrailingSlash = __webpack_require__(7658);
-      var _routeLoader = __webpack_require__(6449);
-      var _script = __webpack_require__(5031);
-      var _isError = _interopRequireWildcard(__webpack_require__(467));
-      var _denormalizePagePath = __webpack_require__(7134);
-      var _normalizeLocalePath = __webpack_require__(6829);
-      var _mitt = _interopRequireDefault1(__webpack_require__(4835));
-      var _utils = __webpack_require__(8030);
-      var _isDynamic = __webpack_require__(485);
-      var _parseRelativeUrl = __webpack_require__(1184);
-      var _querystring = __webpack_require__(5361);
-      var _resolveRewrites = _interopRequireDefault1(__webpack_require__(6527));
-      var _routeMatcher = __webpack_require__(5510);
-      var _routeRegex = __webpack_require__(3804);
-      var _formatUrl = __webpack_require__(1801);
-      var _detectDomainLocale = __webpack_require__(382);
-      var _parsePath = __webpack_require__(5396);
-      var _addLocale = __webpack_require__(3090);
-      var _removeLocale = __webpack_require__(9710);
-      var _removeBasePath = __webpack_require__(589);
-      var _addBasePath = __webpack_require__(596);
-      var _hasBasePath = __webpack_require__(2900);
+      var _normalizeTrailingSlash = __webpack_require__(2800);
+      var _removeTrailingSlash = __webpack_require__(9160);
+      var _routeLoader = __webpack_require__(3051);
+      var _script = __webpack_require__(736);
+      var _isError = _interopRequireWildcard(__webpack_require__(6040));
+      var _denormalizePagePath = __webpack_require__(2399);
+      var _normalizeLocalePath = __webpack_require__(5044);
+      var _mitt = _interopRequireDefault1(__webpack_require__(5569));
+      var _utils = __webpack_require__(9089);
+      var _isDynamic = __webpack_require__(580);
+      var _parseRelativeUrl = __webpack_require__(2657);
+      var _querystring = __webpack_require__(1150);
+      var _resolveRewrites = _interopRequireDefault1(__webpack_require__(9292));
+      var _routeMatcher = __webpack_require__(4041);
+      var _routeRegex = __webpack_require__(2303);
+      var _formatUrl = __webpack_require__(9253);
+      var _detectDomainLocale = __webpack_require__(3881);
+      var _parsePath = __webpack_require__(3146);
+      var _addLocale = __webpack_require__(4841);
+      var _removeLocale = __webpack_require__(4077);
+      var _removeBasePath = __webpack_require__(9186);
+      var _addBasePath = __webpack_require__(9154);
+      var _hasBasePath = __webpack_require__(729);
       function _interopRequireDefault1(obj) {
         return obj && obj.__esModule
           ? obj
@@ -7203,7 +7203,7 @@
       /***/
     },
 
-    /***/ 8186: /***/ function(
+    /***/ 7677: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7214,7 +7214,7 @@
         value: true
       });
       exports.addPathPrefix = addPathPrefix;
-      var _parsePath = __webpack_require__(5396);
+      var _parsePath = __webpack_require__(3146);
       function addPathPrefix(path, prefix) {
         if (!path.startsWith("/") || !prefix) {
           return path;
@@ -7233,7 +7233,7 @@
       /***/
     },
 
-    /***/ 1801: /***/ function(
+    /***/ 9253: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7246,7 +7246,7 @@
       exports.formatUrl = formatUrl;
       exports.formatWithValidation = formatWithValidation;
       exports.urlObjectKeys = void 0;
-      var querystring = _interopRequireWildcard(__webpack_require__(5361));
+      var querystring = _interopRequireWildcard(__webpack_require__(1150));
       function _interopRequireWildcard(obj) {
         if (obj && obj.__esModule) {
           return obj;
@@ -7340,7 +7340,7 @@
       /***/
     },
 
-    /***/ 3031: /***/ function(__unused_webpack_module, exports) {
+    /***/ 7294: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7362,7 +7362,7 @@
       /***/
     },
 
-    /***/ 5222: /***/ function(
+    /***/ 2760: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7384,13 +7384,13 @@
           return _isDynamic.isDynamicRoute;
         }
       });
-      var _sortedRoutes = __webpack_require__(1563);
-      var _isDynamic = __webpack_require__(485); //# sourceMappingURL=index.js.map
+      var _sortedRoutes = __webpack_require__(9580);
+      var _isDynamic = __webpack_require__(580); //# sourceMappingURL=index.js.map
 
       /***/
     },
 
-    /***/ 485: /***/ function(__unused_webpack_module, exports) {
+    /***/ 580: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7406,7 +7406,7 @@
       /***/
     },
 
-    /***/ 5396: /***/ function(__unused_webpack_module, exports) {
+    /***/ 3146: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7442,7 +7442,7 @@
       /***/
     },
 
-    /***/ 1184: /***/ function(
+    /***/ 2657: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7453,8 +7453,8 @@
         value: true
       });
       exports.parseRelativeUrl = parseRelativeUrl;
-      var _utils = __webpack_require__(8030);
-      var _querystring = __webpack_require__(5361);
+      var _utils = __webpack_require__(9089);
+      var _querystring = __webpack_require__(1150);
       function parseRelativeUrl(url, base) {
         var globalBase = new URL(false ? 0 : (0, _utils).getLocationOrigin());
         var resolvedBase = base
@@ -7486,7 +7486,7 @@
       /***/
     },
 
-    /***/ 5580: /***/ function(
+    /***/ 8910: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7497,7 +7497,7 @@
         value: true
       });
       exports.pathHasPrefix = pathHasPrefix;
-      var _parsePath = __webpack_require__(5396);
+      var _parsePath = __webpack_require__(3146);
       function pathHasPrefix(path, prefix) {
         if (typeof path !== "string") {
           return false;
@@ -7509,7 +7509,7 @@
       /***/
     },
 
-    /***/ 5361: /***/ function(__unused_webpack_module, exports) {
+    /***/ 1150: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       function _arrayLikeToArray(arr, len) {
@@ -7643,7 +7643,7 @@
       /***/
     },
 
-    /***/ 7658: /***/ function(__unused_webpack_module, exports) {
+    /***/ 9160: /***/ function(__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7657,7 +7657,7 @@
       /***/
     },
 
-    /***/ 5510: /***/ function(
+    /***/ 4041: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7668,7 +7668,7 @@
         value: true
       });
       exports.getRouteMatcher = getRouteMatcher;
-      var _utils = __webpack_require__(8030);
+      var _utils = __webpack_require__(9089);
       function getRouteMatcher(param1) {
         var re = param1.re,
           groups = param1.groups;
@@ -7705,7 +7705,7 @@
       /***/
     },
 
-    /***/ 3804: /***/ function(
+    /***/ 2303: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -7749,8 +7749,8 @@
       exports.getNamedRouteRegex = getNamedRouteRegex;
       exports.getMiddlewareRegex = getMiddlewareRegex;
       exports.getNamedMiddlewareRegex = getNamedMiddlewareRegex;
-      var _escapeRegexp = __webpack_require__(1280);
-      var _removeTrailingSlash = __webpack_require__(7658);
+      var _escapeRegexp = __webpack_require__(858);
+      var _removeTrailingSlash = __webpack_require__(9160);
       function getRouteRegex(normalizedRoute) {
         var ref = getParametrizedRoute(normalizedRoute),
           parameterizedRoute = ref.parameterizedRoute,
@@ -7934,7 +7934,7 @@
       /***/
     },
 
-    /***/ 1563: /***/ function(__unused_webpack_module, exports) {
+    /***/ 9580: /***/ function(__unused_webpack_module, exports) {
       "use strict";
Post job cleanup.
[command]/usr/bin/git version
git version 2.36.1
Temporarily overriding HOME='/home/runner/work/_temp/9c50ec4b-0c03-4c79-8b1c-fe6338e61957' 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: 740baff0d20a664e9f5f417ca6efe1288ab7acbd

@Schniz Schniz force-pushed the middleware-can-set-matcher-in-its-config branch from b8b1dce to db9f4ce Compare May 25, 2022 09:34
@ijjk ijjk added create-next-app Related to our CLI tool for quickly starting a new Next.js application. area: documentation labels May 25, 2022
@Schniz Schniz force-pushed the middleware-can-set-matcher-in-its-config branch 3 times, most recently from d790084 to a6d821f Compare May 30, 2022 12:53
@Schniz Schniz marked this pull request as ready for review May 30, 2022 13:23
Copy link
Member

@feugy feugy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine so far.

I'm wondering if we should support multiple regexp though.
It's not complicated to use alternative in regexp. With multiple regexp, users may be fooled and assume they work as globs do, and they'll ask about supporting negative patterns: ['/pages/:path*', '!/pages/about*']

@Schniz
Copy link
Contributor Author

Schniz commented May 30, 2022

@feugy one thing to note is that these are not regexps, but path matchers. therefore !/something is an invalid input AFAIK

@javivelasco wdyt about not supporting multiple matchers for now? I am also concerned about how big the generated regexp can get

therefore allowing Middleware to be specific to the given routes by
setting the following config:

```ts
export const config = {
  matching: ['/will-use-middleware/:path*']
}
```
@Schniz Schniz force-pushed the middleware-can-set-matcher-in-its-config branch from 2e65040 to 3b73fce Compare May 31, 2022 09:38
@Schniz Schniz changed the title Allow middleware to set its matcher Allow Middleware to set its matcher May 31, 2022
feugy
feugy previously approved these changes May 31, 2022
Copy link
Member

@feugy feugy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for educating @Schniz!

A couple of nits on naming. but this looks good to me.

Thanks

packages/next/build/analysis/get-page-static-info.ts Outdated Show resolved Hide resolved
packages/next/build/analysis/get-page-static-info.ts Outdated Show resolved Hide resolved
packages/next/build/analysis/get-page-static-info.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@cramforce cramforce left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FMI: We do not pass into the request which matcher matched, right?

'middleware.js': `
import { NextResponse } from 'next/server'
export const config = {
matcher: ['/with-middleware/:path*', '/another-middleware/:path*']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about we make this a subset of the rewrites syntax in next.config.js? That also makes it clear how to add has in the future.

Copy link
Contributor Author

@Schniz Schniz Jun 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is using the path-to-regex helper (tryToParsePath) so it's the same syntax as the rewrites, AFAIK

@Schniz
Copy link
Contributor Author

Schniz commented Jun 1, 2022

We do not pass into the request which matcher matched, right?

if you mean whether we provide the dynamic segments (aka for /hello/:world*, the :world* part) as params like in pages, then the current implementation does not do that. Maybe we should? not sure though.

@cramforce
Copy link
Contributor

@Schniz Ignore my comment. My meta point is: We allow per-path matching of middleware, but we require the developer to still put their own router into the central middleware that is independent of this matching.

@Schniz
Copy link
Contributor Author

Schniz commented Jun 2, 2022

but we require the developer to still put their own router into the central middleware that is independent of this matching

correct 😨

@kodiakhq kodiakhq bot merged commit 401a9a4 into vercel:canary Jun 3, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
create-next-app Related to our CLI tool for quickly starting a new Next.js application. type: next
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants