vike 0.4.268-commit-45c1759 → 0.4.268-commit-ca58695

package/dist/client/__internal/index.d.ts

@@ -1,2 +1,3 @@
 export { readPageContextJson } from '../runtime-client-routing/streamedValues.js';
+export { createPageContextFromServer_experimentalRSC } from '../runtime-client-routing/renderPageClient.js';
 import '../assertEnvClient.js';

package/dist/client/__internal/index.js

@@ -1,3 +1,4 @@
 // Used by vike-react-rsc
 export { readPageContextJson } from '../runtime-client-routing/streamedValues.js';
+export { createPageContextFromServer_experimentalRSC } from '../runtime-client-routing/renderPageClient.js';
 import '../assertEnvClient.js';

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

@@ -3,6 +3,7 @@ export { getPageContextFromHooksClient_firstRender };
 export { getPageContextFromHooksServer };
 export { getPageContextFromHooksServer_firstRender };
 export { setPageContextInitIsPassedToClient };
+export { processPageContextFromServer };
 export type { PageContextFromHooksServer };
 import type { PageContextConfig, PageFile } from '../../shared-server-client/getPageFiles.js';
 import type { PageContextCreatedClient } from './createPageContextClient.js';
@@ -509,3 +510,4 @@ declare function getPageContextFromHooksClient(pageContext: {
     urlOriginal: string;
 }>;
 declare function setPageContextInitIsPassedToClient(pageContext: Record<string, unknown>): void;
+declare function processPageContextFromServer(pageContext: Record<string, unknown>): void;

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

@@ -3,6 +3,7 @@ export { getPageContextFromHooksClient_firstRender };
 export { getPageContextFromHooksServer };
 export { getPageContextFromHooksServer_firstRender };
 export { setPageContextInitIsPassedToClient };
+export { processPageContextFromServer };
 import { assert, assertUsage, getProjectError } from '../../utils/assert.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { hasProp } from '../../utils/hasProp.js';

package/dist/client/runtime-client-routing/renderPageClient.d.ts

@@ -2,6 +2,7 @@ export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
 export { getPageContextClient };
+export { createPageContextFromServer_experimentalRSC };
 export type { PageContextBegin };
 export type { PageContextInternalClientAfterRender };
 import { type PageContextAbort, type PageContextAborted } from '../../shared-server-client/route/abort.js';
@@ -798,3 +799,11 @@ declare function getRenderCount(): number;
  * https://vike.dev/getPageContextClient
  */
 declare function getPageContextClient(): PageContextClient | null;
+/**
+ * Creates a new `pageContext` for the page that `pageContext` renders, with the values of `pageContextFromServer` on top.
+ * - `pageContext` is the `pageContext` of the page rendered last
+ * - `pageContext` and `pageContextFromServer` aren't modified
+ * - The new `pageContext` is the `pageContext.previousPageContext` of the next navigation, including a navigation that has already started
+ * - Unless a navigation has started, `getPageContextClient()` returns the new `pageContext`
+ */
+declare function createPageContextFromServer_experimentalRSC(pageContext: PageContextClient, pageContextFromServer: Record<string, unknown>): PageContextClient;

package/dist/client/runtime-client-routing/renderPageClient.js

@@ -2,6 +2,7 @@ export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
 export { getPageContextClient };
+export { createPageContextFromServer_experimentalRSC };
 import { assert, assertInfo, assertWarning } from '../../utils/assert.js';
 import { catchInfiniteLoop } from '../../utils/catchInfiniteLoop.js';
 import { genPromise } from '../../utils/genPromise.js';
@@ -12,7 +13,7 @@ import { isReact } from '../../utils/isReact.js';
 import { objectAssign } from '../../utils/objectAssign.js';
 import { redirectHard } from '../../utils/redirectHard.js';
 import { updateType } from '../../utils/updateType.js';
-import { getPageContextFromHooksClient, getPageContextFromHooksServer, getPageContextFromHooksClient_firstRender, getPageContextFromHooksServer_firstRender, setPageContextInitIsPassedToClient, } from './getPageContextFromHooks.js';
+import { getPageContextFromHooksClient, getPageContextFromHooksServer, getPageContextFromHooksClient_firstRender, getPageContextFromHooksServer_firstRender, setPageContextInitIsPassedToClient, processPageContextFromServer, } from './getPageContextFromHooks.js';
 import { cancelStreamedValues } from './streamedValues.js';
 import { createPageContextClient } from './createPageContextClient.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
@@ -21,6 +22,7 @@ import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide, } from '../
 import { changeUrl, saveScrollPosition } from './history.js';
 import { addNewPageContextAborted, getPageContextAddendumAbort, isAbortError, logAbort, } from '../../shared-server-client/route/abort.js';
 import { route } from '../../shared-server-client/route/index.js';
+import { forkPageContext } from '../../shared-server-client/forkPageContext.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
 import { isScrollPosition, setScrollPosition } from './setScrollPosition.js';
 import { scrollRestoration_initialRenderIsDone } from './scrollRestoration.js';
@@ -401,6 +403,12 @@ async function renderPageClient(renderArgs) {
             }
         };
         changeUrl(urlOriginal, overwriteLastHistoryEntry);
+        {
+            const previousPageContextBefore = globalObject.renderedPageContext?.previousPageContext;
+            // Remove previousPageContext of past pages (otherwise all the past pageContext are kept in memory)
+            if (previousPageContextBefore)
+                previousPageContextBefore.previousPageContext = null;
+        }
         globalObject.previousPageContext = pageContext;
         // There should never be concurrent onRenderClient() calls
         assert(globalObject.onRenderClientPreviousPromise === undefined);
@@ -509,7 +517,7 @@ async function getPageContextBegin(isForErrorPage, { urlOriginal, isBackwardNavi
                 showStackTrace: true,
                 onlyOnce: true,
             });
-            return previousPageContext;
+            return this.previousPageContext;
         },
         enumerable: false,
     });
@@ -608,6 +616,29 @@ function getPageContextClient() {
         return null;
     return getPageContextPublicClient(pageContext);
 }
+// TODO/soon: check whether this is the right API
+/**
+ * Creates a new `pageContext` for the page that `pageContext` renders, with the values of `pageContextFromServer` on top.
+ * - `pageContext` is the `pageContext` of the page rendered last
+ * - `pageContext` and `pageContextFromServer` aren't modified
+ * - The new `pageContext` is the `pageContext.previousPageContext` of the next navigation, including a navigation that has already started
+ * - Unless a navigation has started, `getPageContextClient()` returns the new `pageContext`
+ */
+function createPageContextFromServer_experimentalRSC(pageContext, pageContextFromServer) {
+    const pageContextFromServerCopy = { ...pageContextFromServer };
+    processPageContextFromServer(pageContextFromServerCopy);
+    const pageContextNew = forkPageContext(pageContext._originalObject);
+    objectAssign(pageContextNew, pageContextFromServerCopy);
+    // A navigation sets currentPageContext and reads previousPageContext when it starts, and sets previousPageContext when it renders
+    if (globalObject.currentPageContext === globalObject.previousPageContext) {
+        globalObject.currentPageContext = pageContextNew;
+    }
+    else {
+        globalObject.currentPageContext.previousPageContext = getPageContextPublicClient(pageContextNew);
+    }
+    globalObject.previousPageContext = pageContextNew;
+    return getPageContextPublicClient(pageContextNew);
+}
 async function loadPageConfigsLazyClientSideAndExecHook(pageContext, isFirstRender, isRenderOutdated) {
     let hasErr = false;
     let err;

package/dist/shared-server-client/getPageContextPublicShared.js

@@ -17,7 +17,7 @@ function getPageContextPublicShared(pageContext) {
                     showStackTrace: true,
                     onlyOnce: true,
                 });
-                return pageContext.pageId;
+                return this.pageId;
             },
             enumerable: false,
         });

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: '0.4.268-commit-45c1759';
+export declare const PROJECT_VERSION: '0.4.268-commit-ca58695';

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.268-commit-45c1759';
+export const PROJECT_VERSION = '0.4.268-commit-ca58695';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.268-commit-45c1759",
+  "version": "0.4.268-commit-ca58695",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {