vike 0.4.224-commit-00ed9fe → 0.4.225

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

@@ -16,7 +16,7 @@ const utils_js_1 = require("./utils.js");
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigEnhanced, vikeConfig } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
+    const { viteConfigEnhanced, vikeConfig } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'build');
     // Pass it to pluginAutoFullBuild()
     if (viteConfigEnhanced)
         viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;

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

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isVikeCliOrApi = isVikeCliOrApi;
 exports.setContextApiOperation = setContextApiOperation;
 exports.clearContextApiOperation = clearContextApiOperation;
+exports.getApiOperation = getApiOperation;
 const utils_js_1 = require("./utils.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('api/context.ts', {});
 function getApiOperation() {
-    (0, utils_js_1.assert)(globalObject.apiOperation);
-    return globalObject.apiOperation;
+    return globalObject.apiOperation ?? null;
 }
 function isVikeCliOrApi() {
     // The CLI uses the API
     return !!globalObject.apiOperation;
 }
-function setContextApiOperation(operation) {
+function setContextApiOperation(operation, options) {
     (0, utils_js_1.assert)(!globalObject.apiOperation);
-    globalObject.apiOperation = operation;
+    globalObject.apiOperation = { operation, options };
 }
 function clearContextApiOperation() {
     globalObject.apiOperation = undefined;

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

@@ -9,7 +9,7 @@ const vite_1 = require("vite");
  * https://vike.dev/api#dev
  */
 async function dev(options = {}) {
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'dev');
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'dev');
     const server = await (0, vite_1.createServer)(viteConfigEnhanced);
     return {
         viteServer: server,

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

@@ -48,9 +48,10 @@ 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)('api/prepareViteApiCall.ts', {});
-async function prepareViteApiCall(viteConfigFromOptions, operation) {
+async function prepareViteApiCall(options, operation) {
     clear();
-    (0, context_js_1.setContextApiOperation)(operation);
+    (0, context_js_1.setContextApiOperation)(operation, options);
+    const viteConfigFromOptions = options.viteConfig;
     return enhanceViteConfig(viteConfigFromOptions, operation);
 }
 // For subsequent API calls, e.g. calling prerender() after build()

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

@@ -10,7 +10,7 @@ const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
  * https://vike.dev/api#prerender
  */
 async function prerender(options = {}) {
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'prerender');
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'prerender');
     options.viteConfig = viteConfigEnhanced;
     const { viteConfig } = await (0, runPrerender_js_1.runPrerenderFromAPI)(options);
     return {

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

@@ -9,7 +9,7 @@ const vite_1 = require("vite");
  * https://vike.dev/api#preview
  */
 async function preview(options = {}) {
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'preview');
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'preview');
     const server = await (0, vite_1.preview)(viteConfigEnhanced);
     return {
         viteServer: server,

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

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

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

@@ -43,8 +43,8 @@ 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);
+    const { command, cliOptions } = (0, parseCli_js_1.parseCli)();
+    (0, context_js_1.setContextCliCommand)(command, cliOptions);
     if (command === 'dev') {
         await cmdDev();
     }
@@ -66,7 +66,7 @@ async function cmdDev() {
         const info = viteServer.config.logger.info;
         const startupDurationString = picocolors_1.default.dim(`ready in ${picocolors_1.default.reset(picocolors_1.default.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
         const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
-        info(`  ${picocolors_1.default.yellow(`${picocolors_1.default.bold(utils_js_1.projectInfo.projectName)} v${utils_js_1.projectInfo.projectVersion}`)}  ${startupDurationString}\n`, {
+        info(`  ${picocolors_1.default.yellow(`${picocolors_1.default.bold('Vike')} v${utils_js_1.PROJECT_VERSION}`)}  ${startupDurationString}\n`, {
             clear: !hasExistingLogs
         });
         viteServer.printUrls();

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCli = parseCli;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("./utils.js");
+const getEnvVarObject_js_1 = require("../plugin/shared/getEnvVarObject.js");
 const commands = [
     { name: 'dev', desc: 'Start development server' },
     { name: 'build', desc: 'Build for production' },
@@ -13,32 +14,59 @@ const commands = [
     { name: 'prerender', desc: 'Pre-render pages (only needed when partial.disableAutoRun is true)' }
 ];
 function parseCli() {
-    const command = (() => {
-        const firstArg = process.argv[2];
-        if (!firstArg) {
-            showHelp();
-        }
-        showHelpOrVersion(firstArg);
-        if ((0, utils_js_1.includes)(commands.map((c) => c.name), firstArg))
-            return firstArg;
-        wrongUsage(`Unknown command ${picocolors_1.default.bold(firstArg)}`);
-    })();
+    const command = getCommand();
+    const cliOptions = getCliOptions();
+    return { command, cliOptions };
+}
+function getCommand() {
+    const firstArg = process.argv[2];
+    if ((0, utils_js_1.includes)(commands.map((c) => c.name), firstArg)) {
+        return firstArg;
+    }
+    if (!firstArg)
+        showHelp();
+    showHelpOrVersion(firstArg);
+    wrongUsage(`Unknown command ${picocolors_1.default.bold(firstArg)}`);
+}
+function getCliOptions() {
+    let cliOptions = {};
+    let configNameCurrent;
+    const commitIfDefinedWithoutValue = () => {
+        if (configNameCurrent)
+            commit(true);
+    };
+    const commit = (val) => {
+        (0, utils_js_1.assert)(configNameCurrent);
+        cliOptions[configNameCurrent] = val;
+        configNameCurrent = undefined;
+    };
     for (const arg of process.argv.slice(3)) {
         showHelpOrVersion(arg);
-        wrongUsage(`Unknown option ${picocolors_1.default.bold(arg)}`);
+        if (arg.startsWith('--')) {
+            commitIfDefinedWithoutValue();
+            configNameCurrent = arg.slice('--'.length);
+        }
+        else {
+            if (!configNameCurrent)
+                wrongUsage(`Unknown option ${picocolors_1.default.bold(arg)}`);
+            commit((0, getEnvVarObject_js_1.parseJson5)(arg, `CLI option --${configNameCurrent}`));
+        }
     }
-    return { command };
+    commitIfDefinedWithoutValue();
+    return cliOptions;
 }
 function showHelp() {
     const TAB = ' '.repeat(3);
     const nameMaxLength = Math.max(...commands.map((c) => c.name.length));
     console.log([
-        `vike@${utils_js_1.projectInfo.projectVersion}`,
+        `vike@${utils_js_1.PROJECT_VERSION}`,
         '',
         'Usage:',
         ...[...commands, { name: '-v', desc: "Print Vike's installed version" }].map((c) => `  ${picocolors_1.default.dim('$')} ${picocolors_1.default.bold(`vike ${c.name}`)}${' '.repeat(nameMaxLength - c.name.length)}${TAB}${picocolors_1.default.dim(`# ${c.desc}`)}`),
         '',
-        `More infos at ${picocolors_1.default.underline('https://vike.dev/cli')}`
+        `Vike settings can be passed over the ${picocolors_1.default.cyan('VIKE_CONFIG')} environment variable or as ${picocolors_1.default.cyan('CLI options')} such as --host.`,
+        `Vite settings can be passed over the ${picocolors_1.default.cyan('VITE_CONFIG')} environment variable.`,
+        `See ${picocolors_1.default.underline('https://vike.dev/cli')} for more information.`
     ].join('\n'));
     process.exit(1);
 }
@@ -51,7 +79,7 @@ function showHelpOrVersion(arg) {
     }
 }
 function showVersion() {
-    console.log(utils_js_1.projectInfo.projectVersion);
+    console.log(utils_js_1.PROJECT_VERSION);
     process.exit(1);
 }
 function wrongUsage(msg) {

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

@@ -19,6 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
 __exportStar(require("../../utils/assert.js"), exports);
-__exportStar(require("../../utils/projectInfo.js"), exports);
+__exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/includes.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);

package/dist/cjs/node/plugin/plugins/build/pluginBuildEntry.js

@@ -40,7 +40,7 @@ function pluginBuildEntry() {
 function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
     const buildInfo = {
-        versionAtBuildTime: utils_js_1.projectInfo.projectVersion,
+        versionAtBuildTime: utils_js_1.PROJECT_VERSION,
         usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
         viteConfigRuntime: (0, globalContext_js_1.getViteConfigRuntime)(config)
     };

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

@@ -78,11 +78,22 @@ function commonConfig(vikeVitePluginOptions) {
             config: {
                 order: 'post',
                 handler(configFromUser) {
-                    // Change default port
                     let configFromVike = { server: {}, preview: {} };
-                    setDefault('port', 3000, configFromUser, configFromVike);
-                    // Set `--host` for Docker/Podman
-                    if ((0, utils_js_1.isDocker)()) {
+                    const vike = getVikeConfigPublic(configFromUser);
+                    if (vike.config.port !== undefined) {
+                        // https://vike.dev/port
+                        setDefault('port', vike.config.port, configFromUser, configFromVike);
+                    }
+                    else {
+                        // Change Vite's default port
+                        setDefault('port', 3000, configFromUser, configFromVike);
+                    }
+                    if (vike.config.host) {
+                        // https://vike.dev/host
+                        setDefault('host', vike.config.host, configFromUser, configFromVike);
+                    }
+                    else if ((0, utils_js_1.isDocker)()) {
+                        // Set `--host` for Docker/Podman
                         setDefault('host', true, configFromUser, configFromVike);
                     }
                     // VITE_CONFIG

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -55,6 +55,8 @@ async function getPageDeps(config, pageConfigs) {
                     const { definedAtFilePath, configEnv } = configValueSource;
                     if (!configEnv.client)
                         return;
+                    if (definedAtFilePath.definedBy)
+                        return;
                     if (definedAtFilePath.filePathAbsoluteUserRootDir !== null) {
                         // Vite expects entries to be filesystem absolute paths (surprisingly so).
                         addEntry(definedAtFilePath.filePathAbsoluteFilesystem);

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

@@ -125,6 +125,14 @@ const configDefinitionsBuiltIn = {
     cacheControl: {
         env: { server: true }
     },
+    host: {
+        env: { config: true },
+        global: true
+    },
+    port: {
+        env: { config: true },
+        global: true
+    },
     injectScriptsAt: {
         env: { server: true }
     },
@@ -150,7 +158,7 @@ const configDefinitionsBuiltIn = {
     },
     prerender: {
         env: { config: true },
-        global: (value) => typeof value === 'object',
+        global: (value, { isGlobalLocation }) => typeof value === 'object' || isGlobalLocation,
         type: ['boolean', 'object'],
         cumulative: true
     },

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

@@ -28,6 +28,9 @@ const assertExtensions_js_1 = require("./getVikeConfig/assertExtensions.js");
 const getPageConfigUserFriendly_js_1 = require("../../../../../shared/page-configs/getPageConfigUserFriendly.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 const getPlusFilesAll_js_1 = require("./getVikeConfig/getPlusFilesAll.js");
+const getEnvVarObject_js_1 = require("../../../shared/getEnvVarObject.js");
+const context_js_1 = require("../../../../api/context.js");
+const context_js_2 = require("../../../../cli/context.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let restartVite = false;
 let wasConfigInvalid = null;
@@ -151,6 +154,8 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
+    // TODO/now: add validation
+    setCliAndApiOptions(pageConfigGlobal);
     // global
     const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
     const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
@@ -209,13 +214,13 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
     (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsGlobal).forEach(([configName, configDef]) => {
         const sources = resolveConfigValueSources(configName, configDef, 
         // We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
-        Object.values(plusFilesAll).flat(), userRootDir, true);
+        Object.values(plusFilesAll).flat(), userRootDir, true, plusFilesAll);
         if (sources.length === 0)
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
     });
     applyEffectsMetaEnv(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
-    applyEffectsConfVal(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
+    applyEffectsConfVal(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal, plusFilesAll);
     sortConfigValueSources(pageConfigGlobal.configValueSources, null);
     assertPageConfigGlobal(pageConfigGlobal, plusFilesAll);
     const pageConfigs = (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal)
@@ -226,14 +231,14 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
         (0, utils_js_1.objectEntries)(configDefinitionsLocal)
             .filter(([_configName, configDef]) => configDef.global !== true)
             .forEach(([configName, configDef]) => {
-            const sources = resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, false);
+            const sources = resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, false, plusFilesAll);
             if (sources.length === 0)
                 return;
             configValueSources[configName] = sources;
         });
         const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsMetaEnv(configValueSources, configDefinitionsLocal);
-        applyEffectsConfVal(configValueSources, configDefinitionsLocal);
+        applyEffectsConfVal(configValueSources, configDefinitionsLocal, plusFilesAll);
         sortConfigValueSources(configValueSources, locationId);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
@@ -358,6 +363,7 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
         (0, utils_js_1.assert)((0, utils_js_1.includes)((0, utils_js_1.objectKeys)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn), configName));
         const configDef = configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn[configName];
         const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
+        // TODO/now: use getSourceNonConfigFile()
         sources.push({
             valueIsLoaded: true,
             value,
@@ -376,6 +382,49 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
         });
     });
 }
+function setCliAndApiOptions(pageConfigGlobal) {
+    // VIKE_CONFIG
+    const configFromEnv = (0, getEnvVarObject_js_1.getEnvVarObject)('VIKE_CONFIG');
+    if (configFromEnv) {
+        add(configFromEnv, { definedBy: 'env' });
+    }
+    // Vike API — passed options
+    const apiOperation = (0, context_js_1.getApiOperation)();
+    if (apiOperation?.options.vikeConfig) {
+        add(apiOperation.options.vikeConfig, {
+            definedBy: 'api',
+            operation: apiOperation.operation
+        });
+    }
+    // Vike CLI options
+    const cliOptions = (0, context_js_2.getCliOptions)();
+    if (cliOptions) {
+        add(cliOptions, { definedBy: 'cli' });
+    }
+    return;
+    function add(configValues, definedBy) {
+        Object.entries(configValues).forEach(([configName, value]) => {
+            var _a;
+            const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
+            sources.unshift(getSourceNonConfigFile(configName, value, definedBy));
+        });
+    }
+}
+function getSourceNonConfigFile(configName, value, definedAt) {
+    (0, utils_js_1.assert)((0, utils_js_1.includes)((0, utils_js_1.objectKeys)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn), configName));
+    const configDef = configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn[configName];
+    const source = {
+        valueIsLoaded: true,
+        value,
+        configEnv: configDef.env,
+        definedAtFilePath: definedAt,
+        locationId: '/',
+        plusFile: null,
+        valueIsLoadedWithImport: false,
+        valueIsDefinedByPlusValueFile: false
+    };
+    return source;
+}
 function sortConfigValueSources(configValueSources, locationIdPage) {
     Object.entries(configValueSources).forEach(([configName, sources]) => {
         sources
@@ -462,7 +511,7 @@ function sortPlusFilesSameLocationId(plusFile1, plusFile2, configName) {
     // No need to make it deterministic: the overall order is arleady deterministic, see sortMakeDeterministic() at getPlusFilesAll()
     return 0;
 }
-function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
+function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal, plusFilesAll) {
     let sources = plusFilesRelevant
         .filter((plusFile) => isDefiningConfig(plusFile, configName))
         .map((plusFile) => getConfigValueSource(configName, plusFile, configDef, userRootDir));
@@ -477,7 +526,7 @@ function resolveConfigValueSources(configName, configDef, plusFilesRelevant, use
         sources = sources.filter((source) => {
             (0, utils_js_1.assert)(source.configEnv.config);
             (0, utils_js_1.assert)(source.valueIsLoaded);
-            const valueIsGlobal = resolveIsGlobalValue(configDef.global, source.value);
+            const valueIsGlobal = resolveIsGlobalValue(configDef.global, source, plusFilesAll);
             return isGlobal ? valueIsGlobal : !valueIsGlobal;
         });
     }
@@ -601,10 +650,13 @@ function isDefiningPage(plusFiles) {
 function isDefiningPageConfig(configName) {
     return ['Page', 'route'].includes(configName);
 }
-function resolveIsGlobalValue(configDefGlobal, configValue) {
+function resolveIsGlobalValue(configDefGlobal, source, plusFilesAll) {
+    (0, utils_js_1.assert)(source.valueIsLoaded);
     let isGlobal;
     if ((0, utils_js_1.isCallable)(configDefGlobal))
-        isGlobal = configDefGlobal(configValue);
+        isGlobal = configDefGlobal(source.value, {
+            isGlobalLocation: isGlobalLocation(source.locationId, plusFilesAll)
+        });
     else
         isGlobal = configDefGlobal ?? false;
     (0, utils_js_1.assert)(typeof isGlobal === 'boolean');
@@ -694,7 +746,7 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
     });
 }
 // Test: https://github.com/vikejs/vike/blob/441a37c4c1a3b07bb8f6efb1d1f7be297a53974a/test/playground/vite.config.ts#L39
-function applyEffectsConfVal(configValueSources, configDefinitions) {
+function applyEffectsConfVal(configValueSources, configDefinitions, plusFilesAll) {
     (0, utils_js_1.objectEntries)(configDefinitions).forEach(([configNameEffect, configDefEffect]) => {
         const sourceEffect = configValueSources[configNameEffect]?.[0];
         if (!sourceEffect)
@@ -702,8 +754,8 @@ function applyEffectsConfVal(configValueSources, configDefinitions) {
         const effect = runEffect(configNameEffect, configDefEffect, sourceEffect);
         if (!effect)
             return;
-        const { configModFromEffect, configValueEffectSource } = effect;
-        applyEffectConfVal(configModFromEffect, sourceEffect, configValueSources, configNameEffect, configDefEffect, configDefinitions, configValueEffectSource);
+        const configModFromEffect = effect;
+        applyEffectConfVal(configModFromEffect, sourceEffect, configValueSources, configNameEffect, configDefEffect, configDefinitions, plusFilesAll);
     });
 }
 // Test: https://github.com/vikejs/vike/blob/441a37c4c1a3b07bb8f6efb1d1f7be297a53974a/test/playground/pages/config-meta/effect/e2e-test.ts#L16
@@ -715,7 +767,7 @@ function applyEffectsMetaEnv(configValueSources, configDefinitions) {
         const effect = runEffect(configNameEffect, configDefEffect, sourceEffect);
         if (!effect)
             return;
-        const { configModFromEffect } = effect;
+        const configModFromEffect = effect;
         applyEffectMetaEnv(configModFromEffect, configValueSources, configDefEffect);
     });
 }
@@ -727,17 +779,16 @@ function runEffect(configName, configDef, source) {
         `Cannot add meta.effect to ${picocolors_1.default.cyan(configName)} because its meta.env is ${picocolors_1.default.cyan(JSON.stringify(configDef.env))} but an effect can only be added to a config that has a meta.env with ${picocolors_1.default.cyan('{ config: true }')}.`
     ].join(' '));
     (0, utils_js_1.assert)(source.valueIsLoaded);
-    const configValueEffectSource = source.value;
     // Call effect
     const configModFromEffect = configDef.effect({
-        configValue: configValueEffectSource,
+        configValue: source.value,
         configDefinedAt: (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, source.definedAtFilePath)
     });
     if (!configModFromEffect)
         return null;
-    return { configModFromEffect, configValueEffectSource };
+    return configModFromEffect;
 }
-function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSources, configNameEffect, configDefEffect, configDefinitions, configValueEffectSource) {
+function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSources, configNameEffect, configDefEffect, configDefinitions, plusFilesAll) {
     (0, utils_js_1.objectEntries)(configModFromEffect).forEach(([configNameTarget, configValue]) => {
         if (configNameTarget === 'meta')
             return;
@@ -754,11 +805,12 @@ function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSource
             valueIsLoaded: true,
             value: configValue
         };
-        const isValueGlobalSource = resolveIsGlobalValue(configDefEffect.global, configValueEffectSource);
-        const isValueGlobalTarget = resolveIsGlobalValue(configDef.global, configValue);
+        (0, utils_js_1.assert)(sourceEffect.valueIsLoaded);
+        const isValueGlobalSource = resolveIsGlobalValue(configDefEffect.global, sourceEffect, plusFilesAll);
+        const isValueGlobalTarget = resolveIsGlobalValue(configDef.global, configValueSource, plusFilesAll);
         const isGlobalHumanReadable = (isGlobal) => `${isGlobal ? 'non-' : ''}global`;
         // The error message make it sound like it's an inherent limitation, it actually isn't (both ways can make senses).
-        (0, utils_js_1.assertUsage)(isValueGlobalSource === isValueGlobalTarget, `The configuration ${picocolors_1.default.cyan(configNameEffect)} is set to ${picocolors_1.default.cyan(JSON.stringify(configValueEffectSource))} which is considered ${isGlobalHumanReadable(isValueGlobalSource)}. However, it has a meta.effect that sets the configuration ${picocolors_1.default.cyan(configNameTarget)} to ${picocolors_1.default.cyan(JSON.stringify(configValue))} which is considered ${isGlobalHumanReadable(isValueGlobalTarget)}. This is contradictory: make sure the values are either both non-global or both global.`);
+        (0, utils_js_1.assertUsage)(isValueGlobalSource === isValueGlobalTarget, `The configuration ${picocolors_1.default.cyan(configNameEffect)} is set to ${picocolors_1.default.cyan(JSON.stringify(sourceEffect.value))} which is considered ${isGlobalHumanReadable(isValueGlobalSource)}. However, it has a meta.effect that sets the configuration ${picocolors_1.default.cyan(configNameTarget)} to ${picocolors_1.default.cyan(JSON.stringify(configValue))} which is considered ${isGlobalHumanReadable(isValueGlobalTarget)}. This is contradictory: make sure the values are either both non-global or both global.`);
         configValueSources[configNameTarget] ?? (configValueSources[configNameTarget] = []);
         configValueSources[configNameTarget].push(configValueSource);
     });
@@ -895,7 +947,7 @@ function determineRouteFilesystem(locationId, configValueSources) {
     (0, utils_js_1.assert)(filesystemRouteString.startsWith('/'));
     const routeFilesystem = {
         routeString: filesystemRouteString,
-        definedBy: filesystemRouteDefinedBy
+        definedAtLocation: filesystemRouteDefinedBy
     };
     return { routeFilesystem, isErrorPage: undefined };
 }
@@ -907,7 +959,9 @@ function getFilesystemRoutingRootEffect(configFilesystemRoutingRoot, configName)
     const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, configFilesystemRoutingRoot.definedAtFilePath);
     (0, utils_js_1.assertUsage)(typeof value === 'string', `${configDefinedAt} should be a string`);
     (0, utils_js_1.assertUsage)(value.startsWith('/'), `${configDefinedAt} is ${picocolors_1.default.cyan(value)} but it should start with a leading slash ${picocolors_1.default.cyan('/')}`);
-    const { filePathAbsoluteUserRootDir } = configFilesystemRoutingRoot.definedAtFilePath;
+    const { definedAtFilePath } = configFilesystemRoutingRoot;
+    (0, utils_js_1.assert)(!definedAtFilePath.definedBy);
+    const { filePathAbsoluteUserRootDir } = definedAtFilePath;
     (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
     const before = (0, filesystemRouting_js_1.getFilesystemRouteString)((0, filesystemRouting_js_1.getLocationId)(filePathAbsoluteUserRootDir));
     const after = value;

package/dist/cjs/node/plugin/shared/getEnvVarObject.js

@@ -4,26 +4,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEnvVarObject = getEnvVarObject;
+exports.parseJson5 = parseJson5;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
 const json5_1 = __importDefault(require("json5"));
-function getEnvVarObject(envVarName
-/* Let's eventually implement this for Vike's config as well
-| 'VIKE_CONFIG'
-*/
-) {
+function getEnvVarObject(envVarName) {
     const valueStr = process.env[envVarName];
     if (!valueStr)
         return null;
+    const value = parseJson5(valueStr, envVarName);
+    (0, utils_js_1.assertUsage)(value, `${envVarName} should define an object but it's ${picocolors_1.default.bold(String(value))} instead.`);
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(value), `${envVarName} should define an object but it's set to the following which isn't an object: ${picocolors_1.default.bold(valueStr)}`);
+    return value;
+}
+function parseJson5(valueStr, what) {
     let value;
     try {
         value = json5_1.default.parse(valueStr);
     }
     catch (err) {
         console.error(err);
-        (0, utils_js_1.assertUsage)(false, `Cannot parse ${envVarName} (see error above) because it's set to the following which isn't a valid JSON5 string: ${picocolors_1.default.bold(valueStr)}`);
+        (0, utils_js_1.assertUsage)(false, `Cannot parse ${picocolors_1.default.cyan(what)} (see error above) because it's set to the following which isn't a valid JSON5 string: ${picocolors_1.default.bold(valueStr)}`);
     }
-    (0, utils_js_1.assertUsage)(value, `${envVarName} should define an object but it's ${picocolors_1.default.bold(String(value))} instead.`);
-    (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(value), `${envVarName} should define an object but it's set to the following which isn't an object: ${picocolors_1.default.bold(valueStr)}`);
     return value;
 }

package/dist/cjs/node/plugin/shared/loggerNotProd/log.js

@@ -20,7 +20,7 @@ function logWithVikeTag(msg, logType, category, showVikeVersion = false) {
 function getProjectTag(showVikeVersion) {
     let projectTag;
     if (showVikeVersion) {
-        projectTag = `[vike@${utils_js_1.projectInfo.projectVersion}]`;
+        projectTag = `[vike@${utils_js_1.PROJECT_VERSION}]`;
     }
     else {
         projectTag = `[vike]`;

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

@@ -4,24 +4,32 @@ exports.resolvePrerenderConfigGlobal = resolvePrerenderConfigGlobal;
 exports.resolvePrerenderConfigLocal = resolvePrerenderConfigLocal;
 const utils_js_1 = require("./utils.js");
 const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.js");
+// When setting +prerender to an object => it also enables pre-rendering
+const defaultValueForObject = true;
 function resolvePrerenderConfigGlobal(vikeConfig) {
-    const prerenderConfigs = vikeConfig.global.config.prerender;
-    let prerenderConfigList = prerenderConfigs || [];
-    // Needed because of backwards compatibility of `vike({prerender:true})` in `vite.config.js`; after we remove it we can remove this line.
-    prerenderConfigList = prerenderConfigList.filter(isObject2);
-    (0, utils_js_1.assert)(prerenderConfigList.every(isObject2)); // Help TS
+    const prerenderConfigs = vikeConfig.global.config.prerender || [];
+    const prerenderSettings = prerenderConfigs.filter(isObject2);
     const prerenderConfigGlobal = {
-        partial: pickFirst(prerenderConfigList.map((c) => c.partial)) ?? false,
-        noExtraDir: pickFirst(prerenderConfigList.map((c) => c.noExtraDir)) ?? false,
-        parallel: pickFirst(prerenderConfigList.map((c) => c.parallel)) ?? true,
-        disableAutoRun: pickFirst(prerenderConfigList.map((c) => c.disableAutoRun)) ?? false
+        partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
+        noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
+        parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
+        disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false
     };
-    const prerenderConfigGlobalLocalValue = prerenderConfigList.map((c) => c.value).filter((v) => v !== null);
-    const defaultLocalValue = pickFirst(prerenderConfigGlobalLocalValue) ??
-        (prerenderConfigGlobalLocalValue.length > 0 ||
-            // Backwards compatibility for with vike({ prerender: true }) in vite.config.js
-            prerenderConfigs?.some((p) => p === true) ||
-            false);
+    let defaultLocalValue = false;
+    {
+        const valueFirst = prerenderConfigs.filter((p) => !(0, utils_js_1.isObject)(p) || p.value !== null)[0];
+        if (valueFirst === true || ((0, utils_js_1.isObject)(valueFirst) && (valueFirst.value ?? defaultValueForObject))) {
+            defaultLocalValue = true;
+        }
+    }
+    // TODO/next-major: remove
+    // Backwards compatibility for `vike({prerender:true})` in vite.config.js
+    {
+        const valuesWithDefinedAt = vikeConfig.global._from.configsCumulative.prerender?.values ?? [];
+        if (valuesWithDefinedAt.some((v) => v.definedAt.includes('vite.config.js') && v.value)) {
+            defaultLocalValue = true;
+        }
+    }
     (0, utils_js_1.objectAssign)(prerenderConfigGlobal, {
         defaultLocalValue,
         isPrerenderingEnabledForAllPages: vikeConfig.pageConfigs.length > 0 &&
@@ -47,8 +55,8 @@ function resolvePrerenderConfigLocal(pageConfig) {
     const prerenderConfigLocal = { value };
     return prerenderConfigLocal;
 }
-function isObject2(p) {
-    return typeof p === 'object' && p !== null;
+function isObject2(value) {
+    return typeof value === 'object' && value !== null;
 }
 function pickFirst(arr) {
     return arr.filter((v) => v !== undefined)[0];