vike 0.4.178 → 0.4.179-commit-9384166

package/dist/cjs/node/plugin/plugins/envVars.js

@@ -5,6 +5,10 @@ const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
+// TODO/enventually: (after we implemented vike.config.js)
+// - Make import.meta.env work inside +config.js
+//   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
+//   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
 const PUBLIC_ENV_WHITELIST = [
     // https://github.com/vikejs/vike/issues/1724

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

@@ -28,6 +28,7 @@ function inferAssetTag(pageAsset) {
         return `<script src="${src}" ${scriptAttrs}></script>`;
     }
     if (assetType === 'style') {
+        // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L29
         return `<link rel="stylesheet" type="text/css" href="${src}">`;
     }
     (0, utils_js_1.assert)(false, { pageAsset });

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

@@ -11,12 +11,12 @@ function injectHtmlTags(htmlString, htmlTags, position) {
     return htmlString;
 }
 exports.injectHtmlTags = injectHtmlTags;
-async function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
+function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
     const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'STREAM'));
     if (htmlFragment) {
         (0, utils_js_1.assert)(streamFromReactStreamingPackage);
         (0, utils_js_1.assert)(!streamFromReactStreamingPackage.hasStreamEnded());
-        await streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
+        streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
     }
 }
 exports.injectHtmlTagsUsingStream = injectHtmlTagsUsingStream;

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

@@ -29,7 +29,7 @@ function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, in
         htmlTags = (0, getHtmlTags_js_1.getHtmlTags)(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript);
         let htmlBegin = htmlPartsToString(htmlPartsBegin, pageAssets);
         htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags);
-        await (0, injectHtmlTags_js_1.injectHtmlTagsUsingStream)(htmlTags, streamFromReactStreamingPackage);
+        (0, injectHtmlTags_js_1.injectHtmlTagsUsingStream)(htmlTags, streamFromReactStreamingPackage);
         return htmlBegin;
     }
     async function injectAtStreamEnd(htmlPartsEnd) {

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

@@ -46,17 +46,27 @@ function serializePageContextClientSide(pageContext) {
         let hasWarned = false;
         const propsNonSerializable = [];
         passToClient.forEach((prop) => {
-            const propName = JSON.stringify(prop);
-            const varName = h(`pageContext[${propName}]`);
+            const propName1 = (0, utils_js_1.getPropAccessNotation)(prop);
+            const propName2 = JSON.stringify(prop);
+            const varName = `pageContext${propName1}`;
             try {
                 serialize(pageContext[prop], varName);
             }
             catch (err) {
                 hasWarned = true;
                 propsNonSerializable.push(prop);
+                // useConfig() wrong usage
+                if (prop === '_configFromHook') {
+                    let pathString = '';
+                    if ((0, stringify_1.isJsonSerializerError)(err)) {
+                        pathString = err.pathString;
+                    }
+                    (0, utils_js_1.assertUsage)(false, `Cannot serialize config ${h(pathString)} set by useConfig(), see https://vike.dev/useConfig#serialization-error`);
+                }
+                // Non-serializable pageContext set by the user
                 let msg = [
-                    `${varName} cannot be serialized and, therefore, cannot be passed to the client.`,
-                    `Make sure that ${varName} is serializable, or remove ${h(propName)} from ${h('passToClient')}.`
+                    `${h(varName)} can't be serialized and, therefore, can't be passed to the client side.`,
+                    `Make sure ${h(varName)} is serializable, or remove ${h(propName2)} from ${h('passToClient')}.`
                 ].join(' ');
                 if ((0, stringify_1.isJsonSerializerError)(err)) {
                     msg = `${msg} Serialization error: ${err.messageCore}.`;

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

@@ -28,7 +28,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     const onErrorWhileStreaming = (err) => {
         // Should the stream inject the following?
         // ```
-        // <script>console.error("An error occurred on the server while streaming the app to HTML. Check the server logs for more information.")</script>
+        // <script>console.error("An error occurred on the server side while streaming the page to HTML, see server logs.")</script>
         // ```
         (0, loggerRuntime_js_1.logRuntimeError)(err, pageContext._httpRequestId);
         if (!pageContext.errorWhileRendering) {

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

@@ -35,6 +35,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
                 return;
             }
             // https://github.com/vikejs/vike/issues/401
+            // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L28
             src = src + '?direct';
         }
         const isEntry = clientEntriesSrc.includes(src) ||

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

@@ -247,8 +247,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
 function getPageContextHttpResponseNullWithError(err, pageContextInit) {
-    const pageContextHttpResponseNull = {};
-    (0, utils_js_1.objectAssign)(pageContextHttpResponseNull, pageContextInit);
+    const pageContextHttpResponseNull = createPageContext(pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextHttpResponseNull, {
         httpResponse: null,
         errorWhileRendering: err
@@ -256,14 +255,20 @@ function getPageContextHttpResponseNullWithError(err, pageContextInit) {
     return pageContextHttpResponseNull;
 }
 function getPageContextHttpResponseNull(pageContextInit) {
-    const pageContextHttpResponseNull = {};
-    (0, utils_js_1.objectAssign)(pageContextHttpResponseNull, pageContextInit);
+    const pageContextHttpResponseNull = createPageContext(pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextHttpResponseNull, {
         httpResponse: null,
         errorWhileRendering: null
     });
     return pageContextHttpResponseNull;
 }
+function createPageContext(pageContextInit) {
+    const pageContext = {
+        _isPageContextObject: true
+    };
+    Object.assign(pageContext, pageContextInit);
+    return pageContext;
+}
 async function renderPageNominal(pageContext) {
     (0, utils_js_1.objectAssign)(pageContext, { errorWhileRendering: null });
     // Route
@@ -347,8 +352,7 @@ function normalizeUrl(pageContextInit, httpRequestId) {
         return null;
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
     const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)({ url: urlNormalized, statusCode: 301 }, pageContextInit.urlOriginal);
-    const pageContextHttpResponse = {};
-    (0, utils_js_1.objectAssign)(pageContextHttpResponse, pageContextInit);
+    const pageContextHttpResponse = createPageContext(pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
@@ -384,8 +388,7 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
-    const pageContextHttpResponse = {};
-    (0, utils_js_1.objectAssign)(pageContextHttpResponse, pageContextInit);
+    const pageContextHttpResponse = createPageContext(pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
@@ -401,9 +404,8 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             const abortCall = pageContextAbort._abortCall;
             (0, utils_js_1.assert)(abortCall);
             (0, utils_js_1.assertUsage)(errorPageId, `You called ${picocolors_1.default.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
-            const pageContext = {
-                _pageId: errorPageId
-            };
+            const pageContext = createPageContext({});
+            (0, utils_js_1.objectAssign)(pageContext, { _pageId: errorPageId });
             (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
             (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit);
             (0, utils_js_1.objectAssign)(pageContext, renderContext);
@@ -427,8 +429,7 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRedirect) {
-        const pageContextReturn = {};
-        (0, utils_js_1.objectAssign)(pageContextReturn, pageContextInit);
+        const pageContextReturn = createPageContext(pageContextInit);
         (0, utils_js_1.objectAssign)(pageContextReturn, pageContextAbort);
         const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)(pageContextAbort._urlRedirect, (() => {
             const { pathname, searchOriginal } = pageContextNominalPageInit.urlParsed;

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

@@ -71,3 +71,4 @@ __exportStar(require("../../utils/isArrayOfStrings.js"), exports);
 __exportStar(require("../../utils/escapeHtml.js"), exports);
 __exportStar(require("../../utils/normalizeHeaders.js"), exports);
 __exportStar(require("../../utils/isVikeReactApp.js"), exports);
+__exportStar(require("../../utils/getPropAccessNotation.js"), exports);

package/dist/cjs/shared/route/index.js

@@ -18,12 +18,12 @@ const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
 const executeOnBeforeRouteHook_js_1 = require("./executeOnBeforeRouteHook.js");
 const debug_js_1 = require("./debug.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-async function route(pageContextForRoute) {
-    (0, debug_js_1.debug)('Pages routes:', pageContextForRoute._pageRoutes);
-    (0, getPageContextUrlComputed_js_1.assertPageContextUrl)(pageContextForRoute);
+async function route(pageContext) {
+    (0, debug_js_1.debug)('Pages routes:', pageContext._pageRoutes);
+    (0, getPageContextUrlComputed_js_1.assertPageContextUrl)(pageContext);
     const pageContextFromRoute = {};
     // onBeforeRoute()
-    const pageContextFromOnBeforeRouteHook = await (0, executeOnBeforeRouteHook_js_1.executeOnBeforeRouteHook)(pageContextForRoute);
+    const pageContextFromOnBeforeRouteHook = await (0, executeOnBeforeRouteHook_js_1.executeOnBeforeRouteHook)(pageContext);
     if (pageContextFromOnBeforeRouteHook) {
         if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
             (0, utils_js_1.assert)(pageContextFromOnBeforeRouteHook._pageId);
@@ -34,8 +34,6 @@ async function route(pageContextForRoute) {
         }
     }
     // We take into account pageContext.urlLogical set by onBeforeRoute()
-    const pageContext = {};
-    (0, utils_js_1.objectAssign)(pageContext, pageContextForRoute);
     (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
     // Vike's routing
     const allPageIds = pageContext._allPageIds;

package/dist/cjs/utils/assert.js

@@ -23,7 +23,7 @@ const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assert.ts'
     },
     showStackTraceList: new WeakSet()
 });
-(0, assertSingleInstance_js_1.onAssertModuleLoad)();
+(0, assertSingleInstance_js_1.assertSingleInstance_onAssertModuleLoad)();
 const projectTag = `[vike]`;
 const projectTagWithVersion = `[vike@${projectInfo_js_1.projectInfo.projectVersion}]`;
 const numberOfStackTraceLinesToRemove = 2;

package/dist/cjs/utils/assertSingleInstance.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onAssertModuleLoad = exports.onClientEntry_ClientRouting = exports.onClientEntry_ServerRouting = void 0;
+exports.assertSingleInstance_onAssertModuleLoad = exports.assertSingleInstance_onClientEntryClientRouting = exports.assertSingleInstance_onClientEntryServerRouting = void 0;
 //  - Throw error if there are two different versions of vike loaded
 //  - Show warning if entry of Client Routing and entry of Server Routing are both loaded
 //  - Show warning if vike is loaded twice
@@ -35,7 +35,7 @@ function assertSingleInstance() {
         //*/
     }
 }
-function onClientEntry_ServerRouting(isProduction) {
+function assertSingleInstance_onClientEntryServerRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== true, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -49,8 +49,8 @@ function onClientEntry_ServerRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-exports.onClientEntry_ServerRouting = onClientEntry_ServerRouting;
-function onClientEntry_ClientRouting(isProduction) {
+exports.assertSingleInstance_onClientEntryServerRouting = assertSingleInstance_onClientEntryServerRouting;
+function assertSingleInstance_onClientEntryClientRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== false, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -64,13 +64,13 @@ function onClientEntry_ClientRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-exports.onClientEntry_ClientRouting = onClientEntry_ClientRouting;
+exports.assertSingleInstance_onClientEntryClientRouting = assertSingleInstance_onClientEntryClientRouting;
 // Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
-function onAssertModuleLoad() {
+function assertSingleInstance_onAssertModuleLoad() {
     globalObject.instances.push(projectInfo_js_1.projectInfo.projectVersion);
     assertSingleInstance();
 }
-exports.onAssertModuleLoad = onAssertModuleLoad;
+exports.assertSingleInstance_onAssertModuleLoad = assertSingleInstance_onAssertModuleLoad;
 function assertUsage(condition, errorMessage) {
     if (condition) {
         return;

package/dist/cjs/utils/augmentType.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.augmentType = void 0;
+const assert_js_1 = require("./assert.js");
+/** Help TypeScript augment the type of objects. */
+function augmentType(thing, clone) {
+    // @ts-ignore
+    (0, assert_js_1.assert)(thing === clone);
+}
+exports.augmentType = augmentType;

package/dist/cjs/utils/getPropAccessNotation.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPropAccessNotation = void 0;
 function getPropAccessNotation(key) {
-    return typeof key === 'string' && /^[a-z0-9\$_]+$/i.test(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+    return typeof key === 'string' && isKeyDotNotationCompatible(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
 }
 exports.getPropAccessNotation = getPropAccessNotation;
+function isKeyDotNotationCompatible(key) {
+    return /^[a-z0-9\$_]+$/i.test(key);
+}

package/dist/cjs/utils/objectAssign.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectAssign = void 0;
+const assert_js_1 = require("./assert.js");
 // Same as Object.assign() but:
 //  - With type inference
 //  - Preserves property descriptors, which we need for preserving the getters added by getPageContextUrlComputed()
 function objectAssign(obj, objAddendum) {
     if (objAddendum) {
+        (0, assert_js_1.assert)(!('_isPageContextObject' in objAddendum));
         Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));
     }
 }

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.178';
+const PROJECT_VERSION = '0.4.179-commit-9384166';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/createPageContext.d.ts

@@ -11,6 +11,7 @@ declare function createPageContext(urlOriginal: string): Promise<{
     _allPageIds: string[];
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    _isPageContextObject: boolean;
 } & {
     urlParsed: import("../../shared/getPageContextUrlComputed.js").Url;
     urlPathname: string;

package/dist/esm/client/client-routing-runtime/createPageContext.js

@@ -24,7 +24,8 @@ async function createPageContext(urlOriginal) {
         _pageConfigGlobal: pageConfigGlobal,
         _allPageIds: allPageIds,
         _pageRoutes: pageRoutes,
-        _onBeforeRouteHook: onBeforeRouteHook
+        _onBeforeRouteHook: onBeforeRouteHook,
+        _isPageContextObject: true
     };
     const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
     objectAssign(pageContext, pageContextUrlComputed);

package/dist/esm/client/client-routing-runtime/entry.js

@@ -2,8 +2,11 @@ import { assertClientRouting } from '../../utils/assertRoutingType.js';
 assertClientRouting();
 import './pageFiles';
 import { installClientRouter } from './installClientRouter.js';
-import { onClientEntry_ClientRouting } from './utils.js';
+import { assertSingleInstance_onClientEntryClientRouting } from './utils.js';
+import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
 const isProd = import.meta.env.PROD;
-onClientEntry_ClientRouting(isProd);
+assertSingleInstance_onClientEntryClientRouting(isProd);
+if (import.meta.env.DEV)
+    removeFoucBuster();
 installClientRouter();

package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.d.ts

@@ -16,7 +16,7 @@ type PageContextSerialized = {
 declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
 };
-declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageContextExports): Promise<{
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageContextExports): Promise<PageContextSerialized & PageContext & PageContextExports & {
     isHydration: true;
     _hasPageContextFromClient: false;
     _hasPageContextFromServer: true;
@@ -25,9 +25,11 @@ declare function getPageContextFromHooks_isNotHydration(pageContext: {
     _pageId: string;
 } & PageContext & PageContextExports, isErrorPage: boolean): Promise<{
     is404ServerSideRouted: boolean;
-    pageContextFromHooks?: undefined;
+    pageContextAugmented?: undefined;
 } | {
-    pageContextFromHooks: {
+    pageContextAugmented: {
+        _pageId: string;
+    } & PageContext & PageContextExports & {
         isHydration: false;
         _hasPageContextFromClient: boolean;
     } & {

package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.js

@@ -27,30 +27,26 @@ function getPageContextFromHooks_serialized() {
     return pageContextSerialized;
 }
 async function getPageContextFromHooks_isHydration(pageContext) {
-    const pageContextFromHooks = {
+    objectAssign(pageContext, {
         isHydration: true,
         _hasPageContextFromClient: false,
         _hasPageContextFromServer: true
-    };
+    });
     for (const hookName of ['data', 'onBeforeRender']) {
-        const pageContextForHook = {};
-        objectAssign(pageContextForHook, pageContext);
-        objectAssign(pageContextForHook, pageContextFromHooks);
-        if (hookClientOnlyExists(hookName, pageContextForHook)) {
-            const pageContextFromHook = await executeHookClientSide(hookName, pageContextForHook);
-            Object.assign(pageContextFromHooks, pageContextFromHook);
+        if (hookClientOnlyExists(hookName, pageContext)) {
+            const pageContextFromHook = await executeHookClientSide(hookName, pageContext);
+            if (pageContextFromHook)
+                assert(!('urlOriginal' in pageContextFromHook));
+            Object.assign(pageContext, pageContextFromHook);
         }
     }
-    return pageContextFromHooks;
+    return pageContext;
 }
 async function getPageContextFromHooks_isNotHydration(pageContext, isErrorPage) {
-    const pageContextFromHooks = {
+    objectAssign(pageContext, {
         isHydration: false,
         _hasPageContextFromClient: false
-    };
-    const pageContextForCondition = {};
-    objectAssign(pageContextForCondition, pageContext);
-    objectAssign(pageContextForCondition, pageContextFromHooks);
+    });
     let hasPageContextFromServer = false;
     // If pageContextInit has some client data or if one of the hooks guard(), data() or onBeforeRender() is server-side
     // only, then we need to fetch pageContext from the server.
@@ -59,7 +55,7 @@ async function getPageContextFromHooks_isNotHydration(pageContext, isErrorPage)
     // For the error page, we cannot fetch pageContext from the server because the pageContext JSON request is based on the URL
     !isErrorPage &&
         // true if pageContextInit has some client data or at least one of the data() and onBeforeRender() hooks is server-side only:
-        (await hasPageContextServer(pageContextForCondition))) {
+        (await hasPageContextServer(pageContext))) {
         const res = await fetchPageContextFromServer(pageContext);
         if ('is404ServerSideRouted' in res)
             return { is404ServerSideRouted: true };
@@ -68,43 +64,42 @@ async function getPageContextFromHooks_isNotHydration(pageContext, isErrorPage)
         // Already handled
         assert(!(isServerSideError in pageContextFromServer));
         assert(!('serverSideError' in pageContextFromServer));
-        objectAssign(pageContextFromHooks, pageContextFromServer);
+        objectAssign(pageContext, pageContextFromServer);
     }
+    objectAssign(pageContext, { _hasPageContextFromServer: hasPageContextFromServer });
     // At this point, we need to call the client-side guard(), data() and onBeforeRender() hooks, if they exist on client
     // env. However if we have fetched pageContext from the server, some of them might have run already on the
     // server-side, so we run only the client-only ones in this case.
     // Note: for the error page, we also execute the client-side data() and onBeforeRender() hooks, but maybe we
     // shouldn't? The server-side does it as well (but maybe it shouldn't).
     for (const hookName of ['guard', 'data', 'onBeforeRender']) {
-        const pageContextForHook = {};
-        objectAssign(pageContextForHook, { _hasPageContextFromServer: hasPageContextFromServer });
-        objectAssign(pageContextForHook, pageContext);
-        objectAssign(pageContextForHook, pageContextFromHooks);
         if (hookName === 'guard') {
             if (!isErrorPage &&
                 // We don't need to call guard() on the client-side if we fetch pageContext from the server side. (Because the `${url}.pageContext.json` HTTP request will already trigger the routing and guard() hook on the server-side.)
                 !hasPageContextFromServer) {
                 // Should we really call the guard() hook on the client-side? Shouldn't we make the guard() hook a server-side
                 // only hook? Or maybe make its env configurable like data() and onBeforeRender()?
-                await executeGuardHook(pageContextForHook, (pageContext) => preparePageContextForUserConsumptionClientSide(pageContext, true));
+                await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionClientSide(pageContext, true));
             }
         }
         else {
             assert(hookName === 'data' || hookName === 'onBeforeRender');
-            if (hookClientOnlyExists(hookName, pageContextForHook) || !hasPageContextFromServer) {
+            if (hookClientOnlyExists(hookName, pageContext) || !hasPageContextFromServer) {
                 // This won't do anything if no hook has been defined or if the hook's env.client is false.
-                const pageContextFromHook = await executeHookClientSide(hookName, pageContextForHook);
-                objectAssign(pageContextFromHooks, pageContextFromHook);
+                const pageContextFromHook = await executeHookClientSide(hookName, pageContext);
+                if (pageContextFromHook)
+                    assert(!('urlOriginal' in pageContextFromHook));
+                Object.assign(pageContext, pageContextFromHook);
             }
             else {
                 assert(hasPageContextFromServer);
             }
         }
     }
-    objectAssign(pageContextFromHooks, {
+    objectAssign(pageContext, {
         _hasPageContextFromServer: hasPageContextFromServer
     });
-    return { pageContextFromHooks };
+    return { pageContextAugmented: pageContext };
 }
 async function executeHookClientSide(hookName, pageContext) {
     const hook = getHook(pageContext, hookName);
@@ -226,7 +221,7 @@ async function fetchPageContextFromServer(pageContext) {
     }
     // Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error occured on the server-side (which is a bad idea because the added complexity is non-negligible while the added value is minuscule since the error page usually doesn't have any (meaningful / server-side) hooks).
     if ('serverSideError' in pageContextFromServer || isServerSideError in pageContextFromServer) {
-        throw getProjectError(`pageContext couldn't be fetched from server: an error occurred on the server-side (see your server logs)`);
+        throw getProjectError(`pageContext couldn't be fetched because an error occurred on the server-side`);
     }
     assert(hasProp(pageContextFromServer, '_pageId', 'string'));
     processPageContextFromServer(pageContextFromServer);

package/dist/esm/client/client-routing-runtime/renderPageClientSide.js

@@ -1,7 +1,7 @@
 export { renderPageClientSide };
 export { getRenderCount };
 export { disableClientRouting };
-import { assert, getCurrentUrl, isSameErrorMessage, objectAssign, serverSideRouteTo, getGlobalObject, executeHook, hasProp } from './utils.js';
+import { assert, getCurrentUrl, isSameErrorMessage, objectAssign, serverSideRouteTo, getGlobalObject, executeHook, hasProp, augmentType } from './utils.js';
 import { getPageContextFromHooks_isHydration, getPageContextFromHooks_isNotHydration, getPageContextFromHooks_serialized } from './getPageContextFromHooks.js';
 import { createPageContext } from './createPageContext.js';
 import { addLinkPrefetchHandlers } from './prefetch.js';
@@ -132,9 +132,9 @@ async function renderPageClientSide(renderArgs) {
         // Get pageContext from hooks (fetched from server, and/or directly called on the client-side)
         if (isHydrationRender) {
             assert(hasProp(pageContext, '_hasPageContextFromServer', 'true'));
-            let pageContextFromHooks;
+            let pageContextAugmented;
             try {
-                pageContextFromHooks = await getPageContextFromHooks_isHydration(pageContext);
+                pageContextAugmented = await getPageContextFromHooks_isHydration(pageContext);
             }
             catch (err) {
                 await onError(err);
@@ -142,8 +142,7 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            assert(!('urlOriginal' in pageContextFromHooks));
-            objectAssign(pageContext, pageContextFromHooks);
+            augmentType(pageContext, pageContextAugmented);
             // Render page view
             await renderPageView(pageContext);
         }
@@ -160,9 +159,7 @@ async function renderPageClientSide(renderArgs) {
                 return;
             if ('is404ServerSideRouted' in res)
                 return;
-            const pageContextFromHooks = res.pageContextFromHooks;
-            assert(!('urlOriginal' in pageContextFromHooks));
-            objectAssign(pageContext, pageContextFromHooks);
+            augmentType(pageContext, res.pageContextAugmented);
             // Render page view
             await renderPageView(pageContext);
         }
@@ -295,10 +292,7 @@ async function renderPageClientSide(renderArgs) {
             return;
         if ('is404ServerSideRouted' in res)
             return;
-        const pageContextFromHooks = res.pageContextFromHooks;
-        assert(pageContextFromHooks);
-        assert(!('urlOriginal' in pageContextFromHooks));
-        objectAssign(pageContext, pageContextFromHooks);
+        augmentType(pageContext, res.pageContextAugmented);
         await renderPageView(pageContext, args);
     }
     async function renderPageView(pageContext, isErrorPage) {

package/dist/esm/client/client-routing-runtime/utils.d.ts

@@ -22,3 +22,4 @@ export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
 export * from '../../utils/isExternalLink.js';
+export * from '../../utils/augmentType.js';

package/dist/esm/client/client-routing-runtime/utils.js

@@ -28,3 +28,4 @@ export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
 export * from '../../utils/isExternalLink.js';
+export * from '../../utils/augmentType.js';

package/dist/esm/client/server-routing-runtime/entry.js

@@ -4,10 +4,13 @@ import './pageFiles';
 import { getPageContext } from './getPageContext.js';
 import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
 import { assertHook } from '../../shared/hooks/getHook.js';
-import { onClientEntry_ServerRouting } from './utils.js';
+import { assertSingleInstance_onClientEntryServerRouting } from './utils.js';
+import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
 const isProd = import.meta.env.PROD;
-onClientEntry_ServerRouting(isProd);
+assertSingleInstance_onClientEntryServerRouting(isProd);
+if (import.meta.env.DEV)
+    removeFoucBuster();
 hydrate();
 async function hydrate() {
     const pageContext = await getPageContext();

package/dist/esm/client/shared/getPageContextProxyForUser.js

@@ -14,7 +14,7 @@ function getPageContextProxyForUser(pageContext) {
         get(_, prop) {
             const val = pageContext[prop];
             const propName = getPropAccessNotation(prop);
-            assertUsage(val !== notSerializable, `pageContext${propName} couldn't be serialized and, therefore, is missing on the client-side. Check the server logs for more information.`);
+            assertUsage(val !== notSerializable, `Can't access pageContext${propName} on the client side. Because it can't be serialized, see server logs.`);
             passToClientHint(pageContext, prop, propName);
             return val;
         }

package/dist/esm/client/shared/removeFoucBuster.d.ts

@@ -0,0 +1,2 @@
+export { removeFoucBuster };
+declare function removeFoucBuster(): void;

package/dist/esm/client/shared/removeFoucBuster.js

@@ -0,0 +1,44 @@
+export { removeFoucBuster };
+import { assert } from './utils.js';
+// See also:
+// - Alternative approach of exactly injecting what Vite injects:
+//   - https://github.com/remix-run/remix/issues/8830#issuecomment-1968368351
+//   - https://github.com/rakkasjs/rakkasjs/blob/7d75ccc915e93bca04e6bab37dc6abdb68a85e4a/packages/rakkasjs/src/features/pages/middleware.tsx#L701
+// - https://github.com/remix-run/remix/issues/8830
+function removeFoucBuster() {
+    assert(import.meta.env.DEV);
+    let sleep = 2;
+    const runClean = () => {
+        const isClean = clean();
+        if (!isClean) {
+            if (sleep < 1000)
+                sleep = 2 * sleep;
+            setTimeout(runClean, sleep);
+        }
+    };
+    setTimeout(runClean, sleep);
+}
+function clean() {
+    const VITE_ID = 'data-vite-dev-id';
+    const injectedByVite = [...document.querySelectorAll(`style[${VITE_ID}]`)].map((style) => style.getAttribute(VITE_ID));
+    // ```
+    // <link rel="stylesheet" type="text/css" href="/renderer/css/index.css?direct">
+    // <link rel="stylesheet" type="text/css" href="/renderer/Layout.css?direct">
+    // ```
+    const suffix = '?direct';
+    // <link> defined by:
+    //  - https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/node/runtime/html/injectAssets/inferHtmlTags.ts#L35
+    //  - https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/node/runtime/renderPage/getPageAssets.ts#L68
+    const injectedByVike = [...document.querySelectorAll(`link[rel="stylesheet"][type="text/css"][href$="${suffix}"]`)];
+    let isClean = true;
+    injectedByVike.forEach((link) => {
+        const filePathAbsoluteUserRootDir = link.getAttribute('href').slice(0, -suffix.length);
+        if (injectedByVite.some((filePathAbsoluteFilesystem) => filePathAbsoluteFilesystem.endsWith(filePathAbsoluteUserRootDir))) {
+            link.remove();
+        }
+        else {
+            isClean = false;
+        }
+    });
+    return isClean;
+}

package/dist/esm/client/shared/utils.d.ts

@@ -0,0 +1 @@
+export * from '../../utils/assert.js';

package/dist/esm/client/shared/utils.js

@@ -0,0 +1 @@
+export * from '../../utils/assert.js';

package/dist/esm/node/plugin/plugins/envVars.js

@@ -5,6 +5,10 @@ import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.js';
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePath } from '../shared/getFilePath.js';
+// TODO/enventually: (after we implemented vike.config.js)
+// - Make import.meta.env work inside +config.js
+//   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
+//   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
 const PUBLIC_ENV_WHITELIST = [
     // https://github.com/vikejs/vike/issues/1724

package/dist/esm/node/runtime/html/injectAssets/inferHtmlTags.js

@@ -27,6 +27,7 @@ function inferAssetTag(pageAsset) {
         return `<script src="${src}" ${scriptAttrs}></script>`;
     }
     if (assetType === 'style') {
+        // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L29
         return `<link rel="stylesheet" type="text/css" href="${src}">`;
     }
     assert(false, { pageAsset });

package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.d.ts

@@ -7,7 +7,7 @@ import type { StreamFromReactStreamingPackage } from '../stream/react-streaming.
 import type { HtmlTag } from './getHtmlTags.js';
 type Position = 'HTML_BEGIN' | 'HTML_END';
 declare function injectHtmlTags(htmlString: string, htmlTags: HtmlTag[], position: Position): string;
-declare function injectHtmlTagsUsingStream(htmlTags: HtmlTag[], streamFromReactStreamingPackage: null | StreamFromReactStreamingPackage): Promise<void>;
+declare function injectHtmlTagsUsingStream(htmlTags: HtmlTag[], streamFromReactStreamingPackage: null | StreamFromReactStreamingPackage): void;
 declare function injectAtOpeningTag(tag: 'head' | 'html' | '!doctype', htmlString: string, htmlFragment: string): string;
 declare function injectAtClosingTag(tag: 'body' | 'html', htmlString: string, htmlFragment: string): string;
 declare function createHtmlHeadIfMissing(htmlString: string): string;

package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -13,12 +13,12 @@ function injectHtmlTags(htmlString, htmlTags, position) {
     }
     return htmlString;
 }
-async function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
+function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
     const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'STREAM'));
     if (htmlFragment) {
         assert(streamFromReactStreamingPackage);
         assert(!streamFromReactStreamingPackage.hasStreamEnded());
-        await streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
+        streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
     }
 }
 function joinHtmlTags(htmlTags) {

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

@@ -27,7 +27,7 @@ function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, in
         htmlTags = getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript);
         let htmlBegin = htmlPartsToString(htmlPartsBegin, pageAssets);
         htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags);
-        await injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage);
+        injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage);
         return htmlBegin;
     }
     async function injectAtStreamEnd(htmlPartsEnd) {

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

@@ -1,7 +1,7 @@
 export { serializePageContextClientSide };
 export { serializePageContextAbort };
 import { stringify, isJsonSerializerError } from '@brillout/json-serializer/stringify';
-import { assert, assertWarning, hasProp, unique } from '../utils.js';
+import { assert, assertUsage, assertWarning, getPropAccessNotation, hasProp, unique } from '../utils.js';
 import { isErrorPage } from '../../../shared/error-page.js';
 import { addIs404ToPageProps } from '../../../shared/addIs404ToPageProps.js';
 import pc from '@brillout/picocolors';
@@ -42,17 +42,27 @@ function serializePageContextClientSide(pageContext) {
         let hasWarned = false;
         const propsNonSerializable = [];
         passToClient.forEach((prop) => {
-            const propName = JSON.stringify(prop);
-            const varName = h(`pageContext[${propName}]`);
+            const propName1 = getPropAccessNotation(prop);
+            const propName2 = JSON.stringify(prop);
+            const varName = `pageContext${propName1}`;
             try {
                 serialize(pageContext[prop], varName);
             }
             catch (err) {
                 hasWarned = true;
                 propsNonSerializable.push(prop);
+                // useConfig() wrong usage
+                if (prop === '_configFromHook') {
+                    let pathString = '';
+                    if (isJsonSerializerError(err)) {
+                        pathString = err.pathString;
+                    }
+                    assertUsage(false, `Cannot serialize config ${h(pathString)} set by useConfig(), see https://vike.dev/useConfig#serialization-error`);
+                }
+                // Non-serializable pageContext set by the user
                 let msg = [
-                    `${varName} cannot be serialized and, therefore, cannot be passed to the client.`,
-                    `Make sure that ${varName} is serializable, or remove ${h(propName)} from ${h('passToClient')}.`
+                    `${h(varName)} can't be serialized and, therefore, can't be passed to the client side.`,
+                    `Make sure ${h(varName)} is serializable, or remove ${h(propName2)} from ${h('passToClient')}.`
                 ].join(' ');
                 if (isJsonSerializerError(err)) {
                     msg = `${msg} Serialization error: ${err.messageCore}.`;

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

@@ -23,7 +23,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     const onErrorWhileStreaming = (err) => {
         // Should the stream inject the following?
         // ```
-        // <script>console.error("An error occurred on the server while streaming the app to HTML. Check the server logs for more information.")</script>
+        // <script>console.error("An error occurred on the server side while streaming the page to HTML, see server logs.")</script>
         // ```
         logRuntimeError(err, pageContext._httpRequestId);
         if (!pageContext.errorWhileRendering) {

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

@@ -34,6 +34,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
                 return;
             }
             // https://github.com/vikejs/vike/issues/401
+            // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L28
             src = src + '?direct';
         }
         const isEntry = clientEntriesSrc.includes(src) ||

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

@@ -241,8 +241,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     logRuntimeInfo?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
 function getPageContextHttpResponseNullWithError(err, pageContextInit) {
-    const pageContextHttpResponseNull = {};
-    objectAssign(pageContextHttpResponseNull, pageContextInit);
+    const pageContextHttpResponseNull = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponseNull, {
         httpResponse: null,
         errorWhileRendering: err
@@ -250,14 +249,20 @@ function getPageContextHttpResponseNullWithError(err, pageContextInit) {
     return pageContextHttpResponseNull;
 }
 function getPageContextHttpResponseNull(pageContextInit) {
-    const pageContextHttpResponseNull = {};
-    objectAssign(pageContextHttpResponseNull, pageContextInit);
+    const pageContextHttpResponseNull = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponseNull, {
         httpResponse: null,
         errorWhileRendering: null
     });
     return pageContextHttpResponseNull;
 }
+function createPageContext(pageContextInit) {
+    const pageContext = {
+        _isPageContextObject: true
+    };
+    Object.assign(pageContext, pageContextInit);
+    return pageContext;
+}
 async function renderPageNominal(pageContext) {
     objectAssign(pageContext, { errorWhileRendering: null });
     // Route
@@ -341,8 +346,7 @@ function normalizeUrl(pageContextInit, httpRequestId) {
         return null;
     logRuntimeInfo?.(`URL normalized from ${pc.cyan(urlOriginal)} to ${pc.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
     const httpResponse = createHttpResponseObjectRedirect({ url: urlNormalized, statusCode: 301 }, pageContextInit.urlOriginal);
-    const pageContextHttpResponse = {};
-    objectAssign(pageContextHttpResponse, pageContextInit);
+    const pageContextHttpResponse = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
@@ -378,8 +382,7 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     }
     logRuntimeInfo?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = createHttpResponseObjectRedirect({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
-    const pageContextHttpResponse = {};
-    objectAssign(pageContextHttpResponse, pageContextInit);
+    const pageContextHttpResponse = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
@@ -395,9 +398,8 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             const abortCall = pageContextAbort._abortCall;
             assert(abortCall);
             assertUsage(errorPageId, `You called ${pc.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
-            const pageContext = {
-                _pageId: errorPageId
-            };
+            const pageContext = createPageContext({});
+            objectAssign(pageContext, { _pageId: errorPageId });
             objectAssign(pageContext, pageContextAbort);
             objectAssign(pageContext, pageContextErrorPageInit);
             objectAssign(pageContext, renderContext);
@@ -421,8 +423,7 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRedirect) {
-        const pageContextReturn = {};
-        objectAssign(pageContextReturn, pageContextInit);
+        const pageContextReturn = createPageContext(pageContextInit);
         objectAssign(pageContextReturn, pageContextAbort);
         const httpResponse = createHttpResponseObjectRedirect(pageContextAbort._urlRedirect, (() => {
             const { pathname, searchOriginal } = pageContextNominalPageInit.urlParsed;

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

@@ -52,3 +52,4 @@ export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
 export * from '../../utils/normalizeHeaders.js';
 export * from '../../utils/isVikeReactApp.js';
+export * from '../../utils/getPropAccessNotation.js';

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

@@ -55,3 +55,4 @@ export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
 export * from '../../utils/normalizeHeaders.js';
 export * from '../../utils/isVikeReactApp.js';
+export * from '../../utils/getPropAccessNotation.js';

package/dist/esm/shared/route/index.d.ts

@@ -30,4 +30,4 @@ type RouteMatch = {
     routeParams: Record<string, string>;
 };
 type RouteMatches = 'CUSTOM_ROUTING' | RouteMatch[];
-declare function route(pageContextForRoute: PageContextForRoute): Promise<PageContextFromRoute>;
+declare function route(pageContext: PageContextForRoute): Promise<PageContextFromRoute>;

package/dist/esm/shared/route/index.js

@@ -13,12 +13,12 @@ import { resolveRouteFunction } from './resolveRouteFunction.js';
 import { executeOnBeforeRouteHook } from './executeOnBeforeRouteHook.js';
 import { debug } from './debug.js';
 import pc from '@brillout/picocolors';
-async function route(pageContextForRoute) {
-    debug('Pages routes:', pageContextForRoute._pageRoutes);
-    assertPageContextUrl(pageContextForRoute);
+async function route(pageContext) {
+    debug('Pages routes:', pageContext._pageRoutes);
+    assertPageContextUrl(pageContext);
     const pageContextFromRoute = {};
     // onBeforeRoute()
-    const pageContextFromOnBeforeRouteHook = await executeOnBeforeRouteHook(pageContextForRoute);
+    const pageContextFromOnBeforeRouteHook = await executeOnBeforeRouteHook(pageContext);
     if (pageContextFromOnBeforeRouteHook) {
         if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
             assert(pageContextFromOnBeforeRouteHook._pageId);
@@ -29,8 +29,6 @@ async function route(pageContextForRoute) {
         }
     }
     // We take into account pageContext.urlLogical set by onBeforeRoute()
-    const pageContext = {};
-    objectAssign(pageContext, pageContextForRoute);
     objectAssign(pageContext, pageContextFromOnBeforeRouteHook);
     // Vike's routing
     const allPageIds = pageContext._allPageIds;

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

@@ -120,7 +120,7 @@ type PageContextBuiltInCommon<Data> = {
     pageExports: Record<string, unknown>;
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlServer;
-type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data' | 'source' | 'sources' | 'from'> & {
+type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'routeParams' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data' | 'source' | 'sources' | 'from'> & {
     /** Whether the current page is already rendered to HTML */
     isHydration: boolean;
     /**

package/dist/esm/utils/assert.js

@@ -8,7 +8,7 @@ export { getAssertErrMsg };
 export { overwriteAssertProductionLogger };
 export { isBug };
 export { setAlwaysShowStackTrace };
-import { onAssertModuleLoad } from './assertSingleInstance.js';
+import { assertSingleInstance_onAssertModuleLoad } from './assertSingleInstance.js';
 import { createErrorWithCleanStackTrace } from './createErrorWithCleanStackTrace.js';
 import { getGlobalObject } from './getGlobalObject.js';
 import { isObject } from './isObject.js';
@@ -27,7 +27,7 @@ const globalObject = getGlobalObject('utils/assert.ts', {
     },
     showStackTraceList: new WeakSet()
 });
-onAssertModuleLoad();
+assertSingleInstance_onAssertModuleLoad();
 const projectTag = `[vike]`;
 const projectTagWithVersion = `[vike@${projectInfo.projectVersion}]`;
 const numberOfStackTraceLinesToRemove = 2;

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

@@ -1,6 +1,6 @@
-export { onClientEntry_ServerRouting };
-export { onClientEntry_ClientRouting };
-export { onAssertModuleLoad };
-declare function onClientEntry_ServerRouting(isProduction: boolean): void;
-declare function onClientEntry_ClientRouting(isProduction: boolean): void;
-declare function onAssertModuleLoad(): void;
+export { assertSingleInstance_onClientEntryServerRouting };
+export { assertSingleInstance_onClientEntryClientRouting };
+export { assertSingleInstance_onAssertModuleLoad };
+declare function assertSingleInstance_onClientEntryServerRouting(isProduction: boolean): void;
+declare function assertSingleInstance_onClientEntryClientRouting(isProduction: boolean): void;
+declare function assertSingleInstance_onAssertModuleLoad(): void;

package/dist/esm/utils/assertSingleInstance.js

@@ -1,6 +1,6 @@
-export { onClientEntry_ServerRouting };
-export { onClientEntry_ClientRouting };
-export { onAssertModuleLoad };
+export { assertSingleInstance_onClientEntryServerRouting };
+export { assertSingleInstance_onClientEntryClientRouting };
+export { assertSingleInstance_onAssertModuleLoad };
 //  - Throw error if there are two different versions of vike loaded
 //  - Show warning if entry of Client Routing and entry of Server Routing are both loaded
 //  - Show warning if vike is loaded twice
@@ -32,7 +32,7 @@ function assertSingleInstance() {
         //*/
     }
 }
-function onClientEntry_ServerRouting(isProduction) {
+function assertSingleInstance_onClientEntryServerRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== true, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -46,7 +46,7 @@ function onClientEntry_ServerRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-function onClientEntry_ClientRouting(isProduction) {
+function assertSingleInstance_onClientEntryClientRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== false, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -61,7 +61,7 @@ function onClientEntry_ClientRouting(isProduction) {
     assertSingleInstance();
 }
 // Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
-function onAssertModuleLoad() {
+function assertSingleInstance_onAssertModuleLoad() {
     globalObject.instances.push(projectInfo.projectVersion);
     assertSingleInstance();
 }

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

@@ -0,0 +1,3 @@
+export { augmentType };
+/** Help TypeScript augment the type of objects. */
+declare function augmentType<Thing, Clone>(thing: Thing, clone: Clone): asserts thing is Thing & Clone;

package/dist/esm/utils/augmentType.js

@@ -0,0 +1,7 @@
+export { augmentType };
+import { assert } from './assert.js';
+/** Help TypeScript augment the type of objects. */
+function augmentType(thing, clone) {
+    // @ts-ignore
+    assert(thing === clone);
+}

package/dist/esm/utils/getPropAccessNotation.js

@@ -1,3 +1,6 @@
 export function getPropAccessNotation(key) {
-    return typeof key === 'string' && /^[a-z0-9\$_]+$/i.test(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+    return typeof key === 'string' && isKeyDotNotationCompatible(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+}
+function isKeyDotNotationCompatible(key) {
+    return /^[a-z0-9\$_]+$/i.test(key);
 }

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

@@ -1,2 +1,2 @@
 export { objectAssign };
-declare function objectAssign<Obj extends object, ObjAddendum>(obj: Obj, objAddendum: ObjAddendum): asserts obj is Obj & ObjAddendum;
+declare function objectAssign<Obj extends object, ObjAddendum extends object | null>(obj: Obj, objAddendum: ObjAddendum): asserts obj is Obj & ObjAddendum;

package/dist/esm/utils/objectAssign.js

@@ -1,9 +1,11 @@
 export { objectAssign };
+import { assert } from './assert.js';
 // Same as Object.assign() but:
 //  - With type inference
 //  - Preserves property descriptors, which we need for preserving the getters added by getPageContextUrlComputed()
 function objectAssign(obj, objAddendum) {
     if (objAddendum) {
+        assert(!('_isPageContextObject' in objAddendum));
         Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));
     }
 }

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.178";
+declare const PROJECT_VERSION: "0.4.179-commit-9384166";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.178";
+    projectVersion: "0.4.179-commit-9384166";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.178';
+const PROJECT_VERSION = '0.4.179-commit-9384166';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.178",
+  "version": "0.4.179-commit-9384166",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@brillout/import": "^0.2.3",
-    "@brillout/json-serializer": "^0.5.10",
+    "@brillout/json-serializer": "^0.5.13",
     "@brillout/picocolors": "^1.0.13",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.4.5",
@@ -138,7 +138,7 @@
     }
   },
   "peerDependencies": {
-    "react-streaming": ">=0.3.36",
+    "react-streaming": ">=0.3.42",
     "vite": ">=4.4.0"
   },
   "peerDependenciesMeta": {
@@ -209,7 +209,7 @@
     "es-module-lexer": "^1.4.1",
     "esbuild": "^0.19.10",
     "fast-glob": "^3.3.2",
-    "react-streaming": "^0.3.36",
+    "react-streaming": "^0.3.42",
     "rimraf": "^5.0.5",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",