vike 0.4.229-commit-58f7ed0 → 0.4.229-commit-5da80bf

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

@@ -20,20 +20,31 @@ export type { GlobalContextServerInternal as GlobalContextServerInternal };
 export type { GlobalContextServer };
 import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
+import type { PageConfigUserFriendly } from '../../shared/page-configs/getUserFriendlyConfigs.js';
 import type { ViteConfigRuntime } from '../plugin/shared/getViteConfigRuntime.js';
 import type { GlobalContext } from '../../shared/types.js';
-type GlobalContextServer = ReturnType<typeof makePublic> & Vike.GlobalContext & Vike.GlobalContextServer;
+type GlobalContextServer = Pick<GlobalContextServerInternal, 'assetsManifest' | 'config' | 'viteConfig' | 'viteConfigRuntime' | 'pages' | 'baseServer' | 'baseAssets' | 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextServer;
 type GlobalContextServerInternal = Awaited<ReturnType<typeof setGlobalContext>>;
 declare function getGlobalContextServerInternal(): Promise<{
     globalContext: (Record<string, unknown> & {
         isGlobalContext: true;
+        _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: PageConfigUserFriendly;
         config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } & {
         _isProduction: false;
         _isPrerendering: false;
@@ -55,23 +66,25 @@ declare function getGlobalContextServerInternal(): Promise<{
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
+        _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: PageConfigUserFriendly;
         config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } & {
         _isPrerendering: true;
         viteConfig: ResolvedConfig;
@@ -94,23 +107,25 @@ declare function getGlobalContextServerInternal(): Promise<{
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
+        _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: PageConfigUserFriendly;
         config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } & {
         _isPrerendering: false;
         viteConfig: null;
@@ -133,114 +148,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
     });
-    globalContext_public: Record<string, unknown> & Pick<{
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-    } & ({
-        _isProduction: false;
-        _isPrerendering: false;
-        assetsManifest: null;
-        _viteDevServer: ViteDevServer;
-        viteConfig: ResolvedConfig;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-        baseServer: string;
-        baseAssets: string;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-    } | {
-        _isPrerendering: true;
-        viteConfig: ResolvedConfig;
-        _isProduction: true;
-        assetsManifest: ViteManifest;
-        _viteDevServer: null;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-        _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-    } | {
-        _isPrerendering: false;
-        viteConfig: null;
-        _isProduction: true;
-        assetsManifest: ViteManifest;
-        _viteDevServer: null;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-        _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-    }), "pages" | "viteConfig" | "viteConfigRuntime" | "assetsManifest" | "baseServer" | "baseAssets" | "config" | "isClientSide"> & Vike.GlobalContext & Vike.GlobalContextServer;
 }>;
 /**
  * Get runtime information about your app.
@@ -262,105 +170,6 @@ declare function getGlobalContextAsync(isProduction: boolean): Promise<GlobalCon
  * @deprecated
  */
 declare function getGlobalContextSync(): GlobalContext;
-declare function makePublic(globalContext: GlobalContextServerInternal): Pick<{
-    isGlobalContext: true;
-    _virtualFileExports: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-} & ({
-    _isProduction: false;
-    _isPrerendering: false;
-    assetsManifest: null;
-    _viteDevServer: ViteDevServer;
-    viteConfig: ResolvedConfig;
-    viteConfigRuntime: {
-        root: string;
-        build: {
-            outDir: string;
-        };
-        _baseViteOriginal: string;
-        vitePluginServerEntry: {
-            inject: boolean | undefined;
-        };
-    };
-    baseServer: string;
-    baseAssets: string;
-    isClientSide: false;
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    isGlobalContext: true;
-    _virtualFileExports: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-} | {
-    _isPrerendering: true;
-    viteConfig: ResolvedConfig;
-    _isProduction: true;
-    assetsManifest: ViteManifest;
-    _viteDevServer: null;
-    viteConfigRuntime: {
-        root: string;
-        build: {
-            outDir: string;
-        };
-        _baseViteOriginal: string;
-        vitePluginServerEntry: {
-            inject: boolean | undefined;
-        };
-    };
-    _usesClientRouter: boolean;
-    baseServer: string;
-    baseAssets: string;
-    isClientSide: false;
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    isGlobalContext: true;
-    _virtualFileExports: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-} | {
-    _isPrerendering: false;
-    viteConfig: null;
-    _isProduction: true;
-    assetsManifest: ViteManifest;
-    _viteDevServer: null;
-    viteConfigRuntime: {
-        root: string;
-        build: {
-            outDir: string;
-        };
-        _baseViteOriginal: string;
-        vitePluginServerEntry: {
-            inject: boolean | undefined;
-        };
-    };
-    _usesClientRouter: boolean;
-    baseServer: string;
-    baseAssets: string;
-    isClientSide: false;
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    isGlobalContext: true;
-    _virtualFileExports: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-}), "pages" | "viteConfig" | "viteConfigRuntime" | "assetsManifest" | "baseServer" | "baseAssets" | "config" | "isClientSide">;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
 declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
 declare function setGlobalContext_isPrerendering(): void;
@@ -380,13 +189,23 @@ declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is Build
 declare function updateUserFiles(): Promise<void>;
 declare function setGlobalContext(virtualFileExports: unknown): Promise<{
     isGlobalContext: true;
+    _isOriginalObject: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
+    _userFriendlyConfigsGlobal: PageConfigUserFriendly;
     config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+    pages: {
+        [k: string]: PageConfigUserFriendly & ({
+            route: import("../../shared/page-configs/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
+    };
 } & ({
     _isProduction: false;
     _isPrerendering: false;
@@ -408,14 +227,6 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
     isClientSide: false;
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    isGlobalContext: true;
-    _virtualFileExports: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
 } | {
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -438,14 +249,6 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
     isClientSide: false;
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    isGlobalContext: true;
-    _virtualFileExports: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
 } | {
     _isPrerendering: false;
     viteConfig: null;
@@ -468,13 +271,5 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
     isClientSide: false;
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    isGlobalContext: true;
-    _virtualFileExports: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    config: import("../../types/index.js").ConfigResolved;
-    pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
 })>;
 declare function clearGlobalContext(): void;

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

@@ -25,7 +25,7 @@ export { updateUserFiles };
 //   - Without vike-server it's manually loaded here using importServerProductionEntry() which uses @brillout/vite-plugin-server-entry's autoImporter or crawler
 // - In development: globalObject.viteDevServer which is Vite's development server
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExports
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, debugGlob, getGlobalObject, genPromise, createDebugger, getPublicProxy, checkType, PROJECT_VERSION } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, debugGlob, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdImportUserCodeServer } from '../shared/virtual-files/virtualFileImportUserCode.js';
 import pc from '@brillout/picocolors';
@@ -33,6 +33,7 @@ import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { assertV1Design } from '../shared/assertV1Design.js';
 import { resolveBase } from '../shared/resolveBase.js';
 import { createGlobalContextShared, getGlobalContextSyncErrMsg } from '../../shared/createGlobalContextShared.js';
+import { prepareGlobalContextForPublicUsage } from '../../shared/prepareGlobalContextForPublicUsage.js';
 const debug = createDebugger('vike:globalContext');
 const globalObject = getGlobalObject('runtime/globalContext.ts', getInitialGlobalContext());
 // Trick to break down TypeScript circular dependency
@@ -44,10 +45,9 @@ async function getGlobalContextServerInternal() {
     assertGlobalContextIsDefined();
     if (globalObject.isProduction !== true)
         await globalObject.waitForUserFilesUpdate;
-    const { globalContext, globalContext_public } = globalObjectTyped;
+    const { globalContext } = globalObjectTyped;
     assertIsDefined(globalContext);
-    assert(globalContext_public);
-    return { globalContext, globalContext_public };
+    return { globalContext };
 }
 function assertIsDefined(globalContext) {
     if (!globalContext) {
@@ -59,7 +59,6 @@ function assertIsDefined(globalContext) {
 function assertGlobalContextIsDefined() {
     assertIsDefined(globalObjectTyped.globalContext);
     assert(globalObject.globalContext);
-    assert(globalObject.globalContext_public);
 }
 // We purposely return GlobalContext instead of GlobalContextServer because `import { getGlobalContext } from 'vike'` can resolve to the client-side implementation.
 /**
@@ -89,9 +88,7 @@ async function getGlobalContextAsync(isProduction) {
     if (!isProduction)
         await globalObject.waitForUserFilesUpdate;
     assertGlobalContextIsDefined();
-    const { globalContext_public } = globalObjectTyped;
-    assert(globalContext_public);
-    return globalContext_public;
+    return getGlobalContextForPublicUsage();
 }
 /**
  * Get runtime information about your app.
@@ -102,26 +99,19 @@ async function getGlobalContextAsync(isProduction) {
  */
 function getGlobalContextSync() {
     debug('getGlobalContextSync()');
-    const { globalContext_public } = globalObjectTyped;
-    assertUsage(globalContext_public, getGlobalContextSyncErrMsg);
+    const { globalContext } = globalObjectTyped;
+    assertUsage(globalContext, getGlobalContextSyncErrMsg);
     assertWarning(false, 
     // We discourage users from using it because `pageContext.globalContext` is safer: I ain't sure but there could be race conditions when using `getGlobalContextSync()` inside React/Vue components upon HMR.
     // We're lying about "is going to be deprecated in the next major release": let's keep it and see if users need it (so far I can't see a use case for it).
     'getGlobalContextSync() is going to be deprecated in the next major release, see https://vike.dev/getGlobalContext', { onlyOnce: true });
-    return globalContext_public;
-}
-function makePublic(globalContext) {
-    const globalContextPublic = getPublicProxy(globalContext, 'globalContext', [
-        'assetsManifest',
-        'config',
-        'viteConfig',
-        'viteConfigRuntime',
-        'pages',
-        'baseServer',
-        'baseAssets',
-        'isClientSide'
-    ], true);
-    return globalContextPublic;
+    return getGlobalContextForPublicUsage();
+}
+function getGlobalContextForPublicUsage() {
+    const { globalContext } = globalObjectTyped;
+    assert(globalContext);
+    const globalContextForPublicUsage = prepareGlobalContextForPublicUsage(globalContext);
+    return globalContextForPublicUsage;
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
     debug('setGlobalContext_viteDevServer()');
@@ -335,8 +325,6 @@ async function setGlobalContext(virtualFileExports) {
     assertV1Design(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
-    // Public usage
-    globalObject.globalContext_public = makePublic(globalContext);
     assertGlobalContextIsDefined();
     onSetupRuntime();
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
@@ -358,7 +346,6 @@ async function addGlobalContext(globalContext) {
         assert(viteConfigRuntime);
         assert(!isPrerendering);
         return {
-            ...globalContext,
             ...globalContextBase,
             ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
             _isProduction: false,
@@ -376,7 +363,6 @@ async function addGlobalContext(globalContext) {
         assert(buildInfo);
         assert(assetsManifest);
         const globalContextBase2 = {
-            ...globalContext,
             ...globalContextBase,
             ...resolveBaseRuntime(buildInfo.viteConfigRuntime, globalContext.config),
             _isProduction: true,

package/dist/esm/node/runtime/html/serializeContext.d.ts

@@ -12,7 +12,7 @@ type PageContextSerialization = {
     is404: null | boolean;
     pageProps?: Record<string, unknown>;
     _pageContextInit: Record<string, unknown>;
-    globalContext: Record<string, any>;
+    _globalContext: Record<string, any>;
 };
 declare function getPageContextClientSerialized(pageContext: PageContextSerialization): string;
 declare function getGlobalContextClientSerialized(pageContext: PageContextSerialization): string;

package/dist/esm/node/runtime/html/serializeContext.js

@@ -36,7 +36,7 @@ function getPageContextClientSerialized(pageContext) {
 }
 function getGlobalContextClientSerialized(pageContext) {
     const passToClient = pageContext._passToClient;
-    const globalContextClient = applyPassToClient(passToClient, pageContext.globalContext);
+    const globalContextClient = applyPassToClient(passToClient, pageContext._globalContext);
     const globalContextClientSerialized = serializeObject(globalContextClient, 'globalContext', passToClient);
     return globalContextClientSerialized;
 }

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

@@ -2,4 +2,4 @@ export { getCacheControl };
 import type { PageConfigRuntime } from '../../../../shared/page-configs/PageConfig.js';
 import type { HttpResponse } from '../createHttpResponse.js';
 type StatusCode = HttpResponse['statusCode'];
-declare function getCacheControl(pageId: string, pageConfigs: PageConfigRuntime[], statusCode: StatusCode): string;
+declare function getCacheControl(pageId: string | null, pageConfigs: PageConfigRuntime[], statusCode: StatusCode): string;

package/dist/esm/node/runtime/renderPage/createHttpResponse/getCacheControl.js

@@ -8,11 +8,13 @@ function getCacheControl(pageId, pageConfigs, statusCode) {
         return defaultValue;
     if (statusCode > 499)
         return defaultValue;
-    const pageConfig = getPageConfig(pageId, pageConfigs);
-    const configValue = getConfigValueRuntime(pageConfig, 'cacheControl', 'string');
-    const value = configValue?.value;
-    if (value)
-        return value;
+    if (pageId) {
+        const pageConfig = getPageConfig(pageId, pageConfigs);
+        const configValue = getConfigValueRuntime(pageConfig, 'cacheControl', 'string');
+        const value = configValue?.value;
+        if (value)
+            return value;
+    }
     // - Disabling caching by default is the safest strategy, because caching is problematic with authentication as described in https://github.com/vikejs/vike/issues/1275#issuecomment-1824366875
     // - Are there use cases when we don't need to disable caching?
     //   - When there isn't any <script id="vike_pageContext" type="application/json"> then we can safely have caching. (We don't implement this exception because we're lazy and it's quite a rare situation.)

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

@@ -29,7 +29,6 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = getEarlyHints(await pageContext.__getPageAssets());
     const headers = [];
-    assert(pageContext.pageId);
     const cacheControl = getCacheControl(pageContext.pageId, pageContext._pageConfigs, statusCode);
     if (cacheControl) {
         headers.push(['Cache-Control', cacheControl]);