vike 0.4.228-commit-67e28cd → 0.4.228-commit-ae4784f

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -1,13 +1,10 @@
 export { renderPageAlreadyRouted };
 export { prerenderPage };
-export { getPageContextInitEnhanced };
-export { createPageContext };
 export type { PageContextAfterRender };
-export type { PageContextInitEnhanced };
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
-import type { GlobalContextInternal } from '../globalContext.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
+import type { PageContextServerSideCreated } from './createPageContextServerSide.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
     errorWhileRendering: null | Error;
@@ -19,8 +16,8 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextInitEnhanced & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
-declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles & {
+} & PageContextServerSideCreated & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+declare function prerenderPage(pageContext: PageContextServerSideCreated & PageFiles & {
     routeParams: Record<string, string>;
     pageId: string;
     _urlRewrite: null;
@@ -35,10 +32,9 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _isPageContextObject: boolean;
         isClientSide: boolean;
         isPrerendering: boolean;
-    } & Record<string, unknown> & {
-        urlOriginal: string;
-        headersOriginal?: unknown;
-        headers?: unknown;
+    } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+        url?: string;
+        headers?: Record<string, string>;
     } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
@@ -50,8 +46,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
-        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
+        _globalContext: import("../globalContext.js").GlobalContextInternal;
         globalContext: Pick<{
             viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
             config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
@@ -83,12 +78,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
             usesClientRouter: boolean;
             viteConfig: import("vite").ResolvedConfig;
         })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
-        _pageContextInit: {
-            urlOriginal: string;
-            headersOriginal?: unknown;
-            headers?: unknown;
-        };
-        _urlRewrite: string | null;
+        _pageContextInit: import("../renderPage.js").PageContextInit;
+        _urlRewrite: null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -123,10 +114,9 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _isPageContextObject: boolean;
         isClientSide: boolean;
         isPrerendering: boolean;
-    } & Record<string, unknown> & {
-        urlOriginal: string;
-        headersOriginal?: unknown;
-        headers?: unknown;
+    } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+        url?: string;
+        headers?: Record<string, string>;
     } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
@@ -138,8 +128,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
-        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
+        _globalContext: import("../globalContext.js").GlobalContextInternal;
         globalContext: Pick<{
             viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
             config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
@@ -171,12 +160,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
             usesClientRouter: boolean;
             viteConfig: import("vite").ResolvedConfig;
         })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
-        _pageContextInit: {
-            urlOriginal: string;
-            headersOriginal?: unknown;
-            headers?: unknown;
-        };
-        _urlRewrite: string | null;
+        _pageContextInit: import("../renderPage.js").PageContextInit;
+        _urlRewrite: null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -205,86 +190,3 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlHandler: null;
     };
 }>;
-type PageContextInitEnhanced = Awaited<ReturnType<typeof getPageContextInitEnhanced>>;
-declare function getPageContextInitEnhanced(pageContextInit: {
-    urlOriginal: string;
-    headersOriginal?: unknown;
-    headers?: unknown;
-}, globalContext: GlobalContextInternal, isPrerendering: boolean, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
-    ssr?: {
-        urlRewrite: null | string;
-        urlHandler: null | ((url: string) => string);
-        isClientSideNavigation: boolean;
-    };
-}): Promise<{
-    _isPageContextObject: boolean;
-    isClientSide: boolean;
-    isPrerendering: boolean;
-} & Record<string, unknown> & {
-    urlOriginal: string;
-    headersOriginal?: unknown;
-    headers?: unknown;
-} & {
-    _objectCreatedByVike: boolean;
-    _baseServer: string;
-    _baseAssets: string;
-    _includeAssetsImportedByServer: boolean;
-    _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-    _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-    _globalContext: GlobalContextInternal;
-    /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
-    globalContext: Pick<{
-        viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
-        config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
-        pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-    } & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
-        pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        pageConfigs: import("../../../__internal/index.js").PageConfig[];
-        pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        allPageIds: string[];
-        pageRoutes: import("../../../__internal/index.js").PageRoutes;
-        onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-        config: import("../../../types/index.js").ConfigResolved;
-    } & ({
-        isProduction: false;
-        isPrerendering: false;
-        viteConfig: import("vite").ResolvedConfig;
-        viteDevServer: import("vite").ViteDevServer;
-        assetsManifest: null;
-    } | ({
-        isProduction: true;
-        assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
-        viteDevServer: null;
-    } & ({
-        isPrerendering: false;
-        viteConfig: null;
-    } | {
-        isPrerendering: true;
-        usesClientRouter: boolean;
-        viteConfig: import("vite").ResolvedConfig;
-    })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
-    _pageContextInit: {
-        urlOriginal: string;
-        headersOriginal?: unknown;
-        headers?: unknown;
-    };
-    _urlRewrite: string | null;
-    _urlHandler: ((url: string) => string) | null;
-    isClientSideNavigation: boolean;
-} & {
-    urlParsed: import("../utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
-} & {
-    headers: Record<string, string> | null;
-}>;
-declare function createPageContext(pageContextInit: Record<string, unknown>, isPrerendering: boolean): {
-    _isPageContextObject: boolean;
-    isClientSide: boolean;
-    isPrerendering: boolean;
-} & Record<string, unknown>;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -1,12 +1,9 @@
 export { renderPageAlreadyRouted };
 export { prerenderPage };
-export { getPageContextInitEnhanced };
-export { createPageContext };
 import { getErrorPageId } from '../../../shared/error-page.js';
 import { getHtmlString } from '../html/renderHtml.js';
-import { assert, assertUsage, assertWarning, hasProp, normalizeHeaders, objectAssign } from '../utils.js';
+import { assert, assertUsage, hasProp, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
-import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
 import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
 import { loadUserFilesServerSide } from './loadUserFilesServerSide.js';
 import { executeOnRenderHtmlHook } from './executeOnRenderHtmlHook.js';
@@ -79,65 +76,3 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function getPageContextInitEnhanced(pageContextInit, globalContext, isPrerendering, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
-    urlRewrite: null,
-    urlHandler: null,
-    isClientSideNavigation: false
-} } = {}) {
-    assert(pageContextInit.urlOriginal);
-    const pageContextInitEnhanced = createPageContext(pageContextInit, isPrerendering);
-    objectAssign(pageContextInitEnhanced, pageContextInit);
-    objectAssign(pageContextInitEnhanced, {
-        _objectCreatedByVike: true,
-        // The following is defined on `pageContext` because we can eventually make these non-global
-        _baseServer: globalContext.baseServer,
-        _baseAssets: globalContext.baseAssets,
-        // TODO/now: add meta.default
-        _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
-        // TODO/soon: use GloablContext instead
-        _pageFilesAll: globalContext.pageFilesAll,
-        _pageConfigs: globalContext.pageConfigs,
-        _pageConfigGlobal: globalContext.pageConfigGlobal,
-        _allPageIds: globalContext.allPageIds,
-        _pageRoutes: globalContext.pageRoutes,
-        _onBeforeRouteHook: globalContext.onBeforeRouteHook,
-        _globalContext: globalContext,
-        // TODO/now: add PageContext['globalContext']
-        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
-        globalContext: globalContext.globalContext_public,
-        _pageContextInit: pageContextInit,
-        _urlRewrite: urlRewrite,
-        _urlHandler: urlHandler,
-        isClientSideNavigation
-    });
-    // pageContext.urlParsed
-    const pageContextUrlComputed = getPageContextUrlComputed(pageContextInitEnhanced);
-    objectAssign(pageContextInitEnhanced, pageContextUrlComputed);
-    // pageContext.headers
-    {
-        let headers;
-        if (pageContextInit.headersOriginal) {
-            headers = normalizeHeaders(pageContextInit.headersOriginal);
-            assertUsage(!('headers' in pageContextInit), "You're defining pageContextInit.headersOriginal as well as pageContextInit.headers but you should only define pageContextInit.headersOriginal instead, see https://vike.dev/headers");
-        }
-        else if (pageContextInit.headers) {
-            headers = pageContextInit.headers;
-            // TODO/next-major-release: assertUsage() instead of assertWarning()
-            assertWarning(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
-        }
-        else {
-            headers = null;
-        }
-        objectAssign(pageContextInitEnhanced, { headers });
-    }
-    return pageContextInitEnhanced;
-}
-function createPageContext(pageContextInit, isPrerendering) {
-    const pageContext = {
-        _isPageContextObject: true,
-        isClientSide: false,
-        isPrerendering
-    };
-    objectAssign(pageContext, pageContextInit);
-    return pageContext;
-}

package/dist/esm/node/runtime/renderPage.d.ts

@@ -1,16 +1,83 @@
 export { renderPage };
 export { renderPage_addAsyncHookwrapper };
-import { HttpResponse } from './renderPage/createHttpResponse.js';
+export type { PageContextInit };
+export type { PageContextBegin };
+import { type GlobalContextInternal } from './globalContext.js';
+import { type HttpResponse } from './renderPage/createHttpResponse.js';
 import type { PageContextServer } from '../../types/index.js';
-declare function renderPage<PageContextUserAdded extends {}, PageContextInit extends {
-    /** @deprecated */
-    url?: string;
-    /** The URL of the HTTP request */
-    urlOriginal: string;
-}>(pageContextInit: PageContextInit): Promise<PageContextInit & {
+import type { PageContextBuiltInServerInternal } from '../../shared/types.js';
+type PageContextInit = Pick<PageContextBuiltInServerInternal, 'urlOriginal' | 'headersOriginal'> & {
+    /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
+    /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
+};
+type PageContextBegin = Awaited<ReturnType<typeof getPageContextBegin>>;
+declare function renderPage<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
 } & Partial<PageContextServer & PageContextUserAdded>>;
 declare let asyncHookWrapper: <PageContext>(_httpRequestId: number, ret: () => Promise<PageContext>) => Promise<{
     pageContextReturn: Awaited<PageContext>;
 }>;
 declare function renderPage_addAsyncHookwrapper(wrapper: typeof asyncHookWrapper): void;
+declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextInternal, httpRequestId: number): Promise<{
+    _isPageContextObject: boolean;
+    isClientSide: boolean;
+    isPrerendering: boolean;
+} & Pick<PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+    /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
+    /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
+} & {
+    _objectCreatedByVike: boolean;
+    _baseServer: string;
+    _baseAssets: string;
+    _includeAssetsImportedByServer: boolean;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../__internal/index.js").PageConfig[];
+    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
+    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
+    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    _globalContext: GlobalContextInternal;
+    globalContext: Pick<{
+        viteConfigRuntime: import("../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
+        config: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
+        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+    } & import("../shared/resolveBase.js").BaseUrlsResolved & ({
+        pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        pageConfigs: import("../../__internal/index.js").PageConfig[];
+        pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        allPageIds: string[];
+        pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
+        onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        config: import("../../types/index.js").ConfigResolved;
+    } & ({
+        isProduction: false;
+        isPrerendering: false;
+        viteConfig: import("vite").ResolvedConfig;
+        viteDevServer: import("vite").ViteDevServer;
+        assetsManifest: null;
+    } | ({
+        isProduction: true;
+        assetsManifest: import("../shared/ViteManifest.js").ViteManifest;
+        viteDevServer: null;
+    } & ({
+        isPrerendering: false;
+        viteConfig: null;
+    } | {
+        isPrerendering: true;
+        usesClientRouter: boolean;
+        viteConfig: import("vite").ResolvedConfig;
+    })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
+    _pageContextInit: PageContextInit;
+    _urlRewrite: null;
+    _urlHandler: ((url: string) => string) | null;
+    isClientSideNavigation: boolean;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
+    headers: Record<string, string> | null;
+} & {
+    _httpRequestId: number;
+}>;