vike 0.4.267 → 0.4.268-commit-ca58695

package/dist/server/__internal/index.js

@@ -1,10 +1,15 @@
 // Used by vike:build:pluginProdBuildEntry
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
+// Used by the vike(app) of the @vikejs/* server adapters
+export { getMiddlewaresPipe_nonHandlers, getMiddlewaresPipe_handlers, } from '../runtime/universal-middleware/getMiddlewaresPipe.js';
+// Used by vike-react-rsc
+export { getPageContextJson };
 // Used by vite-plugin-vercel
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../../shared-server-client/route/index.js';
 import { getGlobalContextServerInternal, initGlobalContext_getPagesAndRoutes } from '../runtime/globalContext.js';
 import { setNodeEnvProductionIfUndefined } from '../../utils/assertSetup.js';
+import { getPageContextJson as getPageContextJsonInternal } from '../runtime/renderPageServer/getPageContextJson.js';
 import '../assertEnvServer.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
@@ -30,3 +35,6 @@ async function route(pageContext) {
     // Old interface
     return { pageContextAddendum: pageContextFromRoute };
 }
+function getPageContextJson(pageContext) {
+    return getPageContextJsonInternal(pageContext);
+}

package/dist/server/createPageRenderer.d.ts

@@ -1,5 +1,5 @@
 export { createPageRenderer };
-import { renderPageServer } from './runtime/renderPageServer.js';
+import { renderPageServer_userLand } from './runtime/renderPageServer.js';
 import './assertEnvServer.js';
 type Options = {
     viteDevServer?: unknown;
@@ -10,4 +10,4 @@ type Options = {
     baseAssets?: string | null;
 };
 /** @deprecated */
-declare function createPageRenderer(options: Options): typeof renderPageServer;
+declare function createPageRenderer(options: Options): typeof renderPageServer_userLand;

package/dist/server/createPageRenderer.js

@@ -1,14 +1,14 @@
 export { createPageRenderer };
 // TO-DO/next-major-release: remove this file
 //import { SsrEnv, setSsrEnv } from './ssrEnv.js'
-import { renderPageServer } from './runtime/renderPageServer.js';
+import { renderPageServer_userLand } from './runtime/renderPageServer.js';
 import { assertWarning } from '../utils/assert.js';
 //import { importBuildWasLoaded } from './importBuild.js'
 import './assertEnvServer.js';
 /** @deprecated */
 function createPageRenderer(options) {
     showWarnings(options);
-    return renderPageServer;
+    return renderPageServer_userLand;
 }
 function showWarnings(options) {
     assertWarning(false, '`createPageRenderer()` is outdated, use `renderPage()` instead. See https://vike.dev/renderPage', { onlyOnce: true, showStackTrace: true });

package/dist/server/runtime/createDevMiddleware.js

@@ -1,7 +1,9 @@
 export { createDevMiddleware_ as createDevMiddleware };
 import '../assertEnvServer.js';
 const createDevMiddleware_ = async (...args) => {
-    const p = '../../node/createDevMiddleware.js';
+    let p = '../../node/createDevMiddleware.js';
+    // Absolute URL, because on Windows Vite's ssrLoadModule() resolves a relative dynamic import to `D:/...` and then fails to load it (e.g. if `vike` is linked and `$ vike dev` runs +serverEntry.js)
+    p = new URL(p, import.meta.url).href;
     const { createDevMiddleware } = await import(/*webpackIgnore: true*/ /* @vite-ignore */ p);
     return createDevMiddleware(...args);
 };

package/dist/server/runtime/globalContext.d.ts

@@ -54,6 +54,10 @@ declare function getGlobalContextServerInternal(): Promise<{
         _pageFilesAll: import("../__internal/index.js").PageFile[];
         _pageConfigs: import("../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _environmentEntries: Record<string, {
+            pageConfigs: import("../__internal/index.js").PageConfig[];
+            pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        } | null>;
         _allPageIds: string[];
     } & {
         isClientSide: false;
@@ -63,10 +67,9 @@ declare function getGlobalContextServerInternal(): Promise<{
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: ViteDevServer | undefined;
+        devMiddleware: import("vite").Connect.Server | null;
         viteConfig: ResolvedConfig | undefined;
     } & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -77,6 +80,14 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        /**
+         * Every `+middleware` from Vike extensions, as well as Vike's built-in handler that renders pages.
+         *
+         * https://vike.dev/globalContext#middlewares
+         */
+        middlewares: import("./universal-middleware/core.js").Middleware[];
     } & {
         prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
@@ -102,6 +113,10 @@ declare function getGlobalContextServerInternal(): Promise<{
         _pageFilesAll: import("../__internal/index.js").PageFile[];
         _pageConfigs: import("../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _environmentEntries: Record<string, {
+            pageConfigs: import("../__internal/index.js").PageConfig[];
+            pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        } | null>;
         _allPageIds: string[];
     } & {
         isClientSide: false;
@@ -110,12 +125,11 @@ declare function getGlobalContextServerInternal(): Promise<{
         _isProduction: true;
         assetsManifest: ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: true;
         viteConfig: ResolvedConfig;
     } & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -126,6 +140,14 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        /**
+         * Every `+middleware` from Vike extensions, as well as Vike's built-in handler that renders pages.
+         *
+         * https://vike.dev/globalContext#middlewares
+         */
+        middlewares: import("./universal-middleware/core.js").Middleware[];
     } & {
         prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
@@ -151,6 +173,10 @@ declare function getGlobalContextServerInternal(): Promise<{
         _pageFilesAll: import("../__internal/index.js").PageFile[];
         _pageConfigs: import("../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _environmentEntries: Record<string, {
+            pageConfigs: import("../__internal/index.js").PageConfig[];
+            pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        } | null>;
         _allPageIds: string[];
     } & {
         isClientSide: false;
@@ -159,12 +185,11 @@ declare function getGlobalContextServerInternal(): Promise<{
         _isProduction: true;
         assetsManifest: ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: false;
         viteConfig: null;
     } & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -175,6 +200,14 @@ declare function getGlobalContextServerInternal(): Promise<{
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        /**
+         * Every `+middleware` from Vike extensions, as well as Vike's built-in handler that renders pages.
+         *
+         * https://vike.dev/globalContext#middlewares
+         */
+        middlewares: import("./universal-middleware/core.js").Middleware[];
     } & {
         prerenderContext: PrerenderContext | undefined;
     });
@@ -202,6 +235,10 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _pageFilesAll: import("../__internal/index.js").PageFile[];
     _pageConfigs: import("../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _environmentEntries: Record<string, {
+        pageConfigs: import("../__internal/index.js").PageConfig[];
+        pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    } | null>;
     _allPageIds: string[];
 } & (({
     isClientSide: false;
@@ -211,6 +248,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _isPrerendering: false;
     assetsManifest: null;
     _viteDevServer: ViteDevServer | undefined;
+    devMiddleware: import("vite").Connect.Server | null;
     viteConfig: ResolvedConfig | undefined;
 } | {
     isClientSide: false;
@@ -219,6 +257,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
+    devMiddleware: null;
     _usesClientRouter: boolean;
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -229,12 +268,11 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
+    devMiddleware: null;
     _usesClientRouter: boolean;
     _isPrerendering: false;
     viteConfig: null;
 }) & {
-    baseServer: string;
-    baseAssets: string;
     viteConfigRuntime: {
         root: string;
         build: {
@@ -245,6 +283,14 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
             inject: boolean | undefined;
         };
     };
+    baseServer: string;
+    baseAssets: string;
+    /**
+     * Every `+middleware` from Vike extensions, as well as Vike's built-in handler that renders pages.
+     *
+     * https://vike.dev/globalContext#middlewares
+     */
+    middlewares: import("./universal-middleware/core.js").Middleware[];
 })) & {
     prerenderContext: PrerenderContext | undefined;
 })) | null;
@@ -309,6 +355,10 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _pageFilesAll: import("../__internal/index.js").PageFile[];
     _pageConfigs: import("../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _environmentEntries: Record<string, {
+        pageConfigs: import("../__internal/index.js").PageConfig[];
+        pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    } | null>;
     _allPageIds: string[];
 } & (({
     isClientSide: false;
@@ -318,6 +368,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _isPrerendering: false;
     assetsManifest: null;
     _viteDevServer: ViteDevServer | undefined;
+    devMiddleware: import("vite").Connect.Server | null;
     viteConfig: ResolvedConfig | undefined;
 } | {
     isClientSide: false;
@@ -326,6 +377,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
+    devMiddleware: null;
     _usesClientRouter: boolean;
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -336,12 +388,11 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
+    devMiddleware: null;
     _usesClientRouter: boolean;
     _isPrerendering: false;
     viteConfig: null;
 }) & {
-    baseServer: string;
-    baseAssets: string;
     viteConfigRuntime: {
         root: string;
         build: {
@@ -352,6 +403,14 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
             inject: boolean | undefined;
         };
     };
+    baseServer: string;
+    baseAssets: string;
+    /**
+     * Every `+middleware` from Vike extensions, as well as Vike's built-in handler that renders pages.
+     *
+     * https://vike.dev/globalContext#middlewares
+     */
+    middlewares: import("./universal-middleware/core.js").Middleware[];
 })) & {
     prerenderContext: PrerenderContext | undefined;
 }>;

package/dist/server/runtime/globalContext.js

@@ -56,6 +56,7 @@ import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
 import { debugFileChange, getVikeConfigErrorBuild, setVikeConfigError, } from '../../shared-server-node/getVikeConfigError.js';
 import { getVikeApiOperation } from '../../shared-server-node/api-context.js';
 import { hasAlreadyLogged } from './logErrorServer.js';
+import { getMiddlewares_globalContext } from './universal-middleware/core.js';
 import '../assertEnvServer.js';
 const debug = createDebug('vike:globalContext');
 const globalObject = getGlobalObject('runtime/globalContext.ts', getInitialGlobalObject());
@@ -490,14 +491,18 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
     if (!isProduction) {
         assert(globalContext); // main common requirement
         assert(!isPrerendering);
-        return {
+        const globalContextDev = {
             ...globalContextBase,
             _isProduction: false,
             _isPrerendering: false,
             assetsManifest: null,
             _viteDevServer: viteDevServer,
+            // https://vike.dev/globalContext#devMiddleware
+            devMiddleware: viteDevServer?.middlewares ?? null,
             viteConfig,
         };
+        addDevMiddlewareWarning(globalContextDev, viteDevServer);
+        return globalContextDev;
     }
     else {
         assert(globalObject.prodBuildEntry);
@@ -510,6 +515,7 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
             _isProduction: true,
             assetsManifest,
             _viteDevServer: null,
+            devMiddleware: null,
             _usesClientRouter: buildInfo.usesClientRouter,
         };
         if (isPrerendering) {
@@ -529,6 +535,25 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         }
     }
 }
+function addDevMiddlewareWarning(globalContext, viteDevServer) {
+    if (!viteDevServer)
+        return;
+    const getMiddlewareMode = () => viteDevServer.config.server.middlewareMode;
+    Object.defineProperty(globalContext, 'devMiddleware', {
+        get() {
+            const middlewareMode = getMiddlewareMode();
+            if (!middlewareMode) {
+                assertWarning(false, `You don't need ${pc.cyan('globalContext.devMiddleware')} because the development middleware is already installed (Vite's ${pc.cyan('config.server.middlewareMode')} is ${pc.cyan(JSON.stringify(middlewareMode))}) — installing the development middleware twice might hang the server`, { onlyOnce: true });
+            }
+            return viteDevServer.middlewares;
+        },
+        enumerable: getMiddlewareMode()
+            ? true
+            : // So that spreading or serializing globalContext doesn't get the warning
+                false,
+        configurable: true,
+    });
+}
 async function addGlobalContextAsync(globalContext) {
     debug('addGlobalContextAsync()');
     let { viteConfigRuntime, buildInfo } = globalObject;
@@ -545,9 +570,17 @@ async function addGlobalContextAsync(globalContext) {
         }
     }
     assert(viteConfigRuntime);
+    const { baseServer, baseAssets } = resolveBaseRuntime(viteConfigRuntime, globalContext.config);
     return {
         viteConfigRuntime,
-        ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
+        baseServer,
+        baseAssets,
+        /**
+         * Every `+middleware` from Vike extensions, as well as Vike's built-in handler that renders pages.
+         *
+         * https://vike.dev/globalContext#middlewares
+         */
+        middlewares: getMiddlewares_globalContext(globalContext, baseServer),
     };
 }
 function clearGlobalContext() {

package/dist/server/runtime/index.d.ts

@@ -1,4 +1,4 @@
-export { renderPageServer as renderPage } from './renderPageServer.js';
+export { renderPageServer_userLand as renderPage } from './renderPageServer.js';
 export { escapeInject, dangerouslySkipEscape } from './renderPageServer/html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPageServer/html/stream.js';
 export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';

package/dist/server/runtime/index.js

@@ -1,4 +1,4 @@
-export { renderPageServer as renderPage } from './renderPageServer.js';
+export { renderPageServer_userLand as renderPage } from './renderPageServer.js';
 export { escapeInject, dangerouslySkipEscape } from './renderPageServer/html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPageServer/html/stream.js';
 export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';

package/dist/server/runtime/renderPageServer/analyzePage.js

@@ -18,14 +18,14 @@ function analyzePage(pageContext) {
             clientEntries.push(getVikeClientEntry(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
-            id: generateVirtualFileId({ type: 'page-entry', pageId: pageConfig.pageId, isForClientSide: true }),
+            id: generateVirtualFileId({ type: 'page-entry', pageId: pageConfig.pageId, environmentName: 'client' }),
             onlyAssets: isClientRuntimeLoaded ? false : true,
             eagerlyImported: false,
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
         if (!globalContext._isProduction) {
             clientDependencies.push({
-                id: generateVirtualFileId({ type: 'page-entry', pageId: pageConfig.pageId, isForClientSide: false }),
+                id: generateVirtualFileId({ type: 'page-entry', pageId: pageConfig.pageId, environmentName: 'server' }),
                 onlyAssets: true,
                 eagerlyImported: false,
             });
@@ -36,7 +36,7 @@ function analyzePage(pageContext) {
             const { env } = configElement
             assert(env)
             const onlyAssets = env === { server: true }
-            const eagerlyImported = env === { server: true, client: 'if-client-routing', eager: true }
+            const eagerlyImported = env === { server: true, client: true, clientRoutingOnly: true, eager: true }
             if (onlyAssets || eagerlyImported) {
               clientDependencies.push({
                 id: configElement.importPath,

package/dist/server/runtime/renderPageServer/createHttpResponse.d.ts

@@ -1,4 +1,5 @@
-export { createHttpResponsePage };
+export { createHttpResponsePageHtml };
+export { createHttpResponsePageContent };
 export { createHttpResponsePageJson };
 export { createHttpResponseErrorFallback };
 export { createHttpResponseErrorFallback_noGlobalContext };
@@ -6,12 +7,12 @@ export { createHttpResponseErrorFallbackJson };
 export { createHttpResponseRedirect };
 export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
-export { createHttpResponseFromUniversalMiddleware };
 export type { HttpResponse };
 import type { GetPageAssets } from './getPageAssets.js';
 import type { HtmlRender } from './html/renderHtml.js';
-import type { RenderHook } from './execHookOnRenderHtml.js';
-import type { AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
+import type { StreamReadableWeb } from './html/stream.js';
+import type { Content, RenderHook } from './execHookOnRenderHtml.js';
+import type { AbortStatusCode, UrlRedirect, PageContextAborted } from '../../../shared-server-client/route/abort.js';
 import { HttpResponseBody } from './getHttpResponseBody.js';
 import { type EarlyHint } from './getEarlyHints.js';
 import type { PageContextBegin } from '../renderPageServer.js';
@@ -24,7 +25,7 @@ type HttpResponse = {
     /** **Deprecated**: use `headers` instead, see https://vike.dev/migration/0.4.134 */
     contentType: string | undefined;
 } & HttpResponseBody;
-declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: {
+type PageContextHttpResponsePage = {
     pageId: null | string;
     is404: null | boolean;
     errorWhileRendering: null | Error;
@@ -32,14 +33,24 @@ declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null
     _globalContext: GlobalContextServerInternal;
     abortStatusCode?: AbortStatusCode;
     headersResponse?: Headers;
-}): Promise<HttpResponse>;
+    pageContextsAborted: PageContextAborted[];
+};
+declare function createHttpResponsePageHtml(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: PageContextHttpResponsePage): Promise<HttpResponse>;
+declare function createHttpResponsePageContent(content: Content, renderHook: RenderHook, pageContext: PageContextHttpResponsePage & {
+    urlOriginal: string;
+}): HttpResponse;
 declare function createHttpResponse404(errMsg404: string): HttpResponse;
 declare function createHttpResponseBaseIsMissing(urlOriginal: string, baseServer: string): HttpResponse;
 declare function createHttpResponseErrorFallback(pageContext: {
     _globalContext: GlobalContextServerInternal;
+    pageContextsAborted: PageContextAborted[];
 }): HttpResponse;
 declare function createHttpResponseErrorFallback_noGlobalContext(): HttpResponse;
-declare function createHttpResponseErrorFallbackJson(): HttpResponse;
-declare function createHttpResponsePageJson(pageContextSerialized: string): Promise<HttpResponse>;
+declare function createHttpResponseErrorFallbackJson(pageContext: {
+    pageContextsAborted: PageContextAborted[];
+}): HttpResponse;
+declare function createHttpResponsePageJson(pageContextJson: string | StreamReadableWeb, pageContext: {
+    headersResponse?: Headers;
+    pageContextsAborted: PageContextAborted[];
+}): Promise<HttpResponse>;
 declare function createHttpResponseRedirect({ url, statusCode }: UrlRedirect, pageContextInit: PageContextBegin): HttpResponse;
-declare function createHttpResponseFromUniversalMiddleware(response: Response, earlyHints?: EarlyHint[]): HttpResponse;

package/dist/server/runtime/renderPageServer/createHttpResponse.js

@@ -1,4 +1,5 @@
-export { createHttpResponsePage };
+export { createHttpResponsePageHtml };
+export { createHttpResponsePageContent };
 export { createHttpResponsePageJson };
 export { createHttpResponseErrorFallback };
 export { createHttpResponseErrorFallback_noGlobalContext };
@@ -6,20 +7,34 @@ export { createHttpResponseErrorFallbackJson };
 export { createHttpResponseRedirect };
 export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
-export { createHttpResponseFromUniversalMiddleware };
 import { escapeHtml } from '../../../utils/escapeHtml.js';
 import { assert, assertWarning } from '../../../utils/assert.js';
 import { getErrorPageId, isErrorPage } from '../../../shared-server-client/error-page.js';
+import { getContentTypeFromUrl } from '../../../utils/getContentTypeFromUrl.js';
 import { getHttpResponseBody, getHttpResponseBodyStreamHandlers } from './getHttpResponseBody.js';
 import { getEarlyHints } from './getEarlyHints.js';
 import { assertNoInfiniteHttpRedirect } from './createHttpResponse/assertNoInfiniteHttpRedirect.js';
-import { resolveHeadersResponseFinal } from './headersResponse.js';
+import { getHeadersSetCookieAborted, resolveHeadersResponseFinal, resolveHeadersResponseSetCookie, } from './headersResponse.js';
 import { stringify } from '@brillout/json-serializer/stringify';
 import '../../assertEnvServer.js';
 const contentTypeJson = 'application/json';
 const contentTypeHtml = 'text/html;charset=utf-8';
 const htmlFallbackLog = 'This HTML was generated by Vike.';
-async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
+async function createHttpResponsePageHtml(htmlRender, renderHook, pageContext) {
+    const statusCode = getStatusCode(pageContext);
+    const earlyHints = getEarlyHints(await pageContext.__getPageAssets());
+    const headers = resolveHeadersResponseFinal(pageContext, statusCode);
+    return createHttpResponse(statusCode, contentTypeHtml, headers, htmlRender, earlyHints, renderHook);
+}
+function createHttpResponsePageContent(content, renderHook, pageContext) {
+    const statusCode = getStatusCode(pageContext);
+    const headers = resolveHeadersResponseFinal(pageContext, statusCode);
+    if (!headers.some(([k]) => k.toLowerCase() === 'content-type')) {
+        headers.push(['Content-Type', getContentTypeFromUrl(pageContext.urlOriginal) ?? 'application/octet-stream']);
+    }
+    return createHttpResponseCommon(statusCode, headers, content, [], renderHook);
+}
+function getStatusCode(pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
         const isError = !pageContext.pageId || isErrorPage(pageContext.pageId, pageContext._globalContext._pageConfigs);
@@ -35,9 +50,7 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
             statusCode = pageContext.is404 ? 404 : 500;
         }
     }
-    const earlyHints = getEarlyHints(await pageContext.__getPageAssets());
-    const headers = resolveHeadersResponseFinal(pageContext, statusCode);
-    return createHttpResponse(statusCode, contentTypeHtml, headers, htmlRender, earlyHints, renderHook);
+    return statusCode;
 }
 function createHttpResponse404(errMsg404) {
     const httpResponse = createHttpResponse(404, contentTypeHtml, [], getHtmlFallback(`<p>${errMsg404}.</p>`));
@@ -76,21 +89,26 @@ function createHttpResponseErrorFallback(pageContext) {
             return 'no error page (https://vike.dev/error-page) is defined, make sure to create one';
         }
     })();
-    return createHttpResponseError_(reason);
+    // Cookies set before `throw redirect()` or `throw render()` are kept
+    return createHttpResponseError_(reason, getHeadersSetCookieAborted(pageContext));
 }
 function createHttpResponseErrorFallback_noGlobalContext() {
-    return createHttpResponseError_('no error page (https://vike.dev/error-page) could be rendered');
+    return createHttpResponseError_('no error page (https://vike.dev/error-page) could be rendered', []);
 }
-function createHttpResponseError_(reason) {
-    const httpResponse = createHttpResponse(500, contentTypeHtml, [], getHtmlFallback('<p>An error occurred.</p>', `${htmlFallbackLog} Vike returned this HTML because ${reason}.`));
+function createHttpResponseError_(reason, headers) {
+    const httpResponse = createHttpResponse(500, contentTypeHtml, headers, getHtmlFallback('<p>An error occurred.</p>', `${htmlFallbackLog} Vike returned this HTML because ${reason}.`));
     return httpResponse;
 }
-function createHttpResponseErrorFallbackJson() {
-    const httpResponse = createHttpResponse(500, contentTypeJson, [], stringify({ serverSideError: true }));
+function createHttpResponseErrorFallbackJson(pageContext) {
+    const headers = getHeadersSetCookieAborted(pageContext);
+    const httpResponse = createHttpResponse(500, contentTypeJson, headers, stringify({ serverSideError: true }));
     return httpResponse;
 }
-async function createHttpResponsePageJson(pageContextSerialized) {
-    const httpResponse = createHttpResponse(200, contentTypeJson, [], pageContextSerialized, [], null);
+async function createHttpResponsePageJson(pageContextJson, pageContext) {
+    const headers = resolveHeadersResponseSetCookie(pageContext);
+    headers.push(['Content-Type', contentTypeJson]);
+    // A stream if there are streamed pageContext values, see https://vike.dev/passToClient#streaming
+    const httpResponse = createHttpResponseCommon(200, headers, pageContextJson);
     return httpResponse;
 }
 function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
@@ -98,17 +116,12 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
     assert(url);
     assert(statusCode);
     assert(300 <= statusCode && statusCode <= 399);
-    const headers = [['Location', url]];
+    const headers = [['Location', url], ...resolveHeadersResponseSetCookie(pageContextInit)];
     return createHttpResponse(statusCode, contentTypeHtml, headers, 
     // For bots / programmatic crawlig: show what's going on.
     // For users: showing a blank page is probably better than a flickering text.
     getHtmlFallback(`<p style="display: none">Redirecting to ${escapeHtml(url)}</p>`));
 }
-function createHttpResponseFromUniversalMiddleware(response, earlyHints) {
-    const body = response.body ?? getHtmlFallback('<p style="display: none">No HTTP response body.</p>');
-    const httpResponse = createHttpResponseCommon(response.status, Array.from(response.headers.entries()), body, earlyHints);
-    return httpResponse;
-}
 function getHtmlFallback(bodyHtml, logText = htmlFallbackLog) {
     return `${bodyHtml}<script>console.log(${JSON.stringify(logText)})</script>`;
 }