next 13.4.13 → 13.4.14-canary.1

package/dist/esm/server/next.js

@@ -1,8 +1,6 @@
-import { addRequestMeta } from "./request-meta";
 import "./require-hook";
 import "./node-polyfill-fetch";
 import "./node-polyfill-crypto";
-import url from "url";
 import * as log from "../build/output/log";
 import loadConfig from "./config";
 import { resolve } from "path";
@@ -12,7 +10,7 @@ import { PHASE_PRODUCTION_SERVER } from "../shared/lib/constants";
 import { getTracer } from "./lib/trace/tracer";
 import { NextServerSpan } from "./lib/trace/constants";
 import { formatUrl } from "../shared/lib/router/utils/format-url";
-import { proxyRequest } from "./lib/router-utils/proxy-request";
+import { checkIsNodeDebugging } from "./lib/is-node-debugging";
 let ServerImpl;
 const getServerImpl = async ()=>{
     if (ServerImpl === undefined) {
@@ -20,7 +18,6 @@ const getServerImpl = async ()=>{
     }
     return ServerImpl;
 };
-const SYMBOL_SET_STANDALONE_MODE = Symbol("next.set_standalone_mode");
 const SYMBOL_LOAD_CONFIG = Symbol("next.load_config");
 export class NextServer {
     constructor(options){
@@ -32,9 +29,6 @@ export class NextServer {
     get port() {
         return this.options.port;
     }
-    [SYMBOL_SET_STANDALONE_MODE]() {
-        this.standaloneMode = true;
-    }
     getRequestHandler() {
         return async (req, res, parsedUrl)=>{
             return getTracer().trace(NextServerSpan.getRequestHandler, async ()=>{
@@ -156,6 +150,64 @@ export class NextServer {
         return this.reqHandlerPromise;
     }
 }
+class NextCustomServer extends NextServer {
+    async prepare() {
+        const { getRequestHandlers  } = require("./lib/start-server");
+        const isNodeDebugging = checkIsNodeDebugging();
+        const initResult = await getRequestHandlers({
+            dir: this.options.dir,
+            port: this.options.port || 3000,
+            isDev: !!this.options.dev,
+            hostname: this.options.hostname || "localhost",
+            minimalMode: this.options.minimalMode,
+            isNodeDebugging: !!isNodeDebugging
+        });
+        this.requestHandler = initResult[0];
+        this.upgradeHandler = initResult[1];
+    }
+    setupWebSocketHandler(customServer, _req) {
+        if (!this.didWebSocketSetup) {
+            var _ref;
+            this.didWebSocketSetup = true;
+            customServer = customServer || ((_ref = _req == null ? void 0 : _req.socket) == null ? void 0 : _ref.server);
+            if (customServer) {
+                customServer.on("upgrade", async (req, socket, head)=>{
+                    this.upgradeHandler(req, socket, head);
+                });
+            }
+        }
+    }
+    getRequestHandler() {
+        return async (req, res, parsedUrl)=>{
+            this.setupWebSocketHandler(this.options.httpServer, req);
+            if (parsedUrl) {
+                req.url = formatUrl(parsedUrl);
+            }
+            return this.requestHandler(req, res);
+        };
+    }
+    async render(...args) {
+        let [req, res, pathname, query, parsedUrl] = args;
+        this.setupWebSocketHandler(this.options.httpServer, req);
+        if (!pathname.startsWith("/")) {
+            console.error(`Cannot render page with path "${pathname}"`);
+            pathname = `/${pathname}`;
+        }
+        pathname = pathname === "/index" ? "/" : pathname;
+        req.url = formatUrl({
+            ...parsedUrl,
+            pathname,
+            query
+        });
+        await this.requestHandler(req, res);
+        return;
+    }
+    constructor(...args){
+        super(...args);
+        this.standaloneMode = true;
+        this.didWebSocketSetup = false;
+    }
+}
 // This file is used for when users run `require('next')`
 function createServer(options) {
     // The package is used as a TypeScript plugin.
@@ -175,112 +227,15 @@ function createServer(options) {
     if (options.dev && typeof options.dev !== "boolean") {
         console.warn("Warning: 'dev' is not a boolean which could introduce unexpected behavior. https://nextjs.org/docs/messages/invalid-server-options");
     }
+    // When the caller is a custom server (using next()).
     if (options.customServer !== false) {
-        // If the `app` dir exists, we'll need to run the standalone server to have
-        // both types of renderers (pages, app) running in separated processes,
-        // instead of having the Next server only.
-        let shouldUseStandaloneMode = false;
         const dir = resolve(options.dir || ".");
-        const server = new NextServer(options);
-        const { createRouterWorker , checkIsNodeDebugging  } = require("./lib/start-server");
-        let didWebSocketSetup = false;
-        let serverPort = 0;
-        function setupWebSocketHandler(customServer, _req) {
-            if (!didWebSocketSetup) {
-                var _ref;
-                didWebSocketSetup = true;
-                customServer = customServer || ((_ref = _req == null ? void 0 : _req.socket) == null ? void 0 : _ref.server);
-                if (!customServer) {
-                    // this is very unlikely to happen but show an error in case
-                    // it does somehow
-                    console.error(`Invalid IncomingMessage received, make sure http.createServer is being used to handle requests.`);
-                } else {
-                    customServer.on("upgrade", async (req, socket, head)=>{
-                        if (shouldUseStandaloneMode) {
-                            await proxyRequest(req, socket, url.parse(`http://127.0.0.1:${serverPort}${req.url}`, true), head);
-                        }
-                    });
-                }
-            }
-        }
-        return new Proxy({}, {
-            get: function(_, propKey) {
-                switch(propKey){
-                    case "prepare":
-                        return async ()=>{
-                            shouldUseStandaloneMode = true;
-                            server[SYMBOL_SET_STANDALONE_MODE]();
-                            const isNodeDebugging = checkIsNodeDebugging();
-                            const routerWorker = await createRouterWorker(require.resolve("./lib/router-server"), isNodeDebugging);
-                            const initResult = await routerWorker.initialize({
-                                dir,
-                                port: options.port || 3000,
-                                hostname: options.hostname || "localhost",
-                                isNodeDebugging: !!isNodeDebugging,
-                                workerType: "router",
-                                dev: !!options.dev,
-                                minimalMode: options.minimalMode
-                            });
-                            serverPort = initResult.port;
-                        };
-                    case "getRequestHandler":
-                        {
-                            return ()=>{
-                                let handler;
-                                return async (req, res, parsedUrl)=>{
-                                    if (shouldUseStandaloneMode) {
-                                        var _ref;
-                                        setupWebSocketHandler(options.httpServer, req);
-                                        const proxyParsedUrl = url.parse(`http://127.0.0.1:${serverPort}${req.url}`, true);
-                                        if ((_ref = req == null ? void 0 : req.socket) == null ? void 0 : _ref.encrypted) {
-                                            req.headers["x-forwarded-proto"] = "https";
-                                        }
-                                        addRequestMeta(req, "__NEXT_INIT_QUERY", proxyParsedUrl.query);
-                                        await proxyRequest(req, res, proxyParsedUrl, undefined, req);
-                                        return;
-                                    }
-                                    handler = handler || server.getRequestHandler();
-                                    return handler(req, res, parsedUrl);
-                                };
-                            };
-                        }
-                    case "render":
-                        {
-                            return async (req, res, pathname, query, parsedUrl)=>{
-                                if (shouldUseStandaloneMode) {
-                                    var _ref;
-                                    setupWebSocketHandler(options.httpServer, req);
-                                    if (!pathname.startsWith("/")) {
-                                        console.error(`Cannot render page with path "${pathname}"`);
-                                        pathname = `/${pathname}`;
-                                    }
-                                    pathname = pathname === "/index" ? "/" : pathname;
-                                    req.url = formatUrl({
-                                        ...parsedUrl,
-                                        pathname,
-                                        query
-                                    });
-                                    if ((_ref = req == null ? void 0 : req.socket) == null ? void 0 : _ref.encrypted) {
-                                        req.headers["x-forwarded-proto"] = "https";
-                                    }
-                                    addRequestMeta(req, "__NEXT_INIT_QUERY", (parsedUrl == null ? void 0 : parsedUrl.query) || query || {});
-                                    await proxyRequest(req, res, url.parse(`http://127.0.0.1:${serverPort}${req.url}`, true), undefined, req);
-                                    return;
-                                }
-                                return server.render(req, res, pathname, query, parsedUrl);
-                            };
-                        }
-                    default:
-                        {
-                            const method = server[propKey];
-                            if (typeof method === "function") {
-                                return method.bind(server);
-                            }
-                        }
-                }
-            }
+        return new NextCustomServer({
+            ...options,
+            dir
         });
     }
+    // When the caller is Next.js internals (i.e. render worker, start server, etc)
     return new NextServer(options);
 }
 // Support commonjs `require('next')`

package/dist/esm/server/next.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/server/next.ts"],"names":["addRequestMeta","url","log","loadConfig","resolve","NON_STANDARD_NODE_ENV","PHASE_DEVELOPMENT_SERVER","PHASE_PRODUCTION_SERVER","getTracer","NextServerSpan","formatUrl","proxyRequest","ServerImpl","getServerImpl","undefined","Promise","require","default","SYMBOL_SET_STANDALONE_MODE","Symbol","SYMBOL_LOAD_CONFIG","NextServer","constructor","options","hostname","port","standaloneMode","getRequestHandler","req","res","parsedUrl","trace","requestHandler","getServerRequestHandler","getUpgradeHandler","socket","head","server","getServer","handleUpgrade","apply","setAssetPrefix","assetPrefix","preparedAssetPrefix","logError","args","render","renderToHTML","renderError","renderErrorToHTML","render404","prepare","serverFields","Object","assign","dev","close","createServer","ServerImplementation","preloadedConfig","dir","conf","_renderWorker","serverPromise","then","process","env","__NEXT_PRIVATE_STANDALONE_CONFIG","JSON","stringify","output","warn","Error","reqHandler","reqHandlerPromise","wrap","bind","typescript","createTSPlugin","NODE_ENV","includes","console","customServer","shouldUseStandaloneMode","createRouterWorker","checkIsNodeDebugging","didWebSocketSetup","serverPort","setupWebSocketHandler","_req","error","on","parse","Proxy","get","_","propKey","isNodeDebugging","routerWorker","initResult","initialize","workerType","minimalMode","handler","httpServer","proxyParsedUrl","encrypted","headers","query","pathname","startsWith","method","module","exports"],"mappings":"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"}
+{"version":3,"sources":["../../src/server/next.ts"],"names":["log","loadConfig","resolve","NON_STANDARD_NODE_ENV","PHASE_DEVELOPMENT_SERVER","PHASE_PRODUCTION_SERVER","getTracer","NextServerSpan","formatUrl","checkIsNodeDebugging","ServerImpl","getServerImpl","undefined","Promise","require","default","SYMBOL_LOAD_CONFIG","Symbol","NextServer","constructor","options","hostname","port","getRequestHandler","req","res","parsedUrl","trace","requestHandler","getServerRequestHandler","getUpgradeHandler","socket","head","server","getServer","handleUpgrade","apply","setAssetPrefix","assetPrefix","preparedAssetPrefix","logError","args","render","renderToHTML","renderError","renderErrorToHTML","render404","prepare","serverFields","standaloneMode","Object","assign","dev","close","createServer","ServerImplementation","preloadedConfig","dir","conf","_renderWorker","serverPromise","then","process","env","__NEXT_PRIVATE_STANDALONE_CONFIG","JSON","stringify","output","warn","Error","reqHandler","reqHandlerPromise","wrap","bind","NextCustomServer","getRequestHandlers","isNodeDebugging","initResult","isDev","minimalMode","upgradeHandler","setupWebSocketHandler","customServer","_req","didWebSocketSetup","on","httpServer","url","pathname","query","startsWith","console","error","typescript","createTSPlugin","NODE_ENV","includes","module","exports"],"mappings":"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"}

package/dist/esm/server/web-server.js

@@ -236,6 +236,11 @@ export default class NextWebServer extends BaseServer {
         if (!renderToHTML) {
             throw new Error("Invariant: routeModule should be configured when rendering pages");
         }
+        // For edge runtime if the pathname hit as /_not-found entrypoint,
+        // override the pathname to /404 for rendering
+        if (pathname === (renderOpts.dev ? "/not-found" : "/_not-found")) {
+            pathname = "/404";
+        }
         return renderToHTML(req, res, pathname, query, Object.assign(renderOpts, {
             disableOptimizedLoading: true,
             runtime: "experimental-edge"

package/dist/esm/server/web-server.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/server/web-server.ts"],"names":["byteLength","BaseServer","NoFallbackError","generateETag","addRequestMeta","WebResponseCache","isAPIRoute","getPathMatch","getRouteFromAssetPath","normalizeLocalePath","removeTrailingSlash","isDynamicRoute","interpolateDynamicPath","normalizeVercelUrl","getNamedRouteRegex","IncrementalCache","NextWebServer","constructor","options","Object","assign","renderOpts","webServerConfig","extendRenderOpts","handleCompression","getIncrementalCache","requestHeaders","dev","requestProtocol","appDir","hasAppDir","allowedRevalidateHeaderKeys","nextConfig","experimental","minimalMode","fetchCache","fetchCacheKeyPrefix","maxMemoryCacheSize","isrMemoryCacheSize","flushToDisk","CurCacheHandler","serverOptions","incrementalCacheHandler","getPrerenderManifest","getResponseCache","getCustomRoutes","headers","rewrites","fallback","afterFiles","beforeFiles","redirects","run","req","res","parsedUrl","hasPage","page","getPublicDir","getBuildId","buildId","loadEnvConfig","getHasAppDir","pagesType","getHasStaticDir","getFallback","getFontManifest","undefined","getPagesManifest","normalizedPage","getAppPathsManifest","getFilesystemPaths","Set","attachRequestMeta","query","prerenderManifest","version","routes","dynamicRoutes","notFoundRoutes","preview","previewModeId","getNextFontManifest","nextFontManifest","normalizeNextData","middleware","getMiddleware","params","pathname","path","render404","finished","shift","lastParam","length","endsWith","join","trailingSlash","substring","i18n","host","hostname","split","toLowerCase","localePathResult","locales","domainLocale","i18nProvider","detectDomainLocale","detectedLocale","__nextLocale","__nextDefaultLocale","defaultLocale","__nextDataReq","handleCatchallRenderRequest","Error","routeRegex","keys","routeKeys","analyze","bubbleNoFallback","_nextBubbleNoFallback","render","err","handleApiRequest","renderHTML","renderToHTML","disableOptimizedLoading","runtime","sendRenderResult","_req","setHeader","poweredByHeader","type","getHeader","result","contentType","isDynamic","writer","transformStream","writable","getWriter","innerClose","target","write","chunk","end","close","on","_event","cb","off","_cb","onClose","closed","then","pipe","payload","toUnchunkedString","String","generateEtags","body","send","runApi","findPageComponents","loadComponent","components"],"mappings":"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"}
+{"version":3,"sources":["../../src/server/web-server.ts"],"names":["byteLength","BaseServer","NoFallbackError","generateETag","addRequestMeta","WebResponseCache","isAPIRoute","getPathMatch","getRouteFromAssetPath","normalizeLocalePath","removeTrailingSlash","isDynamicRoute","interpolateDynamicPath","normalizeVercelUrl","getNamedRouteRegex","IncrementalCache","NextWebServer","constructor","options","Object","assign","renderOpts","webServerConfig","extendRenderOpts","handleCompression","getIncrementalCache","requestHeaders","dev","requestProtocol","appDir","hasAppDir","allowedRevalidateHeaderKeys","nextConfig","experimental","minimalMode","fetchCache","fetchCacheKeyPrefix","maxMemoryCacheSize","isrMemoryCacheSize","flushToDisk","CurCacheHandler","serverOptions","incrementalCacheHandler","getPrerenderManifest","getResponseCache","getCustomRoutes","headers","rewrites","fallback","afterFiles","beforeFiles","redirects","run","req","res","parsedUrl","hasPage","page","getPublicDir","getBuildId","buildId","loadEnvConfig","getHasAppDir","pagesType","getHasStaticDir","getFallback","getFontManifest","undefined","getPagesManifest","normalizedPage","getAppPathsManifest","getFilesystemPaths","Set","attachRequestMeta","query","prerenderManifest","version","routes","dynamicRoutes","notFoundRoutes","preview","previewModeId","getNextFontManifest","nextFontManifest","normalizeNextData","middleware","getMiddleware","params","pathname","path","render404","finished","shift","lastParam","length","endsWith","join","trailingSlash","substring","i18n","host","hostname","split","toLowerCase","localePathResult","locales","domainLocale","i18nProvider","detectDomainLocale","detectedLocale","__nextLocale","__nextDefaultLocale","defaultLocale","__nextDataReq","handleCatchallRenderRequest","Error","routeRegex","keys","routeKeys","analyze","bubbleNoFallback","_nextBubbleNoFallback","render","err","handleApiRequest","renderHTML","renderToHTML","disableOptimizedLoading","runtime","sendRenderResult","_req","setHeader","poweredByHeader","type","getHeader","result","contentType","isDynamic","writer","transformStream","writable","getWriter","innerClose","target","write","chunk","end","close","on","_event","cb","off","_cb","onClose","closed","then","pipe","payload","toUnchunkedString","String","generateEtags","body","send","runApi","findPageComponents","loadComponent","components"],"mappings":"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"}

package/dist/esm/shared/lib/router/utils/route-regex.js

@@ -72,24 +72,19 @@ function getParametrizedRoute(route) {
  * Builds a function to generate a minimal routeKey using only a-z and minimal
  * number of characters.
  */ function buildGetSafeRouteKey() {
-    let routeKeyCharCode = 97;
-    let routeKeyCharLength = 1;
+    let i = 0;
     return ()=>{
         let routeKey = "";
-        for(let i = 0; i < routeKeyCharLength; i++){
-            routeKey += String.fromCharCode(routeKeyCharCode);
-            routeKeyCharCode++;
-            if (routeKeyCharCode > 122) {
-                routeKeyCharLength++;
-                routeKeyCharCode = 97;
-            }
+        let j = ++i;
+        while(j > 0){
+            routeKey += String.fromCharCode(97 + (j - 1) % 26);
+            j = Math.floor((j - 1) / 26);
         }
         return routeKey;
     };
 }
 function getSafeKeyFromSegment(param) {
-    let { segment , routeKeys , keyPrefix  } = param;
-    const getSafeRouteKey = buildGetSafeRouteKey();
+    let { getSafeRouteKey , segment , routeKeys , keyPrefix  } = param;
     const { key , optional , repeat  } = parseParameter(segment);
     // replace any non-word characters since they can break
     // the named regex
@@ -118,6 +113,7 @@ function getSafeKeyFromSegment(param) {
 }
 function getNamedParametrizedRoute(route, prefixRouteKeys) {
     const segments = removeTrailingSlash(route).slice(1).split("/");
+    const getSafeRouteKey = buildGetSafeRouteKey();
     const routeKeys = {};
     return {
         namedParameterizedRoute: segments.map((segment)=>{
@@ -126,12 +122,14 @@ function getNamedParametrizedRoute(route, prefixRouteKeys) {
             ;
             if (hasInterceptionMarker && paramMatches) {
                 return getSafeKeyFromSegment({
+                    getSafeRouteKey,
                     segment: paramMatches[1],
                     routeKeys,
                     keyPrefix: prefixRouteKeys ? NEXT_INTERCEPTION_MARKER_PREFIX : undefined
                 });
             } else if (paramMatches) {
                 return getSafeKeyFromSegment({
+                    getSafeRouteKey,
                     segment: paramMatches[1],
                     routeKeys,
                     keyPrefix: prefixRouteKeys ? NEXT_QUERY_PARAM_PREFIX : undefined

package/dist/esm/shared/lib/router/utils/route-regex.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/shared/lib/router/utils/route-regex.ts"],"names":["INTERCEPTION_ROUTE_MARKERS","escapeStringRegexp","removeTrailingSlash","NEXT_QUERY_PARAM_PREFIX","NEXT_INTERCEPTION_MARKER_PREFIX","parseParameter","param","optional","startsWith","endsWith","slice","repeat","key","getParametrizedRoute","route","segments","split","groups","groupIndex","parameterizedRoute","map","segment","markerMatch","find","m","paramMatches","match","pos","join","getRouteRegex","normalizedRoute","re","RegExp","buildGetSafeRouteKey","routeKeyCharCode","routeKeyCharLength","routeKey","i","String","fromCharCode","getSafeKeyFromSegment","routeKeys","keyPrefix","getSafeRouteKey","cleanedKey","replace","invalidKey","length","isNaN","parseInt","getNamedParametrizedRoute","prefixRouteKeys","namedParameterizedRoute","hasInterceptionMarker","some","undefined","getNamedRouteRegex","prefixRouteKey","result","namedRegex","getNamedMiddlewareRegex","options","catchAll","catchAllRegex","catchAllGroupedRegex"],"mappings":"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"}
+{"version":3,"sources":["../../../../../src/shared/lib/router/utils/route-regex.ts"],"names":["INTERCEPTION_ROUTE_MARKERS","escapeStringRegexp","removeTrailingSlash","NEXT_QUERY_PARAM_PREFIX","NEXT_INTERCEPTION_MARKER_PREFIX","parseParameter","param","optional","startsWith","endsWith","slice","repeat","key","getParametrizedRoute","route","segments","split","groups","groupIndex","parameterizedRoute","map","segment","markerMatch","find","m","paramMatches","match","pos","join","getRouteRegex","normalizedRoute","re","RegExp","buildGetSafeRouteKey","i","routeKey","j","String","fromCharCode","Math","floor","getSafeKeyFromSegment","getSafeRouteKey","routeKeys","keyPrefix","cleanedKey","replace","invalidKey","length","isNaN","parseInt","getNamedParametrizedRoute","prefixRouteKeys","namedParameterizedRoute","hasInterceptionMarker","some","undefined","getNamedRouteRegex","prefixRouteKey","result","namedRegex","getNamedMiddlewareRegex","options","catchAll","catchAllRegex","catchAllGroupedRegex"],"mappings":"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"}

package/dist/server/base-server.d.ts

@@ -212,6 +212,7 @@ export default abstract class Server<ServerOptions extends Options = Options> {
     protected readonly localeNormalizer?: LocaleRouteNormalizer;
     protected readonly isRenderWorker?: boolean;
     constructor(options: ServerOptions);
+    protected reloadMatchers(): Promise<void>;
     protected normalizeNextData(_req: BaseNextRequest, _res: BaseNextResponse, _parsedUrl: NextUrlWithParsedQuery): Promise<{
         finished: boolean;
     }>;

package/dist/server/base-server.js

@@ -205,6 +205,9 @@ class Server {
             dev
         });
     }
+    reloadMatchers() {
+        return this.matchers.reload();
+    }
     async normalizeNextData(_req, _res, _parsedUrl) {
         return {
             finished: false
@@ -806,7 +809,8 @@ class Server {
     }
     async renderToResponseWithComponentsImpl({ req , res , pathname , renderOpts: opts  }, { components , query  }) {
         var _components_Component, _this_nextConfig_i18n, _this_nextConfig_i18n1;
-        const is404Page = pathname === "/404";
+        const is404Page = // For edge runtime 404 page, /_not-found needs to be treated as 404 page
+        process.env.NEXT_RUNTIME === "edge" && pathname === "/_not-found" || pathname === "/404";
         const is500Page = pathname === "/500";
         const isAppPath = components.isAppPath;
         const hasServerProps = !!components.getServerSideProps;
@@ -1142,7 +1146,7 @@ class Server {
                 renderOpts.nextFontManifest = this.nextFontManifest;
                 // Call the built-in render method on the module.
                 result = await module1.render(req.originalRequest ?? req, res.originalResponse ?? res, {
-                    page: pathname,
+                    page: is404Page ? "/404" : pathname,
                     params: opts.params,
                     query,
                     renderOpts