npm - vike - Versions diffs - 0.4.253 → 0.4.255-commit-05a7b95 - Mend

vike 0.4.253 → 0.4.255-commit-05a7b95

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (406) hide show

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

@@ -1,4 +1,3 @@
-import '../../assertEnvServer.js';
 export { renderPageServerAfterRoute };
 export { prerenderPage };
 export { prerenderPageEntry };
@@ -8,6 +7,7 @@ import { HttpResponse } from './createHttpResponse.js';
 import { type PageContext_loadPageConfigsLazyServerSide, type PageConfigsLazy } from './loadPageConfigsLazyServerSide.js';
 import type { PageContextCreatedServer } from './createPageContextServer.js';
 import type { PageContextBegin } from '../renderPageServer.js';
+import '../../assertEnvServer.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
     errorWhileRendering: null | Error;
@@ -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;
@@ -125,23 +106,17 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _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;
@@ -192,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;
@@ -214,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;
@@ -286,23 +242,17 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _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;
@@ -361,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;
@@ -383,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;
@@ -455,23 +386,17 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _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;
@@ -522,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;
@@ -544,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;
@@ -616,23 +522,17 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _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/renderPageServerAfterRoute.js CHANGED Viewed

@@ -1,4 +1,3 @@
-import '../../assertEnvServer.js';
 export { renderPageServerAfterRoute };
 export { prerenderPage };
 export { prerenderPageEntry };
@@ -20,6 +19,7 @@ import { execHookGuard } from '../../../shared-server-client/route/execHookGuard
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared-server-client/misc/isServerSideError.js';
 import { getAsyncLocalStorage } from '../asyncHook.js';
+import '../../assertEnvServer.js';
 async function renderPageServerAfterRoute(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the

package/dist/server/runtime/renderPageServer/resolveRedirects.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
-import '../../assertEnvServer.js';
 export { resolveRedirects };
 export { getStaticRedirectsForPrerender };
 export { resolveRouteStringRedirect };
+import '../../assertEnvServer.js';
 declare function resolveRedirects(redirectsAll: Record<string, string>[], urlPathname: string): null | string;
 declare function getStaticRedirectsForPrerender(redirectsAll: Record<string, string>[], showWarningUponDynamicRedirects: boolean): Record<string, string>;
 declare function resolveRouteStringRedirect(urlSource: string, urlTarget: string, urlPathname: string): null | string;

package/dist/server/runtime/renderPageServer/resolveRedirects.js CHANGED Viewed

@@ -1,15 +1,13 @@
-import '../../assertEnvServer.js';
 export { resolveRedirects };
 export { getStaticRedirectsForPrerender };
 // For ./resolveRedirects.spec.ts
 export { resolveRouteStringRedirect };
-import { assertIsNotBrowser } from '../../../utils/assertIsNotBrowser.js';
 import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
 import { isUrlRedirectTarget, assertUsageUrlRedirectTarget } from '../../../utils/parseUrl.js';
 import { resolveUrlPathname } from '../../../shared-server-client/route/resolveUrlPathname.js';
 import { assertRouteString, isStaticRouteString, resolveRouteString, } from '../../../shared-server-client/route/resolveRouteString.js';
 import pc from '@brillout/picocolors';
-assertIsNotBrowser(); // Don't bloat the client
+import '../../assertEnvServer.js';
 const redirectsErrPrefix = '[+redirects]';
 function resolveRedirects(redirectsAll, urlPathname) {
     const redirects = merge(redirectsAll);

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

@@ -1,20 +1,21 @@
-import '../assertEnvServer.js';
 export { renderPageServer };
 export { getRequestTag };
 export type { PageContextInit };
+export type { PageContextInternalInit };
 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, PageContextInternalInit } 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 PageContextInternalInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
 } & Partial<PageContextServer & PageContextUserAdded>>;
-declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, requestId: number, asyncStore: AsyncStore): {
+declare function getPageContextBegin(pageContextInit: PageContextInternalInit, 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;
@@ -116,23 +98,17 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _pageFilesAll: import("../__internal/index.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: PageContextInit;
+    _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 CHANGED Viewed

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export { renderPageServer };
 export { getRequestTag };
 import { renderPageServerAfterRoute } from './renderPageServer/renderPageServerAfterRoute.js';
@@ -18,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 +30,9 @@ import { resolveRedirects } from './renderPageServer/resolveRedirects.js';
 import { getVikeConfigError } from '../../shared-server-node/getVikeConfigError.js';
 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 CHANGED Viewed

@@ -1,3 +1,10 @@
+import { type RuntimeAdapterTarget } from '@universal-middleware/core';
 import '../assertEnvServer.js';
-export default universalVikeHandler;
-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 CHANGED Viewed

@@ -1,6 +1,6 @@
-import '../assertEnvServer.js';
-export default universalVikeHandler;
+import { enhance } from '@universal-middleware/core';
 import { renderPageServer } from './renderPageServer.js';
+import '../assertEnvServer.js';
 async function universalVikeHandler(request, context, runtime) {
     const pageContextInit = {
         ...context,
@@ -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;