vike 0.4.237-commit-e549c30 → 0.4.237-commit-fd8294f

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js

@@ -1,30 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigValueSourcesRelevant = getConfigValueSourcesRelevant;
+exports.getConfigValueSourceRelevantAnyEnv = getConfigValueSourceRelevantAnyEnv;
 exports.isRuntimeEnvMatch = isRuntimeEnvMatch;
+exports.isConfigSourceValueNull = isConfigSourceValueNull;
 const utils_js_1 = require("../../utils.js");
+(0, utils_js_1.assertIsNotBrowser)();
 function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
     const configDef = pageConfig.configDefinitions[configName];
     (0, utils_js_1.assert)(configDef);
     let sourcesRelevant = pageConfig.configValueSources[configName];
     if (!sourcesRelevant)
         return [];
-    if (!configDef.cumulative) {
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    // Environment filtering
+    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
+    // Overriding - non-cumulative configs
+    if (!configDef.cumulative && sourcesRelevant.length > 1) {
         const source = sourcesRelevant[0];
-        if (source) {
-            sourcesRelevant = [source];
-        }
-        else {
-            (0, utils_js_1.assert)(sourcesRelevant.length === 0);
-        }
+        (0, utils_js_1.assert)(source);
+        sourcesRelevant = [source];
     }
-    else {
-        // isOverridden() must be called before isRuntimeEnvMatch() is called (otherwise isOverridden() will return a wrong value)
-        sourcesRelevant = sourcesRelevant.filter((source) => !isOverridden(source, configName, pageConfig));
+    // Overriding - cumulative configs
+    if (configDef.cumulative && sourcesRelevant.length > 0) {
+        sourcesRelevant = applyFilenameSuffix(sourcesRelevant);
     }
-    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
     return sourcesRelevant;
 }
+function getConfigValueSourceRelevantAnyEnv(configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    (0, utils_js_1.assert)(!configDef.cumulative); // So far, this function is only used by non-cumulative configs
+    let sourcesRelevant = pageConfig.configValueSources[configName];
+    if (!sourcesRelevant)
+        return null;
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    const source = sourcesRelevant[0];
+    if (!source)
+        return null;
+    if (isConfigSourceValueNull(source))
+        return null;
+    return source;
+}
 function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     if ('isForConfig' in runtimeEnv)
         return !!configEnv.config;
@@ -54,14 +73,25 @@ function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     }
     return true;
 }
-function isOverridden(source, configName, pageConfig) {
-    const configDef = pageConfig.configDefinitions[configName];
-    (0, utils_js_1.assert)(configDef);
-    if (configDef.cumulative)
-        return false;
-    const sources = pageConfig.configValueSources[configName];
-    (0, utils_js_1.assert)(sources);
-    const idx = sources.indexOf(source);
-    (0, utils_js_1.assert)(idx >= 0);
-    return idx > 0;
+// Setting a config to `undefined` should be equivalent to not setting it at all
+function isConfigSourceValueUndefined(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === undefined;
+}
+// Setting a config to `null` enables the user to suppress inherited config by overriding it with `null` (this only works when setting the config value to `null` inside a +config.js file — it doesn't work when setting the config value to `null` with a +{configName}.js file).
+function isConfigSourceValueNull(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === null;
+}
+function applyFilenameSuffix(sourcesRelevant) {
+    const getFileName = (source) => source.plusFile?.filePath.fileName ?? '';
+    // Apply `clear`: truncate at first clear file
+    const clearIndex = sourcesRelevant.findIndex((source) => getFileName(source).includes('.clear.'));
+    if (clearIndex !== -1)
+        sourcesRelevant = sourcesRelevant.slice(0, clearIndex + 1);
+    // Apply `default`: exclude defaults if any non-defaults exist, otherwise keep only first default
+    const nonDefaults = sourcesRelevant.filter((source) => !getFileName(source).includes('.default.'));
+    return nonDefaults.length > 0 ? nonDefaults : sourcesRelevant.slice(0, 1);
 }

package/dist/cjs/node/vite/shared/getOutDirs.js

@@ -12,7 +12,7 @@ const isViteServerSide_js_1 = require("./isViteServerSide.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromResolvedConfig(configGlobal);
+    const outDir = getOutDirFromResolvedConfig(configGlobal, viteEnv);
     assertOutDirResolved(outDir, configGlobal, viteEnv);
     const outDirs = getOutDirsAll(outDir, configGlobal.root);
     assertNormalization(outDirs.outDirRoot);
@@ -119,7 +119,8 @@ function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
-    if ((0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv)) {
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv);
+    if (isServerSide) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
@@ -133,8 +134,8 @@ function getOutDirFromViteUserConfig(config) {
     outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function getOutDirFromResolvedConfig(config) {
-    let outDir = config.build.outDir;
+function getOutDirFromResolvedConfig(config, viteEnv) {
+    let outDir = viteEnv?.config.build?.outDir ?? config.build.outDir;
     (0, utils_js_1.assert)(outDir);
     outDir = normalizeOutDir(outDir);
     return outDir;

package/dist/cjs/node/vite/shared/isViteServerSide.js

@@ -6,16 +6,16 @@ exports.isViteServerSide_withoutEnv = isViteServerSide_withoutEnv;
 exports.isViteServerSide_onlySsrEnv = isViteServerSide_onlySsrEnv;
 exports.isViteServerSide_extraSafe = isViteServerSide_extraSafe;
 const assert_js_1 = require("../../../utils/assert.js");
-function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
+function isViteServerSide_impl(configGlobal, viteEnv) {
     (0, assert_js_1.assert)(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
     const isServerSide1 = !viteEnv?.config.consumer ? null : viteEnv.config.consumer !== 'client';
-    const isServerSide2 = !viteEnv?.name ? null : viteEnv.name !== 'client'; // I can't think of a use case for creating another client-side environment
-    const isServerSide3 = !viteEnv ? null : !!viteEnv.config.build?.ssr;
-    const isServerSide4 = !!configGlobal.build?.ssr;
+    const isServerSide2 = !viteEnv?.config.build ? null : getBuildSsrValue(viteEnv.config.build.ssr);
+    const isServerSide3 = !configGlobal.build ? null : getBuildSsrValue(configGlobal.build.ssr);
+    const isServerSide4 = viteEnv?.name === 'ssr' ? true : viteEnv?.name === 'client' ? false : null;
     const debug = {
-        envIsUndefined: !viteEnv,
-        envName: viteEnv?.name ?? null,
-        envConsumer: viteEnv?.config.consumer ?? null,
+        viteEnvIsUndefined: !viteEnv,
+        viteEnvName: viteEnv?.name ?? null,
+        viteEnvConsumer: viteEnv?.config.consumer ?? null,
         configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
         configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
         isServerSide1,
@@ -24,25 +24,36 @@ function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
         isServerSide4,
     };
     if (isServerSide1 !== null) {
-        (0, assert_js_1.assert)(isServerSide1 === isServerSide2 || isServerSide2 === null, debug);
+        // assert(isServerSide1 === isServerSide4 || isServerSide4 === null, debug)
         /* This assertion can fail, seems to be a Vite bug?
-        assert(isServerSide1 === isServerSide3, debug)
+        assert(isServerSide1 === isServerSide2, debug)
         */
         return isServerSide1;
     }
     if (isServerSide2 !== null) {
-        /* This assertion can fail, seems to be a Vite bug?
-        assert(isServerSide2 === isServerSide3, debug)
-        */
+        // assert(isServerSide2 === isServerSide4 || isServerSide4 === null, debug)
         return isServerSide2;
     }
     if (isServerSide3 !== null) {
+        // assert(isServerSide3 === isServerSide4 || isServerSide4 === null, debug)
         return isServerSide3;
     }
-    return isServerSide4;
+    if (isServerSide4 !== null) {
+        return isServerSide4;
+    }
+    (0, assert_js_1.assert)(!viteEnv);
+    return !!configGlobal.build?.ssr;
+}
+function getBuildSsrValue(buildSsr) {
+    if (buildSsr === undefined)
+        return null;
+    return !!buildSsr;
 }
 function isViteServerSide(configGlobal, viteEnv) {
-    return isViteServerSide_withoutEnv(configGlobal, viteEnv);
+    return isViteServerSide_impl(configGlobal, viteEnv);
+}
+function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
+    return isViteServerSide_impl(configGlobal, viteEnv);
 }
 function isViteClientSide(configGlobal, viteEnv) {
     return !isViteServerSide(configGlobal, viteEnv);
@@ -53,20 +64,36 @@ function isViteServerSide_onlySsrEnv(configGlobal, viteEnv) {
 }
 // Vite is quite messy about setting config.build.ssr — for security purposes, we use an extra safe implementation with lots of assertions, which is needed for the .client.js and .server.js guarantee.
 function isViteServerSide_extraSafe(config, options, viteEnv) {
+    const isServerSide = isViteServerSide(config, viteEnv);
+    const debug = {
+        configCommand: config.command,
+        configBuildSsr: config.build.ssr,
+        optionsIsUndefined: options === undefined,
+        optionsSsr: options?.ssr,
+        isServerSide,
+    };
+    if (true) {
+        const res = options?.ssr;
+        if (typeof res === 'boolean') {
+            (0, assert_js_1.assert)(res === isServerSide, debug);
+            return res;
+        }
+        return isServerSide;
+    }
     if (config.command === 'build') {
         const res = config.build.ssr;
-        (0, assert_js_1.assert)(typeof res === 'boolean');
-        (0, assert_js_1.assert)(res === options?.ssr || options?.ssr === undefined);
-        (0, assert_js_1.assert)(res === isViteServerSide(config, viteEnv));
+        (0, assert_js_1.assert)(typeof res === 'boolean', debug);
+        (0, assert_js_1.assert)(res === options?.ssr || options?.ssr === undefined, debug);
+        (0, assert_js_1.assert)(res === isServerSide, debug);
         return res;
     }
     else {
         const res = options?.ssr;
-        (0, assert_js_1.assert)(typeof res === 'boolean');
+        (0, assert_js_1.assert)(typeof res === 'boolean', debug);
         /* This assertion can fail, seems to be a Vite bug? It's very unexpected.
         if (typeof config.build.ssr === 'boolean') assert(res === config.build.ssr)
         */
-        (0, assert_js_1.assert)(res === isViteServerSide(config, viteEnv));
+        (0, assert_js_1.assert)(res === isServerSide, debug);
         return res;
     }
 }

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -110,7 +110,9 @@ const configDefinitionsBuiltIn = {
             }, pageConfig))
                 .flat(1)
                 // Server-only
-                .filter((source) => !source.configEnv.client);
+                .filter((source) => !source.configEnv.client)
+                // Config value isn't `null`
+                .filter((source) => !(0, getConfigValueSourcesRelevant_js_1.isConfigSourceValueNull)(source));
             return sources.length > 0;
         },
     },
@@ -122,22 +124,19 @@ const configDefinitionsBuiltIn = {
         env: { server: true, client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
             {
-                const source = getConfigValueSource(configValueSources, 'clientHooks');
+                const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)('clientHooks', pageConfig);
                 if (source) {
                     (0, utils_js_1.assert)(source.valueIsLoaded);
-                    if (source.value !== null) {
-                        const { value } = source;
-                        const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAt);
-                        (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${definedAt} should be a boolean`);
-                        return value;
-                    }
+                    const { value, definedAt } = source;
+                    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', definedAt);
+                    (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${configDefinedAt} should be a boolean`);
+                    return value;
                 }
             }
-            return (isConfigSet(configValueSources, 'onRenderClient') &&
-                isConfigSet(configValueSources, 'Page') &&
-                !!getConfigEnv(configValueSources, 'Page')?.client);
+            return (isConfigSet(pageConfig, 'onRenderClient') &&
+                isConfigSet(pageConfig, 'Page') &&
+                !!getConfigEnv(pageConfig, 'Page')?.client);
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -145,10 +144,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'onBeforeRender')
-                ? null
-                : getConfigEnv(configValueSources, 'onBeforeRender');
+            return !isConfigSet(pageConfig, 'onBeforeRender') ? null : getConfigEnv(pageConfig, 'onBeforeRender');
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -156,8 +152,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data');
+            return !isConfigSet(pageConfig, 'data') ? null : getConfigEnv(pageConfig, 'data');
         },
     },
     hooksTimeout: {
@@ -246,11 +241,11 @@ const configDefinitionsBuiltIn = {
     },
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
-function getConfigEnv(configValueSources, configName) {
-    const configValueSource = getConfigValueSource(configValueSources, configName);
-    if (!configValueSource)
+function getConfigEnv(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    if (!source)
         return null;
-    const { configEnv } = configValueSource;
+    const { configEnv } = source;
     const env = {};
     if (configEnv.client)
         env.client = true;
@@ -258,18 +253,7 @@ function getConfigEnv(configValueSources, configName) {
         env.server = true;
     return env;
 }
-function isConfigSet(configValueSources, configName) {
-    const source = getConfigValueSource(configValueSources, configName);
-    return (!!source &&
-        !(source.valueIsLoaded &&
-            // Enable users to suppress inherited config by overriding it with `null`
-            source.value === null));
-}
-function getConfigValueSource(configValueSources, configName) {
-    const sources = configValueSources[configName];
-    if (!sources)
-        return null;
-    const configValueSource = sources[0];
-    (0, utils_js_1.assert)(configValueSource);
-    return configValueSource;
+function isConfigSet(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    return !!source;
 }

package/dist/cjs/shared/page-configs/{loadPageEntry.js → loadAndParseVirtualFilePageEntry.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPageEntry = loadPageEntry;
+exports.loadAndParseVirtualFilePageEntry = loadAndParseVirtualFilePageEntry;
 const utils_js_1 = require("../utils.js");
 const parsePageConfigsSerialized_js_1 = require("./serialize/parsePageConfigsSerialized.js");
-async function loadPageEntry(pageConfig, isDev) {
+async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
     if ('isPageEntryLoaded' in pageConfig &&
         // We don't need to cache in dev, since Vite already caches the virtual module
         !isDev) {

package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js

@@ -1,4 +1,9 @@
 "use strict";
+// TO-DO/soon: rename PageConfig names
+// - Use `Internal` suffix, i.e. {Page,Global}ConfigInternal
+//   - While keeping {Page,Global}ConfigPublic or remove Public suffix and rename it to {Page,Global}Config ?
+// - rename EagerLoaded EagerlyLoaded
+// - remove `LazyLoaded` suffix
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/shared/route/execHookOnBeforeRoute.js

@@ -28,7 +28,6 @@ async function execHookOnBeforeRoute(pageContext) {
             }
             (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
                 _routingProvidedByOnBeforeRouteHook: true,
-                _debugRouteMatches: 'CUSTOM_ROUTING',
             });
             return pageContextFromOnBeforeRouteHook;
         }

package/dist/cjs/shared/route/index.js

@@ -86,7 +86,6 @@ async function route(pageContext, skipOnBeforeRouteHook) {
     (0, resolvePrecedence_js_1.resolvePrecedence)(routeMatches);
     const winner = routeMatches[0] ?? null;
     (0, debug_js_1.debug)(`Route matches for URL ${picocolors_1.default.cyan(urlPathname)} (in precedence order):`, routeMatches);
-    (0, utils_js_1.objectAssign)(pageContextFromRoute, { _debugRouteMatches: routeMatches });
     // For vite-plugin-vercel https://github.com/magne4000/vite-plugin-vercel/blob/main/packages/vike-integration/vike.ts#L173
     (0, utils_js_1.objectAssign)(pageContextFromRoute, { _routeMatch: winner });
     if (!winner) {

package/dist/cjs/utils/PROJECT_VERSION.js

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

package/dist/cjs/utils/{augmentType.js → updateType.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.augmentType = augmentType;
+exports.updateType = updateType;
 const assert_js_1 = require("./assert.js");
-/** Help TypeScript augment the type of objects. */
-function augmentType(thing, clone) {
+/** Help TypeScript update the type of dynamically modified objects. */
+function updateType(thing, clone) {
     // @ts-ignore
     (0, assert_js_1.assert)(thing === clone);
 }

package/dist/esm/__internal/index.d.ts

@@ -16,5 +16,5 @@ declare function getPagesAndRoutes(): Promise<{
     allPageIds: string[];
 }>;
 declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
-    pageContextAddendum: import("../shared/route/index.js").PageContextFromRoute;
+    pageContextAddendum: import("../shared/route/index.js").PageContextAfterRoute;
 }>;

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

@@ -3,7 +3,7 @@ import { createPageContextObject, createPageContextShared } from '../../shared/c
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { getBaseServer } from './getBaseServer.js';
 import { getGlobalContextClientInternal } from './globalContext.js';
-import { assert, augmentType, isBaseServer, objectAssign } from './utils.js';
+import { assert, updateType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
     const globalContext = await getGlobalContextClientInternal();
     const baseServer = getBaseServer();
@@ -22,6 +22,6 @@ async function createPageContextClientSide(urlOriginal) {
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
     const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
-    augmentType(pageContextCreated, pageContextAugmented);
+    updateType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -3,7 +3,7 @@ export { getRenderCount };
 export { disableClientRouting };
 export { firstRenderStartPromise };
 export { getPageContextClient };
-import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
+import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, updateType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
 import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient, } from './getPageContextFromHooks.js';
 import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
@@ -159,7 +159,7 @@ async function renderPageClientSide(renderArgs) {
             await onError(res.err);
             return;
         }
-        augmentType(pageContext, res.pageContext);
+        updateType(pageContext, res.pageContext);
         setPageContextCurrent(pageContext);
         // Set global hydrationCanBeAborted
         if (pageContext.exports.hydrationCanBeAborted) {
@@ -184,7 +184,7 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            augmentType(pageContext, pageContextAugmented);
+            updateType(pageContext, pageContextAugmented);
             // Render page view
             await renderPageView(pageContext);
         }
@@ -225,7 +225,7 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            augmentType(pageContext, pageContextFromClientHooks);
+            updateType(pageContext, pageContextFromClientHooks);
             await renderPageView(pageContext);
         }
     }
@@ -336,7 +336,7 @@ async function renderPageClientSide(renderArgs) {
             onError(res.err);
             return;
         }
-        augmentType(pageContext, res.pageContext);
+        updateType(pageContext, res.pageContext);
         setPageContextCurrent(pageContext);
         let pageContextFromServerHooks;
         try {
@@ -364,7 +364,7 @@ async function renderPageClientSide(renderArgs) {
         }
         if (isRenderOutdated())
             return;
-        augmentType(pageContext, pageContextFromClientHooks);
+        updateType(pageContext, pageContextFromClientHooks);
         await renderPageView(pageContext, args);
     }
     async function renderPageView(pageContext, isErrorPage) {

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

@@ -17,7 +17,7 @@ export * from '../../utils/slice.js';
 export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';

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

@@ -21,7 +21,7 @@ export * from '../../utils/slice.js';
 export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';

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

@@ -1,5 +1,5 @@
 export { createPageContextClientSide };
-import { assertUsage, augmentType, objectAssign } from './utils.js';
+import { assertUsage, updateType, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
 import { loadPageConfigsLazyClientSide, } from '../shared/loadPageConfigsLazyClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
@@ -22,9 +22,9 @@ async function createPageContextClientSide() {
     });
     objectAssign(pageContextCreated, getPageContextSerializedInHtml());
     // Sets pageContext.config to global configs
-    augmentType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal));
+    updateType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal));
     // Sets pageContext.config to local configs (overrides the pageContext.config set above)
-    augmentType(pageContextCreated, await loadPageConfigsLazyClientSideAndExecHook(pageContextCreated));
+    updateType(pageContextCreated, await loadPageConfigsLazyClientSideAndExecHook(pageContextCreated));
     assertPristineUrl();
     return pageContextCreated;
 }

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

@@ -10,5 +10,5 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/getPropAccessNotation.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/changeEnumerable.js';

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

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

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

@@ -3,7 +3,7 @@ export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
 import { resolveVikeConfigPublicPageLazyLoaded } from '../../shared/page-configs/resolveVikeConfigPublic.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
-import { loadPageEntry } from '../../shared/page-configs/loadPageEntry.js';
+import { loadAndParseVirtualFilePageEntry } from '../../shared/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { objectAssign } from '../runtime-server-routing/utils.js';
 const errStamp = '_isAssetsError';
 async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
@@ -16,7 +16,7 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
         // prettier-ignore
         // biome-ignore format:
         const result = await Promise.all([
-            pageConfig && loadPageEntry(pageConfig, isDev),
+            pageConfig && loadAndParseVirtualFilePageEntry(pageConfig, isDev),
             ...pageFilesClientSide.map((p) => p.loadFile?.()),
         ]);
         pageConfigLoaded = result[0];

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

@@ -1,45 +1,19 @@
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
-import { build as buildVite, version, createBuilder } from 'vite';
-import { isVikeCli } from '../cli/context.js';
-import { wasPrerenderRun } from '../prerender/context.js';
-import { assert, assertVersion } from './utils.js';
+import { createBuilder } from 'vite';
 /**
  * Programmatically trigger `$ vike build`
  *
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigFromUserEnhanced, vikeConfig } = await prepareViteApiCall(options, 'build');
+    const { viteConfigFromUserEnhanced } = await prepareViteApiCall(options, 'build');
     // Pass it to pluginAutoFullBuild()
     if (viteConfigFromUserEnhanced)
         viteConfigFromUserEnhanced._viteConfigFromUserEnhanced = viteConfigFromUserEnhanced;
-    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
-        assertVersion('Vite', version, '6.0.0');
-        const builder = await createBuilder(viteConfigFromUserEnhanced);
-        // See Vite plugin vike:build:pluginBuildApp
-        await builder.buildApp();
-    }
-    else {
-        // This buildVite() call does everything:
-        // 1. Build client-side
-        // 2. Build server-side
-        //    > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L90
-        // 3. Pre-render (if enabled)
-        //    > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L98
-        //    > We purposely don't start the pre-rendering in this `build()` function but in a Rollup hook instead.
-        //    > Rationale: https://github.com/vikejs/vike/issues/2123
-        await buildVite(viteConfigFromUserEnhanced);
-        // After pre-rendering, when using the Vike CLI, the process is forcefully exited at the end of the buildVite() call above.
-        if (
-        // When calling Vike's prerender() API pre-rendering is run without force exit
-        ![false, 'prerender()'].includes(wasPrerenderRun()) &&
-            // When calling Vike's build() API pre-rendering is auto run without force exit
-            isVikeCli()) {
-            assert(false);
-        }
-    }
+    const builder = await createBuilder(viteConfigFromUserEnhanced);
+    // See Vite plugin vike:build:pluginBuildApp
+    await builder.buildApp();
     return {
     /* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`
     viteConfig: viteConfigFromUserEnhanced,