vike 0.4.227-commit-d082773 → 0.4.227-commit-f991d58

package/dist/cjs/node/plugin/plugins/build/pluginBuildEntry.js

@@ -15,6 +15,7 @@ const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const getViteConfigRuntime_js_1 = require("../../shared/getViteConfigRuntime.js");
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
 function pluginBuildEntry() {
     let config;
@@ -40,7 +41,7 @@ function getServerProductionEntryCode(config) {
     const buildInfo = {
         versionAtBuildTime: utils_js_1.PROJECT_VERSION,
         usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
-        viteConfigRuntime: (0, globalContext_js_1.getViteConfigRuntime)(config)
+        viteConfigRuntime: (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config)
     };
     (0, globalContext_js_1.assertBuildInfo)(buildInfo);
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module

package/dist/cjs/node/plugin/plugins/setGlobalContext.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
-const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
 function setGlobalContext() {
     let isServerReload = false;
     let config;
@@ -43,9 +43,8 @@ function setGlobalContext() {
                 order: 'post',
                 async handler(config_) {
                     config = config_;
-                    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
-                    (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for `importServerProductionEntry({ outDir })` of @brillout/vite-plugin-server-entry
-                    (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
+                    const viteConfigRuntime = (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config);
+                    (0, globalContext_js_1.setGlobalContext_viteConfig)(config, viteConfigRuntime);
                 }
             }
         }

package/dist/cjs/node/plugin/shared/getViteConfigRuntime.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getViteConfigRuntime = getViteConfigRuntime;
+const utils_js_1 = require("../utils.js");
+const getOutDirs_js_1 = require("./getOutDirs.js");
+function getViteConfigRuntime(config) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(config, '_baseViteOriginal', 'string'));
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot);
+    const viteConfigRuntime = {
+        root: config.root,
+        build: {
+            outDir: outDirRoot
+        },
+        _baseViteOriginal: config._baseViteOriginal,
+        vitePluginServerEntry: {
+            inject: config.vitePluginServerEntry?.inject
+        }
+    };
+    return viteConfigRuntime;
+}

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

@@ -115,14 +115,19 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const vike = (0, commonConfig_js_1.getVikeConfigPublic)(viteConfig);
-    (0, utils_js_1.assert)(vike.prerenderContext.isPrerenderingEnabled);
     const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         (0, utils_js_1.assert)(standaloneTrigger);
-        (0, utils_js_1.assertUsage)(false, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the ${picocolors_1.default.cyan('prerender')} setting (${picocolors_1.default.underline('https://vike.dev/prerender')}) to enable pre-rendering for at least one page.`);
+        /* TODO/soon: use this again a little while after https://github.com/magne4000/vite-plugin-vercel/pull/156 is merged.
+        assertUsage(
+          false,
+          `You're executing ${pc.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the ${pc.cyan('prerender')} setting (${pc.underline('https://vike.dev/prerender')}) to enable pre-rendering for at least one page.`
+        )
+        */
+        return { viteConfig };
     }
     const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
     await (0, globalContext_js_1.initGlobalContext_runPrerender)();

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

@@ -18,7 +18,6 @@ exports.setGlobalContext_isProduction = setGlobalContext_isProduction;
 exports.setGlobalContext_buildEntry = setGlobalContext_buildEntry;
 exports.clearGlobalContext = clearGlobalContext;
 exports.assertBuildInfo = assertBuildInfo;
-exports.getViteConfigRuntime = getViteConfigRuntime;
 exports.updateUserFiles = updateUserFiles;
 // The core logic revolves around:
 // - globalObject.userFiles which is the main requirement for resolveGlobalContext()
@@ -84,6 +83,7 @@ function makePublic(globalContext) {
         'assetsManifest',
         'config',
         'viteConfig',
+        'viteConfigRuntime',
         'pages',
         'baseServer',
         'baseAssets'
@@ -103,12 +103,12 @@ async function setGlobalContext_viteDevServer(viteDevServer) {
     assertGlobalContextIsDefined();
     globalObject.viteDevServerPromiseResolve(viteDevServer);
 }
-function setGlobalContext_viteConfig(viteConfig, outDirRoot) {
+function setGlobalContext_viteConfig(viteConfig, viteConfigRuntime) {
     if (globalObject.viteConfig)
         return;
     assertIsNotInitilizedYet();
     globalObject.viteConfig = viteConfig;
-    globalObject.outDirRoot = outDirRoot;
+    globalObject.viteConfigRuntime = viteConfigRuntime;
 }
 function assertIsNotInitilizedYet() {
     // In development, globalObject.viteDevServer always needs to be awaited for before initializing globalObject.globalContext
@@ -143,7 +143,6 @@ async function initGlobalContext_runPrerender() {
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
     (0, utils_js_1.assert)(globalObject.isPrerendering);
     (0, utils_js_1.assert)(globalObject.viteConfig);
-    (0, utils_js_1.assert)(globalObject.outDirRoot);
     // We assume initGlobalContext_runPrerender() to be called before:
     // - initGlobalContext_renderPage()
     // - initGlobalContext_getGlobalContextAsync()
@@ -179,7 +178,7 @@ async function initGlobalContext() {
         await waitForViteDevServer();
     }
     else {
-        await loadBuildEntry(globalObject.outDirRoot);
+        await loadBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
     }
     assertGlobalContextIsDefined();
     globalObject.isInitialized = true;
@@ -202,7 +201,7 @@ function defineGlobalContext() {
     (0, utils_js_1.onSetupRuntime)();
 }
 function resolveGlobalContext() {
-    const { viteDevServer, viteConfig, isPrerendering, isProduction, userFiles } = globalObject;
+    const { viteDevServer, viteConfig, viteConfigRuntime, isPrerendering, isProduction, userFiles } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     let globalContext;
     if (!isProduction) {
@@ -211,8 +210,8 @@ function resolveGlobalContext() {
             return null;
         (0, utils_js_1.assert)(userFiles); // main common requiement
         (0, utils_js_1.assert)(viteConfig);
+        (0, utils_js_1.assert)(viteConfigRuntime);
         (0, utils_js_1.assert)(!isPrerendering);
-        const viteConfigRuntime = getViteConfigRuntime(viteConfig);
         globalContext = {
             isProduction: false,
             isPrerendering: false,
@@ -355,25 +354,17 @@ function assertBuildInfo(buildInfo) {
     assertVersionAtBuildTime(buildInfo.versionAtBuildTime);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo, 'viteConfigRuntime', 'object'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo.viteConfigRuntime, '_baseViteOriginal', 'string'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo.viteConfigRuntime, 'root', 'string'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo.viteConfigRuntime, 'build', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo.viteConfigRuntime.build, 'outDir', 'string'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo.viteConfigRuntime, 'vitePluginServerEntry', 'object'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo, 'usesClientRouter', 'boolean'));
-    (0, utils_js_1.checkType)({ ...buildInfo, viteConfigRuntime: buildInfo.viteConfigRuntime });
 }
 function assertVersionAtBuildTime(versionAtBuildTime) {
     const versionAtRuntime = utils_js_1.PROJECT_VERSION;
     const pretty = (version) => picocolors_1.default.bold(`vike@${version}`);
     (0, utils_js_1.assertUsage)(versionAtBuildTime === versionAtRuntime, `Re-build your app (you're using ${pretty(versionAtRuntime)} but your app was built with ${pretty(versionAtBuildTime)})`);
 }
-function getViteConfigRuntime(viteConfig) {
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(viteConfig, '_baseViteOriginal', 'string'));
-    const viteConfigRuntime = {
-        _baseViteOriginal: viteConfig._baseViteOriginal,
-        vitePluginServerEntry: {
-            inject: viteConfig.vitePluginServerEntry?.inject
-        }
-    };
-    return viteConfigRuntime;
-}
 async function updateUserFiles() {
     const { promise, resolve } = (0, utils_js_1.genPromise)();
     (0, utils_js_1.assert)(!globalObject.isProduction);

package/dist/cjs/node/runtime/html/stream.js

@@ -522,7 +522,6 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
     if (isStreamReadableWeb(streamOriginal)) {
         debug('onRenderHtml() hook returned Web Readable');
         const readableOriginal = streamOriginal;
-        let controllerProxyIsClosed = false;
         let isClosed = false;
         let isCancel = false;
         const closeStream = async () => {
@@ -531,7 +530,6 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             isClosed = true;
             await onEnd(isCancel);
             controllerProxy.close();
-            controllerProxyIsClosed = true;
         };
         let controllerProxy;
         assertReadableStreamConstructor();
@@ -559,8 +557,8 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         });
         const writeChunk = (chunk) => {
             if (
-            // If readableOriginal doesn't implement readableOriginal.cancel() then it may still emit data after we close the stream. We therefore need to check whether we closed `controllerProxy`.
-            !controllerProxyIsClosed) {
+            // If readableOriginal doesn't implement readableOriginal.cancel() then it may still emit data after we close the stream. We therefore need to check whether the steam is closed.
+            !isClosed) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
                 debugWithChunk('data written (Web Readable)', chunk);
             }

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.227-commit-d082773';
+exports.PROJECT_VERSION = '0.4.227-commit-f991d58';

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.js

@@ -8,8 +8,9 @@ import path from 'path';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
-import { assertBuildInfo, getViteConfigRuntime } from '../../../runtime/globalContext.js';
+import { assertBuildInfo } from '../../../runtime/globalContext.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
+import { getViteConfigRuntime } from '../../shared/getViteConfigRuntime.js';
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
 function pluginBuildEntry() {
     let config;

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

@@ -1,8 +1,8 @@
 export { setGlobalContext };
 import { setGlobalContext_viteDevServer, setGlobalContext_viteConfig, setGlobalContext_isProduction } from '../../runtime/globalContext.js';
-import { assert, assertFilePathAbsoluteFilesystem, isDevCheck, markSetup_isViteDev, markSetup_viteDevServer, markSetup_vitePreviewServer } from '../utils.js';
-import { getOutDirs } from '../shared/getOutDirs.js';
+import { assert, isDevCheck, markSetup_isViteDev, markSetup_viteDevServer, markSetup_vitePreviewServer } from '../utils.js';
 import { reloadVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
 function setGlobalContext() {
     let isServerReload = false;
     let config;
@@ -41,9 +41,8 @@ function setGlobalContext() {
                 order: 'post',
                 async handler(config_) {
                     config = config_;
-                    const { outDirRoot } = getOutDirs(config);
-                    assertFilePathAbsoluteFilesystem(outDirRoot); // Needed for `importServerProductionEntry({ outDir })` of @brillout/vite-plugin-server-entry
-                    setGlobalContext_viteConfig(config, outDirRoot);
+                    const viteConfigRuntime = getViteConfigRuntime(config);
+                    setGlobalContext_viteConfig(config, viteConfigRuntime);
                 }
             }
         }

package/dist/esm/node/plugin/shared/getViteConfigRuntime.d.ts

@@ -0,0 +1,14 @@
+export { getViteConfigRuntime };
+export type { ViteConfigRuntime };
+import type { ResolvedConfig } from 'vite';
+type ViteConfigRuntime = ReturnType<typeof getViteConfigRuntime>;
+declare function getViteConfigRuntime(config: ResolvedConfig): {
+    root: string;
+    build: {
+        outDir: string;
+    };
+    _baseViteOriginal: string;
+    vitePluginServerEntry: {
+        inject: boolean | undefined;
+    };
+};

package/dist/esm/node/plugin/shared/getViteConfigRuntime.js

@@ -0,0 +1,19 @@
+export { getViteConfigRuntime };
+import { assert, assertFilePathAbsoluteFilesystem, hasProp } from '../utils.js';
+import { getOutDirs } from './getOutDirs.js';
+function getViteConfigRuntime(config) {
+    assert(hasProp(config, '_baseViteOriginal', 'string'));
+    const { outDirRoot } = getOutDirs(config);
+    assertFilePathAbsoluteFilesystem(outDirRoot);
+    const viteConfigRuntime = {
+        root: config.root,
+        build: {
+            outDir: outDirRoot
+        },
+        _baseViteOriginal: config._baseViteOriginal,
+        vitePluginServerEntry: {
+            inject: config.vitePluginServerEntry?.inject
+        }
+    };
+    return viteConfigRuntime;
+}

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

@@ -77,14 +77,19 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const viteConfig = await resolveConfig(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await getVikeConfig(viteConfig);
     const vike = getVikeConfigPublic(viteConfig);
-    assert(vike.prerenderContext.isPrerenderingEnabled);
     const { outDirClient, outDirServer } = getOutDirs(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         assert(standaloneTrigger);
-        assertUsage(false, `You're executing ${pc.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the ${pc.cyan('prerender')} setting (${pc.underline('https://vike.dev/prerender')}) to enable pre-rendering for at least one page.`);
+        /* TODO/soon: use this again a little while after https://github.com/magne4000/vite-plugin-vercel/pull/156 is merged.
+        assertUsage(
+          false,
+          `You're executing ${pc.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the ${pc.cyan('prerender')} setting (${pc.underline('https://vike.dev/prerender')}) to enable pre-rendering for at least one page.`
+        )
+        */
+        return { viteConfig };
     }
     const concurrencyLimit = pLimit(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? cpus().length : parallel);
     await initGlobalContext_runPrerender();

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

@@ -13,7 +13,6 @@ export { setGlobalContext_isProduction };
 export { setGlobalContext_buildEntry };
 export { clearGlobalContext };
 export { assertBuildInfo };
-export { getViteConfigRuntime };
 export { updateUserFiles };
 export type { BuildInfo };
 export type { GlobalContextInternal };
@@ -22,14 +21,13 @@ import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
 import type { PageConfigUserFriendly, PageConfigsUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 import { type BaseUrlsResolved } from '../shared/resolveBase.js';
+import type { ViteConfigRuntime } from '../plugin/shared/getViteConfigRuntime.js';
 type PageRuntimeInfo = Awaited<ReturnType<typeof getUserFiles>>;
 type GlobalContextInternal = GlobalContext & {
     globalContext_public: GlobalContextPublic;
 };
 type GlobalContext = {
-    viteConfigRuntime: {
-        _baseViteOriginal: null | string;
-    };
+    viteConfigRuntime: ViteConfigRuntime;
     config: PageConfigUserFriendly['config'];
     pages: PageConfigsUserFriendly;
 } & BaseUrlsResolved & PageRuntimeInfo & ({
@@ -56,9 +54,9 @@ declare function getGlobalContextSync(): GlobalContextPublic;
 /** @experimental https://vike.dev/getGlobalContext */
 declare function getGlobalContextAsync(isProduction: boolean): Promise<GlobalContextPublic>;
 type GlobalContextPublic = ReturnType<typeof makePublic>;
-declare function makePublic(globalContext: GlobalContext): Pick<GlobalContext, "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig">;
+declare function makePublic(globalContext: GlobalContext): Pick<GlobalContext, "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
-declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, outDirRoot: string): void;
+declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
 declare function setGlobalContext_isPrerendering(): void;
 declare function setGlobalContext_isProduction(isProduction: boolean): void;
 declare function getViteDevServer(): ViteDevServer | null;
@@ -80,14 +78,8 @@ declare function setGlobalContext_buildEntry(buildEntry: unknown): Promise<void>
 type BuildInfo = {
     versionAtBuildTime: string;
     usesClientRouter: boolean;
-    viteConfigRuntime: {
-        _baseViteOriginal: string;
-        vitePluginServerEntry: {
-            inject?: boolean;
-        };
-    };
+    viteConfigRuntime: ViteConfigRuntime;
 };
 declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is BuildInfo;
-declare function getViteConfigRuntime(viteConfig: ResolvedConfig): BuildInfo['viteConfigRuntime'];
 declare function updateUserFiles(): Promise<void>;
 declare function clearGlobalContext(): void;

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

@@ -15,7 +15,6 @@ export { setGlobalContext_isProduction };
 export { setGlobalContext_buildEntry };
 export { clearGlobalContext };
 export { assertBuildInfo };
-export { getViteConfigRuntime };
 export { updateUserFiles };
 // The core logic revolves around:
 // - globalObject.userFiles which is the main requirement for resolveGlobalContext()
@@ -81,6 +80,7 @@ function makePublic(globalContext) {
         'assetsManifest',
         'config',
         'viteConfig',
+        'viteConfigRuntime',
         'pages',
         'baseServer',
         'baseAssets'
@@ -100,12 +100,12 @@ async function setGlobalContext_viteDevServer(viteDevServer) {
     assertGlobalContextIsDefined();
     globalObject.viteDevServerPromiseResolve(viteDevServer);
 }
-function setGlobalContext_viteConfig(viteConfig, outDirRoot) {
+function setGlobalContext_viteConfig(viteConfig, viteConfigRuntime) {
     if (globalObject.viteConfig)
         return;
     assertIsNotInitilizedYet();
     globalObject.viteConfig = viteConfig;
-    globalObject.outDirRoot = outDirRoot;
+    globalObject.viteConfigRuntime = viteConfigRuntime;
 }
 function assertIsNotInitilizedYet() {
     // In development, globalObject.viteDevServer always needs to be awaited for before initializing globalObject.globalContext
@@ -140,7 +140,6 @@ async function initGlobalContext_runPrerender() {
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
     assert(globalObject.isPrerendering);
     assert(globalObject.viteConfig);
-    assert(globalObject.outDirRoot);
     // We assume initGlobalContext_runPrerender() to be called before:
     // - initGlobalContext_renderPage()
     // - initGlobalContext_getGlobalContextAsync()
@@ -176,7 +175,7 @@ async function initGlobalContext() {
         await waitForViteDevServer();
     }
     else {
-        await loadBuildEntry(globalObject.outDirRoot);
+        await loadBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
     }
     assertGlobalContextIsDefined();
     globalObject.isInitialized = true;
@@ -199,7 +198,7 @@ function defineGlobalContext() {
     onSetupRuntime();
 }
 function resolveGlobalContext() {
-    const { viteDevServer, viteConfig, isPrerendering, isProduction, userFiles } = globalObject;
+    const { viteDevServer, viteConfig, viteConfigRuntime, isPrerendering, isProduction, userFiles } = globalObject;
     assert(typeof isProduction === 'boolean');
     let globalContext;
     if (!isProduction) {
@@ -208,8 +207,8 @@ function resolveGlobalContext() {
             return null;
         assert(userFiles); // main common requiement
         assert(viteConfig);
+        assert(viteConfigRuntime);
         assert(!isPrerendering);
-        const viteConfigRuntime = getViteConfigRuntime(viteConfig);
         globalContext = {
             isProduction: false,
             isPrerendering: false,
@@ -352,25 +351,17 @@ function assertBuildInfo(buildInfo) {
     assertVersionAtBuildTime(buildInfo.versionAtBuildTime);
     assert(hasProp(buildInfo, 'viteConfigRuntime', 'object'));
     assert(hasProp(buildInfo.viteConfigRuntime, '_baseViteOriginal', 'string'));
+    assert(hasProp(buildInfo.viteConfigRuntime, 'root', 'string'));
+    assert(hasProp(buildInfo.viteConfigRuntime, 'build', 'object'));
+    assert(hasProp(buildInfo.viteConfigRuntime.build, 'outDir', 'string'));
     assert(hasProp(buildInfo.viteConfigRuntime, 'vitePluginServerEntry', 'object'));
     assert(hasProp(buildInfo, 'usesClientRouter', 'boolean'));
-    checkType({ ...buildInfo, viteConfigRuntime: buildInfo.viteConfigRuntime });
 }
 function assertVersionAtBuildTime(versionAtBuildTime) {
     const versionAtRuntime = PROJECT_VERSION;
     const pretty = (version) => pc.bold(`vike@${version}`);
     assertUsage(versionAtBuildTime === versionAtRuntime, `Re-build your app (you're using ${pretty(versionAtRuntime)} but your app was built with ${pretty(versionAtBuildTime)})`);
 }
-function getViteConfigRuntime(viteConfig) {
-    assert(hasProp(viteConfig, '_baseViteOriginal', 'string'));
-    const viteConfigRuntime = {
-        _baseViteOriginal: viteConfig._baseViteOriginal,
-        vitePluginServerEntry: {
-            inject: viteConfig.vitePluginServerEntry?.inject
-        }
-    };
-    return viteConfigRuntime;
-}
 async function updateUserFiles() {
     const { promise, resolve } = genPromise();
     assert(!globalObject.isProduction);

package/dist/esm/node/runtime/html/stream.js

@@ -517,7 +517,6 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
     if (isStreamReadableWeb(streamOriginal)) {
         debug('onRenderHtml() hook returned Web Readable');
         const readableOriginal = streamOriginal;
-        let controllerProxyIsClosed = false;
         let isClosed = false;
         let isCancel = false;
         const closeStream = async () => {
@@ -526,7 +525,6 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             isClosed = true;
             await onEnd(isCancel);
             controllerProxy.close();
-            controllerProxyIsClosed = true;
         };
         let controllerProxy;
         assertReadableStreamConstructor();
@@ -554,8 +552,8 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         });
         const writeChunk = (chunk) => {
             if (
-            // If readableOriginal doesn't implement readableOriginal.cancel() then it may still emit data after we close the stream. We therefore need to check whether we closed `controllerProxy`.
-            !controllerProxyIsClosed) {
+            // If readableOriginal doesn't implement readableOriginal.cancel() then it may still emit data after we close the stream. We therefore need to check whether the steam is closed.
+            !isClosed) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
                 debugWithChunk('data written (Web Readable)', chunk);
             }

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

@@ -53,9 +53,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _globalContext: GlobalContextInternal;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: Pick<{
-            viteConfigRuntime: {
-                _baseViteOriginal: null | string;
-            };
+            viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
             config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
             pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         } & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
@@ -84,7 +82,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
             isPrerendering: true;
             usesClientRouter: boolean;
             viteConfig: import("vite").ResolvedConfig;
-        })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig">;
+        })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
         _pageContextInit: {
             urlOriginal: string;
             headersOriginal?: unknown;
@@ -143,9 +141,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _globalContext: GlobalContextInternal;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: Pick<{
-            viteConfigRuntime: {
-                _baseViteOriginal: null | string;
-            };
+            viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
             config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
             pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         } & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
@@ -174,7 +170,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
             isPrerendering: true;
             usesClientRouter: boolean;
             viteConfig: import("vite").ResolvedConfig;
-        })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig">;
+        })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
         _pageContextInit: {
             urlOriginal: string;
             headersOriginal?: unknown;
@@ -242,9 +238,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _globalContext: GlobalContextInternal;
     /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
     globalContext: Pick<{
-        viteConfigRuntime: {
-            _baseViteOriginal: null | string;
-        };
+        viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
         config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
         pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
     } & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
@@ -273,7 +267,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
         isPrerendering: true;
         usesClientRouter: boolean;
         viteConfig: import("vite").ResolvedConfig;
-    })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig">;
+    })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
     _pageContextInit: {
         urlOriginal: string;
         headersOriginal?: unknown;

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.227-commit-d082773";
+export declare const PROJECT_VERSION: "0.4.227-commit-f991d58";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.227-commit-d082773';
+export const PROJECT_VERSION = '0.4.227-commit-f991d58';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-d082773",
+  "version": "0.4.227-commit-f991d58",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {