vike 0.4.256 → 0.4.257-commit-c6e29ea

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

@@ -31,21 +31,13 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
+        _reqDev?: import("http").IncomingMessage;
+        _reqWeb?: Request;
+    } & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
-                    [k: string]: {
-                        config: import("../../../types/index.js").ConfigResolved;
-                        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                    } & ({
-                        route: import("../../../types/Config.js").Route;
-                        isErrorPage?: undefined;
-                    } | {
-                        route?: undefined;
-                        isErrorPage: true;
-                    });
+                    [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
                 };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -53,18 +45,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
                 _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
             };
             pages: {
-                [k: string]: {
-                    config: import("../../../types/index.js").ConfigResolved;
-                    _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -126,24 +107,16 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            _reqDev?: import("http").IncomingMessage;
+            _reqWeb?: Request;
+        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
         pages: {
-            [k: string]: {
-                config: import("../../../types/index.js").ConfigResolved;
-                _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -194,21 +167,13 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
+        _reqDev?: import("http").IncomingMessage;
+        _reqWeb?: Request;
+    } & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
-                    [k: string]: {
-                        config: import("../../../types/index.js").ConfigResolved;
-                        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                    } & ({
-                        route: import("../../../types/Config.js").Route;
-                        isErrorPage?: undefined;
-                    } | {
-                        route?: undefined;
-                        isErrorPage: true;
-                    });
+                    [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
                 };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -216,18 +181,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
                 _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
             };
             pages: {
-                [k: string]: {
-                    config: import("../../../types/index.js").ConfigResolved;
-                    _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -289,24 +243,16 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            _reqDev?: import("http").IncomingMessage;
+            _reqWeb?: Request;
+        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
         pages: {
-            [k: string]: {
-                config: import("../../../types/index.js").ConfigResolved;
-                _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -365,21 +311,13 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
+        _reqDev?: import("http").IncomingMessage;
+        _reqWeb?: Request;
+    } & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
-                    [k: string]: {
-                        config: import("../../../types/index.js").ConfigResolved;
-                        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                    } & ({
-                        route: import("../../../types/Config.js").Route;
-                        isErrorPage?: undefined;
-                    } | {
-                        route?: undefined;
-                        isErrorPage: true;
-                    });
+                    [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
                 };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -387,18 +325,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
                 _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
             };
             pages: {
-                [k: string]: {
-                    config: import("../../../types/index.js").ConfigResolved;
-                    _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -460,24 +387,16 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            _reqDev?: import("http").IncomingMessage;
+            _reqWeb?: Request;
+        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
         pages: {
-            [k: string]: {
-                config: import("../../../types/index.js").ConfigResolved;
-                _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -528,21 +447,13 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
+        _reqDev?: import("http").IncomingMessage;
+        _reqWeb?: Request;
+    } & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
-                    [k: string]: {
-                        config: import("../../../types/index.js").ConfigResolved;
-                        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                    } & ({
-                        route: import("../../../types/Config.js").Route;
-                        isErrorPage?: undefined;
-                    } | {
-                        route?: undefined;
-                        isErrorPage: true;
-                    });
+                    [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
                 };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -550,18 +461,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
                 _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
             };
             pages: {
-                [k: string]: {
-                    config: import("../../../types/index.js").ConfigResolved;
-                    _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -623,24 +523,16 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            _reqDev?: import("http").IncomingMessage;
+            _reqWeb?: Request;
+        } & {
             headers?: Record<string, unknown>;
         };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
         pages: {
-            [k: string]: {
-                config: import("../../../types/index.js").ConfigResolved;
-                _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;

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

@@ -1,20 +1,21 @@
 export { renderPageServer };
 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 } from '../../types/PageContext.js';
+import type { PageContextInit, PageContextInitInternal } 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 PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
+declare function renderPageServer<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInitInternal>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
 } & Partial<PageContextServer & PageContextUserAdded>>;
-declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, requestId: number, asyncStore: AsyncStore): {
+declare function getPageContextBegin(pageContextInit: PageContextInitInternal, globalContext: GlobalContextServerInternal, requestId: number, asyncStore: AsyncStore): {
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -22,21 +23,13 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     isPrerendering: boolean;
     _requestId: number;
 } & PageContextInit & {
+    _reqDev?: import("http").IncomingMessage;
+    _reqWeb?: Request;
+} & {
     _globalContext: ({
         _globalConfigPublic: {
             pages: {
-                [k: string]: {
-                    config: import("../../types/index.js").ConfigResolved;
-                    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -44,18 +37,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
             _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         };
         pages: {
-            [k: string]: {
-                config: import("../../types/index.js").ConfigResolved;
-                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -117,24 +99,16 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: PageContextInit & {
+        _reqDev?: import("http").IncomingMessage;
+        _reqWeb?: Request;
+    } & {
         headers?: Record<string, unknown>;
     };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
     pages: {
-        [k: string]: {
-            config: import("../../types/index.js").ConfigResolved;
-            _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-            _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-            _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-        } & ({
-            route: import("../../types/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
     };
     config: import("../../types/index.js").ConfigResolved;
     _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;

package/dist/server/runtime/renderPageServer.js

@@ -17,7 +17,7 @@ import { updateType } from '../../utils/updateType.js';
 import { getPageContextAddendumAbort, isAbortError, logAbort, addNewPageContextAborted, } from '../../shared-server-client/route/abort.js';
 import { getGlobalContextServerInternal, initGlobalContext_renderPage, } from './globalContext.js';
 import { handlePageContextRequestUrl } from './renderPageServer/handlePageContextRequestUrl.js';
-import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageJson, createHttpResponseErrorFallback, createHttpResponseErrorFallback_noGlobalContext, createHttpResponseBaseIsMissing, } from './renderPageServer/createHttpResponse.js';
+import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageJson, createHttpResponseErrorFallback, createHttpResponseErrorFallback_noGlobalContext, createHttpResponseBaseIsMissing, createHttpResponseFromUniversalMiddleware, } from './renderPageServer/createHttpResponse.js';
 import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
 import { assertArguments } from './renderPageServer/assertArguments.js';
 import { log404 } from './renderPageServer/log404/index.js';
@@ -31,6 +31,8 @@ import { getVikeConfigError } from '../../shared-server-node/getVikeConfigError.
 import { forkPageContext } from '../../shared-server-client/forkPageContext.js';
 import { getAsyncLocalStorage } from './asyncHook.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,
 });
@@ -48,14 +50,14 @@ async function renderPageServer(pageContextInit) {
     logHttpRequest(urlOriginalPretty, pageContextInit, requestId);
     const asyncLocalStorage = await getAsyncLocalStorage();
     const asyncStore = !asyncLocalStorage ? null : { requestId };
-    const render = async () => await renderPageServerEntryOnce(pageContextInit, requestId, asyncStore);
+    const render = async () => await renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncStore);
     const pageContextFinish = !asyncLocalStorage ? await render() : await asyncLocalStorage.run(asyncStore, render);
     logHttpResponse(urlOriginalPretty, pageContextFinish);
     checkType(pageContextFinish);
     assertPageContextFinish(pageContextFinish);
     return pageContextFinish;
 }
-async function renderPageServerEntryOnce(pageContextInit, requestId, asyncStore) {
+async function renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncStore) {
     // Invalid config
     {
         const vikeConfigError = getVikeConfigError();
@@ -91,6 +93,16 @@ async function renderPageServerEntryOnce(pageContextInit, requestId, asyncStore)
     }
     const { globalContext } = await getGlobalContextServerInternal();
     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);
@@ -227,6 +239,42 @@ 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._reqDev
+            ? requestAdapter(pageContext._reqDev)
+            : 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.d.ts

@@ -1,3 +1,10 @@
-export default universalVikeHandler;
+import { type RuntimeAdapterTarget } from '@universal-middleware/core';
 import '../assertEnvServer.js';
-declare function universalVikeHandler(request: Request, context: Record<string, unknown>, runtime: Record<string, unknown>): Promise<Response>;
+declare function universalVikeHandler<T extends string>(request: Request, context: Universal.Context, runtime: RuntimeAdapterTarget<T>): Promise<Response>;
+declare const universalVikeHandlerEnhanced: typeof universalVikeHandler & import("@universal-middleware/core").WithUniversalSymbols<{
+    name: string;
+    method: ("GET" | "HEAD" | "POST" | "PUT" | "OPTIONS" | "PATCH")[];
+    path: string;
+    immutable: true;
+}>;
+export default universalVikeHandlerEnhanced;

package/dist/server/runtime/universal-middleware.js

@@ -1,4 +1,4 @@
-export default universalVikeHandler;
+import { enhance } from '@universal-middleware/core';
 import { renderPageServer } from './renderPageServer.js';
 import '../assertEnvServer.js';
 async function universalVikeHandler(request, context, runtime) {
@@ -8,6 +8,7 @@ async function universalVikeHandler(request, context, runtime) {
         runtime,
         urlOriginal: request.url,
         headersOriginal: request.headers,
+        _reqWeb: request,
     };
     const pageContext = await renderPageServer(pageContextInit);
     const response = pageContext.httpResponse;
@@ -17,3 +18,10 @@ async function universalVikeHandler(request, context, runtime) {
         headers: response.headers,
     });
 }
+const universalVikeHandlerEnhanced = enhance(universalVikeHandler, {
+    name: 'vike',
+    method: ['GET', 'POST', 'PUT', 'PATCH', 'HEAD', 'OPTIONS'],
+    path: '/**',
+    immutable: true,
+});
+export default universalVikeHandlerEnhanced;

package/dist/shared-server-client/createGlobalContextShared.d.ts

@@ -17,18 +17,7 @@ declare function createGlobalContextShared<GlobalContextAdded extends {}, Global
 }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     _globalConfigPublic: {
         pages: {
-            [k: string]: {
-                config: import("../types/index.js").ConfigResolved;
-                _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("./page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../types/index.js").ConfigResolved;
         _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
@@ -36,18 +25,7 @@ declare function createGlobalContextShared<GlobalContextAdded extends {}, Global
         _from: import("./page-configs/resolveVikeConfigPublic.js").From;
     };
     pages: {
-        [k: string]: {
-            config: import("../types/index.js").ConfigResolved;
-            _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
-            _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
-            _from: import("./page-configs/resolveVikeConfigPublic.js").From;
-        } & ({
-            route: import("../types/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
     };
     config: import("../types/index.js").ConfigResolved;
     _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
@@ -71,18 +49,7 @@ type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
 declare function createGlobalContextBase(virtualFileExportsGlobalEntry: unknown): {
     _globalConfigPublic: {
         pages: {
-            [k: string]: {
-                config: import("../types/index.js").ConfigResolved;
-                _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("./page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../types/index.js").ConfigResolved;
         _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
@@ -90,18 +57,7 @@ declare function createGlobalContextBase(virtualFileExportsGlobalEntry: unknown)
         _from: import("./page-configs/resolveVikeConfigPublic.js").From;
     };
     pages: {
-        [k: string]: {
-            config: import("../types/index.js").ConfigResolved;
-            _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
-            _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
-            _from: import("./page-configs/resolveVikeConfigPublic.js").From;
-        } & ({
-            route: import("../types/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
     };
     config: import("../types/index.js").ConfigResolved;
     _source: import("./page-configs/resolveVikeConfigPublic.js").Source;

package/dist/shared-server-client/page-configs/assertPlusFileExport.js

@@ -8,7 +8,9 @@ const SIDE_EXPORTS_TOLERATE = [
     '_rerender_only',
 ];
 // Tolerate `export { frontmatter }` in .mdx files
+// Tolerate any exports from `+server.ts` for Cloudflare Durable Object
 const SIDE_EXPORTS_DO_NOT_CHECK = ['.md', '.mdx'];
+const SIDE_EXPORTS_DO_NOT_CHECK_CONFIG = ['server'];
 function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
     const exportNames = Object.keys(fileExports);
     const isValid = (exportName) => exportName === 'default' || exportName === configName;
@@ -24,10 +26,12 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
     }
     assert(exportNamesValid.length === 1);
     // Warn upon side exports
-    const exportNamesInvalid = exportNames
-        .filter((e) => !isValid(e))
-        .filter((exportName) => !SIDE_EXPORTS_TOLERATE.includes(exportName));
-    if (!SIDE_EXPORTS_DO_NOT_CHECK.some((ext) => filePathToShowToUser.endsWith(ext))) {
+    const skip = SIDE_EXPORTS_DO_NOT_CHECK_CONFIG.includes(configName) ||
+        SIDE_EXPORTS_DO_NOT_CHECK.some((ext) => filePathToShowToUser.endsWith(ext));
+    if (!skip) {
+        const exportNamesInvalid = exportNames
+            .filter((e) => !isValid(e))
+            .filter((exportName) => !SIDE_EXPORTS_TOLERATE.includes(exportName));
         exportNamesInvalid.forEach((exportInvalid) => {
             assertWarning(false, `${filePathToShowToUser} unexpected ${pc.cyan(`export { ${exportInvalid} }`)}, see https://vike.dev/no-side-exports`, {
                 onlyOnce: true,

package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.d.ts

@@ -2,6 +2,7 @@ export { resolveGlobalConfigPublic };
 export { resolvePageContextConfig };
 export { resolveGlobalContextConfig };
 export type { PageContextConfig };
+export type { PageConfigPublicWithRoute };
 export type { GlobalConfigPublic };
 export type { Source };
 export type { Sources };