gsd-pi 2.67.0-dev.46f9884 → 2.67.0-dev.4fb8afe

package/dist/web/standalone/node_modules/next/dist/server/route-modules/pages/pages-handler.js

@@ -30,7 +30,6 @@ const _redirectstatuscode = require("../../../client/components/redirect-status-
 const _isbot = require("../../../shared/lib/router/utils/is-bot");
 const _addpathprefix = require("../../../shared/lib/router/utils/add-path-prefix");
 const _removetrailingslash = require("../../../shared/lib/router/utils/remove-trailing-slash");
-const _deploymentid = require("../../../shared/lib/deployment-id");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -39,6 +38,9 @@ function _interop_require_default(obj) {
 const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, isFallbackError, getStaticPaths, getStaticProps, getServerSideProps })=>{
     return async function handler(req, res, ctx) {
         var _serverFilesManifest_config_experimental, _serverFilesManifest_config;
+        if (ctx.requestMeta) {
+            (0, _requestmeta.setRequestMeta)(req, ctx.requestMeta);
+        }
         if (routeModule.isDev) {
             (0, _requestmeta.addRequestMeta)(req, 'devRequestTimingInternalsEnd', process.hrtime.bigint());
         }
@@ -63,7 +65,7 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
             ctx.waitUntil == null ? void 0 : ctx.waitUntil.call(ctx, Promise.resolve());
             return;
         }
-        const isMinimalMode = Boolean(process.env.MINIMAL_MODE || (0, _requestmeta.getRequestMeta)(req, 'minimalMode'));
+        const isMinimalMode = Boolean((0, _requestmeta.getRequestMeta)(req, 'minimalMode'));
         const render404 = async ()=>{
             // TODO: should route-module itself handle rendering the 404
             if (routerServerContext == null ? void 0 : routerServerContext.render404) {
@@ -72,7 +74,7 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                 res.end('This page could not be found');
             }
         };
-        const { buildId, query, params, parsedUrl, originalQuery, originalPathname, buildManifest, fallbackBuildManifest, nextFontManifest, serverFilesManifest, reactLoadableManifest, prerenderManifest, isDraftMode, isOnDemandRevalidate, revalidateOnlyGenerated, locale, locales, defaultLocale, routerServerContext, nextConfig, resolvedPathname, encodedResolvedPathname } = prepareResult;
+        const { buildId, query, params, parsedUrl, originalQuery, originalPathname, buildManifest, fallbackBuildManifest, nextFontManifest, serverFilesManifest, reactLoadableManifest, prerenderManifest, isDraftMode, isOnDemandRevalidate, revalidateOnlyGenerated, locale, locales, defaultLocale, routerServerContext, nextConfig, resolvedPathname, encodedResolvedPathname, deploymentId, clientAssetToken } = prepareResult;
         const isExperimentalCompile = serverFilesManifest == null ? void 0 : (_serverFilesManifest_config = serverFilesManifest.config) == null ? void 0 : (_serverFilesManifest_config_experimental = _serverFilesManifest_config.experimental) == null ? void 0 : _serverFilesManifest_config_experimental.isExperimentalCompile;
         const hasServerProps = Boolean(getServerSideProps);
         const hasStaticProps = Boolean(getStaticProps);
@@ -98,7 +100,7 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
             const prerenderInfo = prerenderManifest.dynamicRoutes[srcPage];
             if (prerenderInfo) {
                 if (prerenderInfo.fallback === false && !isPrerendered) {
-                    if (nextConfig.experimental.adapterPath) {
+                    if (nextConfig.adapterPath) {
                         return await render404();
                     }
                     throw new _nofallbackerrorexternal.NoFallbackError();
@@ -124,6 +126,7 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                 // make sure to only add query values from original URL
                 query: hasStaticProps ? {} : originalQuery
             });
+            let parentSpan;
             const handleResponse = async (span)=>{
                 const responseGenerator = async ({ previousCacheEntry })=>{
                     var _previousCacheEntry_value;
@@ -147,7 +150,8 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                                 sharedContext: {
                                     buildId,
                                     customServer: Boolean(routerServerContext == null ? void 0 : routerServerContext.isCustomServer) || undefined,
-                                    deploymentId: (0, _deploymentid.getDeploymentId)()
+                                    deploymentId,
+                                    clientAssetToken
                                 },
                                 renderOpts: {
                                     params,
@@ -197,7 +201,6 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                                     isOnDemandRevalidate,
                                     ErrorDebug: (0, _requestmeta.getRequestMeta)(req, 'PagesErrorDebug'),
                                     err: (0, _requestmeta.getRequestMeta)(req, 'invokeError'),
-                                    dev: routeModule.isDev,
                                     // needed for experimental.optimizeCss feature
                                     distDir: _path.default.join(/* turbopackIgnore: true */ process.cwd(), routeModule.relativeProjectDir, routeModule.distDir)
                                 }
@@ -254,6 +257,13 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                                         'next.span_name': name
                                     });
                                     span.updateName(name);
+                                    // Propagate http.route to the parent span if one exists
+                                    // (e.g. a platform-created HTTP span in adapter
+                                    // deployments).
+                                    if (parentSpan && parentSpan !== span) {
+                                        parentSpan.setAttribute('http.route', route);
+                                        parentSpan.updateName(name);
+                                    }
                                 } else {
                                     span.updateName(`${method} ${srcPage}`);
                                 }
@@ -396,7 +406,7 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                     } else {
                         // revalidate: false
                         cacheControl = {
-                            revalidate: _constants1.CACHE_ONE_YEAR,
+                            revalidate: _constants1.CACHE_ONE_YEAR_SECONDS,
                             expire: undefined
                         };
                     }
@@ -416,6 +426,9 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                     (0, _requestmeta.addRequestMeta)(req, 'notFoundRevalidate', (_result_cacheControl1 = result.cacheControl) == null ? void 0 : _result_cacheControl1.revalidate);
                     res.statusCode = 404;
                     if (isNextDataRequest) {
+                        if (deploymentId) {
+                            res.setHeader(_constants1.NEXT_NAV_DEPLOYMENT_ID_HEADER, deploymentId);
+                        }
                         res.end('{"notFound":true}');
                         return;
                     }
@@ -423,6 +436,9 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                 }
                 if (result.value.kind === _responsecache.CachedRouteKind.REDIRECT) {
                     if (isNextDataRequest) {
+                        if (deploymentId) {
+                            res.setHeader(_constants1.NEXT_NAV_DEPLOYMENT_ID_HEADER, deploymentId);
+                        }
                         res.setHeader('content-type', _constants1.JSON_CONTENT_TYPE_HEADER);
                         res.end(JSON.stringify(result.value.props));
                         return;
@@ -461,7 +477,7 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                 }
                 // In dev, we should not cache pages for any reason.
                 if (routeModule.isDev) {
-                    res.setHeader('Cache-Control', 'no-store, must-revalidate');
+                    res.setHeader('Cache-Control', 'no-cache, must-revalidate');
                 }
                 // Draft mode should never be cached
                 if (isDraftMode) {
@@ -472,6 +488,12 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
                 if ((0, _requestmeta.getRequestMeta)(req, 'customErrorRender') || isErrorPage && isMinimalMode && res.statusCode === 500) {
                     return null;
                 }
+                // Add deployment ID header for data requests
+                if (isNextDataRequest && !isErrorPage && !is500Page) {
+                    if (deploymentId) {
+                        res.setHeader(_constants1.NEXT_NAV_DEPLOYMENT_ID_HEADER, deploymentId);
+                    }
+                }
                 await (0, _sendpayload.sendRenderResult)({
                     req,
                     res,
@@ -491,6 +513,7 @@ const getHandler = ({ srcPage: originalSrcPage, config, userland, routeModule, i
             if (activeSpan) {
                 await handleResponse();
             } else {
+                parentSpan = tracer.getActiveScopeSpan();
                 await tracer.withPropagatedContext(req.headers, ()=>tracer.trace(_constants.BaseServerSpan.handleRequest, {
                         spanName: `${method} ${srcPage}`,
                         kind: _tracer.SpanKind.SERVER,

package/dist/web/standalone/node_modules/next/dist/server/route-modules/route-module.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "RouteModule", {
         return RouteModule;
     }
 });
+require("../../build/adapter/setup-node-env.external");
 const _constants = require("../../shared/lib/constants");
 const _url = require("../../lib/url");
 const _normalizelocalepath = require("../../shared/lib/i18n/normalize-locale-path");
@@ -31,7 +32,7 @@ const _apppaths = require("../../shared/lib/router/utils/app-paths");
 const _routerservercontext = require("../lib/router-utils/router-server-context");
 const _decodepathparams = require("../lib/router-utils/decode-path-params");
 const _removetrailingslash = require("../../shared/lib/router/utils/remove-trailing-slash");
-const _generateinterceptionroutesrewrites = require("../../lib/generate-interception-routes-rewrites");
+const _isinterceptionrouterewrite = require("../../lib/is-interception-route-rewrite");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -42,10 +43,31 @@ class RouteModule {
     constructor({ userland, definition, distDir, relativeProjectDir }){
         this.userland = userland;
         this.definition = definition;
-        this.isDev = process.env.NODE_ENV === 'development';
+        this.isDev = !!process.env.__NEXT_DEV_SERVER;
         this.distDir = distDir;
         this.relativeProjectDir = relativeProjectDir;
     }
+    getRouterServerContext(req) {
+        var _routerServerGlobal_RouterServerContextSymbol;
+        const hostname = (0, _requestmeta.getRequestMeta)(req, 'hostname');
+        const revalidate = (0, _requestmeta.getRequestMeta)(req, 'revalidate');
+        const render404 = (0, _requestmeta.getRequestMeta)(req, 'render404');
+        const relativeProjectDir = (0, _requestmeta.getRequestMeta)(req, 'relativeProjectDir') || this.relativeProjectDir;
+        const routerServerContext = (_routerServerGlobal_RouterServerContextSymbol = _routerservercontext.routerServerGlobal[_routerservercontext.RouterServerContextSymbol]) == null ? void 0 : _routerServerGlobal_RouterServerContextSymbol[relativeProjectDir];
+        return {
+            ...routerServerContext,
+            ...hostname !== undefined ? {
+                hostname
+            } : {},
+            ...revalidate !== undefined ? {
+                revalidate
+            } : {},
+            ...render404 !== undefined ? {
+                render404
+            } : {}
+        };
+    }
+    normalizeUrl(_req, _parsedUrl) {}
     async instrumentationOnRequestError(req, ...args) {
         if (process.env.NEXT_RUNTIME === 'edge') {
             const { getEdgeInstrumentationModule } = await import('../web/globals');
@@ -90,6 +112,7 @@ class RouteModule {
                     },
                     redirects: [],
                     headers: [],
+                    onMatchHeaders: [],
                     i18n: process.env.__NEXT_I18N_CONFIG || undefined,
                     skipProxyUrlNormalize: Boolean(process.env.__NEXT_NO_MIDDLEWARE_URL_NORMALIZE)
                 },
@@ -176,18 +199,21 @@ class RouteModule {
                 this.isDev ? undefined : loadManifestFromRelativePath({
                     projectDir,
                     distDir: this.distDir,
+                    shouldCache: true,
                     manifest: `${_constants.SERVER_FILES_MANIFEST}.json`
                 }),
                 this.isDev ? 'development' : loadManifestFromRelativePath({
                     projectDir,
                     distDir: this.distDir,
                     manifest: _constants.BUILD_ID_FILE,
-                    skipParse: true
+                    skipParse: true,
+                    shouldCache: true
                 }),
                 loadManifestFromRelativePath({
                     projectDir,
                     distDir: this.distDir,
                     manifest: _constants.DYNAMIC_CSS_MANIFEST,
+                    shouldCache: !this.isDev,
                     handleMissing: true
                 })
             ];
@@ -204,7 +230,7 @@ class RouteModule {
                 serverActionsManifest,
                 subresourceIntegrityManifest,
                 dynamicCssManifest,
-                interceptionRoutePatterns: routesManifest.rewrites.beforeFiles.filter(_generateinterceptionroutesrewrites.isInterceptionRouteRewrite).map((rewrite)=>new RegExp(rewrite.regex))
+                interceptionRoutePatterns: routesManifest.rewrites.beforeFiles.filter(_isinterceptionrouterewrite.isInterceptionRouteRewrite).map((rewrite)=>new RegExp(rewrite.regex))
             };
         }
         return result;
@@ -273,7 +299,7 @@ class RouteModule {
         }, errorContext);
     }
     /** A more lightweight version of `prepare()` for only retrieving the config on edge */ getNextConfigEdge(req) {
-        var _routerServerGlobal_RouterServerContextSymbol, _nextConfig_experimental;
+        var _nextConfig_experimental;
         if (process.env.NEXT_RUNTIME !== 'edge') {
             throw Object.defineProperty(new Error('Invariant: getNextConfigEdge must only be called in edge runtime'), "__NEXT_ERROR_CODE", {
                 value: "E968",
@@ -282,8 +308,7 @@ class RouteModule {
             });
         }
         let serverFilesManifest = self.__SERVER_FILES_MANIFEST;
-        const relativeProjectDir = (0, _requestmeta.getRequestMeta)(req, 'relativeProjectDir') || this.relativeProjectDir;
-        const routerServerContext = (_routerServerGlobal_RouterServerContextSymbol = _routerservercontext.routerServerGlobal[_routerservercontext.RouterServerContextSymbol]) == null ? void 0 : _routerServerGlobal_RouterServerContextSymbol[relativeProjectDir];
+        const routerServerContext = this.getRouterServerContext(req);
         const nextConfig = (routerServerContext == null ? void 0 : routerServerContext.nextConfig) || (serverFilesManifest == null ? void 0 : serverFilesManifest.config);
         if (!nextConfig) {
             throw Object.defineProperty(new Error("Invariant: nextConfig couldn't be loaded"), "__NEXT_ERROR_CODE", {
@@ -311,7 +336,7 @@ class RouteModule {
         };
     }
     async prepare(req, res, { srcPage, multiZoneDraftMode }) {
-        var _routerServerGlobal_RouterServerContextSymbol, _nextConfig_experimental;
+        var _req_headers_xforwardedproto, _nextConfig_experimental;
         let absoluteProjectDir;
         // edge runtime handles loading instrumentation at the edge adapter level
         if (process.env.NEXT_RUNTIME !== 'edge') {
@@ -326,13 +351,26 @@ class RouteModule {
             // onRequestError below
             ensureInstrumentationRegistered(absoluteProjectDir, this.distDir);
         }
-        const manifests = await this.loadManifests(srcPage, absoluteProjectDir);
+        const manifests = this.loadManifests(srcPage, absoluteProjectDir);
         const { routesManifest, prerenderManifest, serverFilesManifest } = manifests;
         const { basePath, i18n, rewrites } = routesManifest;
+        const routerServerContext = this.getRouterServerContext(req);
+        const nextConfig = (routerServerContext == null ? void 0 : routerServerContext.nextConfig) || (serverFilesManifest == null ? void 0 : serverFilesManifest.config);
+        // Injected in base-server.ts
+        const protocol = ((_req_headers_xforwardedproto = req.headers['x-forwarded-proto']) == null ? void 0 : _req_headers_xforwardedproto.includes('https')) ? 'https' : 'http';
+        // When there are hostname and port we build an absolute URL
+        if (!(0, _requestmeta.getRequestMeta)(req, 'initURL')) {
+            const initUrl = (serverFilesManifest == null ? void 0 : serverFilesManifest.config.experimental.trustHostHeader) ? `${protocol}://${req.headers.host || 'localhost'}${req.url}` : `${protocol}://${(routerServerContext == null ? void 0 : routerServerContext.hostname) || 'localhost'}${req.url}`;
+            (0, _requestmeta.addRequestMeta)(req, 'initURL', initUrl);
+            (0, _requestmeta.addRequestMeta)(req, 'initProtocol', protocol);
+        }
         if (basePath) {
             req.url = (0, _removepathprefix.removePathPrefix)(req.url || '/', basePath);
         }
         const parsedUrl = (0, _url.parseReqUrl)(req.url || '/');
+        (0, _requestmeta.addRequestMeta)(req, 'initQuery', {
+            ...parsedUrl == null ? void 0 : parsedUrl.query
+        });
         // if we couldn't parse the URL we can't continue
         if (!parsedUrl) {
             return;
@@ -342,6 +380,7 @@ class RouteModule {
             isNextDataRequest = true;
             parsedUrl.pathname = (0, _normalizedatapath.normalizeDataPath)(parsedUrl.pathname || '/');
         }
+        this.normalizeUrl(req, parsedUrl);
         let originalPathname = parsedUrl.pathname || '/';
         const originalQuery = {
             ...parsedUrl.query
@@ -373,8 +412,10 @@ class RouteModule {
             caseSensitive: Boolean(routesManifest.caseSensitive)
         });
         const domainLocale = (0, _detectdomainlocale.detectDomainLocale)(i18n == null ? void 0 : i18n.domains, (0, _gethostname.getHostname)(parsedUrl, req.headers), detectedLocale);
-        (0, _requestmeta.addRequestMeta)(req, 'isLocaleDomain', Boolean(domainLocale));
-        const defaultLocale = (domainLocale == null ? void 0 : domainLocale.defaultLocale) || (i18n == null ? void 0 : i18n.defaultLocale);
+        if (Boolean(domainLocale)) {
+            (0, _requestmeta.addRequestMeta)(req, 'isLocaleDomain', Boolean(domainLocale));
+        }
+        const defaultLocale = (0, _requestmeta.getRequestMeta)(req, 'defaultLocale') || (domainLocale == null ? void 0 : domainLocale.defaultLocale) || (i18n == null ? void 0 : i18n.defaultLocale);
         // Ensure parsedUrl.pathname includes locale before processing
         // rewrites or they won't match correctly.
         if (defaultLocale && !detectedLocale) {
@@ -444,8 +485,9 @@ class RouteModule {
             const paramsResult = serverUtils.normalizeDynamicRouteParams(params || {}, true);
             let paramsToInterpolate;
             if (// if both query and params are valid but one
-            // provided more information rely on that one
-            query && params && paramsResult.hasValidParams && queryResult.hasValidParams && Object.keys(paramsResult.params).length < Object.keys(queryResult.params).length) {
+            // provided more information and the query params
+            // were nxtP prefixed rely on that one
+            query && params && paramsResult.hasValidParams && queryResult.hasValidParams && routeParamKeys.size > 0 && Object.keys(paramsResult.params).length <= Object.keys(queryResult.params).length) {
                 paramsToInterpolate = queryResult.params;
                 params = Object.assign(queryResult.params);
             } else {
@@ -481,6 +523,11 @@ class RouteModule {
         for (const key of routeParamKeys){
             if (!(key in originalQuery)) {
                 delete query[key];
+            // handle the case where there's collision and we
+            // normalized nxtPid=123 -> id=123 but user also
+            // sends id=456 as separate key
+            } else if (originalQuery[key] && query[key] && originalQuery[key] !== query[key]) {
+                query[key] = originalQuery[key];
             }
         }
         const { isOnDemandRevalidate, revalidateOnlyGenerated } = (0, _apiutils.checkIsOnDemandRevalidate)(req, prerenderManifest.preview);
@@ -492,9 +539,6 @@ class RouteModule {
             previewData = tryGetPreviewData(req, res, prerenderManifest.preview, Boolean(multiZoneDraftMode));
             isDraftMode = previewData !== false;
         }
-        const relativeProjectDir = (0, _requestmeta.getRequestMeta)(req, 'relativeProjectDir') || this.relativeProjectDir;
-        const routerServerContext = (_routerServerGlobal_RouterServerContextSymbol = _routerservercontext.routerServerGlobal[_routerservercontext.RouterServerContextSymbol]) == null ? void 0 : _routerServerGlobal_RouterServerContextSymbol[relativeProjectDir];
-        const nextConfig = (routerServerContext == null ? void 0 : routerServerContext.nextConfig) || (serverFilesManifest == null ? void 0 : serverFilesManifest.config);
         if (!nextConfig) {
             throw Object.defineProperty(new Error("Invariant: nextConfig couldn't be loaded"), "__NEXT_ERROR_CODE", {
                 value: "E969",
@@ -502,6 +546,10 @@ class RouteModule {
                 configurable: true
             });
         }
+        if (process.env.NEXT_RUNTIME !== 'edge') {
+            const { installProcessErrorHandlers } = require('../node-environment-extensions/process-error-handlers');
+            installProcessErrorHandlers(Boolean(nextConfig.experimental.removeUncaughtErrorAndRejectionListeners));
+        }
         let resolvedPathname = normalizedSrcPage;
         if ((0, _utils.isDynamicRoute)(resolvedPathname) && params) {
             resolvedPathname = serverUtils.interpolateDynamicPath(resolvedPathname, params);
@@ -509,6 +557,9 @@ class RouteModule {
         if (resolvedPathname === '/index') {
             resolvedPathname = '/';
         }
+        if (res && Boolean(req.headers['x-nextjs-data']) && (!res.statusCode || res.statusCode === 200)) {
+            res.setHeader('x-nextjs-matched-path', (0, _removetrailingslash.removeTrailingSlash)(`${locale ? `/${locale}` : ''}${normalizedSrcPage}`));
+        }
         const encodedResolvedPathname = resolvedPathname;
         // we decode for cache key/manifest usage encoded is
         // for URL building
@@ -516,6 +567,7 @@ class RouteModule {
             resolvedPathname = (0, _decodepathparams.decodePathParams)(resolvedPathname);
         } catch (_) {}
         resolvedPathname = (0, _removetrailingslash.removeTrailingSlash)(resolvedPathname);
+        (0, _requestmeta.addRequestMeta)(req, 'resolvedPathname', resolvedPathname);
         let deploymentId;
         if ((_nextConfig_experimental = nextConfig.experimental) == null ? void 0 : _nextConfig_experimental.runtimeServerDeploymentId) {
             if (!process.env.NEXT_DEPLOYMENT_ID) {
@@ -551,12 +603,13 @@ class RouteModule {
             // whole codebase (for now)
             nextConfig: nextConfig,
             routerServerContext,
-            deploymentId
+            deploymentId,
+            clientAssetToken: nextConfig.experimental.immutableAssetToken || deploymentId
         };
     }
     getResponseCache(req) {
         if (!this.responseCache) {
-            const minimalMode = (Boolean(process.env.MINIMAL_MODE) || (0, _requestmeta.getRequestMeta)(req, 'minimalMode')) ?? false;
+            const minimalMode = (0, _requestmeta.getRequestMeta)(req, 'minimalMode') ?? false;
             this.responseCache = new _responsecache.default(minimalMode);
         }
         return this.responseCache;

package/dist/web/standalone/node_modules/next/dist/server/stream-utils/encoded-tags.js

@@ -19,6 +19,14 @@ const ENCODED_TAGS = {
             109,
             108
         ]),
+        // <head
+        HEAD: new Uint8Array([
+            60,
+            104,
+            101,
+            97,
+            100
+        ]),
         // <body
         BODY: new Uint8Array([
             60,