vike 0.4.223-commit-32cd543 → 0.4.223-commit-81afe1f

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

@@ -46,9 +46,9 @@ async function getPageDeps(config, pageConfigs) {
     // V1 design
     {
         pageConfigs.forEach((pageConfig) => {
-            Object.values(pageConfig.configValueSources).forEach((sources) => {
+            Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
                 sources
-                    .filter((c) => !c.isOverriden)
+                    .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
                     .forEach((configValueSource) => {
                     if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;

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

@@ -34,7 +34,7 @@ function assertExtensionName(plusFile) {
     (0, utils_js_1.assertUsage)(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${picocolors_1.default.cyan('name')}`);
 }
 function assertExtensionsRequire(pageConfig) {
-    const plusFilesRelevantList = Object.values(pageConfig.plusFiles).flat(1);
+    const plusFilesRelevantList = pageConfig.plusFiles;
     // Collect extensions
     const extensions = {};
     plusFilesRelevantList.forEach((plusFile) => {

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

@@ -10,6 +10,7 @@ exports.reloadVikeConfig = reloadVikeConfig;
 exports.isV1Design = isV1Design;
 exports.getConfVal = getConfVal;
 exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
+exports.isOverriden = isOverriden;
 const utils_js_1 = require("../../../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./getVikeConfig/filesystemRouting.js");
@@ -161,14 +162,23 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
-    const configDefinitionsGlobal = getConfigDefinitions(sortAfterInheritanceOrderGlobal(plusFilesAll), (configDef) => !!configDef.global);
+    const plusFilesAllOrdered = Object.values(plusFilesAll)
+        .flat()
+        .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, plusFilesAll, null));
+    const configDefinitionsGlobal = getConfigDefinitions(
+    // We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+    plusFilesAllOrdered, (configDef) => !!configDef.global);
     await loadCustomConfigBuildTimeFiles(plusFilesAll, configDefinitionsGlobal, userRootDir, esbuildCache);
     const configDefinitionsLocal = {};
-    await Promise.all((0, utils_js_1.objectEntries)(plusFilesAll).map(async ([locationId, plusFiles]) => {
-        const plusFilesRelevant = getPlusFilesRelevant(plusFilesAll, locationId);
+    await Promise.all((0, utils_js_1.objectEntries)(plusFilesAll).map(async ([locationIdPage, plusFiles]) => {
+        const plusFilesRelevant = (0, utils_js_1.objectEntries)(plusFilesAll)
+            .filter(([locationId]) => (0, filesystemRouting_js_1.isInherited)(locationId, locationIdPage))
+            .map(([, plusFiles]) => plusFiles)
+            .flat()
+            .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderPage(plusFile1, plusFile2, locationIdPage, null));
         const configDefinitions = getConfigDefinitions(plusFilesRelevant, (configDef) => configDef.global !== true);
         await loadCustomConfigBuildTimeFiles(plusFiles, configDefinitions, userRootDir, esbuildCache);
-        configDefinitionsLocal[locationId] = { configDefinitions, plusFiles, plusFilesRelevant };
+        configDefinitionsLocal[locationIdPage] = { configDefinitions, plusFiles, plusFilesRelevant };
     }));
     const configDefinitionsResolved = {
         configDefinitionsGlobal,
@@ -197,13 +207,16 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
         configValueSources: {}
     };
     (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsGlobal).forEach(([configName, configDef]) => {
-        const sources = resolveConfigValueSources(configName, configDef, sortAfterInheritanceOrderGlobal(plusFilesAll), userRootDir, true);
+        const sources = resolveConfigValueSources(configName, configDef, 
+        // We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+        Object.values(plusFilesAll).flat(), userRootDir, true);
         if (sources.length === 0)
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
     });
     applyEffectsMetaEnv(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
     applyEffectsConfVal(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
+    sortConfigValueSources(pageConfigGlobal.configValueSources, null);
     assertPageConfigGlobal(pageConfigGlobal, plusFilesAll);
     const pageConfigs = (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal)
         .filter(([_locationId, { plusFiles }]) => isDefiningPage(plusFiles))
@@ -214,7 +227,6 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             .filter(([_configName, configDef]) => configDef.global !== true)
             .forEach(([configName, configDef]) => {
             const sources = resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, false);
-            // sortConfigValueSources(sources, locationId)
             if (sources.length === 0)
                 return;
             configValueSources[configName] = sources;
@@ -222,6 +234,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
         const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsMetaEnv(configValueSources, configDefinitionsLocal);
         applyEffectsConfVal(configValueSources, configDefinitionsLocal);
+        sortConfigValueSources(configValueSources, locationId);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
@@ -358,37 +371,108 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
             },
             locationId: '/',
             plusFile: null,
-            isOverriden: configDef.cumulative ? false : sources.length > 0,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false
         });
     });
 }
-// Together with getPlusFilesOrdered() this implements the whole config inheritance ordering for non-global configs. See sortAfterInheritanceOrderGlobal() for global configs.
-function getPlusFilesRelevant(plusFilesAll, locationIdPage) {
-    const plusFilesRelevant = Object.fromEntries((0, utils_js_1.objectEntries)(plusFilesAll)
-        .filter(([locationId]) => {
-        return (0, filesystemRouting_js_1.isInherited)(locationId, locationIdPage);
-    })
-        .sort(([locationId1], [locationId2]) => (0, filesystemRouting_js_1.sortAfterInheritanceOrder)(locationId1, locationId2, locationIdPage)));
-    return plusFilesRelevant;
-}
-// This implements the whole config inheritance ordering for global configs.
-// We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
-function sortAfterInheritanceOrderGlobal(plusFilesAll) {
-    const plusFilesAllSorted = Object.fromEntries((0, utils_js_1.objectEntries)(plusFilesAll)
-        .sort((0, utils_js_1.lowerFirst)(([locationId]) => locationId.split('/').length))
-        .sort((0, utils_js_1.makeFirst)(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
-    return plusFilesAllSorted;
+function sortConfigValueSources(configValueSources, locationIdPage) {
+    Object.entries(configValueSources).forEach(([configName, sources]) => {
+        sources
+            .sort((source1, source2) => {
+            if (!source1.plusFile || !source2.plusFile)
+                return 0;
+            const isGlobal = !locationIdPage;
+            if (isGlobal) {
+                return sortAfterInheritanceOrderGlobal(source1.plusFile, source2.plusFile, null, configName);
+            }
+            else {
+                return sortAfterInheritanceOrderPage(source1.plusFile, source2.plusFile, locationIdPage, configName);
+            }
+        })
+            // TODO/next-major: remove
+            // Interop with vike(options) in vite.config.js — make it least precedence.
+            .sort((0, utils_js_1.makeLast)((source) => !source.plusFile));
+    });
+}
+function sortAfterInheritanceOrderPage(plusFile1, plusFile2, locationIdPage, configName) {
+    {
+        const ret = (0, filesystemRouting_js_1.sortAfterInheritanceOrder)(plusFile1.locationId, plusFile2.locationId, locationIdPage);
+        if (ret !== 0)
+            return ret;
+        (0, utils_js_1.assert)(plusFile1.locationId === plusFile2.locationId);
+    }
+    if (configName) {
+        const ret = sortPlusFilesSameLocationId(plusFile1, plusFile2, configName);
+        if (ret !== 0)
+            return ret;
+    }
+    return 0;
+}
+function sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, plusFilesAll, configName) {
+    if (plusFilesAll) {
+        const ret = (0, utils_js_1.makeFirst)((plusFile) => isGlobalLocation(plusFile.locationId, plusFilesAll))(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    {
+        const ret = (0, utils_js_1.lowerFirst)((plusFile) => plusFile.locationId.split('/').length)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    if (plusFile1.locationId !== plusFile2.locationId) {
+        // Same as `sort()` in `['some', 'string', 'array'].sort()`
+        return plusFile1.locationId > plusFile2.locationId ? 1 : -1;
+    }
+    if (configName) {
+        (0, utils_js_1.assert)(plusFile1.locationId === plusFile2.locationId);
+        const ret = sortPlusFilesSameLocationId(plusFile1, plusFile2, configName);
+        if (ret !== 0)
+            return ret;
+    }
+    return 0;
+}
+function sortPlusFilesSameLocationId(plusFile1, plusFile2, configName) {
+    (0, utils_js_1.assert)(plusFile1.locationId === plusFile2.locationId);
+    (0, utils_js_1.assert)(isDefiningConfig(plusFile1, configName));
+    (0, utils_js_1.assert)(isDefiningConfig(plusFile2, configName));
+    // Config set by extensions (lowest precedence)
+    {
+        const ret = (0, utils_js_1.makeLast)((plusFile) => !!plusFile.isExtensionConfig)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    // Config set by side-export (lower precedence)
+    {
+        // - For example `export { frontmatter }` of `.mdx` files.
+        // - This only considers side-export configs that are already loaded at build-time. (E.g. it actually doesn't consider `export { frontmatter }` of .mdx files since .mdx files are loaded only at runtime.)
+        const ret = (0, utils_js_1.makeLast)((plusFile) => !plusFile.isConfigFile &&
+            // Is side-export
+            plusFile.configName !== configName)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    // Config set by +config.js
+    {
+        const ret = (0, utils_js_1.makeLast)((plusFile) => plusFile.isConfigFile)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    // Config set by +{configName}.js (highest precedence)
+    // No need to make it deterministic: the overall order is arleady deterministic, see sortMakeDeterministic() at getPlusFilesAll()
+    return 0;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
-    const plusFilesOrdered = getPlusFilesOrdered(configName, plusFilesRelevant);
-    let sources = plusFilesOrdered.map((plusFile, i) => {
-        const isHighestInheritancePrecedence = i === 0;
-        const configValueSource = getConfigValueSource(configName, plusFile, configDef, userRootDir, isHighestInheritancePrecedence);
-        return configValueSource;
-    });
-    if ((0, utils_js_1.isCallable)(configDef.global)) {
+    let sources = plusFilesRelevant
+        .filter((plusFile) => isDefiningConfig(plusFile, configName))
+        .map((plusFile) => getConfigValueSource(configName, plusFile, configDef, userRootDir));
+    // Filter hydrid global-local configs
+    if (!(0, utils_js_1.isCallable)(configDef.global)) {
+        // Already filtered
+        (0, utils_js_1.assert)((configDef.global ?? false) === isGlobal);
+    }
+    else {
+        // We cannot filter earlier
         (0, utils_js_1.assert)(configDef.env.config);
         sources = sources.filter((source) => {
             (0, utils_js_1.assert)(source.configEnv.config);
@@ -399,67 +483,10 @@ function resolveConfigValueSources(configName, configDef, plusFilesRelevant, use
     }
     return sources;
 }
-// Together with getPlusFilesRelevant() this implements the whole config inheritance ordering.
-function getPlusFilesOrdered(configName, plusFilesRelevant) {
-    const plusFilesOrdered = [];
-    // `plusFilesRelevant` is already deterministic, see sortMakeDeterministic() at getPlusFilesAll()
-    for (const plusFilesAtLocationId of Object.values(plusFilesRelevant)) {
-        const plusFilesForConfigName = plusFilesAtLocationId.filter((plusFile) => getDefiningConfigNames(plusFile).includes(configName));
-        // We populate `plusFilesOrdered` with inheritance order.
-        const populate = (plusFile) => {
-            (0, utils_js_1.assert)(!visited.has(plusFile));
-            visited.add(plusFile);
-            plusFilesOrdered.push(plusFile);
-        };
-        const visited = new WeakSet();
-        // ========================
-        // User-land config (first)
-        // ========================
-        {
-            const plusFilesValue = plusFilesForConfigName.filter((plusFile) => !plusFile.isConfigFile &&
-                // We consider side-effect configs (e.g. `export { frontmatter }` of .mdx files) later (i.e. with less priority)
-                plusFile.configName === configName);
-            const plusFilesConfig = plusFilesForConfigName.filter((plusFile) => plusFile.isConfigFile &&
-                // We consider extensions (e.g. vike-react) later (i.e. with less priority)
-                !plusFile.isExtensionConfig);
-            [...plusFilesValue, ...plusFilesConfig].forEach((plusFile) => {
-                (0, utils_js_1.assert)(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-                populate(plusFile);
-            });
-        }
-        // ==========================
-        // Side-effect configs (next)
-        // ==========================
-        // - For example `export { frontmatter }` of `.mdx` files.
-        // - This only considers side-effect configs that are already loaded at build-time. (E.g. it actually doesn't consider `export { frontmatter }` of .mdx files since .mdx files are loaded only at runtime.)
-        plusFilesForConfigName
-            .filter((plusFile) => !plusFile.isConfigFile &&
-            // Is side-effect config
-            plusFile.configName !== configName)
-            .forEach((plusFile) => {
-            (0, utils_js_1.assert)(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-            populate(plusFile);
-        });
-        // ========================
-        // Extensions config (last)
-        // ========================
-        plusFilesForConfigName
-            .filter((plusFile) => plusFile.isConfigFile && plusFile.isExtensionConfig)
-            // Extension config files are already sorted by inheritance order
-            .forEach((plusFile) => {
-            (0, utils_js_1.assert)(!plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it isn't a user-land plus file
-            populate(plusFile);
-        });
-        // ======
-        // Assert we didn't miss any config.
-        // ======
-        plusFilesForConfigName.forEach((plusFile) => {
-            (0, utils_js_1.assert)(visited.has(plusFile));
-        });
-    }
-    return plusFilesOrdered;
+function isDefiningConfig(plusFile, configName) {
+    return getDefiningConfigNames(plusFile).includes(configName);
 }
-function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHighestInheritancePrecedence) {
+function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
     const confVal = getConfVal(plusFile, configName);
     (0, utils_js_1.assert)(confVal);
     const configValueSourceCommon = {
@@ -470,7 +497,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
         ...plusFile.filePath,
         fileExportPathToShowToUser: ['default', configName]
     };
-    const isOverriden = configDef.cumulative ? false : !isHighestInheritancePrecedence;
     // +client.js
     if (configDef._valueIsFilePath) {
         let definedAtFilePath;
@@ -501,7 +527,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            isOverriden,
             definedAtFilePath
         };
         return configValueSource;
@@ -526,7 +551,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
                 configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
                 valueIsLoadedWithImport: true,
                 valueIsDefinedByPlusValueFile: false,
-                isOverriden,
                 definedAtFilePath: pointerImport.fileExportPath
             };
             return configValueSource;
@@ -539,7 +563,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            isOverriden,
             definedAtFilePath: definedAtFilePath_
         };
         return configValueSource;
@@ -554,7 +577,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
             configEnv: configEnvResolved,
             valueIsLoadedWithImport: !confVal.valueIsLoaded || !(0, serializeConfigValues_js_1.isJsonValue)(confVal.value),
             valueIsDefinedByPlusValueFile: true,
-            isOverriden,
             definedAtFilePath: {
                 ...plusFile.filePath,
                 fileExportPathToShowToUser: configName === plusFile.configName
@@ -602,33 +624,32 @@ function getDefiningConfigNames(plusFile) {
 function getConfigDefinitions(plusFilesRelevant, filter) {
     let configDefinitions = { ...configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn };
     // Add user-land meta configs
-    Object.entries(plusFilesRelevant)
+    plusFilesRelevant
+        .slice()
         .reverse()
-        .forEach(([_locationId, plusFiles]) => {
-        plusFiles.forEach((plusFile) => {
-            const confVal = getConfVal(plusFile, 'meta');
-            if (!confVal)
+        .forEach((plusFile) => {
+        const confVal = getConfVal(plusFile, 'meta');
+        if (!confVal)
+            return;
+        (0, utils_js_1.assert)(confVal.valueIsLoaded);
+        const meta = confVal.value;
+        assertMetaUsage(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${plusFile.filePath.filePathToShowToUser}`);
+        // Set configDef._userEffectDefinedAtFilePath
+        Object.entries(meta).forEach(([configName, configDef]) => {
+            if (!configDef.effect)
                 return;
-            (0, utils_js_1.assert)(confVal.valueIsLoaded);
-            const meta = confVal.value;
-            assertMetaUsage(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${plusFile.filePath.filePathToShowToUser}`);
-            // Set configDef._userEffectDefinedAtFilePath
-            Object.entries(meta).forEach(([configName, configDef]) => {
-                if (!configDef.effect)
-                    return;
-                (0, utils_js_1.assert)(plusFile.isConfigFile);
-                configDef._userEffectDefinedAtFilePath = {
-                    ...plusFile.filePath,
-                    fileExportPathToShowToUser: ['default', 'meta', configName, 'effect']
-                };
-            });
-            (0, utils_js_1.objectEntries)(meta).forEach(([configName, configDefinitionUserLand]) => {
-                // User can override an existing config definition
-                configDefinitions[configName] = {
-                    ...configDefinitions[configName],
-                    ...configDefinitionUserLand
-                };
-            });
+            (0, utils_js_1.assert)(plusFile.isConfigFile);
+            configDef._userEffectDefinedAtFilePath = {
+                ...plusFile.filePath,
+                fileExportPathToShowToUser: ['default', 'meta', configName, 'effect']
+            };
+        });
+        (0, utils_js_1.objectEntries)(meta).forEach(([configName, configDefinitionUserLand]) => {
+            // User can override an existing config definition
+            configDefinitions[configName] = {
+                ...configDefinitions[configName],
+                ...configDefinitionUserLand
+            };
         });
     });
     if (filter) {
@@ -728,7 +749,6 @@ function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSource
             plusFile: sourceEffect.plusFile,
             locationId: sourceEffect.locationId,
             configEnv: configDef.env,
-            isOverriden: false, // TODO/now check
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
             valueIsLoaded: true,
@@ -788,7 +808,7 @@ function getComputed(configValueSources, configDefinitions) {
 }
 // Show error message upon unknown config
 function assertKnownConfigs(configDefinitionsResolved, plusFilesAll) {
-    const configDefinitionsAll = getConfigDefinitions(plusFilesAll);
+    const configDefinitionsAll = getConfigDefinitions(Object.values(plusFilesAll).flat());
     const configNamesKnownAll = Object.keys(configDefinitionsAll);
     const configNamesGlobal = Object.keys(configDefinitionsResolved.configDefinitionsGlobal);
     (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal).forEach(([_locationId, { configDefinitions, plusFiles }]) => {
@@ -972,3 +992,14 @@ function isGlobalLocation(locationId, plusFilesAll) {
         .map(([locationId]) => locationId);
     return locationIdsPage.every((locId) => (0, filesystemRouting_js_1.isInherited)(locationId, locId));
 }
+function isOverriden(source, configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    if (configDef.cumulative)
+        return false;
+    const sources = pageConfig.configValueSources[configName];
+    (0, utils_js_1.assert)(sources);
+    const idx = sources.indexOf(source);
+    (0, utils_js_1.assert)(idx >= 0);
+    return idx > 0;
+}

package/dist/cjs/shared/page-configs/getConfigValueBuildTime.js

@@ -29,8 +29,6 @@ function getConfigValue(pageConfig, configName) {
     if (!configDef.cumulative) {
         const configValueSource = sources[0];
         (0, utils_js_1.assert)(configValueSource);
-        (0, utils_js_1.assert)(configValueSource.isOverriden === false);
-        (0, utils_js_1.assert)(sources.slice(1).every((s) => s.isOverriden === true));
         (0, utils_js_1.assert)(configValueSource.valueIsLoaded);
         return {
             type: 'standard',
@@ -52,7 +50,6 @@ function mergeCumulative(configValueSources) {
     const value = [];
     const definedAtData = [];
     configValueSources.forEach((configValueSource) => {
-        (0, utils_js_1.assert)(configValueSource.isOverriden === false);
         (0, utils_js_1.assert)(configValueSource.configEnv.config === true);
         (0, utils_js_1.assert)(configValueSource.valueIsLoaded);
         value.push(configValueSource.value);

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -12,6 +12,7 @@ const transformPointerImports_js_1 = require("../../../node/plugin/plugins/impor
 const helpers_js_1 = require("../helpers.js");
 const stringify_1 = require("@brillout/json-serializer/stringify");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const getVikeConfig_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
@@ -49,7 +50,6 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatc
     return lines;
 }
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
-    (0, utils_js_1.assert)(configValueSource.isOverriden === false);
     let valueData;
     if (configValueSource.valueIsLoaded && !configValueSource.valueIsLoadedWithImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
@@ -201,7 +201,6 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
         if (!configDef.cumulative) {
             const source = sources[0];
             (0, utils_js_1.assert)(source);
-            (0, utils_js_1.assert)(sources.slice(1).every((s) => s.isOverriden === true));
             if (!isEnvMatch(source.configEnv))
                 return 'SKIP';
             const definedAtFile = getDefinedAtFileSource(source);
@@ -212,7 +211,9 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             return { configValueBase, sourceRelevant: source, configName };
         }
         else {
-            const sourcesRelevant = sources.filter((source) => !source.isOverriden && isEnvMatch(source.configEnv));
+            const sourcesRelevant = sources
+                .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
+                .filter((source) => isEnvMatch(source.configEnv));
             if (sourcesRelevant.length === 0)
                 return 'SKIP';
             const definedAtData = [];

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.223-commit-32cd543';
+exports.PROJECT_VERSION = '0.4.223-commit-81afe1f';

package/dist/cjs/utils/sorter.js

@@ -6,9 +6,6 @@ exports.makeFirst = makeFirst;
 exports.makeLast = makeLast;
 exports.reverse = reverse;
 const assert_js_1 = require("./assert.js");
-// -1 => element1 first (i.e. `indexOf(element1) < indexOf(element2)`)
-// +1 => element2 first (i.e. `indexOf(element2) < indexOf(element1)`)
-// 0 => keep original order of element1 and element2
 /**
  * ```js
  * let arr = [

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

@@ -1,7 +1,7 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { assert, assertIsNpmPackageImport, createDebugger, isArray, unique } from '../../utils.js';
-import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfig, isOverriden } from '../importUserCode/v1-design/getVikeConfig.js';
 import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
@@ -44,9 +44,9 @@ async function getPageDeps(config, pageConfigs) {
     // V1 design
     {
         pageConfigs.forEach((pageConfig) => {
-            Object.values(pageConfig.configValueSources).forEach((sources) => {
+            Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
                 sources
-                    .filter((c) => !c.isOverriden)
+                    .filter((source) => !isOverriden(source, configName, pageConfig))
                     .forEach((configValueSource) => {
                     if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;

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

@@ -29,7 +29,7 @@ function assertExtensionName(plusFile) {
     assertUsage(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${pc.cyan('name')}`);
 }
 function assertExtensionsRequire(pageConfig) {
-    const plusFilesRelevantList = Object.values(pageConfig.plusFiles).flat(1);
+    const plusFilesRelevantList = pageConfig.plusFiles;
     // Collect extensions
     const extensions = {};
     plusFilesRelevantList.forEach((plusFile) => {

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

@@ -5,8 +5,9 @@ export { vikeConfigDependencies };
 export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
+export { isOverriden };
 export type { VikeConfigObject };
-import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
+import type { PageConfigGlobalBuildTime, ConfigValueSource, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
 import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
@@ -31,3 +32,4 @@ declare function getConfVal(plusFile: PlusFile, configName: string): null | {
 } | {
     valueIsLoaded: false;
 };
+declare function isOverriden(source: ConfigValueSource, configName: string, pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime): boolean;

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

@@ -5,7 +5,8 @@ export { vikeConfigDependencies };
 export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
-import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst } from '../../../utils.js';
+export { isOverriden };
+import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast } from '../../../utils.js';
 import { configDefinitionsBuiltIn } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
 import { isVikeConfigInvalid, isVikeConfigInvalid_set } from '../../../../runtime/renderPage/isVikeConfigInvalid.js';
@@ -155,14 +156,23 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
-    const configDefinitionsGlobal = getConfigDefinitions(sortAfterInheritanceOrderGlobal(plusFilesAll), (configDef) => !!configDef.global);
+    const plusFilesAllOrdered = Object.values(plusFilesAll)
+        .flat()
+        .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, plusFilesAll, null));
+    const configDefinitionsGlobal = getConfigDefinitions(
+    // We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+    plusFilesAllOrdered, (configDef) => !!configDef.global);
     await loadCustomConfigBuildTimeFiles(plusFilesAll, configDefinitionsGlobal, userRootDir, esbuildCache);
     const configDefinitionsLocal = {};
-    await Promise.all(objectEntries(plusFilesAll).map(async ([locationId, plusFiles]) => {
-        const plusFilesRelevant = getPlusFilesRelevant(plusFilesAll, locationId);
+    await Promise.all(objectEntries(plusFilesAll).map(async ([locationIdPage, plusFiles]) => {
+        const plusFilesRelevant = objectEntries(plusFilesAll)
+            .filter(([locationId]) => isInherited(locationId, locationIdPage))
+            .map(([, plusFiles]) => plusFiles)
+            .flat()
+            .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderPage(plusFile1, plusFile2, locationIdPage, null));
         const configDefinitions = getConfigDefinitions(plusFilesRelevant, (configDef) => configDef.global !== true);
         await loadCustomConfigBuildTimeFiles(plusFiles, configDefinitions, userRootDir, esbuildCache);
-        configDefinitionsLocal[locationId] = { configDefinitions, plusFiles, plusFilesRelevant };
+        configDefinitionsLocal[locationIdPage] = { configDefinitions, plusFiles, plusFilesRelevant };
     }));
     const configDefinitionsResolved = {
         configDefinitionsGlobal,
@@ -191,13 +201,16 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
         configValueSources: {}
     };
     objectEntries(configDefinitionsResolved.configDefinitionsGlobal).forEach(([configName, configDef]) => {
-        const sources = resolveConfigValueSources(configName, configDef, sortAfterInheritanceOrderGlobal(plusFilesAll), userRootDir, true);
+        const sources = resolveConfigValueSources(configName, configDef, 
+        // We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+        Object.values(plusFilesAll).flat(), userRootDir, true);
         if (sources.length === 0)
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
     });
     applyEffectsMetaEnv(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
     applyEffectsConfVal(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
+    sortConfigValueSources(pageConfigGlobal.configValueSources, null);
     assertPageConfigGlobal(pageConfigGlobal, plusFilesAll);
     const pageConfigs = objectEntries(configDefinitionsResolved.configDefinitionsLocal)
         .filter(([_locationId, { plusFiles }]) => isDefiningPage(plusFiles))
@@ -208,7 +221,6 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             .filter(([_configName, configDef]) => configDef.global !== true)
             .forEach(([configName, configDef]) => {
             const sources = resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, false);
-            // sortConfigValueSources(sources, locationId)
             if (sources.length === 0)
                 return;
             configValueSources[configName] = sources;
@@ -216,6 +228,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
         const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsMetaEnv(configValueSources, configDefinitionsLocal);
         applyEffectsConfVal(configValueSources, configDefinitionsLocal);
+        sortConfigValueSources(configValueSources, locationId);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
@@ -352,37 +365,108 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
             },
             locationId: '/',
             plusFile: null,
-            isOverriden: configDef.cumulative ? false : sources.length > 0,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false
         });
     });
 }
-// Together with getPlusFilesOrdered() this implements the whole config inheritance ordering for non-global configs. See sortAfterInheritanceOrderGlobal() for global configs.
-function getPlusFilesRelevant(plusFilesAll, locationIdPage) {
-    const plusFilesRelevant = Object.fromEntries(objectEntries(plusFilesAll)
-        .filter(([locationId]) => {
-        return isInherited(locationId, locationIdPage);
-    })
-        .sort(([locationId1], [locationId2]) => sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage)));
-    return plusFilesRelevant;
-}
-// This implements the whole config inheritance ordering for global configs.
-// We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
-function sortAfterInheritanceOrderGlobal(plusFilesAll) {
-    const plusFilesAllSorted = Object.fromEntries(objectEntries(plusFilesAll)
-        .sort(lowerFirst(([locationId]) => locationId.split('/').length))
-        .sort(makeFirst(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
-    return plusFilesAllSorted;
+function sortConfigValueSources(configValueSources, locationIdPage) {
+    Object.entries(configValueSources).forEach(([configName, sources]) => {
+        sources
+            .sort((source1, source2) => {
+            if (!source1.plusFile || !source2.plusFile)
+                return 0;
+            const isGlobal = !locationIdPage;
+            if (isGlobal) {
+                return sortAfterInheritanceOrderGlobal(source1.plusFile, source2.plusFile, null, configName);
+            }
+            else {
+                return sortAfterInheritanceOrderPage(source1.plusFile, source2.plusFile, locationIdPage, configName);
+            }
+        })
+            // TODO/next-major: remove
+            // Interop with vike(options) in vite.config.js — make it least precedence.
+            .sort(makeLast((source) => !source.plusFile));
+    });
+}
+function sortAfterInheritanceOrderPage(plusFile1, plusFile2, locationIdPage, configName) {
+    {
+        const ret = sortAfterInheritanceOrder(plusFile1.locationId, plusFile2.locationId, locationIdPage);
+        if (ret !== 0)
+            return ret;
+        assert(plusFile1.locationId === plusFile2.locationId);
+    }
+    if (configName) {
+        const ret = sortPlusFilesSameLocationId(plusFile1, plusFile2, configName);
+        if (ret !== 0)
+            return ret;
+    }
+    return 0;
+}
+function sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, plusFilesAll, configName) {
+    if (plusFilesAll) {
+        const ret = makeFirst((plusFile) => isGlobalLocation(plusFile.locationId, plusFilesAll))(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    {
+        const ret = lowerFirst((plusFile) => plusFile.locationId.split('/').length)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    if (plusFile1.locationId !== plusFile2.locationId) {
+        // Same as `sort()` in `['some', 'string', 'array'].sort()`
+        return plusFile1.locationId > plusFile2.locationId ? 1 : -1;
+    }
+    if (configName) {
+        assert(plusFile1.locationId === plusFile2.locationId);
+        const ret = sortPlusFilesSameLocationId(plusFile1, plusFile2, configName);
+        if (ret !== 0)
+            return ret;
+    }
+    return 0;
+}
+function sortPlusFilesSameLocationId(plusFile1, plusFile2, configName) {
+    assert(plusFile1.locationId === plusFile2.locationId);
+    assert(isDefiningConfig(plusFile1, configName));
+    assert(isDefiningConfig(plusFile2, configName));
+    // Config set by extensions (lowest precedence)
+    {
+        const ret = makeLast((plusFile) => !!plusFile.isExtensionConfig)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    // Config set by side-export (lower precedence)
+    {
+        // - For example `export { frontmatter }` of `.mdx` files.
+        // - This only considers side-export configs that are already loaded at build-time. (E.g. it actually doesn't consider `export { frontmatter }` of .mdx files since .mdx files are loaded only at runtime.)
+        const ret = makeLast((plusFile) => !plusFile.isConfigFile &&
+            // Is side-export
+            plusFile.configName !== configName)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    // Config set by +config.js
+    {
+        const ret = makeLast((plusFile) => plusFile.isConfigFile)(plusFile1, plusFile2);
+        if (ret !== 0)
+            return ret;
+    }
+    // Config set by +{configName}.js (highest precedence)
+    // No need to make it deterministic: the overall order is arleady deterministic, see sortMakeDeterministic() at getPlusFilesAll()
+    return 0;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
-    const plusFilesOrdered = getPlusFilesOrdered(configName, plusFilesRelevant);
-    let sources = plusFilesOrdered.map((plusFile, i) => {
-        const isHighestInheritancePrecedence = i === 0;
-        const configValueSource = getConfigValueSource(configName, plusFile, configDef, userRootDir, isHighestInheritancePrecedence);
-        return configValueSource;
-    });
-    if (isCallable(configDef.global)) {
+    let sources = plusFilesRelevant
+        .filter((plusFile) => isDefiningConfig(plusFile, configName))
+        .map((plusFile) => getConfigValueSource(configName, plusFile, configDef, userRootDir));
+    // Filter hydrid global-local configs
+    if (!isCallable(configDef.global)) {
+        // Already filtered
+        assert((configDef.global ?? false) === isGlobal);
+    }
+    else {
+        // We cannot filter earlier
         assert(configDef.env.config);
         sources = sources.filter((source) => {
             assert(source.configEnv.config);
@@ -393,67 +477,10 @@ function resolveConfigValueSources(configName, configDef, plusFilesRelevant, use
     }
     return sources;
 }
-// Together with getPlusFilesRelevant() this implements the whole config inheritance ordering.
-function getPlusFilesOrdered(configName, plusFilesRelevant) {
-    const plusFilesOrdered = [];
-    // `plusFilesRelevant` is already deterministic, see sortMakeDeterministic() at getPlusFilesAll()
-    for (const plusFilesAtLocationId of Object.values(plusFilesRelevant)) {
-        const plusFilesForConfigName = plusFilesAtLocationId.filter((plusFile) => getDefiningConfigNames(plusFile).includes(configName));
-        // We populate `plusFilesOrdered` with inheritance order.
-        const populate = (plusFile) => {
-            assert(!visited.has(plusFile));
-            visited.add(plusFile);
-            plusFilesOrdered.push(plusFile);
-        };
-        const visited = new WeakSet();
-        // ========================
-        // User-land config (first)
-        // ========================
-        {
-            const plusFilesValue = plusFilesForConfigName.filter((plusFile) => !plusFile.isConfigFile &&
-                // We consider side-effect configs (e.g. `export { frontmatter }` of .mdx files) later (i.e. with less priority)
-                plusFile.configName === configName);
-            const plusFilesConfig = plusFilesForConfigName.filter((plusFile) => plusFile.isConfigFile &&
-                // We consider extensions (e.g. vike-react) later (i.e. with less priority)
-                !plusFile.isExtensionConfig);
-            [...plusFilesValue, ...plusFilesConfig].forEach((plusFile) => {
-                assert(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-                populate(plusFile);
-            });
-        }
-        // ==========================
-        // Side-effect configs (next)
-        // ==========================
-        // - For example `export { frontmatter }` of `.mdx` files.
-        // - This only considers side-effect configs that are already loaded at build-time. (E.g. it actually doesn't consider `export { frontmatter }` of .mdx files since .mdx files are loaded only at runtime.)
-        plusFilesForConfigName
-            .filter((plusFile) => !plusFile.isConfigFile &&
-            // Is side-effect config
-            plusFile.configName !== configName)
-            .forEach((plusFile) => {
-            assert(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-            populate(plusFile);
-        });
-        // ========================
-        // Extensions config (last)
-        // ========================
-        plusFilesForConfigName
-            .filter((plusFile) => plusFile.isConfigFile && plusFile.isExtensionConfig)
-            // Extension config files are already sorted by inheritance order
-            .forEach((plusFile) => {
-            assert(!plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it isn't a user-land plus file
-            populate(plusFile);
-        });
-        // ======
-        // Assert we didn't miss any config.
-        // ======
-        plusFilesForConfigName.forEach((plusFile) => {
-            assert(visited.has(plusFile));
-        });
-    }
-    return plusFilesOrdered;
+function isDefiningConfig(plusFile, configName) {
+    return getDefiningConfigNames(plusFile).includes(configName);
 }
-function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHighestInheritancePrecedence) {
+function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
     const confVal = getConfVal(plusFile, configName);
     assert(confVal);
     const configValueSourceCommon = {
@@ -464,7 +491,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
         ...plusFile.filePath,
         fileExportPathToShowToUser: ['default', configName]
     };
-    const isOverriden = configDef.cumulative ? false : !isHighestInheritancePrecedence;
     // +client.js
     if (configDef._valueIsFilePath) {
         let definedAtFilePath;
@@ -495,7 +521,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            isOverriden,
             definedAtFilePath
         };
         return configValueSource;
@@ -520,7 +545,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
                 configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
                 valueIsLoadedWithImport: true,
                 valueIsDefinedByPlusValueFile: false,
-                isOverriden,
                 definedAtFilePath: pointerImport.fileExportPath
             };
             return configValueSource;
@@ -533,7 +557,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
             configEnv: configDef.env,
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
-            isOverriden,
             definedAtFilePath: definedAtFilePath_
         };
         return configValueSource;
@@ -548,7 +571,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
             configEnv: configEnvResolved,
             valueIsLoadedWithImport: !confVal.valueIsLoaded || !isJsonValue(confVal.value),
             valueIsDefinedByPlusValueFile: true,
-            isOverriden,
             definedAtFilePath: {
                 ...plusFile.filePath,
                 fileExportPathToShowToUser: configName === plusFile.configName
@@ -596,33 +618,32 @@ function getDefiningConfigNames(plusFile) {
 function getConfigDefinitions(plusFilesRelevant, filter) {
     let configDefinitions = { ...configDefinitionsBuiltIn };
     // Add user-land meta configs
-    Object.entries(plusFilesRelevant)
+    plusFilesRelevant
+        .slice()
         .reverse()
-        .forEach(([_locationId, plusFiles]) => {
-        plusFiles.forEach((plusFile) => {
-            const confVal = getConfVal(plusFile, 'meta');
-            if (!confVal)
+        .forEach((plusFile) => {
+        const confVal = getConfVal(plusFile, 'meta');
+        if (!confVal)
+            return;
+        assert(confVal.valueIsLoaded);
+        const meta = confVal.value;
+        assertMetaUsage(meta, `Config ${pc.cyan('meta')} defined at ${plusFile.filePath.filePathToShowToUser}`);
+        // Set configDef._userEffectDefinedAtFilePath
+        Object.entries(meta).forEach(([configName, configDef]) => {
+            if (!configDef.effect)
                 return;
-            assert(confVal.valueIsLoaded);
-            const meta = confVal.value;
-            assertMetaUsage(meta, `Config ${pc.cyan('meta')} defined at ${plusFile.filePath.filePathToShowToUser}`);
-            // Set configDef._userEffectDefinedAtFilePath
-            Object.entries(meta).forEach(([configName, configDef]) => {
-                if (!configDef.effect)
-                    return;
-                assert(plusFile.isConfigFile);
-                configDef._userEffectDefinedAtFilePath = {
-                    ...plusFile.filePath,
-                    fileExportPathToShowToUser: ['default', 'meta', configName, 'effect']
-                };
-            });
-            objectEntries(meta).forEach(([configName, configDefinitionUserLand]) => {
-                // User can override an existing config definition
-                configDefinitions[configName] = {
-                    ...configDefinitions[configName],
-                    ...configDefinitionUserLand
-                };
-            });
+            assert(plusFile.isConfigFile);
+            configDef._userEffectDefinedAtFilePath = {
+                ...plusFile.filePath,
+                fileExportPathToShowToUser: ['default', 'meta', configName, 'effect']
+            };
+        });
+        objectEntries(meta).forEach(([configName, configDefinitionUserLand]) => {
+            // User can override an existing config definition
+            configDefinitions[configName] = {
+                ...configDefinitions[configName],
+                ...configDefinitionUserLand
+            };
         });
     });
     if (filter) {
@@ -722,7 +743,6 @@ function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSource
             plusFile: sourceEffect.plusFile,
             locationId: sourceEffect.locationId,
             configEnv: configDef.env,
-            isOverriden: false, // TODO/now check
             valueIsLoadedWithImport: false,
             valueIsDefinedByPlusValueFile: false,
             valueIsLoaded: true,
@@ -782,7 +802,7 @@ function getComputed(configValueSources, configDefinitions) {
 }
 // Show error message upon unknown config
 function assertKnownConfigs(configDefinitionsResolved, plusFilesAll) {
-    const configDefinitionsAll = getConfigDefinitions(plusFilesAll);
+    const configDefinitionsAll = getConfigDefinitions(Object.values(plusFilesAll).flat());
     const configNamesKnownAll = Object.keys(configDefinitionsAll);
     const configNamesGlobal = Object.keys(configDefinitionsResolved.configDefinitionsGlobal);
     objectEntries(configDefinitionsResolved.configDefinitionsLocal).forEach(([_locationId, { configDefinitions, plusFiles }]) => {
@@ -966,3 +986,14 @@ function isGlobalLocation(locationId, plusFilesAll) {
         .map(([locationId]) => locationId);
     return locationIdsPage.every((locId) => isInherited(locationId, locId));
 }
+function isOverriden(source, configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    assert(configDef);
+    if (configDef.cumulative)
+        return false;
+    const sources = pageConfig.configValueSources[configName];
+    assert(sources);
+    const idx = sources.indexOf(source);
+    assert(idx >= 0);
+    return idx > 0;
+}

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -22,7 +22,7 @@ import type { ConfigValueSerialized } from './serialize/PageConfigSerialized.js'
 import type { LocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js';
 import type { FilePath } from './FilePath.js';
 import type { ConfigDefinitions } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
-import type { PlusFile, PlusFilesByLocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/getPlusFilesAll.js';
+import type { PlusFile } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/getPlusFilesAll.js';
 type PageConfigCommon = {
     pageId: string;
 } & PageConfigRoute;
@@ -49,7 +49,7 @@ type PageConfigGlobalRuntime = {
 /** Page config, build-time data structure */
 type PageConfigBuildTime = PageConfigCommon & {
     configDefinitions: ConfigDefinitions;
-    plusFiles: PlusFilesByLocationId;
+    plusFiles: PlusFile[];
     configValueSources: ConfigValueSources;
     configValuesComputed: ConfigValuesComputed;
 };
@@ -92,7 +92,6 @@ type ConfigValueSource = {
     definedAtFilePath: DefinedAtFilePath;
     plusFile: PlusFile | null;
     locationId: LocationId;
-    isOverriden: boolean;
     /** Wether the config value is loaded at runtime, for example config.Page or config.onBeforeRender */
     valueIsLoadedWithImport: boolean;
     /** Whether the config value is a file path, for example config.client */

package/dist/esm/shared/page-configs/getConfigValueBuildTime.js

@@ -27,8 +27,6 @@ function getConfigValue(pageConfig, configName) {
     if (!configDef.cumulative) {
         const configValueSource = sources[0];
         assert(configValueSource);
-        assert(configValueSource.isOverriden === false);
-        assert(sources.slice(1).every((s) => s.isOverriden === true));
         assert(configValueSource.valueIsLoaded);
         return {
             type: 'standard',
@@ -50,7 +48,6 @@ function mergeCumulative(configValueSources) {
     const value = [];
     const definedAtData = [];
     configValueSources.forEach((configValueSource) => {
-        assert(configValueSource.isOverriden === false);
         assert(configValueSource.configEnv.config === true);
         assert(configValueSource.valueIsLoaded);
         value.push(configValueSource.value);

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.js

@@ -7,6 +7,7 @@ import { parsePointerImportData } from '../../../node/plugin/plugins/importUserC
 import { getConfigValueFilePathToShowToUser } from '../helpers.js';
 import { stringify } from '@brillout/json-serializer/stringify';
 import pc from '@brillout/picocolors';
+import { isOverriden } from '../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
@@ -44,7 +45,6 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatc
     return lines;
 }
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
-    assert(configValueSource.isOverriden === false);
     let valueData;
     if (configValueSource.valueIsLoaded && !configValueSource.valueIsLoadedWithImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
@@ -196,7 +196,6 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
         if (!configDef.cumulative) {
             const source = sources[0];
             assert(source);
-            assert(sources.slice(1).every((s) => s.isOverriden === true));
             if (!isEnvMatch(source.configEnv))
                 return 'SKIP';
             const definedAtFile = getDefinedAtFileSource(source);
@@ -207,7 +206,9 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             return { configValueBase, sourceRelevant: source, configName };
         }
         else {
-            const sourcesRelevant = sources.filter((source) => !source.isOverriden && isEnvMatch(source.configEnv));
+            const sourcesRelevant = sources
+                .filter((source) => !isOverriden(source, configName, pageConfig))
+                .filter((source) => isEnvMatch(source.configEnv));
             if (sourcesRelevant.length === 0)
                 return 'SKIP';
             const definedAtData = [];

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.223-commit-32cd543";
+export declare const PROJECT_VERSION: "0.4.223-commit-81afe1f";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.223-commit-32cd543';
+export const PROJECT_VERSION = '0.4.223-commit-81afe1f';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.223-commit-32cd543";
+    projectVersion: "0.4.223-commit-81afe1f";
 };

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

@@ -3,6 +3,19 @@ export { lowerFirst };
 export { makeFirst };
 export { makeLast };
 export { reverse };
+export type { SortReturn };
+/**
+ * # How to use `Array.prototype.sort()`
+ *
+ * ```js
+ * elements.sort(sorter);
+ * function sorter(element1: unknown, element2: unknown): -1 | 0 | 1
+ * ```
+ * -1 => element1 first: `elements.indexOf(element1) < elements.indexOf(element2)`
+ * +1 => element2 first: `elements.indexOf(element2) < elements.indexOf(element1)`
+ *  0 => keep original order of element1 and element2
+ */
+type SortReturn = -1 | 0 | 1;
 /**
  * ```js
  * let arr = [
@@ -18,7 +31,7 @@ export { reverse };
  * ])
  * ```
  */
-declare function higherFirst<T>(getValue: (element: T) => number): (element1: T, element2: T) => 0 | 1 | -1;
+declare function higherFirst<T>(getValue: (element: T) => number): (element1: T, element2: T) => SortReturn;
 /**
  * ```js
  * let arr = [
@@ -34,7 +47,7 @@ declare function higherFirst<T>(getValue: (element: T) => number): (element1: T,
  * ])
  * ```
  */
-declare function lowerFirst<T>(getValue: (element: T) => number): (element1: T, element2: T) => 0 | 1 | -1;
+declare function lowerFirst<T>(getValue: (element: T) => number): (element1: T, element2: T) => SortReturn;
 /**
  * ```js
  * let arr = [
@@ -48,7 +61,7 @@ declare function lowerFirst<T>(getValue: (element: T) => number): (element1: T,
  * ])
  * ```
  */
-declare function makeFirst<T>(getValue: (element: T) => boolean | null): (element1: T, element2: T) => 0 | 1 | -1;
+declare function makeFirst<T>(getValue: (element: T) => boolean | null): (element1: T, element2: T) => SortReturn;
 /**
  * ```js
  * let arr = [
@@ -62,6 +75,6 @@ declare function makeFirst<T>(getValue: (element: T) => boolean | null): (elemen
  * ])
  * ```
  */
-declare function makeLast<T>(getValue: (element: T) => boolean | null): (element1: T, element2: T) => 0 | 1 | -1;
+declare function makeLast<T>(getValue: (element: T) => boolean | null): (element1: T, element2: T) => SortReturn;
 /** Reverse order result. */
-declare function reverse(sortKey: 0 | 1 | -1): 0 | 1 | -1;
+declare function reverse(sortKey: SortReturn): SortReturn;

package/dist/esm/utils/sorter.js

@@ -4,9 +4,6 @@ export { lowerFirst };
 export { makeFirst };
 export { makeLast };
 export { reverse };
-// -1 => element1 first (i.e. `indexOf(element1) < indexOf(element2)`)
-// +1 => element2 first (i.e. `indexOf(element2) < indexOf(element1)`)
-// 0 => keep original order of element1 and element2
 /**
  * ```js
  * let arr = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.223-commit-32cd543",
+  "version": "0.4.223-commit-81afe1f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {