vike 0.4.225 → 0.4.226-commit-8f5c172

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

@@ -34,9 +34,9 @@ function importUserCode() {
                 return (0, virtual_files_js_1.resolveVirtualFileId)(id);
             }
         },
-        handleHotUpdate(ctx) {
+        async handleHotUpdate(ctx) {
             try {
-                return handleHotUpdate(ctx, config);
+                return await handleHotUpdate(ctx, config);
             }
             catch (err) {
                 // Vite swallows errors thrown by handleHotUpdate()
@@ -68,9 +68,9 @@ function handleFileAddRemove(server, config) {
     server.watcher.prependListener('add', (f) => listener(f, false));
     server.watcher.prependListener('unlink', (f) => listener(f, true));
     return;
-    function listener(file, isRemove) {
+    async function listener(file, isRemove) {
         file = (0, vite_1.normalizePath)(file);
-        if ((0, crawlPlusFiles_js_1.isPlusFile)(file) || isVikeConfigDependency(file, server.moduleGraph)?.modifiesVikeVirtualFiles) {
+        if ((0, crawlPlusFiles_js_1.isPlusFile)(file) || (await isVikeConfigDependency(file, server.moduleGraph))?.modifiesVikeVirtualFiles) {
             invalidateVikeVirtualFiles(server);
             reloadConfig(file, config, isRemove ? 'removed' : 'created');
         }
@@ -82,9 +82,9 @@ function invalidateVikeVirtualFiles(server) {
         server.moduleGraph.invalidateModule(mod);
     });
 }
-function handleHotUpdate(ctx, config) {
+async function handleHotUpdate(ctx, config) {
     const { file, server } = ctx;
-    const isVikeConfig = isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
+    const isVikeConfig = await isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
     if (isVikeConfig) {
         if (isVikeConfig.modifiesVikeVirtualFiles) {
             /* Tailwind breaks this assertion, see https://github.com/vikejs/vike/discussions/1330#discussioncomment-7787238
@@ -106,12 +106,16 @@ function handleHotUpdate(ctx, config) {
         }
     }
 }
-function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
+async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
     // Check config-only files, for example all pages/+config.js dependencies. (There aren't part of Vite's module graph.)
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    getVikeConfig_js_1.vikeConfigDependencies.forEach((f) => (0, utils_js_1.assertPosixPath)(f));
-    if (getVikeConfig_js_1.vikeConfigDependencies.has(filePathAbsoluteFilesystem))
-        return { modifiesVikeVirtualFiles: true };
+    const vikeConfigObject = await (0, getVikeConfig_js_1.getVikeConfigOptional)();
+    if (vikeConfigObject) {
+        const { vikeConfigDependencies } = vikeConfigObject;
+        vikeConfigDependencies.forEach((f) => (0, utils_js_1.assertPosixPath)(f));
+        if (vikeConfigDependencies.has(filePathAbsoluteFilesystem))
+            return { modifiesVikeVirtualFiles: true };
+    }
     // Check using Vite's module graph, for example all +htmlAttributes dependencies.
     // Alternatively, simply call updateUserFiles() on every handleHotUpdate() call.
     const importers = getImporters(filePathAbsoluteFilesystem, moduleGraph);

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

@@ -98,7 +98,7 @@ const configDefinitionsBuiltIn = {
                     (0, utils_js_1.assert)(source.valueIsLoaded);
                     if (source.value !== null) {
                         const { value } = source;
-                        const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAtFilePath);
+                        const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAt);
                         (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${definedAt} should be a boolean`);
                         return value;
                     }
@@ -133,6 +133,10 @@ const configDefinitionsBuiltIn = {
         env: { config: true },
         global: true
     },
+    mode: {
+        env: { config: true },
+        global: true
+    },
     injectScriptsAt: {
         env: { server: true }
     },

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

@@ -14,7 +14,6 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const import_1 = require("@brillout/import");
 const utils_js_1 = require("../../../../utils.js");
 const transformPointerImports_js_1 = require("./transformPointerImports.js");
-const getVikeConfig_js_1 = require("../getVikeConfig.js");
 const source_map_support_1 = __importDefault(require("source-map-support"));
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 const module_1 = require("module");
@@ -31,11 +30,11 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
-    if (esbuildCache[filePathAbsoluteFilesystem]) {
-        return await esbuildCache[filePathAbsoluteFilesystem];
+    if (esbuildCache.transpileCache[filePathAbsoluteFilesystem]) {
+        return await esbuildCache.transpileCache[filePathAbsoluteFilesystem];
     }
     const { promise, resolve } = (0, utils_js_1.genPromise)();
-    esbuildCache[filePathAbsoluteFilesystem] = promise;
+    esbuildCache.transpileCache[filePathAbsoluteFilesystem] = promise;
     (0, utils_js_1.assertUsage)((0, utils_js_1.isPlainJavaScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     if (isHeader) {
@@ -48,20 +47,20 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
     }
     else {
         const transformImports = isHeader ? 'all' : true;
-        const code = await transpileFile(filePath, transformImports, userRootDir);
+        const code = await transpileFile(filePath, transformImports, userRootDir, esbuildCache);
         fileExports = await executeTranspiledFile(filePath, code);
     }
     resolve({ fileExports });
     return { fileExports };
 }
-async function transpileFile(filePath, transformImports, userRootDir) {
+async function transpileFile(filePath, transformImports, userRootDir, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
+    esbuildCache.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     if (debug.isActivated)
         debug('transpile', filePathToShowToUserResolved);
-    let { code, pointerImports } = await transpileWithEsbuild(filePath, userRootDir, transformImports);
+    let { code, pointerImports } = await transpileWithEsbuild(filePath, userRootDir, transformImports, esbuildCache);
     if (debug.isActivated)
         debug(`code, post esbuild (${filePathToShowToUserResolved})`, code);
     let isImportTransformed = false;
@@ -80,7 +79,7 @@ async function transpileFile(filePath, transformImports, userRootDir) {
     }
     return code;
 }
-async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
+async function transpileWithEsbuild(filePath, userRootDir, transformImports, esbuildCache) {
     const entryFilePath = filePath.filePathAbsoluteFilesystem;
     const entryFileDir = path_1.default.posix.dirname(entryFilePath);
     const options = {
@@ -234,7 +233,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     // We collect the dependency `args.path` in case the bulid fails (upon build error => error is thrown => no metafile)
                     let { path } = args;
                     path = (0, utils_js_1.toPosixPath)(path);
-                    getVikeConfig_js_1.vikeConfigDependencies.add(path);
+                    esbuildCache.vikeConfigDependencies.add(path);
                     return undefined;
                 });
                 /* To exhaustively collect all dependencies upon build failure, we would also need to use onResolve().
@@ -263,7 +262,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
         filePathRelative = (0, utils_js_1.toPosixPath)(filePathRelative);
         (0, utils_js_1.assertPosixPath)(userRootDir);
         const filePathAbsoluteFilesystem = path_1.default.posix.join(userRootDir, filePathRelative);
-        getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
+        esbuildCache.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     });
     const code = result.outputFiles[0].text;
     (0, utils_js_1.assert)(typeof code === 'string');
@@ -335,7 +334,7 @@ function getTemporaryBuildFilePath(filePathAbsoluteFilesystem) {
     const dirname = path_1.default.posix.dirname(filePathAbsoluteFilesystem);
     const filename = path_1.default.posix.basename(filePathAbsoluteFilesystem);
     // Syntax with semicolon `build:${/*...*/}` doesn't work on Windows: https://github.com/vikejs/vike/issues/800#issuecomment-1517329455
-    const filePathTmp = path_1.default.posix.join(dirname, `${filename}.build-${(0, utils_js_1.getRandomId)(12)}.mjs`);
+    const filePathTmp = path_1.default.posix.join(dirname, `${filename}.build-${(0, utils_js_1.getRandomId)()}.mjs`);
     (0, utils_js_1.assert)(isTemporaryBuildFile(filePathTmp));
     return filePathTmp;
 }

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

@@ -3,13 +3,14 @@ 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;
 exports.getConfVal = getConfVal;
 exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
+exports.getVikeConfigFromCliOrEnv = getVikeConfigFromCliOrEnv;
 exports.isOverriden = isOverriden;
 const utils_js_1 = require("../../../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
@@ -32,17 +33,14 @@ 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();
 }
@@ -96,6 +94,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);
@@ -140,22 +143,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);
-    // TODO/now: add validation
-    setCliAndApiOptions(pageConfigGlobal);
+    setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     // global
     const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
     const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
@@ -164,7 +169,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)
@@ -174,6 +179,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)
@@ -183,12 +192,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.
@@ -291,7 +311,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
                 : 'to a value that is global';
             const what = isConditionallyGlobal ? 'global values' : picocolors_1.default.cyan(configName);
             const errEnd = configFilePathsGlobal.length > 0
-                ? `define ${what} at a global config file such as ${(0, utils_js_1.joinEnglish)(configFilePathsGlobal, 'or')} instead`
+                ? `define ${what} at a global config file such as ${(0, utils_js_1.joinEnglish)(configFilePathsGlobal.map(picocolors_1.default.bold), 'or')} instead`
                 : `create a global config file (e.g. /pages/+config.js) and define ${what} there instead`;
             // When updating this error message => also update error message at https://vike.dev/warning/global-config
             const errMsg = `${errBeg} ${errMid}: ${errEnd} (https://vike.dev/warning/global-config).`;
@@ -360,56 +380,55 @@ 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] = []));
-        // TODO/now: use getSourceNonConfigFile()
-        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) {
-    // VIKE_CONFIG
-    const configFromEnv = (0, getEnvVarObject_js_1.getEnvVarObject)('VIKE_CONFIG');
-    if (configFromEnv) {
-        add(configFromEnv, { definedBy: 'env' });
-    }
-    // Vike API — passed options
+function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
+    // Vike API — passed options [lowest precedence]
     const apiOperation = (0, context_js_1.getApiOperation)();
     if (apiOperation?.options.vikeConfig) {
-        add(apiOperation.options.vikeConfig, {
-            definedBy: 'api',
-            operation: apiOperation.operation
-        });
+        addSources(apiOperation.options.vikeConfig, { definedBy: 'api', operation: apiOperation.operation }, false);
     }
+    const { configFromCliOptions, configFromEnvVar } = getVikeConfigFromCliOrEnv();
     // Vike CLI options
-    const cliOptions = (0, context_js_2.getCliOptions)();
-    if (cliOptions) {
-        add(cliOptions, { definedBy: 'cli' });
+    if (configFromCliOptions) {
+        addSources(configFromCliOptions, { definedBy: 'cli' }, true);
+    }
+    // VIKE_CONFIG [highest precedence]
+    if (configFromEnvVar) {
+        addSources(configFromEnvVar, { definedBy: 'env' }, false);
     }
     return;
-    function add(configValues, definedBy) {
+    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 getVikeConfigFromCliOrEnv() {
+    const configFromCliOptions = (0, context_js_2.getCliOptions)();
+    const configFromEnvVar = (0, getEnvVarObject_js_1.getEnvVarObject)('VIKE_CONFIG');
+    const vikeConfigFromCliOrEnv = {
+        ...configFromCliOptions, // Lower precedence
+        ...configFromEnvVar // Higher precedence
+    };
+    return {
+        vikeConfigFromCliOrEnv,
+        configFromCliOptions,
+        configFromEnvVar
+    };
+}
 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];
@@ -417,7 +436,7 @@ function getSourceNonConfigFile(configName, value, definedAt) {
         valueIsLoaded: true,
         value,
         configEnv: configDef.env,
-        definedAtFilePath: definedAt,
+        definedAt,
         locationId: '/',
         plusFile: null,
         valueIsLoadedWithImport: false,
@@ -533,7 +552,7 @@ function resolveConfigValueSources(configName, configDef, plusFilesRelevant, use
     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);
@@ -576,7 +595,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            definedAtFilePath
+            definedAt: definedAtFilePath
         };
         return configValueSource;
     }
@@ -600,7 +619,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;
         }
@@ -612,7 +631,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            definedAtFilePath: definedAtFilePath_
+            definedAt: definedAtFilePath_
         };
         return configValueSource;
     }
@@ -626,7 +645,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
                     ? []
@@ -640,7 +659,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;
         }
@@ -662,7 +681,7 @@ function resolveIsGlobalValue(configDefGlobal, source, plusFilesAll) {
     (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);
@@ -782,7 +801,7 @@ function runEffect(configName, configDef, source) {
     // Call effect
     const configModFromEffect = configDef.effect({
         configValue: source.value,
-        configDefinedAt: (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, source.definedAtFilePath)
+        configDefinedAt: (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, source.definedAt)
     });
     if (!configModFromEffect)
         return null;
@@ -796,7 +815,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,
@@ -859,33 +878,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'];
@@ -901,11 +917,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
@@ -922,9 +936,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';
@@ -956,12 +970,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 { definedAtFilePath } = configFilesystemRoutingRoot;
-    (0, utils_js_1.assert)(!definedAtFilePath.definedBy);
-    const { filePathAbsoluteUserRootDir } = 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;
@@ -1012,7 +1026,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/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/getEnvVarObject.js

@@ -23,8 +23,15 @@ function parseJson5(valueStr, what) {
         value = json5_1.default.parse(valueStr);
     }
     catch (err) {
+        if (isNotJavaScriptLike(valueStr)) {
+            // Interpret as string
+            return valueStr;
+        }
         console.error(err);
         (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)}`);
     }
     return value;
 }
+function isNotJavaScriptLike(valueStr) {
+    return ![':', ',', '{', '}', '(', ')'].some((c) => valueStr.includes(c));
+}

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

@@ -17,8 +17,8 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
     };
     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))) {
+        const valueFirst = prerenderConfigs.filter((p) => !(0, utils_js_1.isObject)(p) || p.enable !== null)[0];
+        if (valueFirst === true || ((0, utils_js_1.isObject)(valueFirst) && (valueFirst.enable ?? defaultValueForObject))) {
             defaultLocalValue = true;
         }
     }
@@ -49,7 +49,7 @@ function resolvePrerenderConfigLocal(pageConfig) {
     const values = configValue.value;
     (0, utils_js_1.assert)((0, utils_js_1.isArray)(values));
     const value = values[0];
-    // TODO/now I believe this assert() can fail
+    // If it's set to an object in a local config then Vike considers it a global config and it's skipped from local inheritance, thus we can assume the value to be a boolean.
     (0, utils_js_1.assert)(typeof value === 'boolean');
     (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue.definedAtData));
     const prerenderConfigLocal = { value };