vike 0.4.230-commit-f07cc20 → 0.4.231-commit-a0ca5e4

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

@@ -5,7 +5,7 @@ import { getConfigValueBuildTime } from '../../shared/page-configs/getConfigValu
 // When setting +prerender to an object => it also enables pre-rendering
 const defaultValueForObject = true;
 function resolvePrerenderConfigGlobal(vikeConfig) {
-    const prerenderConfigs = vikeConfig.global.config.prerender || [];
+    const prerenderConfigs = vikeConfig.config.prerender || [];
     const prerenderSettings = prerenderConfigs.filter(isObject2);
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
@@ -24,20 +24,20 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
     // TODO/next-major: remove
     // Backwards compatibility for `vike({prerender:true})` in vite.config.js
     {
-        const valuesWithDefinedAt = vikeConfig.global._from.configsCumulative.prerender?.values ?? [];
+        const valuesWithDefinedAt = vikeConfig._from.configsCumulative.prerender?.values ?? [];
         if (valuesWithDefinedAt.some((v) => v.definedAt.includes('vite.config.js') && v.value)) {
             defaultLocalValue = true;
         }
     }
     objectAssign(prerenderConfigGlobal, {
         defaultLocalValue,
-        isPrerenderingEnabledForAllPages: vikeConfig.pageConfigs.length > 0 &&
-            vikeConfig.pageConfigs.every((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value ?? defaultLocalValue),
-        isPrerenderingEnabled: vikeConfig.pageConfigs.length > 0 &&
-            vikeConfig.pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value ?? defaultLocalValue)
+        isPrerenderingEnabledForAllPages: vikeConfig._pageConfigs.length > 0 &&
+            vikeConfig._pageConfigs.every((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value ?? defaultLocalValue),
+        isPrerenderingEnabled: vikeConfig._pageConfigs.length > 0 &&
+            vikeConfig._pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value ?? defaultLocalValue)
     });
     // TODO/next-major remove
-    if (vikeConfig.pageConfigs.length === 0 && defaultLocalValue)
+    if (vikeConfig._pageConfigs.length === 0 && defaultLocalValue)
         prerenderConfigGlobal.isPrerenderingEnabled = true;
     return prerenderConfigGlobal;
 }

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

@@ -73,7 +73,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
 } & {
     isClientSide: false;
     isPrerendering: boolean;
-} & Pick<import("../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
+} & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
     url?: string;
     headers?: Record<string, string>;
 } & {
@@ -82,19 +82,18 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
-        _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            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/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
-                route: import("../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & ({
         _isProduction: false;
@@ -121,7 +120,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isPrerendering: true;
         viteConfig: ResolvedConfig;
         _isProduction: true;
-        assetsManifest: import("../shared/ViteManifest.js").ViteManifest;
+        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         viteConfigRuntime: {
             root: string;
@@ -143,7 +142,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isPrerendering: false;
         viteConfig: null;
         _isProduction: true;
-        assetsManifest: import("../shared/ViteManifest.js").ViteManifest;
+        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         viteConfigRuntime: {
             root: string;
@@ -162,20 +161,19 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     });
+    _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _includeAssetsImportedByServer: boolean;
-    _pageFilesAll: PageFile[];
-    _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
     _urlRewrite: null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
+} & {
+    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;
+} & {
     urlParsed: import("../shared/utils.js").UrlPublic;
     urlPathname: string;
     url: string;
@@ -196,7 +194,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
 } & {
     isClientSide: false;
     isPrerendering: boolean;
-} & Pick<import("../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
+} & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
     url?: string;
     headers?: Record<string, string>;
 } & {
@@ -205,19 +203,18 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
-        _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            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/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
-                route: import("../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & ({
         _isProduction: false;
@@ -244,7 +241,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isPrerendering: true;
         viteConfig: ResolvedConfig;
         _isProduction: true;
-        assetsManifest: import("../shared/ViteManifest.js").ViteManifest;
+        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         viteConfigRuntime: {
             root: string;
@@ -266,7 +263,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isPrerendering: false;
         viteConfig: null;
         _isProduction: true;
-        assetsManifest: import("../shared/ViteManifest.js").ViteManifest;
+        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         viteConfigRuntime: {
             root: string;
@@ -285,20 +282,19 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     });
+    _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _includeAssetsImportedByServer: boolean;
-    _pageFilesAll: PageFile[];
-    _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
     _urlRewrite: null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
+} & {
+    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;
+} & {
     urlParsed: import("../shared/utils.js").UrlPublic;
     urlPathname: string;
     url: string;
@@ -317,7 +313,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     pageId: string;
     _debugRouteMatches: never[];
     routeParams: {};
-})) & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
+})) & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];

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

@@ -10,7 +10,7 @@ import { createPageContextServerSide } from '../runtime/renderPage/createPageCon
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
 import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering } from '../runtime/globalContext.js';
-import { resolveConfig } from 'vite';
+import { resolveConfig as resolveViteConfig } from 'vite';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
@@ -21,16 +21,15 @@ import { isAbortError } from '../../shared/route/abort.js';
 import { loadPageConfigsLazyServerSide } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
 import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, getHook_setIsPrerenderering } from '../../shared/hooks/getHook.js';
 import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
-import { getVikeConfig } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
 import { logErrorHint } from '../runtime/renderPage/logErrorHint.js';
 import { execHookWithoutPageContext, isUserHookError } from '../../shared/hooks/execHook.js';
 import { prepareViteApiCall } from '../api/prepareViteApiCall.js';
 import { setContextIsPrerendering } from './context.js';
 import { resolvePrerenderConfigGlobal, resolvePrerenderConfigLocal } from './resolvePrerenderConfig.js';
-import { getOutDirs } from '../plugin/shared/getOutDirs.js';
+import { getOutDirs } from '../vite/shared/getOutDirs.js';
 import { isVikeCli } from '../cli/context.js';
-import { isViteCliCall } from '../plugin/shared/isViteCliCall.js';
-import { getVikeConfigInternal } from '../plugin/plugins/commonConfig.js';
+import { isViteCliCall } from '../vite/shared/isViteCliCall.js';
 import fs from 'node:fs';
 import { getProxyForPublicUsage } from '../../shared/getProxyForPublicUsage.js';
 const docLink = 'https://vike.dev/i18n#pre-rendering';
@@ -77,16 +76,17 @@ async function runPrerender(options = {}, standaloneTrigger) {
         console.log(`${pc.cyan(`vike v${PROJECT_VERSION}`)} ${pc.green('pre-rendering HTML...')}`);
     }
     await disableReactStreaming();
-    const viteConfig = await resolveConfig(options.viteConfig || {}, 'build', 'production');
-    const vikeConfig = await getVikeConfig(viteConfig);
-    const vike = getVikeConfigInternal(viteConfig);
+    const viteConfig = await resolveViteConfig(options.viteConfig || {}, 'build', 'production');
+    const vikeConfig = await getVikeConfigInternal();
     const { outDirClient, outDirServer } = getOutDirs(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         assert(standaloneTrigger);
-        /* TODO/soon: use this again a little while after https://github.com/magne4000/vite-plugin-vercel/pull/156 is merged.
+        /* TODO/v1-release: use this assertUsage() again.
+         * - Make sure https://github.com/magne4000/vite-plugin-vercel/pull/156 is merged before using this assertUsage() again. (Otherwise vite-plugin-vercel will trigger this assertUsage() call.)
+         *   - Done: PR is merged as of June 20205
         assertUsage(
           false,
           `You're executing ${pc.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the ${pc.cyan('prerender')} setting (${pc.underline('https://vike.dev/prerender')}) to enable pre-rendering for at least one page.`
@@ -106,7 +106,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
         _prerenderedPageContexts: {}
     };
     const doNotPrerenderList = [];
-    await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext);
+    await collectDoNoPrerenderList(vikeConfig._pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext);
     // Allow user to create `pageContext` for parameterized routes and/or bulk data fetching
     // https://vike.dev/onBeforePrerenderStart
     await callOnBeforePrerenderStartHooks(prerenderContext, globalContext, concurrencyLimit, doNotPrerenderList);
@@ -135,7 +135,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     await warnMissingPages(prerenderContext._prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = preparePrerenderContextForPublicUsage(prerenderContext);
-    objectAssign(vike.prerenderContext, prerenderContextPublic, true);
+    objectAssign(vikeConfig.prerenderContext, prerenderContextPublic, true);
     if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
         fs.rmSync(outDirServer, { recursive: true });
     }

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

@@ -15,14 +15,15 @@ export { setGlobalContext_buildEntry };
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
+export { vikeConfigErrorRecoverMsg };
 export type { BuildInfo };
 export type { GlobalContextServerInternal as GlobalContextServerInternal };
 export type { GlobalContextServer };
-import type { ViteManifest } from '../shared/ViteManifest.js';
+import type { ViteManifest } from '../../types/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';
+import type { ViteConfigRuntime } from '../vite/shared/getViteConfigRuntime.js';
+import type { GlobalContext } from '../../types/PageContext.js';
+declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 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<{
@@ -31,19 +32,18 @@ declare function getGlobalContextServerInternal(): Promise<{
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            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]: PageConfigUserFriendly & ({
-                route: import("../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & {
         _isProduction: false;
@@ -71,19 +71,18 @@ declare function getGlobalContextServerInternal(): Promise<{
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            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]: PageConfigUserFriendly & ({
-                route: import("../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & {
         _isPrerendering: true;
@@ -112,19 +111,18 @@ declare function getGlobalContextServerInternal(): Promise<{
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            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]: PageConfigUserFriendly & ({
-                route: import("../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & {
         _isPrerendering: false;
@@ -186,25 +184,26 @@ type BuildInfo = {
     viteConfigRuntime: ViteConfigRuntime;
 };
 declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is BuildInfo;
-declare function updateUserFiles(): Promise<void>;
+declare function updateUserFiles(): Promise<{
+    success: boolean;
+}>;
 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;
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
-    _userFriendlyConfigsGlobal: PageConfigUserFriendly;
+    _vikeConfigPublicGlobal: {
+        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]: PageConfigUserFriendly & ({
-            route: import("../../shared/page-configs/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
     };
 } & ({
     _isProduction: false;

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

@@ -17,6 +17,7 @@ export { setGlobalContext_buildEntry };
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
+export { vikeConfigErrorRecoverMsg };
 // The core logic revolves around:
 // - virtualFileExports is the main requirement
 // - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
@@ -25,20 +26,23 @@ 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, checkType, PROJECT_VERSION } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, 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 { virtualFileIdEntryServer } from '../shared/virtualFiles/virtualFileEntry.js';
 import pc from '@brillout/picocolors';
 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';
+import { renderPage_vikeConfigHasError } from './renderPage.js';
+import { logRuntimeInfo } from './loggerRuntime.js';
 const debug = createDebugger('vike:globalContext');
 const globalObject = getGlobalObject('runtime/globalContext.ts', getInitialGlobalContext());
 // Trick to break down TypeScript circular dependency
 // https://chat.deepseek.com/a/chat/s/d7e9f90a-c7f3-4108-9cd5-4ad6caed3539
 const globalObjectTyped = globalObject;
+const vikeConfigErrorRecoverMsg = pc.bold(pc.green('Vike config loaded'));
 async function getGlobalContextServerInternal() {
     // getGlobalContextServerInternal() should always be called after initGlobalContext()
     assert(globalObject.isInitialized);
@@ -122,9 +126,11 @@ async function setGlobalContext_viteDevServer(viteDevServer) {
     }
     assert(globalObject.viteConfig);
     globalObject.viteDevServer = viteDevServer;
-    await updateUserFiles();
-    assertGlobalContextIsDefined();
     globalObject.viteDevServerPromiseResolve(viteDevServer);
+    const { success } = await updateUserFiles();
+    if (!success)
+        return;
+    assertGlobalContextIsDefined();
 }
 function setGlobalContext_viteConfig(viteConfig, viteConfigRuntime) {
     if (globalObject.viteConfig)
@@ -186,24 +192,13 @@ async function initGlobalContext_getPagesAndRoutes() {
     setIsProduction(true);
     await initGlobalContext();
 }
-async function waitForViteDevServer() {
-    debug('waitForViteDevServer()');
-    const waitFor = 20;
-    const timeout = setTimeout(() => {
-        assertWarning(false, `Vite's development server still not created after ${waitFor} seconds.`, {
-            onlyOnce: false,
-            showStackTrace: true
-        });
-    }, waitFor * 1000);
-    await globalObject.viteDevServerPromise;
-    clearTimeout(timeout);
-    assertGlobalContextIsDefined();
-}
 async function initGlobalContext() {
     const { isProduction } = globalObject;
     assert(typeof isProduction === 'boolean');
     if (!isProduction) {
-        await waitForViteDevServer();
+        await globalObject.viteDevServerPromise;
+        assert(globalObject.waitForUserFilesUpdate);
+        await globalObject.waitForUserFilesUpdate;
     }
     else {
         await loadBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
@@ -299,26 +294,64 @@ function assertVersionAtBuildTime(versionAtBuildTime) {
     assertUsage(versionAtBuildTime === versionAtRuntime, `Re-build your app (you're using ${pretty(versionAtRuntime)} but your app was built with ${pretty(versionAtBuildTime)})`);
 }
 async function updateUserFiles() {
-    const { promise, resolve } = genPromise();
     assert(!globalObject.isProduction);
+    const { promise, resolve } = genPromise();
     globalObject.waitForUserFilesUpdate = promise;
+    globalObject.waitForUserFilesUpdateResolve ?? (globalObject.waitForUserFilesUpdateResolve = []);
+    globalObject.waitForUserFilesUpdateResolve.push(resolve);
+    const onError = (err) => {
+        console.error(err);
+        renderPage_vikeConfigHasError({ hasRuntimeError: { err } });
+        globalObject.vikeConfigHasRuntimeError = true;
+        return { success: false };
+    };
+    const onSuccess = () => {
+        if (globalObject.vikeConfigHasRuntimeError) {
+            assert(logRuntimeInfo); // always defined in dev
+            logRuntimeInfo(vikeConfigErrorRecoverMsg, null, 'error-recover');
+        }
+        globalObject.vikeConfigHasRuntimeError = false;
+        renderPage_vikeConfigHasError({ hasRuntimeError: false });
+        globalObject.waitForUserFilesUpdateResolve.forEach((resolve) => resolve());
+        globalObject.waitForUserFilesUpdateResolve = [];
+        resolve();
+        return { success: true };
+    };
+    const isOutdated = () => 
+    // There is a newer call — let the new call supersede the old one.
+    // We deliberately swallow the intermetidate state (including any potential error) — it's now outdated and has existed only for a very short period of time.
+    globalObject.waitForUserFilesUpdate !== promise ||
+        // Avoid race condition: abort if there is a new globalObject.viteDevServer (happens when vite.config.js is modified => Vite's dev server is fully reloaded).
+        viteDevServer !== globalObject.viteDevServer;
     const { viteDevServer } = globalObject;
     assert(viteDevServer);
+    let hasError = false;
     let virtualFileExports;
+    let err;
     try {
-        virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileIdImportUserCodeServer);
+        virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileIdEntryServer);
     }
-    catch (err) {
-        debugGlob(`Glob error: ${virtualFileIdImportUserCodeServer} transpile error: `, err);
-        throw err;
+    catch (err_) {
+        hasError = true;
+        err = err_;
     }
+    if (isOutdated())
+        return { success: false };
+    if (hasError)
+        return onError(err);
     virtualFileExports = virtualFileExports.default || virtualFileExports;
-    debugGlob('Glob result: ', virtualFileExports);
-    // Avoid race condition: abort if there is a new globalObject.viteDevServer (happens when vite.config.js is modified => Vite's dev server is fully reloaded).
-    if (viteDevServer !== globalObject.viteDevServer)
-        return;
-    await setGlobalContext(virtualFileExports);
-    resolve();
+    try {
+        await setGlobalContext(virtualFileExports);
+    }
+    catch (err_) {
+        hasError = true;
+        err = err_;
+    }
+    if (isOutdated())
+        return { success: false };
+    if (hasError)
+        return onError(err);
+    return onSuccess();
 }
 async function setGlobalContext(virtualFileExports) {
     const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext);

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -15,7 +15,7 @@ async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectF
     assert([true, false].includes(pageContext._isHtmlOnly));
     const isHtmlOnly = pageContext._isHtmlOnly;
     const { _isProduction: isProduction } = pageContext._globalContext;
-    const injectScriptsAt = getInjectScriptsAt(pageContext.pageId, pageContext._pageConfigs);
+    const injectScriptsAt = getInjectScriptsAt(pageContext.pageId, pageContext._globalContext._pageConfigs);
     const injectFilterEntries = [];
     pageAssets
         .filter((asset) => {

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

@@ -6,7 +6,6 @@ import type { PageAsset } from '../renderPage/getPageAssets.js';
 import type { HtmlPart } from './renderHtml.js';
 import { type PreloadFilter } from './injectAssets/getHtmlTags.js';
 import type { StreamFromReactStreamingPackage } from './stream/react-streaming.js';
-import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from './serializeContext.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
 type PageContextInjectAssets = {
@@ -20,7 +19,6 @@ type PageContextInjectAssets = {
         hookName: 'onRenderHtml' | 'render';
     };
     _baseServer: string;
-    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
     _globalContext: GlobalContextServerInternal;
 } & PageContextSerialization;

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

@@ -2,17 +2,16 @@ export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
 export type { PageContextSerialization };
-import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { UrlRedirect } from '../../../shared/route/abort.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
 type PageContextSerialization = {
     pageId: string;
     routeParams: Record<string, string>;
     _passToClient: string[];
-    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
     pageProps?: Record<string, unknown>;
     _pageContextInit: Record<string, unknown>;
-    _globalContext: Record<string, any>;
+    _globalContext: GlobalContextServerInternal;
 };
 declare function getPageContextClientSerialized(pageContext: PageContextSerialization): string;
 declare function getGlobalContextClientSerialized(pageContext: PageContextSerialization): string;

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

@@ -107,7 +107,7 @@ function serializeValue(value, varName) {
 }
 function getPassToClientPageContext(pageContext) {
     let passToClient = [...pageContext._passToClient, ...passToClientBuiltInPageContext];
-    if (isErrorPage(pageContext.pageId, pageContext._pageConfigs)) {
+    if (isErrorPage(pageContext.pageId, pageContext._globalContext._pageConfigs)) {
         assert(hasProp(pageContext, 'is404', 'boolean'));
         addIs404ToPageProps(pageContext);
         passToClient.push(...pageToClientBuiltInPageContextError);

package/dist/esm/node/runtime/index-deprecated.js

@@ -1,4 +1,4 @@
-// TODO/soon: point package.json#exports['./server'] to this file.
+// TO-DO/soon: point package.json#exports['./server'] to this file.
 // - Write migration guide, see comment below.
 export * from './index.js';
 import { assertWarning } from './utils.js';