vike 0.4.239-commit-050a4a3 → 0.4.239-commit-59f1017

package/dist/esm/client/runtime-client-routing/globalContext.d.ts

@@ -55,4 +55,4 @@ declare const getGlobalContextClientInternal: () => Promise<{
 } & {
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-} & Record<string, any>>;
+}>;

package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts

@@ -7,7 +7,7 @@ export type { PageContextBegin };
 import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
 import type { PageContextConfig } from '../../shared/getPageFiles.js';
-import type { PageContextClient } from '../../types/PageContext.js';
+import type { PageContextClient, PageContextInternalClient } from '../../types/PageContext.js';
 import type { VikeGlobalInternal } from '../../types/VikeGlobalInternal.js';
 declare const firstRenderStartPromise: Promise<void>;
 type PageContextRouted = {
@@ -92,7 +92,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     } & {
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;
@@ -107,7 +107,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & PageContextConfig & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & PageContextConfig & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;

package/dist/esm/client/runtime-client-routing/renderPageClientSide.js

@@ -16,7 +16,7 @@ import { route } from '../../shared/route/index.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
 import { setScrollPosition } from './setScrollPosition.js';
 import { scrollRestoration_initialRenderIsDone } from './scrollRestoration.js';
-import { getErrorPageId } from '../../shared/error-page.js';
+import { getErrorPageId, isErrorPage } from '../../shared/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
 import { getRouteStringParameterList } from '../../shared/route/resolveRouteString.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
@@ -644,3 +644,16 @@ function handleErrorFetchingStaticAssets(err, pageContext, isFirstRender) {
     redirectHard(pageContext.urlOriginal);
     return true;
 }
+// [HMR] If error page is shown => re-render whole page
+if (import.meta.env.DEV && import.meta.hot)
+    import.meta.hot.on('vite:beforeUpdate', () => {
+        const pageContext = globalObject.renderedPageContext;
+        if (pageContext?.pageId && isErrorPage(pageContext.pageId, pageContext._globalContext._pageConfigs)) {
+            renderPageClientSide({
+                scrollTarget: { preserveScroll: false },
+                urlOriginal: getCurrentUrl(),
+                overwriteLastHistoryEntry: true,
+                isBackwardNavigation: false,
+            });
+        }
+    });

package/dist/esm/client/runtime-server-routing/createPageContextClientSide.d.ts

@@ -54,7 +54,7 @@ declare function createPageContextClientSide(): Promise<{
         _allPageIds: string[];
     } & {
         isClientSide: true;
-    } & object & Record<string, any>;
+    } & object;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     isBackwardNavigation: null;
     _hasPageContextFromServer: true;

package/dist/esm/client/runtime-server-routing/globalContext.d.ts

@@ -52,4 +52,4 @@ declare const getGlobalContextClientInternal: () => Promise<{
     _allPageIds: string[];
 } & {
     isClientSide: true;
-} & object & Record<string, any>>;
+} & object>;

package/dist/esm/client/shared/createGetGlobalContextClient.d.ts

@@ -58,7 +58,7 @@ declare function createGetGlobalContextClient<GlobalContextAddendum extends obje
      * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
      */
     isClientSide: true;
-} & Awaited<GlobalContextAddendum> & Record<string, any>>;
+} & Awaited<GlobalContextAddendum>>;
 type NeverExported = never;
 declare function getGlobalContext(): Promise<NeverExported>;
 declare function getGlobalContextSync(): NeverExported;

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -74,7 +74,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -162,7 +162,9 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;

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

@@ -9,7 +9,7 @@ import { prerenderPage } from '../runtime/renderPage/renderPageAfterRoute.js';
 import { createPageContextServerSide } from '../runtime/renderPage/createPageContextServerSide.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'node:os';
-import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering, } from '../runtime/globalContext.js';
+import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering, setGlobalContext_prerenderContext, } from '../runtime/globalContext.js';
 import { resolveConfig as resolveViteConfig } from 'vite';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
@@ -108,6 +108,7 @@ async function runPrerender(options = {}, trigger) {
     await warnMissingPages(prerenderContext._prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = preparePrerenderContextForPublicUsage(prerenderContext);
     objectAssign(vikeConfig.prerenderContext, prerenderContextPublic, true);
+    setGlobalContext_prerenderContext(prerenderContextPublic);
     if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
         fs.rmSync(outDirServer, { recursive: true });
     }

package/dist/esm/node/runtime/globalContext.d.ts

@@ -10,6 +10,7 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
+export { setGlobalContext_prerenderContext };
 export { setGlobalContext_isProductionAccordingToVite };
 export { setGlobalContext_prodBuildEntry };
 export { clearGlobalContext };
@@ -26,6 +27,7 @@ import { type PageRoutes } from '../../shared/route/loadPageRoutes.js';
 import type { ViteConfigRuntime } from '../vite/shared/getViteConfigRuntime.js';
 import type { GlobalContext } from '../../types/PageContext.js';
 import type { Hook } from '../../shared/hooks/getHook.js';
+import type { PrerenderContext } from '../../types/index.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServer = Pick<GlobalContextServerInternal, 'assetsManifest' | 'config' | 'viteConfig' | 'viteConfigRuntime' | 'pages' | 'baseServer' | 'baseAssets' | 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextServer;
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
@@ -98,6 +100,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
@@ -167,6 +171,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
@@ -236,6 +242,8 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+    } & {
+        prerenderContext: PrerenderContext | undefined;
     });
 }>;
 /**
@@ -259,6 +267,7 @@ declare function getGlobalContextSync(): GlobalContext;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
 declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
 declare function setGlobalContext_isPrerendering(): void;
+declare function setGlobalContext_prerenderContext(prerenderContextPublic: PrerenderContext): void;
 declare function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite: boolean): void;
 declare function getViteDevServer(): ViteDevServer | null;
 declare function getViteConfig(): ResolvedConfig | null;
@@ -275,7 +284,7 @@ declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is Build
 declare function updateUserFiles(): Promise<{
     success: boolean;
 }>;
-declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<{
+declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
     _globalConfigPublic: {
         pages: {
             [k: string]: {
@@ -363,6 +372,8 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
             inject: boolean | undefined;
         };
     };
-})>;
+})) & {
+    prerenderContext: PrerenderContext | undefined;
+}>;
 declare function clearGlobalContext(): void;
 declare function isRunnable(viteDevServer: ViteDevServer): boolean;

package/dist/esm/node/runtime/globalContext.js

@@ -12,6 +12,7 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
+export { setGlobalContext_prerenderContext };
 export { setGlobalContext_isProductionAccordingToVite };
 export { setGlobalContext_prodBuildEntry }; // production entry
 export { clearGlobalContext };
@@ -27,7 +28,7 @@ export { vikeConfigErrorRecoverMsg };
 //   - Without vike-server it's manually loaded here using importServerProductionEntry() which uses @brillout/vite-plugin-server-entry's autoImporter or crawler
 // - In development: globalObject.viteDevServer which is Vite's development server
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, objectAssign, } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdGlobalEntryServer } from '../shared/virtualFileId.js';
 import pc from '@brillout/picocolors';
@@ -150,6 +151,13 @@ function assertIsNotInitializedYet() {
 function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
 }
+function setGlobalContext_prerenderContext(prerenderContextPublic) {
+    globalObject.prerenderContextPublic = prerenderContextPublic;
+    // Ugly redundancy, which we can remove after globalContext is a proxy
+    const { globalContext } = globalObjectTyped;
+    if (globalContext)
+        globalContext.prerenderContext = prerenderContextPublic;
+}
 function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite) {
     globalObject.isProductionAccordingToVite = isProductionAccordingToVite;
 }
@@ -401,6 +409,7 @@ async function createGlobalContext(virtualFileExportsGlobalEntry) {
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     onSetupRuntime();
+    objectAssign(globalContext, { prerenderContext: globalObject.prerenderContextPublic });
     // Never actually used, only used for TypeScript `ReturnType<typeof createGlobalContext>`
     return globalContext;
 }

package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts

@@ -23,7 +23,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -111,7 +111,9 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.d.ts

@@ -24,7 +24,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     url?: string;
     headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -112,7 +112,9 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

package/dist/esm/node/runtime/renderPage/renderPageAfterRoute.d.ts

@@ -39,7 +39,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
+        _globalContext: ({
             _globalConfigPublic: {
                 pages: {
                     [k: string]: {
@@ -127,7 +127,9 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-        });
+        })) & {
+            prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+        };
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
@@ -201,7 +203,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
+        _globalContext: ({
             _globalConfigPublic: {
                 pages: {
                     [k: string]: {
@@ -289,7 +291,9 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-        });
+        })) & {
+            prerenderContext: import("../../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+        };
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;

package/dist/esm/node/runtime/renderPage.d.ts

@@ -31,7 +31,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 } & {
-    _globalContext: {
+    _globalContext: ({
         _globalConfigPublic: {
             pages: {
                 [k: string]: {
@@ -119,7 +119,9 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
                 inject: boolean | undefined;
             };
         };
-    });
+    })) & {
+        prerenderContext: import("../prerender/runPrerender.js").PrerenderContextPublic | undefined;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;

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

@@ -13,7 +13,7 @@ function onLoad() {
     // 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
-    assertVersion('Vite', version, ['6.0.0']);
+    assertVersion('Vite', version, ['6.3.0']);
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     assertIsNotProductionRuntime();
 }

package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts

@@ -3,10 +3,14 @@ export { handleAssetsManifest_getBuildConfig };
 export { handleAssetsManifest_isFixEnabled };
 export { handleAssetsManifest_assertUsageCssCodeSplit };
 export { handleAssetsManifest_assertUsageCssTarget };
+export { handleAssetsManifest_workaroundCssTarget_part1 };
+export { handleAssetsManifest_workaroundCssTarget_part2 };
 import type { Environment, ResolvedConfig, Rollup } from 'vite';
 type Bundle = Rollup.OutputBundle;
 declare function handleAssetsManifest_isFixEnabled(): boolean;
 declare function handleAssetsManifest_assertUsageCssCodeSplit(config: ResolvedConfig): void;
+declare function handleAssetsManifest_workaroundCssTarget_part1(config: ResolvedConfig): void;
+declare function handleAssetsManifest_workaroundCssTarget_part2(): void;
 declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfig, env: Environment): void;
 declare function handleAssetsManifest_getBuildConfig(): Promise<{
     readonly ssrEmitAssets: true | undefined;

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

@@ -3,6 +3,8 @@ export { handleAssetsManifest_getBuildConfig };
 export { handleAssetsManifest_isFixEnabled };
 export { handleAssetsManifest_assertUsageCssCodeSplit };
 export { handleAssetsManifest_assertUsageCssTarget };
+export { handleAssetsManifest_workaroundCssTarget_part1 };
+export { handleAssetsManifest_workaroundCssTarget_part2 };
 import fs from 'node:fs/promises';
 import fs_sync from 'node:fs';
 import path from 'node:path';
@@ -13,11 +15,14 @@ import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
 import { isV1Design } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
-import { isViteServerSide_onlySsrEnv, isViteServerSide } from '../../shared/isViteServerSide.js';
+import { isViteServerSide_onlySsrEnv, isViteServerSide, isViteServerSide_viteEnvOptional, } from '../../shared/isViteServerSide.js';
 import { set_macro_ASSETS_MANIFEST } from './pluginProdBuildEntry.js';
 import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
-const globalObject = getGlobalObject('build/handleAssetsManifest.ts', {
+const globalObject = getGlobalObject('handleAssetsManifest.ts', {
     assetsJsonFilePath: undefined,
+    cssTarget: '__VIKE__UNSET',
+    targetsAll: [],
+    configsAll: [],
 });
 // yes  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
@@ -216,16 +221,26 @@ function handleAssetsManifest_assertUsageCssCodeSplit(config) {
         return;
     assertWarning(config.build.cssCodeSplit, `${pc.cyan('build.cssCodeSplit')} shouldn't be set to ${pc.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
-const targets = [];
+function handleAssetsManifest_workaroundCssTarget_part1(config) {
+    globalObject.configsAll.push(config);
+    if (!isViteServerSide_viteEnvOptional(config, undefined)) {
+        globalObject.cssTarget = config.build.cssTarget;
+    }
+}
+function handleAssetsManifest_workaroundCssTarget_part2() {
+    assert(globalObject.cssTarget !== '__VIKE__UNSET');
+    globalObject.configsAll.forEach((c) => (c.build.cssTarget = globalObject.cssTarget));
+}
 function handleAssetsManifest_assertUsageCssTarget(config, env) {
     if (!handleAssetsManifest_isFixEnabled())
         return;
     const isServerSide = isViteServerSide(config, env);
     assert(typeof isServerSide === 'boolean');
     assert(config.build.target !== undefined);
-    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
-    const targetsServer = targets.filter((t) => t.isServerSide);
-    const targetsClient = targets.filter((t) => !t.isServerSide);
+    const { targetsAll } = globalObject;
+    targetsAll.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
+    const targetsServer = targetsAll.filter((t) => t.isServerSide);
+    const targetsClient = targetsAll.filter((t) => !t.isServerSide);
     targetsClient.forEach((targetClient) => {
         const targetCssResolvedClient = resolveCssTarget(targetClient);
         targetsServer.forEach((targetServer) => {

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

@@ -10,20 +10,32 @@ import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { isViteServerSide_viteEnvOptional } from '../../shared/isViteServerSide.js';
-import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, } from './handleAssetsManifest.js';
+import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, handleAssetsManifest_workaroundCssTarget_part1, handleAssetsManifest_workaroundCssTarget_part2, } from './handleAssetsManifest.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
 function pluginBuildConfig() {
     let config;
     return [
         {
-            name: 'vike:build:pluginBuildConfig',
+            name: 'vike:build:pluginBuildConfig:post1',
             apply: 'build',
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                async handler(config_) {
-                    onSetupBuild();
+                handler(config_) {
                     config = config_;
+                    handleAssetsManifest_workaroundCssTarget_part1(config);
+                },
+            },
+        },
+        {
+            name: 'vike:build:pluginBuildConfig:post2',
+            apply: 'build',
+            enforce: 'post',
+            configResolved: {
+                order: 'post',
+                async handler() {
+                    handleAssetsManifest_workaroundCssTarget_part2();
+                    onSetupBuild();
                     assertRollupInput(config);
                     const entries = await getEntries(config);
                     assert(Object.keys(entries).length > 0);

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

@@ -1,7 +1,6 @@
 export { pluginModuleBanner };
-import { removeVirtualFileIdPrefix } from '../../utils.js';
+import { assert, removeVirtualFileIdPrefix } from '../../utils.js';
 import { getMagicString } from '../../shared/getMagicString.js';
-import { isViteServerSide_extraSafe } from '../../shared/isViteServerSide.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).
 function pluginModuleBanner() {
@@ -10,6 +9,13 @@ function pluginModuleBanner() {
         name: 'vike:build:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
+        applyToEnvironment(environment) {
+            const { config } = environment;
+            const { consumer } = config;
+            const { minify } = config.build;
+            assert(minify === false || minify, { minify, consumer });
+            return !minify;
+        },
         configResolved: {
             handler(config_) {
                 config = config_;
@@ -17,12 +23,12 @@ function pluginModuleBanner() {
         },
         transform: {
             order: 'post',
-            handler(code, id, options) {
-                if (!isViteServerSide_extraSafe(config, this.environment, options) &&
-                    // Inject module banners if user sets `build.minify` to `false` for inspecting dist/client/
-                    config.build.minify) {
-                    return;
-                }
+            /* Using a Rolldown hook filter doesn't make sense here — we use applyToEnvironment() to conditionally apply this plugin.
+            filter: {},
+            */
+            handler(code, id) {
+                const { minify } = this.environment.config.build;
+                assert(minify === false, { minify });
                 if (id.startsWith('\0'))
                     id = id;
                 id = removeVirtualFileIdPrefix(id);

package/dist/esm/node/vite/plugins/pluginBuild.js

@@ -6,6 +6,7 @@ import { pluginDistFileNames } from './pluginBuild/pluginDistFileNames.js';
 import { pluginProdBuildEntry } from './pluginBuild/pluginProdBuildEntry.js';
 import { pluginBuildConfig } from './pluginBuild/pluginBuildConfig.js';
 import { pluginModuleBanner } from './pluginBuild/pluginModuleBanner.js';
+// TODO/now refactor
 function pluginBuild() {
     return [
         ...pluginBuildConfig(),

package/dist/esm/node/vite/plugins/pluginCommon.js

@@ -1,5 +1,5 @@
 export { pluginCommon };
-import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isObject, isVitest, } from '../utils.js';
+import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isObject, isVitest } from '../utils.js';
 import { assertRollupInput } from './pluginBuild/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';

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

@@ -5,6 +5,7 @@ import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
+import { filterRolldown, filterFunction } from './pluginReplaceConstants.js';
 // TO-DO/eventually:
 // - Make import.meta.env 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
@@ -28,16 +29,14 @@ function pluginEnvVars() {
             },
         },
         transform: {
+            filter: filterRolldown,
             handler(code, id, options) {
                 id = normalizeId(id);
                 assertPosixPath(id);
-                if (id.includes('/node_modules/'))
-                    return;
                 assertPosixPath(config.root);
                 if (!id.startsWith(config.root))
-                    return;
-                if (!code.includes('import.meta.env.'))
-                    return;
+                    return; // skip linked dependencies
+                assert(filterFunction(id, code));
                 const isBuild = config.command === 'build';
                 const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
                 const { magicString, getMagicStringResult } = getMagicString(code, id);

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

@@ -1,3 +1,4 @@
+// TO-DO/next-major-release: remove
 // Remove this workaround if the other workaround config.build.ssrEmitAssets turns out to be reliable.
 //  - Remove this file then revert this commit: https://github.com/vikejs/vike/commit/805a18974f13420a78fcc30fdd676696e405c3ca
 // Workaround to make client-side bundles include the CSS imports living in server-side-only code.
@@ -22,6 +23,12 @@ const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = createDebugger('vike:pluginExtractAssets');
+const filterRolldown = {
+    id: {
+        include: extractAssetsRE,
+    },
+};
+const filterFunction = (id) => extractAssetsRE.test(id);
 function pluginExtractAssets() {
     let config;
     let vikeConfig;
@@ -34,11 +41,10 @@ function pluginExtractAssets() {
             apply: 'build',
             enforce: 'post',
             transform: {
+                filter: filterRolldown,
                 async handler(src, id, options) {
                     id = normalizeId(id);
-                    if (!extractAssetsRE.test(id)) {
-                        return;
-                    }
+                    assert(filterFunction(id));
                     if (isFixEnabled) {
                         // I'm guessing isFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
                         assertV1Design(vikeConfig._pageConfigs, true);

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

@@ -8,6 +8,12 @@ import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:pluginExtractExportNames');
 const globalObject = getGlobalObject('plugins/pluginExtractExportNames.ts', {});
+const filterRolldown = {
+    id: {
+        include: extractExportNamesRE,
+    },
+};
+const filterFunction = (id) => extractExportNamesRE.test(id);
 function pluginExtractExportNames() {
     let isDev = false;
     let config;
@@ -15,14 +21,14 @@ function pluginExtractExportNames() {
         name: 'vike:pluginExtractExportNames',
         enforce: 'post',
         transform: {
+            filter: filterRolldown,
             async handler(src, id, options) {
                 id = normalizeId(id);
                 const isClientSide = !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()]);
-                    return code;
-                }
+                assert(filterFunction(id));
+                const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
+                debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);
+                return code;
             },
         },
         configureServer: {