@sifxprime/krouter 0.5.166 → 0.5.167

package/app/node_modules/next/dist/server/render.js

@@ -59,7 +59,6 @@ const _constants2 = require("./lib/trace/constants");
 const _reflect = require("./web/spec-extension/adapters/reflect");
 const _cachecontrol = require("./lib/cache-control");
 const _errorsource = require("../shared/lib/error-source");
-const _errortelemetryutils = require("../lib/error-telemetry-utils");
 const _getscriptnoncefromheader = require("./app-render/get-script-nonce-from-header");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -80,11 +79,7 @@ if (process.env.NEXT_RUNTIME !== 'edge') {
 }
 function noRouter() {
     const message = 'No router instance found. you should only use "next/router" inside the client side of your app. https://nextjs.org/docs/messages/no-router-instance';
-    throw Object.defineProperty(new Error(message), "__NEXT_ERROR_CODE", {
-        value: "E1027",
-        enumerable: false,
-        configurable: true
-    });
+    throw new Error(message);
 }
 async function renderToString(element) {
     const renderStream = await _ReactDOMServerPages.default.renderToReadableStream(element);
@@ -175,11 +170,7 @@ function checkRedirectValues(redirect, req, method) {
         errors.push(`\`basePath\` should be undefined or a false, received ${basePathType}`);
     }
     if (errors.length > 0) {
-        throw Object.defineProperty(new Error(`Invalid redirect object returned from ${method} for ${req.url}\n` + errors.join(' and ') + '\n' + `See more info here: https://nextjs.org/docs/messages/invalid-redirect-gssp`), "__NEXT_ERROR_CODE", {
-            value: "E185",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(`Invalid redirect object returned from ${method} for ${req.url}\n` + errors.join(' and ') + '\n' + `See more info here: https://nextjs.org/docs/messages/invalid-redirect-gssp`);
     }
 }
 function errorToJSON(err) {
@@ -192,8 +183,7 @@ function errorToJSON(err) {
         source,
         message: (0, _stripansi.default)(err.message),
         stack: err.stack,
-        digest: err.digest,
-        __NEXT_ERROR_CODE: (0, _errortelemetryutils.extractNextErrorCode)(err)
+        digest: err.digest
     };
 }
 function serializeError(dev, err) {
@@ -269,77 +259,37 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
         isAutoExport = false;
     }
     if (hasPageGetInitialProps && isSSG) {
-        throw Object.defineProperty(new Error(_constants.SSG_GET_INITIAL_PROPS_CONFLICT + ` ${pathname}`), "__NEXT_ERROR_CODE", {
-            value: "E262",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(_constants.SSG_GET_INITIAL_PROPS_CONFLICT + ` ${pathname}`);
     }
     if (hasPageGetInitialProps && getServerSideProps) {
-        throw Object.defineProperty(new Error(_constants.SERVER_PROPS_GET_INIT_PROPS_CONFLICT + ` ${pathname}`), "__NEXT_ERROR_CODE", {
-            value: "E262",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(_constants.SERVER_PROPS_GET_INIT_PROPS_CONFLICT + ` ${pathname}`);
     }
     if (getServerSideProps && isSSG) {
-        throw Object.defineProperty(new Error(_constants.SERVER_PROPS_SSG_CONFLICT + ` ${pathname}`), "__NEXT_ERROR_CODE", {
-            value: "E262",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(_constants.SERVER_PROPS_SSG_CONFLICT + ` ${pathname}`);
     }
     if (getServerSideProps && renderOpts.nextConfigOutput === 'export') {
-        throw Object.defineProperty(new Error('getServerSideProps cannot be used with "output: export". See more info here: https://nextjs.org/docs/advanced-features/static-html-export'), "__NEXT_ERROR_CODE", {
-            value: "E369",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error('getServerSideProps cannot be used with "output: export". See more info here: https://nextjs.org/docs/advanced-features/static-html-export');
     }
     if (getStaticPaths && !pageIsDynamic) {
-        throw Object.defineProperty(new Error(`getStaticPaths is only allowed for dynamic SSG pages and was found on '${pathname}'.` + `\nRead more: https://nextjs.org/docs/messages/non-dynamic-getstaticpaths-usage`), "__NEXT_ERROR_CODE", {
-            value: "E187",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(`getStaticPaths is only allowed for dynamic SSG pages and was found on '${pathname}'.` + `\nRead more: https://nextjs.org/docs/messages/non-dynamic-getstaticpaths-usage`);
     }
     if (!!getStaticPaths && !isSSG) {
-        throw Object.defineProperty(new Error(`getStaticPaths was added without a getStaticProps in ${pathname}. Without getStaticProps, getStaticPaths does nothing`), "__NEXT_ERROR_CODE", {
-            value: "E447",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(`getStaticPaths was added without a getStaticProps in ${pathname}. Without getStaticProps, getStaticPaths does nothing`);
     }
     if (isSSG && pageIsDynamic && !getStaticPaths) {
-        throw Object.defineProperty(new Error(`getStaticPaths is required for dynamic SSG pages and is missing for '${pathname}'.` + `\nRead more: https://nextjs.org/docs/messages/invalid-getstaticpaths-value`), "__NEXT_ERROR_CODE", {
-            value: "E255",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(`getStaticPaths is required for dynamic SSG pages and is missing for '${pathname}'.` + `\nRead more: https://nextjs.org/docs/messages/invalid-getstaticpaths-value`);
     }
     let asPath = renderOpts.resolvedAsPath || req.url;
     if (process.env.__NEXT_DEV_SERVER) {
         const { isValidElementType } = require('next/dist/compiled/react-is');
         if (!isValidElementType(Component)) {
-            throw Object.defineProperty(new Error(`The default export is not a React Component in page: "${pathname}"`), "__NEXT_ERROR_CODE", {
-                value: "E286",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`The default export is not a React Component in page: "${pathname}"`);
         }
         if (!isValidElementType(App)) {
-            throw Object.defineProperty(new Error(`The default export is not a React Component in page: "/_app"`), "__NEXT_ERROR_CODE", {
-                value: "E464",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`The default export is not a React Component in page: "/_app"`);
         }
         if (!isValidElementType(Document)) {
-            throw Object.defineProperty(new Error(`The default export is not a React Component in page: "/_document"`), "__NEXT_ERROR_CODE", {
-                value: "E511",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`The default export is not a React Component in page: "/_document"`);
         }
         if (isAutoExport || isFallback) {
             // remove query values except ones that will be set during export
@@ -349,18 +299,10 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
             req.url = pathname;
         }
         if (pathname === '/404' && (hasPageGetInitialProps || getServerSideProps)) {
-            throw Object.defineProperty(new Error(`\`pages/404\` ${_constants.STATIC_STATUS_PAGE_GET_INITIAL_PROPS_ERROR}`), "__NEXT_ERROR_CODE", {
-                value: "E134",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`\`pages/404\` ${_constants.STATIC_STATUS_PAGE_GET_INITIAL_PROPS_ERROR}`);
         }
         if (_constants1.STATIC_STATUS_PAGES.includes(pathname) && (hasPageGetInitialProps || getServerSideProps)) {
-            throw Object.defineProperty(new Error(`\`pages${pathname}\` ${_constants.STATIC_STATUS_PAGE_GET_INITIAL_PROPS_ERROR}`), "__NEXT_ERROR_CODE", {
-                value: "E125",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`\`pages${pathname}\` ${_constants.STATIC_STATUS_PAGE_GET_INITIAL_PROPS_ERROR}`);
         }
         if (renderOpts == null ? void 0 : renderOpts.setIsrStatus) {
             renderOpts.setIsrStatus(asPath, isSSG || isAutoExport);
@@ -372,11 +314,7 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
         'getStaticPaths'
     ]){
         if (Component == null ? void 0 : Component[methodName]) {
-            throw Object.defineProperty(new Error(`page ${pathname} ${methodName} ${_constants.GSSP_COMPONENT_MEMBER_ERROR}`), "__NEXT_ERROR_CODE", {
-                value: "E417",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`page ${pathname} ${methodName} ${_constants.GSSP_COMPONENT_MEMBER_ERROR}`);
         }
     }
     await _loadablesharedruntime.default.preloadAll() // Make sure all dynamic imports are loaded
@@ -559,54 +497,30 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
             throw staticPropsError;
         }
         if (data == null) {
-            throw Object.defineProperty(new Error(_constants.GSP_NO_RETURNED_VALUE), "__NEXT_ERROR_CODE", {
-                value: "E394",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(_constants.GSP_NO_RETURNED_VALUE);
         }
         const invalidKeys = Object.keys(data).filter((key)=>key !== 'revalidate' && key !== 'props' && key !== 'redirect' && key !== 'notFound');
         if (invalidKeys.includes('unstable_revalidate')) {
-            throw Object.defineProperty(new Error(_constants.UNSTABLE_REVALIDATE_RENAME_ERROR), "__NEXT_ERROR_CODE", {
-                value: "E394",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(_constants.UNSTABLE_REVALIDATE_RENAME_ERROR);
         }
         if (invalidKeys.length) {
-            throw Object.defineProperty(new Error(invalidKeysMsg('getStaticProps', invalidKeys)), "__NEXT_ERROR_CODE", {
-                value: "E394",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(invalidKeysMsg('getStaticProps', invalidKeys));
         }
         if (process.env.NODE_ENV !== 'production') {
             if (typeof data.notFound !== 'undefined' && typeof data.redirect !== 'undefined') {
-                throw Object.defineProperty(new Error(`\`redirect\` and \`notFound\` can not both be returned from ${isSSG ? 'getStaticProps' : 'getServerSideProps'} at the same time. Page: ${pathname}\nSee more info here: https://nextjs.org/docs/messages/gssp-mixed-not-found-redirect`), "__NEXT_ERROR_CODE", {
-                    value: "E454",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error(`\`redirect\` and \`notFound\` can not both be returned from ${isSSG ? 'getStaticProps' : 'getServerSideProps'} at the same time. Page: ${pathname}\nSee more info here: https://nextjs.org/docs/messages/gssp-mixed-not-found-redirect`);
             }
         }
         if ('notFound' in data && data.notFound) {
             if (pathname === '/404') {
-                throw Object.defineProperty(new Error(`The /404 page can not return notFound in "getStaticProps", please remove it to continue!`), "__NEXT_ERROR_CODE", {
-                    value: "E121",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error(`The /404 page can not return notFound in "getStaticProps", please remove it to continue!`);
             }
             metadata.isNotFound = true;
         }
         if ('redirect' in data && data.redirect && typeof data.redirect === 'object') {
             checkRedirectValues(data.redirect, req, 'getStaticProps');
             if (isBuildTimeSSG) {
-                throw Object.defineProperty(new Error(`\`redirect\` can not be returned from getStaticProps during prerendering (${req.url})\n` + `See more info here: https://nextjs.org/docs/messages/gsp-redirect-during-prerender`), "__NEXT_ERROR_CODE", {
-                    value: "E497",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error(`\`redirect\` can not be returned from getStaticProps during prerendering (${req.url})\n` + `See more info here: https://nextjs.org/docs/messages/gsp-redirect-during-prerender`);
             }
             ;
             data.props = {
@@ -621,34 +535,18 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
         }
         if ((process.env.__NEXT_DEV_SERVER || isBuildTimeSSG) && !metadata.isNotFound && !(0, _isserializableprops.isSerializableProps)(pathname, 'getStaticProps', data.props)) {
             // this fn should throw an error instead of ever returning `false`
-            throw Object.defineProperty(new Error('invariant: getStaticProps did not return valid props. Please report this.'), "__NEXT_ERROR_CODE", {
-                value: "E129",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error('invariant: getStaticProps did not return valid props. Please report this.');
         }
         let revalidate;
         if ('revalidate' in data) {
             if (data.revalidate && renderOpts.nextConfigOutput === 'export') {
-                throw Object.defineProperty(new Error('ISR cannot be used with "output: export". See more info here: https://nextjs.org/docs/advanced-features/static-html-export'), "__NEXT_ERROR_CODE", {
-                    value: "E201",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error('ISR cannot be used with "output: export". See more info here: https://nextjs.org/docs/advanced-features/static-html-export');
             }
             if (typeof data.revalidate === 'number') {
                 if (!Number.isInteger(data.revalidate)) {
-                    throw Object.defineProperty(new Error(`A page's revalidate option must be seconds expressed as a natural number for ${req.url}. Mixed numbers, such as '${data.revalidate}', cannot be used.` + `\nTry changing the value to '${Math.ceil(data.revalidate)}' or using \`Math.ceil()\` if you're computing the value.`), "__NEXT_ERROR_CODE", {
-                        value: "E438",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error(`A page's revalidate option must be seconds expressed as a natural number for ${req.url}. Mixed numbers, such as '${data.revalidate}', cannot be used.` + `\nTry changing the value to '${Math.ceil(data.revalidate)}' or using \`Math.ceil()\` if you're computing the value.`);
                 } else if (data.revalidate <= 0) {
-                    throw Object.defineProperty(new Error(`A page's revalidate option can not be less than or equal to zero for ${req.url}. A revalidate option of zero means to revalidate after _every_ request, and implies stale data cannot be tolerated.` + `\n\nTo never revalidate, you can set revalidate to \`false\` (only ran once at build-time).` + `\nTo revalidate as soon as possible, you can set the value to \`1\`.`), "__NEXT_ERROR_CODE", {
-                        value: "E311",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error(`A page's revalidate option can not be less than or equal to zero for ${req.url}. A revalidate option of zero means to revalidate after _every_ request, and implies stale data cannot be tolerated.` + `\n\nTo never revalidate, you can set revalidate to \`false\` (only ran once at build-time).` + `\nTo revalidate as soon as possible, you can set the value to \`1\`.`);
                 } else {
                     if (data.revalidate > 31536000) {
                         // if it's greater than a year for some reason error
@@ -665,11 +563,7 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
                 // By default, we never revalidate.
                 revalidate = false;
             } else {
-                throw Object.defineProperty(new Error(`A page's revalidate option must be seconds expressed as a natural number. Mixed numbers and strings cannot be used. Received '${JSON.stringify(data.revalidate)}' for ${req.url}`), "__NEXT_ERROR_CODE", {
-                    value: "E161",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error(`A page's revalidate option must be seconds expressed as a natural number. Mixed numbers and strings cannot be used. Received '${JSON.stringify(data.revalidate)}' for ${req.url}`);
             }
         } else {
             // By default, we never revalidate.
@@ -704,11 +598,7 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
                     if (!canAccessRes) {
                         const message = `You should not access 'res' after getServerSideProps resolves.` + `\nRead more: https://nextjs.org/docs/messages/gssp-no-mutating-res`;
                         if (deferredContent) {
-                            throw Object.defineProperty(new Error(message), "__NEXT_ERROR_CODE", {
-                                value: "E1028",
-                                enumerable: false,
-                                configurable: true
-                            });
+                            throw new Error(message);
                         } else {
                             warn(message);
                         }
@@ -762,44 +652,24 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
             throw serverSidePropsError;
         }
         if (data == null) {
-            throw Object.defineProperty(new Error(_constants.GSSP_NO_RETURNED_VALUE), "__NEXT_ERROR_CODE", {
-                value: "E394",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(_constants.GSSP_NO_RETURNED_VALUE);
         }
         if (data.props instanceof Promise) {
             deferredContent = true;
         }
         const invalidKeys = Object.keys(data).filter((key)=>key !== 'props' && key !== 'redirect' && key !== 'notFound');
         if (data.unstable_notFound) {
-            throw Object.defineProperty(new Error(`unstable_notFound has been renamed to notFound, please update the field to continue. Page: ${pathname}`), "__NEXT_ERROR_CODE", {
-                value: "E516",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`unstable_notFound has been renamed to notFound, please update the field to continue. Page: ${pathname}`);
         }
         if (data.unstable_redirect) {
-            throw Object.defineProperty(new Error(`unstable_redirect has been renamed to redirect, please update the field to continue. Page: ${pathname}`), "__NEXT_ERROR_CODE", {
-                value: "E284",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`unstable_redirect has been renamed to redirect, please update the field to continue. Page: ${pathname}`);
         }
         if (invalidKeys.length) {
-            throw Object.defineProperty(new Error(invalidKeysMsg('getServerSideProps', invalidKeys)), "__NEXT_ERROR_CODE", {
-                value: "E394",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(invalidKeysMsg('getServerSideProps', invalidKeys));
         }
         if ('notFound' in data && data.notFound) {
             if (pathname === '/404') {
-                throw Object.defineProperty(new Error(`The /404 page can not return notFound in "getStaticProps", please remove it to continue!`), "__NEXT_ERROR_CODE", {
-                    value: "E121",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error(`The /404 page can not return notFound in "getStaticProps", please remove it to continue!`);
             }
             metadata.isNotFound = true;
             return new _renderresult.default(null, {
@@ -825,11 +695,7 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
         }
         if ((process.env.__NEXT_DEV_SERVER || isBuildTimeSSG) && !(0, _isserializableprops.isSerializableProps)(pathname, 'getServerSideProps', data.props)) {
             // this fn should throw an error instead of ever returning `false`
-            throw Object.defineProperty(new Error('invariant: getServerSideProps did not return valid props. Please report this.'), "__NEXT_ERROR_CODE", {
-                value: "E31",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error('invariant: getServerSideProps did not return valid props. Please report this.');
         }
         props.pageProps = Object.assign({}, props.pageProps, data.props);
         metadata.pageData = props;
@@ -892,11 +758,7 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
             if (BuiltinFunctionalDocument) {
                 Document = BuiltinFunctionalDocument;
             } else {
-                throw Object.defineProperty(new Error('`getInitialProps` in Document component is not supported with the Edge Runtime.'), "__NEXT_ERROR_CODE", {
-                    value: "E386",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error('`getInitialProps` in Document component is not supported with the Edge Runtime.');
             }
         }
         async function loadDocumentInitialProps(renderShell) {
@@ -915,11 +777,7 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
                     };
                 }
                 if (process.env.__NEXT_DEV_SERVER && (props.router || props.Component)) {
-                    throw Object.defineProperty(new Error(`'router' and 'Component' can not be returned in getInitialProps from _app.js https://nextjs.org/docs/messages/cant-override-next-props`), "__NEXT_ERROR_CODE", {
-                        value: "E230",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error(`'router' and 'Component' can not be returned in getInitialProps from _app.js https://nextjs.org/docs/messages/cant-override-next-props`);
                 }
                 const { App: EnhancedApp, Component: EnhancedComponent } = enhanceComponents(options, App, Component);
                 const stream = await renderShell(EnhancedApp, EnhancedComponent);
@@ -939,11 +797,7 @@ async function renderToHTMLImpl(req, res, pathname, query, renderOpts, extra, sh
             if ((0, _utils.isResSent)(res) && !isSSG) return null;
             if (!docProps || typeof docProps.html !== 'string') {
                 const message = `"${(0, _utils.getDisplayName)(Document)}.getInitialProps()" should resolve to an object with a "html" prop set with a valid html string`;
-                throw Object.defineProperty(new Error(message), "__NEXT_ERROR_CODE", {
-                    value: "E1039",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error(message);
             }
             return {
                 docProps,

package/app/node_modules/next/dist/server/request/fallback-params.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
     buildDynamicSegmentPlaceholder: null,
     createOpaqueFallbackRouteParams: null,
     getFallbackRouteParams: null,
-    getPlaceholderFallbackRouteParams: null
+    getPlaceholderFallbackRouteParams: null,
+    getStagedFallbackParams: null
 });
 function _export(target, all) {
     for(var name in all)Object.defineProperty(target, name, {
@@ -26,13 +27,16 @@ _export(exports, {
     },
     getPlaceholderFallbackRouteParams: function() {
         return getPlaceholderFallbackRouteParams;
+    },
+    getStagedFallbackParams: function() {
+        return getStagedFallbackParams;
     }
 });
 const _utils = require("../../build/static-paths/utils");
-const _getshortdynamicparamtype = require("../app-render/get-short-dynamic-param-type");
 const _app = require("../../shared/lib/router/routes/app");
 const _extractpathnamerouteparamsegmentsfromloadertree = require("../../build/static-paths/app/extract-pathname-route-param-segments-from-loader-tree");
 const _getsegmentparam = require("../../shared/lib/router/utils/get-segment-param");
+const _invarianterror = require("../../shared/lib/invariant-error");
 function createOpaqueFallbackRouteParams(fallbackRouteParams) {
     // If there are no fallback route params, we can return early.
     if (fallbackRouteParams.length === 0) return null;
@@ -43,14 +47,25 @@ function createOpaqueFallbackRouteParams(fallbackRouteParams) {
     const keys = new Map();
     // Generate a unique key for the fallback route param, if this key is found
     // in the static output, it represents a bug in cache components.
-    for (const { paramName, paramType } of fallbackRouteParams){
-        keys.set(paramName, [
-            `%%drp:${paramName}:${uniqueID}%%`,
-            _getshortdynamicparamtype.dynamicParamTypes[paramType]
-        ]);
+    for (const { paramName } of fallbackRouteParams){
+        keys.set(paramName, `%%drp:${paramName}:${uniqueID}%%`);
     }
     return keys;
 }
+function getStagedFallbackParams(route) {
+    const { fallbackRouteParams, remainingPrerenderableParams } = route;
+    if (!(fallbackRouteParams == null ? void 0 : fallbackRouteParams.length)) {
+        return null;
+    }
+    if (route.throwOnEmptyStaticShell === undefined) {
+        throw new _invarianterror.InvariantError('Expected throwOnEmptyStaticShell for a route with fallback params');
+    }
+    // A required shell keeps all of its fallback params deferred.
+    if (route.throwOnEmptyStaticShell || !(remainingPrerenderableParams == null ? void 0 : remainingPrerenderableParams.length)) {
+        return createOpaqueFallbackRouteParams(fallbackRouteParams);
+    }
+    return createOpaqueFallbackRouteParams(fallbackRouteParams.filter((param)=>!remainingPrerenderableParams.some((prerenderableParam)=>prerenderableParam.paramName === param.paramName)));
+}
 function buildDynamicSegmentPlaceholder(param) {
     const { repeat, optional } = (0, _getsegmentparam.getParamProperties)(param.paramType);
     if (optional) {
@@ -87,8 +102,7 @@ function getFallbackRouteParams(page, routeModule) {
     // resolveRouteParamsFromTree determine which params are unknown.
     (0, _utils.resolveRouteParamsFromTree)(routeModule.userland.loaderTree, params, route, fallbackRouteParams // Will be mutated to add route params
     );
-    // Convert the fallback route params to an opaque format that can be safely
-    // used in the postponed state without exposing implementation details.
+    // Track the unknown params using the same opaque placeholders as prerenders.
     return createOpaqueFallbackRouteParams(fallbackRouteParams);
 }
 

package/app/node_modules/next/dist/server/response-cache/index.js

@@ -76,6 +76,9 @@ function _export_star(from, to) {
 }
 class ResponseCache {
     constructor({ minimalMode, route, maxSize = DEFAULT_MAX_SIZE, ttl = DEFAULT_TTL_MS }){
+        // The get and revalidate batchers share pending renders across invocation
+        // IDs, including failures. Invocation IDs scope reuse of completed results in
+        // the LRU below.
         this.getBatcher = _batcher.Batcher.create({
             // Ensure on-demand revalidate doesn't block normal requests, it should be
             // safe to run an on-demand revalidate for the same key as a normal request.
@@ -147,11 +150,12 @@ class ResponseCache {
                 // With invocationID: exact match found - always a hit
                 // With TTL mode: must check expiration
                 if (context.invocationID !== undefined) {
-                    return (0, _utils.toResponseCacheEntry)(cachedItem.entry);
+                    return cachedItem.entry !== null && 'error' in cachedItem.entry ? cachedItem.entry : (0, _utils.toResponseCacheEntry)(cachedItem.entry);
                 }
-                // TTL mode: check expiration
+                // TTL entries can be reused by unrelated requests. Exclude failures so
+                // those requests can retry instead of receiving a cached error.
                 const now = Date.now();
-                if (cachedItem.expiresAt > now) {
+                if ((cachedItem.entry === null || !('error' in cachedItem.entry)) && cachedItem.expiresAt > now) {
                     return (0, _utils.toResponseCacheEntry)(cachedItem.entry);
                 }
                 // TTL expired - clean up
@@ -179,14 +183,17 @@ class ResponseCache {
             if (waitUntil) waitUntil(promise);
             return promise;
         });
-        if (this.minimal_mode && (response == null ? void 0 : response.cacheControl)) {
+        // In minimal mode, each caller with an invocation ID stores the shared
+        // failure under its own ID for reuse by related requests. Callers without
+        // an invocation ID receive the failure but do not store it in the LRU.
+        if (this.minimal_mode && response && ('error' in response ? invocationID !== undefined : response.cacheControl)) {
             const cacheKey = createCacheKey(key, invocationID);
             this.cache.set(cacheKey, {
                 entry: response,
                 expiresAt: Date.now() + this.ttl
             });
         }
-        return (0, _utils.toResponseCacheEntry)(response);
+        return response !== null && 'error' in response ? response : (0, _utils.toResponseCacheEntry)(response);
     }
     /**
    * Handles the get request for the response cache.
@@ -227,6 +234,12 @@ class ResponseCache {
             // directly lets every prefetch segment take the same fallback-shell path,
             // independent of any concurrent background upgrade.
             const incrementalResponseCacheEntry = context.isPrefetch && previousIncrementalCacheEntry === null ? await this.handleRevalidate(key, context.incrementalCache, context.isRoutePPREnabled, context.isFallback, responseGenerator, previousIncrementalCacheEntry, resolved) : await this.revalidate(key, context.incrementalCache, context.isRoutePPREnabled, context.isFallback, responseGenerator, previousIncrementalCacheEntry, resolved);
+            if (incrementalResponseCacheEntry !== null && 'error' in incrementalResponseCacheEntry && resolved) {
+                // The caller already received the stale entry. Report the background
+                // failure here, as the catch below does for a thrown error.
+                console.error(incrementalResponseCacheEntry.error);
+                return null;
+            }
             // Handle null response
             if (!incrementalResponseCacheEntry) {
                 // Remove the cache item if it was set so we don't use it again.
@@ -273,6 +286,7 @@ class ResponseCache {
         });
     }
     async handleRevalidate(key, incrementalCache, isRoutePPREnabled, isFallback, responseGenerator, previousIncrementalCacheEntry, hasResolved) {
+        let failure;
         try {
             // Generate the response cache entry using the response generator.
             const responseCacheEntry = await responseGenerator({
@@ -283,38 +297,46 @@ class ResponseCache {
             if (!responseCacheEntry) {
                 return null;
             }
-            // Convert the response cache entry to an incremental response cache entry.
-            const incrementalResponseCacheEntry = await (0, _utils.fromResponseCacheEntry)({
-                ...responseCacheEntry,
-                isMiss: !previousIncrementalCacheEntry
-            });
-            // We want to persist the result only if it has a cache control value
-            // defined. The minimal mode LRU write is handled in get() so that
-            // every caller — including batched invocations — populates the cache.
-            if (incrementalResponseCacheEntry.cacheControl && !this.minimal_mode) {
-                await incrementalCache.set(key, incrementalResponseCacheEntry.value, {
-                    ...this.getCacheContext(isRoutePPREnabled, isFallback),
-                    cacheControl: incrementalResponseCacheEntry.cacheControl
+            if ('error' in responseCacheEntry) {
+                failure = responseCacheEntry;
+            } else {
+                // Convert the response cache entry to an incremental response cache entry.
+                const incrementalResponseCacheEntry = await (0, _utils.fromResponseCacheEntry)({
+                    ...responseCacheEntry,
+                    isMiss: !previousIncrementalCacheEntry
                 });
+                // We want to persist the result only if it has a cache control value
+                // defined. The minimal mode LRU write is handled in get() so that every
+                // caller, including batched invocations, populates the cache.
+                if (incrementalResponseCacheEntry.cacheControl && !this.minimal_mode) {
+                    await incrementalCache.set(key, incrementalResponseCacheEntry.value, {
+                        ...this.getCacheContext(isRoutePPREnabled, isFallback),
+                        cacheControl: incrementalResponseCacheEntry.cacheControl
+                    });
+                }
+                return incrementalResponseCacheEntry;
             }
-            return incrementalResponseCacheEntry;
         } catch (err) {
-            // When a path is erroring we automatically re-set the existing cache
-            // with new revalidate and expire times to prevent non-stop retrying.
-            if (previousIncrementalCacheEntry == null ? void 0 : previousIncrementalCacheEntry.cacheControl) {
-                const revalidate = Math.min(Math.max(previousIncrementalCacheEntry.cacheControl.revalidate || 3, 3), 30);
-                const expire = previousIncrementalCacheEntry.cacheControl.expire === undefined ? undefined : Math.max(revalidate + 3, previousIncrementalCacheEntry.cacheControl.expire);
-                await incrementalCache.set(key, previousIncrementalCacheEntry.value, {
-                    ...this.getCacheContext(isRoutePPREnabled, isFallback),
-                    cacheControl: {
-                        revalidate: revalidate,
-                        expire: expire
-                    }
-                });
-            }
-            // We haven't resolved yet, so let's throw to indicate an error.
+            await this.retainPreviousCacheEntry(key, incrementalCache, isRoutePPREnabled, isFallback, previousIncrementalCacheEntry);
             throw err;
         }
+        await this.retainPreviousCacheEntry(key, incrementalCache, isRoutePPREnabled, isFallback, previousIncrementalCacheEntry);
+        return failure;
+    }
+    // Retain the previous successful value and delay retries after revalidation
+    // fails.
+    async retainPreviousCacheEntry(key, incrementalCache, isRoutePPREnabled, isFallback, previousIncrementalCacheEntry) {
+        if (previousIncrementalCacheEntry == null ? void 0 : previousIncrementalCacheEntry.cacheControl) {
+            const revalidate = Math.min(Math.max(previousIncrementalCacheEntry.cacheControl.revalidate || 3, 3), 30);
+            const expire = previousIncrementalCacheEntry.cacheControl.expire === undefined ? undefined : Math.max(revalidate + 3, previousIncrementalCacheEntry.cacheControl.expire);
+            await incrementalCache.set(key, previousIncrementalCacheEntry.value, {
+                ...this.getCacheContext(isRoutePPREnabled, isFallback),
+                cacheControl: {
+                    revalidate: revalidate,
+                    expire: expire
+                }
+            });
+        }
     }
     getCacheContext(isRoutePPREnabled, isFallback) {
         if (this.route === 'image') {

package/app/node_modules/next/dist/server/response-cache/utils.js

@@ -91,11 +91,7 @@ function routeKindToIncrementalCacheKind(routeKind) {
             return _types.IncrementalCacheKind.APP_ROUTE;
         case _routekind.RouteKind.PAGES_API:
             // Pages Router API routes are not cached in the incremental cache.
-            throw Object.defineProperty(new Error(`Unexpected route kind ${routeKind}`), "__NEXT_ERROR_CODE", {
-                value: "E64",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error(`Unexpected route kind ${routeKind}`);
         default:
             return routeKind;
     }