vike 0.4.236-commit-85d361d → 0.4.236-commit-64431e7

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

@@ -26,7 +26,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 virtualFileExports
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdEntryServer } from '../shared/virtualFiles/virtualFileEntry.js';
 import pc from '@brillout/picocolors';
@@ -151,6 +151,9 @@ function setGlobalContext_isPrerendering() {
     setIsProduction(true);
 }
 function setGlobalContext_isProduction(isProduction, tolerateContraditction = false) {
+    // TODO/now: try to remove globalObject.isProduction ?
+    // TODO/now: `rename tolerateContraditction tolerateContradiction`
+    tolerateContraditction = true;
     if (debug.isActivated)
         debug('setGlobalContext_isProduction()', { isProduction, tolerateContraditction });
     if (globalObject.isProduction === undefined) {
@@ -201,7 +204,12 @@ async function initGlobalContext() {
     const { isProduction } = globalObject;
     assert(typeof isProduction === 'boolean');
     if (!isProduction) {
-        await globalObject.viteDevServerPromise;
+        if (isProcessSharedWithVite()) {
+            await globalObject.viteDevServerPromise;
+        }
+        else {
+            await updateUserFiles();
+        }
         assert(globalObject.waitForUserFilesUpdate);
         await globalObject.waitForUserFilesUpdate;
     }
@@ -335,16 +343,27 @@ async function updateUserFiles() {
         // Avoid race condition: abort if there is a new globalObject.viteDevServer (happens when vite.config.js is modified => Vite's dev server is fully reloaded).
         viteDevServer !== globalObject.viteDevServer;
     const { viteDevServer } = globalObject;
-    assert(viteDevServer);
     let hasError = false;
     let virtualFileExports;
     let err;
-    try {
-        virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileIdEntryServer);
+    if (viteDevServer) {
+        try {
+            virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileIdEntryServer);
+        }
+        catch (err_) {
+            hasError = true;
+            err = err_;
+        }
     }
-    catch (err_) {
-        hasError = true;
-        err = err_;
+    else {
+        try {
+            // We don't directly use import() to workaround what seems to be a Vite HMR bug: using import() breaks the HMR of normal non-worker apps.
+            virtualFileExports = await __VIKE__DYNAMIC_IMPORT('virtual:vike:entry:server');
+        }
+        catch (err_) {
+            hasError = true;
+            err = err_;
+        }
     }
     if (isOutdated())
         return { success: false };
@@ -370,7 +389,7 @@ async function updateUserFiles() {
 async function setGlobalContext(virtualFileExports) {
     debug('setGlobalContext()');
     assert(!getVikeConfigErrorBuild());
-    const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync);
+    const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
     assertV1Design(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
@@ -380,13 +399,13 @@ async function setGlobalContext(virtualFileExports) {
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
     return globalContext;
 }
-async function addGlobalContextAsync(globalContext) {
-    debug('addGlobalContextAsync()');
+async function addGlobalContextTmp(globalContext) {
+    debug('addGlobalContextTmp()');
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }
-function addGlobalContextSync(globalContext) {
-    debug('addGlobalContextSync()');
+function addGlobalContext(globalContext) {
+    debug('addGlobalContext()');
     const { pageRoutes, onBeforeRouteHook } = loadPageRoutesSync(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }
@@ -396,23 +415,18 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook,
     };
-    const { viteDevServer, viteConfig, viteConfigRuntime, isPrerendering, isProduction } = globalObject;
+    const { viteDevServer, viteConfig, isPrerendering, isProduction } = globalObject;
     assert(typeof isProduction === 'boolean');
     if (!isProduction) {
-        assert(viteDevServer);
         assert(globalContext); // main common requirement
-        assert(viteConfig);
-        assert(viteConfigRuntime);
         assert(!isPrerendering);
         return {
             ...globalContextBase,
-            ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
             _isProduction: false,
             _isPrerendering: false,
             assetsManifest: null,
             _viteDevServer: viteDevServer,
             viteConfig,
-            viteConfigRuntime,
         };
     }
     else {
@@ -423,11 +437,9 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         assert(assetsManifest);
         const globalContextBase2 = {
             ...globalContextBase,
-            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, globalContext.config),
             _isProduction: true,
             assetsManifest,
             _viteDevServer: null,
-            viteConfigRuntime: buildInfo.viteConfigRuntime,
             _usesClientRouter: buildInfo.usesClientRouter,
         };
         if (isPrerendering) {
@@ -447,14 +459,45 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         }
     }
 }
+async function addGlobalContextAsync(globalContext) {
+    debug('addGlobalContextAsync()');
+    let { viteConfigRuntime, buildInfo } = globalObject;
+    if (!viteConfigRuntime) {
+        if (buildInfo) {
+            viteConfigRuntime = buildInfo.viteConfigRuntime;
+        }
+        else {
+            if (!isProcessSharedWithVite()) {
+                if (!globalObject.isProduction) {
+                    const rpc = getViteRPC();
+                    viteConfigRuntime = await rpc.getViteConfigRuntimeRPC();
+                }
+                else {
+                    assert(false); // production => globalObject.buildInfo should be set
+                }
+            }
+            else {
+                assert(false); // process shared with Vite => globalObject.viteConfigRuntime should be set
+            }
+        }
+    }
+    assert(viteConfigRuntime);
+    return {
+        viteConfigRuntime,
+        ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
+    };
+}
 function clearGlobalContext() {
     debug('clearGlobalContext()');
     objectReplace(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
 }
 function getInitialGlobalObject() {
-    debug('getInitialGlobalObject()');
+    const isProduction = getIsProductionStatic();
+    if (debug.isActivated)
+        debug('getInitialGlobalObject()', { isProduction });
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = genPromise();
     return {
+        isProduction,
         viteDevServerPromise,
         viteDevServerPromiseResolve,
     };
@@ -465,3 +508,22 @@ function resolveBaseRuntime(viteConfigRuntime, config) {
     const baseAssetsUnresolved = config.baseAssets ?? null;
     return resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
 }
+function getIsProductionStatic() {
+    // TODO/now add @ts-ignore comments
+    // @ts-ignore
+    if (!import.meta.env)
+        return undefined;
+    // @ts-ignore
+    const PROD = import.meta.env.PROD;
+    return PROD;
+}
+function isProcessSharedWithVite() {
+    const ret = globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE;
+    if (globalObject.isProcessSharedWithVite !== undefined) {
+        assert(globalObject.isProcessSharedWithVite === ret);
+    }
+    else {
+        globalObject.isProcessSharedWithVite = ret;
+    }
+    return ret;
+}

package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.js

@@ -1,4 +1,5 @@
 export { getViteDevScript };
+import { getViteRPC } from '../../../../utils/getViteRPC.js';
 import { assert, assertUsage, assertWarning } from '../../utils.js';
 import pc from '@brillout/picocolors';
 const reachOutCTA = 'Create a new GitHub issue to discuss a solution.';
@@ -11,7 +12,13 @@ async function getViteDevScript(pageContext) {
     const fakeHtmlBegin = '<html> <head>'; // White space to test whether user is using a minifier
     const fakeHtmlEnd = '</head><body></body></html>';
     let fakeHtml = fakeHtmlBegin + fakeHtmlEnd;
-    fakeHtml = await viteDevServer.transformIndexHtml('/', fakeHtml);
+    if (viteDevServer) {
+        fakeHtml = await viteDevServer.transformIndexHtml('/', fakeHtml);
+    }
+    else {
+        const rpc = getViteRPC();
+        fakeHtml = await rpc.transformIndexHtmlRPC(fakeHtml);
+    }
     assertUsage(!fakeHtml.includes('vite-plugin-pwa'), `The HTML transformer of ${pc.cyan('vite-plugin-pwa')} cannot be applied, see workaround at https://github.com/vikejs/vike/issues/388#issuecomment-1199280084`);
     assertUsage(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), `Vite plugins that minify the HTML cannot be applied, see https://github.com/vikejs/vike/issues/224`);
     assertUsage(fakeHtml.startsWith(fakeHtmlBegin) && fakeHtml.endsWith(fakeHtmlEnd), `You are using a Vite Plugin that transforms the HTML in a way that conflicts with Vike. ${reachOutCTA}`);

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

@@ -41,24 +41,12 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         pages: {
             [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
-    } & ({
+    } & (({
         _isProduction: false;
         _isPrerendering: false;
         assetsManifest: null;
-        _viteDevServer: import("vite").ViteDevServer;
-        viteConfig: import("vite").ResolvedConfig;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-        baseServer: string;
-        baseAssets: string;
+        _viteDevServer: import("vite").ViteDevServer | undefined;
+        viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -68,19 +56,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
         _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
         isClientSide: false;
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -90,6 +66,13 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        _usesClientRouter: boolean;
+        isClientSide: false;
+        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
+    }) & {
+        baseServer: string;
+        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -100,12 +83,6 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
                 inject: boolean | undefined;
             };
         };
-        _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
-        isClientSide: false;
-        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
     });
     _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;

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

@@ -1,7 +1,7 @@
 export { getPageAssets };
 export { setResolveClientEntriesDev };
 export { resolveIncludeAssetsImportedByServer };
-import { assert, prependBase, toPosixPath, unique, getGlobalObject } from '../utils.js';
+import { assert, prependBase, toPosixPath, unique, getGlobalObject, getViteRPC } from '../utils.js';
 import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
 import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
 import { inferMediaType } from './inferMediaType.js';
@@ -14,18 +14,11 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
-    let assetUrls;
-    let clientEntriesSrc;
-    if (isDev) {
-        const { _viteDevServer: viteDevServer } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
-        assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
-    }
-    else {
-        const { assetsManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
-    }
+    const { assetUrls, clientEntriesSrc } = isDev
+        ? !globalContext._viteDevServer
+            ? await getViteRPC().retrievePageAssetsDevRPC(clientDependencies, clientEntries)
+            : await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
+        : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
     let pageAssets = [];
     unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
         const { mediaType = null, assetType = null } = inferMediaType(src) || {};
@@ -59,6 +52,16 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     await sortPageAssetsForEarlyHintsHeader(pageAssets, isProduction);
     return pageAssets;
 }
+async function retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
+    const assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
+    return { clientEntriesSrc, assetUrls };
+}
+function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, includeAssetsImportedByServer) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+    const assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(includeAssetsImportedByServer));
+    return { clientEntriesSrc, assetUrls };
+}
 function resolveClientEntriesProd(clientEntry, assetsManifest) {
     const { manifestEntry } = getManifestEntry(clientEntry, assetsManifest);
     assert(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });

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

@@ -56,24 +56,12 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             pages: {
                 [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
             };
-        } & ({
+        } & (({
             _isProduction: false;
             _isPrerendering: false;
             assetsManifest: null;
-            _viteDevServer: import("vite").ViteDevServer;
-            viteConfig: import("vite").ResolvedConfig;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
-            baseServer: string;
-            baseAssets: string;
+            _viteDevServer: import("vite").ViteDevServer | undefined;
+            viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -83,19 +71,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
             _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -105,6 +81,13 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            _usesClientRouter: boolean;
+            isClientSide: false;
+            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
+        }) & {
+            baseServer: string;
+            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -115,12 +98,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-            _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
-            isClientSide: false;
-            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         });
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;
@@ -191,24 +168,12 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             pages: {
                 [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
             };
-        } & ({
+        } & (({
             _isProduction: false;
             _isPrerendering: false;
             assetsManifest: null;
-            _viteDevServer: import("vite").ViteDevServer;
-            viteConfig: import("vite").ResolvedConfig;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
-            baseServer: string;
-            baseAssets: string;
+            _viteDevServer: import("vite").ViteDevServer | undefined;
+            viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -218,19 +183,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
-            viteConfigRuntime: {
-                root: string;
-                build: {
-                    outDir: string;
-                };
-                _baseViteOriginal: string;
-                vitePluginServerEntry: {
-                    inject: boolean | undefined;
-                };
-            };
             _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -240,6 +193,13 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
             _isProduction: true;
             assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
             _viteDevServer: null;
+            _usesClientRouter: boolean;
+            isClientSide: false;
+            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
+        }) & {
+            baseServer: string;
+            baseAssets: string;
             viteConfigRuntime: {
                 root: string;
                 build: {
@@ -250,12 +210,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
                     inject: boolean | undefined;
                 };
             };
-            _usesClientRouter: boolean;
-            baseServer: string;
-            baseAssets: string;
-            isClientSide: false;
-            _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         });
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _baseServer: string;

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

@@ -46,24 +46,12 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         pages: {
             [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
-    } & ({
+    } & (({
         _isProduction: false;
         _isPrerendering: false;
         assetsManifest: null;
-        _viteDevServer: import("vite").ViteDevServer;
-        viteConfig: import("vite").ResolvedConfig;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-        baseServer: string;
-        baseAssets: string;
+        _viteDevServer: import("vite").ViteDevServer | undefined;
+        viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
@@ -73,19 +61,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
         _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
@@ -95,6 +71,13 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        _usesClientRouter: boolean;
+        isClientSide: false;
+        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
+        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    }) & {
+        baseServer: string;
+        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -105,12 +88,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
                 inject: boolean | undefined;
             };
         };
-        _usesClientRouter: boolean;
-        baseServer: string;
-        baseAssets: string;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     });
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;

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

@@ -56,3 +56,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/augmentType.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/getViteRPC.js';

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

@@ -60,3 +60,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/augmentType.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/getViteRPC.js';

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

@@ -22,6 +22,7 @@ import { resolveClientEntriesDev } from './shared/resolveClientEntriesDev.js';
 import { pluginWorkaroundCssModuleHmr } from './plugins/pluginWorkaroundCssModuleHmr.js';
 import { pluginWorkaroundVite6HmrRegression } from './plugins/pluginWorkaroundVite6HmrRegression.js';
 import { pluginReplaceConstants } from './plugins/pluginReplaceConstants.js';
+import { pluginViteRPC } from './plugins/pluginViteRPC.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setResolveClientEntriesDev(resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -41,6 +42,7 @@ function plugin(vikeVitePluginOptions = {}) {
         pluginWorkaroundCssModuleHmr(),
         pluginWorkaroundVite6HmrRegression(),
         pluginReplaceConstants(),
+        pluginViteRPC(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

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

@@ -11,7 +11,7 @@ declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfi
 declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promise<{
     readonly ssrEmitAssets: true | undefined;
     readonly cssMinify: "esbuild" | undefined;
-    readonly manifest: "_temp_manifest.json";
+    readonly manifest: ".vite/manifest.json";
     readonly copyPublicDir: boolean | undefined;
 }>;
 declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment | undefined, options: {

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

@@ -295,8 +295,8 @@ async function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsREnv = isViteServerBuild_onlySsrEnv(config, viteEnv);
-    if (isSsREnv) {
+    const isSsrEnv = isViteServerBuild_onlySsrEnv(config, viteEnv);
+    if (isSsrEnv) {
         assert(!assetsJsonFilePath);
         const outDirs = getOutDirs(config, viteEnv);
         assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
@@ -310,7 +310,7 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
         // - Also in some other server builds such as dist/vercel/ from vike-vercel
         // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
         const noop = await set_macro_ASSETS_MANIFEST(assetsJsonFilePath, bundle, outDir);
-        if (isSsREnv)
+        if (isSsrEnv)
             assert(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }

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

@@ -4,7 +4,7 @@ export { analyzeClientEntries };
 export { manifestTempFile };
 import type { ResolvedConfig, Plugin } from 'vite';
 import type { PageConfigBuildTime } from '../../../../types/PageConfig.js';
-declare const manifestTempFile = "_temp_manifest.json";
+declare const manifestTempFile = ".vite/manifest.json";
 declare function pluginBuildConfig(): Plugin[];
 declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
     hasClientRouting: boolean;

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

@@ -14,7 +14,8 @@ import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, } from './handleAssetsManifest.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets.js';
-const manifestTempFile = '_temp_manifest.json';
+// TODO/now: stop setting `manifest` altogether and use the resolved value instead? So that other tools can easily read the manifest (e.g. @cloudflare/plugin-vite reads the manifest).
+const manifestTempFile = '.vite/manifest.json';
 function pluginBuildConfig() {
     let config;
     return [