@sifxprime/krouter 0.5.166 → 0.5.167

package/app/node_modules/next/dist/server/lib/router-server.js

@@ -20,6 +20,7 @@ const _debug = /*#__PURE__*/ _interop_require_default(require("next/dist/compile
 const _log = /*#__PURE__*/ _interop_require_wildcard(require("../../build/output/log"));
 const _processerrorhandlers = require("../node-environment-extensions/process-error-handlers");
 const _utils = require("../../shared/lib/utils");
+const _magicidentifier = require("../../shared/lib/magic-identifier");
 const _findpagesdir = require("../../lib/find-pages-dir");
 const _filesystem = require("./router-utils/filesystem");
 const _proxyrequest = require("./router-utils/proxy-request");
@@ -31,7 +32,6 @@ const _removepathprefix = require("../../shared/lib/router/utils/remove-path-pre
 const _compression = /*#__PURE__*/ _interop_require_default(require("next/dist/compiled/compression"));
 const _releasecompressionstream = require("./release-compression-stream");
 const _nextrequest = require("../web/spec-extension/adapters/next-request");
-const _ispostpone = require("./router-utils/is-postpone");
 const _isnonhtmlsecfetchdest = require("./is-non-html-sec-fetch-dest");
 const _parseurl = require("../../shared/lib/router/utils/parse-url");
 const _constants = require("../../shared/lib/constants");
@@ -53,6 +53,7 @@ const _nofallbackerrorexternal = require("../../shared/lib/no-fallback-error.ext
 const _routerservercontext = require("./router-utils/router-server-context");
 const _chromedevtoolsworkspace = require("./chrome-devtools-workspace");
 const _configshared = require("../config-shared");
+const _ciinfo = require("../ci-info");
 const _requestinsights = require("./trace/request-insights");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -102,6 +103,23 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 const debug = (0, _debug.default)('next:router-server:main');
 const isNextFont = (pathname)=>pathname && /\/media\/[^/]+\.(woff|woff2|eot|ttf|otf)$/.test(pathname);
+// ModuleBuildError can cross compiled module boundaries, so constructor
+// identity is not reliable. Check its stable fields and string prefix instead.
+function isModuleBuildError(error) {
+    var _maybeError_constructor;
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const maybeError = error;
+    const errorString = String(error);
+    return maybeError.name === 'ModuleBuildError' || maybeError.code === 'ModuleBuildError' || ((_maybeError_constructor = maybeError.constructor) == null ? void 0 : _maybeError_constructor.name) === 'ModuleBuildError' || errorString.startsWith('ModuleBuildError:') || errorString.startsWith('Error [ModuleBuildError]:');
+}
+function getErrorMessage(error) {
+    if (error && typeof error === 'object' && 'message' in error && typeof error.message === 'string') {
+        return (0, _magicidentifier.deobfuscateText)(error.message);
+    }
+    return (0, _magicidentifier.deobfuscateText)(String(error));
+}
 const requestHandlers = {};
 async function initialize(opts) {
     var _development_bundler, _development_service, _development_service1, _development_service2, _development_service3, _development_service4, _development_bundler1;
@@ -134,6 +152,7 @@ async function initialize(opts) {
     const renderServer = {};
     let development = undefined;
     let originalFetch = globalThis.fetch;
+    let hasVulnerabilityInsight = Promise.resolve(false);
     if (opts.dev) {
         var _developmentConfig_experimental;
         const { Telemetry } = require('../../telemetry/storage');
@@ -150,6 +169,46 @@ async function initialize(opts) {
         const setupDevBundlerSpan = opts.startServerSpan ? opts.startServerSpan.traceChild('setup-dev-bundler') : (0, _trace.trace)('setup-dev-bundler');
         // In development, it's always the complete config.
         let developmentConfig = config;
+        // Check only development; production startup does not query advisories.
+        if (developmentConfig.experimental.agentUpgrade === 'security' || developmentConfig.experimental.agentUpgrade === 'latest' || developmentConfig.experimental.agentUpgrade === 'experimental-future' || process.env.__NEXT_AGENT_UPGRADE || process.env.__NEXT_AGENT_UPGRADE_FORCE_DEVTOOLS_FOR_TESTING === '1') {
+            const { nudgeUpgrade, getUpgradeContext, assessUpgrade } = require('../../lib/upgrade/nudge');
+            const upgradeContext = getUpgradeContext(developmentConfig);
+            const installedVersion = "16.4.1" || 'unknown';
+            const policy = upgradeContext.experimental.agentUpgrade;
+            const forced = process.env.__NEXT_AGENT_UPGRADE === policy;
+            const forceDevToolsForTesting = process.env.__NEXT_AGENT_UPGRADE_FORCE_DEVTOOLS_FOR_TESTING === '1';
+            const assessment = _ciinfo.isCI || forceDevToolsForTesting ? Promise.resolve(null) : assessUpgrade(opts.dir, upgradeContext, installedVersion, null, forced);
+            hasVulnerabilityInsight = assessment.then((result)=>(result == null ? void 0 : result.kind) === 'security' || forceDevToolsForTesting, (error)=>{
+                _log.warn(`Could not check the DevTools security insight: ${error}`);
+                return false;
+            });
+            if (process.env.NEXT_PRIVATE_UPGRADE_PROMPT === '1' && process.send) {
+                // The CLI shows the menu; keep serving instead of waiting for it.
+                void Promise.allSettled([
+                    assessment
+                ]).then(([promptAssessment])=>{
+                    if (process.connected) {
+                        process.send({
+                            nextUpgradeContext: upgradeContext,
+                            telemetryDisabled: process.env.NEXT_TELEMETRY_DISABLED,
+                            ...promptAssessment.status === 'fulfilled' ? {
+                                nextUpgradeAssessment: promptAssessment.value
+                            } : {}
+                        });
+                    }
+                });
+            } else {
+                // CI skips the DevTools assessment, but agents still need the nudge.
+                void nudgeUpgrade(opts.dir, upgradeContext, 'dev', null, _ciinfo.isCI || forceDevToolsForTesting ? null : assessment, {
+                    telemetry,
+                    onNudgeId: null
+                }).catch((error)=>{
+                    const { printAndExit } = require('./utils');
+                    const exitCode = error && typeof error === 'object' ? Reflect.get(error, 'exitCode') : undefined;
+                    printAndExit(error instanceof Error ? error.message : String(error), typeof exitCode === 'number' ? exitCode : 1);
+                });
+            }
+        }
         // Resolve the effective serverFastRefresh value.
         // Both default to enabled (true). CLI takes precedence over config.
         const cliServerFastRefresh = opts.serverFastRefresh;
@@ -176,7 +235,8 @@ async function initialize(opts) {
                 port: opts.port,
                 onDevServerCleanup: opts.onDevServerCleanup,
                 resetFetch,
-                serverFastRefresh: effectiveServerFastRefresh
+                serverFastRefresh: effectiveServerFastRefresh,
+                hasVulnerabilityInsight
             }));
         let devBundlerService = new _devbundlerservice.DevBundlerService(developmentBundler, // The request handler is assigned below, this allows us to create a lazy
         // reference to it.
@@ -193,6 +253,7 @@ async function initialize(opts) {
     renderServer.instance = require('./render-server');
     const requestHandlerImpl = async (req, res)=>{
         (0, _requestmeta.addRequestMeta)(req, 'relativeProjectDir', relativeProjectDir);
+        const assetPrefix = getAssetPrefix();
         // internal headers should not be honored by the request handler
         if (!process.env.NEXT_PRIVATE_TEST_HEADERS) {
             (0, _utils1.filterInternalHeaders)(req.headers);
@@ -286,11 +347,7 @@ async function initialize(opts) {
                 return null;
             }
             if (!handlers) {
-                throw Object.defineProperty(new Error('Failed to initialize render server'), "__NEXT_ERROR_CODE", {
-                    value: "E90",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error('Failed to initialize render server');
             }
             (0, _requestmeta.addRequestMeta)(req, 'invokePath', invokePath);
             (0, _requestmeta.addRequestMeta)(req, 'invokeQuery', parsedUrl.query);
@@ -325,11 +382,7 @@ async function initialize(opts) {
         const handleRequest = async (handleIndex)=>{
             var _development_bundler;
             if (handleIndex > 5) {
-                throw Object.defineProperty(new Error(`Attempted to handle request too many times ${req.url}`), "__NEXT_ERROR_CODE", {
-                    value: "E283",
-                    enumerable: false,
-                    configurable: true
-                });
+                throw new Error(`Attempted to handle request too many times ${req.url}`);
             }
             // handle hot-reloader first
             if (development) {
@@ -341,8 +394,8 @@ async function initialize(opts) {
                 // so that the development bundler can find the correct file
                 if (config.basePath && (0, _pathhasprefix.pathHasPrefix)(origUrl, config.basePath)) {
                     req.url = (0, _removepathprefix.removePathPrefix)(origUrl, config.basePath);
-                } else if (config.assetPrefix && (0, _pathhasprefix.pathHasPrefix)(origUrl, config.assetPrefix)) {
-                    req.url = (0, _removepathprefix.removePathPrefix)(origUrl, config.assetPrefix);
+                } else if (assetPrefix && (0, _pathhasprefix.pathHasPrefix)(origUrl, assetPrefix)) {
+                    req.url = (0, _removepathprefix.removePathPrefix)(origUrl, assetPrefix);
                 }
                 const parsedUrl = (0, _parseurl.parseUrl)(req.url || '/');
                 const hotReloaderResult = await development.bundler.hotReloader.run(req, res, parsedUrl);
@@ -365,8 +418,8 @@ async function initialize(opts) {
                 const origUrl = req.url || '/';
                 if (config.basePath && (0, _pathhasprefix.pathHasPrefix)(origUrl, config.basePath)) {
                     req.url = (0, _removepathprefix.removePathPrefix)(origUrl, config.basePath);
-                } else if (config.assetPrefix && (0, _pathhasprefix.pathHasPrefix)(origUrl, config.assetPrefix)) {
-                    req.url = (0, _removepathprefix.removePathPrefix)(origUrl, config.assetPrefix);
+                } else if (assetPrefix && (0, _pathhasprefix.pathHasPrefix)(origUrl, assetPrefix)) {
+                    req.url = (0, _removepathprefix.removePathPrefix)(origUrl, assetPrefix);
                 }
                 if (resHeaders !== null) {
                     for (const key of Object.keys(resHeaders)){
@@ -422,11 +475,7 @@ async function initialize(opts) {
                     const message = `A conflicting public file and page file was found for path ${matchedOutput.itemPath} https://nextjs.org/docs/messages/conflicting-public-file-page`;
                     await invokeRender(parsedUrl, '/_error', handleIndex, {
                         invokeStatus: 500,
-                        invokeError: Object.defineProperty(new Error(message), "__NEXT_ERROR_CODE", {
-                            value: "E212",
-                            enumerable: false,
-                            configurable: true
-                        })
+                        invokeError: new Error(message)
                     });
                     _log.error(message);
                     return;
@@ -436,6 +485,10 @@ async function initialize(opts) {
                         res.setHeader('Cache-Control', 'public, max-age=0, must-revalidate');
                         res.setHeader('Service-Worker-Allowed', config.basePath || '/');
                     } else if (opts.dev && !isNextFont(parsedUrl.pathname)) {
+                        // Development assets stay revalidatable. `serveStatic` adds an
+                        // `ETag`, so the browser sends a conditional request and reuses the
+                        // stored body when the server answers `304`. This keeps the browser
+                        // from downloading every chunk again on each page load.
                         res.setHeader('Cache-Control', 'no-cache, must-revalidate');
                     } else {
                         res.setHeader('Cache-Control', 'public, max-age=31536000, immutable');
@@ -505,8 +558,26 @@ async function initialize(opts) {
             }
             if (matchedOutput) {
                 invokedOutputs.add(matchedOutput.itemPath);
+                // fsChecker preserves compilation errors from its dev ensure step so
+                // the route remains matched. Log the compiler diagnostic, then render
+                // the matched route as a 500 instead of falling through to a 404.
+                if (matchedOutput.error && development) {
+                    development.bundler.logErrorWithOriginalStack(matchedOutput.error, matchedOutput.type === 'appFile' ? 'app-dir' : undefined);
+                }
                 return await invokeRender(parsedUrl, parsedUrl.pathname || '/', handleIndex, {
-                    invokeOutput: matchedOutput.itemPath
+                    invokeOutput: matchedOutput.itemPath,
+                    ...matchedOutput.error ? {
+                        invokeStatus: 500,
+                        invokeError: matchedOutput.error
+                    } : undefined,
+                    // fsChecker owns the route match for filesystem requests. Forward
+                    // it so BaseServer does not need the removed matcher manager.
+                    ...matchedOutput.route ? {
+                        match: {
+                            definition: matchedOutput.route,
+                            params: matchedOutput.params
+                        }
+                    } : undefined
                 });
             }
             // We want the original pathname without any basePath or proxy rewrites.
@@ -521,8 +592,8 @@ async function initialize(opts) {
                 if (config.basePath) {
                     realRequestPathname = (0, _removepathprefix.removePathPrefix)(realRequestPathname, config.basePath);
                 }
-                if (config.assetPrefix) {
-                    realRequestPathname = (0, _removepathprefix.removePathPrefix)(realRequestPathname, config.assetPrefix);
+                if (assetPrefix) {
+                    realRequestPathname = (0, _removepathprefix.removePathPrefix)(realRequestPathname, assetPrefix);
                 }
                 if (config.i18n) {
                     realRequestPathname = (0, _removepathprefix.removePathPrefix)(realRequestPathname, '/' + ((0, _requestmeta.getRequestMeta)(req, 'locale') ?? ''));
@@ -570,6 +641,10 @@ async function initialize(opts) {
                 if (err instanceof _utils.DecodeError) {
                     invokePath = '/400';
                     invokeStatus = '400';
+                } else if (isModuleBuildError(err)) {
+                    // Webpack compilation failures may bubble out of invokeRender. Log
+                    // the readable diagnostic without printing the wrapper stack again.
+                    _log.error(getErrorMessage(err));
                 } else {
                     console.error(err);
                 }
@@ -621,6 +696,7 @@ async function initialize(opts) {
     renderServerOpts.serverFields.routerServerHandler = requestHandlerImpl;
     // pre-initialize workers
     const handlers = await renderServer.instance.initialize(renderServerOpts);
+    const getAssetPrefix = ()=>handlers.server.getAssetPrefix();
     // this must come after initialize of render server since it's
     // using initialized methods
     if (!_routerservercontext.routerServerGlobal[_routerservercontext.RouterServerContextSymbol]) {
@@ -629,6 +705,7 @@ async function initialize(opts) {
     const relativeProjectDir = _path.default.relative(process.cwd(), opts.dir);
     _routerservercontext.routerServerGlobal[_routerservercontext.RouterServerContextSymbol][relativeProjectDir] = {
         nextConfig: (0, _configshared.getNextConfigRuntime)(config),
+        getAssetPrefix,
         hostname: handlers.server.hostname,
         revalidate: handlers.server.revalidate.bind(handlers.server),
         render404: handlers.server.render404.bind(handlers.server),
@@ -640,11 +717,6 @@ async function initialize(opts) {
         sendErrorsToBrowser: development == null ? void 0 : (_development_service4 = development.service) == null ? void 0 : _development_service4.sendErrorsToBrowser.bind(development == null ? void 0 : development.service)
     };
     const logError = async (err)=>{
-        if ((0, _ispostpone.isPostpone)(err)) {
-            // React postpones that are unhandled might end up logged here but they're
-            // not really errors. They're just part of rendering.
-            return;
-        }
         _log.error('uncaughtException: ', err);
     };
     process.on('uncaughtException', logError);
@@ -654,7 +726,7 @@ async function initialize(opts) {
     if (!(0, _processerrorhandlers.isUnhandledRejectionListenerRegistered)()) {
         (0, _processerrorhandlers.registerUnhandledRejectionListener)();
     }
-    const resolveRoutes = (0, _resolveroutes.getResolveRoutes)(fsChecker, config, opts, renderServer.instance, renderServerOpts, development == null ? void 0 : (_development_bundler1 = development.bundler) == null ? void 0 : _development_bundler1.ensureMiddleware);
+    const resolveRoutes = (0, _resolveroutes.getResolveRoutes)(fsChecker, config, getAssetPrefix, opts, renderServer.instance, renderServerOpts, development == null ? void 0 : (_development_bundler1 = development.bundler) == null ? void 0 : _development_bundler1.ensureMiddleware);
     const upgradeHandler = async (req, socket, head)=>{
         try {
             req.on('error', (_err)=>{
@@ -669,7 +741,8 @@ async function initialize(opts) {
                 if ((0, _blockcrosssitedev.blockCrossSiteDEV)(req, socket, development.config.allowedDevOrigins, opts.hostname)) {
                     return;
                 }
-                const { basePath, assetPrefix } = config;
+                const { basePath } = config;
+                const assetPrefix = getAssetPrefix();
                 let hmrPrefix = basePath;
                 // assetPrefix overrides basePath for HMR path
                 if (assetPrefix) {
@@ -705,11 +778,7 @@ async function initialize(opts) {
             }
             const res = new _mockrequest.MockedResponse({
                 resWriter: ()=>{
-                    throw Object.defineProperty(new Error('Invariant: did not expect response writer to be written to for upgrade request'), "__NEXT_ERROR_CODE", {
-                        value: "E522",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error('Invariant: did not expect response writer to be written to for upgrade request');
                 }
             });
             const { finished, matchedOutput, parsedUrl, statusCode } = await resolveRoutes({
@@ -749,6 +818,7 @@ async function initialize(opts) {
         cacheComponents: config.cacheComponents,
         partialPrefetching: config.partialPrefetching,
         agentRules: config.agentRules,
+        agentFeedback: config.experimental.agentFeedback,
         devMemoryThresholdRestart
     };
 }

package/app/node_modules/next/dist/server/lib/router-utils/build-data-route.js

@@ -2,9 +2,21 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "buildDataRoute", {
-    enumerable: true,
-    get: function() {
+0 && (module.exports = {
+    addLocalePrefixToDataRouteRegex: null,
+    buildDataRoute: null
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    addLocalePrefixToDataRouteRegex: function() {
+        return addLocalePrefixToDataRouteRegex;
+    },
+    buildDataRoute: function() {
         return buildDataRoute;
     }
 });
@@ -44,5 +56,16 @@ function buildDataRoute(page, buildId) {
         namedDataRouteRegex
     };
 }
+function addLocalePrefixToDataRouteRegex(dataRouteRegex, buildId) {
+    // dataRouteRegex escapes static segments, including custom build IDs. Locate
+    // the escaped build ID so locale insertion also works for IDs such as "a.b".
+    const buildIdSegment = `/${(0, _escaperegexp.escapeStringRegexp)(buildId)}`;
+    const buildIdIndex = dataRouteRegex.indexOf(buildIdSegment);
+    if (buildIdIndex === -1) {
+        return dataRouteRegex;
+    }
+    const insertIndex = buildIdIndex + buildIdSegment.length;
+    return `${dataRouteRegex.slice(0, insertIndex)}/(?:[^/]+?)${dataRouteRegex.slice(insertIndex)}`;
+}
 
 //# sourceMappingURL=build-data-route.js.map

package/app/node_modules/next/dist/server/lib/router-utils/cache-life-type-utils.js

@@ -87,6 +87,7 @@ function formatTimespanWithSeconds(seconds) {
     return text + ' (' + descriptive + ')';
 }
 function generateCacheLifeTypes(cacheLife) {
+    let profileKeys = '';
     let overloads = '';
     const profileNames = Object.keys(cacheLife);
     for(let i = 0; i < profileNames.length; i++){
@@ -95,6 +96,8 @@ function generateCacheLifeTypes(cacheLife) {
         if (typeof profile !== 'object' || profile === null) {
             continue;
         }
+        profileKeys += `
+    ${JSON.stringify(profileName)}: true`;
         let description = '';
         if (profile.stale === undefined) {
             description += `
@@ -143,55 +146,21 @@ function generateCacheLifeTypes(cacheLife) {
     export function cacheLife(profile: ${JSON.stringify(profileName)}): void
     `;
     }
-    overloads += `
-    /**
-     * Cache this \`"use cache"\` using a custom timespan.
-     * \`\`\`
-     *   stale: ... // seconds
-     *   revalidate: ... // seconds
-     *   expire: ... // seconds
-     * \`\`\`
-     *
-     * This is similar to Cache-Control: max-age=\`stale\`,s-max-age=\`revalidate\`,stale-while-revalidate=\`expire-revalidate\`
-     *
-     * If a value is left out, the lowest of other cacheLife() calls or the default, is used instead.
-     */
-    export function cacheLife(profile: {
-      /**
-       * This cache may be stale on clients for ... seconds before checking with the server.
-       */
-      stale?: number,
-      /**
-       * If the server receives a new request after ... seconds, start revalidating new values in the background.
-       */
-      revalidate?: number,
-      /**
-       * If this entry has no traffic for ... seconds it will expire. The next request will recompute it.
-       */
-      expire?: number
-    }): void
-  `;
-    // Redefine the cacheLife() accepted arguments.
+    // The top-level `export {}` makes this file a module, which in turn makes
+    // the block below a module augmentation that merges into the `next/cache`
+    // types. Without it the file is a script, the block is a standalone ambient
+    // module declaration, and it shadows `next/cache` instead of merging: every
+    // other export then has to be redeclared here, and TypeScript offers two
+    // identical auto-import completions for each of them, one from this file and
+    // one from the package's own types.
     return `// Type definitions for Next.js cacheLife configs
 
-declare module 'next/cache' {
-  export { unstable_cache } from 'next/dist/server/web/spec-extension/unstable-cache'
-  export {
-    updateTag,
-    revalidateTag,
-    revalidatePath,
-    refresh,
-  } from 'next/dist/server/web/spec-extension/revalidate'
-  export { unstable_noStore } from 'next/dist/server/web/spec-extension/unstable-no-store'
-  export { io } from 'next/dist/server/request/io'
+export {}
 
+declare module 'next/cache' {
+  export interface CacheLifeProfiles {${profileKeys}
+  }
   ${overloads}
-
-  import { cacheTag } from 'next/dist/server/use-cache/cache-tag'
-  export { cacheTag }
-
-  export const unstable_cacheTag: typeof cacheTag
-  export const unstable_cacheLife: typeof cacheLife
 }
 `;
 }

package/app/node_modules/next/dist/server/lib/router-utils/decode-path-params.js

@@ -29,11 +29,7 @@ function _interop_require_default(obj) {
             seg = (0, _escapepathdelimiters.default)(decodeURIComponent(seg), true);
         } catch (_) {
             // An improperly encoded URL was provided
-            throw Object.defineProperty(new _utils.DecodeError('Failed to decode path param(s).'), "__NEXT_ERROR_CODE", {
-                value: "E539",
-                enumerable: false,
-                configurable: true
-            });
+            throw new _utils.DecodeError('Failed to decode path param(s).');
         }
         return seg;
     }).join('/');