vike 0.4.236 → 0.4.237-commit-85e89b1

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigsEager.js → generateVirtualFileGlobalEntry.js}

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFilePageConfigsEager = getVirtualFilePageConfigsEager;
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+exports.generateVirtualFileGlobalEntry = generateVirtualFileGlobalEntry;
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const debug_js_1 = require("./debug.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
-const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
-async function getVirtualFilePageConfigsEager(isForClientSide, isDev, id, isClientRouting) {
+async function generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouting) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)(true);
     const { _pageConfigs: pageConfigs, _pageConfigGlobal: pageConfigGlobal } = vikeConfig;
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
@@ -21,6 +20,10 @@ function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isCl
     lines.push('export const pageConfigGlobalSerialized = {');
     lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv));
     lines.push('};');
+    if (!isForClientSide && isDev) {
+        // https://vite.dev/guide/api-environment-frameworks.html
+        lines.push('if ((undefined)) (undefined).accept();');
+    }
     const code = [...importStatements, ...lines].join('\n');
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
@@ -33,11 +36,10 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    pageId: ${JSON.stringify(pageId)},`);
         lines.push(`    isErrorPage: ${JSON.stringify(isErrorPage)},`);
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
-        const virtualFileId = JSON.stringify((0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, isForClientSide));
-        const load = `() => ({ moduleId: ${virtualFileId}, moduleExports: import(${virtualFileId}) })`;
-        lines.push(`    loadConfigLazy: ${load},`);
+        const virtualFileId = JSON.stringify((0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId, isForClientSide }));
+        lines.push(`    loadVirtualFilePageEntry: () => ({ moduleId: ${virtualFileId}, moduleExportsPromise: import(${virtualFileId}) }),`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '    ', true));
         lines.push(`    },`);
         lines.push(`  },`);
     });
@@ -47,7 +49,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
 function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '    ', null));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFileEntry.js → generateVirtualFileGlobalEntryWithOldDesign.js}

@@ -3,22 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFileEntry = getVirtualFileEntry;
+exports.generateVirtualFileGlobalEntryWithOldDesign = generateVirtualFileGlobalEntryWithOldDesign;
 const utils_js_1 = require("../../utils.js");
-const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const vite_1 = require("vite");
 const fileTypes_js_1 = require("../../../../shared/getPageFiles/fileTypes.js");
 const node_path_1 = __importDefault(require("node:path"));
-const getVirtualFilePageConfigsEager_js_1 = require("./getVirtualFilePageConfigsEager.js");
+const generateVirtualFileGlobalEntry_js_1 = require("./generateVirtualFileGlobalEntry.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
-async function getVirtualFileEntry(id, options, config, isDev) {
-    const idParsed = (0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id);
-    (0, utils_js_1.assert)(idParsed);
+const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
+async function generateVirtualFileGlobalEntryWithOldDesign(id, options, config, env, isDev) {
+    const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+    (0, utils_js_1.assert)(idParsed && idParsed.type === 'global-entry');
     const { isForClientSide, isClientRouting } = idParsed;
-    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options));
+    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, env));
     const code = await getCode(config, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
@@ -71,7 +71,7 @@ export const pageFilesExportNamesEager = {};
 export const pageFilesList = [];
 export const neverLoaded = {};
 
-${await (0, getVirtualFilePageConfigsEager_js_1.getVirtualFilePageConfigsEager)(isForClientSide, isDev, id, isClientRouting)}
+${await (0, generateVirtualFileGlobalEntry_js_1.generateVirtualFileGlobalEntry)(isForClientSide, isDev, id, isClientRouting)}
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
@@ -96,7 +96,7 @@ ${await (0, getVirtualFilePageConfigsEager_js_1.getVirtualFilePageConfigsEager)(
             fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
         }
     });
-    const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+    const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
     if (includeAssetsImportedByServer && isForClientSide) {
         fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
     }
@@ -173,7 +173,7 @@ function getGlobRoots(config) {
     const globRoots = [
         {
             includeDir: '/',
-            excludeDir: node_path_1.default.posix.relative(config.root, (0, getOutDirs_js_1.getOutDirs)(config).outDirRoot),
+            excludeDir: node_path_1.default.posix.relative(config.root, (0, getOutDirs_js_1.getOutDirs)(config, undefined).outDirRoot),
         },
     ];
     return globRoots;

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigLazy.js → generateVirtualFilePageEntry.js}

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFilePageConfigLazy = getVirtualFilePageConfigLazy;
+exports.generateVirtualFilePageEntry = generateVirtualFilePageEntry;
 const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
-const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
 const handleAssetsManifest_js_1 = require("../pluginBuild/handleAssetsManifest.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
-const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
-async function getVirtualFilePageConfigLazy(id, isDev, config) {
-    const result = (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id);
-    (0, utils_js_1.assert)(result);
+const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
+async function generateVirtualFilePageEntry(id, isDev, config) {
+    const result = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+    (0, utils_js_1.assert)(result && result.type === 'page-entry');
     /* This assertion fails when using includeAssetsImportedByServer
     {
       const isForClientSide = !config.build.ssr
@@ -35,20 +34,20 @@ async function getVirtualFilePageConfigLazy(id, isDev, config) {
             throw (0, utils_js_1.getProjectError)('Outdated request');
         //*/
     }
-    const code = getLoadConfigLazy(pageConfig, isForClientSide, pageId, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config), config, isDev);
+    const code = getCode(pageConfig, isForClientSide, pageId, (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config), config, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getLoadConfigLazy(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
+function getCode(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
     const lines = [];
     const importStatements = [];
     const filesEnv = new Map();
     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, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '', false));
     lines.push('};');
     if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
-        importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, false))}'`);
+        importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId, isForClientSide: false }))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');
     return code;

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigValueSourcesRelevant = getConfigValueSourcesRelevant;
+exports.isRuntimeEnvMatch = isRuntimeEnvMatch;
+const utils_js_1 = require("../../utils.js");
+function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    let sourcesRelevant = pageConfig.configValueSources[configName];
+    if (!sourcesRelevant)
+        return [];
+    if (!configDef.cumulative) {
+        const source = sourcesRelevant[0];
+        if (source) {
+            sourcesRelevant = [source];
+        }
+        else {
+            (0, utils_js_1.assert)(sourcesRelevant.length === 0);
+        }
+    }
+    else {
+        // isOverridden() must be called before isRuntimeEnvMatch() is called (otherwise isOverridden() will return a wrong value)
+        sourcesRelevant = sourcesRelevant.filter((source) => !isOverridden(source, configName, pageConfig));
+    }
+    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
+    return sourcesRelevant;
+}
+function isRuntimeEnvMatch(configEnv, runtimeEnv) {
+    if ('isForConfig' in runtimeEnv)
+        return !!configEnv.config;
+    // Runtime
+    if (!runtimeEnv.isForClientSide) {
+        if (!configEnv.server)
+            return false;
+    }
+    else {
+        if (!configEnv.client)
+            return false;
+        if (configEnv.client === 'if-client-routing' && !runtimeEnv.isClientRouting)
+            return false;
+    }
+    // Production/development
+    if (configEnv.production !== undefined) {
+        (0, utils_js_1.assert)(typeof configEnv.production === 'boolean');
+        (0, utils_js_1.assert)(typeof runtimeEnv.isDev === 'boolean');
+        if (configEnv.production) {
+            if (runtimeEnv.isDev)
+                return false;
+        }
+        else {
+            if (!runtimeEnv.isDev)
+                return false;
+        }
+    }
+    return true;
+}
+function isOverridden(source, configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    if (configDef.cumulative)
+        return false;
+    const sources = pageConfig.configValueSources[configName];
+    (0, utils_js_1.assert)(sources);
+    const idx = sources.indexOf(source);
+    (0, utils_js_1.assert)(idx >= 0);
+    return idx > 0;
+}

package/dist/cjs/node/vite/plugins/pluginVirtualFiles.js

@@ -5,12 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginVirtualFiles = pluginVirtualFiles;
 const vite_1 = require("vite");
-const getVirtualFilePageConfigLazy_js_1 = require("./pluginVirtualFiles/getVirtualFilePageConfigLazy.js");
-const getVirtualFileEntry_js_1 = require("./pluginVirtualFiles/getVirtualFileEntry.js");
+const generateVirtualFilePageEntry_js_1 = require("./pluginVirtualFiles/generateVirtualFilePageEntry.js");
+const generateVirtualFileGlobalEntryWithOldDesign_js_1 = require("./pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js");
 const utils_js_1 = require("../utils.js");
-const virtualFiles_js_1 = require("../../shared/virtualFiles.js");
-const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
-const virtualFileEntry_js_1 = require("../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../shared/virtualFileId.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loggerNotProd_js_1 = require("../shared/loggerNotProd.js");
@@ -30,8 +28,8 @@ function pluginVirtualFiles() {
                 config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
-            if ((0, virtualFiles_js_1.isVirtualFileId)(id)) {
-                return (0, virtualFiles_js_1.resolveVirtualFileId)(id);
+            if ((0, utils_js_1.isVirtualFileId)(id)) {
+                return (0, utils_js_1.addVirtualFileIdPrefix)(id);
             }
         },
         async handleHotUpdate(ctx) {
@@ -45,18 +43,21 @@ function pluginVirtualFiles() {
             }
         },
         async load(id, options) {
-            if (!(0, virtualFiles_js_1.isVirtualFileId)(id))
+            if (!(0, utils_js_1.isVirtualFileId)(id))
                 return undefined;
-            id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+            id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            if ((0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id)) {
-                const code = await (0, getVirtualFilePageConfigLazy_js_1.getVirtualFilePageConfigLazy)(id, isDev, config);
-                return code;
-            }
-            if ((0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id)) {
-                const code = await (0, getVirtualFileEntry_js_1.getVirtualFileEntry)(id, options, config, isDev);
-                return code;
+            const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+            if (idParsed) {
+                if (idParsed.type === 'page-entry') {
+                    const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev, config);
+                    return code;
+                }
+                if (idParsed.type === 'global-entry') {
+                    const code = await (0, generateVirtualFileGlobalEntryWithOldDesign_js_1.generateVirtualFileGlobalEntryWithOldDesign)(id, options, config, this.environment, isDev);
+                    return code;
+                }
             }
         },
         configureServer(server) {
@@ -169,7 +170,7 @@ function reloadConfig(filePath, config, op, server) {
 }
 function getVikeVirtualFiles(server) {
     const vikeVirtualFiles = Array.from(server.moduleGraph.urlToModuleMap.keys())
-        .filter((url) => (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(url) || (0, virtualFileEntry_js_1.isVirtualFileIdEntry)(url))
+        .filter((url) => (0, virtualFileId_js_1.parseVirtualFileId)(url))
         .map((url) => {
         const mod = server.moduleGraph.urlToModuleMap.get(url);
         (0, utils_js_1.assert)(mod);

package/dist/cjs/node/vite/shared/findPageFiles.js

@@ -10,7 +10,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getOutDirs_js_1 = require("./getOutDirs.js");
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
-    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     const timeBase = new Date().getTime();
     let pageFiles = await (0, tinyglobby_1.glob)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensionPattern}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + (0, utils_js_1.toPosixPath)(p));

package/dist/cjs/node/vite/shared/{resolveClientEntriesDev.js → getClientEntrySrcDev.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveClientEntriesDev = resolveClientEntriesDev;
+exports.getClientEntrySrcDev = getClientEntrySrcDev;
 const utils_js_1 = require("../utils.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-function resolveClientEntriesDev(clientEntry, viteDevServer) {
+function getClientEntrySrcDev(clientEntry, viteDevServer) {
     let userRootDir = viteDevServer.config.root;
     (0, utils_js_1.assert)(userRootDir);
     userRootDir = (0, utils_js_1.toPosixPath)(userRootDir);

package/dist/cjs/node/vite/shared/getMagicString.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMagicString = getMagicString;
+const magic_string_1 = __importDefault(require("magic-string"));
+// Used everywhere instead of `new MagicString()` for consistent source map generation
+function getMagicString(code, id) {
+    const magicString = new magic_string_1.default(code);
+    const getMagicStringResult = () => {
+        return {
+            code: magicString.toString(),
+            map: magicString.generateMap({ hires: true, source: id }),
+        };
+    };
+    return { magicString, getMagicStringResult };
+}

package/dist/cjs/node/vite/shared/getManifestFilePathRelative.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getManifestFilePathRelative = getManifestFilePathRelative;
+const utils_js_1 = require("../utils.js");
+function getManifestFilePathRelative(manifestConfig) {
+    (0, utils_js_1.assert)(['string', 'boolean'].includes(typeof manifestConfig));
+    (0, utils_js_1.assert)(manifestConfig !== false);
+    const manifestFileRelative = typeof manifestConfig === 'string' ? manifestConfig : '.vite/manifest.json';
+    return manifestFileRelative;
+}

package/dist/cjs/node/vite/shared/getOutDirs.js

@@ -5,23 +5,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
+exports.resolveOutDir_configEnvironment = resolveOutDir_configEnvironment;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
 const isViteServerBuild_js_1 = require("./isViteServerBuild.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
-    const configEnv = viteEnv?.config ?? configGlobal;
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromViteResolvedConfig(configEnv);
-    if (!isOutDirRoot(outDir))
-        assertOutDirResolved(outDir, configEnv);
-    const outDirs = getOutDirsAll(outDir, configEnv.root);
+    const outDir = getOutDirFromResolvedConfig(configGlobal);
+    assertOutDirResolved(outDir, configGlobal, viteEnv);
+    const outDirs = getOutDirsAll(outDir, configGlobal.root);
     return outDirs;
 }
+function resolveOutDir_configEnvironment(configGlobal, envName, configEnv) {
+    (0, utils_js_1.assert)(configGlobal && envName && configEnv);
+    const viteEnv = { name: envName, config: configEnv };
+    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(configGlobal, viteEnv);
+    return resolveOutDir(configEnv, isServerSide);
+}
 /** Appends `client/` or `server/` to `config.build.outDir` */
-function resolveOutDir(config, isSSR) {
+function resolveOutDir(config, isServerSide) {
     debug('resolveOutDir()', new Error().stack);
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config) || isSSR;
     debug('isServerSide', isServerSide);
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     debug('outDir', outDir);
@@ -103,14 +107,16 @@ function isOutDirRoot(outDirRot) {
 function assertIsNotOutDirRoot(outDir) {
     (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server'));
 }
-/** Assert that `outDir` ends with `/server` or `/client` */
-function assertOutDirResolved(outDir, config) {
+/** Assert that `outDir` ends with the correct directory `/server` or `/client` */
+function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (0, utils_js_1.assertPosixPath)(outDir);
-    assertIsNotOutDirRoot(outDir);
+    if (isOutDirRoot(outDir))
+        return;
+    (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server')); // we normalized outDir
     (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
-    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(configGlobal, viteEnv)) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
@@ -124,7 +130,7 @@ function getOutDirFromViteUserConfig(config) {
     outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function getOutDirFromViteResolvedConfig(config) {
+function getOutDirFromResolvedConfig(config) {
     let outDir = config.build.outDir;
     (0, utils_js_1.assert)(outDir);
     outDir = normalizeOutDir(outDir);

package/dist/cjs/node/vite/shared/getViteConfigRuntime.js

@@ -5,7 +5,7 @@ const utils_js_1 = require("../utils.js");
 const getOutDirs_js_1 = require("./getOutDirs.js");
 function getViteConfigRuntime(config) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(config, '_baseViteOriginal', 'string'));
-    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot);
     const viteConfigRuntime = {
         root: config.root,

package/dist/cjs/node/vite/shared/isViteServerBuild.js

@@ -2,46 +2,69 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isViteServerBuild = isViteServerBuild;
 exports.isViteClientBuild = isViteClientBuild;
-exports.isViteServerBuild_options = isViteServerBuild_options;
-exports.isViteServerBuild_safe = isViteServerBuild_safe;
+exports.isViteServerBuild_withoutEnv = isViteServerBuild_withoutEnv;
 exports.isViteServerBuild_onlySsrEnv = isViteServerBuild_onlySsrEnv;
+exports.isViteServerBuild_extraSafe = isViteServerBuild_extraSafe;
 const assert_js_1 = require("../../../utils/assert.js");
-function isViteServerBuild(configGlobal, viteEnv) {
-    const configEnv = viteEnv?.config ?? configGlobal;
-    return !!configEnv?.build?.ssr;
+function isViteServerBuild_withoutEnv(configGlobal, viteEnv) {
+    (0, assert_js_1.assert)(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
+    const isServerSide1 = !viteEnv?.config.consumer ? null : viteEnv.config.consumer !== 'client';
+    const isServerSide2 = !viteEnv?.name ? null : viteEnv.name !== 'client'; // I can't think of a use case for creating another client-side environment
+    const isServerSide3 = !viteEnv ? null : !!viteEnv.config.build?.ssr;
+    const isServerSide4 = !!configGlobal.build?.ssr;
+    const debug = {
+        envIsUndefined: !viteEnv,
+        envName: viteEnv?.name ?? null,
+        envConsumer: viteEnv?.config.consumer ?? null,
+        configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
+        configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
+        isServerSide1,
+        isServerSide2,
+        isServerSide3,
+        isServerSide4,
+    };
+    if (isServerSide1 !== null) {
+        (0, assert_js_1.assert)(isServerSide1 === isServerSide2 || isServerSide2 === null, debug);
+        (0, assert_js_1.assert)(isServerSide1 === isServerSide3, debug);
+        return isServerSide1;
+    }
+    if (isServerSide2 !== null) {
+        /* This assertion can fail, seems to be a Vite bug?
+        assert(isServerSide2 === isServerSide3, debug)
+        */
+        return isServerSide2;
+    }
+    if (isServerSide3 !== null) {
+        return isServerSide3;
+    }
+    return isServerSide4;
 }
-// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
-function isViteServerBuild_onlySsrEnv(configGlobal, viteEnv) {
-    return viteEnv ? viteEnv.name === 'ssr' : isViteServerBuild(configGlobal);
+function isViteServerBuild(configGlobal, viteEnv) {
+    return isViteServerBuild_withoutEnv(configGlobal, viteEnv);
 }
 function isViteClientBuild(configGlobal, viteEnv) {
-    const yes = !isViteServerBuild(configGlobal, viteEnv);
-    const isVite5 = viteEnv === undefined;
-    if (!isVite5) {
-        const yes2 = viteEnv.name === 'client';
-        (0, assert_js_1.assert)(yes === yes2);
-    }
-    return yes;
+    return !isViteServerBuild(configGlobal, viteEnv);
 }
-function isViteServerBuild_options(options) {
-    return !!options?.ssr;
+// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
+function isViteServerBuild_onlySsrEnv(configGlobal, viteEnv) {
+    return viteEnv ? viteEnv.name === 'ssr' : isViteServerBuild(configGlobal, viteEnv);
 }
-// Vite is quite messy about setting `ssr: boolean`, thus we use an extra safe implementation for security purposes.
-// It's used for .client.js and .server.js guarantee thus we use aggressive assert() calls for added safety.
-function isViteServerBuild_safe(config, options) {
+// Vite is quite messy about setting config.build.ssr — for security purposes, we use an extra safe implementation with lots of assertions, which is needed for the .client.js and .server.js guarantee.
+function isViteServerBuild_extraSafe(config, options, viteEnv) {
     if (config.command === 'build') {
-        (0, assert_js_1.assert)(typeof config.build.ssr === 'boolean');
-        const val = config.build.ssr;
-        if (options?.ssr !== undefined)
-            (0, assert_js_1.assert)(val === options.ssr);
-        return val;
+        const res = config.build.ssr;
+        (0, assert_js_1.assert)(typeof res === 'boolean');
+        (0, assert_js_1.assert)(res === options?.ssr || options?.ssr === undefined);
+        (0, assert_js_1.assert)(res === isViteServerBuild(config, viteEnv));
+        return res;
     }
     else {
-        (0, assert_js_1.assert)(typeof options?.ssr === 'boolean');
-        const val = options.ssr;
-        /* This assert() fails (which is very unexpected).
-        if (typeof config.build.ssr === 'boolean') assert(val === config.build.ssr)
-        //*/
-        return val;
+        const res = options?.ssr;
+        (0, assert_js_1.assert)(typeof res === 'boolean');
+        /* This assertion can fail, seems to be a Vite bug? It's very unexpected.
+        if (typeof config.build.ssr === 'boolean') assert(res === config.build.ssr)
+        */
+        (0, assert_js_1.assert)(res === isViteServerBuild(config, viteEnv));
+        return res;
     }
 }

package/dist/cjs/node/vite/shared/loggerVite.js

@@ -33,7 +33,7 @@ function intercept(logType, config) {
             // We swallow Vite's message: we didn't see it add any value so far.
             //  - It can even be confusing, such as the following:
             //    ```
-            //    Error when evaluating SSR module virtual:vike:pageConfigLazy:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
+            //    Error when evaluating SSR module virtual:vike:page-entry:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
             //    ```
             (0, utils_js_1.assert)(!(0, isErrorDebug_js_1.isErrorDebug)());
             return;

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configDefinitionsBuiltIn = void 0;
 const utils_js_1 = require("../../utils.js");
 const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
+const getConfigValueSourcesRelevant_js_1 = require("../../plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js");
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true },
@@ -97,6 +98,22 @@ const configDefinitionsBuiltIn = {
     meta: {
         env: { config: true },
     },
+    serverOnlyHooks: {
+        env: { client: true },
+        eager: true,
+        _computed: (pageConfig) => {
+            const sources = ['data', 'onBeforeRender', 'onCreatePageContext']
+                .map((hookName) => (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourcesRelevant)(hookName, {
+                isForClientSide: false,
+                // TO-DO/eventually/remove-server-router: let's eventually remove support for Server Routing
+                isClientRouting: true,
+            }, pageConfig))
+                .flat(1)
+                // Server-only
+                .filter((source) => !source.configEnv.client);
+            return sources.length > 0;
+        },
+    },
     // Whether the page loads:
     //  - Vike's client runtime
     //  - User's client hooks
@@ -104,7 +121,8 @@ const configDefinitionsBuiltIn = {
     isClientRuntimeLoaded: {
         env: { server: true, client: true },
         eager: true,
-        _computed: (configValueSources) => {
+        _computed: (pageConfig) => {
+            const { configValueSources } = pageConfig;
             {
                 const source = getConfigValueSource(configValueSources, 'clientHooks');
                 if (source) {
@@ -122,15 +140,25 @@ const configDefinitionsBuiltIn = {
                 !!getConfigEnv(configValueSources, 'Page')?.client);
         },
     },
+    // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
     onBeforeRenderEnv: {
         env: { client: true },
         eager: true,
-        _computed: (configValueSources) => !isConfigSet(configValueSources, 'onBeforeRender') ? null : getConfigEnv(configValueSources, 'onBeforeRender'),
+        _computed: (pageConfig) => {
+            const { configValueSources } = pageConfig;
+            return !isConfigSet(configValueSources, 'onBeforeRender')
+                ? null
+                : getConfigEnv(configValueSources, 'onBeforeRender');
+        },
     },
+    // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
     dataEnv: {
         env: { client: true },
         eager: true,
-        _computed: (configValueSources) => !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data'),
+        _computed: (pageConfig) => {
+            const { configValueSources } = pageConfig;
+            return !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data');
+        },
     },
     hooksTimeout: {
         env: { server: true, client: true },

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js

@@ -35,9 +35,7 @@ async function crawlPlusFiles(userRootDir) {
         : // Fallback to tinyglobby for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
             filesGlob;
     (0, utils_js_1.assert)(files);
-    if (debug.isActivated) {
-        (0, utils_js_1.assert)(filesGit);
-        (0, utils_js_1.assert)(filesGlob);
+    if (debug.isActivated && filesGit && filesGlob) {
         (0, utils_js_1.assertWarning)((0, utils_js_1.deepEqual)(filesGlob.slice().sort(), filesGit.slice().sort()), "Git and glob results aren't matching.", { onlyOnce: false });
     }
     // Filter build files