vike 0.4.218-commit-01a099d → 0.4.218-commit-ed9b3d4

package/dist/cjs/__internal/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setBuildEntry = void 0;
+exports.setGlobalContext_buildEntry = void 0;
 exports.route = route;
 exports.getPagesAndRoutes = getPagesAndRoutes;
 exports.getMiddlewares = getMiddlewares;
 // Internals needed by Vike
 var globalContext_js_1 = require("../node/runtime/globalContext.js");
-Object.defineProperty(exports, "setBuildEntry", { enumerable: true, get: function () { return globalContext_js_1.setBuildEntry; } });
+Object.defineProperty(exports, "setGlobalContext_buildEntry", { enumerable: true, get: function () { return globalContext_js_1.setGlobalContext_buildEntry; } });
 const index_js_1 = require("../shared/route/index.js");
 const getPageFiles_js_1 = require("../shared/getPageFiles/getPageFiles.js");
 const globalContext_js_2 = require("../node/runtime/globalContext.js");

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

@@ -51,7 +51,7 @@ async function build(options = {}) {
     // Pre-render
     if ((0, isPrerenderEnabled_js_1.isPrerenderEnabled)(vikeConfigGlobal)) {
         const { runPrerenderFromAutoRun } = await Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
-        await runPrerenderFromAutoRun(viteConfigEnhanced, true);
+        await runPrerenderFromAutoRun(viteConfigEnhanced);
     }
     return {
         /* We don't return `viteConfig` because `viteConfigEnhanced` is `InlineConfig` not `ResolvedConfig`

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVikeCliOrApi = isVikeCliOrApi;
 exports.setOperation = setOperation;
+exports.clearOperation = clearOperation;
+exports.isVikeCliOrApi = isVikeCliOrApi;
 const utils_js_1 = require("./utils.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('context.ts', {
     apiOperation: undefined
@@ -18,3 +19,6 @@ function setOperation(operation) {
     (0, utils_js_1.assert)(!globalObject.apiOperation);
     globalObject.apiOperation = operation;
 }
+function clearOperation() {
+    globalObject.apiOperation = undefined;
+}

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

@@ -47,20 +47,39 @@ const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/g
 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 globalObject = (0, utils_js_1.getGlobalObject)('prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfig, operation) {
+    clear();
     (0, context_js_1.setOperation)(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
+// For subsequent API calls, e.g. calling prerender() after build()
+function clear() {
+    (0, context_js_1.clearOperation)();
+    (0, globalContext_js_1.clearGlobalContext)();
+}
 async function enhanceViteConfig(viteConfig, operation) {
-    const { root, vikeVitePluginOptions, viteConfigEnhanced } = await getInfoFromVite(viteConfig, operation);
-    await assertViteRoot2(root, viteConfigEnhanced, operation);
-    const { vikeConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig2)(root, operation === 'dev', vikeVitePluginOptions);
+    const viteInfo = await getInfoFromVite(viteConfig, operation);
+    await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
+    const viteConfigEnhanced = addViteSettingsSetByUser(viteInfo.viteConfigEnhanced, vikeConfig);
     return {
         viteConfigEnhanced,
-        vikeConfigGlobal
+        vikeConfigGlobal: vikeConfig.vikeConfigGlobal
     };
 }
+function addViteSettingsSetByUser(viteConfigEnhanced, vikeConfig) {
+    const { global } = vikeConfig.vikeConfigNew;
+    const viteConfigs = global.from.configsCumulative.vite;
+    if (!viteConfigs)
+        return viteConfigEnhanced;
+    viteConfigs.values.forEach((v) => {
+        (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(v.value), `${v.definedAt} should be an object`);
+        viteConfigEnhanced = (0, vite_1.mergeConfig)(v.value, viteConfigEnhanced ?? {});
+    });
+    return viteConfigEnhanced;
+}
 async function getViteRoot(operation) {
     if (!globalObject.root)
         await getInfoFromVite(undefined, operation);

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

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

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

@@ -97,7 +97,7 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
         process.exit(1);
     }
     if ((0, isPrerenderEnabled_js_1.isPrerenderEnabled)(vikeConfigGlobal)) {
-        await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, false);
+        await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
         forceExit = true;
     }
 }

package/dist/cjs/node/plugin/plugins/buildEntry/index.js

@@ -43,13 +43,13 @@ function getServerProductionEntryCode(config, vikeConfigGlobal) {
     const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(vikeConfigGlobal, config);
     // Let's eventually simplify and move everything to a single virtual module
     const importerCode = [
-        `  import { setBuildEntry } from '${importPath}';`,
+        `  import { setGlobalContext_buildEntry } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MAP};`,
         `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
-        '    setBuildEntry({',
+        '    setGlobalContext_buildEntry({',
         `      pageFiles,`,
         `      assetsManifest,`,
         `      pluginManifest,`,

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -146,6 +146,7 @@ const configDefinitionsBuiltInGlobal = {
         eager: true
     },
     prerender: { env: { config: true } },
+    vite: { env: { config: true }, cumulative: true },
     disableAutoFullBuild: { env: { config: true } },
     includeAssetsImportedByServer: { env: { config: true } },
     baseAssets: { env: { config: true } },

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -458,16 +458,14 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
         const configValueSource = sources[0];
         if (!configValueSource)
             return;
+        pageConfigGlobal.configValueSources[configName] = sources;
         if (configName === 'onBeforeRoute' || configName === 'onPrerenderStart') {
             (0, utils_js_1.assert)(!('value' in configValueSource));
-            pageConfigGlobal.configValueSources[configName] = [configValueSource];
         }
         else {
             (0, utils_js_1.assert)('value' in configValueSource);
             if (configName === 'prerender' && typeof configValueSource.value === 'boolean')
                 return;
-            const { filePathToShowToUser } = configValueSource.definedAtFilePath;
-            (0, utils_js_1.assertWarning)(false, `Being able to define config ${picocolors_1.default.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${picocolors_1.default.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
             pageConfigGlobalValues[configName] = configValueSource.value;
         }
     }));

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

@@ -83,7 +83,7 @@ async function runPrerenderFromCLIPrerenderCommand() {
     }
     runPrerender_forceExit();
 }
-async function runPrerenderFromAutoRun(viteConfig, forceExit) {
+async function runPrerenderFromAutoRun(viteConfig) {
     try {
         await runPrerender({ viteConfig });
     }
@@ -92,8 +92,6 @@ async function runPrerenderFromAutoRun(viteConfig, forceExit) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    if (forceExit)
-        runPrerender_forceExit();
 }
 async function runPrerender(options = {}, standaloneTrigger) {
     checkOutdatedOptions(options);
@@ -106,7 +104,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
-    assertLoadedConfig(viteConfig, options);
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
@@ -709,25 +706,6 @@ async function disableReactStreaming() {
     const { disable } = mod;
     disable();
 }
-function assertLoadedConfig(viteConfig, options) {
-    if (viteConfig.plugins.some((p) => p.name.startsWith('vike'))) {
-        return;
-    }
-    const { configFile } = viteConfig;
-    if (configFile) {
-        (0, utils_js_1.assertUsage)(false, `${configFile} doesn't install the vike plugin`);
-    }
-    else {
-        if (!options.viteConfig) {
-            (0, utils_js_1.assertUsage)(false, `[prerender()] No vite.config.js file found at ${process.cwd()}. Use the option ${picocolors_1.default.cyan('prerender({ viteConfig })')}.`, { showStackTrace: true });
-        }
-        else {
-            (0, utils_js_1.assertUsage)(false, `[prerender()] The Vite config ${picocolors_1.default.cyan('prerender({ viteConfig })')} is missing the vike plugin.`, {
-                showStackTrace: true
-            });
-        }
-    }
-}
 function isSameUrl(url1, url2) {
     return normalizeUrl(url1) === normalizeUrl(url2);
 }

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

@@ -17,7 +17,8 @@ exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
 exports.setGlobalContext_vikeConfig = setGlobalContext_vikeConfig;
 exports.setGlobalContext_isViteDev = setGlobalContext_isViteDev;
 exports.setGlobalContext_isPrerendering = setGlobalContext_isPrerendering;
-exports.setBuildEntry = setBuildEntry;
+exports.setGlobalContext_buildEntry = setGlobalContext_buildEntry;
+exports.clearGlobalContext = clearGlobalContext;
 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");
@@ -26,16 +27,14 @@ const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
 const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const resolveBase_js_1 = require("../shared/resolveBase.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', (() => {
-    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
-    return {
-        viteDevServerPromise,
-        viteDevServerPromiseResolve
-    };
-})());
+const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
+const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', getInitialGlobalContext());
 initDevEntry();
 function getGlobalContext() {
-    (0, utils_js_1.assert)(globalObject.globalContext);
+    if (!globalObject.globalContext) {
+        debug('getGlobalContext()', new Error().stack);
+        (0, utils_js_1.assert)(false);
+    }
     return globalObject.globalContext;
 }
 /** @experimental https://vike.dev/getGlobalContext */
@@ -114,9 +113,11 @@ function getViteConfig() {
     return globalObject.viteConfig ?? null;
 }
 async function initGlobalContext_renderPage() {
+    debug('initGlobalContext_renderPage()');
     await initGlobalContext(!globalObject.isViteDev);
 }
 async function initGlobalContext_runPrerender() {
+    debug('initGlobalContext_runPrerender()');
     if (globalObject.initGlobalContext_runPrerender_alreadyCalled)
         return;
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
@@ -130,6 +131,7 @@ async function initGlobalContext_runPrerender() {
     await initGlobalContext(true);
 }
 async function initGlobalContext_getGlobalContextAsync(isProduction) {
+    debug('initGlobalContext_getGlobalContextAsync()');
     if (!isProduction) {
         const waitFor = 20;
         const timeout = setTimeout(() => {
@@ -241,18 +243,28 @@ function eagerlyLoadUserFiles() {
     getPageFilesExports();
 }
 async function getBuildEntry(outDir) {
+    debug('getBuildEntry()');
     if (!globalObject.buildEntry) {
+        debug('importServerProductionEntry()');
         await (0, runtime_1.importServerProductionEntry)({ outDir });
+        if (!globalObject.buildEntry) {
+            debug('globalObject.buildEntryPrevious');
+            // Needed, for example, when calling the API prerender() then preview() because both trigger a importServerProductionEntry() call but only the first only is applied because of the import() cache. (A proper implementation would be to clear the import() cache, but it probably isn't possible on platforms such as Cloudflare Workers.)
+            globalObject.buildEntry = globalObject.buildEntryPrevious;
+        }
         (0, utils_js_1.assert)(globalObject.buildEntry);
     }
-    return globalObject.buildEntry;
-}
-function setBuildEntry(buildEntry) {
+    const { buildEntry } = globalObject;
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pageFiles', 'object'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'assetsManifest', 'object'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pluginManifest', 'object'));
+    return buildEntry;
+}
+function setGlobalContext_buildEntry(buildEntry) {
+    debug('setGlobalContext_buildEntry()');
     globalObject.buildEntry = buildEntry;
+    globalObject.buildEntryPrevious = buildEntry;
 }
 function initDevEntry() {
     (0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports);
@@ -273,3 +285,15 @@ async function getPageFilesExports() {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
     return moduleExports;
 }
+function clearGlobalContext() {
+    debug('clearGlobalContext()');
+    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalContext(), ['buildEntryPrevious']);
+}
+function getInitialGlobalContext() {
+    debug('getInitialGlobalContext()');
+    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
+    return {
+        viteDevServerPromise,
+        viteDevServerPromiseResolve
+    };
+}

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

@@ -35,6 +35,7 @@ __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
+__exportStar(require("../../utils/objectReplace.js"), exports);
 __exportStar(require("../../utils/PromiseType.js"), exports);
 __exportStar(require("../../utils/compareString.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);

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.218-commit-01a099d';
+exports.PROJECT_VERSION = '0.4.218-commit-ed9b3d4';

package/dist/cjs/utils/debug.js

@@ -21,6 +21,7 @@ const flags = [
     'vike:extractAssets',
     'vike:extractExportNames',
     'vike:glob',
+    'vike:globalContext',
     'vike:log',
     'vike:optimizeDeps',
     'vike:outDir',
@@ -33,7 +34,7 @@ const flags = [
     'vike:esbuild-resolve'
 ];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
-assertDEBUG();
+assertFlagsActivated();
 function createDebugger(flag, optionsGlobal) {
     (0, checkType_js_1.checkType)(flag);
     (0, assert_js_1.assert)(flags.includes(flag));
@@ -76,8 +77,8 @@ function debug_(flag, options, ...msgs) {
 function isDebugActivated(flag) {
     (0, checkType_js_1.checkType)(flag);
     (0, assert_js_1.assert)(flags.includes(flag));
-    const DEBUG = getDEBUG();
-    const isActivated = DEBUG?.includes(flag) ?? false;
+    const flagsActivated = getFlagsActivated();
+    const isActivated = flagsActivated.includes(flag);
     return isActivated;
 }
 function formatMsg(info, options, padding, position) {
@@ -140,13 +141,17 @@ function replaceFunctionSerializer(_key, value) {
     }
     return value;
 }
-function assertDEBUG() {
-    const DEBUG = getDEBUG() ?? '';
-    const flagsActivated = DEBUG.match(flagRegex) ?? [];
+function assertFlagsActivated() {
+    const flagsActivated = getFlagsActivated();
     flagsActivated.forEach((flag) => {
         (0, assert_js_1.assertUsage)(flags.includes(flag), `Unknown DEBUG flag ${picocolors_1.default.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${picocolors_1.default.cyan(f)}`).join('\n')}`);
     });
 }
+function getFlagsActivated() {
+    const DEBUG = getDEBUG() ?? '';
+    const flagsActivated = DEBUG.match(flagRegex) ?? [];
+    return flagsActivated;
+}
 function getDEBUG() {
     let DEBUG;
     // - `process` can be undefined in edge workers

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,4 +1,4 @@
-export { setBuildEntry } from '../node/runtime/globalContext.js';
+export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
 export { getMiddlewares };

package/dist/esm/__internal/index.js

@@ -1,5 +1,5 @@
 // Internals needed by Vike
-export { setBuildEntry } from '../node/runtime/globalContext.js';
+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

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

@@ -16,7 +16,7 @@ async function build(options = {}) {
     // Pre-render
     if (isPrerenderEnabled(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.js

@@ -3,26 +3,45 @@ 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 = addViteSettingsSetByUser(viteInfo.viteConfigEnhanced, vikeConfig);
     return {
         viteConfigEnhanced,
-        vikeConfigGlobal
+        vikeConfigGlobal: vikeConfig.vikeConfigGlobal
     };
 }
+function addViteSettingsSetByUser(viteConfigEnhanced, vikeConfig) {
+    const { global } = vikeConfig.vikeConfigNew;
+    const viteConfigs = global.from.configsCumulative.vite;
+    if (!viteConfigs)
+        return viteConfigEnhanced;
+    viteConfigs.values.forEach((v) => {
+        assertUsage(isObject(v.value), `${v.definedAt} should be an object`);
+        viteConfigEnhanced = mergeConfig(v.value, viteConfigEnhanced ?? {});
+    });
+    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/plugin/plugins/autoFullBuild.js

@@ -92,7 +92,7 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
         process.exit(1);
     }
     if (isPrerenderEnabled(vikeConfigGlobal)) {
-        await runPrerenderFromAutoRun(configInline, false);
+        await runPrerenderFromAutoRun(configInline);
         forceExit = true;
     }
 }

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

@@ -38,13 +38,13 @@ function getServerProductionEntryCode(config, vikeConfigGlobal) {
     const vikeManifest = getVikeManifest(vikeConfigGlobal, config);
     // Let's eventually simplify and move everything to a single virtual module
     const importerCode = [
-        `  import { setBuildEntry } from '${importPath}';`,
+        `  import { setGlobalContext_buildEntry } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MAP};`,
         `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
-        '    setBuildEntry({',
+        '    setGlobalContext_buildEntry({',
         `      pageFiles,`,
         `      assetsManifest,`,
         `      pluginManifest,`,

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.d.ts

@@ -76,5 +76,5 @@ type ConfigDefinitions = Record<string, // configName
 ConfigDefinitionInternal>;
 type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn, ConfigDefinitionInternal>;
 declare const configDefinitionsBuiltIn: ConfigDefinitionsBuiltIn;
-type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization';
+type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
 declare const configDefinitionsBuiltInGlobal: Record<ConfigNameGlobal, ConfigDefinitionInternal>;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -144,6 +144,7 @@ const configDefinitionsBuiltInGlobal = {
         eager: true
     },
     prerender: { env: { config: true } },
+    vite: { env: { config: true }, cumulative: true },
     disableAutoFullBuild: { env: { config: true } },
     includeAssetsImportedByServer: { env: { config: true } },
     baseAssets: { env: { config: true } },

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -452,16 +452,14 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
         const configValueSource = sources[0];
         if (!configValueSource)
             return;
+        pageConfigGlobal.configValueSources[configName] = sources;
         if (configName === 'onBeforeRoute' || configName === 'onPrerenderStart') {
             assert(!('value' in configValueSource));
-            pageConfigGlobal.configValueSources[configName] = [configValueSource];
         }
         else {
             assert('value' in configValueSource);
             if (configName === 'prerender' && typeof configValueSource.value === 'boolean')
                 return;
-            const { filePathToShowToUser } = configValueSource.definedAtFilePath;
-            assertWarning(false, `Being able to define config ${pc.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${pc.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
             pageConfigGlobalValues[configName] = configValueSource.value;
         }
     }));

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

@@ -29,5 +29,5 @@ declare function runPrerenderFromAPI(options?: PrerenderOptions): Promise<{
     viteConfig: ResolvedConfig;
 }>;
 declare function runPrerenderFromCLIPrerenderCommand(): Promise<void>;
-declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined, forceExit: boolean): Promise<void>;
+declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined): Promise<void>;
 declare function runPrerender_forceExit(): void;

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

@@ -45,7 +45,7 @@ async function runPrerenderFromCLIPrerenderCommand() {
     }
     runPrerender_forceExit();
 }
-async function runPrerenderFromAutoRun(viteConfig, forceExit) {
+async function runPrerenderFromAutoRun(viteConfig) {
     try {
         await runPrerender({ viteConfig });
     }
@@ -54,8 +54,6 @@ async function runPrerenderFromAutoRun(viteConfig, forceExit) {
         logErrorHint(err);
         process.exit(1);
     }
-    if (forceExit)
-        runPrerender_forceExit();
 }
 async function runPrerender(options = {}, standaloneTrigger) {
     checkOutdatedOptions(options);
@@ -68,7 +66,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     await disableReactStreaming();
     const viteConfig = await resolveConfig(options.viteConfig || {}, 'build', 'production');
-    assertLoadedConfig(viteConfig, options);
     const vikeConfig = await getVikeConfig(viteConfig);
     const { outDirClient } = getOutDirs(viteConfig);
     const { root } = viteConfig;
@@ -671,25 +668,6 @@ async function disableReactStreaming() {
     const { disable } = mod;
     disable();
 }
-function assertLoadedConfig(viteConfig, options) {
-    if (viteConfig.plugins.some((p) => p.name.startsWith('vike'))) {
-        return;
-    }
-    const { configFile } = viteConfig;
-    if (configFile) {
-        assertUsage(false, `${configFile} doesn't install the vike plugin`);
-    }
-    else {
-        if (!options.viteConfig) {
-            assertUsage(false, `[prerender()] No vite.config.js file found at ${process.cwd()}. Use the option ${pc.cyan('prerender({ viteConfig })')}.`, { showStackTrace: true });
-        }
-        else {
-            assertUsage(false, `[prerender()] The Vite config ${pc.cyan('prerender({ viteConfig })')} is missing the vike plugin.`, {
-                showStackTrace: true
-            });
-        }
-    }
-}
 function isSameUrl(url1, url2) {
     return normalizeUrl(url1) === normalizeUrl(url2);
 }

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

@@ -12,7 +12,8 @@ export { setGlobalContext_viteConfig };
 export { setGlobalContext_vikeConfig };
 export { setGlobalContext_isViteDev };
 export { setGlobalContext_isPrerendering };
-export { setBuildEntry };
+export { setGlobalContext_buildEntry };
+export { clearGlobalContext };
 import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
 import type { VikeConfigGlobal } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
@@ -63,4 +64,5 @@ declare function initGlobalContext_renderPage(): Promise<void>;
 declare function initGlobalContext_runPrerender(): Promise<void>;
 declare function initGlobalContext_getGlobalContextAsync(isProduction: boolean): Promise<void>;
 declare function getRuntimeManifest(vikeConfigGlobal: VikeConfigGlobal, viteConfig: ResolvedConfig): RuntimeManifest;
-declare function setBuildEntry(buildEntry: unknown): void;
+declare function setGlobalContext_buildEntry(buildEntry: unknown): void;
+declare function clearGlobalContext(): void;

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

@@ -14,8 +14,9 @@ export { setGlobalContext_viteConfig };
 export { setGlobalContext_vikeConfig };
 export { setGlobalContext_isViteDev };
 export { setGlobalContext_isPrerendering };
-export { setBuildEntry };
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectAssign, objectKeys, isObject, hasProp, debugGlob, getGlobalObject, genPromise } from './utils.js';
+export { setGlobalContext_buildEntry };
+export { clearGlobalContext };
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectAssign, objectReplace, objectKeys, isObject, hasProp, debugGlob, getGlobalObject, genPromise, createDebugger } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdImportUserCodeServer } from '../shared/virtual-files/virtualFileImportUserCode.js';
 import { setPageFiles, setPageFilesAsync } from '../../shared/getPageFiles/getPageFiles.js';
@@ -23,16 +24,14 @@ import { assertPluginManifest } from '../shared/assertPluginManifest.js';
 import { assertRuntimeManifest } from '../shared/assertRuntimeManifest.js';
 import pc from '@brillout/picocolors';
 import { resolveBaseFromResolvedConfig } from '../shared/resolveBase.js';
-const globalObject = getGlobalObject('globalContext.ts', (() => {
-    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = genPromise();
-    return {
-        viteDevServerPromise,
-        viteDevServerPromiseResolve
-    };
-})());
+const debug = createDebugger('vike:globalContext');
+const globalObject = getGlobalObject('globalContext.ts', getInitialGlobalContext());
 initDevEntry();
 function getGlobalContext() {
-    assert(globalObject.globalContext);
+    if (!globalObject.globalContext) {
+        debug('getGlobalContext()', new Error().stack);
+        assert(false);
+    }
     return globalObject.globalContext;
 }
 /** @experimental https://vike.dev/getGlobalContext */
@@ -111,9 +110,11 @@ function getViteConfig() {
     return globalObject.viteConfig ?? null;
 }
 async function initGlobalContext_renderPage() {
+    debug('initGlobalContext_renderPage()');
     await initGlobalContext(!globalObject.isViteDev);
 }
 async function initGlobalContext_runPrerender() {
+    debug('initGlobalContext_runPrerender()');
     if (globalObject.initGlobalContext_runPrerender_alreadyCalled)
         return;
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
@@ -127,6 +128,7 @@ async function initGlobalContext_runPrerender() {
     await initGlobalContext(true);
 }
 async function initGlobalContext_getGlobalContextAsync(isProduction) {
+    debug('initGlobalContext_getGlobalContextAsync()');
     if (!isProduction) {
         const waitFor = 20;
         const timeout = setTimeout(() => {
@@ -238,18 +240,28 @@ function eagerlyLoadUserFiles() {
     getPageFilesExports();
 }
 async function getBuildEntry(outDir) {
+    debug('getBuildEntry()');
     if (!globalObject.buildEntry) {
+        debug('importServerProductionEntry()');
         await importServerProductionEntry({ outDir });
+        if (!globalObject.buildEntry) {
+            debug('globalObject.buildEntryPrevious');
+            // Needed, for example, when calling the API prerender() then preview() because both trigger a importServerProductionEntry() call but only the first only is applied because of the import() cache. (A proper implementation would be to clear the import() cache, but it probably isn't possible on platforms such as Cloudflare Workers.)
+            globalObject.buildEntry = globalObject.buildEntryPrevious;
+        }
         assert(globalObject.buildEntry);
     }
-    return globalObject.buildEntry;
-}
-function setBuildEntry(buildEntry) {
+    const { buildEntry } = globalObject;
     assert(isObject(buildEntry));
     assert(hasProp(buildEntry, 'pageFiles', 'object'));
     assert(hasProp(buildEntry, 'assetsManifest', 'object'));
     assert(hasProp(buildEntry, 'pluginManifest', 'object'));
+    return buildEntry;
+}
+function setGlobalContext_buildEntry(buildEntry) {
+    debug('setGlobalContext_buildEntry()');
     globalObject.buildEntry = buildEntry;
+    globalObject.buildEntryPrevious = buildEntry;
 }
 function initDevEntry() {
     setPageFilesAsync(getPageFilesExports);
@@ -270,3 +282,15 @@ async function getPageFilesExports() {
     assert(isObject(moduleExports));
     return moduleExports;
 }
+function clearGlobalContext() {
+    debug('clearGlobalContext()');
+    objectReplace(globalObject, getInitialGlobalContext(), ['buildEntryPrevious']);
+}
+function getInitialGlobalContext() {
+    debug('getInitialGlobalContext()');
+    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = genPromise();
+    return {
+        viteDevServerPromise,
+        viteDevServerPromiseResolve
+    };
+}

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

@@ -15,6 +15,7 @@ export * from '../../utils/projectInfo.js';
 export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/objectAssign.js';
+export * from '../../utils/objectReplace.js';
 export * from '../../utils/PromiseType.js';
 export * from '../../utils/compareString.js';
 export * from '../../utils/isObjectWithKeys.js';

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

@@ -19,6 +19,7 @@ export * from '../../utils/projectInfo.js';
 export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/objectAssign.js';
+export * from '../../utils/objectReplace.js';
 export * from '../../utils/PromiseType.js';
 export * from '../../utils/compareString.js';
 export * from '../../utils/isObjectWithKeys.js';

package/dist/esm/shared/page-configs/Config.d.ts

@@ -39,11 +39,12 @@ import type { VikeVitePluginOptions } from '../../node/plugin/plugins/importUser
 import type { Vike, VikePackages } from '../VikeNamespace.js';
 import type { HooksTimeoutProvidedByUser } from '../hooks/getHook.js';
 import type { PageContextClient, PageContextServer } from '../types.js';
+import type { InlineConfig } from 'vite';
 type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
 type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
 type HookNameOldDesign = 'render' | 'prerender';
-type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
+type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
 type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte | VikePackages.ConfigVikeAngular);
 /** Hook for fetching data.
  *
@@ -344,6 +345,11 @@ type ConfigBuiltIn = {
      * https://vike.dev/meta
      */
     meta?: ConfigMeta | ImportString;
+    /** Vite configuration.
+     *
+     * https://vite.dev/config/
+     */
+    vite?: InlineConfig;
     /**
      * @experimental DON'T USE: the API *will* have breaking changes upon any minor version release.
      *

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.218-commit-01a099d";
+export declare const PROJECT_VERSION: "0.4.218-commit-ed9b3d4";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.218-commit-01a099d';
+export const PROJECT_VERSION = '0.4.218-commit-ed9b3d4';

package/dist/esm/utils/debug.d.ts

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugActivated };
 export type { Debug };
-declare const flags: readonly ["vike:error", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files", "vike:esbuild-resolve"];
+declare const flags: readonly ["vike:error", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files", "vike:esbuild-resolve"];
 type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {

package/dist/esm/utils/debug.js

@@ -16,6 +16,7 @@ const flags = [
     'vike:extractAssets',
     'vike:extractExportNames',
     'vike:glob',
+    'vike:globalContext',
     'vike:log',
     'vike:optimizeDeps',
     'vike:outDir',
@@ -28,7 +29,7 @@ const flags = [
     'vike:esbuild-resolve'
 ];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
-assertDEBUG();
+assertFlagsActivated();
 function createDebugger(flag, optionsGlobal) {
     checkType(flag);
     assert(flags.includes(flag));
@@ -71,8 +72,8 @@ function debug_(flag, options, ...msgs) {
 function isDebugActivated(flag) {
     checkType(flag);
     assert(flags.includes(flag));
-    const DEBUG = getDEBUG();
-    const isActivated = DEBUG?.includes(flag) ?? false;
+    const flagsActivated = getFlagsActivated();
+    const isActivated = flagsActivated.includes(flag);
     return isActivated;
 }
 function formatMsg(info, options, padding, position) {
@@ -135,13 +136,17 @@ function replaceFunctionSerializer(_key, value) {
     }
     return value;
 }
-function assertDEBUG() {
-    const DEBUG = getDEBUG() ?? '';
-    const flagsActivated = DEBUG.match(flagRegex) ?? [];
+function assertFlagsActivated() {
+    const flagsActivated = getFlagsActivated();
     flagsActivated.forEach((flag) => {
         assertUsage(flags.includes(flag), `Unknown DEBUG flag ${pc.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${pc.cyan(f)}`).join('\n')}`);
     });
 }
+function getFlagsActivated() {
+    const DEBUG = getDEBUG() ?? '';
+    const flagsActivated = DEBUG.match(flagRegex) ?? [];
+    return flagsActivated;
+}
 function getDEBUG() {
     let DEBUG;
     // - `process` can be undefined in edge workers

package/dist/esm/utils/objectReplace.d.ts

@@ -0,0 +1 @@
+export declare function objectReplace(obj: object, objNew: object, except?: string[]): void;

package/dist/esm/utils/objectReplace.js

@@ -0,0 +1,6 @@
+export 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/utils/projectInfo.d.ts

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.218-commit-01a099d";
+    projectVersion: "0.4.218-commit-ed9b3d4";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.218-commit-01a099d",
+  "version": "0.4.218-commit-ed9b3d4",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -236,7 +236,7 @@
     "@types/resolve": "^1.20.6",
     "@types/semver": "^7.5.8",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.3.44",
+    "react-streaming": "^0.3.47",
     "rimraf": "^5.0.5",
     "typescript": "^5.7.3",
     "vite": "^6.0.5"