@scrabble-solver/scrabble-solver 2.10.1 → 2.10.3

package/.next/server/chunks/664.js

@@ -11,22 +11,12 @@ var __webpack_unused_export__;
 __webpack_unused_export__ = ({
     value: true
 });
-exports.Z = _asyncToGenerator;
-function _asyncToGenerator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
-}
+Object.defineProperty(exports, "Z", ({
+    enumerable: true,
+    get: function() {
+        return _asyncToGenerator;
+    }
+}));
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -41,108 +31,20 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
         Promise.resolve(value).then(_next, _throw);
     }
 }
-
-
-/***/ }),
-
-/***/ 6495:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-var __webpack_unused_export__;
-
-__webpack_unused_export__ = ({
-    value: true
-});
-exports.Z = _extends;
-function _extends() {
-    return extends_.apply(this, arguments);
-}
-function extends_() {
-    extends_ = Object.assign || function(target) {
-        for(var i = 1; i < arguments.length; i++){
-            var source = arguments[i];
-            for(var key in source){
-                if (Object.prototype.hasOwnProperty.call(source, key)) {
-                    target[key] = source[key];
-                }
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
             }
-        }
-        return target;
-    };
-    return extends_.apply(this, arguments);
-}
-
-
-/***/ }),
-
-/***/ 92648:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-var __webpack_unused_export__;
-
-__webpack_unused_export__ = ({
-    value: true
-});
-exports.Z = _interopRequireDefault;
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-
-
-/***/ }),
-
-/***/ 91598:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-var __webpack_unused_export__;
-
-__webpack_unused_export__ = ({
-    value: true
-});
-exports.Z = _interopRequireWildcard;
-function _interopRequireWildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {};
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
             }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-function _getRequireWildcardCache(nodeInterop1) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop1);
+            _next(undefined);
+        });
+    };
 }
 
 
@@ -157,7 +59,12 @@ var __webpack_unused_export__;
 __webpack_unused_export__ = ({
     value: true
 });
-exports.Z = _objectWithoutPropertiesLoose;
+Object.defineProperty(exports, "Z", ({
+    enumerable: true,
+    get: function() {
+        return _objectWithoutPropertiesLoose;
+    }
+}));
 function _objectWithoutPropertiesLoose(source, excluded) {
     if (source == null) return {};
     var target = {};
@@ -174,7 +81,7 @@ function _objectWithoutPropertiesLoose(source, excluded) {
 
 /***/ }),
 
-/***/ 98684:
+/***/ 33468:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -184,7 +91,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.addBasePath = addBasePath;
 var _addPathPrefix = __webpack_require__(11751);
-var _normalizeTrailingSlash = __webpack_require__(82392);
+var _normalizeTrailingSlash = __webpack_require__(52700);
 const basePath =  false || "";
 function addBasePath(path, required) {
     if (false) {}
@@ -201,7 +108,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 22725:
+/***/ 54465:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -210,7 +117,7 @@ Object.defineProperty(exports, "__esModule", ({
     value: true
 }));
 exports.addLocale = void 0;
-var _normalizeTrailingSlash = __webpack_require__(82392);
+var _normalizeTrailingSlash = __webpack_require__(52700);
 const addLocale = (path, ...args)=>{
     if (false) {}
     return path;
@@ -227,7 +134,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 38748:
+/***/ 84643:
 /***/ ((module, exports) => {
 
 "use strict";
@@ -251,7 +158,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 71210:
+/***/ 10227:
 /***/ ((module, exports) => {
 
 "use strict";
@@ -277,7 +184,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 94119:
+/***/ 10928:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -302,7 +209,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 56007:
+/***/ 31831:
 /***/ ((module, exports) => {
 
 "use strict";
@@ -435,12 +342,12 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 48418:
+/***/ 31551:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
 
-"client";
+"use client";
 Object.defineProperty(exports, "__esModule", ({
     value: true
 }));
@@ -448,18 +355,34 @@ exports["default"] = void 0;
 var _interop_require_default = (__webpack_require__(92648)/* ["default"] */ .Z);
 var _object_without_properties_loose = (__webpack_require__(17273)/* ["default"] */ .Z);
 var _react = _interop_require_default(__webpack_require__(16689));
-var _router = __webpack_require__(76273);
-var _addLocale = __webpack_require__(22725);
+var _router = __webpack_require__(41003);
+var _formatUrl = __webpack_require__(23938);
+var _addLocale = __webpack_require__(54465);
 var _routerContext = __webpack_require__(24964);
 var _appRouterContext = __webpack_require__(3280);
-var _useIntersection = __webpack_require__(57190);
-var _getDomainLocale = __webpack_require__(71210);
-var _addBasePath = __webpack_require__(98684);
-"client";
-const prefetched = {};
+var _useIntersection = __webpack_require__(69246);
+var _getDomainLocale = __webpack_require__(10227);
+var _addBasePath = __webpack_require__(33468);
+const prefetched = new Set();
 function prefetch(router, href, as, options) {
-    if (true) return;
-    if (!(0, _router).isLocalURL(href)) return;
+    if (true) {
+        return;
+    }
+    if (!(0, _router).isLocalURL(href)) {
+        return;
+    }
+    // We should only dedupe requests when experimental.optimisticClientCache is
+    // disabled.
+    if (!options.bypassPrefetchedCheck) {
+        const locale = typeof options.locale !== "undefined" ? options.locale : "locale" in router ? router.locale : undefined;
+        const prefetchedKey = href + "%" + as + "%" + locale;
+        // If we've already fetched the key, then don't prefetch it again!
+        if (prefetched.has(prefetchedKey)) {
+            return;
+        }
+        // Mark this URL as prefetched.
+        prefetched.add(prefetchedKey);
+    }
     // Prefetch the JSON page if asked (only in the client)
     // We need to handle a prefetch error here since we may be
     // loading with priority which can reject but we don't
@@ -467,9 +390,6 @@ function prefetch(router, href, as, options) {
     Promise.resolve(router.prefetch(href, as, options)).catch((err)=>{
         if (false) {}
     });
-    const curLocale = options && typeof options.locale !== "undefined" ? options.locale : router && router.locale;
-    // Join on an invalid URI character
-    prefetched[href + "%" + as + (curLocale ? "%" + curLocale : "")] = true;
 }
 function isModifiedEvent(event) {
     const { target  } = event.currentTarget;
@@ -493,9 +413,7 @@ function linkClicked(e, router, href, as, replace, shallow, scroll, locale, isAp
                 scroll
             });
         } else {
-            // If `beforePopState` doesn't exist on the router it's the AppRouter.
-            const method = replace ? "replace" : "push";
-            router[method](href, {
+            router[replace ? "replace" : "push"](as || href, {
                 forceOptimisticNavigation: !prefetchEnabled
             });
         }
@@ -507,10 +425,18 @@ function linkClicked(e, router, href, as, replace, shallow, scroll, locale, isAp
         navigate();
     }
 }
-const Link = /*#__PURE__*/ _react.default.forwardRef(function LinkComponent(props, forwardedRef) {
+function formatStringOrUrl(urlObjOrString) {
+    if (typeof urlObjOrString === "string") {
+        return urlObjOrString;
+    }
+    return (0, _formatUrl).formatUrl(urlObjOrString);
+}
+/**
+ * React Component that enables client-side transitions between routes.
+ */ const Link = /*#__PURE__*/ _react.default.forwardRef(function LinkComponent(props, forwardedRef) {
     if (false) {}
     let children;
-    const { href: hrefProp , as: asProp , children: childrenProp , prefetch: prefetchProp , passHref , replace , shallow , scroll , locale , onClick , onMouseEnter , onTouchStart , legacyBehavior =Boolean(false) !== true  } = props, restProps = _object_without_properties_loose(props, [
+    const { href: hrefProp , as: asProp , children: childrenProp , prefetch: prefetchProp , passHref , replace , shallow , scroll , locale , onClick , onMouseEnter: onMouseEnterProp , onTouchStart: onTouchStartProp , legacyBehavior =true === false  } = props, restProps = _object_without_properties_loose(props, [
         "href",
         "as",
         "children",
@@ -529,21 +455,28 @@ const Link = /*#__PURE__*/ _react.default.forwardRef(function LinkComponent(prop
     if (legacyBehavior && (typeof children === "string" || typeof children === "number")) {
         children = /*#__PURE__*/ _react.default.createElement("a", null, children);
     }
-    const p = prefetchProp !== false;
-    let router = _react.default.useContext(_routerContext.RouterContext);
-    // TODO-APP: type error. Remove `as any`
+    const prefetchEnabled = prefetchProp !== false;
+    const pagesRouter = _react.default.useContext(_routerContext.RouterContext);
     const appRouter = _react.default.useContext(_appRouterContext.AppRouterContext);
-    if (appRouter) {
-        router = appRouter;
-    }
+    const router = pagesRouter != null ? pagesRouter : appRouter;
+    // We're in the app directory if there is no pages router.
+    const isAppRouter = !pagesRouter;
+    if (false) {}
     const { href , as  } = _react.default.useMemo(()=>{
-        const [resolvedHref, resolvedAs] = (0, _router).resolveHref(router, hrefProp, true);
+        if (!pagesRouter) {
+            const resolvedHref = formatStringOrUrl(hrefProp);
+            return {
+                href: resolvedHref,
+                as: asProp ? formatStringOrUrl(asProp) : resolvedHref
+            };
+        }
+        const [resolvedHref, resolvedAs] = (0, _router).resolveHref(pagesRouter, hrefProp, true);
         return {
             href: resolvedHref,
-            as: asProp ? (0, _router).resolveHref(router, asProp) : resolvedAs || resolvedHref
+            as: asProp ? (0, _router).resolveHref(pagesRouter, asProp) : resolvedAs || resolvedHref
         };
     }, [
-        router,
+        pagesRouter,
         hrefProp,
         asProp
     ]);
@@ -555,6 +488,8 @@ const Link = /*#__PURE__*/ _react.default.forwardRef(function LinkComponent(prop
         if (false) {} else {
             child = _react.default.Children.only(children);
         }
+    } else {
+        if (false) { var ref; }
     }
     const childRef = legacyBehavior ? child && typeof child === "object" && child.ref : forwardedRef;
     const [setIntersectionRef, isVisible, resetVisible] = (0, _useIntersection).useIntersection({
@@ -581,26 +516,33 @@ const Link = /*#__PURE__*/ _react.default.forwardRef(function LinkComponent(prop
         resetVisible,
         setIntersectionRef
     ]);
+    // Prefetch the URL if we haven't already and it's visible.
     _react.default.useEffect(()=>{
-        const shouldPrefetch = isVisible && p && (0, _router).isLocalURL(href);
-        const curLocale = typeof locale !== "undefined" ? locale : router && router.locale;
-        const isPrefetched = prefetched[href + "%" + as + (curLocale ? "%" + curLocale : "")];
-        if (shouldPrefetch && !isPrefetched) {
-            prefetch(router, href, as, {
-                locale: curLocale
-            });
+        // in dev, we only prefetch on hover to avoid wasting resources as the prefetch will trigger compiling the page.
+        if (false) {}
+        if (!router) {
+            return;
         }
+        // If we don't need to prefetch the URL, don't do prefetch.
+        if (!isVisible || !prefetchEnabled) {
+            return;
+        }
+        // Prefetch the URL.
+        prefetch(router, href, as, {
+            locale
+        });
     }, [
         as,
         href,
         isVisible,
         locale,
-        p,
+        prefetchEnabled,
+        pagesRouter == null ? void 0 : pagesRouter.locale,
         router
     ]);
     const childProps = {
         ref: setRef,
-        onClick: (e)=>{
+        onClick (e) {
             if (false) {}
             if (!legacyBehavior && typeof onClick === "function") {
                 onClick(e);
@@ -608,51 +550,63 @@ const Link = /*#__PURE__*/ _react.default.forwardRef(function LinkComponent(prop
             if (legacyBehavior && child.props && typeof child.props.onClick === "function") {
                 child.props.onClick(e);
             }
-            if (!e.defaultPrevented) {
-                linkClicked(e, router, href, as, replace, shallow, scroll, locale, Boolean(appRouter), p);
+            if (!router) {
+                return;
+            }
+            if (e.defaultPrevented) {
+                return;
             }
+            linkClicked(e, router, href, as, replace, shallow, scroll, locale, isAppRouter, prefetchEnabled);
         },
-        onMouseEnter: (e)=>{
-            if (!legacyBehavior && typeof onMouseEnter === "function") {
-                onMouseEnter(e);
+        onMouseEnter (e) {
+            if (!legacyBehavior && typeof onMouseEnterProp === "function") {
+                onMouseEnterProp(e);
             }
             if (legacyBehavior && child.props && typeof child.props.onMouseEnter === "function") {
                 child.props.onMouseEnter(e);
             }
-            // Check for not prefetch disabled in page using appRouter
-            if (!(!p && appRouter)) {
-                if ((0, _router).isLocalURL(href)) {
-                    prefetch(router, href, as, {
-                        priority: true
-                    });
-                }
+            if (!router) {
+                return;
+            }
+            if (!prefetchEnabled && isAppRouter) {
+                return;
             }
+            prefetch(router, href, as, {
+                locale,
+                priority: true,
+                // @see {https://github.com/vercel/next.js/discussions/40268?sort=top#discussioncomment-3572642}
+                bypassPrefetchedCheck: true
+            });
         },
-        onTouchStart: (e)=>{
-            if (!legacyBehavior && typeof onTouchStart === "function") {
-                onTouchStart(e);
+        onTouchStart (e) {
+            if (!legacyBehavior && typeof onTouchStartProp === "function") {
+                onTouchStartProp(e);
             }
             if (legacyBehavior && child.props && typeof child.props.onTouchStart === "function") {
                 child.props.onTouchStart(e);
             }
-            // Check for not prefetch disabled in page using appRouter
-            if (!(!p && appRouter)) {
-                if ((0, _router).isLocalURL(href)) {
-                    prefetch(router, href, as, {
-                        priority: true
-                    });
-                }
+            if (!router) {
+                return;
+            }
+            if (!prefetchEnabled && isAppRouter) {
+                return;
             }
+            prefetch(router, href, as, {
+                locale,
+                priority: true,
+                // @see {https://github.com/vercel/next.js/discussions/40268?sort=top#discussioncomment-3572642}
+                bypassPrefetchedCheck: true
+            });
         }
     };
     // If child is an <a> tag and doesn't have a href attribute, or if the 'passHref' property is
     // defined, we specify the current 'href', so that repetition is not needed by the user
     if (!legacyBehavior || passHref || child.type === "a" && !("href" in child.props)) {
-        const curLocale = typeof locale !== "undefined" ? locale : router && router.locale;
+        const curLocale = typeof locale !== "undefined" ? locale : pagesRouter == null ? void 0 : pagesRouter.locale;
         // we only render domain locales if we are currently on a domain locale
         // so that locale links are still visitable in development/preview envs
-        const localeDomain = router && router.isLocaleDomain && (0, _getDomainLocale).getDomainLocale(as, curLocale, router.locales, router.domainLocales);
-        childProps.href = localeDomain || (0, _addBasePath).addBasePath((0, _addLocale).addLocale(as, curLocale, router && router.defaultLocale));
+        const localeDomain = (pagesRouter == null ? void 0 : pagesRouter.isLocaleDomain) && (0, _getDomainLocale).getDomainLocale(as, curLocale, pagesRouter == null ? void 0 : pagesRouter.locales, pagesRouter == null ? void 0 : pagesRouter.domainLocales);
+        childProps.href = localeDomain || (0, _addBasePath).addBasePath((0, _addLocale).addLocale(as, curLocale, pagesRouter == null ? void 0 : pagesRouter.defaultLocale));
     }
     return legacyBehavior ? /*#__PURE__*/ _react.default.cloneElement(child, childProps) : /*#__PURE__*/ _react.default.createElement("a", Object.assign({}, restProps, childProps), children);
 });
@@ -669,7 +623,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 82392:
+/***/ 52700:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -681,7 +635,7 @@ exports.normalizePathTrailingSlash = void 0;
 var _removeTrailingSlash = __webpack_require__(93297);
 var _parsePath = __webpack_require__(28854);
 const normalizePathTrailingSlash = (path)=>{
-    if (!path.startsWith("/")) {
+    if (!path.startsWith("/") || undefined) {
         return path;
     }
     const { pathname , query , hash  } = (0, _parsePath).parsePath(path);
@@ -700,7 +654,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 19320:
+/***/ 82813:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -709,7 +663,7 @@ Object.defineProperty(exports, "__esModule", ({
     value: true
 }));
 exports.removeBasePath = removeBasePath;
-var _hasBasePath = __webpack_require__(94119);
+var _hasBasePath = __webpack_require__(10928);
 const basePath =  false || "";
 function removeBasePath(path) {
     if (false) {}
@@ -728,7 +682,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 75776:
+/***/ 66876:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -753,7 +707,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 9311:
+/***/ 44686:
 /***/ ((module, exports) => {
 
 "use strict";
@@ -764,7 +718,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.cancelIdleCallback = exports.requestIdleCallback = void 0;
 const requestIdleCallback = typeof self !== "undefined" && self.requestIdleCallback && self.requestIdleCallback.bind(window) || function(cb) {
     let start = Date.now();
-    return setTimeout(function() {
+    return self.setTimeout(function() {
         cb({
             didTimeout: false,
             timeRemaining: function() {
@@ -789,7 +743,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 22669:
+/***/ 82497:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -803,8 +757,8 @@ exports.getClientBuildManifest = getClientBuildManifest;
 exports.createRouteLoader = createRouteLoader;
 var _interop_require_default = (__webpack_require__(92648)/* ["default"] */ .Z);
 var _getAssetPathFromRoute = _interop_require_default(__webpack_require__(29565));
-var _trustedTypes = __webpack_require__(44991);
-var _requestIdleCallback = __webpack_require__(9311);
+var _trustedTypes = __webpack_require__(65407);
+var _requestIdleCallback = __webpack_require__(44686);
 // 3.8s was arbitrarily chosen as it's what https://web.dev/interactive
 // considers as "Good" time-to-interactive. We must assume something went
 // wrong beyond this point, and then fall-back to a full page transition to
@@ -832,6 +786,13 @@ function withFuture(key, map, generator) {
         throw err;
     }) : prom;
 }
+const ASSET_LOAD_ERROR = Symbol("ASSET_LOAD_ERROR");
+function markAssetError(err) {
+    return Object.defineProperty(err, ASSET_LOAD_ERROR, {});
+}
+function isAssetError(err) {
+    return err && ASSET_LOAD_ERROR in err;
+}
 function hasPrefetch(link) {
     try {
         link = document.createElement("link");
@@ -843,33 +804,26 @@ function hasPrefetch(link) {
 }
 const canPrefetch = hasPrefetch();
 function prefetchViaDom(href, as, link) {
-    return new Promise((res, rej)=>{
+    return new Promise((resolve, reject)=>{
         const selector = `
       link[rel="prefetch"][href^="${href}"],
       link[rel="preload"][href^="${href}"],
       script[src^="${href}"]`;
         if (document.querySelector(selector)) {
-            return res();
+            return resolve();
         }
         link = document.createElement("link");
         // The order of property assignment here is intentional:
         if (as) link.as = as;
         link.rel = `prefetch`;
         link.crossOrigin = undefined;
-        link.onload = res;
-        link.onerror = rej;
+        link.onload = resolve;
+        link.onerror = ()=>reject(markAssetError(new Error(`Failed to prefetch: ${href}`)));
         // `href` should always be last:
         link.href = href;
         document.head.appendChild(link);
     });
 }
-const ASSET_LOAD_ERROR = Symbol("ASSET_LOAD_ERROR");
-function markAssetError(err) {
-    return Object.defineProperty(err, ASSET_LOAD_ERROR, {});
-}
-function isAssetError(err) {
-    return err && ASSET_LOAD_ERROR in err;
-}
 function appendScript(src, script) {
     return new Promise((resolve, reject)=>{
         script = document.createElement("script");
@@ -1015,7 +969,7 @@ function createRouteLoader(assetPrefix) {
                 return resolvePromiseWithTimeout(getFilesForRoute(assetPrefix, route).then(({ scripts , css  })=>{
                     return Promise.all([
                         entrypoints.has(route) ? [] : Promise.all(scripts.map(maybeExecuteScript)),
-                        Promise.all(css.map(fetchStyleSheet)), 
+                        Promise.all(css.map(fetchStyleSheet))
                     ]);
                 }).then((res)=>{
                     return this.whenEntrypoint(route).then((entrypoint)=>({
@@ -1065,12 +1019,12 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 20699:
+/***/ 63573:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
 
-"client";
+"use client";
 Object.defineProperty(exports, "__esModule", ({
     value: true
 }));
@@ -1078,13 +1032,14 @@ exports.handleClientScriptLoad = handleClientScriptLoad;
 exports.initScriptLoader = initScriptLoader;
 exports["default"] = void 0;
 var _extends = (__webpack_require__(6495)/* ["default"] */ .Z);
+var _interop_require_default = (__webpack_require__(92648)/* ["default"] */ .Z);
 var _interop_require_wildcard = (__webpack_require__(91598)/* ["default"] */ .Z);
 var _object_without_properties_loose = (__webpack_require__(17273)/* ["default"] */ .Z);
+var _reactDom = _interop_require_default(__webpack_require__(66405));
 var _react = _interop_require_wildcard(__webpack_require__(16689));
 var _headManagerContext = __webpack_require__(92796);
-var _headManager = __webpack_require__(56007);
-var _requestIdleCallback = __webpack_require__(9311);
-"client";
+var _headManager = __webpack_require__(31831);
+var _requestIdleCallback = __webpack_require__(44686);
 const ScriptCache = new Map();
 const LoadCache = new Set();
 const ignoreProps = [
@@ -1093,10 +1048,10 @@ const ignoreProps = [
     "dangerouslySetInnerHTML",
     "children",
     "onError",
-    "strategy", 
+    "strategy"
 ];
 const loadScript = (props)=>{
-    const { src , id , onLoad =()=>{} , onReady =null , dangerouslySetInnerHTML , children ="" , strategy ="afterInteractive" , onError ,  } = props;
+    const { src , id , onLoad =()=>{} , onReady =null , dangerouslySetInnerHTML , children ="" , strategy ="afterInteractive" , onError  } = props;
     const cacheKey = id || src;
     // Script has already loaded
     if (cacheKey && LoadCache.has(cacheKey)) {
@@ -1182,7 +1137,7 @@ function loadLazyScript(props) {
 function addBeforeInteractiveToCache() {
     const scripts = [
         ...document.querySelectorAll('[data-nscript="beforeInteractive"]'),
-        ...document.querySelectorAll('[data-nscript="beforePageRender"]'), 
+        ...document.querySelectorAll('[data-nscript="beforePageRender"]')
     ];
     scripts.forEach((script)=>{
         const cacheKey = script.id || script.getAttribute("src");
@@ -1203,7 +1158,7 @@ function Script(props) {
         "onError"
     ]);
     // Context is available only during SSR
-    const { updateScripts , scripts , getIsSsr  } = (0, _react).useContext(_headManagerContext.HeadManagerContext);
+    const { updateScripts , scripts , getIsSsr , appDir , nonce  } = (0, _react).useContext(_headManagerContext.HeadManagerContext);
     /**
    * - First mount:
    *   1. The useEffect for onReady executes
@@ -1267,7 +1222,7 @@ function Script(props) {
                     onLoad,
                     onReady,
                     onError
-                }, restProps), 
+                }, restProps)
             ]);
             updateScripts(scripts);
         } else if (getIsSsr && getIsSsr()) {
@@ -1277,6 +1232,54 @@ function Script(props) {
             loadScript(props);
         }
     }
+    // For the app directory, we need React Float to preload these scripts.
+    if (appDir) {
+        // Before interactive scripts need to be loaded by Next.js' runtime instead
+        // of native <script> tags, because they no longer have `defer`.
+        if (strategy === "beforeInteractive") {
+            if (!src) {
+                // For inlined scripts, we put the content in `children`.
+                if (restProps.dangerouslySetInnerHTML) {
+                    restProps.children = restProps.dangerouslySetInnerHTML.__html;
+                    delete restProps.dangerouslySetInnerHTML;
+                }
+                return /*#__PURE__*/ _react.default.createElement("script", {
+                    nonce: nonce,
+                    dangerouslySetInnerHTML: {
+                        __html: `(self.__next_s=self.__next_s||[]).push(${JSON.stringify([
+                            0,
+                            _extends({}, restProps)
+                        ])})`
+                    }
+                });
+            }
+            // @ts-ignore
+            _reactDom.default.preload(src, restProps.integrity ? {
+                as: "script",
+                integrity: restProps.integrity
+            } : {
+                as: "script"
+            });
+            return /*#__PURE__*/ _react.default.createElement("script", {
+                nonce: nonce,
+                dangerouslySetInnerHTML: {
+                    __html: `(self.__next_s=self.__next_s||[]).push(${JSON.stringify([
+                        src
+                    ])})`
+                }
+            });
+        } else if (strategy === "afterInteractive") {
+            if (src) {
+                // @ts-ignore
+                _reactDom.default.preload(src, restProps.integrity ? {
+                    as: "script",
+                    integrity: restProps.integrity
+                } : {
+                    as: "script"
+                });
+            }
+        }
+    }
     return null;
 }
 Object.defineProperty(Script, "__nextScript", {
@@ -1295,7 +1298,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 44991:
+/***/ 65407:
 /***/ ((module, exports) => {
 
 "use strict";
@@ -1330,7 +1333,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 57190:
+/***/ 69246:
 /***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
@@ -1340,7 +1343,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.useIntersection = useIntersection;
 var _react = __webpack_require__(16689);
-var _requestIdleCallback = __webpack_require__(9311);
+var _requestIdleCallback = __webpack_require__(44686);
 const hasIntersectionObserver = typeof IntersectionObserver === "function";
 const observers = new Map();
 const idList = [];
@@ -1397,10 +1400,14 @@ function observe(element, callback, options) {
 function useIntersection({ rootRef , rootMargin , disabled  }) {
     const isDisabled = disabled || !hasIntersectionObserver;
     const [visible, setVisible] = (0, _react).useState(false);
-    const [element, setElement] = (0, _react).useState(null);
+    const elementRef = (0, _react).useRef(null);
+    const setElement = (0, _react).useCallback((element)=>{
+        elementRef.current = element;
+    }, []);
     (0, _react).useEffect(()=>{
         if (hasIntersectionObserver) {
             if (isDisabled || visible) return;
+            const element = elementRef.current;
             if (element && element.tagName) {
                 const unobserve = observe(element, (isVisible)=>isVisible && setVisible(isVisible), {
                     root: rootRef == null ? void 0 : rootRef.current,
@@ -1414,12 +1421,13 @@ function useIntersection({ rootRef , rootMargin , disabled  }) {
                 return ()=>(0, _requestIdleCallback).cancelIdleCallback(idleCallback);
             }
         }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        element,
         isDisabled,
         rootMargin,
         rootRef,
-        visible
+        visible,
+        elementRef.current
     ]);
     const resetVisible = (0, _react).useCallback(()=>{
         setVisible(false);
@@ -1441,7 +1449,7 @@ if ((typeof exports.default === "function" || typeof exports.default === "object
 
 /***/ }),
 
-/***/ 76273:
+/***/ 41003:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -1453,16 +1461,17 @@ exports.matchesMiddleware = matchesMiddleware;
 exports.isLocalURL = isLocalURL;
 exports.interpolateAs = interpolateAs;
 exports.resolveHref = resolveHref;
+exports.handleSmoothScroll = handleSmoothScroll;
 exports.createKey = createKey;
 exports["default"] = void 0;
 var _async_to_generator = (__webpack_require__(60932)/* ["default"] */ .Z);
 var _extends = (__webpack_require__(6495)/* ["default"] */ .Z);
 var _interop_require_default = (__webpack_require__(92648)/* ["default"] */ .Z);
 var _interop_require_wildcard = (__webpack_require__(91598)/* ["default"] */ .Z);
-var _normalizeTrailingSlash = __webpack_require__(82392);
+var _normalizeTrailingSlash = __webpack_require__(52700);
 var _removeTrailingSlash = __webpack_require__(93297);
-var _routeLoader = __webpack_require__(22669);
-var _script = __webpack_require__(20699);
+var _routeLoader = __webpack_require__(82497);
+var _script = __webpack_require__(63573);
 var _isError = _interop_require_wildcard(__webpack_require__(80676));
 var _denormalizePagePath = __webpack_require__(64406);
 var _normalizeLocalePath = __webpack_require__(34014);
@@ -1475,13 +1484,14 @@ var _resolveRewrites = _interop_require_default(__webpack_require__(36052));
 var _routeMatcher = __webpack_require__(84226);
 var _routeRegex = __webpack_require__(95052);
 var _formatUrl = __webpack_require__(23938);
-var _detectDomainLocale = __webpack_require__(38748);
+var _detectDomainLocale = __webpack_require__(84643);
 var _parsePath = __webpack_require__(28854);
-var _addLocale = __webpack_require__(22725);
-var _removeLocale = __webpack_require__(75776);
-var _removeBasePath = __webpack_require__(19320);
-var _addBasePath = __webpack_require__(98684);
-var _hasBasePath = __webpack_require__(94119);
+var _addLocale = __webpack_require__(54465);
+var _removeLocale = __webpack_require__(66876);
+var _removeBasePath = __webpack_require__(82813);
+var _addBasePath = __webpack_require__(33468);
+var _hasBasePath = __webpack_require__(10928);
+var _isApiRoute = __webpack_require__(79423);
 var _getNextPathnameInfo = __webpack_require__(35789);
 var _formatNextPathnameInfo = __webpack_require__(10299);
 var _compareStates = __webpack_require__(46220);
@@ -1628,15 +1638,15 @@ function prepareUrlAs(router, url, as) {
     // we'll format them into the string version here.
     let [resolvedHref, resolvedAs] = resolveHref(router, url, true);
     const origin = (0, _utils).getLocationOrigin();
-    const hrefHadOrigin = resolvedHref.startsWith(origin);
-    const asHadOrigin = resolvedAs && resolvedAs.startsWith(origin);
+    const hrefWasAbsolute = resolvedHref.startsWith(origin);
+    const asWasAbsolute = resolvedAs && resolvedAs.startsWith(origin);
     resolvedHref = stripOrigin(resolvedHref);
     resolvedAs = resolvedAs ? stripOrigin(resolvedAs) : resolvedAs;
-    const preparedUrl = hrefHadOrigin ? resolvedHref : (0, _addBasePath).addBasePath(resolvedHref);
+    const preparedUrl = hrefWasAbsolute ? resolvedHref : (0, _addBasePath).addBasePath(resolvedHref);
     const preparedAs = as ? stripOrigin(resolveHref(router, as)) : resolvedAs || resolvedHref;
     return {
         url: preparedUrl,
-        as: asHadOrigin ? preparedAs : (0, _addBasePath).addBasePath(preparedAs)
+        as: asWasAbsolute ? preparedAs : (0, _addBasePath).addBasePath(preparedAs)
     };
 }
 function resolveDynamicRoute(pathname, pages) {
@@ -1681,7 +1691,7 @@ function getMiddlewareData(source, response, options) {
             let fsPathname = (0, _removeTrailingSlash).removeTrailingSlash(pathnameInfo.pathname);
             return Promise.all([
                 options.router.pageLoader.getPageList(),
-                (0, _routeLoader).getClientBuildManifest(), 
+                (0, _routeLoader).getClientBuildManifest()
             ]).then(([pages, { __rewrites: rewrites  }])=>{
                 let as = (0, _addLocale).addLocale(pathnameInfo.pathname, pathnameInfo.locale);
                 if ((0, _isDynamic).isDynamicRoute(as) || !rewriteHeader && pages.includes((0, _normalizeLocalePath).normalizeLocalePath((0, _removeBasePath).removeBasePath(as), options.router.locales).pathname)) {
@@ -1725,8 +1735,8 @@ function getMiddlewareData(source, response, options) {
     const redirectTarget = response.headers.get("x-nextjs-redirect");
     if (redirectTarget) {
         if (redirectTarget.startsWith("/")) {
-            const src1 = (0, _parsePath).parsePath(redirectTarget);
-            const pathname1 = (0, _formatNextPathnameInfo).formatNextPathnameInfo(_extends({}, (0, _getNextPathnameInfo).getNextPathnameInfo(src1.pathname, {
+            const src = (0, _parsePath).parsePath(redirectTarget);
+            const pathname = (0, _formatNextPathnameInfo).formatNextPathnameInfo(_extends({}, (0, _getNextPathnameInfo).getNextPathnameInfo(src.pathname, {
                 nextConfig,
                 parseData: true
             }), {
@@ -1735,8 +1745,8 @@ function getMiddlewareData(source, response, options) {
             }));
             return Promise.resolve({
                 type: "redirect-internal",
-                newAs: `${pathname1}${src1.query}${src1.hash}`,
-                newUrl: `${pathname1}${src1.query}${src1.hash}`
+                newAs: `${pathname}${src.query}${src.hash}`,
+                newUrl: `${pathname}${src.query}${src.hash}`
             });
         }
         return Promise.resolve({
@@ -1749,25 +1759,34 @@ function getMiddlewareData(source, response, options) {
     });
 }
 function withMiddlewareEffects(options) {
-    return matchesMiddleware(options).then((matches)=>{
-        if (matches && options.fetchData) {
-            return options.fetchData().then((data)=>getMiddlewareData(data.dataHref, data.response, options).then((effect)=>({
-                        dataHref: data.dataHref,
-                        cacheKey: data.cacheKey,
-                        json: data.json,
-                        response: data.response,
-                        text: data.text,
-                        effect
-                    }))).catch((_err)=>{
-                /**
-           * TODO: Revisit this in the future.
-           * For now we will not consider middleware data errors to be fatal.
-           * maybe we should revisit in the future.
-           */ return null;
-            });
+    return _withMiddlewareEffects.apply(this, arguments);
+}
+function _withMiddlewareEffects() {
+    _withMiddlewareEffects = _async_to_generator(function*(options) {
+        const matches = yield matchesMiddleware(options);
+        if (!matches || !options.fetchData) {
+            return null;
+        }
+        try {
+            const data = yield options.fetchData();
+            const effect = yield getMiddlewareData(data.dataHref, data.response, options);
+            return {
+                dataHref: data.dataHref,
+                json: data.json,
+                response: data.response,
+                text: data.text,
+                cacheKey: data.cacheKey,
+                effect
+            };
+        } catch (e) {
+            /**
+     * TODO: Revisit this in the future.
+     * For now we will not consider middleware data errors to be fatal.
+     * maybe we should revisit in the future.
+     */ return null;
         }
-        return null;
     });
+    return _withMiddlewareEffects.apply(this, arguments);
 }
 const manualScrollRestoration = (/* unused pure expression or super */ null && ( false && 0));
 const SSG_DATA_NOT_FOUND = Symbol("SSG_DATA_NOT_FOUND");
@@ -1793,11 +1812,16 @@ function fetchRetry(url, attempts, options) {
         return !response.ok && attempts > 1 && response.status >= 500 ? fetchRetry(url, attempts - 1, options) : response;
     });
 }
-const backgroundCache = {};
-function handleSmoothScroll(fn) {
+function handleSmoothScroll(fn, options = {}) {
     const htmlElement = document.documentElement;
     const existing = htmlElement.style.scrollBehavior;
     htmlElement.style.scrollBehavior = "auto";
+    if (!options.dontForceLayout) {
+        // In Chrome-based browsers we need to force reflow before calling `scrollTo`.
+        // Otherwise it will not pickup the change in scrollBehavior
+        // More info here: https://github.com/vercel/next.js/issues/40719#issuecomment-1336248042
+        htmlElement.getClientRects();
+    }
     fn();
     htmlElement.style.scrollBehavior = existing;
 }
@@ -1813,9 +1837,11 @@ function fetchNextData({ dataHref , inflightCache , isPrefetch , hasMiddleware ,
     var ref1;
     const getData = (params)=>{
         return fetchRetry(dataHref, isServerRender ? 3 : 1, {
-            headers: isPrefetch ? {
+            headers: Object.assign({}, isPrefetch ? {
                 purpose: "prefetch"
-            } : {},
+            } : {}, isPrefetch && hasMiddleware ? {
+                "x-middleware-prefetch": "1"
+            } : {}),
             method: (ref1 = params == null ? void 0 : params.method) != null ? ref1 : "GET"
         }).then((response)=>{
             if (response.ok && (params == null ? void 0 : params.method) === "HEAD") {
@@ -1886,7 +1912,14 @@ function fetchNextData({ dataHref , inflightCache , isPrefetch , hasMiddleware ,
             }
             return data;
         }).catch((err)=>{
-            delete inflightCache[cacheKey];
+            if (!unstable_skipClientCache) {
+                delete inflightCache[cacheKey];
+            }
+            if (err.message === "Failed to fetch" || // firefox
+            err.message === "NetworkError when attempting to fetch resource." || // safari
+            err.message === "Load failed") {
+                (0, _routeLoader).markAssetError(err);
+            }
             throw err;
         });
     };
@@ -1945,6 +1978,11 @@ class Router {
         window.history.back();
     }
     /**
+   * Go forward in history
+   */ forward() {
+        window.history.forward();
+    }
+    /**
    * Performs a `pushState` with arguments
    * @param url of the route
    * @param as masks `url` for the browser
@@ -1976,8 +2014,8 @@ class Router {
             // WARNING: `_h` is an internal option for handing Next.js client-side
             // hydration. Your app should _never_ use this property. It may change at
             // any time without notice.
-            const isQueryUpdating = options._h;
-            const shouldResolveHref = isQueryUpdating || options._shouldResolveHref || (0, _parsePath).parsePath(url).pathname === (0, _parsePath).parsePath(as).pathname;
+            const isQueryUpdating = options._h === 1;
+            let shouldResolveHref = isQueryUpdating || options._shouldResolveHref || (0, _parsePath).parsePath(url).pathname === (0, _parsePath).parsePath(as).pathname;
             const nextState = _extends({}, _this.state);
             // for static pages with query params in the URL we delay
             // marking the router ready until after the query is updated
@@ -2047,9 +2085,9 @@ class Router {
                 [pages, { __rewrites: rewrites  }] = yield Promise.all([
                     _this.pageLoader.getPageList(),
                     (0, _routeLoader).getClientBuildManifest(),
-                    _this.pageLoader.getMiddleware(), 
+                    _this.pageLoader.getMiddleware()
                 ]);
-            } catch (err1) {
+            } catch (err) {
                 // If we fail to resolve the page list or client-build manifest, we must
                 // do a server-side transition:
                 handleHardNavigation({
@@ -2073,15 +2111,18 @@ class Router {
             // point by either next/link or router.push/replace so strip the
             // basePath from the pathname to match the pages dir 1-to-1
             pathname = pathname ? (0, _removeTrailingSlash).removeTrailingSlash((0, _removeBasePath).removeBasePath(pathname)) : pathname;
+            let route = (0, _removeTrailingSlash).removeTrailingSlash(pathname);
+            const parsedAsPathname = as.startsWith("/") && (0, _parseRelativeUrl).parseRelativeUrl(as).pathname;
+            const isMiddlewareRewrite = !!(parsedAsPathname && route !== parsedAsPathname && (!(0, _isDynamic).isDynamicRoute(route) || !(0, _routeMatcher).getRouteMatcher((0, _routeRegex).getRouteRegex(route))(parsedAsPathname)));
             // we don't attempt resolve asPath when we need to execute
             // middleware as the resolving will occur server-side
-            const isMiddlewareMatch = yield matchesMiddleware({
+            const isMiddlewareMatch = !options.shallow && (yield matchesMiddleware({
                 asPath: as,
                 locale: nextState.locale,
                 router: _this
-            });
-            if (options.shallow && isMiddlewareMatch) {
-                pathname = _this.pathname;
+            }));
+            if (isQueryUpdating && isMiddlewareMatch) {
+                shouldResolveHref = false;
             }
             if (shouldResolveHref && pathname !== "/_error") {
                 options._shouldResolveHref = true;
@@ -2105,23 +2146,23 @@ class Router {
                 return false;
             }
             resolvedAs = (0, _removeLocale).removeLocale((0, _removeBasePath).removeBasePath(resolvedAs), nextState.locale);
-            let route = (0, _removeTrailingSlash).removeTrailingSlash(pathname);
+            route = (0, _removeTrailingSlash).removeTrailingSlash(pathname);
             let routeMatch = false;
             if ((0, _isDynamic).isDynamicRoute(route)) {
-                const parsedAs1 = (0, _parseRelativeUrl).parseRelativeUrl(resolvedAs);
-                const asPathname = parsedAs1.pathname;
+                const parsedAs = (0, _parseRelativeUrl).parseRelativeUrl(resolvedAs);
+                const asPathname = parsedAs.pathname;
                 const routeRegex = (0, _routeRegex).getRouteRegex(route);
                 routeMatch = (0, _routeMatcher).getRouteMatcher(routeRegex)(asPathname);
                 const shouldInterpolate = route === asPathname;
                 const interpolatedAs = shouldInterpolate ? interpolateAs(route, asPathname, query) : {};
                 if (!routeMatch || shouldInterpolate && !interpolatedAs.result) {
-                    const missingParams = Object.keys(routeRegex.groups).filter((param)=>!query[param]);
+                    const missingParams = Object.keys(routeRegex.groups).filter((param)=>!query[param] && !routeRegex.groups[param].optional);
                     if (missingParams.length > 0 && !isMiddlewareMatch) {
                         if (false) {}
                         throw new Error((shouldInterpolate ? `The provided \`href\` (${url}) value is missing query values (${missingParams.join(", ")}) to be interpolated properly. ` : `The provided \`as\` value (${asPathname}) is incompatible with the \`href\` value (${route}). `) + `Read more: https://nextjs.org/docs/messages/${shouldInterpolate ? "href-interpolation-failed" : "incompatible-href-as"}`);
                     }
                 } else if (shouldInterpolate) {
-                    as = (0, _formatUrl).formatWithValidation(Object.assign({}, parsedAs1, {
+                    as = (0, _formatUrl).formatWithValidation(Object.assign({}, parsedAs, {
                         pathname: interpolatedAs.result,
                         query: omit(query, interpolatedAs.params)
                     }));
@@ -2134,7 +2175,7 @@ class Router {
                 Router.events.emit("routeChangeStart", as, routeProps);
             }
             try {
-                var ref2, ref3;
+                var ref2, ref3, ref4;
                 let routeInfo = yield _this.getRouteInfo({
                     route,
                     pathname,
@@ -2144,7 +2185,10 @@ class Router {
                     routeProps,
                     locale: nextState.locale,
                     isPreview: nextState.isPreview,
-                    hasMiddleware: isMiddlewareMatch
+                    hasMiddleware: isMiddlewareMatch,
+                    unstable_skipClientCache: options.unstable_skipClientCache,
+                    isQueryUpdating: isQueryUpdating && !_this.isFallback,
+                    isMiddlewareRewrite
                 });
                 if ("route" in routeInfo && isMiddlewareMatch) {
                     pathname = routeInfo.route || route;
@@ -2167,8 +2211,8 @@ class Router {
                             rewriteAs = (0, _removeBasePath).removeBasePath(rewriteAs);
                         }
                         if (false) {}
-                        const routeRegex1 = (0, _routeRegex).getRouteRegex(pathname);
-                        const curRouteMatch = (0, _routeMatcher).getRouteMatcher(routeRegex1)(rewriteAs);
+                        const routeRegex = (0, _routeRegex).getRouteRegex(pathname);
+                        const curRouteMatch = (0, _routeMatcher).getRouteMatcher(routeRegex)(new URL(rewriteAs, location.href).pathname);
                         if (curRouteMatch) {
                             Object.assign(query, curRouteMatch);
                         }
@@ -2186,7 +2230,6 @@ class Router {
                         return new Promise(()=>{});
                     }
                 }
-                let { error , props , __N_SSG , __N_SSP  } = routeInfo;
                 const component = routeInfo.Component;
                 if (component && component.unstable_scriptLoader) {
                     const scripts = [].concat(component.unstable_scriptLoader());
@@ -2195,15 +2238,15 @@ class Router {
                     });
                 }
                 // handle redirect on client-transition
-                if ((__N_SSG || __N_SSP) && props) {
-                    if (props.pageProps && props.pageProps.__N_REDIRECT) {
+                if ((routeInfo.__N_SSG || routeInfo.__N_SSP) && routeInfo.props) {
+                    if (routeInfo.props.pageProps && routeInfo.props.pageProps.__N_REDIRECT) {
                         // Use the destination from redirect without adding locale
                         options.locale = false;
-                        const destination = props.pageProps.__N_REDIRECT;
+                        const destination = routeInfo.props.pageProps.__N_REDIRECT;
                         // check if destination is internal (resolves to a page) and attempt
                         // client-navigation if it is falling back to hard navigation if
                         // it's not
-                        if (destination.startsWith("/") && props.pageProps.__N_REDIRECT_BASE_PATH !== false) {
+                        if (destination.startsWith("/") && routeInfo.props.pageProps.__N_REDIRECT_BASE_PATH !== false) {
                             const parsedHref = (0, _parseRelativeUrl).parseRelativeUrl(destination);
                             parsedHref.pathname = resolveDynamicRoute(parsedHref.pathname, pages);
                             const { url: newUrl , as: newAs  } = prepareUrlAs(_this, destination, destination);
@@ -2215,9 +2258,9 @@ class Router {
                         });
                         return new Promise(()=>{});
                     }
-                    nextState.isPreview = !!props.__N_PREVIEW;
+                    nextState.isPreview = !!routeInfo.props.__N_PREVIEW;
                     // handle SSG data 404
-                    if (props.notFound === SSG_DATA_NOT_FOUND) {
+                    if (routeInfo.props.notFound === SSG_DATA_NOT_FOUND) {
                         let notFoundRoute;
                         try {
                             yield _this.fetchComponent("/404");
@@ -2242,22 +2285,21 @@ class Router {
                         }
                     }
                 }
-                Router.events.emit("beforeHistoryChange", as, routeProps);
-                _this.changeState(method, url, as, options);
-                if (isQueryUpdating && pathname === "/_error" && ((ref2 = self.__NEXT_DATA__.props) == null ? void 0 : (ref3 = ref2.pageProps) == null ? void 0 : ref3.statusCode) === 500 && (props == null ? void 0 : props.pageProps)) {
+                if (isQueryUpdating && _this.pathname === "/_error" && ((ref2 = self.__NEXT_DATA__.props) == null ? void 0 : (ref3 = ref2.pageProps) == null ? void 0 : ref3.statusCode) === 500 && ((ref4 = routeInfo.props) == null ? void 0 : ref4.pageProps)) {
                     // ensure statusCode is still correct for static 500 page
                     // when updating query information
-                    props.pageProps.statusCode = 500;
+                    routeInfo.props.pageProps.statusCode = 500;
                 }
                 var _route;
                 // shallow routing is only allowed for same page URL changes.
                 const isValidShallowRoute = options.shallow && nextState.route === ((_route = routeInfo.route) != null ? _route : route);
                 var _scroll;
-                const shouldScroll = (_scroll = options.scroll) != null ? _scroll : !options._h && !isValidShallowRoute;
+                const shouldScroll = (_scroll = options.scroll) != null ? _scroll : !isQueryUpdating && !isValidShallowRoute;
                 const resetScroll = shouldScroll ? {
                     x: 0,
                     y: 0
                 } : null;
+                const upcomingScrollState = forcedScroll != null ? forcedScroll : resetScroll;
                 // the new state that the router gonna set
                 const upcomingRouterState = _extends({}, nextState, {
                     route,
@@ -2266,21 +2308,61 @@ class Router {
                     asPath: cleanedAs,
                     isFallback: false
                 });
-                const upcomingScrollState = forcedScroll != null ? forcedScroll : resetScroll;
+                // When the page being rendered is the 404 page, we should only update the
+                // query parameters. Route changes here might add the basePath when it
+                // wasn't originally present. This is also why this block is before the
+                // below `changeState` call which updates the browser's history (changing
+                // the URL).
+                if (isQueryUpdating && (_this.pathname === "/404" || _this.pathname === "/_error")) {
+                    var ref5, ref6, ref7;
+                    routeInfo = yield _this.getRouteInfo({
+                        route: _this.pathname,
+                        pathname: _this.pathname,
+                        query,
+                        as,
+                        resolvedAs,
+                        routeProps: {
+                            shallow: false
+                        },
+                        locale: nextState.locale,
+                        isPreview: nextState.isPreview
+                    });
+                    if ("type" in routeInfo) {
+                        throw new Error(`Unexpected middleware effect on ${_this.pathname}`);
+                    }
+                    if (_this.pathname === "/_error" && ((ref5 = self.__NEXT_DATA__.props) == null ? void 0 : (ref6 = ref5.pageProps) == null ? void 0 : ref6.statusCode) === 500 && ((ref7 = routeInfo.props) == null ? void 0 : ref7.pageProps)) {
+                        // ensure statusCode is still correct for static 500 page
+                        // when updating query information
+                        routeInfo.props.pageProps.statusCode = 500;
+                    }
+                    try {
+                        yield _this.set(upcomingRouterState, routeInfo, upcomingScrollState);
+                    } catch (err) {
+                        if ((0, _isError).default(err) && err.cancelled) {
+                            Router.events.emit("routeChangeError", err, cleanedAs, routeProps);
+                        }
+                        throw err;
+                    }
+                    return true;
+                }
+                Router.events.emit("beforeHistoryChange", as, routeProps);
+                _this.changeState(method, url, as, options);
                 // for query updates we can skip it if the state is unchanged and we don't
                 // need to scroll
                 // https://github.com/vercel/next.js/issues/37139
-                const canSkipUpdating = options._h && !upcomingScrollState && !readyStateChange && !localeChange && (0, _compareStates).compareRouterStates(upcomingRouterState, _this.state);
+                const canSkipUpdating = isQueryUpdating && !upcomingScrollState && !readyStateChange && !localeChange && (0, _compareStates).compareRouterStates(upcomingRouterState, _this.state);
                 if (!canSkipUpdating) {
-                    yield _this.set(upcomingRouterState, routeInfo, upcomingScrollState).catch((e)=>{
-                        if (e.cancelled) error = error || e;
+                    try {
+                        yield _this.set(upcomingRouterState, routeInfo, upcomingScrollState);
+                    } catch (e) {
+                        if (e.cancelled) routeInfo.error = routeInfo.error || e;
                         else throw e;
-                    });
-                    if (error) {
+                    }
+                    if (routeInfo.error) {
                         if (!isQueryUpdating) {
-                            Router.events.emit("routeChangeError", error, cleanedAs, routeProps);
+                            Router.events.emit("routeChangeError", routeInfo.error, cleanedAs, routeProps);
                         }
-                        throw error;
+                        throw routeInfo.error;
                     }
                     if (false) {}
                     if (!isQueryUpdating) {
@@ -2293,11 +2375,11 @@ class Router {
                     }
                 }
                 return true;
-            } catch (err11) {
-                if ((0, _isError).default(err11) && err11.cancelled) {
+            } catch (err1) {
+                if ((0, _isError).default(err1) && err1.cancelled) {
                     return false;
                 }
-                throw err11;
+                throw err1;
             }
         })();
     }
@@ -2367,7 +2449,7 @@ class Router {
             }
         })();
     }
-    getRouteInfo({ route: requestedRoute , pathname , query , as , resolvedAs , routeProps , locale , hasMiddleware , isPreview , unstable_skipClientCache  }) {
+    getRouteInfo({ route: requestedRoute , pathname , query , as , resolvedAs , routeProps , locale , hasMiddleware , isPreview , unstable_skipClientCache , isQueryUpdating , isMiddlewareRewrite  }) {
         var _this = this;
         return _async_to_generator(function*() {
             /**
@@ -2377,7 +2459,7 @@ class Router {
      * for shallow routing purposes.
      */ let route = requestedRoute;
             try {
-                var ref, ref4, ref5;
+                var ref, ref8, ref9, ref10;
                 const handleCancelled = getCancelledHandler({
                     route,
                     router: _this
@@ -2390,6 +2472,7 @@ class Router {
                     existingInfo = undefined;
                 }
                 let cachedRouteInfo = existingInfo && !("initial" in existingInfo) && "production" !== "development" ? existingInfo : undefined;
+                const isBackground = isQueryUpdating;
                 const fetchNextDataParams = {
                     dataHref: _this.pageLoader.getDataHref({
                         href: (0, _formatUrl).formatWithValidation({
@@ -2403,38 +2486,65 @@ class Router {
                     hasMiddleware: true,
                     isServerRender: _this.isSsr,
                     parseJSON: true,
-                    inflightCache: _this.sdc,
+                    inflightCache: isBackground ? _this.sbc : _this.sdc,
                     persistCache: !isPreview,
                     isPrefetch: false,
-                    unstable_skipClientCache
+                    unstable_skipClientCache,
+                    isBackground
                 };
-                const data = yield withMiddlewareEffects({
+                let data = isQueryUpdating && !isMiddlewareRewrite ? null : yield withMiddlewareEffects({
                     fetchData: ()=>fetchNextData(fetchNextDataParams),
                     asPath: resolvedAs,
                     locale: locale,
                     router: _this
+                }).catch((err)=>{
+                    // we don't hard error during query updating
+                    // as it's un-necessary and doesn't need to be fatal
+                    // unless it is a fallback route and the props can't
+                    // be loaded
+                    if (isQueryUpdating) {
+                        return null;
+                    }
+                    throw err;
                 });
+                if (isQueryUpdating) {
+                    if (!data) {
+                        data = {
+                            json: self.__NEXT_DATA__.props
+                        };
+                    } else {
+                        data.json = self.__NEXT_DATA__.props;
+                    }
+                }
                 handleCancelled();
-                if ((data == null ? void 0 : (ref = data.effect) == null ? void 0 : ref.type) === "redirect-internal" || (data == null ? void 0 : (ref4 = data.effect) == null ? void 0 : ref4.type) === "redirect-external") {
+                if ((data == null ? void 0 : (ref = data.effect) == null ? void 0 : ref.type) === "redirect-internal" || (data == null ? void 0 : (ref8 = data.effect) == null ? void 0 : ref8.type) === "redirect-external") {
                     return data.effect;
                 }
-                if ((data == null ? void 0 : (ref5 = data.effect) == null ? void 0 : ref5.type) === "rewrite") {
-                    route = (0, _removeTrailingSlash).removeTrailingSlash(data.effect.resolvedHref);
-                    pathname = data.effect.resolvedHref;
-                    query = _extends({}, query, data.effect.parsedAs.query);
-                    resolvedAs = (0, _removeBasePath).removeBasePath((0, _normalizeLocalePath).normalizeLocalePath(data.effect.parsedAs.pathname, _this.locales).pathname);
-                    // Check again the cache with the new destination.
-                    existingInfo = _this.components[route];
-                    if (routeProps.shallow && existingInfo && _this.route === route && !hasMiddleware) {
-                        // If we have a match with the current route due to rewrite,
-                        // we can copy the existing information to the rewritten one.
-                        // Then, we return the information along with the matched route.
-                        return _extends({}, existingInfo, {
-                            route
-                        });
+                if ((data == null ? void 0 : (ref9 = data.effect) == null ? void 0 : ref9.type) === "rewrite") {
+                    const resolvedRoute = (0, _removeTrailingSlash).removeTrailingSlash(data.effect.resolvedHref);
+                    const pages = yield _this.pageLoader.getPageList();
+                    // during query updating the page must match although during
+                    // client-transition a redirect that doesn't match a page
+                    // can be returned and this should trigger a hard navigation
+                    // which is valid for incremental migration
+                    if (!isQueryUpdating || pages.includes(resolvedRoute)) {
+                        route = resolvedRoute;
+                        pathname = data.effect.resolvedHref;
+                        query = _extends({}, query, data.effect.parsedAs.query);
+                        resolvedAs = (0, _removeBasePath).removeBasePath((0, _normalizeLocalePath).normalizeLocalePath(data.effect.parsedAs.pathname, _this.locales).pathname);
+                        // Check again the cache with the new destination.
+                        existingInfo = _this.components[route];
+                        if (routeProps.shallow && existingInfo && _this.route === route && !hasMiddleware) {
+                            // If we have a match with the current route due to rewrite,
+                            // we can copy the existing information to the rewritten one.
+                            // Then, we return the information along with the matched route.
+                            return _extends({}, existingInfo, {
+                                route
+                            });
+                        }
                     }
                 }
-                if (route === "/api" || route.startsWith("/api/")) {
+                if ((0, _isApiRoute).isAPIRoute(route)) {
                     handleHardNavigation({
                         url: as,
                         router: _this
@@ -2448,33 +2558,45 @@ class Router {
                         __N_SSP: res.mod.__N_SSP
                     })));
                 if (false) {}
+                const wasBailedPrefetch = data == null ? void 0 : (ref10 = data.response) == null ? void 0 : ref10.headers.get("x-middleware-skip");
                 const shouldFetchData = routeInfo.__N_SSG || routeInfo.__N_SSP;
+                // For non-SSG prefetches that bailed before sending data
+                // we clear the cache to fetch full response
+                if (wasBailedPrefetch && (data == null ? void 0 : data.dataHref)) {
+                    delete _this.sdc[data.dataHref];
+                }
                 const { props , cacheKey  } = yield _this._getData(_async_to_generator(function*() {
                     if (shouldFetchData) {
-                        const { json , cacheKey: _cacheKey  } = (data == null ? void 0 : data.json) ? data : yield fetchNextData({
-                            dataHref: _this.pageLoader.getDataHref({
-                                href: (0, _formatUrl).formatWithValidation({
-                                    pathname,
-                                    query
-                                }),
-                                asPath: resolvedAs,
-                                locale
+                        if ((data == null ? void 0 : data.json) && !wasBailedPrefetch) {
+                            return {
+                                cacheKey: data.cacheKey,
+                                props: data.json
+                            };
+                        }
+                        const dataHref = (data == null ? void 0 : data.dataHref) ? data.dataHref : _this.pageLoader.getDataHref({
+                            href: (0, _formatUrl).formatWithValidation({
+                                pathname,
+                                query
                             }),
+                            asPath: resolvedAs,
+                            locale
+                        });
+                        const fetched = yield fetchNextData({
+                            dataHref,
                             isServerRender: _this.isSsr,
                             parseJSON: true,
-                            inflightCache: _this.sdc,
+                            inflightCache: wasBailedPrefetch ? {} : _this.sdc,
                             persistCache: !isPreview,
                             isPrefetch: false,
                             unstable_skipClientCache
                         });
                         return {
-                            cacheKey: _cacheKey,
-                            props: json || {}
+                            cacheKey: fetched.cacheKey,
+                            props: fetched.json || {}
                         };
                     }
                     return {
                         headers: {},
-                        cacheKey: "",
                         props: yield _this.getInitialProps(routeInfo.Component, {
                             pathname,
                             query,
@@ -2488,16 +2610,16 @@ class Router {
                 // Only bust the data cache for SSP routes although
                 // middleware can skip cache per request with
                 // x-middleware-cache: no-cache as well
-                if (routeInfo.__N_SSP && fetchNextDataParams.dataHref) {
+                if (routeInfo.__N_SSP && fetchNextDataParams.dataHref && cacheKey) {
                     delete _this.sdc[cacheKey];
                 }
                 // we kick off a HEAD request in the background
                 // when a non-prefetch request is made to signal revalidation
-                if (!_this.isPreview && routeInfo.__N_SSG && "production" !== "development") {
+                if (!_this.isPreview && routeInfo.__N_SSG && "production" !== "development" && !isQueryUpdating) {
                     fetchNextData(Object.assign({}, fetchNextDataParams, {
                         isBackground: true,
                         persistCache: false,
-                        inflightCache: backgroundCache
+                        inflightCache: _this.sbc
                     })).catch(()=>{});
                 }
                 props.pageProps = Object.assign({}, props.pageProps);
@@ -2574,28 +2696,74 @@ class Router {
    */ prefetch(url, asPath = url, options = {}) {
         var _this = this;
         return _async_to_generator(function*() {
+            // Prefetch is not supported in development mode because it would trigger on-demand-entries
+            if (false) {}
             if (false) {}
             let parsed = (0, _parseRelativeUrl).parseRelativeUrl(url);
             let { pathname , query  } = parsed;
+            const originalPathname = pathname;
             if (false) {}
             const pages = yield _this.pageLoader.getPageList();
             let resolvedAs = asPath;
             const locale = typeof options.locale !== "undefined" ? options.locale || undefined : _this.locale;
+            const isMiddlewareMatch = yield matchesMiddleware({
+                asPath: asPath,
+                locale: locale,
+                router: _this
+            });
             if (false) {}
             parsed.pathname = resolveDynamicRoute(parsed.pathname, pages);
             if ((0, _isDynamic).isDynamicRoute(parsed.pathname)) {
                 pathname = parsed.pathname;
                 parsed.pathname = pathname;
                 Object.assign(query, (0, _routeMatcher).getRouteMatcher((0, _routeRegex).getRouteRegex(parsed.pathname))((0, _parsePath).parsePath(asPath).pathname) || {});
+                if (!isMiddlewareMatch) {
+                    url = (0, _formatUrl).formatWithValidation(parsed);
+                }
+            }
+            const data =  false ? 0 : yield withMiddlewareEffects({
+                fetchData: ()=>fetchNextData({
+                        dataHref: _this.pageLoader.getDataHref({
+                            href: (0, _formatUrl).formatWithValidation({
+                                pathname: originalPathname,
+                                query
+                            }),
+                            skipInterpolation: true,
+                            asPath: resolvedAs,
+                            locale
+                        }),
+                        hasMiddleware: true,
+                        isServerRender: _this.isSsr,
+                        parseJSON: true,
+                        inflightCache: _this.sdc,
+                        persistCache: !_this.isPreview,
+                        isPrefetch: true
+                    }),
+                asPath: asPath,
+                locale: locale,
+                router: _this
+            });
+            /**
+     * If there was a rewrite we apply the effects of the rewrite on the
+     * current parameters for the prefetch.
+     */ if ((data == null ? void 0 : data.effect.type) === "rewrite") {
+                parsed.pathname = data.effect.resolvedHref;
+                pathname = data.effect.resolvedHref;
+                query = _extends({}, query, data.effect.parsedAs.query);
+                resolvedAs = data.effect.parsedAs.pathname;
                 url = (0, _formatUrl).formatWithValidation(parsed);
             }
-            // Prefetch is not supported in development mode because it would trigger on-demand-entries
-            if (false) {}
+            /**
+     * If there is a redirect to an external destination then we don't have
+     * to prefetch content as it will be unused.
+     */ if ((data == null ? void 0 : data.effect.type) === "redirect-external") {
+                return;
+            }
             const route = (0, _removeTrailingSlash).removeTrailingSlash(pathname);
             yield Promise.all([
                 _this.pageLoader._isSsg(route).then((isSsg)=>{
                     return isSsg ? fetchNextData({
-                        dataHref: _this.pageLoader.getDataHref({
+                        dataHref: (data == null ? void 0 : data.json) ? data == null ? void 0 : data.dataHref : _this.pageLoader.getDataHref({
                             href: url,
                             asPath: resolvedAs,
                             locale: locale
@@ -2608,7 +2776,7 @@ class Router {
                         unstable_skipClientCache: options.unstable_skipClientCache || options.priority && !!true
                     }).then(()=>false) : false;
                 }),
-                _this.pageLoader[options.priority ? "loadPage" : "prefetch"](route), 
+                _this.pageLoader[options.priority ? "loadPage" : "prefetch"](route)
             ]);
         })();
     }
@@ -2693,8 +2861,10 @@ class Router {
         return this.state.isPreview;
     }
     constructor(pathname1, query1, as1, { initialProps , pageLoader , App , wrapApp , Component , err , subscription , isFallback , locale , locales , defaultLocale , domainLocales , isPreview  }){
-        // Server Data Cache
+        // Server Data Cache (full data requests)
         this.sdc = {};
+        // Server Background Cache (HEAD requests)
+        this.sbc = {};
         this.isFirstPopStateEvent = true;
         this._key = createKey();
         this.onPopState = (e)=>{
@@ -2734,10 +2904,10 @@ class Router {
             const { url , as , options , key  } = state;
             if (false) {}
             this._key = key;
-            const { pathname: pathname1  } = (0, _parseRelativeUrl).parseRelativeUrl(url);
+            const { pathname  } = (0, _parseRelativeUrl).parseRelativeUrl(url);
             // Make sure we don't re-render on initial load,
             // can be caused by navigating back from an external site
-            if (this.isSsr && as === (0, _addBasePath).addBasePath(this.asPath) && pathname1 === (0, _addBasePath).addBasePath(this.pathname)) {
+            if (this.isSsr && as === (0, _addBasePath).addBasePath(this.asPath) && pathname === (0, _addBasePath).addBasePath(this.pathname)) {
                 return;
             }
             // If the downstream application returns falsy, return.
@@ -2807,12 +2977,29 @@ Router.events = (0, _mitt).default();
 exports["default"] = Router; //# sourceMappingURL=router.js.map
 
 
+/***/ }),
+
+/***/ 79423:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({
+    value: true
+}));
+exports.isAPIRoute = isAPIRoute;
+function isAPIRoute(value) {
+    return value === "/api" || Boolean(value == null ? void 0 : value.startsWith("/api/"));
+}
+
+//# sourceMappingURL=is-api-route.js.map
+
 /***/ }),
 
 /***/ 41664:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-module.exports = __webpack_require__(48418)
+module.exports = __webpack_require__(31551)
 
 
 /***/ })