vike 0.4.191 → 0.4.192

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

@@ -55,16 +55,15 @@ async function streamReadableNodeToString(readableNode) {
 }
 async function streamReadableWebToString(readableWeb) {
     const reader = readableWeb.getReader();
-    const decoder = new TextDecoder();
+    const { decode, getClosingChunk } = decodeChunks();
     let str = '';
     while (true) {
         const { done, value } = await reader.read();
         if (done)
             break;
-        str += decoder.decode(value, { stream: true });
+        str += decode(value);
     }
-    // https://github.com/vikejs/vike/pull/1799#discussion_r1713554096
-    str += decoder.decode();
+    str += getClosingChunk();
     return str;
 }
 async function stringToStreamReadableNode(str) {
@@ -128,15 +127,16 @@ async function streamPipeNodeToString(streamPipeNode) {
     return promise;
 }
 function streamPipeWebToString(streamPipeWeb) {
+    const { decode, getClosingChunk } = decodeChunks();
     let str = '';
     let resolve;
     const promise = new Promise((r) => (resolve = r));
     const writable = new WritableStream({
         write(chunk) {
-            assert(typeof chunk === 'string');
-            str += chunk;
+            str += decode(chunk);
         },
         close() {
+            str += getClosingChunk();
             resolve(str);
         }
     });
@@ -388,9 +388,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             assert(writableOriginal);
             writableOriginal.write(chunk);
-            if (debug.isActivated) {
-                debug('data written (Node.js Writable)', getChunkAsString(chunk));
-            }
+            debugWithChunk('data written (Node.js Writable)', chunk);
         };
         // For libraries such as https://www.npmjs.com/package/compression
         //  - React calls writable.flush() when available
@@ -461,9 +459,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             assert(writerOriginal);
             writerOriginal.write(encodeForWebStream(chunk));
-            if (debug.isActivated) {
-                debug('data written (Web Writable)', getChunkAsString(chunk));
-            }
+            debugWithChunk('data written (Web Writable)', chunk);
         };
         // Web Streams have compression built-in
         //  - https://developer.mozilla.org/en-US/docs/Web/API/Compression_Streams_API
@@ -554,14 +550,10 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             // 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) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
-                if (debug.isActivated) {
-                    debug('data written (Web Readable)', getChunkAsString(chunk));
-                }
+                debugWithChunk('data written (Web Readable)', chunk);
             }
             else {
-                if (debug.isActivated) {
-                    debug('data emitted but not written (Web Readable)', getChunkAsString(chunk));
-                }
+                debugWithChunk('data emitted but not written (Web Readable)', chunk);
             }
         };
         // Readables don't have the notion of flushing
@@ -581,9 +573,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         }
         const writeChunk = (chunk) => {
             readableProxy.push(chunk);
-            if (debug.isActivated) {
-                debug('data written (Node.js Readable)', getChunkAsString(chunk));
-            }
+            debugWithChunk('data written (Node.js Readable)', chunk);
         };
         // Readables don't have the notion of flushing
         const flushStream = null;
@@ -796,11 +786,34 @@ function inferStreamName(stream) {
     }
     assert(false);
 }
-function getChunkAsString(chunk) {
+function decodeChunks() {
+    const decoder = new TextDecoder();
+    const decode = (chunk) => {
+        if (typeof chunk === 'string') {
+            return chunk;
+        }
+        else if (chunk instanceof Uint8Array) {
+            return decoder.decode(chunk, { stream: true });
+        }
+        else {
+            assert(false);
+        }
+    };
+    // https://github.com/vikejs/vike/pull/1799#discussion_r1713554096
+    const getClosingChunk = () => {
+        return decoder.decode();
+    };
+    return { decode, getClosingChunk };
+}
+function debugWithChunk(msg, chunk) {
+    if (!debug.isActivated)
+        return;
+    let chunkStr;
     try {
-        return new TextDecoder().decode(chunk);
+        chunkStr = new TextDecoder().decode(chunk);
     }
     catch (err) {
-        return String(chunk);
+        chunkStr = String(chunk);
     }
+    debug(msg, chunkStr);
 }

package/dist/esm/node/runtime/page-files/getPageFilesExports.d.ts

@@ -0,0 +1,2 @@
+export { getPageFilesExports };
+declare function getPageFilesExports(): Promise<Record<string, unknown>>;

package/dist/esm/node/runtime/page-files/getPageFilesExports.js

@@ -0,0 +1,20 @@
+export { getPageFilesExports };
+import { assert, debugGlob, isObject } from '../utils.js';
+import { getViteDevServer } from '../globalContext.js';
+import { virtualFileIdImportUserCodeServer } from '../../shared/virtual-files/virtualFileImportUserCode.js';
+async function getPageFilesExports() {
+    const viteDevServer = getViteDevServer();
+    assert(viteDevServer);
+    let moduleExports;
+    try {
+        moduleExports = await viteDevServer.ssrLoadModule(virtualFileIdImportUserCodeServer);
+    }
+    catch (err) {
+        debugGlob(`Glob error: ${virtualFileIdImportUserCodeServer} transpile error: `, err);
+        throw err;
+    }
+    moduleExports = moduleExports.default || moduleExports;
+    debugGlob('Glob result: ', moduleExports);
+    assert(isObject(moduleExports));
+    return moduleExports;
+}

package/dist/esm/node/runtime/page-files/setup.js

@@ -1,21 +1,3 @@
 import { setPageFilesAsync } from '../../../shared/getPageFiles.js';
-import { assert, debugGlob, isObject } from '../utils.js';
-import { getViteDevServer } from '../globalContext.js';
-import { virtualFileIdImportUserCodeServer } from '../../shared/virtual-files/virtualFileImportUserCode.js';
+import { getPageFilesExports } from './getPageFilesExports.js';
 setPageFilesAsync(getPageFilesExports);
-async function getPageFilesExports() {
-    const viteDevServer = getViteDevServer();
-    assert(viteDevServer);
-    let moduleExports;
-    try {
-        moduleExports = await viteDevServer.ssrLoadModule(virtualFileIdImportUserCodeServer);
-    }
-    catch (err) {
-        debugGlob(`Glob error: ${virtualFileIdImportUserCodeServer} transpile error: `, err);
-        throw err;
-    }
-    moduleExports = moduleExports.default || moduleExports;
-    debugGlob('Glob result: ', moduleExports);
-    assert(isObject(moduleExports));
-    return moduleExports;
-}

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

@@ -4,7 +4,7 @@ import { getRenderContext, getPageContextInitEnhanced, renderPageAlreadyRouted }
 import { route } from '../../shared/route/index.js';
 import { assert, hasProp, objectAssign, isUrl, parseUrl, assertEnv, assertWarning, getGlobalObject, checkType, assertUsage, normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, addUrlOrigin, createUrlFromComponents, isUri } from './utils.js';
 import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError, logAbortErrorHandled } from '../../shared/route/abort.js';
-import { getGlobalContext, initGlobalContext } from './globalContext.js';
+import { getGlobalContext, initGlobalContext_renderPage } from './globalContext.js';
 import { handlePageContextRequestUrl } from './renderPage/handlePageContextRequestUrl.js';
 import { createHttpResponseObjectRedirect, createHttpResponsePageContextJson } from './renderPage/createHttpResponseObject.js';
 import { logRuntimeError, logRuntimeInfo } from './renderPage/loggerRuntime.js';
@@ -61,12 +61,12 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
     // Prepare context
     let renderContext;
     try {
-        await initGlobalContext();
+        await initGlobalContext_renderPage();
         renderContext = await getRenderContext();
     }
     catch (err) {
-        // Errors are expected since assertUsage() is used in both initGlobalContext() and getRenderContext().
-        // initGlobalContext() and getRenderContext() don't call any user hooks => err isn't thrown from user code
+        // Errors are expected since assertUsage() is used in both initGlobalContext_renderPage() and getRenderContext().
+        // initGlobalContext_renderPage() and getRenderContext() don't call any user hooks => err isn't thrown from user code.
         assert(!isAbortError(err));
         logRuntimeError(err, httpRequestId);
         const pageContextHttpResponseNull = getPageContextHttpResponseNullWithError(err, pageContextInit);

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

@@ -56,3 +56,4 @@ export * from '../../utils/normalizeHeaders.js';
 export * from '../../utils/isVikeReactApp.js';
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/PROJECT_VERSION.js';
+export * from '../../utils/genPromise.js';

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

@@ -59,3 +59,4 @@ export * from '../../utils/normalizeHeaders.js';
 export * from '../../utils/isVikeReactApp.js';
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/PROJECT_VERSION.js';
+export * from '../../utils/genPromise.js';

package/dist/esm/shared/ConfigVike.d.ts

@@ -7,7 +7,7 @@ type ConfigVikeResolved = {
         partial: boolean;
         disableAutoRun: boolean;
     };
-    disableAutoFullBuild: boolean | null;
+    disableAutoFullBuild: boolean | 'prerender' | null;
     includeAssetsImportedByServer: boolean;
     baseAssets: string;
     baseServer: string;
@@ -63,13 +63,13 @@ type ConfigVikeUserProvided = {
         disableAutoRun?: boolean;
     };
     /**
-     * Set to `true` to disable the automatic chaining of all the build steps.
+     * Disable the automatic chaining of build steps.
      *
      * https://vike.dev/disableAutoFullBuild
      *
      * @default false
      */
-    disableAutoFullBuild?: boolean;
+    disableAutoFullBuild?: boolean | 'prerender';
     /** The Base URL of your server.
      *
      * https://vike.dev/base-url

package/dist/esm/shared/hooks/executeHook.d.ts

@@ -4,7 +4,7 @@ export { providePageContext };
 export { isUserHookError };
 import type { PageContextClient, PageContextServer } from '../types.js';
 import type { Hook, HookLoc } from './getHook.js';
-type PageContextUnknown = null | Record<string, unknown>;
+type PageContextUnknown = null | Record<string, any>;
 declare function isUserHookError(err: unknown): false | HookLoc;
 declare function executeHook<T = unknown>(hookFnCaller: () => T, hook: Omit<Hook, 'hookFn'>, pageContext: PageContextUnknown): Promise<T>;
 /**

package/dist/esm/shared/hooks/getHook.d.ts

@@ -2,7 +2,7 @@ export { getHook };
 export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
 export { assertHook };
-export { setIsPrerenderering };
+export { getHook_setIsPrerenderering };
 export type { Hook };
 export type { HookName };
 export type { HookLoc };
@@ -33,4 +33,4 @@ declare function assertHook<TPageContext extends PageContextExports, THookName e
     exports: Record<THookName, Function | undefined>;
 };
 declare function getHookTimeoutDefault(hookName: HookName): HookTimeout;
-declare function setIsPrerenderering(): void;
+declare function getHook_setIsPrerenderering(): void;

package/dist/esm/shared/hooks/getHook.js

@@ -2,7 +2,7 @@ export { getHook };
 export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
 export { assertHook };
-export { setIsPrerenderering };
+export { getHook_setIsPrerenderering };
 // TODO/v1-release: remove
 // We export for old V0.4 design which doesn't support configooksTimeout
 export { getHookTimeoutDefault };
@@ -11,9 +11,7 @@ import { getHookFilePathToShowToUser } from '../page-configs/helpers.js';
 import { getConfigValueRuntime } from '../page-configs/getConfigValue.js';
 import { assert, assertUsage, checkType, isCallable, isObject } from '../utils.js';
 import pc from '@brillout/picocolors';
-const globalObject = getGlobalObject('getHook.ts', {
-    isPrerendering: false
-});
+const globalObject = getGlobalObject('getHook.ts', {});
 function getHook(pageContext, hookName) {
     if (!(hookName in pageContext.exports)) {
         return null;
@@ -130,6 +128,6 @@ function getHookTimeoutDefault(hookName) {
         warning: 4 * 1000
     };
 }
-function setIsPrerenderering() {
+function getHook_setIsPrerenderering() {
     globalObject.isPrerendering = true;
 }

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -67,8 +67,6 @@ type ConfigEnv = {
 /** For Vike internal use */
 type ConfigEnvInternal = Omit<ConfigEnv, 'client'> & {
     client?: boolean | 'if-client-routing';
-    /** Always load value, no matter which page is loaded. */
-    eager?: true;
     /** Load value only in production, or only in development. */
     production?: boolean;
 };

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.d.ts

@@ -2,4 +2,6 @@ export { serializeConfigValues };
 import type { ConfigEnvInternal, PageConfigBuildTime, PageConfigGlobalBuildTime } from '../PageConfig.js';
 declare function serializeConfigValues(pageConfig: PageConfigBuildTime | (PageConfigGlobalBuildTime & {
     configValuesComputed?: undefined;
-}), importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, tabspace: string): string[];
+}), importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, { isEager }: {
+    isEager: boolean;
+}, tabspace: string): string[];

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.js

@@ -12,7 +12,7 @@ const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // - vike/shared/page-configs/serialize/parsePageConfigs.ts
 // - parsePageConfigs() is loaded on both the client- and server-side.
 assertIsNotProductionRuntime();
-function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspace) {
+function serializeConfigValues(pageConfig, importStatements, isEnvMatch, { isEager }, tabspace) {
     const lines = [];
     tabspace += '  ';
     Object.entries(pageConfig.configValuesComputed ?? {}).forEach(([configName, configValuesComputed]) => {
@@ -31,6 +31,8 @@ function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspac
     Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
         const configDef = pageConfig.configDefinitions[configName];
         assert(configDef);
+        if (isEager !== !!configDef.eager)
+            return;
         if (!configDef.cumulative) {
             const configValueSource = sources[0];
             assert(configValueSource);

package/dist/esm/types/index.d.ts

@@ -3,6 +3,7 @@ export type { PageContextServer } from '../shared/types.js';
 export type { PageContextClient } from '../shared/types.js';
 export type { PageContextWithServerRouting } from '../shared/types.js';
 export type { PageContextClientWithServerRouting } from '../shared/types.js';
+export type { ConfigVitePluginServerEntry } from '@brillout/vite-plugin-server-entry/plugin.js';
 export type { PageContextBuiltInServer } from '../shared/types.js';
 export type { PageContextBuiltInClientWithClientRouting } from '../shared/types.js';
 export type { PageContextBuiltInClientWithServerRouting } from '../shared/types.js';

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.191";
+export declare const PROJECT_VERSION: "0.4.192";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.191';
+export const PROJECT_VERSION = '0.4.192';

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

@@ -0,0 +1,4 @@
+export declare function genPromise<T>(): {
+    promise: Promise<T>;
+    resolve: (val: T) => void;
+};

package/dist/esm/utils/genPromise.js

@@ -0,0 +1,5 @@
+export function genPromise() {
+    let resolve;
+    const promise = new Promise((r) => (resolve = r));
+    return { promise, resolve };
+}

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.191";
+    projectVersion: "0.4.192";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.191",
+  "version": "0.4.192",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -17,7 +17,7 @@
     "@brillout/json-serializer": "^0.5.13",
     "@brillout/picocolors": "^1.0.14",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.4.5",
+    "@brillout/vite-plugin-server-entry": "^0.4.9",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
@@ -219,7 +219,7 @@
     "es-module-lexer": "^1.4.1",
     "esbuild": "^0.23.0",
     "fast-glob": "^3.3.2",
-    "react-streaming": "^0.3.42",
+    "react-streaming": "^0.3.43",
     "rimraf": "^5.0.5",
     "semver": "^7.6.3",
     "sirv": "^2.0.4",