vike 0.4.236-commit-eab75f6 → 0.4.237-commit-85e89b1

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

@@ -2,31 +2,67 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePageContextRequestUrl = handlePageContextRequestUrl;
 const getPageContextRequestUrl_js_1 = require("../../../shared/getPageContextRequestUrl.js");
+const modifyUrl_js_1 = require("../../../shared/modifyUrl.js");
 const utils_js_1 = require("../utils.js");
 // See also shared/getPageContextRequestUrl.ts
 function handlePageContextRequestUrl(url) {
-    if (!hasSuffix(url)) {
-        return { urlWithoutPageContextRequestSuffix: url, isPageContextRequest: false };
+    const urlParsed = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
+    if (!isMatch(urlParsed)) {
+        return {
+            isPageContextJsonRequest: false,
+            urlWithoutPageContextRequestSuffix: url,
+        };
+    }
+    else {
+        const { urlWithoutPageContextRequestSuffix, searchVikeArgs } = processUrl(urlParsed, url);
+        const previousUrl = parseSearchVikeArgs(searchVikeArgs);
+        return {
+            /* TO-DO/soon/once: pass & use previousUrl
+            isPageContextJsonRequest: { previousUrl },
+            /*/
+            isPageContextJsonRequest: true,
+            //*/
+            urlWithoutPageContextRequestSuffix,
+        };
     }
-    return { urlWithoutPageContextRequestSuffix: removePageContextUrlSuffix(url), isPageContextRequest: true };
 }
-function hasSuffix(url) {
-    const { pathnameOriginal, pathname } = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
-    (0, utils_js_1.assert)(pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension) === pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension), {
-        url,
-    });
-    return pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension);
+function isMatch(urlParsed) {
+    const { pathnameOriginal, pathname } = urlParsed;
+    (0, utils_js_1.assert)(pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension) === pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension));
+    return pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension);
 }
-function removePageContextUrlSuffix(url) {
-    const urlParsed = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
+function processUrl(urlParsed, url) {
     // We cannot use `urlParsed.pathname` because it would break the `urlParsed.pathnameOriginal` value of subsequent `parseUrl()` calls.
-    const { origin, pathnameOriginal, searchOriginal, hashOriginal } = urlParsed;
+    const { pathnameOriginal, search } = urlParsed;
     (0, utils_js_1.assert)(getPageContextRequestUrl_js_1.doNotCreateExtraDirectory === false);
     const urlSuffix = `/index${getPageContextRequestUrl_js_1.pageContextJsonFileExtension}`;
     (0, utils_js_1.assert)(pathnameOriginal.endsWith(urlSuffix), { url });
     let pathnameModified = (0, utils_js_1.slice)(pathnameOriginal, 0, -1 * urlSuffix.length);
     if (pathnameModified === '')
         pathnameModified = '/';
-    (0, utils_js_1.assert)(url === `${origin || ''}${pathnameOriginal}${searchOriginal || ''}${hashOriginal || ''}`, { url });
-    return `${origin || ''}${pathnameModified}${searchOriginal || ''}${hashOriginal || ''}`;
+    const searchVikeArgs = search?._vike;
+    const urlWithoutPageContextRequestSuffix = (0, modifyUrl_js_1.modifyUrl)(url, {
+        pathname: pathnameModified,
+        search: {
+            _vike: searchVikeArgs ? null : undefined,
+        },
+    });
+    return {
+        searchVikeArgs,
+        urlWithoutPageContextRequestSuffix,
+    };
+}
+function parseSearchVikeArgs(searchVikeArgs) {
+    const args = {
+        previousUrl: null,
+    };
+    if (searchVikeArgs) {
+        const parsed = JSON.parse(searchVikeArgs);
+        (0, utils_js_1.assert)((0, utils_js_1.isObject)(parsed));
+        if ('previousUrl' in parsed) {
+            (0, utils_js_1.assert)((0, utils_js_1.hasProp)(parsed, 'previousUrl', 'string'));
+            args.previousUrl = parsed.previousUrl;
+        }
+    }
+    return args;
 }

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

@@ -9,7 +9,7 @@ const getPageAssets_js_1 = require("./getPageAssets.js");
 const debugPageFiles_js_1 = require("./debugPageFiles.js");
 const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig.js");
 const analyzePage_js_1 = require("./analyzePage.js");
-const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
+const loadPageEntry_js_1 = require("../../../shared/page-configs/loadPageEntry.js");
 const execHookServer_js_1 = require("./execHookServer.js");
 const getCacheControl_js_1 = require("./getCacheControl.js");
 async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
@@ -31,19 +31,32 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
     const isV1Design = !!pageConfig;
     const passToClient = [];
-    const errMsg = ' should be an array of strings.';
+    const errMsgSuffix = ' should be an array of strings.';
     if (!isV1Design) {
         configPublicPageLazy.exportsAll.passToClient?.forEach((e) => {
-            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsg}`);
+            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsgSuffix}`);
             passToClient.push(...e.exportValue);
         });
     }
     else {
         configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
-            const { value } = v;
-            // const { definedAt } = v
-            // assertUsage(isArrayOfStrings(value), `+passToClient value defined at ${definedAt}${errMsg}`)
-            passToClient.push(...value);
+            const { value, definedAt } = v;
+            const errMsg = `+passToClient value defined at ${definedAt}${errMsgSuffix}`;
+            //*/ TO-DO/next-major-release: remove the passToClient once setting from the public API
+            (0, utils_js_1.assertUsage)((0, utils_js_1.isArray)(value), `+passToClient value defined at ${definedAt} should be an array`);
+            const valS = value.map((el) => {
+                if ((0, utils_js_1.isObject)(el)) {
+                    (0, utils_js_1.assertWarning)(!('once' in el), 'The passToClient once setting is deprecated and no longer has any effect. Instead, see the upcoming .once.js suffix (see https://github.com/vikejs/vike/issues/2566 for more information).', { onlyOnce: true });
+                    (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(el, 'prop', 'string'), errMsg);
+                    return el.prop;
+                }
+                (0, utils_js_1.assertUsage)(typeof el === 'string', errMsg);
+                return el;
+            });
+            /*/
+            assertUsage(isArrayOfStrings(value), errMsg)
+            //*/
+            passToClient.push(...valS);
         });
     }
     const pageContextAddendum = {};
@@ -108,9 +121,9 @@ async function loadPageConfigsLazyServerSide(pageContext) {
 }
 async function loadPageConfigFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
-    const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
+    const pageConfigLoaded = !pageConfig ? null : await (0, loadPageEntry_js_1.loadPageEntry)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazyLoaded)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         configPublicPageLazy,
         pageFilesLoaded: pageFilesServerSide,

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

@@ -63,8 +63,7 @@ async function renderPageAlreadyRouted(pageContext) {
 }
 async function prerenderPage(pageContext) {
     (0, utils_js_1.objectAssign)(pageContext, {
-        isClientSideNavigation: false,
-        _urlHandler: null,
+        _isPageContextJsonRequest: null,
     });
     /* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
@@ -73,7 +72,6 @@ async function prerenderPage(pageContext) {
     await (0, execHookDataAndOnBeforeRender_js_1.execHookDataAndOnBeforeRender)(pageContext);
     const { htmlRender, renderHook } = await (0, execHookOnRenderHtml_js_1.execHookOnRenderHtml)(pageContext);
     (0, utils_js_1.assertUsage)(htmlRender !== null, `Cannot pre-render ${picocolors_1.default.cyan(pageContext.urlOriginal)} because the ${renderHook.hookName}() hook defined by ${renderHook.hookFilePath} didn't return an HTML string.`);
-    (0, utils_js_1.assert)(pageContext.isClientSideNavigation === false);
     const documentHtml = await (0, renderHtml_js_1.getHtmlString)(htmlRender);
     (0, utils_js_1.assert)(typeof documentHtml === 'string');
     if (!pageContext._usesClientRouter) {

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

@@ -312,7 +312,7 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
     return pageContext;
 }
 function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
-    const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
+    const { isClientSideNavigation, _urlHandler, _isPageContextJsonRequest } = handlePageContextUrl(pageContextInit.urlOriginal);
     const pageContextBegin = (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
         isPrerendering: false,
         ssr: {
@@ -320,13 +320,14 @@ function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
             isClientSideNavigation,
         },
     });
-    (0, utils_js_1.objectAssign)(pageContextBegin, { _httpRequestId: httpRequestId });
+    (0, utils_js_1.objectAssign)(pageContextBegin, { _httpRequestId: httpRequestId, _isPageContextJsonRequest });
     return pageContextBegin;
 }
 function handlePageContextUrl(urlOriginal) {
-    const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
+    const { isPageContextJsonRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     return {
-        isClientSideNavigation: isPageContextRequest,
+        isClientSideNavigation: !!isPageContextJsonRequest,
+        _isPageContextJsonRequest: isPageContextJsonRequest,
         _urlHandler: (url) => (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(url).urlWithoutPageContextRequestSuffix,
     };
 }
@@ -350,8 +351,8 @@ async function normalizeUrl(pageContextBegin, globalContext, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContext;
-    const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
-    if (isPageContextRequest)
+    const { isPageContextJsonRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
+    if (isPageContextJsonRequest)
         return null;
     const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, globalContext.baseServer);
     if (!urlNormalized)

package/dist/cjs/node/shared/virtualFileId.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.virtualFileIdGlobalEntryClientCR = exports.virtualFileIdGlobalEntryClientSR = exports.virtualFileIdGlobalEntryServer = void 0;
+exports.parseVirtualFileId = parseVirtualFileId;
+exports.generateVirtualFileId = generateVirtualFileId;
+const extractAssetsQuery_js_1 = require("./extractAssetsQuery.js");
+const utils_js_1 = require("./utils.js");
+(0, utils_js_1.assertIsNotBrowser)();
+// Global entries
+const virtualFileIdGlobalEntryServer = 
+//
+'virtual:vike:global-entry:server';
+exports.virtualFileIdGlobalEntryServer = virtualFileIdGlobalEntryServer;
+const virtualFileIdGlobalEntryClientSR = 
+//
+'virtual:vike:global-entry:client:server-routing';
+exports.virtualFileIdGlobalEntryClientSR = virtualFileIdGlobalEntryClientSR;
+const virtualFileIdGlobalEntryClientCR = 
+//
+'virtual:vike:global-entry:client:client-routing';
+exports.virtualFileIdGlobalEntryClientCR = virtualFileIdGlobalEntryClientCR;
+// Page entries
+const virtualFileIdPageEntryClient = 
+//
+'virtual:vike:page-entry:client:'; // ${pageId}
+const virtualFileIdPageEntryServer = 
+//
+'virtual:vike:page-entry:server:'; //  ${pageId}
+// Virtual ID prefixes
+const virtualFileIdPageEntryPrefix = 
+//
+'virtual:vike:page-entry:';
+const virtualFileIdGlobalEntryPrefix = 
+//
+'virtual:vike:global-entry:';
+const virtualFileIdGlobalEntries = [
+    virtualFileIdGlobalEntryServer,
+    virtualFileIdGlobalEntryClientCR,
+    virtualFileIdGlobalEntryClientSR,
+];
+(0, utils_js_1.assert)(virtualFileIdGlobalEntries.every((v) => 
+//
+v.startsWith(virtualFileIdGlobalEntryPrefix)));
+(0, utils_js_1.assert)([virtualFileIdPageEntryClient, virtualFileIdPageEntryServer].every((v) => 
+//
+v.startsWith(virtualFileIdPageEntryPrefix)));
+function parseVirtualFileId(id) {
+    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
+    if (!id.startsWith(virtualFileIdGlobalEntryPrefix) && !id.startsWith(virtualFileIdPageEntryPrefix))
+        return false;
+    // Global entry
+    if (id.includes(virtualFileIdGlobalEntryPrefix)) {
+        (0, utils_js_1.assert)(virtualFileIdGlobalEntries.includes(id));
+        const isForClientSide = id !== virtualFileIdGlobalEntryServer;
+        const isClientRouting = id === virtualFileIdGlobalEntryClientCR;
+        return {
+            type: 'global-entry',
+            isForClientSide,
+            isClientRouting,
+        };
+    }
+    // Page entry
+    if (id.includes(virtualFileIdPageEntryPrefix)) {
+        (0, utils_js_1.assert)(id.startsWith(virtualFileIdPageEntryPrefix));
+        const idOriginal = id;
+        id = (0, extractAssetsQuery_js_1.extractAssetsRemoveQuery)(id);
+        const isExtractAssets = idOriginal !== id;
+        if (id.startsWith(virtualFileIdPageEntryClient)) {
+            (0, utils_js_1.assert)(isExtractAssets === false);
+            return {
+                type: 'page-entry',
+                pageId: id.slice(virtualFileIdPageEntryClient.length),
+                isForClientSide: true,
+                isExtractAssets,
+            };
+        }
+        if (id.startsWith(virtualFileIdPageEntryServer)) {
+            return {
+                type: 'page-entry',
+                pageId: id.slice(virtualFileIdPageEntryServer.length),
+                isForClientSide: false,
+                isExtractAssets,
+            };
+        }
+        (0, utils_js_1.assert)(false);
+    }
+    return false;
+}
+function generateVirtualFileId(args) {
+    if (args.type === 'global-entry') {
+        const { isForClientSide, isClientRouting } = args;
+        (0, utils_js_1.assert)(typeof isClientRouting === 'boolean');
+        if (!isForClientSide) {
+            return virtualFileIdGlobalEntryServer;
+        }
+        else if (isClientRouting) {
+            return virtualFileIdGlobalEntryClientCR;
+        }
+        else {
+            return virtualFileIdGlobalEntryClientSR;
+        }
+    }
+    if (args.type === 'page-entry') {
+        const { pageId, isForClientSide } = args;
+        (0, utils_js_1.assert)(typeof pageId === 'string');
+        const id = `${isForClientSide ? virtualFileIdPageEntryClient : virtualFileIdPageEntryServer}${pageId}`;
+        return id;
+    }
+    (0, utils_js_1.assert)(false);
+}

package/dist/cjs/node/vite/index.js

@@ -24,14 +24,14 @@ const pluginBaseUrls_js_1 = require("./plugins/pluginBaseUrls.js");
 const pluginEnvVars_js_1 = require("./plugins/pluginEnvVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const pluginFileEnv_js_1 = require("./plugins/pluginFileEnv.js");
-const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
-const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.js");
+const getClientEntrySrcDev_js_1 = require("./shared/getClientEntrySrcDev.js");
 const pluginWorkaroundCssModuleHmr_js_1 = require("./plugins/pluginWorkaroundCssModuleHmr.js");
 const pluginWorkaroundVite6HmrRegression_js_1 = require("./plugins/pluginWorkaroundVite6HmrRegression.js");
 const pluginReplaceConstants_js_1 = require("./plugins/pluginReplaceConstants.js");
 const pluginNonRunnableDev_js_1 = require("./plugins/pluginNonRunnableDev.js");
+const retrievePageAssetsDev_js_1 = require("../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
-(0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
+(0, retrievePageAssetsDev_js_1.setGetClientEntrySrcDev)(getClientEntrySrcDev_js_1.getClientEntrySrcDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [

package/dist/cjs/node/vite/onLoad.js

@@ -11,9 +11,11 @@ function onLoad() {
     (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
     (0, assertNodeVersion_js_1.assertNodeVersion)();
     // package.json#peerDependencies isn't enough as users often ignore it
-    // This assertion isn't reliable: the user may still use a Vite version older than 5.1.0 — see https://github.com/vitejs/vite/pull/19355
-    // TO-DO/eventually: let's also use this.meta.viteVersion https://github.com/vitejs/vite/pull/20088
-    (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, '5.1.0');
+    // This assertion isn't reliable: the user may still use a Vite version older than 6.0.0 — see https://github.com/vitejs/vite/pull/19355
+    // TO-DO/eventually: let's also use this.meta.viteVersion
+    // - https://github.com/vitejs/vite/pull/20088
+    // - https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
+    (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, '6.0.0');
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     (0, assertSetup_js_1.assertIsNotProductionRuntime)();
 }

package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js

@@ -13,7 +13,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_2 = require("node:fs");
 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 getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
@@ -38,7 +38,7 @@ async function fixServerAssets(config) {
     return { clientManifestMod, serverManifestMod };
 }
 async function copyAssets(filesToMove, filesToRemove, config) {
-    const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const assetsDirServer = node_path_1.default.posix.join(outDirServer, assetsDir);
     if (!filesToMove.length && !filesToRemove.length && !(0, node_fs_2.existsSync)(assetsDirServer))
@@ -170,13 +170,13 @@ function addServerAssets(clientManifest, serverManifest) {
 }
 function getPageId(key) {
     // Normalize from:
-    //   ../../virtual:vike:pageConfigLazy:client:/pages/index
+    //   ../../virtual:vike:page-entry:client:/pages/index
     // to:
-    //   virtual:vike:pageConfigLazy:client:/pages/index
+    //   virtual:vike:page-entry:client:/pages/index
     // (This seems to be needed only for vitest tests that use Vite's build() API with an inline config.)
     key = key.substring(key.indexOf('virtual:vike'));
-    const result = (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(key);
-    return result && result.pageId;
+    const result = (0, virtualFileId_js_1.parseVirtualFileId)(key);
+    return result && result.type === 'page-entry' ? result.pageId : null;
 }
 function collectResources(entryRoot, manifest) {
     const css = [];
@@ -221,10 +221,10 @@ function handleAssetsManifest_assertUsageCssCodeSplit(config) {
     (0, utils_js_1.assertWarning)(config.build.cssCodeSplit, `${picocolors_1.default.cyan('build.cssCodeSplit')} shouldn't be set to ${picocolors_1.default.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
-function handleAssetsManifest_assertUsageCssTarget(config) {
+function handleAssetsManifest_assertUsageCssTarget(config, env) {
     if (!handleAssetsManifest_isFixEnabled(config))
         return;
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config);
+    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config, env);
     (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
     (0, utils_js_1.assert)(config.build.target !== undefined);
     targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
@@ -295,7 +295,7 @@ async function handleAssetsManifest_getBuildConfig(config) {
         copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
-            : !(0, isViteServerBuild_js_1.isViteServerBuild)(config),
+            : !(0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(config),
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
@@ -333,7 +333,7 @@ async function writeAssetsManifestFile(assetsJsonFilePath, config) {
     await promises_1.default.rm(serverManifestFilePath);
 }
 function getManifestFilePath(config, client) {
-    const outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
+    const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     const outDir = client ? outDirs.outDirClient : outDirs.outDirServer;
     const env = client ? config.environments.client : config.environments.ssr;
     (0, utils_js_1.assert)(env);

package/dist/cjs/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js

@@ -60,7 +60,7 @@ function pluginAutoFullBuild() {
                 order: 'post',
                 async handler() {
                     (0, utils_js_1.onSetupBuild)();
-                    (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config);
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config, this.environment);
                     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
                     if (forceExit &&
                         // Let vike:build:pluginBuildApp force exit

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js

@@ -55,6 +55,7 @@ function pluginBuildApp() {
                         client: {
                             consumer: 'client',
                             build: {
+                                outDir: (0, getOutDirs_js_1.resolveOutDir)(config, false),
                                 copyPublicDir: true,
                                 ssr: false,
                             },

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js

@@ -6,7 +6,7 @@ exports.analyzeClientEntries = analyzeClientEntries;
 const utils_js_1 = require("../../utils.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
@@ -14,9 +14,10 @@ const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/ge
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
-const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
+const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
 function pluginBuildConfig() {
     let config;
+    let configUnresolved;
     return [
         {
             name: 'vike:build:pluginBuildConfig',
@@ -35,18 +36,26 @@ function pluginBuildConfig() {
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssCodeSplit)(config);
                 },
             },
-            config: {
+            configEnvironment: {
                 order: 'post',
-                async handler(config) {
-                    (0, utils_js_1.onSetupBuild)();
+                async handler(envName, configEnv) {
+                    (0, utils_js_1.assert)(configUnresolved);
                     return {
                         build: {
-                            outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                            ...(await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)),
+                            outDir: (0, getOutDirs_js_1.resolveOutDir_configEnvironment)(configUnresolved, envName, configEnv),
                         },
                     };
                 },
             },
+            config: {
+                order: 'post',
+                async handler(config) {
+                    configUnresolved = config;
+                    (0, utils_js_1.onSetupBuild)();
+                    const build = await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config);
+                    return { build };
+                },
+            },
             buildStart() {
                 (0, utils_js_1.onSetupBuild)();
             },
@@ -57,9 +66,9 @@ async function getEntries(config) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const { _pageConfigs: pageConfigs } = vikeConfig;
     // TO-DO/next-major-release: remove
-    const pageFileEntries = await getPageFileEntries(config, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
+    const pageFileEntries = await getPageFileEntries(config, (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
@@ -132,7 +141,7 @@ function analyzeClientEntries(pageConfigs, config) {
 // Ensure Rollup creates entries for each page file, see https://github.com/vikejs/vike/issues/350
 // (Otherwise the page files may be missing in the client manifest.json)
 async function getPageFileEntries(config, includeAssetsImportedByServer) {
-    const isForClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild)(config);
+    const isForClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');
@@ -176,7 +185,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
-    const entryTarget = (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, isForClientSide);
+    const entryTarget = (0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId, isForClientSide });
     let entryName = pageId;
     // Avoid:
     // ```

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildEntry.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginBuildEntry = pluginBuildEntry;
 exports.set_macro_ASSETS_MANIFEST = set_macro_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
-const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -45,14 +45,14 @@ function getServerProductionEntryCode(config) {
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
         `  import { setGlobalContext_buildEntry } from '${importPath}';`,
-        `  import * as virtualFileExports from '${virtualFileEntry_js_1.virtualFileIdEntryServer}';`,
+        `  import * as virtualFileExportsGlobalEntry from '${virtualFileId_js_1.virtualFileIdGlobalEntryServer}';`,
         `  {`,
         // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
         // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MANIFEST};`,
         `    const buildInfo = ${JSON.stringify(buildInfo, null, 2)};`,
         '    setGlobalContext_buildEntry({',
-        `      virtualFileExports,`,
+        `      virtualFileExportsGlobalEntry,`,
         `      assetsManifest,`,
         `      buildInfo,`,
         '    });',
@@ -102,7 +102,7 @@ function getImportPath(config) {
         return 'vike/__internal';
     }
     else {
-        const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         const filePathRelative = node_path_1.default.posix.relative(outDirServer, filePathAbsolute);
         return filePathRelative;
     }

package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js

@@ -20,7 +20,7 @@ function pluginDistPackageJsonFile() {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!(0, isViteServerBuild_js_1.isViteServerBuild)(config))
+            if (!(0, isViteServerBuild_js_1.isViteServerBuild)(config, this.environment))
                 return;
             const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
             const fileName = 'package.json';

package/dist/cjs/node/vite/plugins/pluginBuild/pluginModuleBanner.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
-const magic_string_1 = __importDefault(require("magic-string"));
 const utils_js_1 = require("../../utils.js");
+const getMagicString_js_1 = require("../../shared/getMagicString.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
@@ -21,7 +18,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options) &&
+                if (!(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment) &&
                     // Inject module banners if user sets `build.minify` to `false` for inspecting dist/client/
                     config.build.minify) {
                     return;
@@ -32,15 +29,12 @@ function pluginModuleBanner() {
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
-                const magicString = new magic_string_1.default(code);
+                const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
                 // Use legal comment so that esbuild doesn't remove it.
                 // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
                 // - https://esbuild.github.io/api/#legal-comments
                 magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
-                return {
-                    code: magicString.toString(),
-                    map: magicString.generateMap({ hires: true, source: id }),
-                };
+                return getMagicStringResult();
             },
         },
     };