vike 0.4.220-commit-5c7810f → 0.4.220-commit-af5c91f

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

@@ -11,7 +11,6 @@ exports.isVikeConfigFile = isVikeConfigFile;
 exports.isV1Design = isV1Design;
 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");
@@ -32,8 +31,6 @@ const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs
 const assertExtensions_js_1 = require("./assertExtensions.js");
 const getPageConfigUserFriendly_js_1 = require("../../../../../shared/page-configs/getPageConfigUserFriendly.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const configDefinitionsBuiltIn = getConfigDefinitionsBuiltIn();
-const configDefinitionsBuiltInGlobal = getConfigDefinitionsBuiltInGlobal();
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let restartVite = false;
 let wasConfigInvalid = null;
@@ -45,7 +42,6 @@ function reloadVikeConfig(config) {
     const vikeVitePluginOptions = config._vikeVitePluginOptions;
     (0, utils_js_1.assert)(vikeVitePluginOptions);
     vikeConfigDependencies.clear();
-    (0, resolvePointerImport_js_1.clearFilesEnvMap)();
     vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
 }
@@ -104,7 +100,7 @@ async function isV1Design(config) {
     const isV1Design = pageConfigs.length > 0;
     return isV1Design;
 }
-async function loadInterfaceFiles(userRootDir) {
+async function loadInterfaceFiles(userRootDir, esbuildCache) {
     const plusFiles = await findPlusFiles(userRootDir, null);
     const configFiles = [];
     const valueFiles = [];
@@ -122,10 +118,10 @@ async function loadInterfaceFiles(userRootDir) {
         ...configFiles.map(async (filePath) => {
             const { filePathAbsoluteUserRootDir } = filePath;
             (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
-            const { configFile, extendsConfigs } = await (0, loadFileAtConfigTime_js_1.loadConfigFile)(filePath, userRootDir, [], false);
+            const { configFile, extendsConfigs } = await (0, loadFileAtConfigTime_js_1.loadConfigFile)(filePath, userRootDir, [], false, esbuildCache);
             (0, utils_js_1.assert)(filePath.filePathAbsoluteUserRootDir);
             const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathAbsoluteUserRootDir);
-            const interfaceFile = getInterfaceFileFromConfigFile(configFile, false, locationId);
+            const interfaceFile = getInterfaceFileFromConfigFile(configFile, false, locationId, userRootDir);
             interfaceFilesAll[locationId] = interfaceFilesAll[locationId] ?? [];
             interfaceFilesAll[locationId].push(interfaceFile);
             extendsConfigs.forEach((extendsConfig) => {
@@ -145,7 +141,7 @@ async function loadInterfaceFiles(userRootDir) {
                 export default { extends: [vikeReact] }
                 ```
                 */
-                const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true, locationId);
+                const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true, locationId, userRootDir);
                 (0, assertExtensions_js_1.assertExtensionsConventions)(interfaceFile);
                 interfaceFilesAll[locationId].push(interfaceFile);
             });
@@ -162,7 +158,7 @@ async function loadInterfaceFiles(userRootDir) {
                 filePath,
                 isConfigFile: false,
                 isValueFile: true,
-                isValueLoaded: false,
+                isValueFileLoaded: false,
                 configName
             };
             interfaceFilesAll[locationId] = interfaceFilesAll[locationId] ?? [];
@@ -170,45 +166,40 @@ async function loadInterfaceFiles(userRootDir) {
             // 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);
+            await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInAll, userRootDir, esbuildCache);
         })
     ]);
-    assertAllConfigsAreKnown(interfaceFilesAll);
+    assertKnownConfigs(interfaceFilesAll);
     return interfaceFilesAll;
 }
-function getInterfaceFileFromConfigFile(configFile, isConfigExtend, locationId) {
+function getInterfaceFileFromConfigFile(configFile, isConfigExtension, locationId, userRootDir) {
     const { fileExports, filePath, extendsFilePaths } = configFile;
+    const fileExportsByConfigName = {};
+    const pointerImportsByConfigName = {};
+    const fileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(fileExports, filePath.filePathToShowToUser);
+    Object.entries(fileExport).forEach(([configName, configValue]) => {
+        fileExportsByConfigName[configName] = configValue;
+        const pointerImport = (0, resolvePointerImport_js_1.resolvePointerImport)(configValue, configFile.filePath, userRootDir, configName);
+        if (pointerImport) {
+            pointerImportsByConfigName[configName] = {
+                ...pointerImport,
+                fileExportValueLoaded: false
+            };
+        }
+    });
     const interfaceFile = {
         locationId,
         filePath,
-        fileExportsByConfigName: {},
+        fileExportsByConfigName,
+        pointerImportsByConfigName,
         isConfigFile: true,
         isValueFile: false,
-        isValueLoaded: true,
-        isConfigExtend,
+        isValueFileLoaded: true,
+        isConfigExtension,
         extendsFilePaths
     };
-    const fileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(fileExports, filePath.filePathToShowToUser);
-    Object.entries(fileExport).forEach(([configName, configValue]) => {
-        interfaceFile.fileExportsByConfigName[configName] = configValue;
-    });
     return interfaceFile;
 }
-/** Show error message upon unknown config */
-function assertAllConfigsAreKnown(interfaceFilesAll) {
-    (0, utils_js_1.objectEntries)(interfaceFilesAll).forEach(([locationId, interfaceFiles]) => {
-        const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
-        const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
-        interfaceFiles.forEach((interfaceFile) => {
-            const configNamesKnown = Object.keys(configDefinitions);
-            const { filePathToShowToUser } = interfaceFile.filePath;
-            const configNames = getDefiningConfigNames(interfaceFile);
-            configNames.forEach((configName) => {
-                assertConfigExists(configName, configNamesKnown, filePathToShowToUser);
-            });
-        });
-    });
-}
 async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     let hasError = false;
     let ret;
@@ -243,7 +234,6 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                 pageConfigs: [],
                 pageConfigGlobal: {
                     configDefinitions: {},
-                    interfaceFiles: {},
                     configValueSources: {}
                 },
                 global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} })
@@ -253,9 +243,10 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
     }
 }
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
-    const interfaceFilesAll = await loadInterfaceFiles(userRootDir);
-    const importedFilesLoaded = {};
-    const { pageConfigGlobal, pageConfigs } = await getPageConfigs(interfaceFilesAll, userRootDir, importedFilesLoaded);
+    const esbuildCache = {};
+    const interfaceFilesAll = await loadInterfaceFiles(userRootDir, esbuildCache);
+    const configDefinitionsResolved = await resolveConfigDefinitions(interfaceFilesAll, userRootDir, esbuildCache);
+    const { pageConfigGlobal, pageConfigs } = getPageConfigs(configDefinitionsResolved, interfaceFilesAll, userRootDir);
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
@@ -263,183 +254,140 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues });
     return { pageConfigs, pageConfigGlobal, global };
 }
-async function getGlobalConfigs(interfaceFilesAll, userRootDir, importedFilesLoaded) {
-    /* TODO/now: dedupe
-    // Validate that global configs live in global interface files
-    {
-      const interfaceFilesGlobalPaths: string[] = []
-      objectEntries(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
-        assert(isGlobalLocation(locationId, locationIds))
-        interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
-          if (filePathAbsoluteUserRootDir) {
-            interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir)
-          }
-        })
-      })
-      const globalPaths = Array.from(new Set(interfaceFilesGlobalPaths.map((p) => path.posix.dirname(p))))
-      objectEntries(interfaceFilesAll).forEach(([locationId, interfaceFiles]) => {
-        interfaceFiles.forEach((interfaceFile) => {
-          Object.keys(interfaceFile.fileExportsByConfigName).forEach((configName) => {
-            if (!isGlobalLocation(locationId, locationIds) && isGlobalConfigOld(configName)) {
-              assertUsage(
-                false,
-                [
-                  `${interfaceFile.filePath.filePathToShowToUser} defines the config ${pc.cyan(
-                    configName
-                  )} which is global:`,
-                  globalPaths.length
-                    ? `define ${pc.cyan(configName)} in ${joinEnglish(globalPaths, 'or')} instead`
-                    : `create a global config (e.g. /pages/+config.js) and define ${pc.cyan(configName)} there instead`
-                ].join(' ')
-              )
-            }
-          })
-        })
-      })
-    }
-    //*/
-}
-function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir) {
-    (0, utils_js_1.assert)((0, utils_js_1.isObject)(vikeVitePluginOptions));
-    (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)(configDefinitionsBuiltInGlobal), configName));
-        const configDef = configDefinitionsBuiltInGlobal[configName];
-        const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
-        sources.push({
-            value,
-            configEnv: configDef.env,
-            definedAtFilePath: {
-                ...(0, getFilePath_js_1.getFilePathResolved)({
-                    userRootDir,
-                    filePathAbsoluteUserRootDir: '/vite.config.js'
-                }),
-                fileExportPathToShowToUser: null
-            },
-            locationId: '/',
-            interfaceFile: null,
-            isOverriden: configDef.cumulative ? false : sources.length > 0,
-            valueIsImportedAtRuntime: false,
-            valueIsDefinedByPlusFile: false
-        });
-    });
+async function resolveConfigDefinitions(interfaceFilesAll, userRootDir, esbuildCache) {
+    const configDefinitionsGlobal = getConfigDefinitions(
+    // We use `interfaceFilesAll` in order to allow local Vike extensions to create global configs.
+    interfaceFilesAll, // TODO/now sort
+    (configDef) => !!configDef.global);
+    await loadCustomConfigBuildTimeFiles(interfaceFilesAll, configDefinitionsGlobal, userRootDir, esbuildCache);
+    const configDefinitionsLocal = {};
+    await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesAll).map(async ([locationId, interfaceFiles]) => {
+        const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
+        //    configDefinitions = getConfigDefinitions(interfaceFilesRelevant, (configDef) => configDef.global !== true) // TODO/now
+        const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
+        await loadCustomConfigBuildTimeFiles(interfaceFiles, configDefinitions, userRootDir, esbuildCache);
+        configDefinitionsLocal[locationId] = { configDefinitions, interfaceFiles, interfaceFilesRelevant };
+    }));
+    const configDefinitionsResolved = {
+        configDefinitionsGlobal,
+        configDefinitionsLocal
+    };
+    return configDefinitionsResolved;
 }
-async function getPageConfigs(interfaceFilesAll, userRootDir, importedFilesLoaded) {
-    const locationIds = (0, utils_js_1.objectKeys)(interfaceFilesAll);
-    const interfaceFilesGlobal = (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(interfaceFilesAll).filter(([locationId]) => {
-        return (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds);
+// Load value files (with `env.config===true`) of *custom* configs.
+// - The value files of *built-in* configs are already loaded at `loadInterfaceFiles()`.
+async function loadCustomConfigBuildTimeFiles(interfaceFiles, configDefinitions, userRootDir, esbuildCache) {
+    const interfaceFileList = Object.values(interfaceFiles).flat(1);
+    await Promise.all(interfaceFileList.map(async (interfaceFile) => {
+        if (interfaceFile.isValueFile) {
+            await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configDefinitions, userRootDir, esbuildCache);
+        }
+        else {
+            await Promise.all(Object.entries(interfaceFile.pointerImportsByConfigName).map(async ([configName, pointerImport]) => {
+                await (0, loadFileAtConfigTime_js_1.loadPointerImport)(pointerImport, userRootDir, configName, configDefinitions, esbuildCache);
+            }));
+        }
     }));
+}
+function getPageConfigs(configDefinitionsResolved, interfaceFilesAll, userRootDir) {
     const pageConfigGlobal = {
-        configDefinitions: configDefinitionsBuiltInGlobal,
-        interfaceFiles: interfaceFilesGlobal,
+        configDefinitions: configDefinitionsResolved.configDefinitionsGlobal,
         configValueSources: {}
     };
-    await Promise.all((0, utils_js_1.objectEntries)(configDefinitionsBuiltInGlobal).map(async ([configName, configDef]) => {
-        const sources = await resolveConfigValueSources(configName, configDef, interfaceFilesGlobal, userRootDir, importedFilesLoaded);
-        const configValueSource = sources[0];
-        if (!configValueSource)
+    (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsGlobal).forEach(([configName, configDef]) => {
+        const sources = resolveConfigValueSources(configName, configDef, 
+        // We use `interfaceFilesAll` in order to allow local Vike extensions to set the value of global configs (e.g. `vite`).
+        interfaceFilesAll, // TODO/now check sort order
+        userRootDir, true);
+        if (sources.length === 0)
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
-    }));
-    const pageConfigs = [];
-    await Promise.all(getPageLocationIds(interfaceFilesAll).map(async (locationId) => {
-        const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
-        const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
-        // 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);
+    });
+    assertPageConfigGlobal(pageConfigGlobal, interfaceFilesAll);
+    const pageConfigs = (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal)
+        .filter(([_locationId, { interfaceFiles }]) => isDefiningPage(interfaceFiles))
+        .map(([locationId, { configDefinitions, interfaceFilesRelevant }]) => {
+        const configDefinitionsLocal = configDefinitions;
         let configValueSources = {};
-        await Promise.all((0, utils_js_1.objectEntries)(configDefinitions)
-            .filter(([configName]) => !isGlobalConfigOld(configName))
-            .map(async ([configName, configDef]) => {
-            const sources = await resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded);
+        (0, utils_js_1.objectEntries)(configDefinitionsLocal)
+            .filter(([_configName, configDef]) => configDef.global !== true)
+            .forEach(([configName, configDef]) => {
+            const sources = resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, false);
             if (sources.length === 0)
                 return;
+            // assertUsage(!isGlobalConfig(configName, configDefinitionsLocal, sources), 'TODO') // TODO/now
             configValueSources[configName] = sources;
-        }));
+        });
         configValueSources = sortConfigValueSources(configValueSources, locationId);
         const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
-        applyEffectsAll(configValueSources, configDefinitions);
-        const configValuesComputed = getComputed(configValueSources, configDefinitions);
+        applyEffectsAll(configValueSources, configDefinitionsLocal);
+        const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
             isErrorPage,
             routeFilesystem,
-            configDefinitions,
+            configDefinitions: configDefinitionsLocal,
             interfaceFiles: interfaceFilesRelevant,
             configValueSources,
             configValuesComputed
         };
-        pageConfigs.push(pageConfig);
-    }));
-    assertPageConfigs(pageConfigs, interfaceFilesAll);
+        return pageConfig;
+    });
+    assertPageConfigs(pageConfigs);
     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);
+function assertPageConfigGlobal(pageConfigGlobal, interfaceFilesAll) {
+    Object.entries(pageConfigGlobal.configValueSources).forEach(([configName, sources]) => {
+        assertGlobalConfigLocation(configName, sources, interfaceFilesAll, pageConfigGlobal.configDefinitions);
+    });
+}
+function assertGlobalConfigLocation(configName, sources, interfaceFilesAll, configDefinitionsGlobal) {
+    const locationIdsAll = (0, utils_js_1.objectKeys)(interfaceFilesAll);
+    // Determine existing global +config.js files
+    const configFilePathsGlobal = [];
+    const interfaceFilesGlobal = Object.values((0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(interfaceFilesAll).filter(([locationId]) => (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIdsAll)))).flat();
+    interfaceFilesGlobal
+        .filter((i) => i.isConfigFile)
+        .forEach((interfaceFile) => {
+        const { filePathAbsoluteUserRootDir } = interfaceFile.filePath;
+        if (filePathAbsoluteUserRootDir) {
+            configFilePathsGlobal.push(filePathAbsoluteUserRootDir);
+        }
+    });
+    // Call assertWarning()
+    sources.forEach((source) => {
+        const { interfaceFile } = source;
+        // It's `null` when the config is defined by `vike(options)` in vite.config.js
+        (0, utils_js_1.assert)(interfaceFile);
+        const { filePathAbsoluteUserRootDir } = interfaceFile.filePath;
+        // Allow local Vike extensions to set gloabl configs (`filePathAbsoluteUserRootDir===null` for Vike extension)
+        if (!filePathAbsoluteUserRootDir)
+            return;
+        (0, utils_js_1.assert)(!interfaceFile.isConfigExtension);
+        if (!(0, filesystemRouting_js_1.isGlobalLocation)(source.locationId, locationIdsAll)) {
+            const configDef = configDefinitionsGlobal[configName];
+            (0, utils_js_1.assert)(configDef);
+            const isConditionallyGlobal = (0, utils_js_1.isCallable)(configDef.global);
+            const errBeg = `${filePathAbsoluteUserRootDir} (which is a local config file) sets the config ${picocolors_1.default.cyan(configName)}`;
+            const errMid = !isConditionallyGlobal
+                ? "but it's a global config"
+                : '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`
+                : `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).`;
+            (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
         }
     });
-    return Array.from(locationIds);
 }
-function assertPageConfigs(pageConfigs, interfaceFilesAll) {
+function assertPageConfigs(pageConfigs) {
     pageConfigs.forEach((pageConfig) => {
-        assertGlobalConfigs(pageConfig, interfaceFilesAll);
         (0, assertExtensions_js_1.assertExtensionsRequire)(pageConfig);
         assertOnBeforeRenderEnv(pageConfig);
     });
 }
-// TODO/now: refactor
-//  - Dedupe: most of the assertGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
-//    - This assertUsage() message is slightly better: use this one for getGlobalConfigs()
-// Global configs should be defined at global locations
-function assertGlobalConfigs(pageConfig, interfaceFilesAll) {
-    const interfaceFilesRelevantList = Object.values(pageConfig.interfaceFiles).flat(1);
-    const { configDefinitions } = pageConfig;
-    interfaceFilesRelevantList.forEach((interfaceFile) => {
-        const configNames = [];
-        if (interfaceFile.isValueFile) {
-            configNames.push(interfaceFile.configName);
-        }
-        else {
-            configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
-        }
-        configNames.forEach((configName) => {
-            if (isGlobalConfigOld(configName))
-                return;
-            const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            if (configDef.global === true) {
-                const locationIds = (0, utils_js_1.objectKeys)(interfaceFilesAll);
-                if (!(0, filesystemRouting_js_1.isGlobalLocation)(interfaceFile.locationId, locationIds)) {
-                    const interfaceFilesGlobal = (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(interfaceFilesAll).filter(([locationId]) => {
-                        return (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds);
-                    }));
-                    const configFilesGlobal = [];
-                    (0, utils_js_1.objectEntries)(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
-                        (0, utils_js_1.assert)((0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds));
-                        interfaceFiles.forEach((interfaceFile) => {
-                            if (!interfaceFile.isConfigFile)
-                                return;
-                            const { filePath: { filePathAbsoluteUserRootDir } } = interfaceFile;
-                            if (filePathAbsoluteUserRootDir) {
-                                configFilesGlobal.push(filePathAbsoluteUserRootDir);
-                            }
-                        });
-                    });
-                    (0, utils_js_1.assertUsage)(false, [
-                        `${interfaceFile.filePath.filePathToShowToUser} sets the config ${picocolors_1.default.cyan(configName)} but it's a global config:`,
-                        configFilesGlobal.length > 0
-                            ? `define ${picocolors_1.default.cyan(configName)} at ${(0, utils_js_1.joinEnglish)(configFilesGlobal, 'or')} instead.`
-                            : `create a global config (e.g. /pages/+config.js) and define ${picocolors_1.default.cyan(configName)} there instead.`
-                    ].join(' '));
-                }
-            }
-        });
-    });
-}
 function assertOnBeforeRenderEnv(pageConfig) {
     const onBeforeRenderConfig = pageConfig.configValueSources.onBeforeRender?.[0];
     if (!onBeforeRenderConfig)
@@ -477,6 +425,32 @@ function getConfigValues(pageConfig) {
     });
     return configValues;
 }
+function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir) {
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(vikeVitePluginOptions));
+    (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.configDefinitionsBuiltInAll), configName));
+        const configDef = configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInAll[configName];
+        const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
+        sources.push({
+            value,
+            configEnv: configDef.env,
+            definedAtFilePath: {
+                ...(0, getFilePath_js_1.getFilePathResolved)({
+                    userRootDir,
+                    filePathAbsoluteUserRootDir: '/vite.config.js'
+                }),
+                fileExportPathToShowToUser: null
+            },
+            locationId: '/',
+            interfaceFile: null,
+            isOverriden: configDef.cumulative ? false : sources.length > 0,
+            valueIsImportedAtRuntime: false,
+            valueIsDefinedByPlusFile: false
+        });
+    });
+}
 function getInterfaceFilesRelevant(interfaceFilesAll, locationIdPage) {
     const interfaceFilesRelevant = Object.fromEntries((0, utils_js_1.objectEntries)(interfaceFilesAll)
         .filter(([locationId]) => {
@@ -485,8 +459,8 @@ function getInterfaceFilesRelevant(interfaceFilesAll, locationIdPage) {
         .sort(([locationId1], [locationId2]) => (0, filesystemRouting_js_1.sortAfterInheritanceOrder)(locationId1, locationId2, locationIdPage)));
     return interfaceFilesRelevant;
 }
-async function resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded) {
-    const sourcesInfo = [];
+function resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, isGlobal) {
+    const interfaceFilesSource = [];
     // interfaceFilesRelevant is sorted by sortAfterInheritanceOrder()
     for (const interfaceFiles of Object.values(interfaceFilesRelevant)) {
         const interfaceFilesDefiningConfig = interfaceFiles.filter((interfaceFile) => getDefiningConfigNames(interfaceFile).includes(configName));
@@ -496,15 +470,8 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
         const add = (interfaceFile) => {
             (0, utils_js_1.assert)(!visited.has(interfaceFile));
             visited.add(interfaceFile);
-            const isHighestInheritancePrecedence = sourcesInfo.length === 0;
-            sourcesInfo.push([
-                configName,
-                interfaceFile,
-                configDef,
-                userRootDir,
-                importedFilesLoaded,
-                isHighestInheritancePrecedence
-            ]);
+            const isHighestInheritancePrecedence = interfaceFilesSource.length === 0;
+            interfaceFilesSource.push({ interfaceFile, isHighestInheritancePrecedence });
         };
         // Main resolution logic
         {
@@ -515,8 +482,8 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
                 .sort(makeOrderDeterministic);
             const interfaceConfigFiles = interfaceFilesDefiningConfig
                 .filter((interfaceFile) => interfaceFile.isConfigFile &&
-                // We consider value from extended configs (e.g. vike-react) later (i.e. with less priority)
-                !interfaceFile.isConfigExtend)
+                // We consider values from extensions (e.g. vike-react) later (i.e. with less priority)
+                !interfaceFile.isConfigExtension)
                 .sort(makeOrderDeterministic);
             const interfaceValueFile = interfaceValueFiles[0];
             const interfaceConfigFile = interfaceConfigFiles[0];
@@ -544,8 +511,8 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
         });
         // extends
         interfaceFilesDefiningConfig
-            .filter((interfaceFile) => interfaceFile.isConfigFile && interfaceFile.isConfigExtend)
-            // extended config files are already sorted by inheritance order
+            .filter((interfaceFile) => interfaceFile.isConfigFile && interfaceFile.isConfigExtension)
+            // Extension config files are already sorted by inheritance order
             .forEach((interfaceFile) => {
             add(interfaceFile);
         });
@@ -553,29 +520,24 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
             (0, utils_js_1.assert)(visited.has(interfaceFile));
         });
     }
-    const sources = await Promise.all(sourcesInfo.map(async (args) => await getConfigValueSource(...args)));
-    return sources;
-}
-function makeOrderDeterministic(interfaceFile1, interfaceFile2) {
-    return (0, utils_js_1.lowerFirst)((interfaceFile) => {
-        const { filePathAbsoluteUserRootDir } = interfaceFile.filePath;
-        (0, utils_js_1.assert)(isInterfaceFileUserLand(interfaceFile));
-        (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
-        return filePathAbsoluteUserRootDir.length;
-    })(interfaceFile1, interfaceFile2);
-}
-function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden, configName) {
-    interfaceFilesOverriden.forEach((interfaceFileLoser) => {
-        const loserFilePath = interfaceFileLoser.filePath.filePathToShowToUser;
-        const winnerFilePath = interfaceFileWinner.filePath.filePathToShowToUser;
-        const confName = picocolors_1.default.cyan(configName);
-        (0, utils_js_1.assertWarning)(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
+    let sources = interfaceFilesSource.map(({ interfaceFile, isHighestInheritancePrecedence }) => {
+        const configValueSource = getConfigValueSource(configName, interfaceFile, configDef, userRootDir, isHighestInheritancePrecedence);
+        return configValueSource;
     });
+    if ((0, utils_js_1.isCallable)(configDef.global)) {
+        const isGlobalValue = configDef.global;
+        (0, utils_js_1.assert)(configDef.env.config);
+        sources = sources.filter((source) => {
+            (0, utils_js_1.assert)(source.configEnv.config);
+            // TODO/now: source.valueIsDefined
+            (0, utils_js_1.assert)('value' in source);
+            const valueIsGlobal = isGlobalValue(source.value);
+            return isGlobal ? valueIsGlobal : !valueIsGlobal;
+        });
+    }
+    return sources;
 }
-function isInterfaceFileUserLand(interfaceFile) {
-    return (interfaceFile.isConfigFile && !interfaceFile.isConfigExtend) || interfaceFile.isValueFile;
-}
-async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded, isHighestInheritancePrecedence) {
+function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, isHighestInheritancePrecedence) {
     const confVal = getConfVal(interfaceFile, configName);
     (0, utils_js_1.assert)(confVal);
     const configValueSourceCommon = {
@@ -594,11 +556,11 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         if (interfaceFile.isConfigFile) {
             // Defined over pointer import
             (0, utils_js_1.assert)(confVal.configValueLoaded);
-            const resolved = (0, resolvePointerImport_js_1.resolvePointerImportOfConfig)(confVal.configValue, interfaceFile.filePath, userRootDir, configDef.env, configName);
+            const pointerImport = (0, resolvePointerImport_js_1.resolvePointerImport)(confVal.configValue, interfaceFile.filePath, userRootDir, 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;
-            definedAtFilePath = resolved.pointerImport;
+            (0, utils_js_1.assertUsage)(pointerImport, `${configDefinedAt} should be an import`);
+            valueFilePath = pointerImport.fileExportPath.filePathAbsoluteVite;
+            definedAtFilePath = pointerImport.fileExportPath;
         }
         else {
             // Defined by value file, i.e. +{configName}.js
@@ -626,28 +588,19 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         (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) {
+        const pointerImport = interfaceFile.pointerImportsByConfigName[configName];
+        if (pointerImport) {
             const configValueSource = {
                 ...configValueSourceCommon,
-                configEnv: resolved.configEnvResolved,
+                configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
                 valueIsImportedAtRuntime: true,
                 valueIsDefinedByPlusFile: false,
                 isOverriden,
-                definedAtFilePath: resolved.pointerImport
+                definedAtFilePath: pointerImport.fileExportPath
             };
-            // Load pointer import
-            if (shouldBeLoadableAtBuildTime(configDef) &&
-                // The value of `extends` was already loaded and already used: we don't need the value of `extends` anymore
-                configName !== 'extends') {
-                if (resolved.pointerImport.filePathAbsoluteFilesystem) {
-                    const fileExport = await (0, loadFileAtConfigTime_js_1.loadImportedFile)(resolved.pointerImport, userRootDir, importedFilesLoaded);
-                    configValueSource.value = fileExport;
-                }
-                else {
-                    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, configValueSource.definedAtFilePath);
-                    (0, utils_js_1.assertUsage)(!configDef.cumulative, `${configDefinedAt} cannot be defined over an aliased import`);
-                }
+            if (pointerImport.fileExportValueLoaded) {
+                configValueSource.value = pointerImport.fileExportValue;
+                (0, utils_js_1.assert)('fileExportValue' in pointerImport);
             }
             return configValueSource;
         }
@@ -665,7 +618,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 configEnvResolved = resolveConfigEnv(configDef.env, interfaceFile.filePath);
         const valueAlreadyLoaded = confVal.configValueLoaded;
         (0, utils_js_1.assert)(valueAlreadyLoaded === !!configEnvResolved.config);
         const configValueSource = {
@@ -689,6 +642,25 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
     }
     (0, utils_js_1.assert)(false);
 }
+function makeOrderDeterministic(interfaceFile1, interfaceFile2) {
+    return (0, utils_js_1.lowerFirst)((interfaceFile) => {
+        const { filePathAbsoluteUserRootDir } = interfaceFile.filePath;
+        (0, utils_js_1.assert)(isInterfaceFileUserLand(interfaceFile));
+        (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
+        return filePathAbsoluteUserRootDir.length;
+    })(interfaceFile1, interfaceFile2);
+}
+function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden, configName) {
+    interfaceFilesOverriden.forEach((interfaceFileLoser) => {
+        const loserFilePath = interfaceFileLoser.filePath.filePathToShowToUser;
+        const winnerFilePath = interfaceFileWinner.filePath.filePathToShowToUser;
+        const confName = picocolors_1.default.cyan(configName);
+        (0, utils_js_1.assertWarning)(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
+    });
+}
+function isInterfaceFileUserLand(interfaceFile) {
+    return (interfaceFile.isConfigFile && !interfaceFile.isConfigExtension) || interfaceFile.isValueFile;
+}
 function isDefiningPage(interfaceFiles) {
     for (const interfaceFile of interfaceFiles) {
         const configNames = getDefiningConfigNames(interfaceFile);
@@ -706,14 +678,15 @@ function getDefiningConfigNames(interfaceFile) {
     if (interfaceFile.isValueFile) {
         configNames.push(interfaceFile.configName);
     }
-    if (interfaceFile.isValueLoaded) {
+    if (interfaceFile.isValueFileLoaded) {
         configNames.push(...Object.keys(interfaceFile.fileExportsByConfigName));
     }
     configNames = (0, utils_js_1.unique)(configNames);
     return configNames;
 }
-function getConfigDefinitions(interfaceFilesRelevant) {
-    const configDefinitionsMerged = { ...configDefinitionsBuiltIn };
+function getConfigDefinitions(interfaceFilesRelevant, filter) {
+    let configDefinitions = { ...configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInAll };
+    // Add user-land meta configs
     Object.entries(interfaceFilesRelevant)
         .reverse()
         .forEach(([_locationId, interfaceFiles]) => {
@@ -734,16 +707,18 @@ function getConfigDefinitions(interfaceFilesRelevant) {
                     fileExportPathToShowToUser: ['default', 'meta', configName, 'effect']
                 };
             });
-            (0, utils_js_1.objectEntries)(meta).forEach(([configName, configDefinition]) => {
+            (0, utils_js_1.objectEntries)(meta).forEach(([configName, configDefinitionUserLand]) => {
                 // User can override an existing config definition
-                configDefinitionsMerged[configName] = {
-                    ...configDefinitionsMerged[configName],
-                    ...configDefinition
+                configDefinitions[configName] = {
+                    ...configDefinitions[configName],
+                    ...configDefinitionUserLand
                 };
             });
         });
     });
-    const configDefinitions = configDefinitionsMerged;
+    if (filter) {
+        configDefinitions = Object.fromEntries(Object.entries(configDefinitions).filter(([_configName, configDef]) => filter(configDef)));
+    }
     return configDefinitions;
 }
 function assertMetaUsage(metaVal, metaConfigDefinedAt) {
@@ -897,10 +872,35 @@ function assertNoUnexpectedPlusSign(filePath: string, fileName: string) {
   )
 }
 */
-function handleUnknownConfig(configName, configNames, filePathToShowToUser) {
+// Show error message upon unknown config
+function assertKnownConfigs(interfaceFilesAll) {
+    const configDefinitionsAll = getConfigDefinitions(interfaceFilesAll);
+    const configNamesKnownAll = Object.keys(configDefinitionsAll);
+    (0, utils_js_1.objectEntries)(interfaceFilesAll).forEach(([locationId, interfaceFiles]) => {
+        const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesAll, locationId);
+        const configDefinitionsLocal = getConfigDefinitions(interfaceFilesRelevant);
+        const configNamesKnownLocal = Object.keys(configDefinitionsLocal);
+        interfaceFiles.forEach((interfaceFile) => {
+            const configNames = getDefiningConfigNames(interfaceFile);
+            configNames.forEach((configName) => {
+                assertKnownConfig(configName, configNamesKnownAll, configNamesKnownLocal, interfaceFile);
+                (0, utils_js_1.assert)(configNamesKnownLocal.includes(configName));
+                (0, utils_js_1.assert)(configNamesKnownAll.includes(configName));
+            });
+        });
+    });
+}
+function assertKnownConfig(configName, configNamesKnownAll, configNamesKnownLocal, interfaceFile) {
+    if (configNamesKnownLocal.includes(configName))
+        return;
     const configNameColored = picocolors_1.default.cyan(configName);
-    let errMsg = `${filePathToShowToUser} sets an unknown config ${configNameColored}.`;
-    // vike-{react,vue,solid} hint
+    const { locationId, filePath: { filePathToShowToUser } } = interfaceFile;
+    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')}`);
+    }
+    // Missing vike-{react,vue,solid} installation
     {
         const ui = ['vike-react', 'vike-vue', 'vike-solid'];
         const knownVikeExntensionConfigs = {
@@ -915,15 +915,11 @@ function handleUnknownConfig(configName, configNames, filePathToShowToUser) {
             Wrapper: ui
         };
         if (configName in knownVikeExntensionConfigs) {
-            const requiredVikeExtension = knownVikeExntensionConfigs[configName];
-            (0, utils_js_1.assertUsage)(false, [
-                errMsg,
-                `If you want to use the configuration documented at https://vike.dev/${configName} then make sure to install the Vike extension ${requiredVikeExtension
-                    .map((e) => picocolors_1.default.bold(e))
-                    .join('/')}.`,
-                `Also make sure it applies to ${filePathToShowToUser} (see https://vike.dev/extends#inheritance).`,
-                `Alternatively, if you don't want to use the aforementioned Vike extension, define it yourself by using ${picocolors_1.default.cyan('meta')} (https://vike.dev/meta).`
-            ].join(' '));
+            const requiredVikeExtension = knownVikeExntensionConfigs[configName]
+                .map((e) => picocolors_1.default.bold(e))
+                .join('/');
+            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);
         }
     }
     // Similarity hint
@@ -932,18 +928,15 @@ function handleUnknownConfig(configName, configNames, filePathToShowToUser) {
         configNameSimilar = 'Page';
     }
     else {
-        configNameSimilar = (0, utils_js_1.getMostSimilar)(configName, configNames);
+        configNameSimilar = (0, utils_js_1.getMostSimilar)(configName, configNamesKnownAll);
     }
     if (configNameSimilar) {
         (0, utils_js_1.assert)(configNameSimilar !== configName);
-        errMsg += ` Did you mean to set ${picocolors_1.default.cyan(configNameSimilar)} instead?`;
+        let errMsgEnhanced = `${errMsg}. Did you mean ${picocolors_1.default.cyan(configNameSimilar)} instead?`;
         if (configName === 'page') {
-            errMsg += ` (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.)`;
+            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.)`;
         }
-    }
-    // `meta` hint
-    if (!configNameSimilar) {
-        errMsg += ` Make sure to define ${configNameColored} by using ${picocolors_1.default.cyan('meta')} (https://vike.dev/meta), and also make sure the meta configuration applies to ${filePathToShowToUser} (see https://vike.dev/config#inheritance).`;
+        (0, utils_js_1.assertUsage)(false, errMsgEnhanced);
     }
     (0, utils_js_1.assertUsage)(false, errMsg);
 }
@@ -1030,53 +1023,9 @@ function getConfigEnvValue(val, errMsgIntro) {
     */
     return val;
 }
-function getConfigDefinition(configDefinitions, configName, filePathToShowToUser) {
-    const configDef = configDefinitions[configName];
-    assertConfigExists(configName, Object.keys(configDefinitions), filePathToShowToUser);
-    (0, utils_js_1.assert)(configDef);
-    return configDef;
-}
 function getConfigDefinitionOptional(configDefinitions, configName) {
     return configDefinitions[configName] ?? null;
 }
-function shouldBeLoadableAtBuildTime(configDef) {
-    return !!configDef.env.config && !configDef._valueIsFilePath;
-}
-// 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, 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);
-}
-function getConfigDefinitionsBuiltInGlobal() {
-    return (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInAll).filter(([_configName, configDef]) => configDef.global !== undefined));
-}
-function getConfigDefinitionsBuiltIn() {
-    return (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInAll).filter(([_configName, configDef]) => configDef.global !== true));
-}
-function assertConfigExists(configName, configNamesRelevant, filePathToShowToUser) {
-    const configNames = [...configNamesRelevant, ...getConfigNamesGlobal()];
-    if (configNames.includes(configName))
-        return;
-    handleUnknownConfig(configName, configNames, filePathToShowToUser);
-    (0, utils_js_1.assert)(false);
-}
 function sortConfigValueSources(configValueSources, locationIdPage) {
     return Object.fromEntries(Object.entries(configValueSources)
         // Make order deterministic (no other purpose)
@@ -1097,8 +1046,27 @@ function getConfVal(interfaceFile, configName) {
     const configNames = getDefiningConfigNames(interfaceFile);
     if (!configNames.includes(configName))
         return null;
-    if (!interfaceFile.isValueLoaded)
+    if (!interfaceFile.isValueFileLoaded)
         return { configValueLoaded: false };
     const confVal = { configValue: interfaceFile.fileExportsByConfigName[configName], configValueLoaded: true };
     return confVal;
 }
+function resolveConfigEnv(configEnv, filePath) {
+    const configEnvResolved = { ...configEnv };
+    if (filePath.filePathAbsoluteFilesystem) {
+        const { fileName } = filePath;
+        if (fileName.includes('.server.')) {
+            configEnvResolved.server = true;
+            configEnvResolved.client = false;
+        }
+        else if (fileName.includes('.client.')) {
+            configEnvResolved.client = true;
+            configEnvResolved.server = false;
+        }
+        else if (fileName.includes('.shared.')) {
+            configEnvResolved.server = true;
+            configEnvResolved.client = true;
+        }
+    }
+    return configEnvResolved;
+}