vike 0.4.219 → 0.4.220-commit-9a798ce

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

@@ -1,72 +1,37 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
-const isPrerenderAutoRunEnabled_js_1 = require("../prerender/isPrerenderAutoRunEnabled.js");
+const assert_1 = __importDefault(require("assert"));
+const context_js_1 = require("../cli/context.js");
+const context_js_2 = require("../prerender/context.js");
 /**
  * Programmatically trigger `$ vike build`
  *
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigEnhanced, vikeConfigGlobal } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
-    // Build client-side
-    const outputClient = await (0, vite_1.build)(viteConfigEnhanced);
-    // Build server-side
-    const outputServer = await (0, vite_1.build)(setSSR(viteConfigEnhanced));
-    // Pre-render
-    if ((0, isPrerenderAutoRunEnabled_js_1.isPrerenderAutoRunEnabled)(vikeConfigGlobal)) {
-        const { runPrerenderFromAutoRun } = await Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
-        await runPrerenderFromAutoRun(viteConfigEnhanced);
-    }
-    return {
-        /* We don't return `viteConfig` because `viteConfigEnhanced` is `InlineConfig` not `ResolvedConfig`
-        viteConfig: viteConfigEnhanced,
-        */
-        rollupOutputClient: outputClient,
-        rollupOutputServer: outputServer
-    };
-}
-function setSSR(viteConfig) {
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
+    // Pass it to autoFullBuild()
+    if (viteConfigEnhanced)
+        viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;
+    // 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 (0, vite_1.build)(viteConfigEnhanced);
+    // When using the Vike CLI with pre-rendering the process is forcefully exited at the end of the buildVite() call above
+    (0, assert_1.default)(!((0, context_js_1.isVikeCli)() && (0, context_js_2.isPrerendering)()));
     return {
-        ...viteConfig,
-        build: {
-            ...viteConfig?.build,
-            ssr: true
-        }
+    /* We don't return `viteConfig` because `viteConfigEnhanced` is `InlineConfig` not `ResolvedConfig`
+    viteConfig: viteConfigEnhanced,
+    */
     };
 }

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setOperation = setOperation;
-exports.clearOperation = clearOperation;
 exports.isVikeCliOrApi = isVikeCliOrApi;
+exports.setContextApiOperation = setContextApiOperation;
+exports.clearContextApiOperation = clearContextApiOperation;
 const utils_js_1 = require("./utils.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('context.ts', {
-    apiOperation: undefined
-});
-function getOperation() {
+const globalObject = (0, utils_js_1.getGlobalObject)('api/context.ts', {});
+function getApiOperation() {
     (0, utils_js_1.assert)(globalObject.apiOperation);
     return globalObject.apiOperation;
 }
@@ -15,10 +13,10 @@ function isVikeCliOrApi() {
     // The CLI uses the API
     return !!globalObject.apiOperation;
 }
-function setOperation(operation) {
+function setContextApiOperation(operation) {
     (0, utils_js_1.assert)(!globalObject.apiOperation);
     globalObject.apiOperation = operation;
 }
-function clearOperation() {
+function clearContextApiOperation() {
     globalObject.apiOperation = undefined;
 }

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

@@ -51,31 +51,30 @@ 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);
+    (0, context_js_1.setContextApiOperation)(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
 // For subsequent API calls, e.g. calling prerender() after build()
 function clear() {
-    (0, context_js_1.clearOperation)();
+    (0, context_js_1.clearContextApiOperation)();
     (0, globalContext_js_1.clearGlobalContext)();
 }
 async function enhanceViteConfig(viteConfig, operation) {
     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);
+    const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
     return {
-        viteConfigEnhanced,
-        vikeConfigGlobal: vikeConfig.vikeConfigGlobal
+        viteConfigEnhanced
     };
 }
-function addViteSettingsSetByUser(viteConfigEnhanced, vikeConfig) {
+function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
     const viteConfigs = vikeConfig.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 ?? {});
+        viteConfigEnhanced = (0, vite_1.mergeConfig)(viteConfigEnhanced ?? {}, v.value);
     });
     return viteConfigEnhanced;
 }

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

@@ -20,5 +20,5 @@ const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
-__exportStar(require("../../utils/filesystemPathHandling.js"), exports);
+__exportStar(require("../../utils/toPosixPath.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVikeCli = isVikeCli;
+exports.setContextCliCommand = setContextCliCommand;
+const utils_js_1 = require("./utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('cli/context.ts', {});
+function getCliCommand() {
+    return globalObject.cliCommand;
+}
+function isVikeCli() {
+    return !!globalObject.cliCommand;
+}
+function setContextCliCommand(command) {
+    (0, utils_js_1.assert)(!globalObject.cliCommand);
+    globalObject.cliCommand = command;
+}

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

@@ -40,9 +40,11 @@ const utils_js_1 = require("./utils.js");
 const index_js_1 = require("../api/index.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const parseCli_js_1 = require("./parseCli.js");
+const context_js_1 = require("./context.js");
 cli();
 async function cli() {
     const { command } = (0, parseCli_js_1.parseCli)();
+    (0, context_js_1.setContextCliCommand)(command);
     if (command === 'dev') {
         await cmdDev();
     }

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

@@ -21,3 +21,4 @@ const onLoad_js_1 = require("./onLoad.js");
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/includes.js"), exports);
+__exportStar(require("../../utils/getGlobalObject.js"), exports);

package/dist/cjs/{utils → node/plugin}/getOutDirs.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
-const viteIsSSR_js_1 = require("./viteIsSSR.js");
-const assert_js_1 = require("./assert.js");
-const path_shim_js_1 = require("./path-shim.js");
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
+const viteIsSSR_js_1 = require("../../utils/viteIsSSR.js");
+const assert_js_1 = require("../../utils/assert.js");
+const path_shim_js_1 = require("../../utils/path-shim.js");
+const toPosixPath_js_1 = require("../../utils/toPosixPath.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const debug_js_1 = require("./debug.js");
+const debug_js_1 = require("../../utils/debug.js");
 const debug = (0, debug_js_1.createDebugger)('vike:outDir');
 function getOutDirs(config) {
     debug('getOutDirs()', new Error().stack);
@@ -55,7 +55,7 @@ function resolveOutDir(config) {
     }
 }
 function determineOutDirs(outDirRoot) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(outDirRoot);
+    (0, toPosixPath_js_1.assertPosixPath)(outDirRoot);
     (0, assert_js_1.assert)(!outDirRoot.endsWith('/'));
     (0, assert_js_1.assert)(isOutDirRoot(outDirRoot));
     const outDirClient = (0, path_shim_js_1.pathJoin)(outDirRoot, 'client');
@@ -66,8 +66,8 @@ function determineOutDirs(outDirRoot) {
 }
 function getOutDirsAll(outDirRoot, root) {
     if (!outDirIsAbsolutePath(outDirRoot)) {
-        (0, filesystemPathHandling_js_1.assertPosixPath)(outDirRoot);
-        (0, filesystemPathHandling_js_1.assertPosixPath)(root);
+        (0, toPosixPath_js_1.assertPosixPath)(outDirRoot);
+        (0, toPosixPath_js_1.assertPosixPath)(root);
         outDirRoot = (0, path_shim_js_1.pathJoin)(root, outDirRoot);
     }
     let { outDirClient, outDirServer } = determineOutDirs(outDirRoot);
@@ -80,7 +80,7 @@ function getOutDirsAll(outDirRoot, root) {
     return { outDirRoot, outDirClient, outDirServer };
 }
 function assertNormalization(outDirAny) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(outDirAny);
+    (0, toPosixPath_js_1.assertPosixPath)(outDirAny);
     (0, assert_js_1.assert)(outDirIsAbsolutePath(outDirAny));
     (0, assert_js_1.assert)(outDirAny.endsWith('/'));
     (0, assert_js_1.assert)(!outDirAny.endsWith('//'));
@@ -95,7 +95,7 @@ function assertIsNotOutDirRoot(outDir) {
 }
 /** `outDir` ends with `/server` or `/client` */
 function assertOutDirResolved(outDir, config) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(outDir);
+    (0, toPosixPath_js_1.assertPosixPath)(outDir);
     assertIsNotOutDirRoot(outDir);
     (0, assert_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
@@ -121,7 +121,7 @@ function getOutDirFromViteResolvedConfig(config) {
     return outDir;
 }
 function normalize(outDir) {
-    outDir = (0, filesystemPathHandling_js_1.toPosixPath)(outDir);
+    outDir = (0, toPosixPath_js_1.toPosixPath)(outDir);
     outDir = outDir.replace(/\/+$/, ''); // remove trailing slashes
     return outDir;
 }

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

@@ -9,7 +9,6 @@ exports.ssr = plugin;
 exports.default = plugin;
 var utils_js_1 = require("./utils.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
-const vite_1 = require("vite");
 const utils_js_2 = require("./utils.js");
 const buildConfig_js_1 = require("./plugins/buildConfig.js");
 const previewConfig_js_1 = require("./plugins/previewConfig.js");
@@ -33,8 +32,7 @@ const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
 const resolveClientEntriesDev_js_1 = require("./resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
 const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
-(0, utils_js_2.markSetup_vikeVitePlugin)();
-assertViteVersion();
+// We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeVitePluginOptions = {}) {
@@ -69,10 +67,6 @@ Object.defineProperty(plugin, 'apply', {
         (0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
     }
 });
-// package.json#peerDependencies isn't enough as users can ignore it
-function assertViteVersion() {
-    (0, utils_js_2.assertVersion)('Vite', vite_1.version, '5.1.0');
-}
 // Ensures following works: `const vike = require('vike/plugin')` / `import vike from 'vike/plugin'`
 //  - It needs to live at the end of this file, in order to ensure we do it after all assignments to `exports`.
 try {

package/dist/cjs/node/plugin/onLoad.js

@@ -4,9 +4,14 @@ exports.onLoad = onLoad;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 const assertSetup_js_1 = require("../../utils/assertSetup.js");
 const assertNodeVersion_js_1 = require("../../utils/assertNodeVersion.js");
+const assertVersion_js_1 = require("../../utils/assertVersion.js");
+const vite_1 = require("vite");
 function onLoad() {
+    (0, assertSetup_js_1.markSetup_vikeVitePlugin)();
     (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
     (0, assertNodeVersion_js_1.assertNodeVersion)();
-    // Ensure we don't bloat the server runtime with heavy plugin dependencies such as esbuild
+    // package.json#peerDependencies isn't enough as users can ignore it
+    (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, '5.1.0');
+    // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     (0, assertSetup_js_1.assertIsNotProductionRuntime)();
 }

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

@@ -8,26 +8,27 @@ exports.autoFullBuild = autoFullBuild;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const runPrerender_js_1 = require("../../prerender/runPrerender.js");
-const isPrerenderAutoRunEnabled_js_1 = require("../../prerender/isPrerenderAutoRunEnabled.js");
+const context_js_1 = require("../../prerender/context.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const logErrorHint_js_1 = require("../../runtime/renderPage/logErrorHint.js");
 const buildConfig_js_1 = require("./buildConfig.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const context_js_2 = require("../../api/context.js");
+const context_js_3 = require("../../cli/context.js");
 let forceExit = false;
 function autoFullBuild() {
     let config;
-    let vikeConfigGlobal;
+    let vikeConfig;
     return [
         {
             name: 'vike:autoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
-                const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
-                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
+                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
                 config = config_;
-                abortViteBuildSsr(vikeConfigGlobal);
+                abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
                 /* We can't use this because it breaks Vite's logging. TODO: try again with latest Vite version.
@@ -36,7 +37,7 @@ function autoFullBuild() {
                 */
                 async handler(_options, bundle) {
                     try {
-                        await triggerFullBuild(config, vikeConfigGlobal, bundle);
+                        await triggerFullBuild(config, vikeConfig, bundle);
                     }
                     catch (err) {
                         // Avoid Rollup prefixing the error with [vike:autoFullBuild], for example see https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
@@ -62,10 +63,10 @@ function autoFullBuild() {
         }
     ];
 }
-async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
+async function triggerFullBuild(config, vikeConfig, bundle) {
     if (config.build.ssr)
         return; // already triggered
-    if (isDisabled(vikeConfigGlobal))
+    if (isDisabled(vikeConfig))
         return;
     // Workaround for @vitejs/plugin-legacy
     //  - The legacy plugin triggers its own Rollup build for the client-side.
@@ -74,43 +75,54 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
     if (!bundle[buildConfig_js_1.manifestTempFile])
         return;
     const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
-    const configInline = {
-        ...configFromCli,
-        configFile: configFromCli?.configFile || config.configFile,
-        root: config.root,
-        build: {
-            ...configFromCli?.build
-        }
-    };
-    try {
-        await (0, vite_1.build)({
-            ...configInline,
+    let configInline;
+    if (config._viteConfigEnhanced) {
+        configInline = config._viteConfigEnhanced;
+    }
+    else {
+        configInline = {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
             build: {
-                ...configInline.build,
-                ssr: true
+                ...configFromCli?.build
             }
-        });
+        };
+    }
+    try {
+        await (0, vite_1.build)(setSSR(configInline));
     }
     catch (err) {
         console.error(err);
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    if ((0, isPrerenderAutoRunEnabled_js_1.isPrerenderAutoRunEnabled)(vikeConfigGlobal)) {
-        await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
-        forceExit = true;
+    if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
+        const { prerenderContextPublic } = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
+        config.vike.prerenderContext = prerenderContextPublic;
+        forceExit = (0, context_js_3.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
     }
 }
-function abortViteBuildSsr(vikeConfigGlobal) {
-    if (vikeConfigGlobal.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
+function setSSR(configInline) {
+    return {
+        ...configInline,
+        build: {
+            ...configInline.build,
+            ssr: true
+        }
+    };
+}
+function abortViteBuildSsr(vikeConfig) {
+    if (vikeConfig.global.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
         (0, utils_js_1.assertWarning)(false, `The CLI call ${picocolors_1.default.cyan('$ vite build --ssr')} is superfluous since ${picocolors_1.default.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${picocolors_1.default.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
 }
-function isDisabled(vikeConfigGlobal) {
-    const { disableAutoFullBuild } = vikeConfigGlobal;
-    if (disableAutoFullBuild === null || disableAutoFullBuild === 'prerender') {
-        return !(0, isViteCliCall_js_1.isViteCliCall)();
+function isDisabled(vikeConfig) {
+    const { disableAutoFullBuild } = vikeConfig.global.config;
+    if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
+        const isViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
+        return isViteApi;
     }
     else {
         return disableAutoFullBuild;

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

@@ -13,7 +13,7 @@ function baseUrls() {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vike.vikeConfigGlobal.baseServer, config.vike.vikeConfigGlobal.baseAssets);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vike.global.config.baseServer ?? null, config.vike.global.config.baseAssets ?? null);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -29,7 +29,7 @@ function baseUrls() {
         },
         async configResolved(config) {
             const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
+            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
             (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)

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

@@ -85,7 +85,7 @@ function buildConfig() {
             name: 'vike:buildConfig:pre',
             apply: 'build',
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
             enforce: 'pre',
             writeBundle: {
@@ -108,7 +108,7 @@ function buildConfig() {
                         }
                         await promises_1.default.rm(clientManifestFilePath);
                         await promises_1.default.rm(serverManifestFilePath);
-                        await (0, index_js_1.set_ASSETS_MAP)(options, bundle);
+                        await (0, index_js_1.set_ASSETS_MANIFEST)(options, bundle);
                     }
                 }
             }
@@ -118,7 +118,10 @@ function buildConfig() {
 async function getEntries(config) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
     const { pageConfigs } = vikeConfig;
-    const pageFileEntries = await getPageFileEntries(config, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer); // TODO/v1-release: remove
+    // TODO/v1-release: remove
+    const pageFileEntries = await getPageFileEntries(config, 
+    // TODO/now: add meta.default
+    vikeConfig.global.config.includeAssetsImportedByServer ?? true);
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if ((0, utils_js_1.viteIsSSR)(config)) {
         const pageEntries = getPageEntries(pageConfigs);

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

@@ -4,11 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildEntry = buildEntry;
-exports.set_ASSETS_MAP = set_ASSETS_MAP;
+exports.set_ASSETS_MANIFEST = set_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
-const getVikeManifest_js_1 = require("./getVikeManifest.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
@@ -16,69 +14,74 @@ const module_1 = require("module");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
-const ASSETS_MAP = '__VITE_ASSETS_MAP__';
+const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
+const globalContext_js_1 = require("../../../runtime/globalContext.js");
+const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
 function buildEntry() {
     let config;
-    let vikeConfigGlobal;
     return [
         {
             name: 'vike:buildEntry',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
-                const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
             }
         },
         ...(0, plugin_1.serverProductionEntryPlugin)({
             getServerProductionEntry: () => {
-                return getServerProductionEntryCode(config, vikeConfigGlobal);
+                return getServerProductionEntryCode(config);
             },
             libraryName: 'Vike'
         })
     ];
 }
-function getServerProductionEntryCode(config, vikeConfigGlobal) {
+function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
-    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(vikeConfigGlobal, config);
-    // Let's eventually simplify and move everything to a single virtual module
+    const buildInfo = {
+        versionAtBuildTime: utils_js_1.projectInfo.projectVersion,
+        usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
+        viteConfigRuntime: (0, globalContext_js_1.getViteConfigRuntime)(config)
+    };
+    (0, globalContext_js_1.assertBuildInfo)(buildInfo);
+    // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
         `  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)};`,
+        // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
+        // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
+        `    const assetsManifest = ${ASSETS_MANIFEST};`,
+        `    const buildInfo = ${JSON.stringify(buildInfo, null, 2)};`,
         '    setGlobalContext_buildEntry({',
         `      pageFiles,`,
         `      assetsManifest,`,
-        `      pluginManifest,`,
+        `      buildInfo,`,
         '    });',
         `  }`,
         ''
     ].join('\n');
     return importerCode;
 }
-/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
-async function set_ASSETS_MAP(options, bundle) {
+/** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
+async function set_ASSETS_MANIFEST(options, bundle) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
-    const chunkPath = find_ASSETS_MAP(bundle);
+    const chunkPath = find_ASSETS_MANIFEST(bundle);
     const chunkFilePath = path_1.default.join(dir, chunkPath);
     const assetsJsonFilePath = path_1.default.join(dir, '..', 'assets.json');
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
         await promises_1.default.readFile(chunkFilePath, 'utf8')
     ]);
-    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MAP, assetsJsonString);
+    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== chunkFileContent);
     await promises_1.default.writeFile(chunkFilePath, serverEntryFileContentPatched);
 }
-function find_ASSETS_MAP(bundle) {
+function find_ASSETS_MANIFEST(bundle) {
     let chunkPath;
     for (const filePath in bundle) {
         const chunk = bundle[filePath];
-        if ('code' in chunk && chunk.code.includes(ASSETS_MAP)) {
+        if ('code' in chunk && chunk.code.includes(ASSETS_MANIFEST)) {
             (0, utils_js_1.assert)(!chunkPath);
             chunkPath = filePath;
         }