vike 0.4.224 → 0.4.225-commit-37a36a5

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

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vikeConfigDependencies = void 0;
 exports.getVikeConfig = getVikeConfig;
+exports.getVikeConfigOptional = getVikeConfigOptional;
 exports.getVikeConfig2 = getVikeConfig2;
 exports.reloadVikeConfig = reloadVikeConfig;
 exports.isV1Design = isV1Design;
@@ -28,18 +28,18 @@ 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)();
+(0, utils_js_1.assertIsSingleModuleInstance)('v1-design/getVikeConfig.ts');
 let restartVite = false;
 let wasConfigInvalid = null;
 let vikeConfigPromise = null;
-const vikeConfigDependencies = new Set();
-exports.vikeConfigDependencies = vikeConfigDependencies;
 function reloadVikeConfig(config) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;
     (0, utils_js_1.assert)(vikeVitePluginOptions);
-    // TODO/now: unify with esbuildCache
-    vikeConfigDependencies.clear();
     vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
 }
@@ -93,6 +93,11 @@ async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doN
     }
     return await vikeConfigPromise;
 }
+async function getVikeConfigOptional() {
+    if (!vikeConfigPromise)
+        return null;
+    return await vikeConfigPromise;
+}
 function isV1Design(config) {
     const vikeConfig = config._vikeConfigObject;
     (0, utils_js_1.assert)(vikeConfig);
@@ -137,20 +142,24 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configValueSources: {}
                 },
                 global: (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: {} }),
-                pages: {}
+                pages: {},
+                vikeConfigDependencies: new Set()
             };
             return dummyData;
         }
     }
 }
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
-    const esbuildCache = {};
+    const esbuildCache = {
+        transpileCache: {},
+        vikeConfigDependencies: new Set()
+    };
     const plusFilesAll = await (0, getPlusFilesAll_js_1.getPlusFilesAll)(userRootDir, esbuildCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
-    assertKnownConfigs(configDefinitionsResolved, plusFilesAll);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
+    setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     // global
     const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
     const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
@@ -159,7 +168,7 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
         const pageConfigValues = getConfigValues(pageConfig, true);
         return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
-    return { pageConfigs, pageConfigGlobal, global, pages };
+    return { pageConfigs, pageConfigGlobal, global, pages, vikeConfigDependencies: esbuildCache.vikeConfigDependencies };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const plusFilesAllOrdered = Object.values(plusFilesAll)
@@ -169,6 +178,10 @@ async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache)
     // 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).
     plusFilesAllOrdered, (configDef) => !!configDef.global);
     await loadCustomConfigBuildTimeFiles(plusFilesAll, configDefinitionsGlobal, userRootDir, esbuildCache);
+    const configDefinitionsAll = getConfigDefinitions(Object.values(plusFilesAll).flat());
+    const configNamesKnownAll = Object.keys(configDefinitionsAll);
+    const configNamesKnownGlobal = Object.keys(configDefinitionsGlobal);
+    (0, utils_js_1.assert)(configNamesKnownGlobal.every((configName) => configNamesKnownAll.includes(configName)));
     const configDefinitionsLocal = {};
     await Promise.all((0, utils_js_1.objectEntries)(plusFilesAll).map(async ([locationIdPage, plusFiles]) => {
         const plusFilesRelevant = (0, utils_js_1.objectEntries)(plusFilesAll)
@@ -178,12 +191,23 @@ async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache)
             .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderPage(plusFile1, plusFile2, locationIdPage, null));
         const configDefinitions = getConfigDefinitions(plusFilesRelevant, (configDef) => configDef.global !== true);
         await loadCustomConfigBuildTimeFiles(plusFiles, configDefinitions, userRootDir, esbuildCache);
-        configDefinitionsLocal[locationIdPage] = { configDefinitions, plusFiles, plusFilesRelevant };
+        const configNamesKnownLocal = (0, utils_js_1.unique)([...Object.keys(configDefinitions), ...configNamesKnownGlobal]);
+        (0, utils_js_1.assert)(configNamesKnownLocal.every((configName) => configNamesKnownAll.includes(configName)));
+        configDefinitionsLocal[locationIdPage] = {
+            configDefinitions,
+            plusFiles,
+            plusFilesRelevant,
+            configNamesKnownLocal
+        };
     }));
     const configDefinitionsResolved = {
         configDefinitionsGlobal,
-        configDefinitionsLocal
+        configDefinitionsLocal,
+        configDefinitionsAll,
+        configNamesKnownAll,
+        configNamesKnownGlobal
     };
+    assertKnownConfigs(configDefinitionsResolved);
     return configDefinitionsResolved;
 }
 // Load value files (with `env.config===true`) of *custom* configs.
@@ -209,13 +233,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 +250,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 = {
@@ -355,27 +379,58 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
     (0, utils_js_1.assertWarning)(Object.keys(vikeVitePluginOptions).length === 0, `Define Vike settings in +config.js instead of vite.config.js ${picocolors_1.default.underline('https://vike.dev/migration/settings')}`, { onlyOnce: true });
     Object.entries(vikeVitePluginOptions).forEach(([configName, value]) => {
         var _a;
-        (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] = []));
-        sources.push({
-            valueIsLoaded: true,
-            value,
-            configEnv: configDef.env,
-            definedAtFilePath: {
-                ...(0, getFilePath_js_1.getFilePathResolved)({
-                    userRootDir,
-                    filePathAbsoluteUserRootDir: '/vite.config.js'
-                }),
-                fileExportPathToShowToUser: null
-            },
-            locationId: '/',
-            plusFile: null,
-            valueIsLoadedWithImport: false,
-            valueIsDefinedByPlusValueFile: false
-        });
+        sources.push(getSourceNonConfigFile(configName, value, {
+            ...(0, getFilePath_js_1.getFilePathResolved)({
+                userRootDir,
+                filePathAbsoluteUserRootDir: '/vite.config.js'
+            }),
+            fileExportPathToShowToUser: null
+        }));
     });
 }
+function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
+    // Vike API — passed options [lowest precedence]
+    const apiOperation = (0, context_js_1.getApiOperation)();
+    if (apiOperation?.options.vikeConfig) {
+        addSources(apiOperation.options.vikeConfig, { definedBy: 'api', operation: apiOperation.operation }, false);
+    }
+    // Vike CLI options
+    const cliOptions = (0, context_js_2.getCliOptions)();
+    if (cliOptions) {
+        addSources(cliOptions, { definedBy: 'cli' }, true);
+    }
+    // VIKE_CONFIG [highest precedence]
+    const configFromEnv = (0, getEnvVarObject_js_1.getEnvVarObject)('VIKE_CONFIG');
+    if (configFromEnv) {
+        addSources(configFromEnv, { definedBy: 'env' }, false);
+    }
+    return;
+    function addSources(configValues, definedBy, exitOnError) {
+        Object.entries(configValues).forEach(([configName, value]) => {
+            var _a;
+            const sourceName = `The ${(0, getConfigDefinedAt_js_1.getDefinedByString)(definedBy, configName)}`;
+            assertKnownConfig(configName, configDefinitionsResolved.configNamesKnownGlobal, configDefinitionsResolved, '/', sourceName, exitOnError);
+            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,
+        definedAt,
+        locationId: '/',
+        plusFile: null,
+        valueIsLoadedWithImport: false,
+        valueIsDefinedByPlusValueFile: false
+    };
+    return source;
+}
 function sortConfigValueSources(configValueSources, locationIdPage) {
     Object.entries(configValueSources).forEach(([configName, sources]) => {
         sources
@@ -462,7 +517,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,14 +532,14 @@ 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;
         });
     }
     return sources;
 }
 function isDefiningConfig(plusFile, configName) {
-    return getDefiningConfigNames(plusFile).includes(configName);
+    return getConfigNamesSetByPlusFile(plusFile).includes(configName);
 }
 function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
     const confVal = getConfVal(plusFile, configName);
@@ -527,7 +582,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            definedAtFilePath
+            definedAt: definedAtFilePath
         };
         return configValueSource;
     }
@@ -551,7 +606,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
                 configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
                 valueIsLoadedWithImport: true,
                 valueIsDefinedByPlusValueFile: false,
-                definedAtFilePath: pointerImport.fileExportPath
+                definedAt: pointerImport.fileExportPath
             };
             return configValueSource;
         }
@@ -563,7 +618,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            definedAtFilePath: definedAtFilePath_
+            definedAt: definedAtFilePath_
         };
         return configValueSource;
     }
@@ -577,7 +632,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             configEnv: configEnvResolved,
             valueIsLoadedWithImport: !confVal.valueIsLoaded || !(0, serializeConfigValues_js_1.isJsonValue)(confVal.value),
             valueIsDefinedByPlusValueFile: true,
-            definedAtFilePath: {
+            definedAt: {
                 ...plusFile.filePath,
                 fileExportPathToShowToUser: configName === plusFile.configName
                     ? []
@@ -591,7 +646,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
 }
 function isDefiningPage(plusFiles) {
     for (const plusFile of plusFiles) {
-        const configNames = getDefiningConfigNames(plusFile);
+        const configNames = getConfigNamesSetByPlusFile(plusFile);
         if (configNames.some((configName) => isDefiningPageConfig(configName))) {
             return true;
         }
@@ -601,16 +656,19 @@ 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');
     return isGlobal;
 }
-function getDefiningConfigNames(plusFile) {
+function getConfigNamesSetByPlusFile(plusFile) {
     let configNames = [];
     if (!plusFile.isConfigFile) {
         configNames.push(plusFile.configName);
@@ -694,7 +752,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 +760,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 +773,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 +785,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,
-        configDefinedAt: (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, source.definedAtFilePath)
+        configValue: source.value,
+        configDefinedAt: (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, source.definedAt)
     });
     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;
@@ -745,7 +802,7 @@ function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSource
         (0, utils_js_1.assert)(configDef);
         (0, utils_js_1.assert)(configDefEffect._userEffectDefinedAtFilePath);
         const configValueSource = {
-            definedAtFilePath: configDefEffect._userEffectDefinedAtFilePath,
+            definedAt: configDefEffect._userEffectDefinedAtFilePath,
             plusFile: sourceEffect.plusFile,
             locationId: sourceEffect.locationId,
             configEnv: configDef.env,
@@ -754,11 +811,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);
     });
@@ -807,33 +865,30 @@ function getComputed(configValueSources, configDefinitions) {
     return configValuesComputed;
 }
 // Show error message upon unknown config
-function assertKnownConfigs(configDefinitionsResolved, plusFilesAll) {
-    const configDefinitionsAll = getConfigDefinitions(Object.values(plusFilesAll).flat());
-    const configNamesKnownAll = Object.keys(configDefinitionsAll);
-    const configNamesGlobal = Object.keys(configDefinitionsResolved.configDefinitionsGlobal);
-    (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal).forEach(([_locationId, { configDefinitions, plusFiles }]) => {
-        const configDefinitionsLocal = configDefinitions;
-        const configNamesKnownLocal = [...Object.keys(configDefinitionsLocal), ...configNamesGlobal];
+function assertKnownConfigs(configDefinitionsResolved) {
+    (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal).forEach(([_locationId, { configNamesKnownLocal, plusFiles }]) => {
         plusFiles.forEach((plusFile) => {
-            const configNames = getDefiningConfigNames(plusFile);
+            const configNames = getConfigNamesSetByPlusFile(plusFile);
             configNames.forEach((configName) => {
-                assertKnownConfig(configName, configNamesKnownAll, configNamesKnownLocal, plusFile);
-                (0, utils_js_1.assert)(configNamesKnownLocal.includes(configName));
-                (0, utils_js_1.assert)(configNamesKnownAll.includes(configName));
+                const { locationId } = plusFile;
+                const sourceName = plusFile.filePath.filePathToShowToUser;
+                assertKnownConfig(configName, configNamesKnownLocal, configDefinitionsResolved, locationId, sourceName, false);
             });
         });
     });
 }
-function assertKnownConfig(configName, configNamesKnownAll, configNamesKnownLocal, plusFile) {
-    if (configNamesKnownLocal.includes(configName))
+function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitionsResolved, locationId, sourceName, exitOnError) {
+    const { configNamesKnownAll } = configDefinitionsResolved;
+    if (configNamesKnownRelevant.includes(configName)) {
+        (0, utils_js_1.assert)(configNamesKnownAll.includes(configName));
         return;
+    }
     const configNameColored = picocolors_1.default.cyan(configName);
-    const { locationId, filePath: { filePathToShowToUser } } = plusFile;
-    const errMsg = `${filePathToShowToUser} sets an unknown config ${configNameColored}`;
     // Inheritance issue: config is known but isn't defined at `locationId`
     if (configNamesKnownAll.includes(configName)) {
-        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} sets the value of the config ${configNameColored} which is a custom config that is defined with ${picocolors_1.default.underline('https://vike.dev/meta')} at a path that doesn't apply to ${locationId} — see ${picocolors_1.default.underline('https://vike.dev/config#inheritance')}`);
+        (0, utils_js_1.assertUsage)(false, `${sourceName} sets the value of the config ${configNameColored} which is a custom config that is defined with ${picocolors_1.default.underline('https://vike.dev/meta')} at a path that doesn't apply to ${locationId} — see ${picocolors_1.default.underline('https://vike.dev/config#inheritance')}`, { exitOnError });
     }
+    const errMsg = `${sourceName} sets an unknown config ${configNameColored}`;
     // Missing vike-{react,vue,solid} installation
     {
         const ui = ['vike-react', 'vike-vue', 'vike-solid'];
@@ -849,11 +904,9 @@ function assertKnownConfig(configName, configNamesKnownAll, configNamesKnownLoca
             Wrapper: ui
         };
         if (configName in knownVikeExntensionConfigs) {
-            const requiredVikeExtension = knownVikeExntensionConfigs[configName]
-                .map((e) => picocolors_1.default.bold(e))
-                .join('/');
+            const requiredVikeExtension = (0, utils_js_1.joinEnglish)(knownVikeExntensionConfigs[configName].map((e) => picocolors_1.default.bold(e)), 'or');
             const errMsgEnhanced = `${errMsg}. If you want to use the configuration ${configNameColored} documented at ${picocolors_1.default.underline(`https://vike.dev/${configName}`)} then make sure to install ${requiredVikeExtension}. (Alternatively, you can define ${configNameColored} yourself by using ${picocolors_1.default.cyan('meta')}, see ${picocolors_1.default.underline('https://vike.dev/meta')} for more information.)`;
-            (0, utils_js_1.assertUsage)(false, errMsgEnhanced);
+            (0, utils_js_1.assertUsage)(false, errMsgEnhanced, { exitOnError });
         }
     }
     // Similarity hint
@@ -870,9 +923,9 @@ function assertKnownConfig(configName, configNamesKnownAll, configNamesKnownLoca
         if (configName === 'page') {
             errMsgEnhanced += ` (The name of the config ${picocolors_1.default.cyan('Page')} starts with a capital letter ${picocolors_1.default.cyan('P')} because it defines a UI component: a ubiquitous JavaScript convention is that the name of UI components start with a capital letter.)`;
         }
-        (0, utils_js_1.assertUsage)(false, errMsgEnhanced);
+        (0, utils_js_1.assertUsage)(false, errMsgEnhanced, { exitOnError });
     }
-    (0, utils_js_1.assertUsage)(false, errMsg);
+    (0, utils_js_1.assertUsage)(false, errMsg, { exitOnError });
 }
 function determineRouteFilesystem(locationId, configValueSources) {
     const configName = 'filesystemRoutingRoot';
@@ -895,7 +948,7 @@ function determineRouteFilesystem(locationId, configValueSources) {
     (0, utils_js_1.assert)(filesystemRouteString.startsWith('/'));
     const routeFilesystem = {
         routeString: filesystemRouteString,
-        definedBy: filesystemRouteDefinedBy
+        definedAtLocation: filesystemRouteDefinedBy
     };
     return { routeFilesystem, isErrorPage: undefined };
 }
@@ -904,10 +957,12 @@ function getFilesystemRoutingRootEffect(configFilesystemRoutingRoot, configName)
     // Eagerly loaded since it's config-only
     (0, utils_js_1.assert)(configFilesystemRoutingRoot.valueIsLoaded);
     const { value } = configFilesystemRoutingRoot;
-    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, configFilesystemRoutingRoot.definedAtFilePath);
+    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, configFilesystemRoutingRoot.definedAt);
     (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 { definedAt } = configFilesystemRoutingRoot;
+    (0, utils_js_1.assert)(!definedAt.definedBy);
+    const { filePathAbsoluteUserRootDir } = definedAt;
     (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
     const before = (0, filesystemRouting_js_1.getFilesystemRouteString)((0, filesystemRouting_js_1.getLocationId)(filePathAbsoluteUserRootDir));
     const after = value;
@@ -958,7 +1013,7 @@ function getConfigDefinitionOptional(configDefinitions, configName) {
     return configDefinitions[configName] ?? null;
 }
 function getConfVal(plusFile, configName) {
-    const configNames = getDefiningConfigNames(plusFile);
+    const configNames = getConfigNamesSetByPlusFile(plusFile);
     if (!configNames.includes(configName))
         return null;
     if (plusFile.isNotLoaded)

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

@@ -11,6 +11,8 @@ const addSsrMiddleware_js_1 = require("../shared/addSsrMiddleware.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const index_js_1 = require("./devConfig/index.js");
 const getOutDirs_js_1 = require("../shared/getOutDirs.js");
+const sirv_1 = __importDefault(require("sirv"));
+const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
 function previewConfig() {
     let config;
     // let vikeConfig: VikeConfigObject
@@ -37,23 +39,26 @@ function previewConfig() {
             */
             return () => {
                 assertDist();
-                /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.
-                if (!vikeConfig.global.config.prerender || vikeConfig.global.config.prerender.partial) {
-                  addSsrMiddleware(server.middlewares, config, true)
+                // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
+                addStaticAssetsMiddleware(server.middlewares);
+                const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject);
+                if (!prerenderConfigGlobal.isPrerenderingEnabledForAllPages) {
+                    (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, prerenderConfigGlobal.isPrerenderingEnabled);
                 }
-                /*/
-                (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true);
-                //*/
                 addStatic404Middleware(server.middlewares);
             };
         }
     };
     function assertDist() {
-        let { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
         [outDirRoot, outDirClient, outDirServer].forEach((outDirAny) => {
             (0, utils_js_1.assertUsage)(fs_1.default.existsSync(outDirAny), `Cannot run ${picocolors_1.default.cyan('$ vike preview')}: your app isn't built (the build directory ${picocolors_1.default.cyan(outDirAny)} is missing). Make sure to run ${picocolors_1.default.cyan('$ vike build')} before running ${picocolors_1.default.cyan('$ vike preview')}.`);
         });
     }
+    function addStaticAssetsMiddleware(middlewares) {
+        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
+        middlewares.use((0, sirv_1.default)(outDirClient));
+    }
     function addStatic404Middleware(middlewares) {
         const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
         middlewares.use(config.base, (_, res, next) => {

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

@@ -4,14 +4,22 @@ exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
 const getOutDirs_js_1 = require("../shared/getOutDirs.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 function setGlobalContext() {
+    let isServerReload = false;
+    let config;
     return [
         {
             name: 'vike:setGlobalContext:pre',
             enforce: 'pre',
+            // This hook is called not only at server start but also at server restart (a new `viteDevServer` instance is created)
             configureServer: {
                 order: 'pre',
                 handler(viteDevServer) {
+                    (0, utils_js_1.assert)(config);
+                    if (isServerReload)
+                        (0, getVikeConfig_js_1.reloadVikeConfig)(config);
+                    isServerReload = true;
                     (0, globalContext_js_1.setGlobalContext_viteDevServer)(viteDevServer);
                     (0, utils_js_1.markSetup_viteDevServer)();
                 }
@@ -33,7 +41,8 @@ function setGlobalContext() {
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                async handler(config) {
+                async handler(config_) {
+                    config = config_;
                     const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
                     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for `importServerProductionEntry({ outDir })` of @brillout/vite-plugin-server-entry
                     (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);

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

@@ -7,7 +7,7 @@ exports.addSsrMiddleware = addSsrMiddleware;
 const renderPage_js_1 = require("../../runtime/renderPage.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function addSsrMiddleware(middlewares, config, isPreview) {
+function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled) {
     middlewares.use(async (req, res, next) => {
         if (res.headersSent)
             return next();
@@ -42,6 +42,10 @@ function addSsrMiddleware(middlewares, config, isPreview) {
             // - We purposely don't use next(err) to align behavior: we use our own/copied implementation of buildErrorMessage() regardless of whether the user uses Vite's dev middleware or Vite's standalone dev server
             return next();
         }
+        if (pageContext.httpResponse.statusCode === 404 && isPreview && isPrerenderingEnabled) {
+            // Serve /dist/client/404.html instead
+            return next();
+        }
         const configHeaders = (isPreview && config?.preview?.headers) || config?.server?.headers;
         if (configHeaders) {
             for (const [name, value] of Object.entries(configHeaders))

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]`;