vike 0.4.218 → 0.4.220

package/dist/cjs/utils/getGlobalObject.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalObject = getGlobalObject;
 exports.assertIsSingleModuleInstance = assertIsSingleModuleInstance;
 const assert_js_1 = require("./assert.js");
-const projectInfo_js_1 = require("./projectInfo.js");
-const projectKey = `_${projectInfo_js_1.projectInfo.projectName.toLowerCase()}`;
 /** Share information across module instances. */
 function getGlobalObject(
 // We use the filename (or file path) as key. There should be only one getGlobalObject() usage per file. Thus the key should be unique, assuming the filename (or file path) is unique.
@@ -21,6 +19,7 @@ key) {
     (0, assert_js_1.assert)(!(key in globalObjects));
 }
 function getGlobalObjects() {
+    const projectKey = '_vike';
     // @ts-ignore
     const globalObjects = (globalThis[projectKey] = globalThis[projectKey] || {});
     return globalObjects;

package/dist/cjs/utils/objectReplace.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.objectReplace = objectReplace;
+function objectReplace(obj, objNew, except) {
+    Object.keys(obj)
+        .filter((key) => !except?.includes(key))
+        .forEach((key) => delete obj[key]);
+    Object.assign(obj, objNew);
+}

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

@@ -1,14 +1,12 @@
+export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
 export { getMiddlewares };
 import { route as routeInternal, type PageRoutes } from '../shared/route/index.js';
-import { type PageFile } from '../shared/getPageFiles.js';
+import type { PageFile } from '../shared/getPageFiles/getPageFileObject.js';
 import { PageConfigRuntime } from '../shared/page-configs/PageConfig.js';
 /**
- * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel}
- * to compute some rewrite rules and extract { isr } configs.
- * Needs `import 'vike/__internal/setup'`
- * @param config
+ * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  */
 declare function getPagesAndRoutes(): Promise<{
     pageRoutes: PageRoutes;

package/dist/esm/__internal/index.js

@@ -1,24 +1,22 @@
+// Internals needed by Vike
+export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
 // Internals needed by vite-plugin-vercel
 export { route, getPagesAndRoutes };
 // Internals needed by experimental implementation of vike-telefunc
 export { getMiddlewares };
 import { route as routeInternal } from '../shared/route/index.js';
-import { getPageFilesAll } from '../shared/getPageFiles.js';
+import { getPageFilesAll } from '../shared/getPageFiles/getPageFiles.js';
 import { getGlobalContext, initGlobalContext_getGlobalContextAsync } from '../node/runtime/globalContext.js';
 import { setNodeEnvProduction } from '../utils/assertSetup.js';
-import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRouted.js';
 /**
- * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel}
- * to compute some rewrite rules and extract { isr } configs.
- * Needs `import 'vike/__internal/setup'`
- * @param config
+ * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  */
 async function getPagesAndRoutes() {
     setNodeEnvProduction();
-    const renderContext = await getRenderContext();
+    const globalContext = getGlobalContext();
     const { 
     //
-    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = renderContext;
+    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = globalContext;
     return {
         pageRoutes,
         pageFilesAll,

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

@@ -1,10 +1,13 @@
 export { createPageContext };
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
-import { getPageFilesAll } from '../../shared/getPageFiles.js';
+import { getPageFilesAll, setPageFiles } from '../../shared/getPageFiles/getPageFiles.js';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { getBaseServer } from './getBaseServer.js';
 import { assert, isBaseServer, getGlobalObject, objectAssign } from './utils.js';
+// @ts-ignore
+import * as pageFilesExports from 'virtual:vike:importUserCode:client:client-routing';
 const globalObject = getGlobalObject('createPageContext.ts', {});
+setPageFiles(pageFilesExports);
 async function createPageContext(urlOriginal) {
     if (!globalObject.pageFilesData) {
         globalObject.pageFilesData = await getPageFilesAll(true);

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

@@ -1 +1 @@
-import './pageFiles';
+export {};

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

@@ -1,6 +1,5 @@
 import { assertClientRouting } from '../../utils/assertRoutingType.js';
 assertClientRouting();
-import './pageFiles';
 import { initClientRouter } from './initClientRouter.js';
 import { assertSingleInstance_onClientEntryClientRouting } from './utils.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';

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

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
-import type { PageContextExports } from '../../shared/getPageFiles.js';
-type PageContextCurrent = PageContextExports & {
+import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+type PageContextCurrent = PageConfigUserFriendly & {
     urlPathname: string;
 };
 declare function getPageContextCurrent(): null | PageContextCurrent;

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

@@ -5,7 +5,7 @@ export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
 export type { PageContextFromServerHooks };
 export type { PageContextFromClientHooks };
-import type { PageContextExports, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContext = {
     urlOriginal: string;
@@ -21,9 +21,9 @@ declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
     _hasPageContextFromServer: true;
 };
-declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageContextExports & {
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendly & {
     _hasPageContextFromServer: true;
-}): Promise<PageContextSerialized & PageContext & PageContextExports & {
+}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendly & {
     _hasPageContextFromServer: true;
 } & {
     _hasPageContextFromClient: boolean;
@@ -45,5 +45,5 @@ type PageContextFromClientHooks = {
 declare function getPageContextFromClientHooks(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContext & PageContextExports, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
+} & PageContext & PageConfigUserFriendly, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
 declare function setPageContextInitIsPassedToClient(pageContext: Record<string, unknown>): void;

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

@@ -12,7 +12,7 @@ import { preparePageContextForUserConsumptionClientSide } from '../shared/prepar
 import { removeBuiltInOverrides } from './getPageContext/removeBuiltInOverrides.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getPageConfig } from '../../shared/page-configs/helpers.js';
-import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueRuntime.js';
 import { assertOnBeforeRenderHookReturn } from '../../shared/assertOnBeforeRenderHookReturn.js';
 import { executeGuardHook } from '../../shared/route/executeGuardHook.js';
 import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';

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

@@ -1,2 +1,6 @@
 export { initOnLinkClick };
+export { getCurrentLinkClick };
 declare function initOnLinkClick(): void;
+declare function getCurrentLinkClick(): {
+    href: string;
+} | undefined;

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

@@ -1,9 +1,11 @@
 // Code adapted from https://github.com/HenrikJoreteg/internal-nav-helper/blob/5199ec5448d0b0db7ec63cf76d88fa6cad878b7d/src/index.js#L11-L29
 export { initOnLinkClick };
-import { assert } from './utils.js';
+export { getCurrentLinkClick };
+import { getGlobalObject } from './utils.js';
 import { isSameAsCurrentUrl, skipLink } from './skipLink.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { scrollToHashOrTop } from './setScrollPosition.js';
+const globalObject = getGlobalObject('initOnLinkClick.ts', {});
 function initOnLinkClick() {
     document.addEventListener('click', onClick);
 }
@@ -14,10 +16,16 @@ async function onClick(ev) {
     if (!linkTag)
         return;
     const href = linkTag.getAttribute('href');
+    if (href === null)
+        return;
+    globalObject.currentLinkClick = { href };
+    setTimeout(() => {
+        delete globalObject.currentLinkClick;
+    }, 0);
     // Workaround for Firefox bug: clicking on a hash link that doesn't change the current URL causes Firefox to erroneously set `window.history.state = null` without firing any signal that we can detect.
     // - https://github.com/vikejs/vike/issues/1962
     // - https://github.com/sveltejs/kit/issues/8725
-    if (href?.includes('#') && isSameAsCurrentUrl(href)) {
+    if (href.includes('#') && isSameAsCurrentUrl(href)) {
         // Prevent Firefox from setting `window.history.state` to `null`
         ev.preventDefault();
         // Replicate the browser's native behavior
@@ -26,7 +34,6 @@ async function onClick(ev) {
     }
     if (skipLink(linkTag))
         return;
-    assert(href);
     ev.preventDefault();
     let scrollTarget;
     {
@@ -53,3 +60,6 @@ function findLinkTag(target) {
     }
     return target;
 }
+function getCurrentLinkClick() {
+    return globalObject.currentLinkClick;
+}

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

@@ -4,6 +4,8 @@ import { assertWarning, getGlobalObject } from './utils.js';
 import { onPopStateBegin } from './history.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { setScrollPosition } from './setScrollPosition.js';
+import { getCurrentLinkClick } from './initOnLinkClick.js';
+import { isSamePageHashLink } from './skipLink.js';
 const globalObject = getGlobalObject('initOnPopState.ts', { listeners: [] });
 function initOnPopState() {
     // - The popstate event is trigged upon:
@@ -16,7 +18,13 @@ function initOnPopState() {
     //     - `location.hash = 'some-hash'`
     // - The `event` argument of `window.addEventListener('popstate', (event) => /*...*/)` is useless: the History API doesn't provide the previous state (the popped state), see https://stackoverflow.com/questions/48055323/is-history-state-always-the-same-as-popstate-event-state
     window.addEventListener('popstate', async () => {
+        const currentLinkClick = getCurrentLinkClick();
         const { isNewState, previous, current } = onPopStateBegin();
+        // We use currentLinkClick.href instead of current.url because current.url missing text links such as #:~:text=With%20frontmatter-,Global%20metadata,-What%20is%20global (e.g. Chrome strips the `#:~:text=` part from the URL before the popstate event).
+        if (currentLinkClick && isSamePageHashLink(currentLinkClick.href)) {
+            // Let the browser handle hash links
+            return;
+        }
         const scrollTarget = current.state.scrollPosition || undefined;
         const isUserPushStateNavigation = current.state.triggeredBy === 'user' || previous.state.triggeredBy === 'user';
         const isHashNavigation = removeHash(current.url) === removeHash(previous.url) && current.url !== previous.url;

package/dist/esm/client/client-routing-runtime/prefetch/getPrefetchSettings.d.ts

@@ -1,10 +1,10 @@
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };
-import type { PageContextExports } from '../../../shared/getPageFiles.js';
+import type { PageConfigUserFriendly } from '../../../shared/getPageFiles.js';
 declare const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 type PrefetchSettingResolved = {
     staticAssets: false | 'hover' | 'viewport';
     pageContext: false | number;
 };
-declare function getPrefetchSettings(pageContext: PageContextExports, linkTag: null | HTMLElement): PrefetchSettingResolved;
+declare function getPrefetchSettings(pageContext: PageConfigUserFriendly, linkTag: null | HTMLElement): PrefetchSettingResolved;

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

@@ -6,7 +6,7 @@ export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import type { PageContextExports, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
 import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = {
@@ -19,7 +19,7 @@ type PageContextForPrefetch = {
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-} & PageContextExports): null | PageContextFromServerHooks;
+} & PageConfigUserFriendly): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

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

@@ -60,8 +60,8 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext /*& PageContextExports*/, result) {
-    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageContextExports as it isn't available here.)
+function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendly*/, result) {
+    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageConfigUserFriendly as it isn't available here.)
     if (!isBrilloutDocpress())
         return;
     setPageContextPrefetchCache(pageContext, result, null);

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

@@ -1,4 +1,6 @@
 export { skipLink };
 export { isSameAsCurrentUrl };
+export { isSamePageHashLink };
 declare function skipLink(linkTag: HTMLElement): boolean;
+declare function isSamePageHashLink(href: string): boolean;
 declare function isSameAsCurrentUrl(href: string): boolean;

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

@@ -1,5 +1,6 @@
 export { skipLink };
 export { isSameAsCurrentUrl };
+export { isSamePageHashLink };
 import { normalizeClientSideUrl } from '../shared/normalizeClientSideUrl.js';
 import { getBaseServer } from './getBaseServer.js';
 import { assert, parseUrl, isBaseServer, isUrl, isUrlExternal } from './utils.js';

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

@@ -1 +1 @@
-import './pageFiles';
+export {};

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

@@ -1,6 +1,5 @@
 import { assertServerRouting } from '../../utils/assertRoutingType.js';
 assertServerRouting();
-import './pageFiles';
 import { getPageContext } from './getPageContext.js';
 import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
 import { assertHook } from '../../shared/hooks/getHook.js';

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

@@ -10,6 +10,6 @@ declare function getPageContext(): Promise<{
 } & {
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
-} & import("../../shared/getPageFiles.js").PageContextExports & {
+} & import("../../shared/getPageFiles.js").PageConfigUserFriendly & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

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

@@ -1,10 +1,13 @@
+export { getPageContext };
 import { assertUsage, assertWarning, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getPageContextSerializedInHtml.js';
-import { getPageFilesAll } from '../../shared/getPageFiles.js';
+import { getPageFilesAll, setPageFiles } from '../../shared/getPageFiles/getPageFiles.js';
 import { loadUserFilesClientSide } from '../shared/loadUserFilesClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-export { getPageContext };
+// @ts-ignore
+import * as pageFilesExports from 'virtual:vike:importUserCode:client:server-routing';
 const urlFirst = getCurrentUrl({ withoutHash: true });
+setPageFiles(pageFilesExports);
 async function getPageContext() {
     const pageContext = getPageContextSerializedInHtml();
     objectAssign(pageContext, {

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

@@ -1,6 +1,6 @@
 export { executeOnRenderClientHook };
 export type { PageContextBeforeRenderClient };
-import type { PageFile, PageContextExports } from '../../shared/getPageFiles.js';
+import type { PageFile, PageConfigUserFriendly } from '../../shared/getPageFiles.js';
 import { type PageContextForUserConsumptionClientSide } from './preparePageContextForUserConsumptionClientSide.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContextBeforeRenderClient = {
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
-} & PageContextExports & PageContextForUserConsumptionClientSide;
+} & PageConfigUserFriendly & PageContextForUserConsumptionClientSide;
 declare function executeOnRenderClientHook<PC extends PageContextBeforeRenderClient>(pageContext: PC, isClientRouting: boolean): Promise<void>;

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

@@ -1,9 +1,9 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
-import { type PageFile, type PageContextExports } from '../../shared/getPageFiles.js';
+import { type PageFile, type PageConfigUserFriendly } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-type PageContextUserFilesLoaded = PageContextExports & {
+type PageContextUserFilesLoaded = PageConfigUserFriendly & {
     _pageFilesLoaded: PageFile[];
 };
 type PageContextUserFiles = {

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

@@ -1,6 +1,6 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
-import { getPageFilesClientSide, getPageContextExports } from '../../shared/getPageFiles.js';
+import { getPageFilesClientSide, getPageConfigUserFriendly } from '../../shared/getPageFiles.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { objectAssign } from '../server-routing-runtime/utils.js';
@@ -29,7 +29,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs) {
         }
         throw err;
     }
-    const pageContextExports = getPageContextExports(pageFilesClientSide, pageConfigLoaded);
+    const pageContextExports = getPageConfigUserFriendly(pageFilesClientSide, pageConfigLoaded);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

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

@@ -2,9 +2,8 @@ export { normalizeClientSideUrl };
 import { assert, parseUrl } from './utils.js';
 /** Resolves relative URLs */
 function normalizeClientSideUrl(url, options) {
-    // This function doesn't work for `url === '#some-hash'` because `searchOriginal` is `null` even if window.location.href has a search string.
-    // - Thus the resolved absolute URL would be missing the search string.
-    // - It makes sense that `parseUrl()` returns `searchOriginal === null` since there isn't any search string in `url`.
+    // This function doesn't work for `url === '#some-hash'` because `searchOriginal` will be missing: if window.location.href has a search string then it's going to be missing in the returned `urlCurrent` value because `parseUrl(url)` returns `searchOriginal: null` since there isn't any search string in `url`.
+    // - Maybe `const { searchOriginal } = parseUrl(window.location.href)` can be a fix. (Let's check how `normalizeClientSideUrl()` is being used.)
     assert(!url.startsWith('#'));
     const { searchOriginal, hashOriginal, pathname } = parseUrl(url, '/');
     let urlCurrent = `${pathname}${searchOriginal || ''}`;

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

@@ -1,9 +1,9 @@
 export { preparePageContextForUserConsumptionClientSide };
 export type { PageContextForUserConsumptionClientSide };
-import type { PageContextExports } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 import { PageContextForPassToClientWarning } from './getPageContextProxyForUser.js';
-type PageContextForUserConsumptionClientSide = PageContextExports & PageContextForPassToClientWarning & {
+type PageContextForUserConsumptionClientSide = PageConfigUserFriendly & PageContextForPassToClientWarning & {
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
 };

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

@@ -1,6 +1,7 @@
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { build as buildVite } from 'vite';
+import { isPrerenderAutoRunEnabled } from '../prerender/isPrerenderAutoRunEnabled.js';
 /**
  * Programmatically trigger `$ vike build`
  *
@@ -13,11 +14,9 @@ async function build(options = {}) {
     // Build server-side
     const outputServer = await buildVite(setSSR(viteConfigEnhanced));
     // Pre-render
-    if (vikeConfigGlobal.prerender &&
-        !vikeConfigGlobal.prerender.disableAutoRun &&
-        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
+    if (isPrerenderAutoRunEnabled(vikeConfigGlobal)) {
         const { runPrerenderFromAutoRun } = await import('../prerender/runPrerender.js');
-        await runPrerenderFromAutoRun(viteConfigEnhanced, true);
+        await runPrerenderFromAutoRun(viteConfigEnhanced);
     }
     return {
         /* We don't return `viteConfig` because `viteConfigEnhanced` is `InlineConfig` not `ResolvedConfig`

package/dist/esm/node/api/context.d.ts

@@ -1,5 +1,7 @@
+export { setOperation };
+export { clearOperation };
 export { isVikeCliOrApi };
-export { setOperation as setOperation };
 import type { Operation } from './types.js';
 declare function isVikeCliOrApi(): boolean;
 declare function setOperation(operation: Operation): void;
+declare function clearOperation(): void;

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

@@ -1,6 +1,7 @@
-export { isVikeCliOrApi };
 // export { getOperation }
-export { setOperation as setOperation };
+export { setOperation };
+export { clearOperation };
+export { isVikeCliOrApi };
 import { assert, getGlobalObject } from './utils.js';
 const globalObject = getGlobalObject('context.ts', {
     apiOperation: undefined
@@ -17,3 +18,6 @@ function setOperation(operation) {
     assert(!globalObject.apiOperation);
     globalObject.apiOperation = operation;
 }
+function clearOperation() {
+    globalObject.apiOperation = undefined;
+}

package/dist/esm/node/api/prepareViteApiCall.d.ts

@@ -6,7 +6,7 @@ import type { InlineConfig, ResolvedConfig } from 'vite';
 import type { Operation } from './types.js';
 declare function prepareViteApiCall(viteConfig: InlineConfig | undefined, operation: Operation): Promise<{
     viteConfigEnhanced: InlineConfig | undefined;
-    vikeConfigGlobal: import("../plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js").VikeConfigGlobal;
+    vikeConfigGlobal: import("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js").VikeConfigGlobal;
 }>;
 declare function getViteRoot(operation: 'build' | 'dev' | 'preview' | 'prerender'): Promise<string>;
 declare function normalizeViteRoot(root: string): string;

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

@@ -3,26 +3,44 @@ export { getViteRoot };
 export { assertViteRoot };
 export { normalizeViteRoot };
 // TODO: enable Vike extensions to add Vite plugins
-import { loadConfigFromFile, resolveConfig } from 'vite';
-import { setOperation } from './context.js';
+import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite';
+import { clearOperation, setOperation } from './context.js';
 import { getVikeConfig2 } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 import path from 'path';
-import { assert, assertUsage, getGlobalObject, toPosixPath } from './utils.js';
+import { assert, assertUsage, getGlobalObject, isObject, toPosixPath } from './utils.js';
 import pc from '@brillout/picocolors';
+import { clearGlobalContext } from '../runtime/globalContext.js';
 const globalObject = getGlobalObject('prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfig, operation) {
+    clear();
     setOperation(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
+// For subsequent API calls, e.g. calling prerender() after build()
+function clear() {
+    clearOperation();
+    clearGlobalContext();
+}
 async function enhanceViteConfig(viteConfig, operation) {
-    const { root, vikeVitePluginOptions, viteConfigEnhanced } = await getInfoFromVite(viteConfig, operation);
-    await assertViteRoot2(root, viteConfigEnhanced, operation);
-    const { vikeConfigGlobal } = await getVikeConfig2(root, operation === 'dev', vikeVitePluginOptions);
+    const viteInfo = await getInfoFromVite(viteConfig, operation);
+    await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
+    const vikeConfig = await getVikeConfig2(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
+    const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
     return {
         viteConfigEnhanced,
-        vikeConfigGlobal
+        vikeConfigGlobal: vikeConfig.vikeConfigGlobal
     };
 }
+function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
+    const viteConfigs = vikeConfig.global.from.configsCumulative.vite;
+    if (!viteConfigs)
+        return viteConfigEnhanced;
+    viteConfigs.values.forEach((v) => {
+        assertUsage(isObject(v.value), `${v.definedAt} should be an object`);
+        viteConfigEnhanced = mergeConfig(viteConfigEnhanced ?? {}, v.value);
+    });
+    return viteConfigEnhanced;
+}
 async function getViteRoot(operation) {
     if (!globalObject.root)
         await getInfoFromVite(undefined, operation);

package/dist/esm/node/cli/entry.js

@@ -49,6 +49,8 @@ async function cmdBuild() {
         console.error(err);
         process.exit(1);
     }
+    // See comments at runPrerender_forceExit()
+    process.exit(0);
 }
 async function cmdPreview() {
     try {

package/dist/esm/node/cli/parseCli.d.ts

@@ -1,4 +1,4 @@
 export { parseCli };
 declare function parseCli(): {
-    command: "dev" | "build" | "preview" | "prerender";
+    command: "build" | "dev" | "preview" | "prerender";
 };

package/dist/esm/node/plugin/index.d.ts

@@ -3,5 +3,5 @@ export { plugin };
 export { plugin as ssr };
 export type { VikeVitePluginOptions as UserConfig };
 export { PROJECT_VERSION as version } from './utils.js';
-import type { VikeVitePluginOptions } from './plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
+import type { VikeVitePluginOptions } from './plugins/importUserCode/v1-design/getVikeConfig.js';
 declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): any;

package/dist/esm/node/plugin/index.js

@@ -17,7 +17,7 @@ import { extractAssetsPlugin } from './plugins/extractAssetsPlugin.js';
 import { extractExportNamesPlugin } from './plugins/extractExportNamesPlugin.js';
 import { suppressRollupWarning } from './plugins/suppressRollupWarning.js';
 import { setGlobalContext } from './plugins/setGlobalContext.js';
-import { importBuild } from './plugins/importBuild/index.js';
+import { buildEntry } from './plugins/buildEntry/index.js';
 import { commonConfig } from './plugins/commonConfig.js';
 import { baseUrls } from './plugins/baseUrls.js';
 import { envVarsPlugin } from './plugins/envVars.js';
@@ -26,7 +26,7 @@ import { fileEnv } from './plugins/fileEnv.js';
 import { setResolveClientEntriesDev } from '../runtime/renderPage/getPageAssets.js';
 import { resolveClientEntriesDev } from './resolveClientEntriesDev.js';
 import { workaroundCssModuleHmr } from './plugins/workaroundCssModuleHmr.js';
-import { vite6HmrRegressionWorkaround } from './plugins/vite6HmrRegressionWorkaround.js';
+import { workaroundVite6HmrRegression } from './plugins/workaroundVite6HmrRegression.js';
 markSetup_vikeVitePlugin();
 assertViteVersion();
 setResolveClientEntriesDev(resolveClientEntriesDev);
@@ -46,12 +46,12 @@ function plugin(vikeVitePluginOptions = {}) {
         extractExportNamesPlugin(),
         suppressRollupWarning(),
         ...setGlobalContext(),
-        ...importBuild(),
-        baseUrls(vikeVitePluginOptions),
+        ...buildEntry(),
+        baseUrls(),
         envVarsPlugin(),
         fileEnv(),
         workaroundCssModuleHmr(),
-        vite6HmrRegressionWorkaround()
+        workaroundVite6HmrRegression()
     ];
     Object.assign(plugins, { __vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

package/dist/esm/node/plugin/plugins/autoFullBuild.js

@@ -3,6 +3,7 @@ export { autoFullBuild };
 import { build } from 'vite';
 import { assertWarning } from '../utils.js';
 import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../prerender/runPrerender.js';
+import { isPrerenderAutoRunEnabled } from '../../prerender/isPrerenderAutoRunEnabled.js';
 import { isViteCliCall, getViteConfigFromCli } from '../shared/isViteCliCall.js';
 import pc from '@brillout/picocolors';
 import { logErrorHint } from '../../runtime/renderPage/logErrorHint.js';
@@ -90,10 +91,8 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
         logErrorHint(err);
         process.exit(1);
     }
-    if (vikeConfigGlobal.prerender &&
-        !vikeConfigGlobal.prerender.disableAutoRun &&
-        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
-        await runPrerenderFromAutoRun(configInline, false);
+    if (isPrerenderAutoRunEnabled(vikeConfigGlobal)) {
+        await runPrerenderFromAutoRun(configInline);
         forceExit = true;
     }
 }

package/dist/esm/node/plugin/plugins/baseUrls.d.ts

@@ -1,3 +1,3 @@
 export { baseUrls };
 import type { Plugin } from 'vite';
-declare function baseUrls(vikeVitePluginOptions: unknown): Plugin;
+declare function baseUrls(): Plugin;