vike 0.4.222 → 0.4.223-commit-6f064ad

package/dist/cjs/utils/parseUrl.js

@@ -49,7 +49,7 @@ function parseUrl(url, baseServer) {
     const pathnameOriginal = urlWithoutHashNorSearch.slice((origin || '').length);
     assertUrlComponents(url, origin, pathnameOriginal, searchOriginal, hashOriginal);
     // Base URL
-    let { pathname, hasBaseServer } = removeBaseServer(pathnameAbsoluteWithBase, baseServer);
+    let { pathname, isBaseMissing } = removeBaseServer(pathnameAbsoluteWithBase, baseServer);
     // pageContext.urlParsed.href
     const href = createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal);
     // pageContext.urlParsed.{hostname, port}
@@ -66,7 +66,7 @@ function parseUrl(url, baseServer) {
         origin,
         pathname,
         pathnameOriginal: pathnameOriginal,
-        hasBaseServer,
+        isBaseMissing,
         search,
         searchAll,
         searchOriginal,
@@ -235,7 +235,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     (0, assert_js_1.assert)(baseServer.startsWith('/'));
     if (baseServer === '/') {
         const pathname = pathnameAbsoluteWithBase;
-        return { pathname, hasBaseServer: true };
+        return { pathname, isBaseMissing: false };
     }
     // Support `url === '/some-base-url' && baseServer === '/some-base-url/'`
     let baseServerNormalized = baseServer;
@@ -245,7 +245,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     }
     if (!urlPathname.startsWith(baseServerNormalized)) {
         const pathname = pathnameAbsoluteWithBase;
-        return { pathname, hasBaseServer: false };
+        return { pathname, isBaseMissing: true };
     }
     (0, assert_js_1.assert)(urlPathname.startsWith('/') || urlPathname.startsWith('http'));
     (0, assert_js_1.assert)(urlPathname.startsWith(baseServerNormalized));
@@ -253,7 +253,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     if (!urlPathname.startsWith('/'))
         urlPathname = '/' + urlPathname;
     (0, assert_js_1.assert)(urlPathname.startsWith('/'));
-    return { pathname: urlPathname, hasBaseServer: true };
+    return { pathname: urlPathname, isBaseMissing: false };
 }
 function isBaseServer(baseServer) {
     return baseServer.startsWith('/');

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

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
-import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
-type PageContextCurrent = PageConfigUserFriendly & {
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
+type PageContextCurrent = PageConfigUserFriendlyOld & {
     urlPathname: string;
 };
 declare function getPageContextCurrent(): null | PageContextCurrent;

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

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import { getGlobalObject } from './utils.js';
-const globalObject = getGlobalObject('getPageContextCurrent.ts', {
+const globalObject = getGlobalObject('client-routing-runtime/getPageContextCurrent.ts', {
     pageContextCurrent: null
 });
 function getPageContextCurrent() {

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

@@ -5,7 +5,7 @@ export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
 export type { PageContextFromServerHooks };
 export type { PageContextFromClientHooks };
-import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContext = {
     urlOriginal: string;
@@ -21,9 +21,9 @@ declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
     _hasPageContextFromServer: true;
 };
-declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendly & {
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
-}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendly & {
+}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
 } & {
     _hasPageContextFromClient: boolean;
@@ -45,5 +45,5 @@ type PageContextFromClientHooks = {
 declare function getPageContextFromClientHooks(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContext & PageConfigUserFriendly, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
+} & PageContext & PageConfigUserFriendlyOld, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
 declare function setPageContextInitIsPassedToClient(pageContext: Record<string, unknown>): void;

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

@@ -18,7 +18,7 @@ import { executeGuardHook } from '../../shared/route/executeGuardHook.js';
 import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
 import { pageContextInitIsPassedToClient } from '../../shared/misc/pageContextInitIsPassedToClient.js';
 import { isServerSideError } from '../../shared/misc/isServerSideError.js';
-const globalObject = getGlobalObject('router/getPageContext.ts', {});
+const globalObject = getGlobalObject('client-routing-runtime/getPageContextFromHooks.ts', {});
 // TODO/eventually: rename
 function getPageContextFromHooks_serialized() {
     const pageContextSerialized = getPageContextSerializedInHtml();

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

@@ -7,7 +7,7 @@ export { monkeyPatchHistoryAPI };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { assert, assertUsage, getGlobalObject, isObject } from './utils.js';
 initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
-const globalObject = getGlobalObject('history.ts', { previous: getHistoryInfo() });
+const globalObject = getGlobalObject('client-routing-runtime/history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`

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

@@ -1,5 +1,6 @@
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
+export { getPageContextClient } from './renderPageClientSide.js';
 export { PROJECT_VERSION as version } from './utils.js';
 import type { PageContextBuiltInClientWithClientRouting } from '../../shared/types.js';
 /** @deprecated

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

@@ -5,4 +5,5 @@
 // Use package.json#exports to make the imports isomorphic.
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
+export { getPageContextClient } from './renderPageClientSide.js';
 export { PROJECT_VERSION as version } from './utils.js';

package/dist/esm/client/client-routing-runtime/prefetch/getPrefetchSettings.d.ts

@@ -1,10 +1,10 @@
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };
-import type { PageConfigUserFriendly } from '../../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
 declare const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 type PrefetchSettingResolved = {
     staticAssets: false | 'hover' | 'viewport';
     pageContext: false | number;
 };
-declare function getPrefetchSettings(pageContext: PageConfigUserFriendly, linkTag: null | HTMLElement): PrefetchSettingResolved;
+declare function getPrefetchSettings(pageContext: PageConfigUserFriendlyOld, linkTag: null | HTMLElement): PrefetchSettingResolved;

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

@@ -6,7 +6,7 @@ export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
 import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = {
@@ -19,7 +19,7 @@ type PageContextForPrefetch = {
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-} & PageConfigUserFriendly): null | PageContextFromServerHooks;
+} & PageConfigUserFriendlyOld): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

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

@@ -19,7 +19,7 @@ import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings } from './prefetch/ge
 import pc from '@brillout/picocolors';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 assertClientRouting();
-const globalObject = getGlobalObject('prefetch.ts', {
+const globalObject = getGlobalObject('client-routing-runtime/prefetch.ts', {
     linkPrefetchHandlerAdded: new WeakSet(),
     addLinkPrefetchHandlers_debounce: null,
     mutationObserver: new MutationObserver(addLinkPrefetchHandlers),
@@ -60,8 +60,8 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendly*/, result) {
-    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageConfigUserFriendly as it isn't available here.)
+function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendlyOld*/, result) {
+    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageConfigUserFriendlyOld as it isn't available here.)
     if (!isBrilloutDocpress())
         return;
     setPageContextPrefetchCache(pageContext, result, null);

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

@@ -2,8 +2,10 @@ export { renderPageClientSide };
 export { getRenderCount };
 export { disableClientRouting };
 export { firstRenderStartPromise };
+export { getPageContextClient };
 import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
+import type { PageContextClient } from '../../shared/types.js';
 declare const firstRenderStartPromise: Promise<void>;
 type RenderArgs = {
     scrollTarget: ScrollTarget;
@@ -24,3 +26,9 @@ declare global {
 }
 declare function disableClientRouting(err: unknown, log: boolean): void;
 declare function getRenderCount(): number;
+/**
+ * Get the `pageContext` object on the client-side.
+ *
+ * https://vike.dev/getPageContextClient
+ */
+declare function getPageContextClient(): PageContextClient | null;

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

@@ -2,6 +2,7 @@ export { renderPageClientSide };
 export { getRenderCount };
 export { disableClientRouting };
 export { firstRenderStartPromise };
+export { getPageContextClient };
 import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, executeHook, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop } from './utils.js';
 import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient } from './getPageContextFromHooks.js';
 import { createPageContext } from './createPageContext.js';
@@ -20,10 +21,9 @@ import { getErrorPageId } from '../../shared/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
 import { getRouteStringParameterList } from '../../shared/route/resolveRouteString.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
+const globalObject = getGlobalObject('client-routing-runtime/renderPageClientSide.ts', (() => {
     const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
     return {
-        previousPageContext: null,
         renderCounter: 0,
         firstRenderStartPromise,
         firstRenderStartPromiseResolve
@@ -484,11 +484,12 @@ async function renderPageClientSide(renderArgs) {
         // Add link prefetch handlers
         addLinkPrefetchHandlers_watch();
         addLinkPrefetchHandlers();
+        globalObject.renderedPageContext = pageContext;
         stampFinished(urlOriginal);
     }
 }
 // For Vike tests (but also potentially for Vike users)
-// TODO/now add comment linking to usage example
+// https://github.com/vikejs/vike/blob/ffbc5cf16407bcc075f414447e50d997c87c0c94/test/playground/pages/nested-layout/e2e-test.ts#L59
 function stampFinished(urlOriginal) {
     window._vike ?? (window._vike = {});
     window._vike.fullyRenderedUrl = urlOriginal;
@@ -595,3 +596,11 @@ function areKeysEqual(key1, key2) {
         return false;
     return key1.length === key2.length && key1.every((_, i) => key1[i] === key2[i]);
 }
+/**
+ * Get the `pageContext` object on the client-side.
+ *
+ * https://vike.dev/getPageContextClient
+ */
+function getPageContextClient() {
+    return globalObject.renderedPageContext ?? null;
+}

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

@@ -6,7 +6,7 @@ export { scrollRestoration_initialRenderIsDone };
 // - Firefox doesn't restore the scroll position upon page reload but does upon Cmd-Shift-T
 // See also: https://github.com/cyco130/knave/blob/e9e1bc7687848504293197f1b314b7d12ad0d228/design.md#scroll-restoration
 import { getGlobalObject, onPageHide, onPageShow } from './utils.js';
-const globalObject = getGlobalObject('scrollRestoration.ts', {});
+const globalObject = getGlobalObject('client-routing-runtime/scrollRestoration.ts', {});
 function scrollRestoration_init() {
     // Use the native scroll restoration mechanism only for the first render
     scrollRestoration_enable();

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

@@ -49,8 +49,8 @@ function isSameAsCurrentUrl(href) {
 function hasBaseServer(href) {
     const baseServer = getBaseServer();
     assert(isBaseServer(baseServer));
-    const { hasBaseServer } = parseUrl(href, baseServer);
-    return hasBaseServer;
+    const { isBaseMissing } = parseUrl(href, baseServer);
+    return !isBaseMissing;
 }
 function isDisableAutomaticLinkInterception() {
     // @ts-ignore

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

@@ -11,6 +11,6 @@ declare function getPageContext(): Promise<{
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-} & import("../../shared/getPageFiles.js").PageConfigUserFriendly & {
+} & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

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

@@ -1,6 +1,6 @@
 export { executeOnRenderClientHook };
 export type { PageContextBeforeRenderClient };
-import type { PageFile, PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import type { PageFile, PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import { type PageContextForUserConsumptionClientSide } from './preparePageContextForUserConsumptionClientSide.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContextBeforeRenderClient = {
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
-} & PageConfigUserFriendly & PageContextForUserConsumptionClientSide;
+} & PageConfigUserFriendlyOld & PageContextForUserConsumptionClientSide;
 declare function executeOnRenderClientHook<PC extends PageContextBeforeRenderClient>(pageContext: PC, isClientRouting: boolean): Promise<void>;

package/dist/esm/client/shared/getPageContextProxyForUser.js

@@ -1,7 +1,7 @@
 export { getPageContextProxyForUser };
 import { assert, assertUsage, assertWarning, getGlobalObject, getPropAccessNotation } from '../server-routing-runtime/utils.js';
 import { notSerializable } from '../../shared/notSerializable.js';
-const globalObject = getGlobalObject('getPageContextProxyForUser.ts', {});
+const globalObject = getGlobalObject('shared/getPageContextProxyForUser.ts', {});
 /**
  * Throw error when pageContext value isn't:
  * - serializable, or

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

@@ -1,9 +1,9 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
-import { type PageFile, type PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import { type PageFile, type PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-type PageContextUserFilesLoaded = PageConfigUserFriendly & {
+type PageContextUserFilesLoaded = PageConfigUserFriendlyOld & {
     _pageFilesLoaded: PageFile[];
 };
 type PageContextUserFiles = {

package/dist/esm/client/shared/loadUserFilesClientSide.js

@@ -1,7 +1,7 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { getPageConfigUserFriendlyOld } from '../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigUserFriendly_oldDesign } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { objectAssign } from '../server-routing-runtime/utils.js';
@@ -30,7 +30,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageCo
         }
         throw err;
     }
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

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

@@ -1,9 +1,9 @@
 export { preparePageContextForUserConsumptionClientSide };
 export type { PageContextForUserConsumptionClientSide };
-import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 import { PageContextForPassToClientWarning } from './getPageContextProxyForUser.js';
-type PageContextForUserConsumptionClientSide = PageConfigUserFriendly & PageContextForPassToClientWarning & {
+type PageContextForUserConsumptionClientSide = PageConfigUserFriendlyOld & PageContextForPassToClientWarning & {
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
 };

package/dist/esm/node/api/prepareViteApiCall.js

@@ -10,7 +10,7 @@ import path from 'path';
 import { assert, assertUsage, getGlobalObject, isObject, toPosixPath } from './utils.js';
 import pc from '@brillout/picocolors';
 import { clearGlobalContext } from '../runtime/globalContext.js';
-const globalObject = getGlobalObject('prepareViteApiCall.ts', {});
+const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfigFromOptions, operation) {
     clear();
     setContextApiOperation(operation);

package/dist/esm/node/plugin/index.d.ts

@@ -1,10 +1,14 @@
 export default plugin;
 export { plugin };
 export { plugin as ssr };
+export { getVikeConfigPublic as getVikeConfig } from './plugins/commonConfig.js';
+export { PROJECT_VERSION as version } from './utils.js';
 export type { VikeVitePluginOptions as UserConfig };
 export type { VikeVitePluginOptions };
-export { PROJECT_VERSION as version } from './utils.js';
-declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): any;
+type PluginInterop = Record<string, unknown> & {
+    name: string;
+};
+declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): PluginInterop[];
 /** @deprecated Define Vike settings in +config.js instead of vite.config.js */
 type VikeVitePluginOptions = {
     /** @deprecated Define Vike settings in +config.js instead of vite.config.js */

package/dist/esm/node/plugin/index.js

@@ -2,6 +2,7 @@ export default plugin;
 export { plugin };
 // TODO/v1-release: remove
 export { plugin as ssr };
+export { getVikeConfigPublic as getVikeConfig } from './plugins/commonConfig.js';
 export { PROJECT_VERSION as version } from './utils.js';
 import { assertUsage } from './utils.js';
 import { buildConfig } from './plugins/buildConfig.js';
@@ -29,7 +30,7 @@ import { workaroundVite6HmrRegression } from './plugins/workaroundVite6HmrRegres
 import { buildApp } from './plugins/buildApp.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setResolveClientEntriesDev(resolveClientEntriesDev);
-// Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
+// Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...commonConfig(vikeVitePluginOptions),

package/dist/esm/node/plugin/plugins/baseUrls.js

@@ -1,7 +1,8 @@
 export { baseUrls };
-import { resolveBase, resolveBaseFromResolvedConfig } from '../../shared/resolveBase.js';
+import { resolveBase } from '../../shared/resolveBase.js';
 import { assert } from '../utils.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfigPublic } from './commonConfig.js';
 function baseUrls() {
     let basesResolved;
     return {
@@ -11,7 +12,8 @@ function baseUrls() {
             const isDev = config._isDev;
             assert(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            basesResolved = resolveBase(baseViteOriginal, config.vike.config.baseServer ?? null, config.vike.config.baseAssets ?? null);
+            const vike = getVikeConfigPublic(config);
+            basesResolved = resolveBase(baseViteOriginal, vike.config.baseServer ?? null, vike.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;
@@ -38,3 +40,8 @@ function baseUrls() {
         }
     };
 }
+function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
+    let baseViteOriginal = config._baseViteOriginal;
+    assert(baseViteOriginal === null || typeof baseViteOriginal == 'string');
+    return resolveBase(baseViteOriginal, baseServer, baseAssets);
+}

package/dist/esm/node/plugin/plugins/buildApp.js

@@ -5,14 +5,19 @@ import { resolveOutDir } from '../shared/getOutDirs.js';
 import { assert } from '../utils.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
 import { getFullBuildInlineConfig } from '../shared/getFullBuildInlineConfig.js';
+import { getVikeConfigPublic } from './commonConfig.js';
 function buildApp() {
     let config;
+    // `builder.buildApp` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+    // In that case, we should'nt `forceExit`.
+    let forceExit = false;
     return [
         {
             name: 'vike:buildApp',
             apply: 'build',
             config(config) {
-                if (!config.vike.config.viteEnvironmentAPI)
+                const vike = getVikeConfigPublic(config);
+                if (!vike.config.viteEnvironmentAPI)
                     return;
                 return {
                     builder: {
@@ -21,6 +26,10 @@ function buildApp() {
                             assert(builder.environments.ssr);
                             await builder.build(builder.environments.client);
                             await builder.build(builder.environments.ssr);
+                            if (forceExit) {
+                                runPrerender_forceExit();
+                                assert(false);
+                            }
                         }
                     },
                     environments: {
@@ -53,17 +62,15 @@ function buildApp() {
                 config = _config;
             },
             async writeBundle() {
-                if (!config.vike.config.viteEnvironmentAPI)
+                const vike = getVikeConfigPublic(config);
+                if (!vike.config.viteEnvironmentAPI)
                     return;
                 const vikeConfig = await getVikeConfig(config);
                 if (!isPrerenderAutoRunEnabled(vikeConfig))
                     return;
                 const configInline = getFullBuildInlineConfig(config);
-                const { forceExit } = await runPrerenderFromAutoRun(configInline, config);
-                if (forceExit) {
-                    runPrerender_forceExit();
-                    assert(false);
-                }
+                const res = await runPrerenderFromAutoRun(configInline, config);
+                forceExit = res.forceExit;
             }
         }
     ];

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -30,8 +30,8 @@ async function fixServerAssets(config) {
     const outDirs = getOutDirs(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
-    const { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove } = addServerAssets(clientManifest, serverManifest);
-    await copyAssets(filesToCopy, filesToRemove, config);
+    const { clientManifestMod, serverManifestMod, filesToMove, filesToRemove } = addServerAssets(clientManifest, serverManifest);
+    await copyAssets(filesToMove, filesToRemove, config);
     return { clientManifestMod, serverManifestMod };
 }
 async function loadManifest(outDir) {
@@ -42,15 +42,15 @@ async function loadManifest(outDir) {
     assert(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, filesToRemove, config) {
+async function copyAssets(filesToMove, filesToRemove, config) {
     const { outDirClient, outDirServer } = getOutDirs(config);
     const assetsDir = getAssetsDir(config);
     const assetsDirServer = path.posix.join(outDirServer, assetsDir);
-    if (!filesToCopy.length && !filesToRemove.length && !existsSync(assetsDirServer))
+    if (!filesToMove.length && !filesToRemove.length && !existsSync(assetsDirServer))
         return;
     assert(existsSync(assetsDirServer));
     const concurrencyLimit = pLimit(10);
-    await Promise.all(filesToCopy.map((file) => concurrencyLimit(async () => {
+    await Promise.all(filesToMove.map((file) => concurrencyLimit(async () => {
         const source = path.posix.join(outDirServer, file);
         const target = path.posix.join(outDirClient, file);
         await fs.mkdir(path.posix.dirname(target), { recursive: true });
@@ -86,19 +86,20 @@ function addServerAssets(clientManifest, serverManifest) {
         assert(!entriesServer.has(pageId));
         entriesServer.set(pageId, { key, ...resources });
     }
-    let filesToCopy = [];
+    let filesToMove = [];
     let filesToRemove = [];
+    // Copy page assets
     for (const [pageId, entryClient] of entriesClient.entries()) {
         const entryServer = entriesServer.get(pageId);
         if (!entryServer)
             continue;
-        const cssToAdd = [];
+        const cssToMove = [];
         const cssToRemove = [];
-        const assetsToAdd = [];
+        const assetsToMove = [];
         const assetsToRemove = [];
         entryServer.css.forEach((cssServer) => {
             if (!entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash)) {
-                cssToAdd.push(cssServer.src);
+                cssToMove.push(cssServer.src);
             }
             else {
                 cssToRemove.push(cssServer.src);
@@ -106,17 +107,17 @@ function addServerAssets(clientManifest, serverManifest) {
         });
         entryServer.assets.forEach((assetServer) => {
             if (!entryClient.assets.some((assetClient) => assetServer.hash === assetClient.hash)) {
-                assetsToAdd.push(assetServer.src);
+                assetsToMove.push(assetServer.src);
             }
             else {
                 assetsToRemove.push(assetServer.src);
             }
         });
-        if (cssToAdd.length) {
+        if (cssToMove.length) {
             const { key } = entryClient;
-            filesToCopy.push(...cssToAdd);
+            filesToMove.push(...cssToMove);
             (_a = clientManifest[key]).css ?? (_a.css = []);
-            clientManifest[key].css?.push(...cssToAdd);
+            clientManifest[key].css?.push(...cssToMove);
         }
         if (cssToRemove.length) {
             const { key } = entryServer;
@@ -124,11 +125,11 @@ function addServerAssets(clientManifest, serverManifest) {
             (_b = serverManifest[key]).css ?? (_b.css = []);
             serverManifest[key].css = serverManifest[key].css.filter((entry) => !cssToRemove.includes(entry));
         }
-        if (assetsToAdd.length) {
+        if (assetsToMove.length) {
             const { key } = entryClient;
-            filesToCopy.push(...assetsToAdd);
+            filesToMove.push(...assetsToMove);
             (_c = clientManifest[key]).assets ?? (_c.assets = []);
-            clientManifest[key].assets?.push(...assetsToAdd);
+            clientManifest[key].assets?.push(...assetsToMove);
         }
         if (assetsToRemove.length) {
             const { key } = entryServer;
@@ -137,11 +138,40 @@ function addServerAssets(clientManifest, serverManifest) {
             serverManifest[key].assets = serverManifest[key].assets.filter((entry) => !assetsToRemove.includes(entry));
         }
     }
+    // Also copy assets of virtual:@brillout/vite-plugin-server-entry:serverEntry
+    {
+        const filesClientAll = [];
+        for (const key in clientManifest) {
+            const entry = clientManifest[key];
+            filesClientAll.push(entry.file);
+            filesClientAll.push(...(entry.assets ?? []));
+            filesClientAll.push(...(entry.css ?? []));
+        }
+        for (const key in serverManifest) {
+            const entry = serverManifest[key];
+            if (!entry.isEntry)
+                continue;
+            const resources = collectResources(entry, serverManifest);
+            const css = resources.css.map((css) => css.src).filter((file) => !filesClientAll.includes(file));
+            const assets = resources.assets.map((asset) => asset.src).filter((file) => !filesClientAll.includes(file));
+            filesToMove.push(...css, ...assets);
+            if (css.length > 0 || assets.length > 0) {
+                assert(!clientManifest[key]);
+                clientManifest[key] = {
+                    ...entry,
+                    css,
+                    assets,
+                    dynamicImports: undefined,
+                    imports: undefined
+                };
+            }
+        }
+    }
     const clientManifestMod = clientManifest;
     const serverManifestMod = serverManifest;
-    filesToCopy = unique(filesToCopy);
-    filesToRemove = unique(filesToRemove).filter((file) => !filesToCopy.includes(file));
-    return { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove };
+    filesToMove = unique(filesToMove);
+    filesToRemove = unique(filesToRemove).filter((file) => !filesToMove.includes(file));
+    return { clientManifestMod, serverManifestMod, filesToMove, filesToRemove };
 }
 function getPageId(key) {
     // Normalize from: