vike 0.4.160 → 0.4.161-commit-ba539a4

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVikeConfigFile = exports.vikeConfigDependencies = exports.reloadVikeConfig = exports.getVikeConfig = void 0;
+exports.isV1Design = exports.isVikeConfigFile = exports.vikeConfigDependencies = exports.reloadVikeConfig = exports.getVikeConfig = void 0;
 const utils_js_1 = require("../../../utils.js");
 const path_1 = __importDefault(require("path"));
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
@@ -19,8 +19,9 @@ const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
 const crawlPlusFiles_js_1 = require("./getVikeConfig/crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
-const loadFileConfigEnv_js_1 = require("./getVikeConfig/loadFileConfigEnv.js");
+const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.js");
 const resolveImportPath_js_1 = require("./getVikeConfig/resolveImportPath.js");
+const resolveFilePath_js_1 = require("./getVikeConfig/resolveFilePath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -74,6 +75,11 @@ async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, exten
     return await vikeConfigPromise;
 }
 exports.getVikeConfig = getVikeConfig;
+async function isV1Design(config, isDev) {
+    const isV1Design = (await getVikeConfig(config, isDev)).pageConfigs.length > 0;
+    return isV1Design;
+}
+exports.isV1Design = isV1Design;
 async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
     const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev, extensions);
     const configFiles = [];
@@ -87,69 +93,77 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions) {
         }
     });
     let interfaceFilesByLocationId = {};
-    // Config files
-    await Promise.all(configFiles.map(async (filePath) => {
-        const { configFile, extendsConfigs } = await (0, loadFileConfigEnv_js_1.loadConfigFile)(filePath, userRootDir, [], false);
-        const interfaceFile = getInterfaceFileFromConfigFile(configFile, false);
-        const locationId = (0, filesystemRouting_js_1.getLocationId)(filePath.filePathAbsoluteVite);
-        interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
-        interfaceFilesByLocationId[locationId].push(interfaceFile);
-        extendsConfigs.forEach((extendsConfig) => {
-            const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true);
-            interfaceFilesByLocationId[locationId].push(interfaceFile);
-        });
-    }));
-    // Value files
-    await Promise.all(valueFiles.map(async (filePath) => {
-        const configName = getConfigName(filePath.filePathAbsoluteVite);
-        (0, utils_js_1.assert)(configName);
-        const interfaceFile = {
-            filePath,
-            fileExportsByConfigName: {
-                [configName]: {}
-            },
-            isConfigFile: false,
-            isValueFile: true,
-            configName
-        };
-        {
-            // We don't have access to the custom config definitions defined by the user yet.
-            //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
-            //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
-            const configDef = getConfigDefinitionOptional(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn, configName);
-            if (configDef && isConfigEnv(configDef, configName)) {
-                await (0, loadFileConfigEnv_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
-            }
-        }
-        {
-            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePath.filePathAbsoluteVite);
+    await Promise.all([
+        // Config files
+        ...configFiles.map(async (filePath) => {
+            const { filePathRelativeToUserRootDir } = filePath;
+            (0, utils_js_1.assert)(filePathRelativeToUserRootDir);
+            const { configFile, extendsConfigs } = await (0, loadFileAtConfigTime_js_1.loadConfigFile)(filePath, userRootDir, [], false);
+            (0, utils_js_1.assert)(filePath.filePathRelativeToUserRootDir);
+            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir);
+            const interfaceFile = getInterfaceFileFromConfigFile(configFile, false, locationId);
             interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
             interfaceFilesByLocationId[locationId].push(interfaceFile);
-        }
-    }));
+            extendsConfigs.forEach((extendsConfig) => {
+                /* We purposely use the same locationId because the Vike extension's config should only apply to where it's being extended from, for example:
+                ```js
+                // /pages/admin/+config.h.js
+        
+                import vikeVue from 'vike-vue/config'
+                // Should only apply to /pages/admin/**
+                export default { extends: [vikeVue] }
+                ```
+                ```js
+                // /pages/marketing/+config.h.js
+        
+                import vikeReact from 'vike-react/config'
+                // Should only apply to /pages/marketing/**
+                export default { extends: [vikeReact] }
+                ```
+                */
+                const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true, locationId);
+                interfaceFilesByLocationId[locationId].push(interfaceFile);
+            });
+        }),
+        // Value files
+        ...valueFiles.map(async (filePath) => {
+            const { filePathRelativeToUserRootDir } = filePath;
+            (0, utils_js_1.assert)(filePathRelativeToUserRootDir);
+            const configName = getConfigName(filePathRelativeToUserRootDir);
+            (0, utils_js_1.assert)(configName);
+            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir);
+            const interfaceFile = {
+                locationId,
+                filePath,
+                fileExportsByConfigName: {
+                    [configName]: {}
+                },
+                isConfigFile: false,
+                isValueFile: true,
+                configName
+            };
+            {
+                // We don't have access to the custom config definitions defined by the user yet.
+                //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
+                //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
+                const configDef = getConfigDefinitionOptional(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn, configName);
+                if (configDef && isConfigEnv(configDef, configName)) {
+                    await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
+                }
+            }
+            {
+                interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
+                interfaceFilesByLocationId[locationId].push(interfaceFile);
+            }
+        })
+    ]);
     assertAllConfigsAreKnown(interfaceFilesByLocationId);
     return interfaceFilesByLocationId;
 }
-function getConfigDefinition(configDefinitionsRelevant, configName, filePathToShowToUser) {
-    const configDef = configDefinitionsRelevant[configName];
-    assertConfigExists(configName, Object.keys(configDefinitionsRelevant), filePathToShowToUser);
-    (0, utils_js_1.assert)(configDef);
-    return configDef;
-}
-function getConfigDefinitionOptional(configDefinitions, configName) {
-    return configDefinitions[configName] ?? null;
-}
-function isConfigEnv(configDef, configName) {
-    const configEnv = configDef.env;
-    if (configDef.cumulative) {
-        // In principle we could lift that requirement (but it requires non-trivial modifications)
-        (0, utils_js_1.assertUsage)(configEnv.config, `Config ${picocolors_1.default.cyan(configName)} needs its ${picocolors_1.default.cyan('env')} to have ${picocolors_1.default.cyan('{ config: true }')} (because ${picocolors_1.default.cyan(configName)} is a ${picocolors_1.default.cyan('cumulative')} config)`);
-    }
-    return !!configEnv.config;
-}
-function getInterfaceFileFromConfigFile(configFile, isConfigExtend) {
+function getInterfaceFileFromConfigFile(configFile, isConfigExtend, locationId) {
     const { fileExports, filePath, extendsFilePaths } = configFile;
     const interfaceFile = {
+        locationId,
         filePath,
         fileExportsByConfigName: {},
         isConfigFile: true,
@@ -165,12 +179,12 @@ function getInterfaceFileFromConfigFile(configFile, isConfigExtend) {
 }
 /** Show error message upon unknown config */
 function assertAllConfigsAreKnown(interfaceFilesByLocationId) {
-    Object.entries(interfaceFilesByLocationId).forEach(([locationId, interfaceFiles]) => {
+    (0, utils_js_1.objectEntries)(interfaceFilesByLocationId).forEach(([locationId, interfaceFiles]) => {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesByLocationId, locationId);
-        const configDefinitionsRelevant = getConfigDefinitions(interfaceFilesRelevant);
+        const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
         interfaceFiles.forEach((interfaceFile) => {
             Object.keys(interfaceFile.fileExportsByConfigName).forEach((configName) => {
-                assertConfigExists(configName, Object.keys(configDefinitionsRelevant), interfaceFile.filePath.filePathToShowToUser);
+                assertConfigExists(configName, Object.keys(configDefinitions), interfaceFile.filePath.filePathToShowToUser);
             });
         });
     });
@@ -220,11 +234,11 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
     const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, isDev, extensions);
     const importedFilesLoaded = {};
     const { globalVikeConfig, pageConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
-    const pageConfigs = await Promise.all(Object.entries(interfaceFilesByLocationId)
+    const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
         .filter(([_pageId, interfaceFiles]) => isDefiningPage(interfaceFiles))
         .map(async ([locationId]) => {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesByLocationId, locationId);
-        const configDefinitionsRelevant = getConfigDefinitions(interfaceFilesRelevant);
+        const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
         // Load value files of custom config-only configs
         await Promise.all(getInterfaceFileList(interfaceFilesRelevant).map(async (interfaceFile) => {
             if (!interfaceFile.isValueFile)
@@ -232,7 +246,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
             const { configName } = interfaceFile;
             if (isGlobalConfig(configName))
                 return;
-            const configDef = getConfigDefinition(configDefinitionsRelevant, configName, interfaceFile.filePath.filePathToShowToUser);
+            const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
             if (!isConfigEnv(configDef, configName))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -240,10 +254,10 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
                 return;
             // Value files of built-in configs should have already been loaded at loadInterfaceFiles()
             (0, utils_js_1.assert)(!(configName in configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn));
-            await (0, loadFileConfigEnv_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
+            await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
         }));
-        const configValueSources = {};
-        await Promise.all((0, utils_js_1.objectEntries)(configDefinitionsRelevant)
+        let configValueSources = {};
+        await Promise.all((0, utils_js_1.objectEntries)(configDefinitions)
             .filter(([configName]) => !isGlobalConfig(configName))
             .map(async ([configName, configDef]) => {
             const sources = await resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded);
@@ -251,10 +265,11 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, extensions) {
                 return;
             configValueSources[configName] = sources;
         }));
+        configValueSources = sortConfigValueSources(configValueSources, locationId);
         const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
-        applyEffectsAll(configValueSources, configDefinitionsRelevant);
-        const configValuesComputed = getComputed(configValueSources, configDefinitionsRelevant);
-        const configValues = getConfigValues(configValueSources, configValuesComputed, configDefinitionsRelevant);
+        applyEffectsAll(configValueSources, configDefinitions);
+        const configValuesComputed = getComputed(configValueSources, configDefinitions);
+        const configValues = getConfigValues(configValueSources, configValuesComputed, configDefinitions);
         const pageConfig = {
             pageId: locationId,
             isErrorPage,
@@ -291,7 +306,7 @@ function interfacefileIsAlreaydLoaded(interfaceFile) {
     return isAlreadyLoaded;
 }
 function getInterfaceFilesRelevant(interfaceFilesByLocationId, locationIdPage) {
-    const interfaceFilesRelevant = Object.fromEntries(Object.entries(interfaceFilesByLocationId)
+    const interfaceFilesRelevant = Object.fromEntries((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
         .filter(([locationId]) => {
         return (0, filesystemRouting_js_1.isInherited)(locationId, locationIdPage);
     })
@@ -306,14 +321,14 @@ function getInterfaceFileList(interfaceFilesByLocationId) {
     return interfaceFiles;
 }
 async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded) {
-    const locationIds = Object.keys(interfaceFilesByLocationId);
-    const interfaceFilesGlobal = Object.fromEntries(Object.entries(interfaceFilesByLocationId).filter(([locationId]) => {
+    const locationIds = (0, utils_js_1.objectKeys)(interfaceFilesByLocationId);
+    const interfaceFilesGlobal = (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(interfaceFilesByLocationId).filter(([locationId]) => {
         return (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds);
     }));
     // Validate that global configs live in global interface files
     {
         const interfaceFilesGlobalPaths = [];
-        Object.entries(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
+        (0, utils_js_1.objectEntries)(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
             (0, utils_js_1.assert)((0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds));
             interfaceFiles.forEach(({ filePath: { filePathRelativeToUserRootDir } }) => {
                 if (filePathRelativeToUserRootDir) {
@@ -322,7 +337,7 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
             });
         });
         const globalPaths = Array.from(new Set(interfaceFilesGlobalPaths.map((p) => path_1.default.posix.dirname(p))));
-        Object.entries(interfaceFilesByLocationId).forEach(([locationId, interfaceFiles]) => {
+        (0, utils_js_1.objectEntries)(interfaceFilesByLocationId).forEach(([locationId, interfaceFiles]) => {
             interfaceFiles.forEach((interfaceFile) => {
                 Object.keys(interfaceFile.fileExportsByConfigName).forEach((configName) => {
                     if (!(0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds) && isGlobalConfig(configName)) {
@@ -446,6 +461,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
     const conf = interfaceFile.fileExportsByConfigName[configName];
     (0, utils_js_1.assert)(conf);
     const configEnv = configDef.env;
+    const { locationId } = interfaceFile;
     const definedAtConfigFile = {
         ...interfaceFile.filePath,
         fileExportPathToShowToUser: ['default', configName]
@@ -471,6 +487,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             };
         }
         const configValueSource = {
+            locationId,
             value: valueFilePath,
             valueIsFilePath: true,
             configEnv,
@@ -487,6 +504,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         const import_ = (0, resolveImportPath_js_1.resolveImport)(configValue, interfaceFile.filePath, userRootDir, configEnv, configName);
         if (import_) {
             const configValueSource = {
+                locationId,
                 configEnv,
                 valueIsImportedAtRuntime: true,
                 definedAt: import_
@@ -497,7 +515,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 configName !== 'extends') {
                 if (import_.filePathAbsoluteFilesystem) {
                     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(import_, 'filePathAbsoluteFilesystem', 'string')); // Help TS
-                    const fileExport = await (0, loadFileConfigEnv_js_1.loadImportedFile)(import_, userRootDir, importedFilesLoaded);
+                    const fileExport = await (0, loadFileAtConfigTime_js_1.loadImportedFile)(import_, userRootDir, importedFilesLoaded);
                     configValueSource.value = fileExport;
                 }
                 else {
@@ -509,6 +527,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         }
         // Defined by config file, i.e. +config.js file
         const configValueSource = {
+            locationId,
             value: configValue,
             configEnv,
             valueIsImportedAtRuntime: false,
@@ -521,6 +540,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         const valueAlreadyLoaded = 'configValue' in conf;
         (0, utils_js_1.assert)(valueAlreadyLoaded === !!configEnv.config);
         const configValueSource = {
+            locationId,
             configEnv,
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
             definedAt: {
@@ -551,8 +571,10 @@ function isDefiningPageConfig(configName) {
     return ['Page', 'route'].includes(configName);
 }
 function getConfigDefinitions(interfaceFilesRelevant) {
-    const configDefinitions = { ...configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn };
-    Object.entries(interfaceFilesRelevant).forEach(([_locationId, interfaceFiles]) => {
+    const configDefinitionsMerged = { ...configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn };
+    Object.entries(interfaceFilesRelevant)
+        .reverse()
+        .forEach(([_locationId, interfaceFiles]) => {
         interfaceFiles.forEach((interfaceFile) => {
             const configMeta = interfaceFile.fileExportsByConfigName['meta'];
             if (!configMeta)
@@ -571,13 +593,14 @@ function getConfigDefinitions(interfaceFilesRelevant) {
             });
             (0, utils_js_1.objectEntries)(meta).forEach(([configName, configDefinition]) => {
                 // User can override an existing config definition
-                configDefinitions[configName] = {
-                    ...configDefinitions[configName],
+                configDefinitionsMerged[configName] = {
+                    ...configDefinitionsMerged[configName],
                     ...configDefinition
                 };
             });
         });
     });
+    const configDefinitions = configDefinitionsMerged;
     return configDefinitions;
 }
 function assertMetaValue(metaVal, configMetaDefinedAt) {
@@ -616,8 +639,8 @@ function assertMetaValue(metaVal, configMetaDefinedAt) {
         }
     });
 }
-function applyEffectsAll(configValueSources, configDefinitionsRelevant) {
-    (0, utils_js_1.objectEntries)(configDefinitionsRelevant).forEach(([configName, configDef]) => {
+function applyEffectsAll(configValueSources, configDefinitions) {
+    (0, utils_js_1.objectEntries)(configDefinitions).forEach(([configName, configDef]) => {
         if (!configDef.effect)
             return;
         // The value needs to be loaded at config time, that's why we only support effect for configs that are config-only for now.
@@ -676,9 +699,9 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         }
     });
 }
-function getComputed(configValueSources, configDefinitionsRelevant) {
+function getComputed(configValueSources, configDefinitions) {
     const configValuesComputed = {};
-    (0, utils_js_1.objectEntries)(configDefinitionsRelevant).forEach(([configName, configDef]) => {
+    (0, utils_js_1.objectEntries)(configDefinitions).forEach(([configName, configDef]) => {
         if (!configDef._computed)
             return;
         const value = configDef._computed(configValueSources);
@@ -693,15 +716,7 @@ function getComputed(configValueSources, configDefinitionsRelevant) {
 }
 async function findPlusFiles(userRootDir, outDirRoot, isDev, extensions) {
     const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, isDev);
-    const plusFiles = files.map(({ filePathRelativeToUserRootDir, filePathAbsoluteFilesystem }) => {
-        return {
-            filePathRelativeToUserRootDir,
-            filePathAbsoluteVite: filePathRelativeToUserRootDir,
-            filePathAbsoluteFilesystem,
-            filePathToShowToUser: filePathRelativeToUserRootDir,
-            importPathAbsolute: null
-        };
-    });
+    const plusFiles = files.map(({ filePathRelativeToUserRootDir }) => (0, resolveFilePath_js_1.resolveFilePathRelativeToUserRootDir)(filePathRelativeToUserRootDir, userRootDir));
     // TODO/v1-release: remove
     extensions.forEach((extension) => {
         extension.pageConfigsDistFiles?.forEach((pageConfigDistFile) => {
@@ -753,22 +768,6 @@ function assertNoUnexpectedPlusSign(filePath: string, fileName: string) {
   )
 }
 */
-function isGlobalConfig(configName) {
-    if (configName === 'prerender')
-        return false;
-    const configNamesGlobal = getConfigNamesGlobal();
-    return (0, utils_js_1.arrayIncludes)(configNamesGlobal, configName);
-}
-function getConfigNamesGlobal() {
-    return Object.keys(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal);
-}
-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 handleUnknownConfig(configName, configNames, filePathToShowToUser) {
     let errMsg = `${filePathToShowToUser} defines an unknown config ${picocolors_1.default.cyan(configName)}`;
     let configNameSimilar = null;
@@ -839,7 +838,7 @@ function isVikeConfigFile(filePath) {
     return !!getConfigName(filePath);
 }
 exports.isVikeConfigFile = isVikeConfigFile;
-function getConfigValues(configValueSources, configValuesComputed, configDefinitionsRelevant) {
+function getConfigValues(configValueSources, configValuesComputed, configDefinitions) {
     const configValues = {};
     Object.entries(configValuesComputed).forEach(([configName, configValueComputed]) => {
         configValues[configName] = {
@@ -848,7 +847,7 @@ function getConfigValues(configValueSources, configValuesComputed, configDefinit
         };
     });
     Object.entries(configValueSources).forEach(([configName, sources]) => {
-        const configDef = configDefinitionsRelevant[configName];
+        const configDef = configDefinitions[configName];
         (0, utils_js_1.assert)(configDef);
         if (!configDef.cumulative) {
             const configValueSource = sources[0];
@@ -962,3 +961,48 @@ 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 isConfigEnv(configDef, configName) {
+    const configEnv = configDef.env;
+    if (configDef.cumulative) {
+        // In principle we could lift that requirement (but it requires non-trivial modifications)
+        (0, utils_js_1.assertUsage)(configEnv.config, `Config ${picocolors_1.default.cyan(configName)} needs its ${picocolors_1.default.cyan('env')} to have ${picocolors_1.default.cyan('{ config: true }')} (because ${picocolors_1.default.cyan(configName)} is a ${picocolors_1.default.cyan('cumulative')} config)`);
+    }
+    return !!configEnv.config;
+}
+function isGlobalConfig(configName) {
+    if (configName === 'prerender')
+        return false;
+    const configNamesGlobal = getConfigNamesGlobal();
+    return (0, utils_js_1.arrayIncludes)(configNamesGlobal, configName);
+}
+function getConfigNamesGlobal() {
+    return Object.keys(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal);
+}
+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)
+        .sort(([, [source1]], [, [source2]]) => source1.definedAt.filePathAbsoluteVite < source2.definedAt.filePathAbsoluteVite ? -1 : 1)
+        // Sort after whether the config value was defined by an npm package
+        .sort((0, utils_js_1.makeFirst)(([, [source]]) => {
+        const { importPathAbsolute } = source.definedAt;
+        return !!importPathAbsolute && (0, utils_js_1.isNpmPackageImport)(importPathAbsolute);
+    }))
+        // Sort after the filesystem inheritance of the config value
+        .sort(([, [source1]], [, [source2]]) => (0, utils_js_1.reverse)((0, filesystemRouting_js_1.sortAfterInheritanceOrder)(source1.locationId, source2.locationId, locationIdPage))));
+}

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

@@ -12,6 +12,7 @@ const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
 const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
+const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
     (0, utils_js_1.assert)(result);
@@ -45,7 +46,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
         isClientRouting
     })));
     lines.push('};');
-    if (includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!(0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, false))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');

package/dist/cjs/node/plugin/utils.js

@@ -27,7 +27,6 @@ __exportStar(require("../../utils/getDependencyPackageJson.js"), exports);
 __exportStar(require("../../utils/requireResolve.js"), exports);
 __exportStar(require("../../utils/arrayIncludes.js"), exports);
 __exportStar(require("../../utils/isDev.js"), exports);
-__exportStar(require("../../utils/objectKeys.js"), exports);
 __exportStar(require("../../utils/getMostSimilar.js"), exports);
 __exportStar(require("../../utils/getRandomId.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
@@ -35,10 +34,12 @@ __exportStar(require("../../utils/escapeRegex.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
 __exportStar(require("../../utils/trimWithAnsi.js"), exports);
 __exportStar(require("../../utils/removeEmptyLines.js"), exports);
-__exportStar(require("../../utils/findUserPackageJsonPath.js"), exports);
+__exportStar(require("../../utils/findFile.js"), exports);
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/mergeCumulativeValues.js"), exports);
 __exportStar(require("../../utils/deepEqual.js"), exports);
 __exportStar(require("../../utils/assertKeys.js"), exports);
 __exportStar(require("../../utils/injectRollupInputs.js"), exports);
 __exportStar(require("../../utils/humanizeTime.js"), exports);
+__exportStar(require("../../utils/pLimit.js"), exports);
+__exportStar(require("../../utils/isVersionOrAbove.js"), exports);

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

@@ -51,11 +51,11 @@ const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFile
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
-const logHintForCjsEsmError_js_1 = require("../runtime/renderPage/logHintForCjsEsmError.js");
+const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
-    // - We don't use logHintForCjsEsmError() because we don't have control over what happens with the error. For example, if the user land purposely swallows the error then the hint shouldn't be logged. Also, it's best if the hint is shown to the user *after* the error, but we cannot do/guarentee that.
+    // - We don't use logErrorHint() because we don't have control over what happens with the error. For example, if the user land purposely swallows the error then the hint shouldn't be logged. Also, it's best if the hint is shown to the user *after* the error, but we cannot do/guarentee that.
 }
 exports.runPrerenderFromAPI = runPrerenderFromAPI;
 async function runPrerenderFromCLI(options) {
@@ -64,7 +64,7 @@ async function runPrerenderFromCLI(options) {
     }
     catch (err) {
         console.error(err);
-        (0, logHintForCjsEsmError_js_1.logHintForCjsEsmError)(err);
+        (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
 }
@@ -75,7 +75,7 @@ async function runPrerenderFromAutoFullBuild(options) {
     }
     catch (err) {
         console.error(err);
-        (0, logHintForCjsEsmError_js_1.logHintForCjsEsmError)(err);
+        (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
 }
@@ -87,7 +87,7 @@ async function runPrerender(options, manuallyTriggered) {
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
     }
-    (0, utils_js_1.setNodeEnvToProduction)();
+    handleNodeEnv();
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
     assertLoadedConfig(viteConfig, options);
@@ -742,3 +742,10 @@ function assertIsNotAbort(err, urlOr404) {
     (0, utils_js_1.assert)(abortCall);
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
+function handleNodeEnv() {
+    const assertNodeEnv = () => (0, utils_js_1.assertNodeEnvIsNotDev)('pre-rendering');
+    if ((0, utils_js_1.getNodeEnv)())
+        assertNodeEnv();
+    (0, utils_js_1.setNodeEnvToProduction)();
+    assertNodeEnv();
+}

package/dist/cjs/node/runtime/globalContext.js

@@ -157,8 +157,11 @@ function assertNodeEnv(hasViteDevServer) {
     const nodeEnv = (0, utils_js_1.getNodeEnv)();
     if (nodeEnv === null || nodeEnv === 'test')
         return;
-    const isDevNodeEnv = (0, utils_js_1.isNodeEnvDev)();
-    // - Calling Vite's createServer() is enough for hasViteDevServer to be true, even without actually adding Vite's development middleware to the server: https://github.com/vikejs/vike/issues/792#issuecomment-1516830759
-    // - We should change this to be a warning if it blocks users (e.g. if a bad-citizen tool sets a wrong process.env.NODE_ENV value).
-    (0, utils_js_1.assertUsage)(hasViteDevServer === isDevNodeEnv, `Vite's development server was${hasViteDevServer ? '' : "n't"} instantiated while the environment is set to be a ${isDevNodeEnv ? 'development' : 'production'} environment by ${picocolors_1.default.cyan(`process.env.NODE_ENV === ${JSON.stringify(nodeEnv)}`)} which is contradictory, see https://vike.dev/NODE_ENV`);
+    const isDev = (0, utils_js_1.isNodeEnvDev)();
+    // Calling Vite's createServer() is enough for hasViteDevServer to be true, even without actually adding Vite's development middleware to the server: https://github.com/vikejs/vike/issues/792#issuecomment-1516830759
+    if (hasViteDevServer === isDev)
+        return;
+    const nodeEnvDesc = (0, utils_js_1.getNodeEnvDesc)();
+    // We should change this to be a warning if it blocks users (e.g. if a bad-citizen tool sets a wrong process.env.NODE_ENV value)
+    (0, utils_js_1.assertUsage)(false, `Vite's development server was${hasViteDevServer ? '' : "n't"} instantiated while the ${nodeEnvDesc} which is contradictory, see https://vike.dev/NODE_ENV`);
 }

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -90,8 +90,8 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as progressive hydration won't work", { onlyOnce: true });
-            // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/stream#initial-data-after-stream-end
+            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
+            // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/streaming#initial-data-after-stream-end
             return 'HTML_END';
         }
         if (injectToStream) {

package/dist/cjs/node/runtime/html/renderHtml.js

@@ -186,7 +186,7 @@ async function renderTemplate(templateContent, pageContext) {
             const varType = typeof templateVar;
             const streamNote = ['boolean', 'number', 'bigint', 'symbol'].includes(varType)
                 ? null
-                : '(See https://vike.dev/stream for HTML streaming.)';
+                : '(See https://vike.dev/streaming for HTML streaming.)';
             (0, utils_js_1.assertUsage)(varType === 'string', getErrMsg(picocolors_1.default.cyan(`typeof htmlVar === "${varType}"`), streamNote));
         }
         {

package/dist/cjs/node/runtime/html/stream.js

@@ -631,7 +631,7 @@ exports.isStream = isStream;
 const __streamPipeWeb = '__streamPipeWeb';
 /** @deprecated */
 function pipeWebStream(pipe) {
-    (0, utils_js_1.assertWarning)(false, 'pipeWebStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', {
+    (0, utils_js_1.assertWarning)(false, 'pipeWebStream() is outdated, use stampPipe() instead. See https://vike.dev/streaming', {
         onlyOnce: true,
         showStackTrace: true
     });
@@ -668,7 +668,7 @@ exports.isStreamPipeWeb = isStreamPipeWeb;
 const __streamPipeNode = '__streamPipeNode';
 /** @deprecated */
 function pipeNodeStream(pipe) {
-    (0, utils_js_1.assertWarning)(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', {
+    (0, utils_js_1.assertWarning)(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/streaming', {
         onlyOnce: true,
         showStackTrace: true
     });

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -6,11 +6,11 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const globalContext_js_1 = require("../globalContext.js");
-const getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
+const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = (0, getClientEntryFilePath_js_1.getClientEntryFilePath)(pageConfig);
+        const clientFilePath = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
         const clientEntry = !isClientSideRenderable ? clientFilePath : (0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting);
         const clientDependencies = [];
         clientDependencies.push({