vike 0.4.267-commit-feffb0f → 0.4.267-commit-83049a4

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts

@@ -31,12 +31,6 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         _globalContext: ({
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -73,6 +67,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isPrerendering: false;
             assetsManifest: null;
             _viteDevServer: import("vite").ViteDevServer | undefined;
+            devMiddleware: import("vite").Connect.Server | null;
             viteConfig: import("vite").ResolvedConfig | undefined;
         } | {
             isClientSide: false;
@@ -81,6 +76,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -91,12 +87,11 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: false;
             viteConfig: null;
         }) & {
-            baseServer: string;
-            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -107,6 +102,9 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
                     inject: boolean | undefined;
                 };
             };
+            baseServer: string;
+            baseAssets: string;
+            middlewares: import("../universal-middleware/core.js").Middleware[];
         })) & {
             prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
         };
@@ -114,12 +112,6 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _nodeDev?: {
-                req: import("http").IncomingMessage;
-                res: import("http").ServerResponse;
-            };
-            _reqWeb?: Request;
-        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
@@ -178,12 +170,6 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         _globalContext: ({
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -220,6 +206,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isPrerendering: false;
             assetsManifest: null;
             _viteDevServer: import("vite").ViteDevServer | undefined;
+            devMiddleware: import("vite").Connect.Server | null;
             viteConfig: import("vite").ResolvedConfig | undefined;
         } | {
             isClientSide: false;
@@ -228,6 +215,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -238,12 +226,11 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: false;
             viteConfig: null;
         }) & {
-            baseServer: string;
-            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -254,6 +241,9 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
                     inject: boolean | undefined;
                 };
             };
+            baseServer: string;
+            baseAssets: string;
+            middlewares: import("../universal-middleware/core.js").Middleware[];
         })) & {
             prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
         };
@@ -261,12 +251,6 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _nodeDev?: {
-                req: import("http").IncomingMessage;
-                res: import("http").ServerResponse;
-            };
-            _reqWeb?: Request;
-        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
@@ -325,12 +309,6 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         _globalContext: ({
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -367,6 +345,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isPrerendering: false;
             assetsManifest: null;
             _viteDevServer: import("vite").ViteDevServer | undefined;
+            devMiddleware: import("vite").Connect.Server | null;
             viteConfig: import("vite").ResolvedConfig | undefined;
         } | {
             isClientSide: false;
@@ -375,6 +354,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -385,12 +365,11 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: false;
             viteConfig: null;
         }) & {
-            baseServer: string;
-            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -401,6 +380,9 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
                     inject: boolean | undefined;
                 };
             };
+            baseServer: string;
+            baseAssets: string;
+            middlewares: import("../universal-middleware/core.js").Middleware[];
         })) & {
             prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
         };
@@ -408,12 +390,6 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _nodeDev?: {
-                req: import("http").IncomingMessage;
-                res: import("http").ServerResponse;
-            };
-            _reqWeb?: Request;
-        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
@@ -480,12 +456,6 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         _globalContext: ({
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -522,6 +492,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isPrerendering: false;
             assetsManifest: null;
             _viteDevServer: import("vite").ViteDevServer | undefined;
+            devMiddleware: import("vite").Connect.Server | null;
             viteConfig: import("vite").ResolvedConfig | undefined;
         } | {
             isClientSide: false;
@@ -530,6 +501,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -540,12 +512,11 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: false;
             viteConfig: null;
         }) & {
-            baseServer: string;
-            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -556,6 +527,9 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
                     inject: boolean | undefined;
                 };
             };
+            baseServer: string;
+            baseAssets: string;
+            middlewares: import("../universal-middleware/core.js").Middleware[];
         })) & {
             prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
         };
@@ -563,12 +537,6 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _nodeDev?: {
-                req: import("http").IncomingMessage;
-                res: import("http").ServerResponse;
-            };
-            _reqWeb?: Request;
-        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
@@ -627,12 +595,6 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         _globalContext: ({
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -669,6 +631,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isPrerendering: false;
             assetsManifest: null;
             _viteDevServer: import("vite").ViteDevServer | undefined;
+            devMiddleware: import("vite").Connect.Server | null;
             viteConfig: import("vite").ResolvedConfig | undefined;
         } | {
             isClientSide: false;
@@ -677,6 +640,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -687,12 +651,11 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: false;
             viteConfig: null;
         }) & {
-            baseServer: string;
-            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -703,6 +666,9 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
                     inject: boolean | undefined;
                 };
             };
+            baseServer: string;
+            baseAssets: string;
+            middlewares: import("../universal-middleware/core.js").Middleware[];
         })) & {
             prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
         };
@@ -710,12 +676,6 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _nodeDev?: {
-                req: import("http").IncomingMessage;
-                res: import("http").ServerResponse;
-            };
-            _reqWeb?: Request;
-        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
@@ -774,12 +734,6 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         _globalContext: ({
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -816,6 +770,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isPrerendering: false;
             assetsManifest: null;
             _viteDevServer: import("vite").ViteDevServer | undefined;
+            devMiddleware: import("vite").Connect.Server | null;
             viteConfig: import("vite").ResolvedConfig | undefined;
         } | {
             isClientSide: false;
@@ -824,6 +779,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -834,12 +790,11 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            devMiddleware: null;
             _usesClientRouter: boolean;
             _isPrerendering: false;
             viteConfig: null;
         }) & {
-            baseServer: string;
-            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -850,6 +805,9 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
                     inject: boolean | undefined;
                 };
             };
+            baseServer: string;
+            baseAssets: string;
+            middlewares: import("../universal-middleware/core.js").Middleware[];
         })) & {
             prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
         };
@@ -857,12 +815,6 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _nodeDev?: {
-                req: import("http").IncomingMessage;
-                res: import("http").ServerResponse;
-            };
-            _reqWeb?: Request;
-        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;

package/dist/server/runtime/renderPageServer.d.ts

@@ -1,21 +1,72 @@
 export { renderPageServer };
+export { renderPageServer_userLand };
 export { getRequestTag };
 export type { PageContextInit };
-export type { PageContextInitInternal };
 export type { PageContextBegin };
 export type { RequestTag };
 import { type PageContextAborted } from '../../shared-server-client/route/abort.js';
 import { type GlobalContextServerInternal } from './globalContext.js';
 import { type HttpResponse } from './renderPageServer/createHttpResponse.js';
 import type { PageContextServer } from '../../types/index.js';
-import type { PageContextInit, PageContextInitInternal } from '../../types/PageContext.js';
+import type { PageContextInit, PageContextInternalServer } from '../../types/PageContext.js';
 import { type AsyncStore } from './asyncHook.js';
 import '../assertEnvServer.js';
 type PageContextBegin = ReturnType<typeof getPageContextBegin>;
-declare function renderPageServer<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInitInternal>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
+declare function renderPageServer_userLand<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
+    httpResponse: HttpResponse;
+} & Partial<import("../../shared-server-client/getPageFiles.js").PageContextConfig & {
+    isPageContext: true;
+    Page: import("../../types/Config.js").Config['Page'];
+    routeParams: Record<string, string>;
+    data: unknown;
+    headersResponse: Headers;
+    is404: boolean | null;
+    isClientSideNavigation: boolean;
+    abortReason?: unknown;
+    abortStatusCode?: import("../../shared-server-client/route/abort.js").AbortStatusCode;
+    errorWhileRendering?: unknown;
+    pageId: string | null;
+    from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+    source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+    sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+    pageExports: Record<string, unknown>;
+    isBaseMissing?: true;
+} & PageContextInit & {
+    urlOriginal: string;
+} & {
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
+    urlParsed: Omit<import("../../utils/parseUrl.js").UrlPublic, "hash" | "hashOriginal" | "hashString"> & {
+        hash: '';
+        hashString: null;
+        hashOriginal: null;
+    };
+} & {
+    headers: Record<string, string> | null;
+    isClientSide: false;
+    isPrerendering: boolean;
+    globalContext: import("../../types/GlobalContext.js").GlobalContextServer;
+    cspNonce: string | null;
+    pageContextsAborted: Partial<PageContextServer<unknown>>[];
+    environments?: Record<string, {
+        config: import("../../shared-server-client/getPageFiles.js").PageContextConfig['config'];
+        pageContext: PageContextServer<unknown>;
+    }> | undefined;
+    isHydration?: undefined;
+    isBackwardNavigation?: undefined;
+    isHistoryNavigation?: undefined;
+    previousPageContext?: undefined;
+} & {
+    dangerouslyUseInternals: import("../../shared-server-client/getPublicProxy.js").DangerouslyUseInternals<PageContextInternalServer & import("./renderPageServer/renderPageServerAfterRoute.js").PageContextAfterRender & import("./renderPageServer/getPageContextPublicServer.js").PageContextPublicServer>;
+} & Vike.PageContext & Vike.PageContextServer & {
+    content?: string | Uint8Array | ReadableStream<Uint8Array>;
+} & PageContextUserAdded>>;
+declare function renderPageServer<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser, isCalledDirectlyByUser: boolean): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
 } & Partial<PageContextServer & PageContextUserAdded>>;
-declare function getPageContextBegin(pageContextInit: PageContextInitInternal, globalContext: GlobalContextServerInternal, requestId: number, asyncStore: AsyncStore): {
+declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, requestId: number, asyncStore: AsyncStore): {
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -23,12 +74,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
     isPrerendering: boolean;
     _requestId: number;
 } & PageContextInit & {
-    _nodeDev?: {
-        req: import("http").IncomingMessage;
-        res: import("http").ServerResponse;
-    };
-    _reqWeb?: Request;
-} & {
     _globalContext: ({
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -65,6 +110,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
+        devMiddleware: import("vite").Connect.Server | null;
         viteConfig: import("vite").ResolvedConfig | undefined;
     } | {
         isClientSide: false;
@@ -73,6 +119,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -83,12 +130,11 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: false;
         viteConfig: null;
     }) & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -99,6 +145,9 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        middlewares: import("./universal-middleware/core.js").Middleware[];
     })) & {
         prerenderContext: import("../../types/index.js").PrerenderContext | undefined;
     };
@@ -106,12 +155,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         headers?: Record<string, unknown>;
     };
     _urlHandler: ((url: string) => string) | null;

package/dist/server/runtime/renderPageServer.js

@@ -1,4 +1,5 @@
 export { renderPageServer };
+export { renderPageServer_userLand };
 export { getRequestTag };
 import { renderPageServerAfterRoute } from './renderPageServer/renderPageServerAfterRoute.js';
 import { createPageContextServer, createPageContextServerWithoutGlobalContext, } from './renderPageServer/createPageContextServer.js';
@@ -18,7 +19,7 @@ import { getPageContextAddendumAbort, isAbortError, logAbort, addNewPageContextA
 import { getGlobalContextServerInternal, initGlobalContext_renderPage, } from './globalContext.js';
 import { handlePageContextRequestUrl } from './renderPageServer/handlePageContextRequestUrl.js';
 import { getPageContextPublicServer } from './renderPageServer/getPageContextPublicServer.js';
-import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageJson, createHttpResponseErrorFallback, createHttpResponseErrorFallback_noGlobalContext, createHttpResponseBaseIsMissing, createHttpResponseFromUniversalMiddleware, } from './renderPageServer/createHttpResponse.js';
+import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageJson, createHttpResponseErrorFallback, createHttpResponseErrorFallback_noGlobalContext, createHttpResponseBaseIsMissing, } from './renderPageServer/createHttpResponse.js';
 import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
 import { assertArguments } from './renderPageServer/assertArguments.js';
 import { log404 } from './renderPageServer/log404/index.js';
@@ -32,15 +33,18 @@ import { getVikeConfigError } from '../../shared-server-node/getVikeConfigError.
 import { forkPageContext } from '../../shared-server-client/forkPageContext.js';
 import { getAsyncLocalStorage } from './asyncHook.js';
 import { getPageContextJson } from './renderPageServer/getPageContextJson.js';
+import { hasPlusMiddlewares } from './universal-middleware/core.js';
 import '../assertEnvServer.js';
-import { enhance, apply, universalSymbol, UniversalRouter, getAdapterRuntime, } from '@universal-middleware/core';
-import { createRequestAdapter } from '@universal-middleware/node/request';
 const globalObject = getGlobalObject('runtime/renderPageServer.ts', {
     httpRequestsCount: 0,
 });
-// `renderPageServer()` calls `renderPageServerNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
-async function renderPageServer(pageContextInit) {
+// The user's renderPage()
+function renderPageServer_userLand(pageContextInit) {
     assertArguments(...arguments);
+    return renderPageServer(pageContextInit, true);
+}
+// `renderPageServer()` calls `renderPageServerNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
+async function renderPageServer(pageContextInit, isCalledDirectlyByUser) {
     assert(hasProp(pageContextInit, 'urlOriginal', 'string')); // assertUsage() already implemented at assertArguments()
     assertIsUrl(pageContextInit.urlOriginal);
     onSetupRuntime();
@@ -52,7 +56,7 @@ async function renderPageServer(pageContextInit) {
     logHttpRequest(urlOriginalPretty, pageContextInit, requestId);
     const asyncLocalStorage = await getAsyncLocalStorage();
     const asyncStore = !asyncLocalStorage ? null : { requestId };
-    const render = async () => await renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncStore);
+    const render = async () => await renderPageServerEntryOnce(pageContextInit, isCalledDirectlyByUser, requestId, asyncStore);
     const pageContextFinish = !asyncLocalStorage ? await render() : await asyncLocalStorage.run(asyncStore, render);
     logHttpResponse(urlOriginalPretty, pageContextFinish);
     checkType(pageContextFinish);
@@ -64,7 +68,7 @@ function getPageContextReturn(pageContextFinish) {
         return pageContextFinish;
     return getPageContextPublicServer(pageContextFinish);
 }
-async function renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncStore) {
+async function renderPageServerEntryOnce(pageContextInit, isCalledDirectlyByUser, requestId, asyncStore) {
     // Invalid config
     {
         const vikeConfigError = getVikeConfigError();
@@ -99,17 +103,8 @@ async function renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncS
         }
     }
     const { globalContext } = await getGlobalContextServerInternal();
+    assertUsage(!isCalledDirectlyByUser || !hasPlusMiddlewares(globalContext), `renderPage() doesn't run +middleware — see ${pc.underline('https://vike.dev/error/setup-middlewares')}`);
     const pageContextBegin = getPageContextBegin(pageContextInit, globalContext, requestId, asyncStore);
-    const middlewares = (globalContext.config.middleware ?? []).flat();
-    const renderPageServerEntry = () => renderPageServerEntryOnce(pageContextBegin, globalContext, requestId);
-    if (middlewares.length === 0) {
-        return renderPageServerEntry();
-    }
-    else {
-        return renderPageServerEntryWithMiddlewares(pageContextBegin, renderPageServerEntry, middlewares);
-    }
-}
-async function renderPageServerEntryOnce(pageContextBegin, globalContext, requestId) {
     // Check Base URL
     {
         const pageContextHttpResponse = await checkBaseUrl(pageContextBegin, globalContext);
@@ -249,42 +244,6 @@ async function renderPageServerEntryRecursive_onError(err, pageContextBegin, pag
     }
     return pageContextErrorPage;
 }
-const requestAdapter = createRequestAdapter();
-async function renderPageServerEntryWithMiddlewares(pageContext, renderPageServerEntry, middlewares) {
-    const router = new UniversalRouter(true, false);
-    let httpResponseVikeCore = undefined;
-    // Wrap rendering into universal-middleware routing
-    apply(router, [
-        enhance(async function adaptRenderPageServerEntryOnceInternal() {
-            const pageContextHttpResponse = await renderPageServerEntry();
-            const { httpResponse } = pageContextHttpResponse;
-            pageContext = pageContextHttpResponse;
-            httpResponseVikeCore = httpResponse;
-            const readable = httpResponse.getReadableWebStream();
-            return new Response(readable, {
-                status: httpResponse.statusCode,
-                headers: httpResponse.headers,
-            });
-        }, {
-            name: 'vike',
-            method: ['GET', 'POST', 'PUT', 'PATCH', 'HEAD', 'OPTIONS'],
-            path: '/**', // rou3 format
-            immutable: true, // avoids cloning the function we just created
-        }),
-        ...middlewares,
-    ]);
-    const handler = router[universalSymbol];
-    const request = pageContext._reqWeb ??
-        (pageContext._nodeDev
-            ? requestAdapter(pageContext._nodeDev.req, pageContext._nodeDev.res)
-            : new Request(new URL(pageContext.urlOriginal, 'http://localhost').toString(), {
-                headers: pageContext.headers ?? {},
-            }));
-    const res = await handler(request, {}, getAdapterRuntime('other', { params: undefined }));
-    const httpResponse = createHttpResponseFromUniversalMiddleware(res, httpResponseVikeCore?.earlyHints);
-    objectAssign(pageContext, { httpResponse });
-    return pageContext;
-}
 function logHttpRequest(urlOriginal, pageContextInit, requestId) {
     const pageContext = createPageContextServerWithoutGlobalContext(pageContextInit, requestId);
     logRuntimeInfo?.(getRequestInfoMessage(urlOriginal), pageContext, 'info');

package/dist/server/runtime/universal-middleware/core.d.ts

@@ -0,0 +1,25 @@
+export { getMiddlewares_globalContext };
+export { getMiddlewares_withErrorHandling };
+export { hasPlusMiddlewares };
+export { routeCatchAll };
+export { mergeContext };
+export type { Middleware };
+import { type EnhancedMiddleware, type UniversalMiddleware } from '@universal-middleware/core';
+import type { ConfigResolved } from '../../../types/Config/ConfigResolved.js';
+import '../../assertEnvServer.js';
+type Middleware = EnhancedMiddleware & {
+    isHandler: boolean;
+};
+declare const routeCatchAll: {
+    readonly name: 'vike';
+    readonly method: ["GET", "POST", "PUT", "PATCH", "HEAD", "OPTIONS"];
+    readonly path: '/**';
+};
+declare function getMiddlewares_globalContext(globalContext: {
+    config: ConfigResolved;
+}, baseServer: string): Middleware[];
+declare function getMiddlewares_withErrorHandling(): Promise<Middleware[]>;
+declare function hasPlusMiddlewares(globalContext: {
+    config: ConfigResolved;
+}): boolean;
+declare function mergeContext(middleware: EnhancedMiddleware): UniversalMiddleware;