vike 0.4.238 → 0.4.239-commit-33e55d4

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

@@ -1,6 +1,6 @@
 export { loadPageConfigsLazyServerSide };
 import { getPageFilesServerSide } from '../../../shared/getPageFiles.js';
-import { resolveVikeConfigPublicPageLazyLoaded } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
+import { resolvePageContextConfig } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
 import { assertUsage, assertWarning, hasProp, isArray, isObject, objectAssign, updateType, } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
@@ -8,13 +8,14 @@ import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';
 import { loadAndParseVirtualFilePageEntry } from '../../../shared/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { execHookServer } from './execHookServer.js';
-import { getCacheControl } from './getCacheControl.js';
+import { resolveHeadersResponseEarly } from './headersResponse.js';
+import { resolvePageContextCspNone } from './csp.js';
 async function loadPageConfigsLazyServerSide(pageContext) {
     objectAssign(pageContext, {
         _pageConfig: findPageConfig(pageContext._globalContext._pageConfigs, pageContext.pageId),
     });
     // Load the page's + files
-    updateType(pageContext, await loadPageUserFiles(pageContext));
+    objectAssign(pageContext, await loadPageUserFiles(pageContext));
     // Resolve new computed pageContext properties
     updateType(pageContext, await resolvePageContext(pageContext));
     // Execute +onCreatePageContext
@@ -53,12 +54,13 @@ async function resolvePageContext(pageContext) {
             passToClient.push(...valS);
         });
     }
+    objectAssign(pageContext, await resolvePageContextCspNone(pageContext));
     objectAssign(pageContext, {
         Page: pageContext.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
-        headersResponse: resolveHeadersResponse(pageContext),
     });
+    objectAssign(pageContext, await resolveHeadersResponseEarly(pageContext));
     objectAssign(pageContext, {
         __getPageAssets: async () => {
             if ('_pageAssets' in pageContext) {
@@ -101,43 +103,20 @@ async function resolvePageContext(pageContext) {
     return pageContext;
 }
 async function loadPageUserFiles(pageContext) {
-    const [{ configPublicPageLazy }] = await Promise.all([
-        loadPageUserFiles_v1Design(pageContext),
+    const [{ pageContextAddendum }] = await Promise.all([
+        (async () => {
+            const pageFilesServerSide = getPageFilesServerSide(pageContext._pageFilesAll, pageContext.pageId);
+            const isDev = !pageContext._globalContext._isProduction;
+            const pageConfigLoaded = !pageContext._pageConfig
+                ? null
+                : await loadAndParseVirtualFilePageEntry(pageContext._pageConfig, isDev);
+            await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
+            const pageContextAddendum = resolvePageContextConfig(pageFilesServerSide, pageConfigLoaded, pageContext._globalContext._pageConfigGlobal);
+            return { pageContextAddendum };
+        })(),
         analyzePageClientSideInit(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
             sharedPageFilesAlreadyLoaded: true,
         }),
     ]);
-    objectAssign(pageContext, configPublicPageLazy);
-    return pageContext;
-}
-async function loadPageUserFiles_v1Design(pageContext) {
-    const pageFilesServerSide = getPageFilesServerSide(pageContext._pageFilesAll, pageContext.pageId);
-    const isDev = !pageContext._globalContext._isProduction;
-    const pageConfigLoaded = !pageContext._pageConfig
-        ? null
-        : await loadAndParseVirtualFilePageEntry(pageContext._pageConfig, isDev);
-    await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const configPublicPageLazy = resolveVikeConfigPublicPageLazyLoaded(pageFilesServerSide, pageConfigLoaded, pageContext._globalContext._pageConfigGlobal);
-    return {
-        configPublicPageLazy,
-        pageFilesLoaded: pageFilesServerSide,
-    };
-}
-function resolveHeadersResponse(pageContext) {
-    const headersResponse = mergeHeaders(pageContext.config.headersResponse);
-    if (!headersResponse.get('Cache-Control')) {
-        const cacheControl = getCacheControl(pageContext.pageId, pageContext._globalContext._pageConfigs);
-        if (cacheControl)
-            headersResponse.set('Cache-Control', cacheControl);
-    }
-    return headersResponse;
-}
-function mergeHeaders(headersList = []) {
-    const headersMerged = new Headers();
-    headersList.forEach((headers) => {
-        new Headers(headers).forEach((value, key) => {
-            headersMerged.append(key, value);
-        });
-    });
-    return headersMerged;
+    return pageContextAddendum;
 }

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

@@ -1,10 +1,10 @@
 export { preparePageContextForPublicUsageServer };
 export type { PageContextForPublicUsageServer };
 import type { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
-import type { VikeConfigPublicPageLazyLoaded } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
+import type { PageContextConfig } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
 import type { PageContextInternalServer } from '../../../types/PageContext.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
-type PageContextForPublicUsageServer = PageContextInternalServer & VikeConfigPublicPageLazyLoaded & {
+type PageContextForPublicUsageServer = PageContextInternalServer & PageContextConfig & {
     urlOriginal: string;
     /** @deprecated */
     url: string;

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

@@ -39,24 +39,52 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
-            isGlobalContext: true;
-            _isOriginalObject: true;
-            _virtualFileExportsGlobalEntry: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
-            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            _vikeConfigPublicGlobal: {
+        _globalContext: ({
+            _globalConfigPublic: {
+                pages: {
+                    [k: string]: {
+                        config: import("../../../types/index.js").ConfigResolved;
+                        _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                        _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                        _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                    } & ({
+                        route: import("../../../types/Config.js").Route;
+                        isErrorPage?: undefined;
+                    } | {
+                        route?: undefined;
+                        isErrorPage: true;
+                    });
+                };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
                 _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
                 _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
             };
-            config: import("../../../types/index.js").ConfigResolved;
             pages: {
-                [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+                [k: string]: {
+                    config: import("../../../types/index.js").ConfigResolved;
+                    _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
             };
+            config: import("../../../types/index.js").ConfigResolved;
+            _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            isGlobalContext: true;
+            _isOriginalObject: true;
+            _virtualFileExportsGlobalEntry: unknown;
+            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
+            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
+            _allPageIds: string[];
         } & (({
             _isProduction: false;
             _isPrerendering: false;
@@ -99,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;
@@ -108,6 +138,20 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
+        pages: {
+            [k: string]: {
+                config: import("../../../types/index.js").ConfigResolved;
+                _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
@@ -123,14 +167,15 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         pageId: string;
     } & {
         _pageConfig: import("../../../types/PageConfig.js").PageConfigRuntime | null;
-    } & {
-        _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
-    } & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+    } & import("../../../shared/getPageFiles.js").PageContextConfig & {
         _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
+    } & {
+        cspNonce: string | null;
     } & {
         Page: unknown;
         _isHtmlOnly: boolean;
-        _passToClient: import("../html/serializeContext.js").PassToClient;
+        _passToClient: import("./html/serializeContext.js").PassToClient;
+    } & {
         headersResponse: Headers;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
@@ -158,24 +203,52 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         url?: string;
         headers?: Record<string, string>;
     } & {
-        _globalContext: {
-            isGlobalContext: true;
-            _isOriginalObject: true;
-            _virtualFileExportsGlobalEntry: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
-            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            _vikeConfigPublicGlobal: {
+        _globalContext: ({
+            _globalConfigPublic: {
+                pages: {
+                    [k: string]: {
+                        config: import("../../../types/index.js").ConfigResolved;
+                        _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                        _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                        _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                    } & ({
+                        route: import("../../../types/Config.js").Route;
+                        isErrorPage?: undefined;
+                    } | {
+                        route?: undefined;
+                        isErrorPage: true;
+                    });
+                };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
                 _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
                 _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
             };
-            config: import("../../../types/index.js").ConfigResolved;
             pages: {
-                [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+                [k: string]: {
+                    config: import("../../../types/index.js").ConfigResolved;
+                    _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
             };
+            config: import("../../../types/index.js").ConfigResolved;
+            _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            isGlobalContext: true;
+            _isOriginalObject: true;
+            _virtualFileExportsGlobalEntry: unknown;
+            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
+            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
+            _allPageIds: string[];
         } & (({
             _isProduction: false;
             _isPrerendering: false;
@@ -218,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;
@@ -227,6 +302,20 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
+        pages: {
+            [k: string]: {
+                config: import("../../../types/index.js").ConfigResolved;
+                _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
@@ -242,14 +331,15 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         pageId: string;
     } & {
         _pageConfig: import("../../../types/PageConfig.js").PageConfigRuntime | null;
-    } & {
-        _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
-    } & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+    } & import("../../../shared/getPageFiles.js").PageContextConfig & {
         _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
+    } & {
+        cspNonce: string | null;
     } & {
         Page: unknown;
         _isHtmlOnly: boolean;
-        _passToClient: import("../html/serializeContext.js").PassToClient;
+        _passToClient: import("./html/serializeContext.js").PassToClient;
+    } & {
         headersResponse: Headers;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;

package/dist/esm/node/runtime/renderPage/renderPageAfterRoute.js

@@ -1,9 +1,9 @@
 export { renderPageAfterRoute };
 export { prerenderPage };
 import { getErrorPageId } from '../../../shared/error-page.js';
-import { getHtmlString } from '../html/renderHtml.js';
+import { getHtmlString } from './html/renderHtml.js';
 import { assert, assertUsage, updateType, hasProp, objectAssign } from '../utils.js';
-import { getPageContextClientSerialized } from '../html/serializeContext.js';
+import { getPageContextClientSerialized } from './html/serializeContext.js';
 import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
 import { loadPageConfigsLazyServerSide, } from './loadPageConfigsLazyServerSide.js';
 import { execHookOnRenderHtml } from './execHookOnRenderHtml.js';

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

@@ -31,24 +31,52 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 } & {
-    _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+    _globalContext: ({
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & (({
         _isProduction: false;
         _isPrerendering: false;
@@ -91,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;
@@ -100,6 +130,20 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
+    pages: {
+        [k: string]: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        } & ({
+            route: import("../../types/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
+    };
     config: import("../../types/index.js").ConfigResolved;
     _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;

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

@@ -13,7 +13,7 @@ import { isNewError } from './renderPage/isNewError.js';
 import { assertArguments } from './renderPage/assertArguments.js';
 import { log404 } from './renderPage/log404/index.js';
 import pc from '@brillout/picocolors';
-import { getPageContextClientSerializedAbort, getPageContextClientSerialized } from './html/serializeContext.js';
+import { getPageContextClientSerializedAbort, getPageContextClientSerialized, } from './renderPage/html/serializeContext.js';
 import { getErrorPageId } from '../../shared/error-page.js';
 import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErrorPage.js';
 import { loadPageConfigsLazyServerSide } from './renderPage/loadPageConfigsLazyServerSide.js';

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/pluginBaseUrls.js

@@ -7,35 +7,39 @@ function pluginBaseUrls() {
     return {
         name: 'vike:pluginBaseUrls',
         enforce: 'post',
-        async config(config) {
-            const isDev = config._isDev;
-            assert(typeof isDev === 'boolean');
-            const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vikeConfig = await getVikeConfigInternal();
-            basesResolved = resolveBase(baseViteOriginal, vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null);
-            // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
-            process.env.BASE_SERVER = basesResolved.baseServer;
-            process.env.BASE_ASSETS = basesResolved.baseAssets;
-            return {
-                envPrefix: [
-                    'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
-                    'BASE_SERVER',
-                    'BASE_ASSETS',
-                ],
-                base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseViteOriginal: baseViteOriginal,
-            };
+        config: {
+            async handler(config) {
+                const isDev = config._isDev;
+                assert(typeof isDev === 'boolean');
+                const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
+                const vikeConfig = await getVikeConfigInternal();
+                basesResolved = resolveBase(baseViteOriginal, vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null);
+                // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
+                process.env.BASE_SERVER = basesResolved.baseServer;
+                process.env.BASE_ASSETS = basesResolved.baseAssets;
+                return {
+                    envPrefix: [
+                        'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
+                        'BASE_SERVER',
+                        'BASE_ASSETS',
+                    ],
+                    base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
+                    _baseViteOriginal: baseViteOriginal,
+                };
+            },
         },
-        async configResolved(config) {
-            const vikeConfig = await getVikeConfigInternal();
-            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null, config);
-            assert(basesResolved2.baseServer === basesResolved.baseServer);
-            assert(basesResolved2.baseAssets === basesResolved.baseAssets);
-            /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
-             *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
-             *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
-            assert(config.base === baseAssets)
-            */
+        configResolved: {
+            async handler(config) {
+                const vikeConfig = await getVikeConfigInternal();
+                const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null, config);
+                assert(basesResolved2.baseServer === basesResolved.baseServer);
+                assert(basesResolved2.baseAssets === basesResolved.baseAssets);
+                /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
+               *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
+               *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
+              assert(config.base === baseAssets)
+              */
+            },
         },
     };
 }

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

@@ -19,7 +19,7 @@ import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRel
 const globalObject = getGlobalObject('build/handleAssetsManifest.ts', {
     assetsJsonFilePath: undefined,
 });
-// true  => use workaround config.build.ssrEmitAssets
+// yes  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
 function handleAssetsManifest_isFixEnabled() {
     // Allow user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.

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

@@ -46,35 +46,39 @@ function pluginBuildApp() {
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            config(config) {
-                return {
-                    environments: {
-                        ssr: {
-                            consumer: 'server',
-                            build: {
-                                outDir: resolveOutDir(config, true),
-                                ssr: true,
+            config: {
+                handler(config) {
+                    return {
+                        environments: {
+                            ssr: {
+                                consumer: 'server',
+                                build: {
+                                    outDir: resolveOutDir(config, true),
+                                    ssr: true,
+                                },
                             },
-                        },
-                        client: {
-                            consumer: 'client',
-                            build: {
-                                outDir: resolveOutDir(config, false),
-                                copyPublicDir: true,
-                                ssr: false,
+                            client: {
+                                consumer: 'client',
+                                build: {
+                                    outDir: resolveOutDir(config, false),
+                                    copyPublicDir: true,
+                                    ssr: false,
+                                },
                             },
                         },
-                    },
-                };
+                    };
+                },
             },
         },
         {
             name: 'vike:build:pluginBuildApp:autoFullBuild:pre',
             apply: 'build',
             enforce: 'pre',
-            async configResolved(config_) {
-                config = config_;
-                await abortViteBuildSsr();
+            configResolved: {
+                async handler(config_) {
+                    config = config_;
+                    await abortViteBuildSsr();
+                },
             },
             // TO-DO/eventually: stop using this writeBundle() hack and, instead, use the buildApp() implementation above.
             // - Could it cause issues if a tool uses the writeBundle() hack together with getVikeConfig() ?

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

@@ -40,8 +40,10 @@ function pluginBuildConfig() {
                     return { build };
                 },
             },
-            buildStart() {
-                onSetupBuild();
+            buildStart: {
+                handler() {
+                    onSetupBuild();
+                },
             },
         },
     ];