vike 0.4.171 → 0.4.172

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

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addSsrMiddleware = void 0;
 const renderPage_js_1 = require("../../runtime/renderPage.js");
+const utils_js_1 = require("../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function addSsrMiddleware(middlewares) {
     middlewares.use(async (req, res, next) => {
         if (res.headersSent)
@@ -10,11 +15,21 @@ function addSsrMiddleware(middlewares) {
         if (!url)
             return next();
         const { headers } = req;
-        const userAgent = headers['user-agent'];
         const pageContextInit = {
             urlOriginal: url,
-            userAgent
+            headersOriginal: headers
         };
+        Object.defineProperty(pageContextInit, 'userAgent', {
+            get() {
+                // TODO/next-major-release: assertUsage() instead of assertWarning()
+                (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('pageContext.userAgent')} is deprecated: use ${picocolors_1.default.cyan("pageContext.headers['user-agent']")} instead.`, {
+                    showStackTrace: true,
+                    onlyOnce: true
+                });
+                return headers['user-agent'];
+            },
+            enumerable: false
+        });
         let pageContext;
         try {
             pageContext = await (0, renderPage_js_1.renderPage)(pageContextInit);

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

@@ -44,7 +44,7 @@ const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const getConfigValue_js_1 = require("../../shared/page-configs/getConfigValue.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
-const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../../shared/getPageContextUrlComputed.js");
 const abort_js_1 = require("../../shared/route/abort.js");
 const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFilesServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
@@ -52,6 +52,7 @@ const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
 const executeHook_js_1 = require("../../shared/hooks/executeHook.js");
+const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.js");
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -142,7 +143,7 @@ async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerend
     // V1 design
     pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
-        const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, configName, 'boolean');
+        const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
             const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData);
             (0, utils_js_1.assert)(configValueFilePathToShowToUser);
@@ -245,7 +246,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
         if (doNotPrerenderList.find((p) => p.pageId === pageId)) {
             return;
         }
-        const prerenderResult = await (0, executeHook_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout });
+        const prerenderResult = await (0, executeHook_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout }, null);
         const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
         result.forEach(({ url, pageContext }) => {
             {
@@ -268,9 +269,9 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
             prerenderContext.pageContexts.push(pageContextNew);
             if (pageContext) {
                 (0, utils_js_1.objectAssign)(pageContextNew, {
-                    _pageContextAlreadyProvidedByOnPrerenderHook: true,
-                    ...pageContext
+                    _pageContextAlreadyProvidedByOnPrerenderHook: true
                 });
+                (0, utils_js_1.objectAssign)(pageContextNew, pageContext);
             }
         });
     })));
@@ -328,14 +329,11 @@ function createPageContext(urlOriginal, renderContext, prerenderContext) {
         _prerenderContext: prerenderContext
     };
     const pageContextInit = {
-        urlOriginal,
-        ...prerenderContext.pageContextInit
+        urlOriginal
     };
+    (0, utils_js_1.objectAssign)(pageContextInit, prerenderContext.pageContextInit);
     {
-        const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext, {
-            // We set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in a onPrerenderStart() hook, e.g. /examples/i18n/
-            urlComputedPropsNonEnumerable: true
-        });
+        const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
     return pageContext;
@@ -410,6 +408,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
     const docLink = 'https://vike.dev/i18n#pre-rendering';
+    // Set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in onPrerenderStart() hook, e.g. /examples/i18n/
+    const { restoreEnumerable, addPageContextComputedUrl } = makePageContextComputedUrlNonEnumerable(prerenderContext.pageContexts);
     let result = await (0, executeHook_js_1.executeHook)(() => hookFn({
         pageContexts: prerenderContext.pageContexts,
         // TODO/v1-release: remove warning
@@ -420,7 +420,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
             });
             return prerenderContext.pageContexts;
         }
-    }), onPrerenderStartHook);
+    }), onPrerenderStartHook, null);
+    restoreEnumerable();
     if (result === null || result === undefined) {
         return;
     }
@@ -458,9 +459,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
                 hookName
             };
         }
-        // Restore as URL computed props are lost when user makes a pageContext copy
-        (0, addUrlComputedProps_js_1.addUrlComputedProps)(pageContext);
     });
+    addPageContextComputedUrl(prerenderContext.pageContexts);
 }
 async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete) {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
@@ -502,7 +502,7 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
             if (pageContext._pageConfigs.length > 0) {
                 const pageConfig = pageContext._pageConfigs.find((p) => p.pageId === pageId);
                 (0, utils_js_1.assert)(pageConfig);
-                usesClientRouter = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+                usesClientRouter = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
                 usesClientRouter = globalContext.pluginManifest.usesClientRouter;
@@ -743,3 +743,23 @@ function assertIsNotAbort(err, urlOr404) {
     (0, utils_js_1.assert)(abortCall);
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
+function makePageContextComputedUrlNonEnumerable(pageContexts) {
+    change(false);
+    return { restoreEnumerable, addPageContextComputedUrl };
+    function restoreEnumerable() {
+        change(true);
+    }
+    function addPageContextComputedUrl(pageContexts) {
+        // Add URL computed props to the user-generated pageContext copies
+        pageContexts.forEach((pageContext) => {
+            const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContext);
+            (0, utils_js_1.objectAssign)(pageContext, pageContextUrlComputed);
+        });
+    }
+    function change(enumerable) {
+        pageContexts.forEach((pageContext) => {
+            (0, utils_js_1.changeEnumerable)(pageContext, 'urlPathname', enumerable);
+            (0, utils_js_1.changeEnumerable)(pageContext, 'urlParsed', enumerable);
+        });
+    }
+}

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

@@ -31,3 +31,4 @@ __exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
 __exportStar(require("../../utils/assertPathFilesystemAbsolute.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
+__exportStar(require("../../utils/changeEnumerable.js"), exports);

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -112,7 +112,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
         });
     }
     // The JavaScript entry <script> tag
-    const scriptEntry = await mergeScriptEntries(pageAssets, isProduction);
+    const scriptEntry = await mergeScriptEntries(pageAssets);
     if (scriptEntry) {
         htmlTags.push({
             htmlTag: scriptEntry,
@@ -134,11 +134,11 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     return htmlTags;
 }
 exports.getHtmlTags = getHtmlTags;
-async function mergeScriptEntries(pageAssets, isProduction) {
+async function mergeScriptEntries(pageAssets) {
     const scriptEntries = pageAssets.filter((pageAsset) => pageAsset.isEntry && pageAsset.assetType === 'script');
     const viteScripts = await (0, getViteDevScripts_js_1.getViteDevScripts)();
     const scriptTagsHtml = `${viteScripts}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
-    const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml, isProduction);
+    const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml);
     return scriptTag;
 }
 function getPageContextJsonScriptTag(pageContext) {

package/dist/cjs/node/runtime/html/injectAssets/getViteDevScripts.js

@@ -21,7 +21,8 @@ async function getViteDevScripts() {
     (0, utils_js_1.assertUsage)(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), 'Vite plugins that minify the HTML are not supported by vike, see https://github.com/vikejs/vike/issues/224');
     (0, utils_js_1.assertUsage)(fakeHtml.startsWith(fakeHtmlBegin) && fakeHtml.endsWith(fakeHtmlEnd), 'You are using a Vite Plugin that transforms the HTML in a way that conflicts with vike. Create a new GitHub ticket to discuss a solution.');
     const viteInjection = fakeHtml.slice(fakeHtmlBegin.length, -1 * fakeHtmlEnd.length);
-    (0, utils_js_1.assert)(viteInjection.includes('script'), { viteInjection });
+    (0, utils_js_1.assert)(viteInjection.includes('script'));
+    (0, utils_js_1.assertWarning)(!viteInjection.includes('import('), 'Unexpected Vite HMR code. Reach out to a Vike maintainer on GitHub.', { onlyOnce: true });
     const scriptTags = viteInjection;
     return scriptTags;
 }

package/dist/cjs/node/runtime/html/injectAssets/mergeScriptTags.js

@@ -6,7 +6,7 @@ const inferHtmlTags_js_1 = require("./inferHtmlTags.js");
 const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
-function mergeScriptTags(scriptTagsHtml, isProduction) {
+function mergeScriptTags(scriptTagsHtml) {
     let scriptTag = '';
     const scripts = parseScripts(scriptTagsHtml);
     // We need to merge module scripts to ensure execution order
@@ -21,13 +21,7 @@ function mergeScriptTags(scriptTagsHtml, isProduction) {
                 const hasInnerHtml = !!innerHtml.trim();
                 if (src) {
                     (0, utils_js_1.assert)(!hasInnerHtml);
-                    if (isProduction) {
-                        contents.push(`import ${JSON.stringify(src)};`);
-                    }
-                    else {
-                        // Ensure HMR preamble code is executed before client entries
-                        contents.push(`import(${JSON.stringify(src)});`);
-                    }
+                    contents.push(`import ${JSON.stringify(src)};`);
                 }
                 else if (hasInnerHtml) {
                     innerHtml = innerHtml.split('\n').filter(Boolean).join('\n');

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

@@ -170,35 +170,44 @@ async function renderTemplate(templateContent, pageContext) {
             setStream(templateVar);
             continue;
         }
-        const getErrMsg = (typeText, end) => {
+        const getErrMsg = (msg) => {
             const { hookName, hookFilePath } = pageContext._renderHook;
             const nth = (i === 0 && '1st') || (i === 1 && '2nd') || (i === 2 && '3rd') || `${i}-th`;
-            return [`The ${nth} HTML variable is ${typeText}, see ${hookName}() hook defined by ${hookFilePath}.`, end]
+            return [
+                `The ${nth} HTML variable is ${msg}`,
+                `The HTML was provided by the ${hookName}() hook at ${hookFilePath}.`
+            ]
                 .filter(Boolean)
                 .join(' ');
         };
-        (0, utils_js_1.assertUsage)(!(0, utils_js_1.isPromise)(templateVar), getErrMsg('a promise', `Did you forget to ${picocolors_1.default.cyan('await')} the promise?`));
+        (0, utils_js_1.assertUsage)(!(0, utils_js_1.isPromise)(templateVar), getErrMsg(`a promise, did you forget to ${picocolors_1.default.cyan('await')} the promise?`));
         if (templateVar === undefined || templateVar === null) {
-            (0, utils_js_1.assertWarning)(false, getErrMsg(`${picocolors_1.default.cyan(String(templateVar))} which will be converted to an empty string`, `Pass the empty string ${picocolors_1.default.cyan("''")} instead of ${picocolors_1.default.cyan(String(templateVar))} to remove this warning.`), { onlyOnce: false });
+            const msgVal = picocolors_1.default.cyan(String(templateVar));
+            const msgEmptyString = picocolors_1.default.cyan("''");
+            const msg = `${msgVal} which will be converted to an empty string. Pass the empty string ${msgEmptyString} instead of ${msgVal} to remove this warning.`;
+            (0, utils_js_1.assertWarning)(false, getErrMsg(msg), { onlyOnce: false });
             templateVar = '';
         }
         {
             const varType = typeof templateVar;
-            const streamNote = ['boolean', 'number', 'bigint', 'symbol'].includes(varType)
-                ? null
-                : '(See https://vike.dev/streaming for HTML streaming.)';
-            (0, utils_js_1.assertUsage)(varType === 'string', getErrMsg(picocolors_1.default.cyan(`typeof htmlVar === "${varType}"`), streamNote));
+            if (varType !== 'string') {
+                const msgType = picocolors_1.default.cyan(`typeof htmlVariable === "${varType}"`);
+                const msg = `${msgType} but a string or stream (https://vike.dev/streaming) is expected instead.`;
+                (0, utils_js_1.assertUsage)(false, getErrMsg(msg));
+            }
         }
         {
             const { isProduction } = (0, globalContext_js_1.getGlobalContext)();
             if ((0, utils_js_1.isHtml)(templateVar) &&
                 // We don't show this warning in production because it's expected that some users may (un)willingly do some XSS injection: we avoid flooding the production logs.
                 !isProduction) {
-                (0, utils_js_1.assertWarning)(false, getErrMsg(`${picocolors_1.default.cyan(templateVar)} which seems to be HTML code`, 'Did you forget to wrap the value with dangerouslySkipEscape()?'), { onlyOnce: false });
+                const msgVal = picocolors_1.default.cyan(String(templateVar));
+                const msg = `${msgVal} which seems to be HTML code. Did you forget to wrap the value with dangerouslySkipEscape()?`;
+                (0, utils_js_1.assertWarning)(false, getErrMsg(msg), { onlyOnce: false });
             }
         }
         // Escape untrusted template variable
-        addHtmlPart(escapeHtml(templateVar));
+        addHtmlPart((0, utils_js_1.escapeHtml)(templateVar));
     }
     (0, utils_js_1.assert)(templateStrings.length === templateVariables.length + 1);
     addHtmlPart(templateStrings[templateStrings.length - 1]);
@@ -214,16 +223,6 @@ async function renderTemplate(templateContent, pageContext) {
         htmlPartsEnd
     };
 }
-function escapeHtml(unsafeString) {
-    // Source: https://stackoverflow.com/questions/6234773/can-i-escape-html-special-chars-in-javascript/6234804#6234804
-    const safe = unsafeString
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-    return safe;
-}
 async function getHtmlString(htmlRender) {
     if (typeof htmlRender === 'string') {
         return htmlRender;

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

@@ -762,17 +762,17 @@ async function loadStreamNodeModule() {
     const { Readable, Writable } = streamModule;
     return { Readable, Writable };
 }
-function getStreamName(type, standard) {
-    let standardName = (0, utils_js_1.capitalizeFirstLetter)(standard);
-    if (standardName === 'Node') {
-        standardName = 'Node.js';
+function getStreamName(kind, type) {
+    let typeName = (0, utils_js_1.capitalizeFirstLetter)(type);
+    if (typeName === 'Node') {
+        typeName = 'Node.js';
     }
-    const typeName = (0, utils_js_1.capitalizeFirstLetter)(type);
-    if (type !== 'pipe') {
-        return `a ${typeName} ${standardName} Stream`;
+    const kindName = (0, utils_js_1.capitalizeFirstLetter)(kind);
+    if (kind !== 'pipe') {
+        return `a ${kindName} ${typeName} Stream`;
     }
-    if (type === 'pipe') {
-        return `a ${standardName} Stream Pipe`;
+    if (kind === 'pipe') {
+        return `a ${typeName} Stream Pipe`;
     }
     (0, utils_js_1.assert)(false);
 }

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -6,12 +6,16 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const globalContext_js_1 = require("../globalContext.js");
-const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
+const getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
-        const clientEntry = !isClientSideRenderable ? clientFilePath : (0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting);
+        const clientEntries = [];
+        const clientFilePath = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
+        if (clientFilePath)
+            clientEntries.push(clientFilePath);
+        if (isClientSideRenderable)
+            clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),
@@ -43,15 +47,13 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
           }
         })
         */
-        const clientEntries = [];
-        if (clientEntry) {
+        clientEntries.forEach((clientEntry) => {
             clientDependencies.push({
                 id: clientEntry,
                 onlyAssets: false,
                 eagerlyImported: false
             });
-            clientEntries.push(clientEntry);
-        }
+        });
         return {
             isHtmlOnly: !isClientSideRenderable,
             isClientRouting,

package/dist/cjs/node/runtime/renderPage/createHttpResponseObject/getCacheControl.js

@@ -9,7 +9,7 @@ function getCacheControl(pageId, pageConfigs) {
     if (pageConfigs.length === 0)
         return defaultValue;
     const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'cacheControl', 'string');
+    const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
     const value = configValue?.value;
     if (value)
         return value;

package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js

@@ -16,7 +16,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     }
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
     if (dataHook) {
-        const hookResult = await (0, executeHook_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook, pageContext);
         // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
             data: hookResult
@@ -24,7 +24,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
         Object.assign(pageContext, pageContextFromHook);
     }
     if (onBeforeRenderHook) {
-        const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook, pageContext);
         (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookResult, onBeforeRenderHook.hookFilePath);
         const pageContextFromHook = hookResult?.pageContext;
         Object.assign(pageContext, pageContextFromHook);

package/dist/cjs/node/runtime/renderPage/executeOnRenderHtmlHook.js

@@ -18,7 +18,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     const { renderHook, hookFn } = getRenderHook(pageContext);
     (0, utils_js_1.objectAssign)(pageContext, { _renderHook: renderHook });
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
-    const hookReturnValue = await (0, executeHook_js_1.executeHook)(() => hookFn(pageContext), renderHook);
+    const hookReturnValue = await (0, executeHook_js_1.executeHook)(() => hookFn(pageContext), renderHook, pageContext);
     const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturnValue, renderHook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     (0, utils_js_1.objectAssign)(pageContext, { _pageContextPromise: pageContextPromise });
@@ -69,13 +69,13 @@ function getRenderHook(pageContext) {
         (0, utils_js_1.assertUsage)(false, [
             `No ${hookName}() hook found, see https://vike.dev/${hookName}`
             /*
-          'See https://vike.dev/render-modes for more information.',
-          [
-            // 'Loaded config files (none of them define the onRenderHtml() hook):',
-            'Loaded server-side page files (none of them `export { render }`):',
-            ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
-          ].join('\n')
-          */
+            'See https://vike.dev/render-modes for more information.',
+            [
+              // 'Loaded config files (none of them define the onRenderHtml() hook):',
+              'Loaded server-side page files (none of them `export { render }`):',
+              ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
+            ].join('\n')
+            */
         ].join(' '));
     }
     return hookFound;

package/dist/cjs/node/runtime/renderPage/getHttpResponseBody.js

@@ -100,8 +100,8 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
         }
     };
-    function getFixMsg(type, standard) {
-        const streamName = (0, stream_js_1.getStreamName)(type, standard);
+    function getFixMsg(kind, type) {
+        const streamName = (0, stream_js_1.getStreamName)(kind, type);
         (0, utils_js_1.assert)(['a ', 'an ', 'the '].some((s) => streamName.startsWith(s)));
         (0, utils_js_1.assert)(renderHook);
         const { hookFilePath, hookName } = renderHook;

package/dist/cjs/node/runtime/renderPage/loadUserFilesServerSide.js

@@ -12,7 +12,7 @@ const globalContext_js_1 = require("../globalContext.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
-    const [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
+    const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !(0, globalContext_js_1.getGlobalContext)().isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
@@ -37,8 +37,8 @@ async function loadUserFilesServerSide(pageContext) {
         });
     }
     const pageContextAddendum = {};
+    (0, utils_js_1.objectAssign)(pageContextAddendum, pageContextExports);
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
-        ...pageContextExports,
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
@@ -104,8 +104,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const pageContextExports = (0, getPageFiles_js_1.getPageContextExports)(pageFilesServerSide, pageConfigLoaded);
     return {
-        ...pageContextExports,
-        pageFilesLoaded: pageFilesServerSide,
-        pageConfigLoaded
+        pageContextExports,
+        pageFilesLoaded: pageFilesServerSide
     };
 }