vike 0.4.250-commit-193dea3 → 0.4.250-commit-2686732

package/dist/client/runtime-client-routing/createPageContextClientSide.d.ts

@@ -1,5 +1,6 @@
 export { createPageContextClientSide };
 export type PageContextCreatedClient = Awaited<ReturnType<typeof createPageContextClientSide>>;
+export type PageContextCreatedClientBase = Awaited<ReturnType<typeof createPageContextBase>>;
 declare function createPageContextClientSide(urlOriginal: string): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
@@ -7,6 +8,14 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     isClientSide: true;
     isPrerendering: false;
     urlOriginal: string;
+    _urlHandler: null;
+} & {
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
     _globalContext: {
         _globalConfigPublic: {
             pages: {
@@ -60,10 +69,19 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
+} & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
+declare function createPageContextBase(urlOriginal: string): {
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: true;
+    isPrerendering: false;
+    urlOriginal: string;
     _urlHandler: null;
+} & {
     _baseServer: string;
 } & {
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
+};

package/dist/client/runtime-client-routing/createPageContextClientSide.js

@@ -5,22 +5,30 @@ import { getBaseServer } from './getBaseServer.js';
 import { getGlobalContextClientInternal } from './getGlobalContextClientInternal.js';
 import { assert, updateType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
+    const pageContext = createPageContextBase(urlOriginal);
     const globalContext = await getGlobalContextClientInternal();
-    const baseServer = getBaseServer();
-    assert(isBaseServer(baseServer));
-    const pageContextCreated = createPageContextObject();
-    objectAssign(pageContextCreated, {
+    objectAssign(pageContext, {
+        _globalContext: globalContext,
+        _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
+    });
+    const pageContextAugmented = createPageContextShared(pageContext, globalContext._globalConfigPublic);
+    updateType(pageContext, pageContextAugmented);
+    return pageContext;
+}
+function createPageContextBase(urlOriginal) {
+    const pageContext = createPageContextObject();
+    objectAssign(pageContext, {
         isClientSide: true,
         isPrerendering: false,
         urlOriginal,
-        _globalContext: globalContext,
-        _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
         _urlHandler: null,
+    });
+    const baseServer = getBaseServer();
+    assert(isBaseServer(baseServer));
+    objectAssign(pageContext, {
         _baseServer: baseServer,
     });
-    const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
-    objectAssign(pageContextCreated, pageContextUrlComputed);
-    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._globalConfigPublic);
-    updateType(pageContextCreated, pageContextAugmented);
-    return pageContextCreated;
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
+    objectAssign(pageContext, pageContextUrlComputed);
+    return pageContext;
 }

package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts

@@ -25,6 +25,14 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     isClientSide: true;
     isPrerendering: false;
     urlOriginal: string;
+    _urlHandler: null;
+} & {
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
     _globalContext: {
         _globalConfigPublic: {
             pages: {
@@ -78,12 +86,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: PageFile[];
-    _urlHandler: null;
-    _baseServer: string;
-} & {
-    urlParsed: import("./utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -101,6 +103,14 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         isClientSide: true;
         isPrerendering: false;
         urlOriginal: string;
+        _urlHandler: null;
+    } & {
+        _baseServer: string;
+    } & {
+        urlParsed: import("./utils.js").UrlPublic;
+        urlPathname: string;
+        url: string;
+    } & {
         _globalContext: {
             _globalConfigPublic: {
                 pages: {
@@ -154,20 +164,13 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
         };
         _pageFilesAll: PageFile[];
-        _urlHandler: null;
-        _baseServer: string;
-    } & {
-        urlParsed: import("./utils.js").UrlPublic;
-        urlPathname: string;
-        url: string;
-    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
+        _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+    } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -178,7 +181,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
     }> & Pick<PageContextConfig & {
@@ -186,9 +188,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -199,13 +198,13 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+    }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
+        urlOriginal: string;
         isHydration: boolean;
         isBackwardNavigation: boolean | null;
         isHistoryNavigation: boolean;
@@ -218,7 +217,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
         previousPageContext: {
             pageId: string;
         } | null;
@@ -228,14 +227,13 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     pageContextsAborted: import("../../shared-server-client/route/abort.js").PageContextAborted[];
 } & (import("../../shared-server-client/route/abort.js").PageContextAbort | null))) & PageContextConfig & {
     _hasPageContextFromServer: true;
-}) & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<PageContextConfig & {
+}) & {
+    _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+} & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -246,7 +244,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
 }> & Pick<PageContextConfig & {
@@ -254,9 +251,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -267,13 +261,13 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+}, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
+    urlOriginal: string;
     isHydration: boolean;
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -286,7 +280,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-}, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+}, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
     previousPageContext: {
         pageId: string;
     } | null;
@@ -307,16 +301,24 @@ declare function getPageContextFromHooksServer(pageContext: {
 declare function getPageContextFromHooksClient(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContextBegin & PageContextConfig & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<({
+} & PageContextBegin & PageContextConfig & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<(({
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & (({
+} & ({
     _isOriginalObject: true;
     isPageContext: true;
 } & {
     isClientSide: true;
     isPrerendering: false;
     urlOriginal: string;
+    _urlHandler: null;
+} & {
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
     _globalContext: {
         _globalConfigPublic: {
             pages: {
@@ -370,12 +372,6 @@ declare function getPageContextFromHooksClient(pageContext: {
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: PageFile[];
-    _urlHandler: null;
-    _baseServer: string;
-} & {
-    urlParsed: import("./utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -393,6 +389,14 @@ declare function getPageContextFromHooksClient(pageContext: {
         isClientSide: true;
         isPrerendering: false;
         urlOriginal: string;
+        _urlHandler: null;
+    } & {
+        _baseServer: string;
+    } & {
+        urlParsed: import("./utils.js").UrlPublic;
+        urlPathname: string;
+        url: string;
+    } & {
         _globalContext: {
             _globalConfigPublic: {
                 pages: {
@@ -446,20 +450,13 @@ declare function getPageContextFromHooksClient(pageContext: {
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
         };
         _pageFilesAll: PageFile[];
-        _urlHandler: null;
-        _baseServer: string;
-    } & {
-        urlParsed: import("./utils.js").UrlPublic;
-        urlPathname: string;
-        url: string;
-    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
+        _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+    } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -470,7 +467,6 @@ declare function getPageContextFromHooksClient(pageContext: {
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
     }> & Pick<PageContextConfig & {
@@ -478,9 +474,6 @@ declare function getPageContextFromHooksClient(pageContext: {
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -491,13 +484,13 @@ declare function getPageContextFromHooksClient(pageContext: {
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+    }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
+        urlOriginal: string;
         isHydration: boolean;
         isBackwardNavigation: boolean | null;
         isHistoryNavigation: boolean;
@@ -510,7 +503,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
         previousPageContext: {
             pageId: string;
         } | null;
@@ -518,14 +511,13 @@ declare function getPageContextFromHooksClient(pageContext: {
         urlOriginal: string;
     }) | null;
     pageContextsAborted: import("../../shared-server-client/route/abort.js").PageContextAborted[];
-} & (import("../../shared-server-client/route/abort.js").PageContextAbort | null)) & PageContextConfig)) & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<PageContextConfig & {
+} & (import("../../shared-server-client/route/abort.js").PageContextAbort | null))) & PageContextConfig & {
+    _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+}) & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -536,7 +528,6 @@ declare function getPageContextFromHooksClient(pageContext: {
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
 }> & Pick<PageContextConfig & {
@@ -544,9 +535,6 @@ declare function getPageContextFromHooksClient(pageContext: {
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -557,13 +545,13 @@ declare function getPageContextFromHooksClient(pageContext: {
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+}, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
+    urlOriginal: string;
     isHydration: boolean;
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -576,7 +564,7 @@ declare function getPageContextFromHooksClient(pageContext: {
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-}, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+}, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
     previousPageContext: {
         pageId: string;
     } | null;