vike 0.4.220-commit-9a798ce → 0.4.220-commit-5c7810f

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

@@ -65,18 +65,22 @@ function assertExtensionsRequire(pageConfig) {
     });
 }
 function getConfigRequireValue(interfaceFile) {
-    const require = (0, getVikeConfig_js_1.getConfigValueInterfaceFile)(interfaceFile, 'require');
-    if (!require)
+    const confVal = (0, getVikeConfig_js_1.getConfVal)(interfaceFile, 'require');
+    if (!confVal)
         return null;
+    (0, utils_js_1.assert)(confVal.configValueLoaded);
+    const require = confVal.configValue;
     const { filePathToShowToUserResolved } = interfaceFile.filePath;
     (0, utils_js_1.assert)(filePathToShowToUserResolved);
     (0, utils_js_1.assertUsage)((0, isObjectOfStrings_js_1.isObjectOfStrings)(require), `The setting ${picocolors_1.default.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${picocolors_1.default.bold('Record<string, string>')}).`);
     return require;
 }
 function getNameValue(interfaceFile) {
-    const name = (0, getVikeConfig_js_1.getConfigValueInterfaceFile)(interfaceFile, 'name');
-    if (!name)
+    const confVal = (0, getVikeConfig_js_1.getConfVal)(interfaceFile, 'name');
+    if (!confVal)
         return null;
+    (0, utils_js_1.assert)(confVal.configValueLoaded);
+    const name = confVal.configValue;
     const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
     (0, utils_js_1.assertUsage)(typeof name === 'string', `The setting ${picocolors_1.default.bold('name')} defined at ${filePathToShowToUser} should be a string.`);
     return name;

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

@@ -1,14 +1,16 @@
 "use strict";
-// Files loadded at config time:
+// Files loaded at config time:
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadImportedFile = loadImportedFile;
 exports.loadValueFile = loadValueFile;
+exports.loadValueFiles = loadValueFiles;
 exports.loadConfigFile = loadConfigFile;
 const utils_js_1 = require("../../../../utils.js");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
+const getVikeConfig_js_1 = require("../getVikeConfig.js");
 const assertPlusFileExport_js_1 = require("../../../../../../shared/page-configs/assertPlusFileExport.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const transformPointerImports_js_1 = require("./transformPointerImports.js");
@@ -26,15 +28,39 @@ async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
     return fileExport;
 }
 // Load +{configName}.js
-async function loadValueFile(interfaceValueFile, configName, userRootDir) {
+async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir) {
+    const { configName } = interfaceValueFile;
+    const configDef = (0, getVikeConfig_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
+    if (!configDef || !(0, getVikeConfig_js_1.shouldBeLoadableAtBuildTime)(configDef)) {
+        // Only load value files with `env.config===true`
+        return;
+    }
+    if (interfaceValueFile.isValueLoaded) {
+        await interfaceValueFile.isValueLoaded;
+        if (
+        // Help TS
+        true)
+            return;
+    }
+    const { promise, resolve } = (0, utils_js_1.genPromise)();
+    interfaceValueFile.isValueLoaded = promise;
+    (0, utils_js_1.assert)(interfaceValueFile.isValueLoaded);
+    interfaceValueFile.fileExportsByConfigName = {};
     const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(interfaceValueFile.filePath, userRootDir, false);
+    resolve();
     const { filePathToShowToUser } = interfaceValueFile.filePath;
     (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, configName);
     Object.entries(fileExports).forEach(([exportName, configValue]) => {
         const configName_ = exportName === 'default' ? configName : exportName;
-        interfaceValueFile.fileExportsByConfigName[configName_] = { configValue };
+        interfaceValueFile.fileExportsByConfigName[configName_] = configValue;
     });
 }
+async function loadValueFiles(interfaceFiles, configDefinitions, userRootDir) {
+    await Promise.all(Object.values(interfaceFiles)
+        .flat(1)
+        .filter((interfaceFile) => interfaceFile.isValueFile)
+        .map(async (interfaceFile) => await loadValueFile(interfaceFile, configDefinitions, userRootDir)));
+}
 // Load +config.js, including all its extends pointer imports
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig) {
     const { filePathAbsoluteFilesystem } = configFilePath;

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

@@ -9,7 +9,9 @@ exports.getVikeConfig2 = getVikeConfig2;
 exports.reloadVikeConfig = reloadVikeConfig;
 exports.isVikeConfigFile = isVikeConfigFile;
 exports.isV1Design = isV1Design;
-exports.getConfigValueInterfaceFile = getConfigValueInterfaceFile;
+exports.getConfVal = getConfVal;
+exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
+exports.shouldBeLoadableAtBuildTime = shouldBeLoadableAtBuildTime;
 const utils_js_1 = require("../../../utils.js");
 const path_1 = __importDefault(require("path"));
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
@@ -158,26 +160,17 @@ async function loadInterfaceFiles(userRootDir) {
             const interfaceFile = {
                 locationId,
                 filePath,
-                fileExportsByConfigName: {
-                    [configName]: {}
-                },
                 isConfigFile: false,
                 isValueFile: true,
+                isValueLoaded: false,
                 configName
             };
-            {
-                // We don't have access to the custom config definitions defined by the user yet.
-                //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
-                //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
-                const configDef = getConfigDefinitionOptional(configDefinitionsBuiltIn, configName);
-                if (configDef && shouldBeLoadableAtBuildTime(configDef)) {
-                    await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
-                }
-            }
-            {
-                interfaceFilesAll[locationId] = interfaceFilesAll[locationId] ?? [];
-                interfaceFilesAll[locationId].push(interfaceFile);
-            }
+            interfaceFilesAll[locationId] = interfaceFilesAll[locationId] ?? [];
+            interfaceFilesAll[locationId].push(interfaceFile);
+            // We don't have access to the custom config definitions defined by the user yet.
+            //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
+            //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
+            await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configDefinitionsBuiltIn, userRootDir);
         })
     ]);
     assertAllConfigsAreKnown(interfaceFilesAll);
@@ -191,12 +184,13 @@ function getInterfaceFileFromConfigFile(configFile, isConfigExtend, locationId)
         fileExportsByConfigName: {},
         isConfigFile: true,
         isValueFile: false,
+        isValueLoaded: true,
         isConfigExtend,
         extendsFilePaths
     };
     const fileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(fileExports, filePath.filePathToShowToUser);
     Object.entries(fileExport).forEach(([configName, configValue]) => {
-        interfaceFile.fileExportsByConfigName[configName] = { configValue };
+        interfaceFile.fileExportsByConfigName[configName] = configValue;
     });
     return interfaceFile;
 }
@@ -206,8 +200,11 @@ function assertAllConfigsAreKnown(interfaceFilesAll) {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
         const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
         interfaceFiles.forEach((interfaceFile) => {
-            Object.keys(interfaceFile.fileExportsByConfigName).forEach((configName) => {
-                assertConfigExists(configName, Object.keys(configDefinitions), interfaceFile.filePath.filePathToShowToUser);
+            const configNamesKnown = Object.keys(configDefinitions);
+            const { filePathToShowToUser } = interfaceFile.filePath;
+            const configNames = getDefiningConfigNames(interfaceFile);
+            configNames.forEach((configName) => {
+                assertConfigExists(configName, configNamesKnown, filePathToShowToUser);
             });
         });
     });
@@ -283,7 +280,7 @@ async function getGlobalConfigs(interfaceFilesAll, userRootDir, importedFilesLoa
       objectEntries(interfaceFilesAll).forEach(([locationId, interfaceFiles]) => {
         interfaceFiles.forEach((interfaceFile) => {
           Object.keys(interfaceFile.fileExportsByConfigName).forEach((configName) => {
-            if (!isGlobalLocation(locationId, locationIds) && isGlobalConfig(configName)) {
+            if (!isGlobalLocation(locationId, locationIds) && isGlobalConfigOld(configName)) {
               assertUsage(
                 false,
                 [
@@ -346,32 +343,15 @@ async function getPageConfigs(interfaceFilesAll, userRootDir, importedFilesLoade
         pageConfigGlobal.configValueSources[configName] = sources;
     }));
     const pageConfigs = [];
-    await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesAll)
-        .filter(([_locationId, interfaceFiles]) => isDefiningPage(interfaceFiles))
-        .map(async ([locationId]) => {
+    await Promise.all(getPageLocationIds(interfaceFilesAll).map(async (locationId) => {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
-        const interfaceFilesRelevantList = Object.values(interfaceFilesRelevant).flat(1);
         const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
-        // Load value files of `env.config===true` custom configs
-        await Promise.all(interfaceFilesRelevantList.map(async (interfaceFile) => {
-            if (!interfaceFile.isValueFile)
-                return;
-            const { configName } = interfaceFile;
-            if (isGlobalConfig(configName))
-                return;
-            const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            if (!shouldBeLoadableAtBuildTime(configDef))
-                return;
-            const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
-            if (isAlreadyLoaded)
-                return;
-            // Value files of built-in configs should have already been loaded at loadInterfaceFiles()
-            (0, utils_js_1.assert)(!(configName in configDefinitionsBuiltIn));
-            await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
-        }));
+        // Load value files (with `env.config===true`) of *custom* configs.
+        // - The value files of *built-in* configs are already loaded at `loadInterfaceFiles()`.
+        await (0, loadFileAtConfigTime_js_1.loadValueFiles)(interfaceFilesRelevant, configDefinitions, userRootDir);
         let configValueSources = {};
         await Promise.all((0, utils_js_1.objectEntries)(configDefinitions)
-            .filter(([configName]) => !isGlobalConfig(configName))
+            .filter(([configName]) => !isGlobalConfigOld(configName))
             .map(async ([configName, configDef]) => {
             const sources = await resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded);
             if (sources.length === 0)
@@ -396,6 +376,15 @@ async function getPageConfigs(interfaceFilesAll, userRootDir, importedFilesLoade
     assertPageConfigs(pageConfigs, interfaceFilesAll);
     return { pageConfigs, pageConfigGlobal };
 }
+function getPageLocationIds(interfaceFilesAll) {
+    const locationIds = new Set();
+    (0, utils_js_1.objectEntries)(interfaceFilesAll).forEach(([locationId, interfaceFiles]) => {
+        if (isDefiningPage(interfaceFiles)) {
+            locationIds.add(locationId);
+        }
+    });
+    return Array.from(locationIds);
+}
 function assertPageConfigs(pageConfigs, interfaceFilesAll) {
     pageConfigs.forEach((pageConfig) => {
         assertGlobalConfigs(pageConfig, interfaceFilesAll);
@@ -419,7 +408,7 @@ function assertGlobalConfigs(pageConfig, interfaceFilesAll) {
             configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
         }
         configNames.forEach((configName) => {
-            if (isGlobalConfig(configName))
+            if (isGlobalConfigOld(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
             if (configDef.global === true) {
@@ -488,14 +477,6 @@ function getConfigValues(pageConfig) {
     });
     return configValues;
 }
-function interfacefileIsAlreaydLoaded(interfaceFile) {
-    const configMapValues = Object.values(interfaceFile.fileExportsByConfigName);
-    const isAlreadyLoaded = configMapValues.some((conf) => 'configValue' in conf);
-    if (isAlreadyLoaded) {
-        (0, utils_js_1.assert)(configMapValues.every((conf) => 'configValue' in conf));
-    }
-    return isAlreadyLoaded;
-}
 function getInterfaceFilesRelevant(interfaceFilesAll, locationIdPage) {
     const interfaceFilesRelevant = Object.fromEntries((0, utils_js_1.objectEntries)(interfaceFilesAll)
         .filter(([locationId]) => {
@@ -508,7 +489,7 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
     const sourcesInfo = [];
     // interfaceFilesRelevant is sorted by sortAfterInheritanceOrder()
     for (const interfaceFiles of Object.values(interfaceFilesRelevant)) {
-        const interfaceFilesDefiningConfig = interfaceFiles.filter((interfaceFile) => interfaceFile.fileExportsByConfigName[configName]);
+        const interfaceFilesDefiningConfig = interfaceFiles.filter((interfaceFile) => getDefiningConfigNames(interfaceFile).includes(configName));
         if (interfaceFilesDefiningConfig.length === 0)
             continue;
         const visited = new WeakSet();
@@ -595,8 +576,8 @@ function isInterfaceFileUserLand(interfaceFile) {
     return (interfaceFile.isConfigFile && !interfaceFile.isConfigExtend) || interfaceFile.isValueFile;
 }
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded, isHighestInheritancePrecedence) {
-    const conf = interfaceFile.fileExportsByConfigName[configName];
-    (0, utils_js_1.assert)(conf);
+    const confVal = getConfVal(interfaceFile, configName);
+    (0, utils_js_1.assert)(confVal);
     const configValueSourceCommon = {
         locationId: interfaceFile.locationId,
         interfaceFile
@@ -612,7 +593,8 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         let valueFilePath;
         if (interfaceFile.isConfigFile) {
             // Defined over pointer import
-            const resolved = (0, resolvePointerImport_js_1.resolvePointerImportOfConfig)(conf.configValue, interfaceFile.filePath, userRootDir, configDef.env, configName);
+            (0, utils_js_1.assert)(confVal.configValueLoaded);
+            const resolved = (0, resolvePointerImport_js_1.resolvePointerImportOfConfig)(confVal.configValue, interfaceFile.filePath, userRootDir, configDef.env, configName);
             const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, definedAtFilePath_);
             (0, utils_js_1.assertUsage)(resolved, `${configDefinedAt} should be an import`);
             valueFilePath = resolved.pointerImport.filePathAbsoluteVite;
@@ -641,8 +623,8 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
     }
     // +config.js
     if (interfaceFile.isConfigFile) {
-        (0, utils_js_1.assert)('configValue' in conf);
-        const { configValue } = conf;
+        (0, utils_js_1.assert)(confVal.configValueLoaded);
+        const { configValue } = confVal;
         // Defined over pointer import
         const resolved = (0, resolvePointerImport_js_1.resolvePointerImportOfConfig)(configValue, interfaceFile.filePath, userRootDir, configDef.env, configName);
         if (resolved) {
@@ -684,7 +666,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
     // Defined by value file, i.e. +{configName}.js
     if (interfaceFile.isValueFile) {
         const configEnvResolved = (0, resolvePointerImport_js_1.resolveConfigEnvWithFileName)(configDef.env, interfaceFile.filePath);
-        const valueAlreadyLoaded = 'configValue' in conf;
+        const valueAlreadyLoaded = confVal.configValueLoaded;
         (0, utils_js_1.assert)(valueAlreadyLoaded === !!configEnvResolved.config);
         const configValueSource = {
             ...configValueSourceCommon,
@@ -701,7 +683,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             }
         };
         if (valueAlreadyLoaded) {
-            configValueSource.value = conf.configValue;
+            configValueSource.value = confVal.configValue;
         }
         return configValueSource;
     }
@@ -709,7 +691,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
 }
 function isDefiningPage(interfaceFiles) {
     for (const interfaceFile of interfaceFiles) {
-        const configNames = Object.keys(interfaceFile.fileExportsByConfigName);
+        const configNames = getDefiningConfigNames(interfaceFile);
         if (configNames.some((configName) => isDefiningPageConfig(configName))) {
             return true;
         }
@@ -719,16 +701,28 @@ function isDefiningPage(interfaceFiles) {
 function isDefiningPageConfig(configName) {
     return ['Page', 'route'].includes(configName);
 }
+function getDefiningConfigNames(interfaceFile) {
+    let configNames = [];
+    if (interfaceFile.isValueFile) {
+        configNames.push(interfaceFile.configName);
+    }
+    if (interfaceFile.isValueLoaded) {
+        configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
+    }
+    configNames = (0, utils_js_1.unique)(configNames);
+    return configNames;
+}
 function getConfigDefinitions(interfaceFilesRelevant) {
     const configDefinitionsMerged = { ...configDefinitionsBuiltIn };
     Object.entries(interfaceFilesRelevant)
         .reverse()
         .forEach(([_locationId, interfaceFiles]) => {
         interfaceFiles.forEach((interfaceFile) => {
-            const configMeta = interfaceFile.fileExportsByConfigName['meta'];
-            if (!configMeta)
+            const confVal = getConfVal(interfaceFile, 'meta');
+            if (!confVal)
                 return;
-            const meta = configMeta.configValue;
+            (0, utils_js_1.assert)(confVal.configValueLoaded);
+            const meta = confVal.configValue;
             assertMetaUsage(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAtFilePath
             Object.entries(meta).forEach(([configName, configDef]) => {
@@ -1048,24 +1042,25 @@ function getConfigDefinitionOptional(configDefinitions, configName) {
 function shouldBeLoadableAtBuildTime(configDef) {
     return !!configDef.env.config && !configDef._valueIsFilePath;
 }
-function isGlobalConfig(configName) {
+// TODO/now: remove
+function isGlobalConfigOld(configName) {
     // TODO/now
     if (configName === 'prerender')
         return false;
     const configNamesGlobal = getConfigNamesGlobal();
     return (0, utils_js_1.includes)(configNamesGlobal, configName);
 }
-/*
 // TODO/now
-function isGlobalConfig(configName: string, configDefinitions: ConfigDefinitions): configName is ConfigNameGlobal {
-  const configSpec = configDefinitions[configName]
-  assert(configSpec)
-  const globalValue = configSpec.global
-  if (!globalValue) return false
-  if (globalValue === true ) return true
-  return globalValue(value)
+function isGlobalConfig(configName, configDefinitions, value) {
+    const configSpec = configDefinitions[configName];
+    (0, utils_js_1.assert)(configSpec);
+    const globalValue = configSpec.global;
+    if (!globalValue)
+        return false;
+    if (globalValue === true)
+        return true;
+    return globalValue(value);
 }
-*/
 function getConfigNamesGlobal() {
     return Object.keys(configDefinitionsBuiltInGlobal);
 }
@@ -1098,6 +1093,12 @@ function sortConfigValueSources(configValueSources, locationIdPage) {
         // Sort after the filesystem inheritance of the config value
         .sort(([, [source1]], [, [source2]]) => (0, utils_js_1.reverse)((0, filesystemRouting_js_1.sortAfterInheritanceOrder)(source1.locationId, source2.locationId, locationIdPage))));
 }
-function getConfigValueInterfaceFile(interfaceFile, configName) {
-    return interfaceFile.fileExportsByConfigName[configName]?.configValue;
+function getConfVal(interfaceFile, configName) {
+    const configNames = getDefiningConfigNames(interfaceFile);
+    if (!configNames.includes(configName))
+        return null;
+    if (!interfaceFile.isValueLoaded)
+        return { configValueLoaded: false };
+    const confVal = { configValue: interfaceFile.fileExportsByConfigName[configName], configValueLoaded: true };
+    return confVal;
 }

package/dist/cjs/shared/getPageContextUrlComputed.js

@@ -39,24 +39,29 @@ function getUrlParsed(pageContext) {
     //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
+    // TODO/soon: revert https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
+    const assertUrlResolved = (src) => (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string', { src, urlResolved });
     let urlResolved;
     let baseToBeRemoved;
     if (pageContext.urlLogical) {
         // Set by onBeforeRoute()
         urlResolved = pageContext.urlLogical;
         baseToBeRemoved = false;
+        assertUrlResolved(1);
     }
     else if (pageContext._urlRewrite) {
         // Set by `throw render()`
         urlResolved = pageContext._urlRewrite;
         baseToBeRemoved = false;
+        assertUrlResolved(2);
     }
     else {
         // Set by renderPage()
         urlResolved = pageContext.urlOriginal;
         baseToBeRemoved = true;
+        assertUrlResolved(3);
     }
-    (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string');
+    assertUrlResolved(4);
     // Remove .pageContext.json
     let urlHandler = pageContext._urlHandler;
     if (!urlHandler)

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.220-commit-9a798ce';
+exports.PROJECT_VERSION = '0.4.220-commit-5c7810f';

package/dist/cjs/utils/isDev.js

@@ -9,7 +9,7 @@ function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
     // Released at vite@5.1.0 which is guaranteed with `assertVersion('Vite', version, '5.1.0')`
     // - Release: https://github.com/vitejs/vite/blob/6f7466e6211027686f40ad7e4ce6ec8477414546/packages/vite/CHANGELOG.md#510-beta4-2024-01-26:~:text=fix(preview)%3A-,set%20isPreview%20true,-(%2315695)%20(93fce55
-    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2120
+    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2135
     (0, assert_js_1.assert)(typeof isPreview === 'boolean', { isPreview, version: vite_1.version });
     return command === 'serve' && !isPreview;
 }

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

@@ -3,7 +3,7 @@ export { assertExtensionsRequire };
 import pc from '@brillout/picocolors';
 import { isObjectOfStrings } from '../../../../../utils/isObjectOfStrings.js';
 import { PROJECT_VERSION, assert, assertUsage, assertWarning, findPackageJson } from '../../../utils.js';
-import { getConfigValueInterfaceFile } from './getVikeConfig.js';
+import { getConfVal } from './getVikeConfig.js';
 import path from 'path';
 import semver from 'semver';
 function assertExtensionsConventions(interfaceFile) {
@@ -60,18 +60,22 @@ function assertExtensionsRequire(pageConfig) {
     });
 }
 function getConfigRequireValue(interfaceFile) {
-    const require = getConfigValueInterfaceFile(interfaceFile, 'require');
-    if (!require)
+    const confVal = getConfVal(interfaceFile, 'require');
+    if (!confVal)
         return null;
+    assert(confVal.configValueLoaded);
+    const require = confVal.configValue;
     const { filePathToShowToUserResolved } = interfaceFile.filePath;
     assert(filePathToShowToUserResolved);
     assertUsage(isObjectOfStrings(require), `The setting ${pc.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${pc.bold('Record<string, string>')}).`);
     return require;
 }
 function getNameValue(interfaceFile) {
-    const name = getConfigValueInterfaceFile(interfaceFile, 'name');
-    if (!name)
+    const confVal = getConfVal(interfaceFile, 'name');
+    if (!confVal)
         return null;
+    assert(confVal.configValueLoaded);
+    const name = confVal.configValue;
     const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
     assertUsage(typeof name === 'string', `The setting ${pc.bold('name')} defined at ${filePathToShowToUser} should be a string.`);
     return name;

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

@@ -1,10 +1,12 @@
 export { loadImportedFile };
 export { loadValueFile };
+export { loadValueFiles };
 export { loadConfigFile };
 export type { ImportedFilesLoaded };
 export type { ConfigFile };
 import type { FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
-import type { InterfaceValueFile } from '../getVikeConfig.js';
+import { InterfaceFilesByLocationId, type InterfaceValueFile } from '../getVikeConfig.js';
+import type { ConfigDefinitions } from './configDefinitionsBuiltIn.js';
 type ImportedFilesLoaded = Record<string, Promise<Record<string, unknown>>>;
 type ConfigFile = {
     fileExports: Record<string, unknown>;
@@ -14,7 +16,8 @@ type ConfigFile = {
 declare function loadImportedFile(import_: FilePathResolved & {
     fileExportName: string;
 }, userRootDir: string, importedFilesLoaded: ImportedFilesLoaded): Promise<unknown>;
-declare function loadValueFile(interfaceValueFile: InterfaceValueFile, configName: string, userRootDir: string): Promise<void>;
+declare function loadValueFile(interfaceValueFile: InterfaceValueFile, configDefinitions: ConfigDefinitions, userRootDir: string): Promise<void>;
+declare function loadValueFiles(interfaceFiles: InterfaceFilesByLocationId, configDefinitions: ConfigDefinitions, userRootDir: string): Promise<void>;
 declare function loadConfigFile(configFilePath: FilePathResolved, userRootDir: string, visited: string[], isExtensionConfig: boolean): Promise<{
     configFile: ConfigFile;
     extendsConfigs: ConfigFile[];

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

@@ -1,9 +1,11 @@
-// Files loadded at config time:
+// Files loaded at config time:
 export { loadImportedFile };
 export { loadValueFile };
+export { loadValueFiles };
 export { loadConfigFile };
-import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject } from '../../../../utils.js';
+import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject, genPromise } from '../../../../utils.js';
 import { transpileAndExecuteFile } from './transpileAndExecuteFile.js';
+import { getConfigDefinitionOptional, shouldBeLoadableAtBuildTime } from '../getVikeConfig.js';
 import { assertPlusFileExport } from '../../../../../../shared/page-configs/assertPlusFileExport.js';
 import pc from '@brillout/picocolors';
 import { parsePointerImportData } from './transformPointerImports.js';
@@ -21,15 +23,39 @@ async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
     return fileExport;
 }
 // Load +{configName}.js
-async function loadValueFile(interfaceValueFile, configName, userRootDir) {
+async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir) {
+    const { configName } = interfaceValueFile;
+    const configDef = getConfigDefinitionOptional(configDefinitions, configName);
+    if (!configDef || !shouldBeLoadableAtBuildTime(configDef)) {
+        // Only load value files with `env.config===true`
+        return;
+    }
+    if (interfaceValueFile.isValueLoaded) {
+        await interfaceValueFile.isValueLoaded;
+        if (
+        // Help TS
+        true)
+            return;
+    }
+    const { promise, resolve } = genPromise();
+    interfaceValueFile.isValueLoaded = promise;
+    assert(interfaceValueFile.isValueLoaded);
+    interfaceValueFile.fileExportsByConfigName = {};
     const { fileExports } = await transpileAndExecuteFile(interfaceValueFile.filePath, userRootDir, false);
+    resolve();
     const { filePathToShowToUser } = interfaceValueFile.filePath;
     assertPlusFileExport(fileExports, filePathToShowToUser, configName);
     Object.entries(fileExports).forEach(([exportName, configValue]) => {
         const configName_ = exportName === 'default' ? configName : exportName;
-        interfaceValueFile.fileExportsByConfigName[configName_] = { configValue };
+        interfaceValueFile.fileExportsByConfigName[configName_] = configValue;
     });
 }
+async function loadValueFiles(interfaceFiles, configDefinitions, userRootDir) {
+    await Promise.all(Object.values(interfaceFiles)
+        .flat(1)
+        .filter((interfaceFile) => interfaceFile.isValueFile)
+        .map(async (interfaceFile) => await loadValueFile(interfaceFile, configDefinitions, userRootDir)));
+}
 // Load +config.js, including all its extends pointer imports
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig) {
     const { filePathAbsoluteFilesystem } = configFilePath;

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

@@ -4,12 +4,15 @@ export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
 export { isV1Design };
-export { getConfigValueInterfaceFile };
+export { getConfVal };
+export { getConfigDefinitionOptional };
+export { shouldBeLoadableAtBuildTime };
 export type { VikeConfigObject };
 export type { InterfaceValueFile };
 export type { InterfaceFile };
 export type { InterfaceFilesByLocationId };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
+import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import { type LocationId } from './getVikeConfig/filesystemRouting.js';
 import type { ResolvedConfig } from 'vite';
 import type { FilePathResolved } from '../../../../../shared/page-configs/FilePath.js';
@@ -18,22 +21,27 @@ type InterfaceFile = InterfaceConfigFile | InterfaceValueFile;
 type InterfaceFileCommons = {
     locationId: LocationId;
     filePath: FilePathResolved;
-    fileExportsByConfigName: Record<ConfigName, {
-        configValue?: unknown;
-    }>;
 };
 type InterfaceConfigFile = InterfaceFileCommons & {
     isConfigFile: true;
     isValueFile: false;
     extendsFilePaths: string[];
     isConfigExtend: boolean;
+    isValueLoaded: true;
+    fileExportsByConfigName: Record<string, // configName
+    unknown>;
 };
 type InterfaceValueFile = InterfaceFileCommons & {
     isConfigFile: false;
     isValueFile: true;
     configName: string;
-};
-type ConfigName = string;
+} & ({
+    isValueLoaded: Promise<void>;
+    fileExportsByConfigName: Record<string, // configName
+    unknown>;
+} | {
+    isValueLoaded: false;
+});
 type InterfaceFilesByLocationId = Record<LocationId, InterfaceFile[]>;
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
@@ -48,4 +56,11 @@ declare function getVikeConfig(config: ResolvedConfig, { doNotRestartViteOnError
 declare function getVikeConfig2(userRootDir: string, isDev: boolean, vikeVitePluginOptions: unknown): Promise<VikeConfigObject>;
 declare function isV1Design(config: ResolvedConfig): Promise<boolean>;
 declare function isVikeConfigFile(filePath: string): boolean;
-declare function getConfigValueInterfaceFile(interfaceFile: InterfaceFile, configName: string): unknown;
+declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitions, configName: string): ConfigDefinitionInternal | null;
+declare function shouldBeLoadableAtBuildTime(configDef: ConfigDefinitionInternal): boolean;
+declare function getConfVal(interfaceFile: InterfaceFile, configName: string): null | {
+    configValue: unknown;
+    configValueLoaded: true;
+} | {
+    configValueLoaded: false;
+};

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

@@ -4,8 +4,10 @@ export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
 export { isV1Design };
-export { getConfigValueInterfaceFile };
-import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, lowerFirst, assertKeys, objectKeys, objectFromEntries, makeFirst, isNpmPackageImport, reverse } from '../../../utils.js';
+export { getConfVal };
+export { getConfigDefinitionOptional };
+export { shouldBeLoadableAtBuildTime };
+import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, lowerFirst, assertKeys, objectKeys, objectFromEntries, makeFirst, isNpmPackageImport, reverse, unique } from '../../../utils.js';
 import path from 'path';
 import { configDefinitionsBuiltInAll } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, isGlobalLocation, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
@@ -18,7 +20,7 @@ import pc from '@brillout/picocolors';
 import { getConfigDefinedAt } from '../../../../../shared/page-configs/getConfigDefinedAt.js';
 import { crawlPlusFiles } from './getVikeConfig/crawlPlusFiles.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
-import { loadConfigFile, loadImportedFile, loadValueFile } from './getVikeConfig/loadFileAtConfigTime.js';
+import { loadConfigFile, loadImportedFile, loadValueFile, loadValueFiles } from './getVikeConfig/loadFileAtConfigTime.js';
 import { clearFilesEnvMap, resolveConfigEnvWithFileName, resolvePointerImportOfConfig } from './getVikeConfig/resolvePointerImport.js';
 import { getFilePathResolved } from '../../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
@@ -152,26 +154,17 @@ async function loadInterfaceFiles(userRootDir) {
             const interfaceFile = {
                 locationId,
                 filePath,
-                fileExportsByConfigName: {
-                    [configName]: {}
-                },
                 isConfigFile: false,
                 isValueFile: true,
+                isValueLoaded: false,
                 configName
             };
-            {
-                // We don't have access to the custom config definitions defined by the user yet.
-                //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
-                //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
-                const configDef = getConfigDefinitionOptional(configDefinitionsBuiltIn, configName);
-                if (configDef && shouldBeLoadableAtBuildTime(configDef)) {
-                    await loadValueFile(interfaceFile, configName, userRootDir);
-                }
-            }
-            {
-                interfaceFilesAll[locationId] = interfaceFilesAll[locationId] ?? [];
-                interfaceFilesAll[locationId].push(interfaceFile);
-            }
+            interfaceFilesAll[locationId] = interfaceFilesAll[locationId] ?? [];
+            interfaceFilesAll[locationId].push(interfaceFile);
+            // We don't have access to the custom config definitions defined by the user yet.
+            //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
+            //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
+            await loadValueFile(interfaceFile, configDefinitionsBuiltIn, userRootDir);
         })
     ]);
     assertAllConfigsAreKnown(interfaceFilesAll);
@@ -185,12 +178,13 @@ function getInterfaceFileFromConfigFile(configFile, isConfigExtend, locationId)
         fileExportsByConfigName: {},
         isConfigFile: true,
         isValueFile: false,
+        isValueLoaded: true,
         isConfigExtend,
         extendsFilePaths
     };
     const fileExport = getConfigFileExport(fileExports, filePath.filePathToShowToUser);
     Object.entries(fileExport).forEach(([configName, configValue]) => {
-        interfaceFile.fileExportsByConfigName[configName] = { configValue };
+        interfaceFile.fileExportsByConfigName[configName] = configValue;
     });
     return interfaceFile;
 }
@@ -200,8 +194,11 @@ function assertAllConfigsAreKnown(interfaceFilesAll) {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
         const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
         interfaceFiles.forEach((interfaceFile) => {
-            Object.keys(interfaceFile.fileExportsByConfigName).forEach((configName) => {
-                assertConfigExists(configName, Object.keys(configDefinitions), interfaceFile.filePath.filePathToShowToUser);
+            const configNamesKnown = Object.keys(configDefinitions);
+            const { filePathToShowToUser } = interfaceFile.filePath;
+            const configNames = getDefiningConfigNames(interfaceFile);
+            configNames.forEach((configName) => {
+                assertConfigExists(configName, configNamesKnown, filePathToShowToUser);
             });
         });
     });
@@ -277,7 +274,7 @@ async function getGlobalConfigs(interfaceFilesAll, userRootDir, importedFilesLoa
       objectEntries(interfaceFilesAll).forEach(([locationId, interfaceFiles]) => {
         interfaceFiles.forEach((interfaceFile) => {
           Object.keys(interfaceFile.fileExportsByConfigName).forEach((configName) => {
-            if (!isGlobalLocation(locationId, locationIds) && isGlobalConfig(configName)) {
+            if (!isGlobalLocation(locationId, locationIds) && isGlobalConfigOld(configName)) {
               assertUsage(
                 false,
                 [
@@ -340,32 +337,15 @@ async function getPageConfigs(interfaceFilesAll, userRootDir, importedFilesLoade
         pageConfigGlobal.configValueSources[configName] = sources;
     }));
     const pageConfigs = [];
-    await Promise.all(objectEntries(interfaceFilesAll)
-        .filter(([_locationId, interfaceFiles]) => isDefiningPage(interfaceFiles))
-        .map(async ([locationId]) => {
+    await Promise.all(getPageLocationIds(interfaceFilesAll).map(async (locationId) => {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
-        const interfaceFilesRelevantList = Object.values(interfaceFilesRelevant).flat(1);
         const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
-        // Load value files of `env.config===true` custom configs
-        await Promise.all(interfaceFilesRelevantList.map(async (interfaceFile) => {
-            if (!interfaceFile.isValueFile)
-                return;
-            const { configName } = interfaceFile;
-            if (isGlobalConfig(configName))
-                return;
-            const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            if (!shouldBeLoadableAtBuildTime(configDef))
-                return;
-            const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
-            if (isAlreadyLoaded)
-                return;
-            // Value files of built-in configs should have already been loaded at loadInterfaceFiles()
-            assert(!(configName in configDefinitionsBuiltIn));
-            await loadValueFile(interfaceFile, configName, userRootDir);
-        }));
+        // Load value files (with `env.config===true`) of *custom* configs.
+        // - The value files of *built-in* configs are already loaded at `loadInterfaceFiles()`.
+        await loadValueFiles(interfaceFilesRelevant, configDefinitions, userRootDir);
         let configValueSources = {};
         await Promise.all(objectEntries(configDefinitions)
-            .filter(([configName]) => !isGlobalConfig(configName))
+            .filter(([configName]) => !isGlobalConfigOld(configName))
             .map(async ([configName, configDef]) => {
             const sources = await resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded);
             if (sources.length === 0)
@@ -390,6 +370,15 @@ async function getPageConfigs(interfaceFilesAll, userRootDir, importedFilesLoade
     assertPageConfigs(pageConfigs, interfaceFilesAll);
     return { pageConfigs, pageConfigGlobal };
 }
+function getPageLocationIds(interfaceFilesAll) {
+    const locationIds = new Set();
+    objectEntries(interfaceFilesAll).forEach(([locationId, interfaceFiles]) => {
+        if (isDefiningPage(interfaceFiles)) {
+            locationIds.add(locationId);
+        }
+    });
+    return Array.from(locationIds);
+}
 function assertPageConfigs(pageConfigs, interfaceFilesAll) {
     pageConfigs.forEach((pageConfig) => {
         assertGlobalConfigs(pageConfig, interfaceFilesAll);
@@ -413,7 +402,7 @@ function assertGlobalConfigs(pageConfig, interfaceFilesAll) {
             configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
         }
         configNames.forEach((configName) => {
-            if (isGlobalConfig(configName))
+            if (isGlobalConfigOld(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
             if (configDef.global === true) {
@@ -482,14 +471,6 @@ function getConfigValues(pageConfig) {
     });
     return configValues;
 }
-function interfacefileIsAlreaydLoaded(interfaceFile) {
-    const configMapValues = Object.values(interfaceFile.fileExportsByConfigName);
-    const isAlreadyLoaded = configMapValues.some((conf) => 'configValue' in conf);
-    if (isAlreadyLoaded) {
-        assert(configMapValues.every((conf) => 'configValue' in conf));
-    }
-    return isAlreadyLoaded;
-}
 function getInterfaceFilesRelevant(interfaceFilesAll, locationIdPage) {
     const interfaceFilesRelevant = Object.fromEntries(objectEntries(interfaceFilesAll)
         .filter(([locationId]) => {
@@ -502,7 +483,7 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
     const sourcesInfo = [];
     // interfaceFilesRelevant is sorted by sortAfterInheritanceOrder()
     for (const interfaceFiles of Object.values(interfaceFilesRelevant)) {
-        const interfaceFilesDefiningConfig = interfaceFiles.filter((interfaceFile) => interfaceFile.fileExportsByConfigName[configName]);
+        const interfaceFilesDefiningConfig = interfaceFiles.filter((interfaceFile) => getDefiningConfigNames(interfaceFile).includes(configName));
         if (interfaceFilesDefiningConfig.length === 0)
             continue;
         const visited = new WeakSet();
@@ -589,8 +570,8 @@ function isInterfaceFileUserLand(interfaceFile) {
     return (interfaceFile.isConfigFile && !interfaceFile.isConfigExtend) || interfaceFile.isValueFile;
 }
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded, isHighestInheritancePrecedence) {
-    const conf = interfaceFile.fileExportsByConfigName[configName];
-    assert(conf);
+    const confVal = getConfVal(interfaceFile, configName);
+    assert(confVal);
     const configValueSourceCommon = {
         locationId: interfaceFile.locationId,
         interfaceFile
@@ -606,7 +587,8 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         let valueFilePath;
         if (interfaceFile.isConfigFile) {
             // Defined over pointer import
-            const resolved = resolvePointerImportOfConfig(conf.configValue, interfaceFile.filePath, userRootDir, configDef.env, configName);
+            assert(confVal.configValueLoaded);
+            const resolved = resolvePointerImportOfConfig(confVal.configValue, interfaceFile.filePath, userRootDir, configDef.env, configName);
             const configDefinedAt = getConfigDefinedAt('Config', configName, definedAtFilePath_);
             assertUsage(resolved, `${configDefinedAt} should be an import`);
             valueFilePath = resolved.pointerImport.filePathAbsoluteVite;
@@ -635,8 +617,8 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
     }
     // +config.js
     if (interfaceFile.isConfigFile) {
-        assert('configValue' in conf);
-        const { configValue } = conf;
+        assert(confVal.configValueLoaded);
+        const { configValue } = confVal;
         // Defined over pointer import
         const resolved = resolvePointerImportOfConfig(configValue, interfaceFile.filePath, userRootDir, configDef.env, configName);
         if (resolved) {
@@ -678,7 +660,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
     // Defined by value file, i.e. +{configName}.js
     if (interfaceFile.isValueFile) {
         const configEnvResolved = resolveConfigEnvWithFileName(configDef.env, interfaceFile.filePath);
-        const valueAlreadyLoaded = 'configValue' in conf;
+        const valueAlreadyLoaded = confVal.configValueLoaded;
         assert(valueAlreadyLoaded === !!configEnvResolved.config);
         const configValueSource = {
             ...configValueSourceCommon,
@@ -695,7 +677,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             }
         };
         if (valueAlreadyLoaded) {
-            configValueSource.value = conf.configValue;
+            configValueSource.value = confVal.configValue;
         }
         return configValueSource;
     }
@@ -703,7 +685,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
 }
 function isDefiningPage(interfaceFiles) {
     for (const interfaceFile of interfaceFiles) {
-        const configNames = Object.keys(interfaceFile.fileExportsByConfigName);
+        const configNames = getDefiningConfigNames(interfaceFile);
         if (configNames.some((configName) => isDefiningPageConfig(configName))) {
             return true;
         }
@@ -713,16 +695,28 @@ function isDefiningPage(interfaceFiles) {
 function isDefiningPageConfig(configName) {
     return ['Page', 'route'].includes(configName);
 }
+function getDefiningConfigNames(interfaceFile) {
+    let configNames = [];
+    if (interfaceFile.isValueFile) {
+        configNames.push(interfaceFile.configName);
+    }
+    if (interfaceFile.isValueLoaded) {
+        configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
+    }
+    configNames = unique(configNames);
+    return configNames;
+}
 function getConfigDefinitions(interfaceFilesRelevant) {
     const configDefinitionsMerged = { ...configDefinitionsBuiltIn };
     Object.entries(interfaceFilesRelevant)
         .reverse()
         .forEach(([_locationId, interfaceFiles]) => {
         interfaceFiles.forEach((interfaceFile) => {
-            const configMeta = interfaceFile.fileExportsByConfigName['meta'];
-            if (!configMeta)
+            const confVal = getConfVal(interfaceFile, 'meta');
+            if (!confVal)
                 return;
-            const meta = configMeta.configValue;
+            assert(confVal.configValueLoaded);
+            const meta = confVal.configValue;
             assertMetaUsage(meta, `Config ${pc.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAtFilePath
             Object.entries(meta).forEach(([configName, configDef]) => {
@@ -1042,24 +1036,25 @@ function getConfigDefinitionOptional(configDefinitions, configName) {
 function shouldBeLoadableAtBuildTime(configDef) {
     return !!configDef.env.config && !configDef._valueIsFilePath;
 }
-function isGlobalConfig(configName) {
+// TODO/now: remove
+function isGlobalConfigOld(configName) {
     // TODO/now
     if (configName === 'prerender')
         return false;
     const configNamesGlobal = getConfigNamesGlobal();
     return includes(configNamesGlobal, configName);
 }
-/*
 // TODO/now
-function isGlobalConfig(configName: string, configDefinitions: ConfigDefinitions): configName is ConfigNameGlobal {
-  const configSpec = configDefinitions[configName]
-  assert(configSpec)
-  const globalValue = configSpec.global
-  if (!globalValue) return false
-  if (globalValue === true ) return true
-  return globalValue(value)
+function isGlobalConfig(configName, configDefinitions, value) {
+    const configSpec = configDefinitions[configName];
+    assert(configSpec);
+    const globalValue = configSpec.global;
+    if (!globalValue)
+        return false;
+    if (globalValue === true)
+        return true;
+    return globalValue(value);
 }
-*/
 function getConfigNamesGlobal() {
     return Object.keys(configDefinitionsBuiltInGlobal);
 }
@@ -1092,6 +1087,12 @@ function sortConfigValueSources(configValueSources, locationIdPage) {
         // Sort after the filesystem inheritance of the config value
         .sort(([, [source1]], [, [source2]]) => reverse(sortAfterInheritanceOrder(source1.locationId, source2.locationId, locationIdPage))));
 }
-function getConfigValueInterfaceFile(interfaceFile, configName) {
-    return interfaceFile.fileExportsByConfigName[configName]?.configValue;
+function getConfVal(interfaceFile, configName) {
+    const configNames = getDefiningConfigNames(interfaceFile);
+    if (!configNames.includes(configName))
+        return null;
+    if (!interfaceFile.isValueLoaded)
+        return { configValueLoaded: false };
+    const confVal = { configValue: interfaceFile.fileExportsByConfigName[configName], configValueLoaded: true };
+    return confVal;
 }

package/dist/esm/shared/getPageContextUrlComputed.js

@@ -37,24 +37,29 @@ function getUrlParsed(pageContext) {
     //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
+    // TODO/soon: revert https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
+    const assertUrlResolved = (src) => assert(urlResolved && typeof urlResolved === 'string', { src, urlResolved });
     let urlResolved;
     let baseToBeRemoved;
     if (pageContext.urlLogical) {
         // Set by onBeforeRoute()
         urlResolved = pageContext.urlLogical;
         baseToBeRemoved = false;
+        assertUrlResolved(1);
     }
     else if (pageContext._urlRewrite) {
         // Set by `throw render()`
         urlResolved = pageContext._urlRewrite;
         baseToBeRemoved = false;
+        assertUrlResolved(2);
     }
     else {
         // Set by renderPage()
         urlResolved = pageContext.urlOriginal;
         baseToBeRemoved = true;
+        assertUrlResolved(3);
     }
-    assert(urlResolved && typeof urlResolved === 'string');
+    assertUrlResolved(4);
     // Remove .pageContext.json
     let urlHandler = pageContext._urlHandler;
     if (!urlHandler)

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.220-commit-9a798ce";
+export declare const PROJECT_VERSION: "0.4.220-commit-5c7810f";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.220-commit-9a798ce';
+export const PROJECT_VERSION = '0.4.220-commit-5c7810f';

package/dist/esm/utils/isDev.js

@@ -7,7 +7,7 @@ function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
     // Released at vite@5.1.0 which is guaranteed with `assertVersion('Vite', version, '5.1.0')`
     // - Release: https://github.com/vitejs/vite/blob/6f7466e6211027686f40ad7e4ce6ec8477414546/packages/vite/CHANGELOG.md#510-beta4-2024-01-26:~:text=fix(preview)%3A-,set%20isPreview%20true,-(%2315695)%20(93fce55
-    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2120
+    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2135
     assert(typeof isPreview === 'boolean', { isPreview, version });
     return command === 'serve' && !isPreview;
 }

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.220-commit-9a798ce";
+    projectVersion: "0.4.220-commit-5c7810f";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.220-commit-9a798ce",
+  "version": "0.4.220-commit-5c7810f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {