vike 0.4.171-commit-75e1588 → 0.4.171-commit-6e37128

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

@@ -6,19 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.manifestTempFile = exports.analyzeClientEntries = exports.assertRollupInput = exports.buildConfig = void 0;
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
 const findPageFiles_js_1 = require("../shared/findPageFiles.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const module_1 = require("module");
-const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
 const index_js_1 = require("./importBuild/index.js");
 const prependEntriesDir_js_1 = require("../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
+const getConfigValueBuildTime_js_1 = require("../../../shared/page-configs/getConfigValueBuildTime.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
@@ -156,7 +155,7 @@ function analyzeClientEntries(pageConfigs, config) {
     let clientEntries = {};
     let clientEntryList = [];
     pageConfigs.forEach((pageConfig) => {
-        const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
+        const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean');
         if (configValue?.value) {
             hasClientRouting = true;
         }
@@ -169,7 +168,7 @@ function analyzeClientEntries(pageConfigs, config) {
             clientEntries[entryName] = entryTarget;
         }
         {
-            const clientEntry = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
+            const clientEntry = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'client', 'string')?.value ?? null;
             if (clientEntry) {
                 clientEntryList.push(clientEntry);
             }

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

@@ -4,7 +4,6 @@ exports.determineOptimizeDeps = void 0;
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
 const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const getConfigValueSourcesNotOverriden_js_1 = require("../../shared/getConfigValueSourcesNotOverriden.js");
 const buildConfig_js_1 = require("../buildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
@@ -48,20 +47,24 @@ async function getPageDeps(config, pageConfigs, isDev) {
     // V1 design
     {
         pageConfigs.forEach((pageConfig) => {
-            (0, getConfigValueSourcesNotOverriden_js_1.getConfigValueSourcesNotOverriden)(pageConfig).forEach((configValueSource) => {
-                if (!configValueSource.valueIsImportedAtRuntime)
-                    return;
-                const { definedAtFilePath, configEnv } = configValueSource;
-                if (!configEnv.client)
-                    return;
-                if (definedAtFilePath.filePathAbsoluteUserRootDir !== null) {
-                    // Vite expects entries to be filesystem absolute paths (surprisingly so).
-                    addEntry(definedAtFilePath.filePathAbsoluteFilesystem);
-                }
-                else {
-                    // Adding definedAtFilePath.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
-                    addInclude(definedAtFilePath.importPathAbsolute);
-                }
+            Object.values(pageConfig.configValueSources).forEach((sources) => {
+                sources
+                    .filter((c) => !c.isOverriden)
+                    .forEach((configValueSource) => {
+                    if (!configValueSource.valueIsImportedAtRuntime)
+                        return;
+                    const { definedAtFilePath, configEnv } = configValueSource;
+                    if (!configEnv.client)
+                        return;
+                    if (definedAtFilePath.filePathAbsoluteUserRootDir !== null) {
+                        // Vite expects entries to be filesystem absolute paths (surprisingly so).
+                        addEntry(definedAtFilePath.filePathAbsoluteFilesystem);
+                    }
+                    else {
+                        // Adding definedAtFilePath.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
+                        addInclude(definedAtFilePath.importPathAbsolute);
+                    }
+                });
             });
         });
     }

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

@@ -22,7 +22,7 @@ const configDefinitionsBuiltIn = {
         env: { server: true }
     },
     onBeforePrerenderStart: {
-        env: { server: true }
+        env: { server: true, production: true }
     },
     Page: {
         env: { server: true, client: true }
@@ -48,7 +48,7 @@ const configDefinitionsBuiltIn = {
     },
     client: {
         // The value of the client config is merely the file path to the client entry file, which is only needed on the sever-side
-        env: { server: true },
+        env: { server: true, config: true },
         _valueIsFilePath: true
     },
     clientRouting: {
@@ -97,7 +97,7 @@ const configDefinitionsBuiltIn = {
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
 const configDefinitionsBuiltInGlobal = {
     onPrerenderStart: {
-        env: { server: true }
+        env: { server: true, production: true }
     },
     onBeforeRoute: {
         env: { server: true, client: 'if-client-routing', eager: true }

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

@@ -15,12 +15,12 @@ const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
 const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAt_js_1 = require("../../../../../shared/page-configs/getConfigDefinedAt.js");
-const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
 const crawlPlusFiles_js_1 = require("./getVikeConfig/crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.js");
 const resolvePointerImport_js_1 = require("./getVikeConfig/resolvePointerImport.js");
 const getFilePath_js_1 = require("../../../shared/getFilePath.js");
+const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -171,7 +171,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
                 //  - 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)) {
+                if (configDef && isLoadableAtBuildTime(configDef)) {
                     await (0, loadFileAtConfigTime_js_1.loadValueFile)(interfaceFile, configName, userRootDir);
                 }
             }
@@ -246,6 +246,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
             const dummyData = {
                 pageConfigs: [],
                 pageConfigGlobal: {
+                    configDefinitions: {},
                     configValueSources: {}
                 },
                 globalVikeConfig: {}
@@ -271,7 +272,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            if (!isConfigEnv(configDef, configName))
+            if (!isLoadableAtBuildTime(configDef))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
             if (isAlreadyLoaded)
@@ -293,14 +294,13 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
         const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitions);
         const configValuesComputed = getComputed(configValueSources, configDefinitions);
-        const configValues = getConfigValues(configValueSources, configValuesComputed, configDefinitions);
         const pageConfig = {
             pageId: locationId,
             isErrorPage,
             routeFilesystem,
+            configDefinitions,
             configValueSources,
-            configValuesComputed,
-            configValues
+            configValuesComputed
         };
         return pageConfig;
     }));
@@ -333,7 +333,7 @@ function assertOnBeforeRenderEnv(pageConfig) {
     if (!onBeforeRenderConfig)
         return;
     const onBeforeRenderEnv = onBeforeRenderConfig.configEnv;
-    const isClientRouting = !!pageConfig.configValues.clientRouting?.value;
+    const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean');
     // When using Server Routing, loading a onBeforeRender() hook on the client-side hasn't any effect (the Server Routing's client runtime never calls it); it unnecessarily bloats client bundle sizes
     (0, utils_js_1.assertUsage)(!(onBeforeRenderEnv.client && !isClientRouting), `Page ${pageConfig.pageId} has an onBeforeRender() hook with env ${picocolors_1.default.cyan(JSON.stringify(onBeforeRenderEnv))} which doesn't make sense because the page is using Server Routing: onBeforeRender() can be run in the client only when using Client Routing.`);
 }
@@ -394,6 +394,7 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
     }
     const globalVikeConfig = {};
     const pageConfigGlobal = {
+        configDefinitions: configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal,
         configValueSources: {}
     };
     await Promise.all((0, utils_js_1.objectEntries)(configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal).map(async ([configName, configDef]) => {
@@ -427,7 +428,15 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
         const add = (interfaceFile) => {
             (0, utils_js_1.assert)(!visited.has(interfaceFile));
             visited.add(interfaceFile);
-            sourcesInfo.push([configName, interfaceFile, configDef, userRootDir, importedFilesLoaded]);
+            const isHighestInheritancePrecedence = sourcesInfo.length === 0;
+            sourcesInfo.push([
+                configName,
+                interfaceFile,
+                configDef,
+                userRootDir,
+                importedFilesLoaded,
+                isHighestInheritancePrecedence
+            ]);
         };
         // Main resolution logic
         {
@@ -498,7 +507,7 @@ function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden,
 function isInterfaceFileUserLand(interfaceFile) {
     return (interfaceFile.isConfigFile && !interfaceFile.isConfigExtend) || interfaceFile.isValueFile;
 }
-async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded) {
+async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded, isHighestInheritancePrecedence) {
     const conf = interfaceFile.fileExportsByConfigName[configName];
     (0, utils_js_1.assert)(conf);
     const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
@@ -507,6 +516,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
         ...interfaceFile.filePath,
         fileExportPathToShowToUser: ['default', configName]
     };
+    const isOverriden = configDef.cumulative ? false : !isHighestInheritancePrecedence;
     // +client.js
     if (configDef._valueIsFilePath) {
         let definedAtFilePath;
@@ -533,7 +543,8 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             valueIsFilePath: true,
             configEnv,
             valueIsImportedAtRuntime: true,
-            valueIsDefinedByValueFile: false,
+            valueIsDefinedByPlusFile: false,
+            isOverriden,
             definedAtFilePath
         };
         return configValueSource;
@@ -549,11 +560,12 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 locationId,
                 configEnv,
                 valueIsImportedAtRuntime: true,
-                valueIsDefinedByValueFile: false,
+                valueIsDefinedByPlusFile: false,
+                isOverriden,
                 definedAtFilePath: pointerImport
             };
             // Load pointer import
-            if (isConfigEnv(configDef, configName) &&
+            if (isLoadableAtBuildTime(configDef) &&
                 // The value of `extends` was already loaded and already used: we don't need the value of `extends` anymore
                 configName !== 'extends') {
                 if (pointerImport.filePathAbsoluteFilesystem) {
@@ -573,7 +585,8 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             value: configValue,
             configEnv,
             valueIsImportedAtRuntime: false,
-            valueIsDefinedByValueFile: false,
+            valueIsDefinedByPlusFile: false,
+            isOverriden,
             definedAtFilePath: definedAtFilePath_
         };
         return configValueSource;
@@ -586,7 +599,8 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             locationId,
             configEnv,
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
-            valueIsDefinedByValueFile: true,
+            valueIsDefinedByPlusFile: true,
+            isOverriden,
             definedAtFilePath: {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: configName === interfaceFile.configName
@@ -882,59 +896,6 @@ function isVikeConfigFile(filePath) {
     return !!getConfigName(filePath);
 }
 exports.isVikeConfigFile = isVikeConfigFile;
-function getConfigValues(configValueSources, configValuesComputed, configDefinitions) {
-    const configValues = {};
-    Object.entries(configValuesComputed).forEach(([configName, configValueComputed]) => {
-        configValues[configName] = {
-            type: 'computed',
-            value: configValueComputed.value,
-            definedAtData: null
-        };
-    });
-    Object.entries(configValueSources).forEach(([configName, sources]) => {
-        const configDef = configDefinitions[configName];
-        (0, utils_js_1.assert)(configDef);
-        if (!configDef.cumulative) {
-            const configValueSource = sources[0];
-            if ('value' in configValueSource) {
-                configValues[configName] = {
-                    type: 'standard',
-                    value: configValueSource.value,
-                    definedAtData: getDefinedAtFile(configValueSource)
-                };
-            }
-        }
-        else {
-            const value = mergeCumulative(configName, sources);
-            const definedAtData = sources.map((source) => getDefinedAtFile(source));
-            (0, utils_js_1.assert)(value.length === definedAtData.length);
-            configValues[configName] = {
-                type: 'cumulative',
-                value,
-                definedAtData
-            };
-        }
-    });
-    return configValues;
-}
-function getDefinedAtFile(configValueSource) {
-    return {
-        filePathToShowToUser: configValueSource.definedAtFilePath.filePathToShowToUser,
-        fileExportPathToShowToUser: configValueSource.definedAtFilePath.fileExportPathToShowToUser
-    };
-}
-function mergeCumulative(configName, configValueSources) {
-    const configValues = [];
-    configValueSources.forEach((configValueSource) => {
-        // We could, in principle, also support cumulative for values that aren't loaded at config-time but it isn't completely trivial to implement.
-        (0, utils_js_1.assert)('value' in configValueSource);
-        // Make sure configValueSource.value is serializable
-        (0, getConfigValuesSerialized_js_1.assertConfigValueIsSerializable)(configValueSource.value, configName, getDefinedAtFile(configValueSource));
-        const { value } = configValueSource;
-        configValues.push(value);
-    });
-    return configValues;
-}
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${picocolors_1.default.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
@@ -977,13 +938,8 @@ function getConfigDefinition(configDefinitions, configName, filePathToShowToUser
 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 isLoadableAtBuildTime(configDef) {
+    return !!configDef.env.config && !configDef._valueIsFilePath;
 }
 function isGlobalConfig(configName) {
     if (configName === 'prerender')

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

@@ -6,13 +6,11 @@ const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
-const getConfigValue_js_1 = require("../../../../../shared/page-configs/getConfigValue.js");
-const getConfigValueSourcesNotOverriden_js_1 = require("../../../shared/getConfigValueSourcesNotOverriden.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
+const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
-const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
 const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
+const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
     (0, utils_js_1.assert)(result);
@@ -35,16 +33,9 @@ exports.getVirtualFilePageConfigValuesAll = getVirtualFilePageConfigValuesAll;
 function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
     const lines = [];
     const importStatements = [];
-    const isClientRouting = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-    lines.push('export const configValuesImported = [');
-    lines.push(getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements));
-    lines.push('];');
+    const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, importStatements, (configEnv, configValueSource) => isEnvMatch(configEnv, !configValueSource ? false : checkWhetherIsImport(configValueSource), {
-        isImport: false,
-        isForClientSide,
-        isClientRouting
-    })));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: false, isDev }), ''));
     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))}'`);
@@ -52,32 +43,3 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     const code = [...importStatements, ...lines].join('\n');
     return code;
 }
-function getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements) {
-    const lines = [];
-    (0, getConfigValueSourcesNotOverriden_js_1.getConfigValueSourcesNotOverriden)(pageConfig).forEach((configValueSource) => {
-        if (!isEnvMatch(configValueSource.configEnv, checkWhetherIsImport(configValueSource), {
-            isImport: true,
-            isForClientSide,
-            isClientRouting
-        }))
-            return;
-        const whitespace = '  ';
-        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configValueSource.configName, whitespace, importStatements));
-    });
-    const code = lines.join('\n');
-    return code;
-}
-function checkWhetherIsImport(configValueSource) {
-    const { valueIsImportedAtRuntime, valueIsFilePath } = configValueSource;
-    return valueIsImportedAtRuntime && !valueIsFilePath;
-}
-function isEnvMatch(configEnv, isImport, runtime) {
-    // Whether config value is imported or serialized
-    if (isImport !== runtime.isImport)
-        return false;
-    // Runtime match
-    const { isForClientSide, isClientRouting } = runtime;
-    if (!(0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: false }))
-        return false;
-    return true;
-}

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigs = void 0;
-const utils_js_1 = require("../../../utils.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const debug_js_1 = require("./debug.js");
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
-const getConfigValuesSerialized_js_1 = require("./getConfigValuesSerialized.js");
+const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
     const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, true);
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
@@ -17,16 +15,16 @@ function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isCl
     const lines = [];
     const importStatements = [];
     lines.push('export const pageConfigsSerialized = [');
-    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements));
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements));
     lines.push('];');
     lines.push('export const pageConfigGlobalSerialized = {');
-    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements));
     lines.push('};');
     const code = [...importStatements, ...lines].join('\n');
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements) {
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements) {
     const lines = [];
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -36,57 +34,19 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    isErrorPage: ${JSON.stringify(isErrorPage)},`);
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
         lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
-        // Serialized config values
         lines.push(`    configValuesSerialized: {`);
-        lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true })));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
         lines.push(`    },`);
-        // Imported config values
-        const whitespace = '    ';
-        lines.push(`${whitespace}configValuesImported: [`);
-        Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
-            const configValue = pageConfig.configValues[configName];
-            if (configValue)
-                return;
-            const configValueSource = sources[0];
-            (0, utils_js_1.assert)(configValueSource);
-            if (!configValueSource.configEnv.eager)
-                return;
-            if (!(0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configValueSource.configEnv, { isForClientSide, isClientRouting, isEager: true }))
-                return;
-            lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, importStatements));
-        });
-        lines.push(`${whitespace}],`);
         lines.push(`  },`);
     });
     const code = lines.join('\n');
     return code;
 }
-function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements) {
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements) {
     const lines = [];
-    /* Nothing (yet)
-    lines.push(`  configValuesSerialized: {`)
-    lines.push(`  },`)
-    */
-    lines.push(`  configValuesImported: [`);
-    (0, utils_js_1.objectEntries)(pageConfigGlobal.configValueSources).forEach(([configName, sources]) => {
-        if (configName === 'onBeforeRoute') {
-            // if( isForClientSide && !isClientRouting ) return
-        }
-        else if (configName === 'onPrerenderStart') {
-            if (isDev || isForClientSide) {
-                // Only load onPrerenderStart() in server production runtime
-                return;
-            }
-        }
-        else {
-            (0, utils_js_1.assert)(false);
-        }
-        const configValueSource = sources[0];
-        (0, utils_js_1.assert)(configValueSource);
-        const whitespace = '    ';
-        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, importStatements));
-    });
-    lines.push(`  ],`);
+    lines.push(`  configValuesSerialized: {`);
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
+    lines.push(`  },`);
     const code = lines.join('\n');
     return code;
 }

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

@@ -16,6 +16,12 @@ function isRuntimeEnvMatch(configEnv, runtime) {
     // Eager
     if (runtime.isEager !== !!configEnv.eager)
         return false;
+    // Production/development
+    if (
+    //
+    (configEnv.production === true && runtime.isDev) ||
+        (configEnv.production === false && !runtime.isDev))
+        return false;
     return true;
 }
 exports.isRuntimeEnvMatch = isRuntimeEnvMatch;

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

@@ -44,7 +44,7 @@ const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const getConfigValue_js_1 = require("../../shared/page-configs/getConfigValue.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
-const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../../shared/getPageContextUrlComputed.js");
 const abort_js_1 = require("../../shared/route/abort.js");
 const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFilesServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
@@ -52,6 +52,7 @@ const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
 const executeHook_js_1 = require("../../shared/hooks/executeHook.js");
+const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.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.
@@ -142,7 +143,7 @@ async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerend
     // V1 design
     pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
-        const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, configName, 'boolean');
+        const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
             const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData);
             (0, utils_js_1.assert)(configValueFilePathToShowToUser);
@@ -268,9 +269,9 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
             prerenderContext.pageContexts.push(pageContextNew);
             if (pageContext) {
                 (0, utils_js_1.objectAssign)(pageContextNew, {
-                    _pageContextAlreadyProvidedByOnPrerenderHook: true,
-                    ...pageContext
+                    _pageContextAlreadyProvidedByOnPrerenderHook: true
                 });
+                (0, utils_js_1.objectAssign)(pageContextNew, pageContext);
             }
         });
     })));
@@ -328,14 +329,11 @@ function createPageContext(urlOriginal, renderContext, prerenderContext) {
         _prerenderContext: prerenderContext
     };
     const pageContextInit = {
-        urlOriginal,
-        ...prerenderContext.pageContextInit
+        urlOriginal
     };
+    (0, utils_js_1.objectAssign)(pageContextInit, prerenderContext.pageContextInit);
     {
-        const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext, {
-            // We set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in a onPrerenderStart() hook, e.g. /examples/i18n/
-            urlComputedPropsNonEnumerable: true
-        });
+        const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
     return pageContext;
@@ -410,6 +408,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
     const docLink = 'https://vike.dev/i18n#pre-rendering';
+    // Set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in onPrerenderStart() hook, e.g. /examples/i18n/
+    const { restoreEnumerable, addPageContextComputedUrl } = makePageContextComputedUrlNonEnumerable(prerenderContext.pageContexts);
     let result = await (0, executeHook_js_1.executeHook)(() => hookFn({
         pageContexts: prerenderContext.pageContexts,
         // TODO/v1-release: remove warning
@@ -421,6 +421,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
             return prerenderContext.pageContexts;
         }
     }), onPrerenderStartHook, null);
+    restoreEnumerable();
     if (result === null || result === undefined) {
         return;
     }
@@ -458,9 +459,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
                 hookName
             };
         }
-        // Restore as URL computed props are lost when user makes a pageContext copy
-        (0, addUrlComputedProps_js_1.addUrlComputedProps)(pageContext);
     });
+    addPageContextComputedUrl(prerenderContext.pageContexts);
 }
 async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete) {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
@@ -502,7 +502,7 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
             if (pageContext._pageConfigs.length > 0) {
                 const pageConfig = pageContext._pageConfigs.find((p) => p.pageId === pageId);
                 (0, utils_js_1.assert)(pageConfig);
-                usesClientRouter = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+                usesClientRouter = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
                 usesClientRouter = globalContext.pluginManifest.usesClientRouter;
@@ -743,3 +743,23 @@ 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 makePageContextComputedUrlNonEnumerable(pageContexts) {
+    change(false);
+    return { restoreEnumerable, addPageContextComputedUrl };
+    function restoreEnumerable() {
+        change(true);
+    }
+    function addPageContextComputedUrl(pageContexts) {
+        // Add URL computed props to the user-generated pageContext copies
+        pageContexts.forEach((pageContext) => {
+            const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContext);
+            (0, utils_js_1.objectAssign)(pageContext, pageContextUrlComputed);
+        });
+    }
+    function change(enumerable) {
+        pageContexts.forEach((pageContext) => {
+            (0, utils_js_1.changeEnumerable)(pageContext, 'urlPathname', enumerable);
+            (0, utils_js_1.changeEnumerable)(pageContext, 'urlParsed', enumerable);
+        });
+    }
+}

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

@@ -31,3 +31,4 @@ __exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
 __exportStar(require("../../utils/assertPathFilesystemAbsolute.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
+__exportStar(require("../../utils/changeEnumerable.js"), exports);