vike 0.4.253 → 0.4.255-commit-05a7b95

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

@@ -1,8 +1,8 @@
-import '../../../assertEnvServer.js';
 export { getPropVal };
 export { setPropVal };
 export { getPropKeys };
 import { isObject } from '../../../../utils/isObject.js';
+import '../../../assertEnvServer.js';
 // Get a nested property from an object using a dot-separated path such as 'user.id'
 function getPropVal(obj, prop) {
     const keys = getPropKeys(prop);

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

@@ -1,4 +1,3 @@
-import '../../../assertEnvServer.js';
 export { escapeInject };
 export { dangerouslySkipEscape };
 export { renderDocumentHtml };
@@ -12,6 +11,7 @@ import type { PageContextInjectAssets } from './injectAssets.js';
 import { StreamProviderAny, StreamTypePatch, StreamProviderNormalized } from './stream.js';
 import type { PageAsset } from '../getPageAssets.js';
 import type { PreloadFilter } from './injectAssets/getHtmlTags.js';
+import '../../../assertEnvServer.js';
 type DocumentHtml = TemplateWrapped | EscapedString | StreamProviderAny;
 type HtmlRender = string | StreamProviderNormalized;
 type TemplateStrings = TemplateStringsArray;

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

@@ -1,4 +1,3 @@
-import '../../../assertEnvServer.js';
 export { escapeInject };
 export { dangerouslySkipEscape };
 export { renderDocumentHtml };
@@ -15,6 +14,7 @@ import { injectHtmlTagsToString, injectHtmlTagsToStream } from './injectAssets.j
 import { processStream, isStream, streamToString, } from './stream.js';
 import { isStreamFromReactStreamingPackage } from './stream/react-streaming.js';
 import pc from '@brillout/picocolors';
+import '../../../assertEnvServer.js';
 function isDocumentHtml(something) {
     if (isTemplateWrapped(something) || isEscapedString(something) || isStream(something)) {
         checkType(something);

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

@@ -1,4 +1,3 @@
-import '../../../assertEnvServer.js';
 export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
@@ -10,6 +9,7 @@ import type { GlobalContextServerInternal } from '../../globalContext.js';
 import type { PageContextCreatedServer } from '../createPageContextServer.js';
 import type { PageContextBegin } from '../../renderPageServer.js';
 import type { PageContextCspNonce } from '../csp.js';
+import '../../../assertEnvServer.js';
 type PageContextSerialization = PageContextCreatedServer & {
     pageId: string;
     routeParams: Record<string, string>;

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

@@ -1,4 +1,3 @@
-import '../../../assertEnvServer.js';
 export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
@@ -15,6 +14,7 @@ import { pageContextInitIsPassedToClient } from '../../../../shared-server-clien
 import { isServerSideError } from '../../../../shared-server-client/misc/isServerSideError.js';
 import { getPropKeys, getPropVal, setPropVal } from './propKeys.js';
 import { assertRouteParams } from '../../../../shared-server-client/route/resolveRouteFunction.js';
+import '../../../assertEnvServer.js';
 const passToClientBuiltInPageContext = [
     'abortReason',
     '_urlRewrite',

package/dist/server/runtime/renderPageServer/html/stream/react-streaming.d.ts

@@ -1,4 +1,3 @@
-import '../../../../assertEnvServer.js';
 export { isStreamFromReactStreamingPackage };
 export { streamFromReactStreamingPackageToString };
 export { getStreamOfReactStreamingPackage };
@@ -6,6 +5,7 @@ export type { StreamFromReactStreamingPackage };
 export type { StreamFromReactStreamingPackagePublic };
 import type { renderToStream } from 'react-streaming/server';
 import { StreamReadableWeb, StreamWritableNode } from '../stream.js';
+import '../../../../assertEnvServer.js';
 type StreamFromReactStreamingPackagePublic = {
     injectToStream: Function;
 };

package/dist/server/runtime/renderPageServer/html/stream/react-streaming.js

@@ -1,4 +1,3 @@
-import '../../../../assertEnvServer.js';
 // Zero-config support for https://www.npmjs.com/package/react-streaming
 export { isStreamFromReactStreamingPackage };
 export { streamFromReactStreamingPackageToString };
@@ -7,6 +6,7 @@ import { assert, assertUsage } from '../../../../../utils/assert.js';
 import { hasProp } from '../../../../../utils/hasProp.js';
 import { isVikeReactApp } from '../../../../../utils/isVikeReactApp.js';
 import { streamPipeNodeToString, streamReadableWebToString } from '../stream.js';
+import '../../../../assertEnvServer.js';
 function streamFromReactStreamingPackageToString(stream) {
     if (stream.pipe) {
         return streamPipeNodeToString(stream.pipe);

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

@@ -1,4 +1,3 @@
-import '../../../assertEnvServer.js';
 export { processStream };
 export { streamToString };
 export { stampPipe };
@@ -32,6 +31,7 @@ export type { StreamPipeNode };
 import { HtmlRender } from './renderHtml.js';
 import { StreamFromReactStreamingPackagePublic } from './stream/react-streaming.js';
 import type { Readable as Readable_, Writable as Writable_ } from 'node:stream';
+import '../../../assertEnvServer.js';
 type StreamReadableWeb = ReadableStream;
 type StreamReadableNode = Readable_;
 type StreamWritableWeb = WritableStream;

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

@@ -1,4 +1,3 @@
-import '../../../assertEnvServer.js';
 export { processStream };
 export { streamToString };
 export { stampPipe };
@@ -31,6 +30,7 @@ import { objectAssign } from '../../../../utils/objectAssign.js';
 import { getStreamOfReactStreamingPackage, isStreamFromReactStreamingPackage, streamFromReactStreamingPackageToString, } from './stream/react-streaming.js';
 import { import_ } from '@brillout/import';
 import pc from '@brillout/picocolors';
+import '../../../assertEnvServer.js';
 const debug = createDebug('vike:stream');
 function isStreamReadableWeb(thing) {
     return typeof ReadableStream !== 'undefined' && thing instanceof ReadableStream;
@@ -78,6 +78,10 @@ async function stringToStreamReadableNode(str) {
     const { Readable } = await loadStreamNodeModule();
     return Readable.from(str);
 }
+async function streamReadableWebToStreamReadableNode(stream) {
+    const { Readable } = await loadStreamNodeModule();
+    return Readable.fromWeb(stream);
+}
 function stringToStreamReadableWeb(str) {
     // ReadableStream.from() spec discussion: https://github.com/whatwg/streams/issues/1018
     assertReadableStreamConstructor();
@@ -214,7 +218,11 @@ function pipeToStreamWritableNode(htmlRender, writable) {
         streamPipeNode(writable);
         return true;
     }
-    if (isStreamReadableWeb(htmlRender) || isStreamPipeWeb(htmlRender)) {
+    if (isStreamReadableWeb(htmlRender)) {
+        streamReadableWebToStreamReadableNode(htmlRender).then((s) => s.pipe(writable));
+        return true;
+    }
+    if (isStreamPipeWeb(htmlRender)) {
         return false;
     }
     checkType(htmlRender);

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

@@ -1,6 +1,6 @@
-import '../../assertEnvServer.js';
 export { inferMediaType };
 export type { MediaType };
+import '../../assertEnvServer.js';
 type MediaType = null | {
     assetType: 'image' | 'script' | 'font' | 'style' | 'audio' | 'video' | 'document' | 'fetch' | 'track' | 'worker' | 'embed' | 'object';
     mediaType: 'text/javascript' | 'text/css' | 'image/avif' | 'image/jpeg' | 'image/png' | 'image/webp' | 'image/gif' | 'image/svg+xml' | 'font/ttf' | 'font/woff' | 'font/woff2' | 'video/mp4' | 'video/webm' | 'video/ogg' | 'video/mpeg' | 'video/x-msvideo' | 'video/quicktime' | 'audio/mpeg' | 'audio/wav' | 'audio/ogg' | 'audio/aac' | 'audio/midi' | 'audio/flac';

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

@@ -1,7 +1,7 @@
-import '../../assertEnvServer.js';
 export { inferMediaType };
 import { styleFileRE } from '../../../utils/styleFileRE.js';
 import { isScriptFile } from '../../../utils/isScriptFile.js';
+import '../../assertEnvServer.js';
 function inferMediaType(href) {
     // Basics
     if (styleFileRE.test(href)) {

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

@@ -1,4 +1,4 @@
-import '../../assertEnvServer.js';
 export { isFontFallback };
 import type { PageAsset } from './getPageAssets.js';
+import '../../assertEnvServer.js';
 declare function isFontFallback(asset: PageAsset, pageAssets: PageAsset[]): boolean;

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

@@ -1,6 +1,6 @@
-import '../../assertEnvServer.js';
 export { isFontFallback };
 import { assert } from '../../../utils/assert.js';
+import '../../assertEnvServer.js';
 function isFontFallback(asset, pageAssets) {
     if (asset.assetType !== 'font') {
         return false;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvServer.js';
 export { loadPageConfigsLazyServerSide };
 export type { PageContext_loadPageConfigsLazyServerSide };
 export type { PageConfigsLazy };
@@ -10,6 +9,7 @@ import type { PageConfigRuntime } from '../../../types/PageConfig.js';
 import type { PassToClient } from './html/serializeContext.js';
 import type { PageContextAfterRoute } from '../../../shared-server-client/route/index.js';
 import type { PageContextCreatedServer } from './createPageContextServer.js';
+import '../../assertEnvServer.js';
 type PageContext_loadPageConfigsLazyServerSide = PageContextCreatedServer & PageContextAfterRoute & {
     is404: boolean | null;
     pageId: string;
@@ -23,21 +23,13 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     isPrerendering: boolean;
     _requestId: number;
 } & import("../renderPageServer.js").PageContextInit & {
+    _reqDev?: import("http").IncomingMessage;
+    _reqWeb?: Request;
+} & {
     _globalContext: ({
         _globalConfigPublic: {
             pages: {
-                [k: string]: {
-                    config: import("../../../types/index.js").ConfigResolved;
-                    _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -45,18 +37,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
             _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         };
         pages: {
-            [k: string]: {
-                config: import("../../../types/index.js").ConfigResolved;
-                _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -117,23 +98,17 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _pageFilesAll: import("../../../shared-server-client/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: import("../renderPageServer.js").PageContextInit;
+    _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+        _reqDev?: import("http").IncomingMessage;
+        _reqWeb?: Request;
+    } & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
     pages: {
-        [k: string]: {
-            config: import("../../../types/index.js").ConfigResolved;
-            _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-            _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-            _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-        } & ({
-            route: import("../../../types/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
     };
     config: import("../../../types/index.js").ConfigResolved;
     _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvServer.js';
 export { loadPageConfigsLazyServerSide };
 import { getPageFilesServerSide } from '../../../shared-server-client/getPageFiles.js';
 import { resolvePageContextConfig } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
@@ -16,6 +15,7 @@ import { loadAndParseVirtualFilePageEntry } from '../../../shared-server-client/
 import { execHookServer } from './execHookServer.js';
 import { resolveHeadersResponseEarly } from './headersResponse.js';
 import { resolvePageContextCspNone } from './csp.js';
+import '../../assertEnvServer.js';
 async function loadPageConfigsLazyServerSide(pageContext) {
     objectAssign(pageContext, {
         _pageConfig: findPageConfig(pageContext._globalContext._pageConfigs, pageContext.pageId),

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

@@ -1,9 +1,9 @@
-import '../../../assertEnvServer.js';
 export { log404 };
 export { getRoutesInfo };
 import type { PageRoutes } from '../../../../shared-server-client/route/index.js';
 import type { GlobalContextServerInternal } from '../../globalContext.js';
 import type { PageContextCreatedServer } from '../createPageContextServer.js';
+import '../../../assertEnvServer.js';
 declare function log404(pageContext: PageContextCreatedServer & {
     urlPathname: string;
     errorWhileRendering: null | Error;

package/dist/server/runtime/renderPageServer/log404/index.js

@@ -1,4 +1,3 @@
-import '../../../assertEnvServer.js';
 export { log404 };
 // Exported for ./index.spec.ts
 export { getRoutesInfo };
@@ -9,6 +8,7 @@ import { stripAnsi } from '../../../../utils/colorsServer.js';
 import { getTerminalWidth } from '../../../../utils/getTerminalWidth.js';
 import { truncateString } from '../../../../utils/truncateString.js';
 import pc from '@brillout/picocolors';
+import '../../../assertEnvServer.js';
 function log404(pageContext) {
     const { urlPathname } = pageContext;
     const pageRoutes = pageContext._globalContext._pageRoutes;

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

@@ -1,4 +1,4 @@
-import '../../assertEnvServer.js';
 export { loggRuntimeErrorProd };
 import { type PageContext_logRuntime } from '../loggerRuntime.js';
+import '../../assertEnvServer.js';
 declare function loggRuntimeErrorProd(err: unknown, pageContext: PageContext_logRuntime): void;

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

@@ -1,9 +1,9 @@
-import '../../assertEnvServer.js';
 // Logger used for the production server.
 // Any other environment (dev, preview, build, and pre-rendering) uses loggerDev.ts instead.
 export { loggRuntimeErrorProd };
 import { logErrorServer } from '../logErrorServer.js';
 import { assertPageContext_logRuntime } from '../loggerRuntime.js';
+import '../../assertEnvServer.js';
 function loggRuntimeErrorProd(err, pageContext) {
     assertPageContext_logRuntime(pageContext);
     logErrorServer(err, pageContext);