vike 0.4.228-commit-ae4784f → 0.4.228-commit-90cfb1a

package/dist/cjs/client/server-routing-runtime/utils.js

@@ -30,3 +30,4 @@ __exportStar(require("../../utils/parseUrl.js"), exports);
 __exportStar(require("../../utils/slice.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports); // Only used by Server Routing (not needed for Client Routing)
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
+__exportStar(require("../../utils/augmentType.js"), exports);

package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js

@@ -4,7 +4,7 @@ exports.createPageContextServerSide = createPageContextServerSide;
 exports.createPageContextServerSideWithoutGlobalContext = createPageContextServerSideWithoutGlobalContext;
 const utils_js_1 = require("../utils.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
-const executeHookGeneric_js_1 = require("./executeHookGeneric.js");
+const createPageContextShared_js_1 = require("../../../shared/createPageContextShared.js");
 async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false
@@ -13,7 +13,6 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     (0, utils_js_1.objectAssign)(pageContextCreated, pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextCreated, {
-        _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
@@ -55,7 +54,8 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
-    await (0, executeHookGeneric_js_1.executeHookGenericGlobalCumulative)('onCreatePageContext', globalContext, pageContextCreated);
+    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext.pageConfigGlobal);
+    (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }
 function createPageContextServerSideWithoutGlobalContext(pageContextInit) {
@@ -64,7 +64,6 @@ function createPageContextServerSideWithoutGlobalContext(pageContextInit) {
 }
 function createPageContext(pageContextInit, isPrerendering) {
     const pageContext = {
-        _isPageContextObject: true,
         isClientSide: false,
         isPrerendering
     };

package/dist/cjs/node/runtime/renderPage/executeHookGeneric.js

@@ -10,8 +10,8 @@ async function executeHookGeneric(hookName, pageContext) {
         return;
     await (0, executeHook_js_1.executeHook)(() => hook.hookFn(pageContext), hook, pageContext);
 }
-async function executeHookGenericGlobalCumulative(hookName, globalContext, pageContext) {
-    const hooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext.pageConfigGlobal, hookName);
+async function executeHookGenericGlobalCumulative(hookName, pageConfigGlobal, pageContext) {
+    const hooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(pageConfigGlobal, hookName);
     await Promise.all(hooks.map(async (hook) => {
         await (0, executeHook_js_1.executeHook)(() => hook.hookFn(pageContext), hook, null);
     }));

package/dist/cjs/node/runtime/universal-middleware.js

@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = universalVikeHandler;
 const index_js_1 = require("./index.js");
 async function universalVikeHandler(request, context, runtime) {
-    const pageContextInit = { ...context, ...runtime, urlOriginal: request.url, headersOriginal: request.headers };
+    const pageContextInit = {
+        ...context,
+        ...runtime,
+        runtime,
+        urlOriginal: request.url,
+        headersOriginal: request.headers
+    };
     const pageContext = await (0, index_js_1.renderPage)(pageContextInit);
     const response = pageContext.httpResponse;
     const readable = response.getReadableWebStream();

package/dist/cjs/node/runtime/utils.js

@@ -75,3 +75,4 @@ __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/genPromise.js"), exports);
 __exportStar(require("../../utils/makePublicCopy.js"), exports);
+__exportStar(require("../../utils/augmentType.js"), exports);

package/dist/cjs/shared/assertPageContextProvidedByUser.js

@@ -12,7 +12,7 @@ function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName,
     (0, utils_js_1.assert)(!hookName.endsWith(')'));
     const errPrefix = `The ${picocolors_1.default.cyan('pageContext')} object provided by the ${hookName}() hook defined by ${hookFilePath}`;
     (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(pageContextProvidedByUser), `${errPrefix} should be an object (but it's ${picocolors_1.default.cyan(`typeof pageContext === ${JSON.stringify(typeof pageContextProvidedByUser)}`)} instead)`);
-    (0, utils_js_1.assertUsage)(!('_objectCreatedByVike' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${picocolors_1.default.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
+    (0, utils_js_1.assertUsage)(!('_isPageContextObject' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${picocolors_1.default.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
     // In principle, it's possible to use onBeforeRoute()` to override and define the whole routing.
     // Is that a good idea to allow users to do this? Beyond deep integration with Vue Router or React Router, is there a use case for this?
     (0, utils_js_1.assertWarning)(!('pageId' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.pageId')} which means that Vike's routing is overriden. This is an experimental feature: make sure to contact a vike maintainer before using this.`, { onlyOnce: true });

package/dist/cjs/shared/createPageContextShared.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPageContextShared = createPageContextShared;
+const executeHookGeneric_js_1 = require("../node/runtime/renderPage/executeHookGeneric.js");
+const getPageConfigUserFriendly_js_1 = require("./page-configs/getPageConfigUserFriendly.js");
+const utils_js_1 = require("./utils.js");
+async function createPageContextShared(pageContextCreated, pageConfigGlobal) {
+    const pageConfigGlobalUserFriendly = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({
+        pageConfigGlobalValues: pageConfigGlobal.configValues
+    });
+    (0, utils_js_1.objectAssign)(pageContextCreated, {
+        _isPageContextObject: true,
+        ...pageConfigGlobalUserFriendly
+    }, true);
+    await (0, executeHookGeneric_js_1.executeHookGenericGlobalCumulative)('onCreatePageContext', pageConfigGlobal, pageContextCreated);
+    return pageContextCreated;
+}

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.228-commit-ae4784f';
+exports.PROJECT_VERSION = '0.4.228-commit-90cfb1a';

package/dist/esm/client/client-routing-runtime/{createPageContext.d.ts → createPageContextClientSide.d.ts}

@@ -1,13 +1,11 @@
-export { createPageContext };
-declare function createPageContext(urlOriginal: string): Promise<{
-    _isPageContextObject: boolean;
+export { createPageContextClientSide };
+declare function createPageContextClientSide(urlOriginal: string): Promise<{
     isClientSide: boolean;
     isPrerendering: boolean;
     urlOriginal: string;
     globalContext: {
         [x: string]: unknown;
     };
-    _objectCreatedByVike: boolean;
     _urlHandler: null;
     _urlRewrite: null;
     _baseServer: string;
@@ -21,4 +19,10 @@ declare function createPageContext(urlOriginal: string): Promise<{
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
+} & {
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
+    _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
+    _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
+    _isPageContextObject: boolean;
 }>;

package/dist/esm/client/client-routing-runtime/{createPageContext.js → createPageContextClientSide.js}

@@ -1,24 +1,23 @@
-export { createPageContext };
+export { createPageContextClientSide };
+import { createPageContextShared } from '../../shared/createPageContextShared.js';
 import { getPageConfigsRuntime } from '../../shared/getPageConfigsRuntime.js';
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { getBaseServer } from './getBaseServer.js';
 import { getGlobalContext } from './globalContextClientSide.js';
-import { assert, isBaseServer, objectAssign } from './utils.js';
+import { assert, augmentType, isBaseServer, objectAssign } from './utils.js';
 // @ts-ignore
 import * as virtualFileExports from 'virtual:vike:importUserCode:client:client-routing';
 const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = getPageConfigsRuntime(virtualFileExports);
-async function createPageContext(urlOriginal) {
+async function createPageContextClientSide(urlOriginal) {
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
     const baseServer = getBaseServer();
     assert(isBaseServer(baseServer));
-    const pageContext = {
-        _isPageContextObject: true,
+    const pageContextCreated = {
         isClientSide: true,
         isPrerendering: false,
         urlOriginal,
         globalContext: getGlobalContext(),
-        _objectCreatedByVike: true,
         _urlHandler: null,
         _urlRewrite: null,
         _baseServer: baseServer,
@@ -29,7 +28,9 @@ async function createPageContext(urlOriginal) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook
     };
-    const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
-    objectAssign(pageContext, pageContextUrlComputed);
-    return pageContext;
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
+    objectAssign(pageContextCreated, pageContextUrlComputed);
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, pageConfigGlobal);
+    augmentType(pageContextCreated, pageContextAugmented);
+    return pageContextCreated;
 }

package/dist/esm/client/client-routing-runtime/prefetch.js

@@ -10,7 +10,7 @@ import { isErrorFetchingStaticAssets, loadUserFilesClientSide } from '../shared/
 import { skipLink } from './skipLink.js';
 import { disableClientRouting } from './renderPageClientSide.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
-import { createPageContext } from './createPageContext.js';
+import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { route } from '../../shared/route/index.js';
 import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
 import { getPageContextFromServerHooks } from './getPageContextFromHooks.js';
@@ -238,7 +238,7 @@ function isExpired(found) {
 }
 // TODO/next-major-release: make it sync
 async function getPageContextLink(urlOfLink) {
-    const pageContextLink = await createPageContext(urlOfLink);
+    const pageContextLink = await createPageContextClientSide(urlOfLink);
     let pageContextFromRoute;
     try {
         pageContextFromRoute = await route(pageContextLink);

package/dist/esm/client/client-routing-runtime/renderPageClientSide.js

@@ -5,7 +5,7 @@ export { firstRenderStartPromise };
 export { getPageContextClient };
 import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop } from './utils.js';
 import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient } from './getPageContextFromHooks.js';
-import { createPageContext } from './createPageContext.js';
+import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache } from './prefetch.js';
 import { assertInfo, assertWarning, isReact } from './utils.js';
 import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
@@ -217,7 +217,7 @@ async function renderPageClientSide(renderArgs) {
         }
     }
     async function getPageContextBegin(isForErrorPage) {
-        const pageContext = await createPageContext(urlOriginal);
+        const pageContext = await createPageContextClientSide(urlOriginal);
         objectAssign(pageContext, {
             isBackwardNavigation,
             isClientSideNavigation,

package/dist/esm/client/server-routing-runtime/{getPageContext.d.ts → createPageContextClientSide.d.ts}

@@ -1,6 +1,5 @@
-export { getPageContext };
-declare function getPageContext(): Promise<{
-    _isPageContextObject: boolean;
+export { createPageContextClientSide };
+declare function createPageContextClientSide(): Promise<{
     isPrerendering: boolean;
     isClientSide: boolean;
     isHydration: true;
@@ -16,4 +15,10 @@ declare function getPageContext(): Promise<{
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
 } & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
+} & {
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
+    _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
+    _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
+    _isPageContextObject: boolean;
 }>;

package/dist/esm/client/server-routing-runtime/{getPageContext.js → createPageContextClientSide.js}

@@ -1,16 +1,16 @@
-export { getPageContext };
-import { assertUsage, assertWarning, objectAssign } from './utils.js';
+export { createPageContextClientSide };
+import { assertUsage, assertWarning, augmentType, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getPageContextSerializedInHtml.js';
 import { loadUserFilesClientSide } from '../shared/loadUserFilesClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { getPageConfigsRuntime } from '../../shared/getPageConfigsRuntime.js';
 // @ts-ignore
 import * as virtualFileExports from 'virtual:vike:importUserCode:client:server-routing';
+import { createPageContextShared } from '../../shared/createPageContextShared.js';
 const { pageFilesAll, pageConfigs, pageConfigGlobal } = getPageConfigsRuntime(virtualFileExports);
 const urlFirst = getCurrentUrl({ withoutHash: true });
-async function getPageContext() {
-    const pageContext = {
-        _isPageContextObject: true,
+async function createPageContextClientSide() {
+    const pageContextCreated = {
         isPrerendering: false,
         isClientSide: true,
         isHydration: true,
@@ -18,10 +18,12 @@ async function getPageContext() {
         _hasPageContextFromServer: true,
         _hasPageContextFromClient: false
     };
-    objectAssign(pageContext, getPageContextSerializedInHtml());
-    objectAssign(pageContext, await loadPageUserFiles(pageContext.pageId));
+    objectAssign(pageContextCreated, getPageContextSerializedInHtml());
+    objectAssign(pageContextCreated, await loadPageUserFiles(pageContextCreated.pageId));
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, pageConfigGlobal);
+    augmentType(pageContextCreated, pageContextAugmented);
     assertPristineUrl();
-    return pageContext;
+    return pageContextCreated;
 }
 function assertPristineUrl() {
     const urlCurrent = getCurrentUrl({ withoutHash: true });

package/dist/esm/client/server-routing-runtime/entry.js

@@ -1,6 +1,6 @@
 import { assertServerRouting } from '../../utils/assertRoutingType.js';
 assertServerRouting();
-import { getPageContext } from './getPageContext.js';
+import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
 import { assertHook } from '../../shared/hooks/getHook.js';
 import { assertSingleInstance_onClientEntryServerRouting } from './utils.js';
@@ -12,7 +12,7 @@ if (import.meta.env.DEV)
     removeFoucBuster();
 hydrate();
 async function hydrate() {
-    const pageContext = await getPageContext();
+    const pageContext = await createPageContextClientSide();
     await executeOnRenderClientHook(pageContext, false);
     assertHook(pageContext, 'onHydrationEnd');
     await pageContext.exports.onHydrationEnd?.(pageContext);

package/dist/esm/client/server-routing-runtime/utils.d.ts

@@ -10,3 +10,4 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/getPropAccessNotation.js';
+export * from '../../utils/augmentType.js';

package/dist/esm/client/server-routing-runtime/utils.js

@@ -14,3 +14,4 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/unique.js'; // Only used by Server Routing (not needed for Client Routing)
 export * from '../../utils/getPropAccessNotation.js';
+export * from '../../utils/augmentType.js';

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

@@ -1,9 +1,9 @@
 export { createPageContextServerSide };
 export { createPageContextServerSideWithoutGlobalContext };
-export type { PageContextServerSideCreated };
+export type { PageContextCreatedServerSide };
 import type { GlobalContextInternal } from '../globalContext.js';
 import type { PageContextInit } from '../renderPage.js';
-type PageContextServerSideCreated = Awaited<ReturnType<typeof createPageContextServerSide>>;
+type PageContextCreatedServerSide = Awaited<ReturnType<typeof createPageContextServerSide>>;
 declare function createPageContextServerSide(pageContextInit: PageContextInit, globalContext: GlobalContextInternal, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } }: {
     isPrerendering: false;
     ssr: {
@@ -14,14 +14,12 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     isPrerendering: true;
     ssr?: undefined;
 }): Promise<{
-    _isPageContextObject: boolean;
     isClientSide: boolean;
     isPrerendering: boolean;
 } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _objectCreatedByVike: boolean;
     _baseServer: string;
     _baseAssets: string;
     _includeAssetsImportedByServer: boolean;
@@ -74,9 +72,14 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     url: string;
 } & {
     headers: Record<string, string> | null;
+} & {
+    config: import("../../../types/index.js").ConfigResolved;
+    _source: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Source;
+    _sources: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
+    _from: import("../../../shared/page-configs/getPageConfigUserFriendly.js").From;
+    _isPageContextObject: boolean;
 }>;
 declare function createPageContextServerSideWithoutGlobalContext(pageContextInit: PageContextInit): {
-    _isPageContextObject: boolean;
     isClientSide: boolean;
     isPrerendering: boolean;
 } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {

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

@@ -1,8 +1,8 @@
 export { createPageContextServerSide };
 export { createPageContextServerSideWithoutGlobalContext };
-import { assert, assertUsage, assertWarning, normalizeHeaders, objectAssign } from '../utils.js';
+import { assert, assertUsage, assertWarning, augmentType, normalizeHeaders, objectAssign } from '../utils.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
-import { executeHookGenericGlobalCumulative } from './executeHookGeneric.js';
+import { createPageContextShared } from '../../../shared/createPageContextShared.js';
 async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false
@@ -11,7 +11,6 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     objectAssign(pageContextCreated, pageContextInit);
     objectAssign(pageContextCreated, {
-        _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
@@ -53,7 +52,8 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         objectAssign(pageContextCreated, { headers });
     }
-    await executeHookGenericGlobalCumulative('onCreatePageContext', globalContext, pageContextCreated);
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext.pageConfigGlobal);
+    augmentType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }
 function createPageContextServerSideWithoutGlobalContext(pageContextInit) {
@@ -62,7 +62,6 @@ function createPageContextServerSideWithoutGlobalContext(pageContextInit) {
 }
 function createPageContext(pageContextInit, isPrerendering) {
     const pageContext = {
-        _isPageContextObject: true,
         isClientSide: false,
         isPrerendering
     };

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

@@ -3,7 +3,6 @@ export { executeHookGenericGlobalCumulative };
 import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
 import { type HookName } from '../../../shared/hooks/getHook.js';
 import type { HookNameGlobal } from '../../../shared/page-configs/Config.js';
-import type { GlobalContextInternal } from '../globalContext.js';
-import type { PageContextServerSideCreated } from './createPageContextServerSide.js';
+import type { PageConfigGlobalRuntime } from '../../../shared/page-configs/PageConfig.js';
 declare function executeHookGeneric(hookName: HookName, pageContext: PageConfigUserFriendlyOld): Promise<void>;
-declare function executeHookGenericGlobalCumulative(hookName: HookNameGlobal, globalContext: GlobalContextInternal, pageContext: PageContextServerSideCreated): Promise<void>;
+declare function executeHookGenericGlobalCumulative(hookName: HookNameGlobal, pageConfigGlobal: PageConfigGlobalRuntime, pageContext: object): Promise<void>;

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

@@ -8,8 +8,8 @@ async function executeHookGeneric(hookName, pageContext) {
         return;
     await executeHook(() => hook.hookFn(pageContext), hook, pageContext);
 }
-async function executeHookGenericGlobalCumulative(hookName, globalContext, pageContext) {
-    const hooks = getHookFromPageConfigGlobalCumulative(globalContext.pageConfigGlobal, hookName);
+async function executeHookGenericGlobalCumulative(hookName, pageConfigGlobal, pageContext) {
+    const hooks = getHookFromPageConfigGlobalCumulative(pageConfigGlobal, hookName);
     await Promise.all(hooks.map(async (hook) => {
         await executeHook(() => hook.hookFn(pageContext), hook, null);
     }));

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

@@ -4,7 +4,7 @@ export type { PageContextAfterRender };
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
-import type { PageContextServerSideCreated } from './createPageContextServerSide.js';
+import type { PageContextCreatedServerSide } from './createPageContextServerSide.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
     errorWhileRendering: null | Error;
@@ -16,8 +16,8 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextServerSideCreated & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
-declare function prerenderPage(pageContext: PageContextServerSideCreated & PageFiles & {
+} & PageContextCreatedServerSide & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageFiles & {
     routeParams: Record<string, string>;
     pageId: string;
     _urlRewrite: null;
@@ -29,14 +29,12 @@ declare function prerenderPage(pageContext: PageContextServerSideCreated & PageF
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
-        _isPageContextObject: boolean;
         isClientSide: boolean;
         isPrerendering: boolean;
     } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string;
         _includeAssetsImportedByServer: boolean;
@@ -88,6 +86,12 @@ declare function prerenderPage(pageContext: PageContextServerSideCreated & PageF
         url: string;
     } & {
         headers: Record<string, string> | null;
+    } & {
+        config: import("../../../types/index.js").ConfigResolved;
+        _source: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Source;
+        _sources: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
+        _from: import("../../../shared/page-configs/getPageConfigUserFriendly.js").From;
+        _isPageContextObject: boolean;
     } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
@@ -111,14 +115,12 @@ declare function prerenderPage(pageContext: PageContextServerSideCreated & PageF
     documentHtml: string;
     pageContextSerialized: string;
     pageContext: {
-        _isPageContextObject: boolean;
         isClientSide: boolean;
         isPrerendering: boolean;
     } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string;
         _includeAssetsImportedByServer: boolean;
@@ -170,6 +172,12 @@ declare function prerenderPage(pageContext: PageContextServerSideCreated & PageF
         url: string;
     } & {
         headers: Record<string, string> | null;
+    } & {
+        config: import("../../../types/index.js").ConfigResolved;
+        _source: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Source;
+        _sources: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
+        _from: import("../../../shared/page-configs/getPageConfigUserFriendly.js").From;
+        _isPageContextObject: boolean;
     } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;

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

@@ -19,14 +19,12 @@ declare let asyncHookWrapper: <PageContext>(_httpRequestId: number, ret: () => P
 }>;
 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;
@@ -78,6 +76,12 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     url: string;
 } & {
     headers: Record<string, string> | null;
+} & {
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
+    _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
+    _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
+    _isPageContextObject: boolean;
 } & {
     _httpRequestId: number;
 }>;

package/dist/esm/node/runtime/universal-middleware.js

@@ -1,6 +1,12 @@
 import { renderPage } from './index.js';
 export default async function universalVikeHandler(request, context, runtime) {
-    const pageContextInit = { ...context, ...runtime, urlOriginal: request.url, headersOriginal: request.headers };
+    const pageContextInit = {
+        ...context,
+        ...runtime,
+        runtime,
+        urlOriginal: request.url,
+        headersOriginal: request.headers
+    };
     const pageContext = await renderPage(pageContextInit);
     const response = pageContext.httpResponse;
     const readable = response.getReadableWebStream();

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

@@ -55,3 +55,4 @@ export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/makePublicCopy.js';
+export * from '../../utils/augmentType.js';

package/dist/esm/node/runtime/utils.js

@@ -59,3 +59,4 @@ export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/makePublicCopy.js';
+export * from '../../utils/augmentType.js';

package/dist/esm/shared/assertPageContextProvidedByUser.js

@@ -7,7 +7,7 @@ function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName,
     assert(!hookName.endsWith(')'));
     const errPrefix = `The ${pc.cyan('pageContext')} object provided by the ${hookName}() hook defined by ${hookFilePath}`;
     assertUsage(isObject(pageContextProvidedByUser), `${errPrefix} should be an object (but it's ${pc.cyan(`typeof pageContext === ${JSON.stringify(typeof pageContextProvidedByUser)}`)} instead)`);
-    assertUsage(!('_objectCreatedByVike' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${pc.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
+    assertUsage(!('_isPageContextObject' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${pc.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
     // In principle, it's possible to use onBeforeRoute()` to override and define the whole routing.
     // Is that a good idea to allow users to do this? Beyond deep integration with Vue Router or React Router, is there a use case for this?
     assertWarning(!('pageId' in pageContextProvidedByUser), `${errPrefix} sets ${pc.cyan('pageContext.pageId')} which means that Vike's routing is overriden. This is an experimental feature: make sure to contact a vike maintainer before using this.`, { onlyOnce: true });

package/dist/esm/shared/createPageContextShared.d.ts

@@ -0,0 +1,9 @@
+export { createPageContextShared };
+import type { PageConfigGlobalRuntime } from './page-configs/PageConfig.js';
+declare function createPageContextShared<T extends object>(pageContextCreated: T, pageConfigGlobal: PageConfigGlobalRuntime): Promise<T & {
+    config: import("./page-configs/Config/PageContextConfig.js").ConfigResolved;
+    _source: import("./page-configs/getPageConfigUserFriendly.js").Source;
+    _sources: import("./page-configs/getPageConfigUserFriendly.js").Sources;
+    _from: import("./page-configs/getPageConfigUserFriendly.js").From;
+    _isPageContextObject: boolean;
+}>;

package/dist/esm/shared/createPageContextShared.js

@@ -0,0 +1,15 @@
+export { createPageContextShared };
+import { executeHookGenericGlobalCumulative } from '../node/runtime/renderPage/executeHookGeneric.js';
+import { getPageConfigGlobalUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
+import { objectAssign } from './utils.js';
+async function createPageContextShared(pageContextCreated, pageConfigGlobal) {
+    const pageConfigGlobalUserFriendly = getPageConfigGlobalUserFriendly({
+        pageConfigGlobalValues: pageConfigGlobal.configValues
+    });
+    objectAssign(pageContextCreated, {
+        _isPageContextObject: true,
+        ...pageConfigGlobalUserFriendly
+    }, true);
+    await executeHookGenericGlobalCumulative('onCreatePageContext', pageConfigGlobal, pageContextCreated);
+    return pageContextCreated;
+}

package/dist/esm/shared/hooks/getHook.d.ts

@@ -21,7 +21,7 @@ type HookLoc = {
     hookName: HookName;
     hookFilePath: string;
 };
-type HookFn = (arg: unknown) => unknown;
+type HookFn = (arg: object) => unknown;
 type HookTimeout = {
     error: number | false;
     warning: number | false;

package/dist/esm/shared/page-configs/Config.d.ts

@@ -45,7 +45,7 @@ import type { PageContextClient, PageContextServer } from '../types.js';
 import type { InlineConfig } from 'vite';
 type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
-type HookNameGlobal = 'onCreatePageContext' | 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
+type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext';
 type HookNameOldDesign = 'render' | 'prerender';
 type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
 type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
@@ -330,9 +330,9 @@ type ConfigBuiltIn = {
      *  https://vike.dev/onBeforeRender
      */
     onBeforeRender?: OnBeforeRenderAsync | OnBeforeRenderSync | ImportString | null;
-    /** Hook called when a page starts rendering.
+    /** Hook called when a `pageContext` object is created.
      *
-     *  https://vike.dev/onCreatePageContext TODO/now
+     *  https://vike.dev/onCreatePageContext
      */
     onCreatePageContext?: (pageContext: PageContextServer) => void | ImportString | null;
     /** Hook for fetching data.

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.228-commit-ae4784f";
+export declare const PROJECT_VERSION: "0.4.228-commit-90cfb1a";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.228-commit-ae4784f';
+export const PROJECT_VERSION = '0.4.228-commit-90cfb1a';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.228-commit-ae4784f",
+  "version": "0.4.228-commit-90cfb1a",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {