@sifxprime/krouter 0.5.166 → 0.5.167

package/app/node_modules/next/dist/server/base-server.js

@@ -37,6 +37,9 @@ const _removetrailingslash = require("../shared/lib/router/utils/remove-trailing
 const _denormalizepagepath = require("../shared/lib/page-path/denormalize-page-path");
 const _log = /*#__PURE__*/ _interop_require_wildcard(require("../build/output/log"));
 const _serverutils = require("./server-utils");
+const _isapiroute = require("../lib/is-api-route");
+const _isapppageroute = require("../lib/is-app-page-route");
+const _isapprouteroute = require("../lib/is-app-route-route");
 const _iserror = /*#__PURE__*/ _interop_require_wildcard(require("../lib/is-error"));
 const _requestmeta = require("./request-meta");
 const _removepathprefix = require("../shared/lib/router/utils/remove-path-prefix");
@@ -47,12 +50,9 @@ const _getnextpathnameinfo = require("../shared/lib/router/utils/get-next-pathna
 const _approuterheaders = require("../client/components/app-router-headers");
 const _nanoid = require("next/dist/compiled/nanoid");
 const _localeroutenormalizer = require("./normalizers/locale-route-normalizer");
-const _defaultroutematchermanager = require("./route-matcher-managers/default-route-matcher-manager");
-const _apppageroutematcherprovider = require("./route-matcher-providers/app-page-route-matcher-provider");
-const _approuteroutematcherprovider = require("./route-matcher-providers/app-route-route-matcher-provider");
-const _pagesapiroutematcherprovider = require("./route-matcher-providers/pages-api-route-matcher-provider");
-const _pagesroutematcherprovider = require("./route-matcher-providers/pages-route-matcher-provider");
-const _servermanifestloader = require("./route-matcher-providers/helpers/manifest-loaders/server-manifest-loader");
+const _apppageroutedefinition = require("./route-definitions/app-page-route-definition");
+const _pages = require("./normalizers/built/pages");
+const _app = require("./normalizers/built/app");
 const _tracer = require("./lib/trace/tracer");
 const _constants1 = require("./lib/trace/constants");
 const _requestinsightsidentity = require("./lib/trace/request-insights-identity");
@@ -64,6 +64,7 @@ const _constants2 = require("../lib/constants");
 const _normalizelocalepath = require("../shared/lib/i18n/normalize-locale-path");
 const _matchnextdatapathname = require("./lib/match-next-data-pathname");
 const _getroutefromassetpath = /*#__PURE__*/ _interop_require_default(require("../shared/lib/router/utils/get-route-from-asset-path"));
+const _routematcher = require("../shared/lib/router/utils/route-matcher");
 const _rsc = require("./normalizers/request/rsc");
 const _stripflightheaders = require("./app-render/strip-flight-headers");
 const _checks = require("./route-modules/checks");
@@ -73,13 +74,13 @@ const _interceptionroutes = require("../shared/lib/router/utils/interception-rou
 const _toroute = require("./lib/to-route");
 const _helpers = require("./base-http/helpers");
 const _patchsetheader = require("./lib/patch-set-header");
-const _ppr = require("./lib/experimental/ppr");
 const _builtinrequestcontext = require("./after/builtin-request-context");
 const _adapter = require("./web/adapter");
 const _fallback = require("../lib/fallback");
 const _segmentprefixrsc = require("./normalizers/request/segment-prefix-rsc");
 const _streamingmetadata = require("./lib/streaming-metadata");
 const _decodequerypathparameter = require("./lib/decode-query-path-parameter");
+const _decodepathparams = require("./lib/router-utils/decode-path-params");
 const _nofallbackerrorexternal = require("../shared/lib/no-fallback-error.external");
 const _fixmojibake = require("./lib/fix-mojibake");
 const _setcachebustingsearchparam = require("../client/components/router-reducer/set-cache-busting-search-param");
@@ -332,11 +333,7 @@ class Server {
         }
         if (this.nextConfig.experimental.runtimeServerDeploymentId) {
             if (!process.env.NEXT_DEPLOYMENT_ID) {
-                throw Object.defineProperty(new Error('process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled'), "__NEXT_ERROR_CODE", {
-                    value: "E970",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error('process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled');
             }
             this.deploymentId = process.env.NEXT_DEPLOYMENT_ID;
         } else {
@@ -353,6 +350,8 @@ class Server {
         }
         this.port = port;
         this.distDir = _path.join(/* turbopackIgnore: true */ this.dir, this.nextConfig.distDir);
+        this.pagesNormalizers = new _pages.PagesNormalizers(this.distDir);
+        this.appNormalizers = new _app.AppNormalizers(this.distDir);
         this.publicDir = this.getPublicDir();
         this.hasStaticDir = !minimalMode && this.getHasStaticDir();
         this.i18nProvider = ((_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales) ? new _i18nprovider.I18NProvider(this.nextConfig.i18n) : undefined;
@@ -365,7 +364,7 @@ class Server {
         const minimalModeKey = 'minimalMode';
         this[minimalModeKey] = minimalMode || !!process.env.NEXT_PRIVATE_MINIMAL_MODE;
         this.enabledDirectories = this.getEnabledDirectories(dev);
-        this.isAppPPREnabled = this.enabledDirectories.app && (0, _ppr.checkIsAppPPREnabled)(this.nextConfig.experimental.ppr);
+        this.isAppPPREnabled = this.enabledDirectories.app && Boolean(this.nextConfig.cacheComponents);
         this.normalizers = {
             // We should normalize the pathname from the RSC prefix only in minimal
             // mode as otherwise that route is not exposed external to the server as
@@ -381,7 +380,7 @@ class Server {
             trailingSlash: this.nextConfig.trailingSlash,
             poweredByHeader: this.nextConfig.poweredByHeader,
             generateEtags,
-            previewProps: this.getPrerenderManifest().preview,
+            previewProps: this.getPreviewProps(),
             basePath: this.nextConfig.basePath,
             images: this.nextConfig.images,
             optimizeCss: this.nextConfig.experimental.optimizeCss,
@@ -396,9 +395,7 @@ class Server {
             enableTainting: this.nextConfig.experimental.taint,
             crossOrigin: this.nextConfig.crossOrigin ? this.nextConfig.crossOrigin : undefined,
             largePageDataBytes: this.nextConfig.experimental.largePageDataBytes,
-            isExperimentalCompile: this.nextConfig.experimental.isExperimentalCompile,
-            // `htmlLimitedBots` is passed to server as serialized config in string format
-            htmlLimitedBots: this.nextConfig.htmlLimitedBots,
+            isExperimentalCompile: options.compileMode ? options.compileMode.isExperimentalCompile : this.nextConfig.experimental.isExperimentalCompile,
             cacheComponents: this.nextConfig.cacheComponents ?? false,
             partialPrefetching: this.nextConfig.partialPrefetching,
             validationLevel: this.nextConfig.experimental.instantInsights.validationLevel,
@@ -409,16 +406,19 @@ class Server {
                 clientParamParsingOrigins: this.nextConfig.experimental.clientParamParsingOrigins,
                 dynamicOnHover: this.nextConfig.experimental.dynamicOnHover ?? false,
                 optimisticRouting: this.nextConfig.experimental.optimisticRouting ?? false,
+                parallelRouteMetadata: this.nextConfig.experimental.parallelRouteMetadata ?? false,
                 inlineCss: this.nextConfig.experimental.inlineCss ?? false,
                 prefetchInlining: this.nextConfig.experimental.prefetchInlining ?? false,
                 authInterrupts: !!this.nextConfig.experimental.authInterrupts,
+                reactBrowserBailout: this.nextConfig.experimental.reactBrowserBailout ?? false,
                 serverComponentsHmrCancellation: this.nextConfig.experimental.serverComponentsHmrCancellation,
                 useCacheTimeout: this.nextConfig.experimental.useCacheTimeout,
+                durableUseCacheEntries: Boolean(this.nextConfig.experimental.durableUseCacheEntries),
                 cachedNavigations: this.nextConfig.experimental.cachedNavigations ?? false,
                 maxPostponedStateSizeBytes: (0, _configshared.parseMaxPostponedStateSize)(this.nextConfig.experimental.maxPostponedStateSize),
-                exposeTestingApi: this.dev === true || this.nextConfig.experimental.exposeTestingApiInProductionBuild === true
+                disableResumeDataCacheCompression: this.nextConfig.experimental.disableResumeDataCacheCompression ?? false,
+                exposeTestingApi: this.nextConfig.cacheComponents === true && (this.dev === true || this.nextConfig.experimental.exposeTestingApiInProductionBuild === true)
             },
-            onInstrumentationRequestError: this.instrumentationOnRequestError.bind(this),
             prefetchHints: {},
             reactMaxHeadersLength: this.nextConfig.reactMaxHeadersLength,
             logServerFunctions: typeof this.nextConfig.logging === 'object' && Boolean(this.nextConfig.logging.serverFunctions)
@@ -427,43 +427,8 @@ class Server {
         this.appPathsManifest = this.getAppPathsManifest();
         this.appPathRoutes = this.getAppPathRoutes();
         this.interceptionRoutePatterns = this.getinterceptionRoutePatterns();
-        // Configure the routes.
-        this.matchers = this.getRouteMatchers();
-        // Start route compilation. We don't wait for the routes to finish loading
-        // because we use the `waitTillReady` promise below in `handleRequest` to
-        // wait. Also we can't `await` in the constructor.
-        void this.matchers.reload();
         this.setAssetPrefix(assetPrefix);
     }
-    reloadMatchers() {
-        return this.matchers.reload();
-    }
-    getRouteMatchers() {
-        // Create a new manifest loader that get's the manifests from the server.
-        const manifestLoader = new _servermanifestloader.ServerManifestLoader((name)=>{
-            switch(name){
-                case _constants.PAGES_MANIFEST:
-                    return this.getPagesManifest() ?? null;
-                case _constants.APP_PATHS_MANIFEST:
-                    return this.getAppPathsManifest() ?? null;
-                default:
-                    return null;
-            }
-        });
-        // Configure the matchers and handlers.
-        const matchers = new _defaultroutematchermanager.DefaultRouteMatcherManager();
-        // Match pages under `pages/`.
-        matchers.push(new _pagesroutematcherprovider.PagesRouteMatcherProvider(this.distDir, manifestLoader, this.i18nProvider));
-        // Match api routes under `pages/api/`.
-        matchers.push(new _pagesapiroutematcherprovider.PagesAPIRouteMatcherProvider(this.distDir, manifestLoader, this.i18nProvider));
-        // If the app directory is enabled, then add the app matchers and handlers.
-        if (this.enabledDirectories.app) {
-            // Match app pages under `app/`.
-            matchers.push(new _apppageroutematcherprovider.AppPageRouteMatcherProvider(this.distDir, manifestLoader));
-            matchers.push(new _approuteroutematcherprovider.AppRouteRouteMatcherProvider(this.distDir, manifestLoader));
-        }
-        return matchers;
-    }
     async instrumentationOnRequestError(...args) {
         const [err, req, ctx] = args;
         if (this.instrumentation) {
@@ -564,8 +529,6 @@ class Server {
     async handleRequestImpl(req, res, parsedUrl) {
         try {
             var _originalRequest_socket, _originalRequest_socket1, _this_i18nProvider, _this_nextConfig_i18n;
-            // Wait for the matchers to be ready.
-            await this.matchers.waitTillReady();
             // ensure cookies set in middleware are merged and
             // not overridden by API routes/getServerSideProps
             (0, _patchsetheader.patchSetHeaderWithCookieSupport)(req, (0, _helpers.isNodeNextResponse)(res) ? res.originalResponse : res);
@@ -583,20 +546,12 @@ class Server {
             // Parse url if parsedUrl not provided
             if (!parsedUrl || typeof parsedUrl !== 'object') {
                 if (!req.url) {
-                    throw Object.defineProperty(new Error('Invariant: url can not be undefined'), "__NEXT_ERROR_CODE", {
-                        value: "E123",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error('Invariant: url can not be undefined');
                 }
                 parsedUrl = (0, _parseurl.parseUrl)(req.url);
             }
             if (!parsedUrl.pathname) {
-                throw Object.defineProperty(new Error("Invariant: pathname can't be empty"), "__NEXT_ERROR_CODE", {
-                    value: "E412",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error("Invariant: pathname can't be empty");
             }
             // Parse the querystring ourselves if the user doesn't handle querystring parsing
             if (typeof parsedUrl.query === 'string') {
@@ -704,19 +659,26 @@ class Server {
                         params: false,
                         hasValidParams: false
                     };
-                    const match = await this.matchers.match(srcPathname, {
-                        i18n: localeAnalysisResult
-                    });
-                    if (!pageIsDynamic && match) {
-                        // Update the source pathname to the matched page's pathname.
-                        srcPathname = match.definition.pathname;
-                        // The page is dynamic if the params are defined. We know at this
-                        // stage that the matched path is not a static page if the params
-                        // were parsed from the matched path header.
-                        if (typeof match.params !== 'undefined') {
-                            pageIsDynamic = true;
-                            paramsResult.params = match.params;
-                            paramsResult.hasValidParams = true;
+                    // A dynamic x-matched-path identifies the route pattern, not a
+                    // concrete pathname. Match it by identity so a pattern such as
+                    // `/[...path]` cannot be captured by the regex for `/[slug]`.
+                    let routeDefinition;
+                    if (pageIsDynamic) {
+                        routeDefinition = this.getRoutePatternDefinition(srcPathname, localeAnalysisResult);
+                    } else {
+                        const match = this.getRouteMatch(srcPathname, localeAnalysisResult);
+                        if (match) {
+                            routeDefinition = match.definition;
+                            // Update the source pathname to the matched page's pathname.
+                            srcPathname = match.definition.pathname;
+                            // The page is dynamic if the params are defined. We know at this
+                            // stage that the matched path is not a static page if the params
+                            // were parsed from the matched path header.
+                            if (typeof match.params !== 'undefined') {
+                                pageIsDynamic = true;
+                                paramsResult.params = match.params;
+                                paramsResult.hasValidParams = true;
+                            }
                         }
                     }
                     // The rest of this function can't handle i18n properly, so ensure we
@@ -858,6 +820,39 @@ class Server {
                             }
                         }
                     }
+                    // A platform route match can capture the locale as a dynamic param.
+                    // Analyze the interpolated pathname again to remove that prefix, but
+                    // preserve the original locale when it was already stripped above.
+                    let finalLocaleAnalysisResult = localeAnalysisResult;
+                    if (this.i18nProvider) {
+                        const analyzedMatchedPath = this.i18nProvider.analyze(matchedPath, {
+                            defaultLocale
+                        });
+                        const hasLocalePrefix = analyzedMatchedPath.pathname !== matchedPath;
+                        if (hasLocalePrefix || !localeAnalysisResult) {
+                            finalLocaleAnalysisResult = analyzedMatchedPath;
+                        } else {
+                            finalLocaleAnalysisResult = {
+                                ...localeAnalysisResult,
+                                pathname: matchedPath
+                            };
+                        }
+                        matchedPath = finalLocaleAnalysisResult.pathname;
+                        (0, _requestmeta.addRequestMeta)(req, 'locale', finalLocaleAnalysisResult.detectedLocale);
+                        if (finalLocaleAnalysisResult.inferredFromDefault) {
+                            (0, _requestmeta.addRequestMeta)(req, 'localeInferredFromDefault', true);
+                        } else {
+                            (0, _requestmeta.removeRequestMeta)(req, 'localeInferredFromDefault');
+                        }
+                    }
+                    // Match the resulting concrete pathname again so route precedence
+                    // is preserved while the concrete params remain available to PPR.
+                    const finalRouteMatch = this.getRouteMatch(matchedPath, finalLocaleAnalysisResult);
+                    if (finalRouteMatch) {
+                        (0, _requestmeta.addRequestMeta)(req, 'match', finalRouteMatch);
+                    } else {
+                        (0, _requestmeta.removeRequestMeta)(req, 'match');
+                    }
                     if (pageIsDynamic || didRewrite) {
                         var _utils_defaultRouteRegex;
                         utils.normalizeCdnUrl(req, [
@@ -879,7 +874,7 @@ class Server {
                     // handleRewrites to ensure catch-all routes get proper array values.
                     // App Router routes should not include rewrite query params as they
                     // affect RSC payload.
-                    if ((match == null ? void 0 : match.definition.kind) === _routekind.RouteKind.PAGES || (match == null ? void 0 : match.definition.kind) === _routekind.RouteKind.PAGES_API) {
+                    if ((routeDefinition == null ? void 0 : routeDefinition.kind) === _routekind.RouteKind.PAGES || (routeDefinition == null ? void 0 : routeDefinition.kind) === _routekind.RouteKind.PAGES_API) {
                         parsedUrl.query = rewrittenQueryParams;
                     }
                     finished = await this.normalizeAndAttachMetadata(req, res, parsedUrl);
@@ -1019,6 +1014,170 @@ class Server {
             res.body('Internal Server Error').send();
         }
     }
+    getPagesRouteDefinition(page, pathname, kind, locale) {
+        var _this_pagesManifest;
+        const filename = (_this_pagesManifest = this.pagesManifest) == null ? void 0 : _this_pagesManifest[page];
+        if (!filename) return;
+        return {
+            kind,
+            pathname,
+            page,
+            bundlePath: this.pagesNormalizers.bundlePath.normalize(page),
+            filename: this.pagesNormalizers.filename.normalize(filename),
+            ...this.i18nProvider ? {
+                i18n: {
+                    locale
+                }
+            } : {}
+        };
+    }
+    getAppPageRouteDefinition(pathname) {
+        var _this_appPathRoutes, _this_appPathsManifest;
+        const appPaths = (_this_appPathRoutes = this.appPathRoutes) == null ? void 0 : _this_appPathRoutes[pathname];
+        if (!appPaths) return;
+        const page = (0, _apppaths.selectAppPageEntry)(pathname, appPaths);
+        if (!(0, _isapppageroute.isAppPageRoute)(page)) return;
+        const filename = (_this_appPathsManifest = this.appPathsManifest) == null ? void 0 : _this_appPathsManifest[page];
+        if (!filename) return;
+        return {
+            kind: _routekind.RouteKind.APP_PAGE,
+            pathname,
+            page,
+            bundlePath: this.appNormalizers.bundlePath.normalize(page),
+            filename: this.appNormalizers.filename.normalize(filename),
+            appPaths
+        };
+    }
+    getAppRouteRouteDefinition(page) {
+        var _this_appPathsManifest;
+        const filename = (_this_appPathsManifest = this.appPathsManifest) == null ? void 0 : _this_appPathsManifest[page];
+        if (!filename) return;
+        const pathname = this.appNormalizers.pathname.normalize(page);
+        return {
+            kind: _routekind.RouteKind.APP_ROUTE,
+            pathname,
+            page,
+            bundlePath: this.appNormalizers.bundlePath.normalize(page),
+            filename: this.appNormalizers.filename.normalize(filename)
+        };
+    }
+    getRouteDefinitions() {
+        // Route definitions are rebuilt from the manifests instead of being held
+        // by route matcher providers. This keeps direct BaseServer entrypoints
+        // working when requests do not pass through router-server's fsChecker.
+        const definitions = [];
+        if (this.enabledDirectories.pages) {
+            for (const page of Object.keys(this.pagesManifest || {})){
+                var _this_i18nProvider;
+                const localeResult = (_this_i18nProvider = this.i18nProvider) == null ? void 0 : _this_i18nProvider.analyze(page);
+                const pathname = (localeResult == null ? void 0 : localeResult.pathname) ?? page;
+                if ((0, _utils2.isBlockedPage)(pathname)) continue;
+                const definition = this.getPagesRouteDefinition(page, pathname, (0, _isapiroute.isAPIRoute)(page) ? _routekind.RouteKind.PAGES_API : _routekind.RouteKind.PAGES, localeResult == null ? void 0 : localeResult.detectedLocale);
+                if (definition) {
+                    definitions.push(definition);
+                }
+            }
+        }
+        if (this.enabledDirectories.app) {
+            for (const pathname of Object.keys(this.appPathRoutes || {})){
+                const definition = this.getAppPageRouteDefinition(pathname);
+                if (definition) {
+                    definitions.push(definition);
+                }
+            }
+            for (const page of Object.keys(this.appPathsManifest || {})){
+                if (!(0, _isapprouteroute.isAppRouteRoute)(page)) continue;
+                const definition = this.getAppRouteRouteDefinition(page);
+                if (definition) {
+                    definitions.push(definition);
+                }
+            }
+        }
+        return definitions;
+    }
+    getSortedRouteDefinitions(definitions) {
+        const references = new Map();
+        const pathnames = [];
+        for (const definition of definitions){
+            const existing = references.get(definition.pathname);
+            if (existing) {
+                existing.push(definition);
+            } else {
+                references.set(definition.pathname, [
+                    definition
+                ]);
+                pathnames.push(definition.pathname);
+            }
+        }
+        return (0, _utils1.getSortedRoutes)(pathnames).flatMap((pathname)=>references.get(pathname));
+    }
+    getRouteMatchPathname(pathname, definition, localeAnalysisResult) {
+        const localeDefinition = definition;
+        if (localeDefinition.i18n && localeAnalysisResult) {
+            if (localeDefinition.i18n.locale && localeAnalysisResult.detectedLocale && localeDefinition.i18n.locale !== localeAnalysisResult.detectedLocale) {
+                return null;
+            }
+            return localeAnalysisResult.pathname;
+        }
+        if (localeAnalysisResult == null ? void 0 : localeAnalysisResult.inferredFromDefault) {
+            return localeAnalysisResult.pathname;
+        }
+        return pathname;
+    }
+    testRouteDefinition(pathname, definition, localeAnalysisResult) {
+        const matchPathname = this.getRouteMatchPathname(pathname, definition, localeAnalysisResult);
+        if (!matchPathname) return null;
+        if ((0, _utils1.isDynamicRoute)(definition.pathname)) {
+            const params = (0, _routematcher.getRouteMatcher)((0, _routeregex.getRouteRegex)(definition.pathname))(matchPathname);
+            if (!params) return null;
+            return {
+                definition,
+                params
+            };
+        }
+        if (matchPathname === definition.pathname) {
+            return {
+                definition,
+                params: undefined
+            };
+        }
+        return null;
+    }
+    getRoutePatternDefinition(pathname, localeAnalysisResult) {
+        for (const definition of this.getRouteDefinitions()){
+            const matchPathname = this.getRouteMatchPathname(pathname, definition, localeAnalysisResult);
+            if (matchPathname === definition.pathname) {
+                return definition;
+            }
+        }
+    }
+    getRouteMatch(pathname, localeAnalysisResult) {
+        const definitions = this.getRouteDefinitions();
+        const dynamicDefinitions = [];
+        // Check exact routes first, then sort dynamic routes by specificity. The
+        // old matcher manager provided the same precedence before it was removed.
+        if (!(0, _utils1.isDynamicRoute)(pathname)) {
+            for (const definition of definitions){
+                if ((0, _utils1.isDynamicRoute)(definition.pathname)) {
+                    dynamicDefinitions.push(definition);
+                    continue;
+                }
+                const match = this.testRouteDefinition(pathname, definition, localeAnalysisResult);
+                if (match) return match;
+            }
+        } else {
+            for (const definition of definitions){
+                if ((0, _utils1.isDynamicRoute)(definition.pathname)) {
+                    dynamicDefinitions.push(definition);
+                }
+            }
+        }
+        for (const definition of this.getSortedRouteDefinitions(dynamicDefinitions)){
+            const match = this.testRouteDefinition(pathname, definition, localeAnalysisResult);
+            if (match) return match;
+        }
+        return null;
+    }
     /**
    * @internal - this method is internal to Next.js and should not be used directly by end-users
    */ getRequestHandlerWithMetadata(meta) {
@@ -1032,7 +1191,10 @@ class Server {
         return this.handleRequest.bind(this);
     }
     setAssetPrefix(prefix) {
-        this.nextConfig.assetPrefix = prefix ? prefix.replace(/\/$/, '') : '';
+        this.renderOpts.assetPrefix = prefix ? prefix.replace(/\/$/, '') : '';
+    }
+    getAssetPrefix() {
+        return this.renderOpts.assetPrefix || '';
     }
     /**
    * Runs async initialization of server.
@@ -1063,6 +1225,8 @@ class Server {
             }
             appPathRoutes[normalizedPath].push(entry);
         });
+        // Preserve manifest order: legacy deployment builders package the final
+        // direct entry for a pathname as the function's loadable page module.
         return appPathRoutes;
     }
     async run(req, res, parsedUrl) {
@@ -1095,16 +1259,14 @@ class Server {
         let { cacheControl } = payload;
         if (!res.sent) {
             const { generateEtags, poweredByHeader } = this.renderOpts;
-            // Dev responses use `no-cache` so the browser can restore them from the
-            // HTTP cache on back/forward instead of reloading. HMR refresh responses
-            // opt out into `no-store` because a superseded refresh's fetch is aborted
-            // mid-write: under `no-cache` the response is stored, so the abort leaves
-            // the cache entry shared with the superseding refresh (same URL)
-            // half-written; Chromium then discards it and reissues the superseding
-            // refresh on a second connection as a duplicate request. `no-store` keeps
-            // that entry from being created.
+            // Documents and data responses must not be stored in development.
+            // Browsers reuse a stored response for a history navigation without
+            // revalidating it, so a back navigation would restore a page from before
+            // the latest edit. Static assets never reach this code. They keep a
+            // revalidatable `Cache-Control`, so the browser caches them between page
+            // loads.
             if (this.dev) {
-                res.setHeader('Cache-Control', req.headers[_approuterheaders.NEXT_HMR_REFRESH_HEADER] === '1' ? 'no-store' : 'no-cache, must-revalidate');
+                res.setHeader('Cache-Control', 'no-store');
                 cacheControl = undefined;
             }
             if (cacheControl && cacheControl.expire === undefined) {
@@ -1441,35 +1603,67 @@ class Server {
                 (0, _requestmeta.addRequestMeta)(req, 'devGenerateStaticParamsDuration', process.hrtime.bigint() - getStaticPathsStart);
             }
             if (isAppPath && this.nextConfig.cacheComponents) {
-                var _pathsResults_prerenderedRoutes;
-                if ((_pathsResults_prerenderedRoutes = pathsResults.prerenderedRoutes) == null ? void 0 : _pathsResults_prerenderedRoutes.length) {
-                    // Replicate, on demand, the per-URL fallback set a production build
-                    // writes to the prerender manifest. Production matches the requested
-                    // URL to the most-specific prerendered route and defers that route's
-                    // `fallbackRouteParams` (so `generateStaticParams`-covered params
-                    // resolve in the static shell and only the uncovered ones are
-                    // deferred). The dev prerender manifest isn't populated for these
-                    // ad-hoc routes, but `getStaticPaths` already computed every
-                    // prerendered route here, so we do the same match: among the routes
-                    // whose canonical regex matches this URL, pick the one with the
-                    // fewest fallback params (the most-specific) and thread it via the
-                    // `fallbackParams` meta. A fully-covered concrete route (e.g.
-                    // `/blog/a`) has zero fallback params and is the most-specific match
-                    // for its own URL, so it must be considered alongside the others: it
-                    // wins over the base dynamic route (`/blog/[slug]`) and leaves its
-                    // statically-known params out of the deferred set.
-                    let perUrlFallbackRouteParams = null;
-                    for (const route of pathsResults.prerenderedRoutes){
-                        const fallbackRouteParams = route.fallbackRouteParams ?? [];
-                        if (!(0, _routeregex.getRouteRegex)(route.pathname).re.test(urlPathname)) {
+                var _pathsResults_prerenderedRoutes, _pathsResults_prerenderRouteMatchers;
+                const paramMatching = pathsResults.paramMatching;
+                if (paramMatching !== undefined) {
+                    // Explicit fallback and blocking policies describe how production
+                    // prerenders are selected. Normal dev requests still render
+                    // dynamically; only an explicit not-found match changes their
+                    // foreground behavior.
+                    (0, _requestmeta.addRequestMeta)(req, 'devParamMatchingRejected', false);
+                    (0, _requestmeta.addRequestMeta)(req, 'devNotFoundParams', Object.keys(paramMatching).filter((name)=>paramMatching[name] === 'not-found'));
+                }
+                if (((_pathsResults_prerenderedRoutes = pathsResults.prerenderedRoutes) == null ? void 0 : _pathsResults_prerenderedRoutes.length) || ((_pathsResults_prerenderRouteMatchers = pathsResults.prerenderRouteMatchers) == null ? void 0 : _pathsResults_prerenderRouteMatchers.length)) {
+                    // Build-time pathnames are decoded. Match the decoded rewrite
+                    // destination, not the original encoded URL, just as in production.
+                    const decodedPathname = (0, _decodepathparams.decodePathParams)(resolvedUrlPathname);
+                    // Match both build-time prerenders and routes that have no
+                    // build-time output, such as an explicit blocking match.
+                    let matchedRoute;
+                    for (const route of pathsResults.prerenderedRoutes ?? []){
+                        var _route_fallbackRouteParams, _matchedRoute_fallbackRouteParams;
+                        if (!(0, _routeregex.getRouteRegex)(route.pathname).re.test(decodedPathname)) {
                             continue;
                         }
-                        if (perUrlFallbackRouteParams === null || fallbackRouteParams.length < perUrlFallbackRouteParams.length) {
-                            perUrlFallbackRouteParams = fallbackRouteParams;
+                        if (matchedRoute === undefined || (((_route_fallbackRouteParams = route.fallbackRouteParams) == null ? void 0 : _route_fallbackRouteParams.length) ?? 0) < (((_matchedRoute_fallbackRouteParams = matchedRoute.fallbackRouteParams) == null ? void 0 : _matchedRoute_fallbackRouteParams.length) ?? 0)) {
+                            matchedRoute = route;
                         }
                     }
-                    if (perUrlFallbackRouteParams && perUrlFallbackRouteParams.length > 0) {
-                        (0, _requestmeta.addRequestMeta)(req, 'fallbackParams', (0, _fallbackparams.createOpaqueFallbackRouteParams)(perUrlFallbackRouteParams));
+                    for (const route of pathsResults.prerenderRouteMatchers ?? []){
+                        var _matchedRoute_fallbackRouteParams1;
+                        if (!(0, _routeregex.getRouteRegex)(route.pathname).re.test(decodedPathname)) {
+                            continue;
+                        }
+                        if (matchedRoute === undefined || route.fallbackRouteParams.length < (((_matchedRoute_fallbackRouteParams1 = matchedRoute.fallbackRouteParams) == null ? void 0 : _matchedRoute_fallbackRouteParams1.length) ?? 0)) {
+                            matchedRoute = route;
+                        }
+                    }
+                    if (paramMatching !== undefined && (matchedRoute == null ? void 0 : matchedRoute.fallbackMode) === _fallback.FallbackMode.NOT_FOUND) {
+                        (0, _requestmeta.addRequestMeta)(req, 'devParamMatchingRejected', true);
+                    }
+                    if (matchedRoute) {
+                        // Shell requests keep the matched route's fallback params unknown.
+                        // Ordinary requests use stagedFallbackParams below to determine
+                        // which params resolve in the static phase.
+                        (0, _requestmeta.addRequestMeta)(req, 'fallbackRouteParams', matchedRoute.fallbackRouteParams ? (0, _fallbackparams.createOpaqueFallbackRouteParams)(matchedRoute.fallbackRouteParams) : null);
+                        let stagedFallbackParams = (0, _fallbackparams.getStagedFallbackParams)({
+                            ...matchedRoute,
+                            // A match without a build-time prerender has no shell validation
+                            // metadata. With false, getStagedFallbackParams lets remaining
+                            // prerenderable params resolve in the static phase; params that
+                            // cannot be prerendered still wait for the dynamic phase.
+                            throwOnEmptyStaticShell: 'throwOnEmptyStaticShell' in matchedRoute ? matchedRoute.throwOnEmptyStaticShell : false
+                        });
+                        if (pathsResults.explicitFallbackRouteParams) {
+                            // An explicit fallback must work even when its params are
+                            // unknown. Preserve that boundary for fully generated URLs too,
+                            // without losing holes in a required partial source shell.
+                            stagedFallbackParams = new Map([
+                                ...stagedFallbackParams ?? [],
+                                ...(0, _fallbackparams.createOpaqueFallbackRouteParams)(pathsResults.explicitFallbackRouteParams) ?? []
+                            ]);
+                        }
+                        (0, _requestmeta.addRequestMeta)(req, 'stagedFallbackParams', stagedFallbackParams);
                     }
                 }
             }
@@ -1565,11 +1759,17 @@ class Server {
     async renderPageComponent(ctx, bubbleNoFallback) {
         var _this_nextConfig_experimental_sri;
         const { query, pathname } = ctx;
-        const appPaths = this.getOriginalAppPaths(pathname);
+        const match = (0, _requestmeta.getRequestMeta)(ctx.req, 'match');
+        const appPaths = this.getOriginalAppPaths(pathname) ?? (match && (0, _apppageroutedefinition.isAppPageRouteDefinition)(match.definition) ? match.definition.appPaths : null);
         const isAppPath = Array.isArray(appPaths);
         let page = pathname;
         if (isAppPath) {
+            // Load the same direct entry selected by the build and deployment
+            // adapter. Expanded catch-all contributors are part of the route tree,
+            // but their modules are not necessarily traced into this function.
             page = (0, _apppaths.selectAppPageEntry)(pathname, appPaths);
+        } else if ((match == null ? void 0 : match.definition.kind) === _routekind.RouteKind.APP_ROUTE) {
+            page = match.definition.page;
         }
         const result = await this.findPageComponents({
             locale: (0, _requestmeta.getRequestMeta)(ctx.req, 'locale'),
@@ -1579,8 +1779,10 @@ class Server {
             isAppPath,
             sriEnabled: !!((_this_nextConfig_experimental_sri = this.nextConfig.experimental.sri) == null ? void 0 : _this_nextConfig_experimental_sri.algorithm),
             appPaths,
-            // Ensuring for loading page component routes is done via the matcher.
-            shouldEnsure: false
+            // Normal routed requests are ensured by the route match. Legacy custom
+            // server render methods bypass that path, so ensure when no match exists.
+            shouldEnsure: !match,
+            url: pathname
         });
         if (result) {
             (0, _tracer.getTracer)().setRootSpanAttribute('next.route', pathname);
@@ -1606,7 +1808,6 @@ class Server {
         });
     }
     async renderToResponseImpl(ctx) {
-        var _this_i18nProvider;
         const { req, res, query, pathname } = ctx;
         let page = pathname;
         const bubbleNoFallback = (0, _requestmeta.getRequestMeta)(ctx.req, 'bubbleNoFallback') ?? false;
@@ -1614,35 +1815,33 @@ class Server {
             (0, _requestmeta.addRequestMeta)(ctx.req, 'cacheBustingSearchParam', query[_approuterheaders.NEXT_RSC_UNION_QUERY]);
         }
         delete query[_approuterheaders.NEXT_RSC_UNION_QUERY];
-        const options = {
-            i18n: (_this_i18nProvider = this.i18nProvider) == null ? void 0 : _this_i18nProvider.fromRequest(req, pathname)
-        };
-        const existingMatch = (0, _requestmeta.getRequestMeta)(ctx.req, 'match');
-        let fastPath = true;
-        // when a specific invoke-output is meant to be matched
-        // ensure a prior dynamic route/page doesn't take priority
+        let existingMatch = (0, _requestmeta.getRequestMeta)(ctx.req, 'match');
         const invokeOutput = (0, _requestmeta.getRequestMeta)(ctx.req, 'invokeOutput');
-        if (!this.minimalMode && typeof invokeOutput === 'string' && (0, _utils1.isDynamicRoute)(invokeOutput || '') && invokeOutput !== (existingMatch == null ? void 0 : existingMatch.definition.pathname) || (// Parallel routes are matched in `existingMatch` but since currently
-        // there can be multiple matches it's not guaranteed to be the right match
-        // therefor we need to opt-out of the fast path for parallel routes.
-        existingMatch == null ? void 0 : existingMatch.definition.page.includes('/@'))) {
-            fastPath = false;
-        }
         try {
-            for await (const match of fastPath && existingMatch ? [
-                existingMatch
-            ] : this.matchers.matchAll(pathname, options)){
-                if (!this.minimalMode && typeof invokeOutput === 'string' && (0, _utils1.isDynamicRoute)(invokeOutput || '') && invokeOutput !== match.definition.pathname) {
-                    continue;
+            if (!existingMatch) {
+                var _this_i18nProvider;
+                const localeAnalysisResult = (_this_i18nProvider = this.i18nProvider) == null ? void 0 : _this_i18nProvider.fromRequest(req, pathname);
+                const routeMatch = this.getRouteMatch(pathname, localeAnalysisResult);
+                if (routeMatch) {
+                    existingMatch = routeMatch;
+                    (0, _requestmeta.addRequestMeta)(req, 'match', routeMatch);
                 }
-                const result = await this.renderPageComponent({
-                    ...ctx,
-                    pathname: match.definition.pathname,
-                    renderOpts: {
-                        ...ctx.renderOpts,
-                        params: match.params
-                    }
-                }, bubbleNoFallback);
+            }
+            if (existingMatch) {
+                const shouldSkipMatch = !this.minimalMode && typeof invokeOutput === 'string' && (0, _utils1.isDynamicRoute)(invokeOutput || '') && invokeOutput !== existingMatch.definition.pathname;
+                if (!shouldSkipMatch) {
+                    const result = await this.renderPageComponent({
+                        ...ctx,
+                        pathname: existingMatch.definition.pathname,
+                        renderOpts: {
+                            ...ctx.renderOpts,
+                            params: existingMatch.params
+                        }
+                    }, bubbleNoFallback);
+                    if (result !== false) return result;
+                }
+            } else {
+                const result = await this.renderPageComponent(ctx, bubbleNoFallback);
                 if (result !== false) return result;
             }
             // currently edge functions aren't receiving the x-matched-path
@@ -1862,11 +2061,7 @@ class Server {
               </script>`, _constants2.HTML_CONTENT_TYPE_HEADER)
                     };
                 }
-                throw new WrappedBuildError(Object.defineProperty(new Error('missing required error components'), "__NEXT_ERROR_CODE", {
-                    value: "E60",
-                    enumerable: false,
-                    configurable: true
-                }));
+                throw new WrappedBuildError(new Error('missing required error components'));
             }
             // If the page has a route module, use it for the new match. If it doesn't
             // have a route module, remove the match.
@@ -1889,11 +2084,7 @@ class Server {
                 }, result);
             } catch (maybeFallbackError) {
                 if (maybeFallbackError instanceof _nofallbackerrorexternal.NoFallbackError) {
-                    throw Object.defineProperty(new Error('invariant: failed to render error page'), "__NEXT_ERROR_CODE", {
-                        value: "E55",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error('invariant: failed to render error page');
                 }
                 throw maybeFallbackError;
             }