Reduce router code (#16159)
This reduces the code as suggested: https://github.com/vercel/next.js/pull/15231#discussion_r469691649.
Removes these bloated Babel helpers:
```diff
@@ -678,80 +678,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var _createClass = __webpack_require__("W8MJ");
- function _createForOfIteratorHelper(o, allowArrayLike) {
- var it;
- if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
- if (
- Array.isArray(o) ||
- (it = _unsupportedIterableToArray(o)) ||
- (allowArrayLike && o && typeof o.length === "number")
- ) {
- if (it) o = it;
- var i = 0;
- var F = function F() {};
- return {
- s: F,
- n: function n() {
- if (i >= o.length) return { done: true };
- return { done: false, value: o[i++] };
- },
- e: function e(_e) {
- throw _e;
- },
- f: F
- };
- }
- throw new TypeError(
- "Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."
- );
- }
- var normalCompletion = true,
- didErr = false,
- err;
- return {
- s: function s() {
- it = o[Symbol.iterator]();
- },
- n: function n() {
- var step = it.next();
- normalCompletion = step.done;
- return step;
- },
- e: function e(_e2) {
- didErr = true;
- err = _e2;
- },
- f: function f() {
- try {
- if (!normalCompletion && it["return"] != null) it["return"]();
- } finally {
- if (didErr) throw err;
- }
- }
- };
- }
-
- function _unsupportedIterableToArray(o, minLen) {
- if (!o) return;
- if (typeof o === "string") return _arrayLikeToArray(o, minLen);
- var n = Object.prototype.toString.call(o).slice(8, -1);
- if (n === "Object" && o.constructor) n = o.constructor.name;
- if (n === "Map" || n === "Set") return Array.from(o);
- if (
- n === "Arguments" ||
- /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)
- )
- return _arrayLikeToArray(o, minLen);
- }
-
- 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];
- }
- return arr2;
- }
-
exports.__esModule = true;
exports.hasBasePath = hasBasePath;
exports.addBasePath = addBasePath;
@@ -1864,28 +1790,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
} // handle resolving href for dynamic routes
if (!pages.includes(cleanPathname)) {
- var _iterator = _createForOfIteratorHelper(pages),
- _step;
-
- try {
- for (_iterator.s(); !(_step = _iterator.n()).done; ) {
- var page = _step.value;
-
- if (
- (0, _isDynamic.isDynamicRoute)(page) &&
- (0, _routeRegex.getRouteRegex)(page).re.test(
- cleanPathname
- )
- ) {
- parsedHref.pathname = addBasePath(page);
- break;
- }
+ // eslint-disable-next-line array-callback-return
+ pages.some(function(page) {
+ if (
+ (0, _isDynamic.isDynamicRoute)(page) &&
+ (0, _routeRegex.getRouteRegex)(page).re.test(cleanPathname)
+ ) {
+ parsedHref.pathname = addBasePath(page);
+ return true;
}
- } catch (err) {
- _iterator.e(err);
- } finally {
- _iterator.f();
- }
+ });
}
return parsedHref;
@@ -2069,10 +1983,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
if (cancelled) {
- var _err = new Error("Loading initial props cancelled");
-
- _err.cancelled = true;
- throw _err;
+ var err = new Error("Loading initial props cancelled");
+ err.cancelled = true;
+ throw err;
}
return data;
```
5b81531676