vike 0.4.230 → 0.4.231-commit-a0ca5e4

package/client/router.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from '../dist/esm/client/client-routing-runtime/index.js'
-export { default } from '../dist/esm/client/client-routing-runtime/index.js'
+export * from '../dist/esm/client/runtime-client-routing/index.js'
+export { default } from '../dist/esm/client/runtime-client-routing/index.js'

package/client.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/esm/client/server-routing-runtime/index.js'
-export { default } from './dist/esm/client/server-routing-runtime/index.js'
+export * from './dist/esm/client/runtime-server-routing/index.js'
+export { default } from './dist/esm/client/runtime-server-routing/index.js'

package/dist/cjs/client/{client-routing-runtime → runtime-client-routing}/globalContext.js

@@ -37,7 +37,7 @@ exports.getGlobalContextClientInternal = void 0;
 const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 // @ts-ignore
-const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:client-routing"));
+const virtualFileExports = __importStar(require("virtual:vike:entry:client:client-routing"));
 const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, true, addGlobalContext);
 exports.getGlobalContextClientInternal = getGlobalContextClientInternal;
 async function addGlobalContext(globalContext) {

package/dist/cjs/client/{server-routing-runtime → runtime-server-routing}/globalContext.js

@@ -36,6 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextClientInternal = void 0;
 const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
 // @ts-ignore
-const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:server-routing"));
+const virtualFileExports = __importStar(require("virtual:vike:entry:client:server-routing"));
 const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, false);
 exports.getGlobalContextClientInternal = getGlobalContextClientInternal;

package/dist/cjs/client/shared/preparePageContextForPublicUsageClientShared.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePageContextForPublicUsageClientShared = preparePageContextForPublicUsageClientShared;
 exports.preparePageContextForPublicUsageClientMinimal = preparePageContextForPublicUsageClientMinimal;
-const utils_js_1 = require("../server-routing-runtime/utils.js");
+const utils_js_1 = require("../runtime-server-routing/utils.js");
 const preparePageContextForPublicUsage_js_1 = require("../../shared/preparePageContextForPublicUsage.js");
 function preparePageContextForPublicUsageClientShared(pageContext) {
-    // TODO/now use proxy
+    // TODO/now-proxy use proxy
     const Page = pageContext.config?.Page ||
         // TODO/next-major-release: remove
         pageContext.exports?.Page;

package/dist/cjs/node/api/build.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
-const context_js_1 = require("../cli/context.js");
-const context_js_2 = require("../prerender/context.js");
 const utils_js_1 = require("./utils.js");
 /**
  * Programmatically trigger `$ vike build`
@@ -16,7 +14,8 @@ async function build(options = {}) {
     // Pass it to pluginAutoFullBuild()
     if (viteConfigFromUserEnhanced)
         viteConfigFromUserEnhanced._viteConfigFromUserEnhanced = viteConfigFromUserEnhanced;
-    if (vikeConfig.global.config.vite6BuilderApp) {
+    if (vikeConfig.config.vite6BuilderApp) {
+        // This assertion isn't reliable: the user may still use a Vite version older than 6.0.0 — see https://github.com/vitejs/vite/pull/19355
         (0, utils_js_1.assertVersion)('Vite', vite_1.version, '6.0.0');
         const builder = await (0, vite_1.createBuilder)(viteConfigFromUserEnhanced);
         // See Vite plugin vike:build:pluginBuildApp
@@ -33,8 +32,7 @@ async function build(options = {}) {
         //    > Rationale: https://github.com/vikejs/vike/issues/2123
         await (0, vite_1.build)(viteConfigFromUserEnhanced);
         // After pre-rendering, when using the Vike CLI, the process is forcefully exited at the end of the buildVite() call above.
-        if ((0, context_js_1.isVikeCli)() && (0, context_js_2.isPrerendering)())
-            (0, utils_js_1.assert)(false);
+        // if (isVikeCli() && isPrerendering()) assert(false)
     }
     return {
     /* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -42,12 +42,12 @@ exports.assertViteRoot = assertViteRoot;
 exports.normalizeViteRoot = normalizeViteRoot;
 const vite_1 = require("vite");
 const context_js_1 = require("./context.js");
-const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../vite/shared/resolveVikeConfigInternal.js");
 const path_1 = __importDefault(require("path"));
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalContext_js_1 = require("../runtime/globalContext.js");
-const getEnvVarObject_js_1 = require("../plugin/shared/getEnvVarObject.js");
+const getEnvVarObject_js_1 = require("../vite/shared/getEnvVarObject.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('api/prepareViteApiCall.ts', {});
 async function prepareViteApiCall(options, operation) {
     clear();
@@ -62,7 +62,12 @@ function clear() {
 }
 async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteInfo = await getViteInfo(viteConfigFromUserApiOptions, operation);
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
+    (0, resolveVikeConfigInternal_js_1.setVikeConfigContext)({
+        userRootDir: viteInfo.root,
+        isDev: operation === 'dev',
+        vikeVitePluginOptions: viteInfo.vikeVitePluginOptions
+    });
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
     const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
@@ -74,7 +79,7 @@ async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
 // Apply +vite
 // - For example, Vike extensions adding Vite plugins
 function applyVikeViteConfig(viteConfigFromUserEnhanced, vikeConfig) {
-    const viteConfigs = vikeConfig.global._from.configsCumulative.vite;
+    const viteConfigs = vikeConfig._from.configsCumulative.vite;
     if (!viteConfigs)
         return viteConfigFromUserEnhanced;
     viteConfigs.values.forEach((v) => {
@@ -99,7 +104,7 @@ async function getViteInfo(viteConfigFromUserApiOptions, operation) {
     //  3) viteConfigFromUserViteFile (lowest precendence)
     // Resolve Vike's +mode setting
     {
-        const viteConfigFromUserVikeConfig = (0, utils_js_1.pick)((0, getVikeConfig_js_1.getVikeConfigFromCliOrEnv)().vikeConfigFromCliOrEnv, ['mode']);
+        const viteConfigFromUserVikeConfig = (0, utils_js_1.pick)((0, resolveVikeConfigInternal_js_1.getVikeConfigFromCliOrEnv)().vikeConfigFromCliOrEnv, ['mode']);
         if (Object.keys(viteConfigFromUserVikeConfig).length > 0) {
             viteConfigFromUserEnhanced = (0, vite_1.mergeConfig)(viteConfigFromUserEnhanced ?? {}, viteConfigFromUserVikeConfig);
         }
@@ -127,7 +132,7 @@ async function getViteInfo(viteConfigFromUserApiOptions, operation) {
     else {
         // Add Vike to plugins if not present.
         // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus vike/plugin may resolved to two different node_modules/vike directories.
-        const { plugin: vikePlugin } = await Promise.resolve().then(() => __importStar(require('../plugin/index.js')));
+        const { plugin: vikePlugin } = await Promise.resolve().then(() => __importStar(require('../vite/index.js')));
         viteConfigFromUserEnhanced = {
             ...viteConfigFromUserEnhanced,
             plugins: [...(viteConfigFromUserEnhanced?.plugins ?? []), vikePlugin()]
@@ -143,9 +148,9 @@ function findVikeVitePlugin(viteConfig) {
     let vikeVitePluginOptions;
     let vikeVitePuginFound = false;
     viteConfig?.plugins?.forEach((p) => {
-        if (p && '__vikeVitePluginOptions' in p) {
+        if (p && '_vikeVitePluginOptions' in p) {
             vikeVitePuginFound = true;
-            const options = p.__vikeVitePluginOptions;
+            const options = p._vikeVitePluginOptions;
             vikeVitePluginOptions ?? (vikeVitePluginOptions = {});
             Object.assign(vikeVitePluginOptions, options);
         }

package/dist/cjs/node/api/preview.js

@@ -7,7 +7,7 @@ exports.preview = preview;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
 const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
-const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
+const getOutDirs_js_1 = require("../vite/shared/getOutDirs.js");
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const node_path_1 = __importDefault(require("node:path"));

package/dist/cjs/node/cli/parseCli.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCli = parseCli;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("./utils.js");
-const getEnvVarObject_js_1 = require("../plugin/shared/getEnvVarObject.js");
+const getEnvVarObject_js_1 = require("../vite/shared/getEnvVarObject.js");
 const commands = [
     { name: 'dev', desc: 'Start development server' },
     { name: 'build', desc: 'Build for production' },

package/dist/cjs/node/prerender/context.js

@@ -12,7 +12,7 @@ function isPrerenderAutoRunEnabled(vikeConfig) {
     return (prerenderConfigGlobal.isPrerenderingEnabled &&
         !(prerenderConfigGlobal || {}).disableAutoRun &&
         !globalObject.isDisabled &&
-        vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
+        vikeConfig.config.disableAutoFullBuild !== 'prerender');
 }
 // TODO/v1-release: remove
 function temp_disablePrerenderAutoRun() {

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

@@ -7,7 +7,7 @@ const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfi
 // 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,
@@ -26,20 +26,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;
         }
     }
     (0, utils_js_1.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/cjs/node/prerender/runPrerender.js

@@ -59,16 +59,15 @@ const abort_js_1 = require("../../shared/route/abort.js");
 const loadPageConfigsLazyServerSide_js_1 = require("../runtime/renderPage/loadPageConfigsLazyServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
-const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../vite/shared/resolveVikeConfigInternal.js");
 const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
 const execHook_js_1 = require("../../shared/hooks/execHook.js");
 const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
 const context_js_1 = require("./context.js");
 const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
-const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
+const getOutDirs_js_1 = require("../vite/shared/getOutDirs.js");
 const context_js_2 = require("../cli/context.js");
-const isViteCliCall_js_1 = require("../plugin/shared/isViteCliCall.js");
-const commonConfig_js_1 = require("../plugin/plugins/commonConfig.js");
+const isViteCliCall_js_1 = require("../vite/shared/isViteCliCall.js");
 const node_fs_1 = __importDefault(require("node:fs"));
 const getProxyForPublicUsage_js_1 = require("../../shared/getProxyForPublicUsage.js");
 const docLink = 'https://vike.dev/i18n#pre-rendering';
@@ -116,15 +115,16 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
-    const vike = (0, commonConfig_js_1.getVikeConfigInternal)(viteConfig);
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         (0, utils_js_1.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.`
@@ -144,7 +144,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);
@@ -173,7 +173,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     await warnMissingPages(prerenderContext._prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = preparePrerenderContextForPublicUsage(prerenderContext);
-    (0, utils_js_1.objectAssign)(vike.prerenderContext, prerenderContextPublic, true);
+    (0, utils_js_1.objectAssign)(vikeConfig.prerenderContext, prerenderContextPublic, true);
     if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
         node_fs_1.default.rmSync(outDirServer, { recursive: true });
     }

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.vikeConfigErrorRecoverMsg = void 0;
 exports.getGlobalContext = getGlobalContext;
 exports.getGlobalContextSync = getGlobalContextSync;
 exports.getGlobalContextAsync = getGlobalContextAsync;
@@ -30,18 +31,22 @@ exports.updateUserFiles = updateUserFiles;
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExports
 const utils_js_1 = require("./utils.js");
 const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
-const virtualFileImportUserCode_js_1 = require("../shared/virtual-files/virtualFileImportUserCode.js");
+const virtualFileEntry_js_1 = require("../shared/virtualFiles/virtualFileEntry.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 const assertV1Design_js_1 = require("../shared/assertV1Design.js");
 const resolveBase_js_1 = require("../shared/resolveBase.js");
 const createGlobalContextShared_js_1 = require("../../shared/createGlobalContextShared.js");
 const prepareGlobalContextForPublicUsage_js_1 = require("../../shared/prepareGlobalContextForPublicUsage.js");
+const renderPage_js_1 = require("./renderPage.js");
+const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
 const globalObject = (0, utils_js_1.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 = picocolors_1.default.bold(picocolors_1.default.green('Vike config loaded'));
+exports.vikeConfigErrorRecoverMsg = vikeConfigErrorRecoverMsg;
 async function getGlobalContextServerInternal() {
     // getGlobalContextServerInternal() should always be called after initGlobalContext()
     (0, utils_js_1.assert)(globalObject.isInitialized);
@@ -125,9 +130,11 @@ async function setGlobalContext_viteDevServer(viteDevServer) {
     }
     (0, utils_js_1.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)
@@ -189,24 +196,13 @@ async function initGlobalContext_getPagesAndRoutes() {
     setIsProduction(true);
     await initGlobalContext();
 }
-async function waitForViteDevServer() {
-    debug('waitForViteDevServer()');
-    const waitFor = 20;
-    const timeout = setTimeout(() => {
-        (0, utils_js_1.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;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     if (!isProduction) {
-        await waitForViteDevServer();
+        await globalObject.viteDevServerPromise;
+        (0, utils_js_1.assert)(globalObject.waitForUserFilesUpdate);
+        await globalObject.waitForUserFilesUpdate;
     }
     else {
         await loadBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
@@ -302,26 +298,64 @@ function assertVersionAtBuildTime(versionAtBuildTime) {
     (0, utils_js_1.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 } = (0, utils_js_1.genPromise)();
     (0, utils_js_1.assert)(!globalObject.isProduction);
+    const { promise, resolve } = (0, utils_js_1.genPromise)();
     globalObject.waitForUserFilesUpdate = promise;
+    globalObject.waitForUserFilesUpdateResolve ?? (globalObject.waitForUserFilesUpdateResolve = []);
+    globalObject.waitForUserFilesUpdateResolve.push(resolve);
+    const onError = (err) => {
+        console.error(err);
+        (0, renderPage_js_1.renderPage_vikeConfigHasError)({ hasRuntimeError: { err } });
+        globalObject.vikeConfigHasRuntimeError = true;
+        return { success: false };
+    };
+    const onSuccess = () => {
+        if (globalObject.vikeConfigHasRuntimeError) {
+            (0, utils_js_1.assert)(loggerRuntime_js_1.logRuntimeInfo); // always defined in dev
+            (0, loggerRuntime_js_1.logRuntimeInfo)(vikeConfigErrorRecoverMsg, null, 'error-recover');
+        }
+        globalObject.vikeConfigHasRuntimeError = false;
+        (0, renderPage_js_1.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;
     (0, utils_js_1.assert)(viteDevServer);
+    let hasError = false;
     let virtualFileExports;
+    let err;
     try {
-        virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer);
+        virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileEntry_js_1.virtualFileIdEntryServer);
     }
-    catch (err) {
-        (0, utils_js_1.debugGlob)(`Glob error: ${virtualFileImportUserCode_js_1.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;
-    (0, utils_js_1.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 (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext);

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

@@ -20,7 +20,7 @@ async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectF
     (0, utils_js_1.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/cjs/node/runtime/html/serializeContext.js

@@ -71,7 +71,9 @@ function serializeObject(obj, objName, passToClient) {
                     if ((0, stringify_1.isJsonSerializerError)(err)) {
                         pathString = err.pathString;
                     }
-                    (0, utils_js_1.assertUsage)(false, `Cannot serialize config ${h(pathString)} set by useConfig(), see https://vike.dev/useConfig#serialization-error`);
+                    // There used to be a `## Serialization Error` section in the docs but we removed it at:
+                    // https://github.com/vikejs/vike/commit/c9da2f577db01bd1c8f72265ff83e78484ddc2c0
+                    (0, utils_js_1.assertUsage)(false, `Cannot serialize config value ${h(pathString)} set by useConfig()`);
                 }
                 // Non-serializable property set by the user
                 let msg = [
@@ -110,7 +112,7 @@ function serializeValue(value, varName) {
 }
 function getPassToClientPageContext(pageContext) {
     let passToClient = [...pageContext._passToClient, ...passToClientBuiltInPageContext];
-    if ((0, error_page_js_1.isErrorPage)(pageContext.pageId, pageContext._pageConfigs)) {
+    if ((0, error_page_js_1.isErrorPage)(pageContext.pageId, pageContext._globalContext._pageConfigs)) {
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'is404', 'boolean'));
         (0, addIs404ToPageProps_js_1.addIs404ToPageProps)(pageContext);
         passToClient.push(...pageToClientBuiltInPageContextError);

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

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// 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.
 __exportStar(require("./index.js"), exports);
 const utils_js_1 = require("./utils.js");

package/dist/cjs/node/runtime/{renderPage/loggerRuntime.js → loggerRuntime.js}

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logRuntimeInfo = exports.logRuntimeError = void 0;
 exports.overwriteRuntimeProductionLogger = overwriteRuntimeProductionLogger;
 exports.logRuntimeInfo = null; // logInfo is null in production
-const loggerProd_js_1 = require("./loggerProd.js");
+const loggerProd_js_1 = require("./renderPage/loggerProd.js");
 // Set production logger (which is overwritten by loggerNotProd.ts in non-production environments such as development and during pre-rendering)
 exports.logRuntimeError =
     // @ts-expect-error

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzePage = analyzePage;
 const determineClientEntry_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide/determineClientEntry.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
 async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
@@ -17,14 +17,14 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
-            id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),
+            id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, true),
             onlyAssets: isClientRuntimeLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
         if (!globalContext._isProduction) {
             clientDependencies.push({
-                id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, false),
+                id: (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageConfig.pageId, false),
                 onlyAssets: true,
                 eagerlyImported: false
             });

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

@@ -16,7 +16,7 @@ const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponse/assertNo
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
-        const isError = !pageContext.pageId || (0, error_page_js_1.isErrorPage)(pageContext.pageId, pageContext._pageConfigs);
+        const isError = !pageContext.pageId || (0, error_page_js_1.isErrorPage)(pageContext.pageId, pageContext._globalContext._pageConfigs);
         if (pageContext.errorWhileRendering) {
             (0, utils_js_1.assert)(isError);
         }
@@ -31,7 +31,7 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = (0, getEarlyHints_js_1.getEarlyHints)(await pageContext.__getPageAssets());
     const headers = [];
-    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._pageConfigs, statusCode);
+    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs, statusCode);
     if (cacheControl) {
         headers.push(['Cache-Control', cacheControl]);
     }
@@ -66,7 +66,7 @@ function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
 }
 function createHttpResponseError(pageContext) {
     const reason = (() => {
-        const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);
+        const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs);
         if (errorPageId) {
             return "the error page (https://vike.dev/error-page) couldn't be rendered (for example if an error occurred while rendering the error page)";
         }

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

@@ -13,24 +13,16 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     (0, utils_js_1.objectAssign)(pageContextCreated, {
         _globalContext: globalContext,
-        // The following is defined on `pageContext` because we can eventually make these non-global
+        _pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
+        // We use pageContext._baseServer and pageContext._baseAssets instead of pageContext._globalContext.baseServer and pageContext._globalContext.baseAssets because the Base URLs can (eventually one day if needed) be made non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
-        // TODO/now: add meta.default
-        _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
-        // TODO/soon: use GloablContext instead
-        _pageFilesAll: globalContext._pageFilesAll,
-        _pageConfigs: globalContext._pageConfigs,
-        _pageConfigGlobal: globalContext._pageConfigGlobal,
-        _allPageIds: globalContext._allPageIds,
-        _pageRoutes: globalContext._pageRoutes,
-        _onBeforeRouteHook: globalContext._onBeforeRouteHook,
         _pageContextInit: pageContextInit,
         _urlRewrite: null,
         _urlHandler: urlHandler,
         isClientSideNavigation
     });
-    (0, utils_js_1.objectAssign)(pageContextCreated, globalContext._userFriendlyConfigsGlobal);
+    (0, utils_js_1.objectAssign)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
     // pageContext.urlParsed
     const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContextCreated);
     (0, utils_js_1.objectAssign)(pageContextCreated, pageContextUrlComputed);
@@ -51,7 +43,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
+    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
     (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -9,7 +9,7 @@ const utils_js_1 = require("../utils.js");
 function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies }) {
     const debug = (0, utils_js_1.createDebugger)('vike:pageFiles', { serialization: { emptyArray: 'None' } });
     const padding = '   - ';
-    debug('All page files:', printPageFiles(pageContext._pageFilesAll, true)); // TODO
+    debug('All page files:', printPageFiles(pageContext._globalContext._pageFilesAll, true));
     debug(`URL:`, pageContext.urlOriginal);
     debug.options({ serialization: { emptyArray: 'No match' } })(`Routing:`, printRouteMatches(pageContext._debugRouteMatches));
     debug(`pageId:`, pageContext.pageId);

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

@@ -11,7 +11,7 @@ const stream_js_1 = require("../html/stream.js");
 const assertPageContextProvidedByUser_js_1 = require("../../../shared/assertPageContextProvidedByUser.js");
 const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContextForPublicUsageServer.js");
 const assertHookReturnedObject_js_1 = require("../../../shared/assertHookReturnedObject.js");
-const loggerRuntime_js_1 = require("./loggerRuntime.js");
+const loggerRuntime_js_1 = require("../loggerRuntime.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const execHook_js_1 = require("../../../shared/hooks/execHook.js");
 async function executeOnRenderHtmlHook(pageContext) {
@@ -57,7 +57,7 @@ function getRenderHook(pageContext) {
         }
     }
     if (!hookFound) {
-        const hookName = pageContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
+        const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
         (0, utils_js_1.assertUsage)(false, [
             `No ${hookName}() hook found, see https://vike.dev/${hookName}`
             /*

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

@@ -105,7 +105,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
         (0, utils_js_1.assert)(['a ', 'an ', 'the '].some((s) => streamName.startsWith(s)));
         (0, utils_js_1.assert)(renderHook);
         const { hookFilePath, hookName } = renderHook;
-        return `Make sure the ${hookName}() defined by ${hookFilePath} hook provides ${streamName} instead`;
+        return `Make sure the ${hookName}() hook defined by ${hookFilePath} provides ${streamName} instead`;
     }
 }
 function getErrMsg(htmlRender, renderHook, method, msgAddendum) {