vike 0.4.255 → 0.4.256-commit-414bdc0

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

@@ -34,18 +34,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     globalContext: (Record<string, unknown> & {
         _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 +42,7 @@ declare function getGlobalContextServerInternal(): Promise<{
             _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;
@@ -104,18 +82,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         _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;
@@ -123,18 +90,7 @@ declare function getGlobalContextServerInternal(): Promise<{
             _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;
@@ -175,18 +131,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         _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;
@@ -194,18 +139,7 @@ declare function getGlobalContextServerInternal(): Promise<{
             _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;
@@ -248,18 +182,7 @@ declare function getGlobalContextServerInternal(): Promise<{
 declare function getGlobalContextServerInternalOptional(): (Record<string, unknown> & (({
     _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;
@@ -267,18 +190,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
         _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;
@@ -377,18 +289,7 @@ declare function updateUserFiles(): Promise<{
 declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
     _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;
@@ -396,18 +297,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
         _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;

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

@@ -6,22 +6,23 @@ export { createHttpResponseErrorFallbackJson };
 export { createHttpResponseRedirect };
 export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
+export { createHttpResponseFromUniversalMiddleware };
 export type { HttpResponse };
 import type { GetPageAssets } from './getPageAssets.js';
 import type { HtmlRender } from './html/renderHtml.js';
 import type { RenderHook } from './execHookOnRenderHtml.js';
-import type { RedirectStatusCode, AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
+import type { AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
 import { HttpResponseBody } from './getHttpResponseBody.js';
 import { type EarlyHint } from './getEarlyHints.js';
 import type { PageContextBegin } from '../renderPageServer.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
 import '../../assertEnvServer.js';
 type HttpResponse = {
-    statusCode: 200 | 404 | 500 | RedirectStatusCode | AbortStatusCode;
+    statusCode: number;
     headers: [string, string][];
     earlyHints: EarlyHint[];
     /** **Deprecated**: use `headers` instead, see https://vike.dev/migration/0.4.134 */
-    contentType: 'application/json' | 'text/html;charset=utf-8';
+    contentType: string | undefined;
 } & HttpResponseBody;
 declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: {
     pageId: null | string;
@@ -41,3 +42,4 @@ declare function createHttpResponseErrorFallback_noGlobalContext(): HttpResponse
 declare function createHttpResponseErrorFallbackJson(): HttpResponse;
 declare function createHttpResponsePageJson(pageContextSerialized: string): Promise<HttpResponse>;
 declare function createHttpResponseRedirect({ url, statusCode }: UrlRedirect, pageContextInit: PageContextBegin): HttpResponse;
+declare function createHttpResponseFromUniversalMiddleware(response: Response, earlyHints?: EarlyHint[]): HttpResponse;

package/dist/server/runtime/renderPageServer/createHttpResponse.js

@@ -6,6 +6,7 @@ export { createHttpResponseErrorFallbackJson };
 export { createHttpResponseRedirect };
 export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
+export { createHttpResponseFromUniversalMiddleware };
 import { escapeHtml } from '../../../utils/escapeHtml.js';
 import { assert, assertWarning } from '../../../utils/assert.js';
 import { getErrorPageId, isErrorPage } from '../../../shared-server-client/error-page.js';
@@ -102,9 +103,20 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
     // For users: showing a blank page is probably better than a flickering text.
     `<p style="display: none">Redirecting to ${escapeHtml(url)}</p><script>console.log('This HTML was generated by Vike.')</script>`);
 }
-function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
+function createHttpResponseFromUniversalMiddleware(response, earlyHints) {
+    // @brillout TODO/after-PR-merge: dedupe such HTML responses generated by Vike
+    const body = response.body ??
+        `<p style="display: none">No HTTP response body.</p><script>console.log('This HTML was generated by Vike.')</script>`;
+    const httpResponse = createHttpResponseCommon(response.status, Array.from(response.headers.entries()), body, earlyHints);
+    return httpResponse;
+}
+function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints, renderHook) {
     headers.push(['Content-Type', contentType]);
     assert(renderHook || typeof htmlRender === 'string');
+    return createHttpResponseCommon(statusCode, headers, htmlRender, earlyHints, renderHook);
+}
+function createHttpResponseCommon(statusCode, headers, htmlRender, earlyHints = [], renderHook = null) {
+    const contentType = headers.find(([k]) => k.toLowerCase() === 'content-type')?.[1];
     return {
         statusCode,
         headers,

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

@@ -3,10 +3,10 @@ export { createPageContextServerWithoutGlobalContext };
 export type { PageContextCreatedServer };
 export type { PageContextCreatedServerWithoutGlobalContext };
 import type { GlobalContextServerInternal } from '../globalContext.js';
-import type { PageContextInit } from '../renderPageServer.js';
+import type { PageContextInit, PageContextInternalInit } from '../renderPageServer.js';
 import '../../assertEnvServer.js';
 type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServer>>;
-declare function createPageContextServer(pageContextInit: PageContextInit & {
+declare function createPageContextServer(pageContextInit: PageContextInternalInit & {
     headers?: Record<string, unknown>;
 }, globalContext: GlobalContextServerInternal, args: {
     requestId: number;
@@ -24,21 +24,13 @@ declare function createPageContextServer(pageContextInit: PageContextInit & {
     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;
@@ -46,18 +38,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit & {
             _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;
@@ -119,24 +100,16 @@ declare function createPageContextServer(pageContextInit: PageContextInit & {
     _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;
@@ -158,4 +131,7 @@ declare function createPageContextServerWithoutGlobalContext(pageContextInit: Pa
     isClientSide: false;
     isPrerendering: boolean;
     _requestId: number;
-} & PageContextInit;
+} & PageContextInit & {
+    _reqDev?: import("http").IncomingMessage;
+    _reqWeb?: Request;
+};

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

@@ -23,21 +23,13 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     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;
@@ -45,18 +37,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
             _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;
@@ -118,24 +99,16 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _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;