vike 0.4.267-commit-feffb0f → 0.4.267-commit-83049a4

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/createHttpResponse.d.ts

@@ -7,7 +7,6 @@ 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';
@@ -55,4 +54,3 @@ declare function createHttpResponsePageJson(pageContextJson: string | StreamRead
     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

@@ -7,7 +7,6 @@ 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';
@@ -123,11 +122,6 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
     // 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>`;
 }

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

@@ -3,10 +3,10 @@ export { createPageContextServerWithoutGlobalContext };
 export type { PageContextCreatedServer };
 export type { PageContextCreatedServerWithoutGlobalContext };
 import type { GlobalContextServerInternal } from '../globalContext.js';
-import type { PageContextInit, PageContextInitInternal } from '../renderPageServer.js';
+import type { PageContextInit } from '../renderPageServer.js';
 import '../../assertEnvServer.js';
 type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServer>>;
-declare function createPageContextServer(pageContextInit: PageContextInitInternal & {
+declare function createPageContextServer(pageContextInit: PageContextInit & {
     headers?: Record<string, unknown>;
 }, globalContext: GlobalContextServerInternal, args: {
     requestId: number;
@@ -24,12 +24,6 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
     isPrerendering: boolean;
     _requestId: number;
 } & PageContextInit & {
-    _nodeDev?: {
-        req: import("http").IncomingMessage;
-        res: import("http").ServerResponse;
-    };
-    _reqWeb?: Request;
-} & {
     _globalContext: ({
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -66,6 +60,7 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
+        devMiddleware: import("vite").Connect.Server | null;
         viteConfig: import("vite").ResolvedConfig | undefined;
     } | {
         isClientSide: false;
@@ -74,6 +69,7 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -84,12 +80,11 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: false;
         viteConfig: null;
     }) & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -100,6 +95,9 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        middlewares: import("../universal-middleware/core.js").Middleware[];
     })) & {
         prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
     };
@@ -107,12 +105,6 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         headers?: Record<string, unknown>;
     };
     _urlHandler: ((url: string) => string) | null;
@@ -141,10 +133,4 @@ declare function createPageContextServerWithoutGlobalContext(pageContextInit: Pa
     isClientSide: false;
     isPrerendering: boolean;
     _requestId: number;
-} & PageContextInit & {
-    _nodeDev?: {
-        req: import("http").IncomingMessage;
-        res: import("http").ServerResponse;
-    };
-    _reqWeb?: Request;
-};
+} & PageContextInit;

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

@@ -40,11 +40,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             assertUsage(false, `The argument ${pc.cyan('writable')} passed to ${pc.cyan('pageContext.httpResponse.pipe(writable)')} doesn't seem to be ${getStreamName('writable', 'web')} nor ${getStreamName('writable', 'node')}.`);
         },
         getReadableWebStream() {
-            const webStream = getStreamReadableWeb(htmlRender);
-            if (webStream === null) {
-                assertUsage(false, getErrMsg(htmlRender, renderHook, 'getReadableWebStream()', getFixMsg('readable', 'web')));
-            }
-            return webStream;
+            return getStreamReadableWeb(htmlRender);
         },
         async getReadableNodeStream() {
             const nodeStream = await getStreamReadableNode(htmlRender);
@@ -80,11 +76,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
         getWebStream() {
             assertWarning(false, '`pageContext.httpResponse.getWebStream(res)` is outdated, use `pageContext.httpResponse.getReadableWebStream(res)` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
-            const webStream = getStreamReadableWeb(htmlRender);
-            if (webStream === null) {
-                assertUsage(false, getErrMsg(htmlRender, renderHook, 'getWebStream()', getFixMsg('readable', 'web')));
-            }
-            return webStream;
+            return getStreamReadableWeb(htmlRender);
         },
         // TO-DO/next-major-release: remove
         pipeToWebWritable(writable) {

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

@@ -1,6 +1,6 @@
 export { handlePageContextRequestUrl };
 import { pageContextJsonFileExtension, doNotCreateExtraDirectory, } from '../../../shared-server-client/getPageContextRequestUrl.js';
-import { modifyUrl } from '../../../shared-server-client/modifyUrl.js';
+import { modifyUrlSameOrigin } from '../../../shared-server-client/modifyUrlSameOrigin.js';
 import { slice } from '../../../utils/slice.js';
 import { baseServer } from '../../../utils/urlToFile.js';
 import { assert } from '../../../utils/assert.js';
@@ -46,7 +46,7 @@ function processUrl(urlParsed, url) {
     if (pathnameModified === '')
         pathnameModified = '/';
     const searchVikeArgs = search?._vike;
-    const urlWithoutPageContextRequestSuffix = modifyUrl(url, {
+    const urlWithoutPageContextRequestSuffix = modifyUrlSameOrigin(url, {
         pathname: pathnameModified,
         search: {
             _vike: searchVikeArgs ? null : undefined,

package/dist/server/runtime/renderPageServer/html/stream.d.ts

@@ -52,7 +52,7 @@ declare function streamReadableWebToBytes(readableWeb: ReadableStream): Promise<
 declare function awaitFirstChunk(stream: StreamReadableWeb, onErrorWhileStreaming: (err: unknown) => void): Promise<StreamReadableWeb>;
 declare function streamPipeNodeToString(streamPipeNode: StreamPipeNode): Promise<string>;
 declare function getStreamReadableNode(htmlRender: HtmlRender | Uint8Array): Promise<null | StreamReadableNode>;
-declare function getStreamReadableWeb(htmlRender: HtmlRender | Uint8Array): null | StreamReadableWeb;
+declare function getStreamReadableWeb(htmlRender: HtmlRender | Uint8Array): StreamReadableWeb;
 declare function pipeToStreamWritableWeb(htmlRender: HtmlRender | Uint8Array, writable: StreamWritableWeb): boolean;
 declare function pipeToStreamWritableNode(htmlRender: HtmlRender | Uint8Array, writable: StreamWritableNode): boolean;
 declare function processStream(streamOriginal: StreamProviderAny, { injectStringAtBegin, injectStringAfterFirstChunk, injectStringAtEnd, onErrorWhileStreaming, enableEagerStreaming, onCancel, }: {

package/dist/server/runtime/renderPageServer/html/stream.js

@@ -234,7 +234,20 @@ function getStreamReadableWeb(htmlRender) {
         streamPipeWeb(writable);
         return readable;
     }
-    return null;
+    if (isStreamReadableNode(htmlRender) || isStreamPipeNode(htmlRender)) {
+        // A Node.js stream implies that Node.js's `stream` module is available
+        const { readable, writable } = new TransformStream();
+        loadStreamNodeModule().then(({ Readable, PassThrough }) => {
+            const passThrough = new PassThrough();
+            pipeToStreamWritableNode(htmlRender, passThrough);
+            Readable.toWeb(passThrough)
+                .pipeTo(writable)
+                .catch(() => { });
+        });
+        return readable;
+    }
+    checkType(htmlRender);
+    assert(false);
 }
 function pipeToStreamWritableWeb(htmlRender, writable) {
     if (typeof htmlRender === 'string' || htmlRender instanceof Uint8Array) {
@@ -866,8 +879,8 @@ function encodeForWebStream(thing) {
 // Because of Cloudflare Workers, we cannot statically import the `stream` module, instead we dynamically import it.
 async function loadStreamNodeModule() {
     const streamModule = (await import_('stream')).default;
-    const { Readable, Writable, pipeline } = streamModule;
-    return { Readable, Writable, pipeline };
+    const { Readable, Writable, PassThrough, pipeline } = streamModule;
+    return { Readable, Writable, PassThrough, pipeline };
 }
 function getStreamName(kind, type) {
     let typeName = capitalizeFirstLetter(type);

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

@@ -23,12 +23,6 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     isPrerendering: boolean;
     _requestId: number;
 } & import("../renderPageServer.js").PageContextInit & {
-    _nodeDev?: {
-        req: import("http").IncomingMessage;
-        res: import("http").ServerResponse;
-    };
-    _reqWeb?: Request;
-} & {
     _globalContext: ({
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -65,6 +59,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
+        devMiddleware: import("vite").Connect.Server | null;
         viteConfig: import("vite").ResolvedConfig | undefined;
     } | {
         isClientSide: false;
@@ -73,6 +68,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -83,12 +79,11 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: false;
         viteConfig: null;
     }) & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -99,6 +94,9 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        middlewares: import("../universal-middleware/core.js").Middleware[];
     })) & {
         prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
     };
@@ -106,12 +104,6 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         headers?: Record<string, unknown>;
     };
     _urlHandler: ((url: string) => string) | null;