vike 0.4.238-commit-3c1a09d → 0.4.238-commit-d48a597

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

@@ -7,23 +7,51 @@ declare function createPageContextClientSide(): Promise<{
     isPrerendering: false;
     isHydration: true;
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & {
         isClientSide: true;
     } & object & Record<string, any>;
@@ -33,11 +61,6 @@ declare function createPageContextClientSide(): Promise<{
 } & {
     pageId: string;
     routeParams: Record<string, string>;
-} & {
-    config: import("../../types/index.js").ConfigResolved;
-    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
-    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
-    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
-} & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+} & import("../../shared/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared/getPageFiles.js").PageContextConfig & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

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

@@ -22,7 +22,7 @@ async function createPageContextClientSide() {
     });
     objectAssign(pageContextCreated, getPageContextSerializedInHtml());
     // Sets pageContext.config to global configs
-    updateType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal));
+    updateType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._globalConfigPublic));
     // Sets pageContext.config to local configs (overrides the pageContext.config set above)
     updateType(pageContextCreated, await loadPageConfigsLazyClientSideAndExecHook(pageContextCreated));
     assertPristineUrl();

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

@@ -5,23 +5,51 @@ import type { GlobalContextBasePublic } from '../../shared/createGlobalContextSh
 type GlobalContextClientWithServerRouting = GlobalContextBasePublic & Pick<GlobalContextClientInternalWithServerRouting, 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextClient & {};
 type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
 declare const getGlobalContextClientInternal: () => Promise<{
-    isGlobalContext: true;
-    _isOriginalObject: true;
-    _virtualFileExportsGlobalEntry: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _vikeConfigPublicGlobal: {
+    _globalConfigPublic: {
+        pages: {
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
     };
-    config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+        [k: string]: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        } & ({
+            route: import("../../types/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
     };
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+    isGlobalContext: true;
+    _isOriginalObject: true;
+    _virtualFileExportsGlobalEntry: unknown;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
 } & {
     isClientSide: true;
 } & object & Record<string, any>>;

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

@@ -1,9 +1,9 @@
 export { preparePageContextForPublicUsageClient };
 export type { PageContextForPublicUsageClient };
-import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
+import type { PageContextConfig } from '../../shared/getPageFiles.js';
 import type { PageContextInternalClient_ServerRouting } from '../../types/PageContext.js';
 import type { PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
-type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting & VikeConfigPublicPageLazyLoaded;
+type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting & PageContextConfig;
 declare function preparePageContextForPublicUsageClient<PageContext extends PageContextForPublicUsageClient>(pageContext: PageContext): PageContext & {
     Page: unknown;
 };

package/dist/esm/client/shared/createGetGlobalContextClient.d.ts

@@ -6,23 +6,51 @@ import { type GlobalContextBase } from '../../shared/createGlobalContextShared.j
 import type { GlobalContextClientInternal } from '../runtime-client-routing/globalContext.js';
 import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/globalContext.js';
 declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExportsGlobalEntry: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>): () => Promise<{
-    isGlobalContext: true;
-    _isOriginalObject: true;
-    _virtualFileExportsGlobalEntry: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _vikeConfigPublicGlobal: {
+    _globalConfigPublic: {
+        pages: {
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
     };
-    config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+        [k: string]: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        } & ({
+            route: import("../../types/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
     };
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+    isGlobalContext: true;
+    _isOriginalObject: true;
+    _virtualFileExportsGlobalEntry: unknown;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
 } & {
     /**
      * Whether the environment is client-side or server-side / pre-rendering.

package/dist/esm/client/shared/execHookOnRenderClient.d.ts

@@ -1,6 +1,6 @@
 export { execHookOnRenderClient };
 export type { PageContextBeforeRenderClient };
-import type { PageFile, VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
+import type { PageFile, PageContextConfig } from '../../shared/getPageFiles.js';
 import type { PageContextForPublicUsageClientShared } from './preparePageContextForPublicUsageClientShared.js';
 import type { GlobalContextClientInternalShared } from './createGetGlobalContextClient.js';
 type PageContextBeforeRenderClient = {
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _globalContext: GlobalContextClientInternalShared;
-} & VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageClientShared;
+} & PageContextConfig & PageContextForPublicUsageClientShared;
 declare function execHookOnRenderClient<PageContext extends PageContextBeforeRenderClient>(pageContext: PageContext, prepareForPublicUsage: (pageConfig: PageContext) => PageContext): Promise<void>;

package/dist/esm/client/shared/loadPageConfigsLazyClientSide.d.ts

@@ -11,7 +11,7 @@ type PageContext_loadPageConfigsLazyClientSide = {
         _pageConfigGlobal: PageConfigGlobalRuntime;
     };
 };
-declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<import("../../shared/getPageFiles.js").PageContextConfig & {
     _pageFilesLoaded: PageFile[];
 }>;
 declare function isErrorFetchingStaticAssets(err: unknown): boolean;

package/dist/esm/client/shared/loadPageConfigsLazyClientSide.js

@@ -1,7 +1,7 @@
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { resolveVikeConfigPublicPageLazyLoaded } from '../../shared/page-configs/resolveVikeConfigPublic.js';
+import { resolvePageContextConfig } from '../../shared/page-configs/resolveVikeConfigPublic.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadAndParseVirtualFilePageEntry } from '../../shared/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { objectAssign } from '../runtime-server-routing/utils.js';
@@ -30,9 +30,8 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
         }
         throw err;
     }
-    const configPublicPageLazy = resolveVikeConfigPublicPageLazyLoaded(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
-    objectAssign(pageContextAddendum, configPublicPageLazy);
+    objectAssign(pageContextAddendum, resolvePageContextConfig(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal));
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });
     return pageContextAddendum;
 }

package/dist/esm/client/shared/preparePageContextForPublicUsageClientShared.d.ts

@@ -1,10 +1,10 @@
 export { preparePageContextForPublicUsageClientShared };
 export { preparePageContextForPublicUsageClientMinimal };
 export type { PageContextForPublicUsageClientShared };
-import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
+import type { PageContextConfig } from '../../shared/getPageFiles.js';
 import { type PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
 import type { PageContextInternalClient } from '../../types/PageContext.js';
-type PageContextForPublicUsageClientShared = PageContextPrepareMinimum & PageContextInternalClient & VikeConfigPublicPageLazyLoaded;
+type PageContextForPublicUsageClientShared = PageContextPrepareMinimum & PageContextInternalClient & PageContextConfig;
 declare function preparePageContextForPublicUsageClientShared<PageContext extends PageContextForPublicUsageClientShared>(pageContext: PageContext): PageContext & {
     Page: unknown;
 };

package/dist/esm/node/prerender/resolvePrerenderConfig.js

@@ -1,7 +1,8 @@
 export { resolvePrerenderConfigGlobal };
 export { resolvePrerenderConfigLocal };
-import { assert, isArray, isObject, objectAssign } from './utils.js';
+import { assert, assertUsage, isArray, isObject, objectAssign } from './utils.js';
 import { getConfigValueBuildTime } from '../../shared/page-configs/getConfigValueBuildTime.js';
+import { getConfigDefinedAt } from '../../shared/page-configs/getConfigDefinedAt.js';
 // When setting +prerender to an object => it also enables pre-rendering
 const defaultValueForObject = true;
 function resolvePrerenderConfigGlobal(vikeConfig) {
@@ -49,9 +50,9 @@ function resolvePrerenderConfigLocal(pageConfig) {
     const values = configValue.value;
     assert(isArray(values));
     const value = values[0];
-    // If it's set to an object in a local config then Vike considers it a global config and it's skipped from local inheritance, thus we can assume the value to be a boolean.
-    assert(typeof value === 'boolean');
     assert(isArray(configValue.definedAtData));
+    const configDefinedAt = getConfigDefinedAt('Config', 'prerender', configValue.definedAtData);
+    assertUsage(typeof value === 'boolean', `${configDefinedAt} must be a boolean (it isn't defined at a global location)`);
     const prerenderConfigLocal = { value };
     return prerenderConfigLocal;
 }

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -75,23 +75,51 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     headers?: Record<string, string>;
 } & {
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & (({
         _isProduction: false;
         _isPrerendering: false;
@@ -143,6 +171,20 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
+    pages: {
+        [k: string]: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        } & ({
+            route: import("../../types/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
+    };
     config: import("../../types/index.js").ConfigResolved;
     _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
@@ -170,16 +212,15 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     pageId: string;
 } & {
     _pageConfig: import("../../types/PageConfig.js").PageConfigRuntime | null;
-} & {
-    _pageConfig: null | import("../../types/PageConfig.js").PageConfigRuntime;
-} & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+} & import("../../shared/getPageFiles.js").PageContextConfig & {
     _pageConfig: null | import("../../types/PageConfig.js").PageConfigRuntime;
 } & {
-    cspNonce: string;
+    cspNonce: string | null;
 } & {
     Page: unknown;
     _isHtmlOnly: boolean;
-    _passToClient: import("../runtime/html/serializeContext.js").PassToClient;
+    _passToClient: import("../runtime/renderPage/html/serializeContext.js").PassToClient;
+} & {
     headersResponse: Headers;
 } & {
     __getPageAssets: () => Promise<import("../runtime/renderPage/getPageAssets.js").PageAsset[]>;