vike 0.4.237 → 0.4.238-commit-5762291

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

@@ -1,16 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginEnvVars = pluginEnvVars;
-const magic_string_1 = __importDefault(require("magic-string"));
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
+const getMagicString_js_1 = require("../shared/getMagicString.js");
 // TO-DO/eventually:
 // - Make ({}) work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -42,8 +38,8 @@ function pluginEnvVars() {
             if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
-            const magicString = new magic_string_1.default(code);
+            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
+            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
             // Find & check
             const replacements = Object.entries(envsAll)
                 .filter(([key]) => {
@@ -81,14 +77,11 @@ function pluginEnvVars() {
                 .filter(utils_js_1.isNotNullish);
             // Apply
             replacements.forEach(({ regExpStr, replacement }) => {
-                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExpStr, replacement);
+                magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
             });
             if (!magicString.hasChanged())
                 return null;
-            return {
-                code: magicString.toString(),
-                map: magicString.generateMap({ hires: true, source: id }),
-            };
+            return getMagicStringResult();
         },
     };
 }

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

@@ -16,8 +16,8 @@ const handleAssetsManifest_js_1 = require("./pluginBuild/handleAssetsManifest.js
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-const getPageAssets_js_1 = require("../../runtime/renderPage/getPageAssets.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
+const retrievePageAssetsProd_js_1 = require("../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -45,9 +45,9 @@ function pluginExtractAssets() {
                     (0, assertV1Design_js_1.assertV1Design)(vikeConfig._pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
-                const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+                const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
                 (0, utils_js_1.assert)(includeAssetsImportedByServer);
-                (0, utils_js_1.assert)(!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options));
+                (0, utils_js_1.assert)(!(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -64,7 +64,7 @@ function pluginExtractAssets() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if ((0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options)) {
+                if ((0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
                     (0, utils_js_1.assert)(importer === undefined || !extractAssetsRE.test(importer));
@@ -79,7 +79,7 @@ function pluginExtractAssets() {
                 if (!extractAssetsRE.test(importer)) {
                     return;
                 }
-                const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+                const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
                 (0, utils_js_1.assert)(includeAssetsImportedByServer);
                 let resolution = null;
                 try {
@@ -141,7 +141,7 @@ function pluginExtractAssets() {
             async configResolved(config_) {
                 config = config_;
                 vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config);
+                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)();
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
                     (0, utils_js_1.assertUsage)(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');

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

@@ -6,19 +6,20 @@ exports.isUsingClientRouter = isUsingClientRouter;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:pluginExtractExportNames');
 const globalObject = (0, utils_js_1.getGlobalObject)('plugins/pluginExtractExportNames.ts', {});
 function pluginExtractExportNames() {
     let isDev = false;
+    let config;
     return {
         name: 'vike:pluginExtractExportNames',
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);
-            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options);
+            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
                 debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);
@@ -28,6 +29,9 @@ function pluginExtractExportNames() {
         configureServer() {
             isDev = true;
         },
+        configResolved(config_) {
+            config = config_;
+        },
         config() {
             if (debug.isActivated) {
                 return { logLevel: 'silent' };

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

@@ -12,6 +12,7 @@ const getFilePath_js_1 = require("../shared/getFilePath.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 function pluginFileEnv() {
     let config;
     let viteDevServer;
@@ -33,7 +34,7 @@ function pluginFileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(id, !!options?.ssr, importers, 
+            assertFileEnv(id, (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options), importers, 
             // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
             true);
         },
@@ -45,7 +46,7 @@ function pluginFileEnv() {
                 return;
             if (skip(id))
                 return;
-            const isServerSide = !!options?.ssr;
+            const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);
@@ -71,7 +72,7 @@ function pluginFileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(moduleId, (0, isViteServerSide_js_1.isViteServerSide)(config, this.environment), importers, false);
             });
         },
         configResolved(config_) {

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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginNonRunnableDev = pluginNonRunnableDev;
 const utils_js_1 = require("../utils.js");
-const resolveClientEntriesDev_js_1 = require("../shared/resolveClientEntriesDev.js");
-const retrieveAssetsDev_js_1 = require("../../runtime/renderPage/getPageAssets/retrieveAssetsDev.js");
+const retrievePageAssetsDev_js_1 = require("../../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js");
 const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
 const getMagicString_js_1 = require("../shared/getMagicString.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
@@ -12,11 +11,8 @@ function getViteRpcFunctions(viteDevServer) {
         async transformIndexHtmlRPC(html) {
             return await viteDevServer.transformIndexHtml('/', html);
         },
-        // TODO/now: dedupe retrievePageAssetsDevRPC and retrievePageAssetsDev()
         async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
-            const clientEntriesSrc = clientEntries.map((clientEntry) => (0, resolveClientEntriesDev_js_1.resolveClientEntriesDev)(clientEntry, viteDevServer));
-            const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
-            return { clientEntriesSrc, assetUrls };
+            return await (0, retrievePageAssetsDev_js_1.retrievePageAssetsDev)(viteDevServer, clientDependencies, clientEntries);
         },
         async getViteConfigRuntimeRPC() {
             return (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(viteDevServer.config);
@@ -24,7 +20,8 @@ function getViteRpcFunctions(viteDevServer) {
     };
 }
 function pluginNonRunnableDev() {
-    const runtimeGlobalContextFilePath = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/node/runtime/globalContext.js');
+    const distFileIsNonRunnableDev = (0, utils_js_1.requireResolveDistFile)('dist/esm/utils/isNonRunnableDev.js');
+    const distFileGlobalContext = (0, utils_js_1.requireResolveDistFile)('dist/esm/node/runtime/globalContext.js');
     let config;
     return {
         name: 'vike:pluginNonRunnableDev',
@@ -37,14 +34,17 @@ function pluginNonRunnableDev() {
         transform(code, id) {
             if (!config._isDev)
                 return;
-            if (id !== runtimeGlobalContextFilePath)
+            if (id !== distFileIsNonRunnableDev && id !== distFileGlobalContext)
+                return;
+            if ((0, utils_js_1.isRunnableDevEnvironment)(this.environment))
                 return;
-            const isNonRunnableDev = !(0, utils_js_1.isRunnableDevEnvironment)(this.environment);
             const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
-            if (isNonRunnableDev) {
+            if (id === distFileIsNonRunnableDev) {
+                magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(true));
+            }
+            if (id === distFileGlobalContext) {
                 magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
             }
-            magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(isNonRunnableDev));
             return getMagicStringResult();
         },
     };

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

@@ -19,12 +19,9 @@ function pluginPreview() {
     return {
         name: 'vike:pluginPreview',
         apply: utils_js_1.applyPreview,
-        config(config) {
+        config() {
             return {
                 appType: 'custom',
-                build: {
-                    outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                },
             };
         },
         async configResolved(config_) {
@@ -51,7 +48,7 @@ function pluginPreview() {
         },
     };
     function assertDist(isPrerenderingEnabledForAllPages) {
-        const { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         const dirS = [outDirRoot, outDirClient];
         if (!isPrerenderingEnabledForAllPages)
             dirS.push(outDirServer);
@@ -60,11 +57,11 @@ function pluginPreview() {
         });
     }
     function addStaticAssetsMiddleware(middlewares) {
-        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         middlewares.use((0, sirv_1.default)(outDirClient));
     }
     function addStatic404Middleware(middlewares) {
-        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         middlewares.use(config.base, (_, res, next) => {
             const file = node_path_1.default.posix.join(outDirClient, './404.html');
             if (node_fs_1.default.existsSync(file)) {

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

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginReplaceConstants = pluginReplaceConstants;
-const magic_string_1 = __importDefault(require("magic-string"));
 const utils_js_1 = require("../utils.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
+const getMagicString_js_1 = require("../shared/getMagicString.js");
 function pluginReplaceConstants() {
     let config;
     return {
@@ -35,24 +31,21 @@ function pluginReplaceConstants() {
             // @ts-expect-error
             if (config._skipVikeReplaceConstants?.(id))
                 return;
-            const magicString = new magic_string_1.default(code);
+            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
             const constantsMap = [];
             constantsMap.push({
                 constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options),
+                replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options),
             });
             constantsMap.forEach(({ constants, replacement }) => {
                 if (!constants.some((c) => code.includes(c)))
                     return;
                 const regExp = getConstantRegExp(constants);
-                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExp, replacement);
+                magicString.replaceAll(regExp, JSON.stringify(replacement));
             });
             if (!magicString.hasChanged())
                 return null;
-            return {
-                code: magicString.toString(),
-                map: magicString.generateMap({ hires: true, source: id }),
-            };
+            return getMagicStringResult();
         },
     };
 }

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

@@ -29,7 +29,7 @@ function pluginSetGlobalContext() {
                 order: 'pre',
                 handler(_, env) {
                     const isViteDev = (0, utils_js_1.isDevCheck)(env);
-                    (0, globalContext_js_1.setGlobalContext_isProduction)(!isViteDev);
+                    (0, globalContext_js_1.setGlobalContext_isProductionAccordingToVite)(!isViteDev);
                     (0, utils_js_1.markSetup_isViteDev)(isViteDev);
                 },
             },

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

@@ -1,11 +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 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);
@@ -36,9 +36,8 @@ 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, { isForClientSide, isClientRouting, isDev }, '    ', true));
         lines.push(`    },`);

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 isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
+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, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, env, options));
     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;
-// TODO/now: rename file to generateVirtualFileEntryPage.ts
+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 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) {
+    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,11 +34,11 @@ 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), 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, isDev) {
     const lines = [];
     const importStatements = [];
     const filesEnv = new Map();
@@ -47,8 +46,8 @@ function getLoadConfigLazy(pageConfig, isForClientSide, pageId, includeAssetsImp
     lines.push('export const configValuesSerialized = {');
     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))}'`);
+    if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
+        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

@@ -1,30 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigValueSourcesRelevant = getConfigValueSourcesRelevant;
+exports.getConfigValueSourceRelevantAnyEnv = getConfigValueSourceRelevantAnyEnv;
 exports.isRuntimeEnvMatch = isRuntimeEnvMatch;
+exports.isConfigSourceValueNull = isConfigSourceValueNull;
 const utils_js_1 = require("../../utils.js");
+(0, utils_js_1.assertIsNotBrowser)();
 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) {
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    // Environment filtering
+    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
+    // Overriding - non-cumulative configs
+    if (!configDef.cumulative && sourcesRelevant.length > 1) {
         const source = sourcesRelevant[0];
-        if (source) {
-            sourcesRelevant = [source];
-        }
-        else {
-            (0, utils_js_1.assert)(sourcesRelevant.length === 0);
-        }
+        (0, utils_js_1.assert)(source);
+        sourcesRelevant = [source];
     }
-    else {
-        // isOverridden() must be called before isRuntimeEnvMatch() is called (otherwise isOverridden() will return a wrong value)
-        sourcesRelevant = sourcesRelevant.filter((source) => !isOverridden(source, configName, pageConfig));
+    // Overriding - cumulative configs
+    if (configDef.cumulative && sourcesRelevant.length > 0) {
+        sourcesRelevant = applyFilenameSuffix(sourcesRelevant);
     }
-    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
     return sourcesRelevant;
 }
+function getConfigValueSourceRelevantAnyEnv(configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    (0, utils_js_1.assert)(!configDef.cumulative); // So far, this function is only used by non-cumulative configs
+    let sourcesRelevant = pageConfig.configValueSources[configName];
+    if (!sourcesRelevant)
+        return null;
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    const source = sourcesRelevant[0];
+    if (!source)
+        return null;
+    if (isConfigSourceValueNull(source))
+        return null;
+    return source;
+}
 function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     if ('isForConfig' in runtimeEnv)
         return !!configEnv.config;
@@ -54,14 +73,25 @@ function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     }
     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;
+// Setting a config to `undefined` should be equivalent to not setting it at all
+function isConfigSourceValueUndefined(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === undefined;
+}
+// Setting a config to `null` enables the user to suppress inherited config by overriding it with `null` (this only works when setting the config value to `null` inside a +config.js file — it doesn't work when setting the config value to `null` with a +{configName}.js file).
+function isConfigSourceValueNull(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === null;
+}
+function applyFilenameSuffix(sourcesRelevant) {
+    const getFileName = (source) => source.plusFile?.filePath.fileName ?? '';
+    // Apply `clear`: truncate at first clear file
+    const clearIndex = sourcesRelevant.findIndex((source) => getFileName(source).includes('.clear.'));
+    if (clearIndex !== -1)
+        sourcesRelevant = sourcesRelevant.slice(0, clearIndex + 1);
+    // Apply `default`: exclude defaults if any non-defaults exist, otherwise keep only first default
+    const nonDefaults = sourcesRelevant.filter((source) => !getFileName(source).includes('.default.'));
+    return nonDefaults.length > 0 ? nonDefaults : sourcesRelevant.slice(0, 1);
 }

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

@@ -5,11 +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 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");
@@ -49,13 +48,16 @@ function pluginVirtualFiles() {
             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);
+                    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) {
@@ -168,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));