vike 0.4.197-commit-f4d8658 → 0.4.197-commit-7d64995

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.197-commit-f4d8658';
+exports.PROJECT_VERSION = '0.4.197-commit-7d64995';

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

@@ -19,13 +19,13 @@ type PageContextSerialized = {
 };
 declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
+    _hasPageContextFromServer: true;
 };
 declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageContextExports & {
     _hasPageContextFromServer: true;
 }): Promise<PageContextSerialized & PageContext & PageContextExports & {
     _hasPageContextFromServer: true;
 } & {
-    isHydration: true;
     _hasPageContextFromClient: boolean;
 }>;
 type PageContextFromServerHooks = {

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

@@ -32,7 +32,6 @@ function getPageContextFromHooks_serialized() {
 // TODO/eventually: rename
 async function getPageContextFromHooks_isHydration(pageContext) {
     objectAssign(pageContext, {
-        isHydration: true,
         _hasPageContextFromClient: false
     });
     for (const hookName of ['data', 'onBeforeRender']) {
@@ -46,8 +45,6 @@ async function getPageContextFromHooks_isHydration(pageContext) {
 }
 async function getPageContextFromServerHooks(pageContext, isErrorPage) {
     const pageContextFromServerHooks = {
-        // TODO/eventually: move this upstream
-        isHydration: false,
         _hasPageContextFromServer: false
     };
     // If pageContextInit has some client data or if one of the hooks guard(), data() or onBeforeRender() is server-side

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

@@ -6,7 +6,7 @@ export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import { PageFile } from '../../shared/getPageFiles.js';
+import type { PageContextExports, PageFile } from '../../shared/getPageFiles.js';
 import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = {
@@ -19,7 +19,7 @@ type PageContextForPrefetch = {
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-}): null | PageContextFromServerHooks;
+} & PageContextExports): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

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

@@ -27,6 +27,10 @@ const globalObject = getGlobalObject('prefetch.ts', {
     prefetchedPageContexts: {}
 });
 function getPageContextPrefetched(pageContext) {
+    const prefetchSettings = getPrefetchSettings(pageContext, null);
+    // TODO/pageContext-prefetch: we need linkTag to make this condition work
+    if (!prefetchSettings.pageContext)
+        return null;
     const key = getCacheKey(pageContext.urlPathname);
     const found = globalObject.prefetchedPageContexts[key];
     if (!found || found.result.is404ServerSideRouted || isExpired(found))
@@ -223,8 +227,10 @@ async function getPageContextLink(urlOfLink) {
     objectAssign(pageContextLink, pageContextFromRoute);
     return pageContextLink;
 }
-function getCacheKey(urlPathname) {
-    assert(urlPathname.startsWith('/'));
-    const key = urlPathname.split('#')[0];
+function getCacheKey(url) {
+    if (url.startsWith('#'))
+        url = '/';
+    assert(url.startsWith('/'), { urlPathname: url });
+    const key = url.split('#')[0];
     return key;
 }

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

@@ -53,7 +53,7 @@ async function renderPageClientSide(renderArgs) {
         const onError = async (err) => {
             await renderErrorPage({ err });
         };
-        const pageContext = await getPageContextBegin();
+        const pageContext = await getPageContextBegin(false);
         if (isRenderOutdated())
             return;
         // onPageTransitionStart()
@@ -81,10 +81,13 @@ async function renderPageClientSide(renderArgs) {
             }
         }
         // Route
-        let pageContextRouted;
         if (isFirstRender) {
             const pageContextSerialized = getPageContextFromHooks_serialized();
-            pageContextRouted = pageContextSerialized;
+            // TODO/eventually: create helper assertPageContextFromHook()
+            assert(!('urlOriginal' in pageContextSerialized));
+            objectAssign(pageContext, pageContextSerialized);
+            // TODO/pageContext-prefetch: remove or change, because this only makes sense for a pre-rendered page
+            populatePageContextPrefetchCache(pageContext, { pageContextFromServerHooks: pageContextSerialized });
         }
         else {
             let pageContextFromRoute;
@@ -125,10 +128,10 @@ async function renderPageClientSide(renderArgs) {
                 // Skip's Vike's rendering; let the user handle the navigation
                 return;
             }
-            pageContextRouted = pageContextFromRoute;
+            // TODO/eventually: create helper assertPageContextFromHook()
+            assert(!('urlOriginal' in pageContextFromRoute));
+            objectAssign(pageContext, pageContextFromRoute);
         }
-        assert(!('urlOriginal' in pageContextRouted));
-        objectAssign(pageContext, pageContextRouted);
         try {
             objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs));
         }
@@ -185,6 +188,7 @@ async function renderPageClientSide(renderArgs) {
                     if (result.is404ServerSideRouted)
                         return;
                     pageContextFromServerHooks = result.pageContextFromServerHooks;
+                    // TODO/pageContext-prefetch: remove or change, because this only makes sense for a pre-rendered page
                     populatePageContextPrefetchCache(pageContext, result);
                 }
                 catch (err) {
@@ -212,11 +216,12 @@ async function renderPageClientSide(renderArgs) {
             await renderPageView(pageContext);
         }
     }
-    async function getPageContextBegin() {
+    async function getPageContextBegin(isForErrorPage) {
         const pageContext = await createPageContext(urlOriginal);
         objectAssign(pageContext, {
             isBackwardNavigation,
             isClientSideNavigation,
+            isHydration: isFirstRender && !isForErrorPage,
             _previousPageContext: previousPageContext
         });
         {
@@ -251,7 +256,7 @@ async function renderPageClientSide(renderArgs) {
                 // We handle the abort error down below.
             }
         }
-        const pageContext = await getPageContextBegin();
+        const pageContext = await getPageContextBegin(true);
         if (isRenderOutdated())
             return;
         if (args.is404)

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.197-commit-f4d8658";
+export declare const PROJECT_VERSION: "0.4.197-commit-7d64995";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.197-commit-f4d8658';
+export const PROJECT_VERSION = '0.4.197-commit-7d64995';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.197-commit-f4d8658";
+    projectVersion: "0.4.197-commit-7d64995";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.197-commit-f4d8658",
+  "version": "0.4.197-commit-7d64995",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {