vike 0.4.218-commit-85af52a → 0.4.218-commit-ea8bb27

package/dist/cjs/__internal/index.js

@@ -11,16 +11,15 @@ const index_js_1 = require("../shared/route/index.js");
 const getPageFiles_js_1 = require("../shared/getPageFiles/getPageFiles.js");
 const globalContext_js_2 = require("../node/runtime/globalContext.js");
 const assertSetup_js_1 = require("../utils/assertSetup.js");
-const renderPageAlreadyRouted_js_1 = require("../node/runtime/renderPage/renderPageAlreadyRouted.js");
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  */
 async function getPagesAndRoutes() {
     (0, assertSetup_js_1.setNodeEnvProduction)();
-    const renderContext = await (0, renderPageAlreadyRouted_js_1.getRenderContext)();
+    const globalContext = (0, globalContext_js_2.getGlobalContext)();
     const { 
     //
-    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = renderContext;
+    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = globalContext;
     return {
         pageRoutes,
         pageFilesAll,

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -70,8 +70,7 @@ async function enhanceViteConfig(viteConfig, operation) {
     };
 }
 function addViteSettingsSetByUser(viteConfigEnhanced, vikeConfig) {
-    const { global } = vikeConfig.vikeConfigNew;
-    const viteConfigs = global.from.configsCumulative.vite;
+    const viteConfigs = vikeConfig.global.from.configsCumulative.vite;
     if (!viteConfigs)
         return viteConfigEnhanced;
     viteConfigs.values.forEach((v) => {

package/dist/cjs/node/plugin/plugins/baseUrls.js

@@ -13,7 +13,7 @@ function baseUrls() {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vikeTmp.vikeConfigGlobal.baseServer, config.vikeTmp.vikeConfigGlobal.baseAssets);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vike.vikeConfigGlobal.baseServer, config.vike.vikeConfigGlobal.baseAssets);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -34,7 +34,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: vikeConfig.vikeConfigNew,
+                        vike: vikeConfig,
                         vikeTmp: vikeConfig
                     };
                 }

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configDefinitionsBuiltInGlobal = exports.configDefinitionsBuiltIn = void 0;
+exports.configDefinitionsBuiltInAll = void 0;
 const utils_js_1 = require("../../../../utils.js");
 const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
-const configDefinitionsBuiltIn = {
+const configDefinitionsBuiltInAll = {
     onRenderHtml: {
         env: { server: true }
     },
@@ -62,9 +62,6 @@ const configDefinitionsBuiltIn = {
     clientHooks: {
         env: { config: true }
     },
-    prerender: {
-        env: { config: true }
-    },
     hydrationCanBeAborted: {
         env: { client: true }
     },
@@ -133,29 +130,36 @@ const configDefinitionsBuiltIn = {
         env: { client: true }
     },
     // TODO/eventually: define it as a global config.
-    middleware: { env: { server: true }, cumulative: true, eager: true }
-};
-exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
-const configDefinitionsBuiltInGlobal = {
+    middleware: { env: { server: true }, cumulative: true, eager: true },
     onPrerenderStart: {
         env: { server: true, production: true },
-        eager: true
+        eager: true,
+        global: true
     },
     onBeforeRoute: {
         env: { server: true, client: 'if-client-routing' },
-        eager: true
-    },
-    prerender: { env: { config: true } },
-    vite: { env: { config: true }, cumulative: true },
-    disableAutoFullBuild: { env: { config: true } },
-    includeAssetsImportedByServer: { env: { config: true } },
-    baseAssets: { env: { config: true } },
-    baseServer: { env: { config: true } },
-    redirects: { env: { server: true } },
-    trailingSlash: { env: { server: true } },
-    disableUrlNormalization: { env: { server: true } }
+        eager: true,
+        global: true
+    },
+    prerender: { env: { config: true }, global: (value) => typeof value !== 'object', type: ['boolean', 'object'] },
+    vite: { env: { config: true }, global: true, cumulative: true, type: 'object' },
+    disableAutoFullBuild: {
+        env: { config: true },
+        global: true,
+        type: [
+            'boolean',
+            // Can be 'prerender'
+            'string'
+        ]
+    },
+    includeAssetsImportedByServer: { env: { config: true }, global: true, type: 'boolean' },
+    baseAssets: { env: { config: true }, global: true, type: 'string' },
+    baseServer: { env: { config: true }, global: true, type: 'string' },
+    redirects: { env: { server: true }, global: true, type: 'string{}', cumulative: true },
+    trailingSlash: { env: { server: true }, global: true, type: 'boolean' },
+    disableUrlNormalization: { env: { server: true }, global: true, type: 'boolean' }
 };
-exports.configDefinitionsBuiltInGlobal = configDefinitionsBuiltInGlobal;
+exports.configDefinitionsBuiltInAll = configDefinitionsBuiltInAll;
 function getConfigEnv(configValueSources, configName) {
     const configValueSource = getConfigValueSource(configValueSources, configName);
     if (!configValueSource)

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

@@ -30,6 +30,8 @@ const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs
 const assertExtensions_js_1 = require("./assertExtensions.js");
 const getPageConfigUserFriendly_js_1 = require("../../../../../shared/page-configs/getPageConfigUserFriendly.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
+const configDefinitionsBuiltIn = getConfigDefinitionsBuiltIn();
+const configDefinitionsBuiltInGlobal = getConfigDefinitionsBuiltInGlobal();
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let restartVite = false;
 let wasConfigInvalid = null;
@@ -167,7 +169,7 @@ async function loadInterfaceFiles(userRootDir) {
                 // We don't have access to the custom config definitions defined by the user yet.
                 //  - If `configDef` is `undefined` => we load the file +{configName}.js later.
                 //  - We already need to load +meta.js here (to get the custom config definitions defined by the user)
-                const configDef = getConfigDefinitionOptional(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn, configName);
+                const configDef = getConfigDefinitionOptional(configDefinitionsBuiltIn, configName);
                 if (configDef && isLoadableAtBuildTime(configDef)) {
                     await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
                 }
@@ -247,9 +249,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configValueSources: {}
                 },
                 vikeConfigGlobal: resolveVikeConfigGlobal({}, {}),
-                vikeConfigNew: {
-                    global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} })
-                }
+                global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} })
             };
             return dummyData;
         }
@@ -258,7 +258,97 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir);
     const importedFilesLoaded = {};
-    const { pageConfigGlobal, vikeConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded, vikeVitePluginOptions);
+    const [globalConfigs, pageConfigs] = await Promise.all([
+        getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded, vikeVitePluginOptions),
+        getPageConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded)
+    ]);
+    return { pageConfigs, ...globalConfigs };
+}
+async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded, vikeVitePluginOptions) {
+    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 = [];
+        (0, utils_js_1.objectEntries)(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
+            (0, utils_js_1.assert)((0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds));
+            interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
+                if (filePathAbsoluteUserRootDir) {
+                    interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
+                }
+            });
+        });
+        const globalPaths = Array.from(new Set(interfaceFilesGlobalPaths.map((p) => path_1.default.posix.dirname(p))));
+        (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)) {
+                        (0, utils_js_1.assertUsage)(false, [
+                            `${interfaceFile.filePath.filePathToShowToUser} defines the config ${picocolors_1.default.cyan(configName)} which is global:`,
+                            globalPaths.length
+                                ? `define ${picocolors_1.default.cyan(configName)} in ${(0, utils_js_1.joinEnglish)(globalPaths, 'or')} instead`
+                                : `create a global config (e.g. /pages/+config.js) and define ${picocolors_1.default.cyan(configName)} there instead`
+                        ].join(' '));
+                    }
+                });
+            });
+        });
+    }
+    const pageConfigGlobalValues = {};
+    const pageConfigGlobal = {
+        configDefinitions: configDefinitionsBuiltInGlobal,
+        configValueSources: {}
+    };
+    await Promise.all((0, utils_js_1.objectEntries)(configDefinitionsBuiltInGlobal).map(async ([configName, configDef]) => {
+        const sources = await resolveConfigValueSources(configName, configDef, interfaceFilesGlobal, userRootDir, importedFilesLoaded);
+        const configValueSource = sources[0];
+        if (!configValueSource)
+            return;
+        pageConfigGlobal.configValueSources[configName] = sources;
+        // TODO/now
+        if (configName === 'onBeforeRoute' || configName === 'onPrerenderStart') {
+            (0, utils_js_1.assert)(!('value' in configValueSource));
+        }
+        else {
+            (0, utils_js_1.assert)('value' in configValueSource);
+            // TODO/now
+            if (configName === 'prerender' && typeof configValueSource.value === 'boolean')
+                return;
+            pageConfigGlobalValues[configName] = configValueSource.value;
+        }
+    }));
+    const vikeConfigGlobal = resolveVikeConfigGlobal(vikeVitePluginOptions, pageConfigGlobalValues);
+    {
+        (0, utils_js_1.assert)((0, utils_js_1.isObject)(vikeVitePluginOptions));
+        Object.entries(vikeVitePluginOptions).forEach(([configName, value]) => {
+            var _a;
+            (0, utils_js_1.assert)((0, utils_js_1.includes)((0, utils_js_1.objectKeys)(configDefinitionsBuiltInGlobal), configName));
+            const configDef = configDefinitionsBuiltInGlobal[configName];
+            const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
+            sources.push({
+                value,
+                configEnv: configDef.env,
+                definedAtFilePath: {
+                    ...(0, getFilePath_js_1.getFilePathResolved)({
+                        userRootDir,
+                        filePathAbsoluteUserRootDir: '/vite.config.js'
+                    }),
+                    fileExportPathToShowToUser: null
+                },
+                locationId: '/',
+                isOverriden: configDef.cumulative ? false : sources.length > 0,
+                valueIsImportedAtRuntime: false,
+                valueIsDefinedByPlusFile: false
+            });
+        });
+    }
+    const configValues = getConfigValues(pageConfigGlobal);
+    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues });
+    return { pageConfigGlobal, vikeConfigGlobal, global };
+}
+async function getPageConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded) {
     const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
         .filter(([_pageId, interfaceFiles]) => isDefiningPage(interfaceFiles))
         .map(async ([locationId]) => {
@@ -280,7 +370,7 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
             if (isAlreadyLoaded)
                 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));
+            (0, utils_js_1.assert)(!(configName in configDefinitionsBuiltIn));
             await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
         }));
         let configValueSources = {};
@@ -308,13 +398,11 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
         return pageConfig;
     }));
     assertPageConfigs(pageConfigs);
-    const configValues = getConfigValues(pageConfigGlobal);
-    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues });
-    return { pageConfigs, pageConfigGlobal, vikeConfigGlobal, vikeConfigNew: { global } };
+    return pageConfigs;
 }
 function getConfigValues(pageConfig) {
     const configValues = {};
-    (0, serializeConfigValues_js_1.getConfigValuesBase)(pageConfig, (configEnv) => !!configEnv.config).forEach((entry) => {
+    (0, serializeConfigValues_js_1.getConfigValuesBase)(pageConfig, (configEnv) => !!configEnv.config, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
             (0, utils_js_1.assert)('value' in entry); // Help TS
             const { configValueBase, value, configName } = entry;
@@ -340,7 +428,7 @@ function getConfigValues(pageConfig) {
     });
     return configValues;
 }
-// TODO/soon: refactor
+// TODO/now: refactor
 //  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
 //    - This assertUsage() message is slightly better: use this one for getGlobalConfigs()
 // Global configs should be defined at global locations
@@ -357,7 +445,7 @@ function assertUsageGlobalConfigs(interfaceFilesRelevantList, configDefinitions,
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            if (configDef.global) {
+            if (configDef.global === true) {
                 const locationIds = (0, utils_js_1.objectKeys)(interfaceFilesByLocationId);
                 if (!(0, filesystemRouting_js_1.isGlobalLocation)(interfaceFile.locationId, locationIds)) {
                     const interfaceFilesGlobal = (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(interfaceFilesByLocationId).filter(([locationId]) => {
@@ -416,85 +504,6 @@ function getInterfaceFilesRelevant(interfaceFilesByLocationId, locationIdPage) {
         .sort(([locationId1], [locationId2]) => (0, filesystemRouting_js_1.sortAfterInheritanceOrder)(locationId1, locationId2, locationIdPage)));
     return interfaceFilesRelevant;
 }
-async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded, vikeVitePluginOptions) {
-    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 = [];
-        (0, utils_js_1.objectEntries)(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
-            (0, utils_js_1.assert)((0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds));
-            interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
-                if (filePathAbsoluteUserRootDir) {
-                    interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
-                }
-            });
-        });
-        const globalPaths = Array.from(new Set(interfaceFilesGlobalPaths.map((p) => path_1.default.posix.dirname(p))));
-        (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)) {
-                        (0, utils_js_1.assertUsage)(false, [
-                            `${interfaceFile.filePath.filePathToShowToUser} defines the config ${picocolors_1.default.cyan(configName)} which is global:`,
-                            globalPaths.length
-                                ? `define ${picocolors_1.default.cyan(configName)} in ${(0, utils_js_1.joinEnglish)(globalPaths, 'or')} instead`
-                                : `create a global config (e.g. /pages/+config.js) and define ${picocolors_1.default.cyan(configName)} there instead`
-                        ].join(' '));
-                    }
-                });
-            });
-        });
-    }
-    const pageConfigGlobalValues = {};
-    const pageConfigGlobal = {
-        configDefinitions: configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal,
-        configValueSources: {}
-    };
-    await Promise.all((0, utils_js_1.objectEntries)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal).map(async ([configName, configDef]) => {
-        const sources = await resolveConfigValueSources(configName, configDef, interfaceFilesGlobal, userRootDir, importedFilesLoaded);
-        const configValueSource = sources[0];
-        if (!configValueSource)
-            return;
-        pageConfigGlobal.configValueSources[configName] = sources;
-        if (configName === 'onBeforeRoute' || configName === 'onPrerenderStart') {
-            (0, utils_js_1.assert)(!('value' in configValueSource));
-        }
-        else {
-            (0, utils_js_1.assert)('value' in configValueSource);
-            if (configName === 'prerender' && typeof configValueSource.value === 'boolean')
-                return;
-            pageConfigGlobalValues[configName] = configValueSource.value;
-        }
-    }));
-    const vikeConfigGlobal = resolveVikeConfigGlobal(vikeVitePluginOptions, pageConfigGlobalValues);
-    {
-        (0, utils_js_1.assert)((0, utils_js_1.isObject)(vikeVitePluginOptions));
-        Object.entries(vikeVitePluginOptions).forEach(([configName, value]) => {
-            if (pageConfigGlobal.configValueSources[configName])
-                return;
-            pageConfigGlobal.configValueSources[configName] = [];
-            pageConfigGlobal.configValueSources[configName].push({
-                value,
-                configEnv: { config: true },
-                definedAtFilePath: {
-                    ...(0, getFilePath_js_1.getFilePathResolved)({
-                        userRootDir,
-                        filePathAbsoluteUserRootDir: '/vite.config.js'
-                    }),
-                    fileExportPathToShowToUser: null
-                },
-                locationId: '/',
-                isOverriden: false,
-                valueIsImportedAtRuntime: false,
-                valueIsDefinedByPlusFile: false
-            });
-        });
-    }
-    return { pageConfigGlobal, pageConfigGlobalValues, vikeConfigGlobal };
-}
 async function resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded) {
     const sourcesInfo = [];
     // interfaceFilesRelevant is sorted by sortAfterInheritanceOrder()
@@ -708,7 +717,7 @@ function isDefiningPageConfig(configName) {
     return ['Page', 'route'].includes(configName);
 }
 function getConfigDefinitions(interfaceFilesRelevant) {
-    const configDefinitionsMerged = { ...configDefinitionsBuiltIn_js_1.configDefinitionsBuiltIn };
+    const configDefinitionsMerged = { ...configDefinitionsBuiltIn };
     Object.entries(interfaceFilesRelevant)
         .reverse()
         .forEach(([_locationId, interfaceFiles]) => {
@@ -1037,13 +1046,20 @@ function isLoadableAtBuildTime(configDef) {
     return !!configDef.env.config && !configDef._valueIsFilePath;
 }
 function isGlobalConfig(configName) {
+    // TODO/now
     if (configName === 'prerender')
         return false;
     const configNamesGlobal = getConfigNamesGlobal();
     return (0, utils_js_1.includes)(configNamesGlobal, configName);
 }
 function getConfigNamesGlobal() {
-    return Object.keys(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal);
+    return Object.keys(configDefinitionsBuiltInGlobal);
+}
+function getConfigDefinitionsBuiltInGlobal() {
+    return (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInAll).filter(([_configName, configDef]) => configDef.global !== undefined));
+}
+function getConfigDefinitionsBuiltIn() {
+    return (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInAll).filter(([_configName, configDef]) => configDef.global !== true));
 }
 function assertConfigExists(configName, configNamesRelevant, filePathToShowToUser) {
     const configNames = [...configNamesRelevant, ...getConfigNamesGlobal()];
@@ -1071,23 +1087,15 @@ function sortConfigValueSources(configValueSources, locationIdPage) {
 function getConfigValueInterfaceFile(interfaceFile, configName) {
     return interfaceFile.fileExportsByConfigName[configName]?.configValue;
 }
-// TODO: refactor code below
+// TODO/now: refactor code below
 function resolveVikeConfigGlobal(vikeVitePluginOptions, pageConfigGlobalValues) {
-    // TODO/v1-release: remove
-    assertVikeConfigGlobal(vikeVitePluginOptions, ({ prop, errMsg }) => `vite.config.js > vike option ${prop} ${errMsg}`);
-    const configs = [vikeVitePluginOptions];
-    assertVikeConfigGlobal(pageConfigGlobalValues, ({ prop, errMsg }) => {
-        // Can we add the config file path ?
-        return `config ${picocolors_1.default.cyan(prop)} ${errMsg}`;
-    });
-    configs.push(pageConfigGlobalValues);
+    const configs = [vikeVitePluginOptions, pageConfigGlobalValues];
     const vikeConfigGlobal = {
         disableAutoFullBuild: pickFirst(configs.map((c) => c.disableAutoFullBuild)) ?? null,
         prerender: resolvePrerenderOptions(configs),
         includeAssetsImportedByServer: pickFirst(configs.map((c) => c.includeAssetsImportedByServer)) ?? true,
         baseServer: pickFirst(configs.map((c) => c.baseServer)) ?? null,
         baseAssets: pickFirst(configs.map((c) => c.baseAssets)) ?? null,
-        redirects: merge(configs.map((c) => c.redirects)) ?? {},
         disableUrlNormalization: pickFirst(configs.map((c) => c.disableUrlNormalization)) ?? false,
         trailingSlash: pickFirst(configs.map((c) => c.trailingSlash)) ?? false
     };
@@ -1108,84 +1116,6 @@ function resolvePrerenderOptions(configs) {
 function isObject2(p) {
     return typeof p === 'object';
 }
-function merge(objs) {
-    const obj = {};
-    objs.forEach((e) => {
-        Object.assign(obj, e);
-    });
-    return obj;
-}
 function pickFirst(arr) {
     return arr.filter((v) => v !== undefined)[0];
 }
-function assertVikeConfigGlobal(vikeConfigGlobal, wrongUsageMsg) {
-    const wrongUsageError = check(vikeConfigGlobal);
-    if (wrongUsageError) {
-        (0, utils_js_1.assertUsage)(false, wrongUsageMsg(wrongUsageError));
-    }
-}
-function check(vikeConfigGlobal) {
-    (0, utils_js_1.assert)((0, utils_js_1.isObject)(vikeConfigGlobal));
-    {
-        const prop = 'disableUrlNormalization';
-        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
-            return { prop, errMsg: 'should be a boolean' };
-    }
-    {
-        const prop = 'trailingSlash';
-        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
-            return { prop, errMsg: 'should be a boolean' };
-    }
-    {
-        const prop = 'redirects';
-        const { redirects } = vikeConfigGlobal;
-        if (!(redirects === undefined ||
-            ((0, utils_js_1.isObject)(redirects) && Object.values(redirects).every((v) => typeof v === 'string'))))
-            return { prop, errMsg: 'should be an object of strings' };
-    }
-    {
-        const prop = 'disableAutoFullBuild';
-        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') &&
-            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined') &&
-            !(vikeConfigGlobal[prop] === 'prerender'))
-            return { prop, errMsg: "should be a boolean or 'prerender'" };
-    }
-    {
-        const prop = 'includeAssetsImportedByServer';
-        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
-            return { prop, errMsg: 'should be a boolean' };
-    }
-    {
-        const prop = 'prerender';
-        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'object') &&
-            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') &&
-            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
-            return { prop, errMsg: 'should be an object or a boolean' };
-    }
-    const configVikePrerender = vikeConfigGlobal.prerender;
-    if (typeof configVikePrerender === 'object') {
-        {
-            const p = 'partial';
-            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'noExtraDir';
-            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'disableAutoRun';
-            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'parallel';
-            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') &&
-                !(0, utils_js_1.hasProp)(configVikePrerender, p, 'number') &&
-                !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
-                return { prop: `prerender.${p}`, errMsg: 'should be a boolean or a number' };
-        }
-    }
-    return null;
-}

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

@@ -33,7 +33,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     const importStatements = [];
     const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: false }, ''));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
     lines.push('};');
     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))}'`);

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

@@ -35,7 +35,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
         lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: true }, '    '));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
         lines.push(`    },`);
         lines.push(`  },`);
     });
@@ -45,7 +45,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
 function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: true }, '    '));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;