vike 0.4.197-commit-9db6c02 → 0.4.197-commit-ab2fbbe

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-9db6c02';
+exports.PROJECT_VERSION = '0.4.197-commit-ab2fbbe';

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/getPrefetchSettings.js

@@ -2,6 +2,7 @@
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 import { assertUsage, assertInfo } from '../utils.js';
+// TODO/pageContext-prefetch: Make it `Infinity` for pre-rendered pages.
 const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 const prefetchSettingTrue = {
     staticAssets: 'hover',

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

@@ -1,13 +1,26 @@
 export { prefetch };
 export { getPageContextPrefetched };
 export { initLinkPrefetchHandlers };
+export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
-import { type PageContextFromServerHooks } from './getPageContextFromHooks.js';
-declare function getPageContextPrefetched(pageContext: {
+import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
+import { PageFile } from '../../shared/getPageFiles.js';
+import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
+type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
+type PageContextForPrefetch = {
     urlOriginal: string;
+    urlPathname: string;
+    pageId: string;
+    _urlRewrite: null;
+    _pageFilesAll: PageFile[];
+    _pageConfigs: PageConfigRuntime[];
+};
+declare function getPageContextPrefetched(pageContext: {
+    urlPathname: string;
 }): null | PageContextFromServerHooks;
+declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.
  *

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

@@ -1,6 +1,7 @@
 export { prefetch };
 export { getPageContextPrefetched };
 export { initLinkPrefetchHandlers };
+export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
@@ -26,13 +27,15 @@ const globalObject = getGlobalObject('prefetch.ts', {
     prefetchedPageContexts: {}
 });
 function getPageContextPrefetched(pageContext) {
-    const url = pageContext.urlOriginal;
-    const found = globalObject.prefetchedPageContexts[url];
+    const key = getCacheKey(pageContext.urlPathname);
+    const found = globalObject.prefetchedPageContexts[key];
     if (!found || found.result.is404ServerSideRouted || isExpired(found))
         return null;
     const pageContextPrefetched = found.result.pageContextFromServerHooks;
+    /* TODO/pageContext-prefetch: make it work for when resultMaxAge is Infinity.
     // We discard the prefetched pageContext whenever we use it, so that the user always sees fresh data upon naivgating.
-    delete globalObject.prefetchedPageContexts[url];
+    delete globalObject.prefetchedPageContexts[key]
+    */
     return pageContextPrefetched;
 }
 async function prefetchAssets(pageContextLink) {
@@ -50,13 +53,30 @@ async function prefetchAssets(pageContextLink) {
 }
 async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge) {
     const result = await getPageContextFromServerHooks(pageContextLink, false);
-    const urlOfLink = pageContextLink.urlOriginal;
-    globalObject.prefetchedPageContexts[urlOfLink] = {
+    setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
+}
+function populatePageContextPrefetchCache(pageContext, result) {
+    setPageContextPrefetchCache(pageContext, result, null);
+}
+function setPageContextPrefetchCache(pageContext, result, resultMaxAge) {
+    if (resultMaxAge === null)
+        resultMaxAge = getResultMaxAge();
+    const key = getCacheKey(pageContext.urlPathname);
+    globalObject.prefetchedPageContexts[key] = {
         resultFetchedAt: Date.now(),
         resultMaxAge,
         result
     };
 }
+function getResultMaxAge() {
+    const pageContextCurrent = getPageContextCurrent();
+    // TODO/pageContext-prefetch: remove this dirty hack used by @brillout/docpress and, instead, use Vike's default if pageContextCurrent isn't defined yet.
+    if (!pageContextCurrent)
+        return Infinity;
+    const prefetchSettings = getPrefetchSettings(pageContextCurrent, null);
+    const resultMaxAge = typeof prefetchSettings.pageContext === 'number' ? prefetchSettings.pageContext : PAGE_CONTEXT_MAX_AGE_DEFAULT;
+    return resultMaxAge;
+}
 /**
  * Programmatically prefetch client assets.
  *
@@ -87,27 +107,11 @@ async function prefetch(url, options) {
         })(),
         (async () => {
             if (options?.pageContext !== false) {
-                const resultMaxAge = getResultMaxAge();
+                const resultMaxAge = typeof options?.pageContext === 'number' ? options.pageContext : null;
                 await prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge);
             }
         })()
     ]);
-    return;
-    function getResultMaxAge() {
-        if (typeof options?.pageContext === 'number') {
-            return options.pageContext;
-        }
-        else {
-            // If user calls prefetch() before hydration finished => await the pageContext to be set
-            const pageContextCurrent = getPageContextCurrent();
-            // TODO/pageContext-prefetch: remove this dirty hack for @brillout/docpress and, instead, use Vike's default if pageContextCurrent isn't defined yet.
-            if (!pageContextCurrent)
-                return Infinity;
-            const prefetchSettings = getPrefetchSettings(pageContextCurrent, null);
-            const resultMaxAge = typeof prefetchSettings.pageContext === 'number' ? prefetchSettings.pageContext : PAGE_CONTEXT_MAX_AGE_DEFAULT;
-            return resultMaxAge;
-        }
-    }
 }
 // Lazy execution logic copied from: https://github.com/withastro/astro/blob/2594eb088d53a98181ac820243bcb1a765856ecf/packages/astro/src/runtime/client/dev-toolbar/apps/audit/index.ts#L53-L72
 function addLinkPrefetchHandlers() {
@@ -147,7 +151,7 @@ function addLinkPrefetchHandlers_apply() {
             continue;
         globalObject.linkPrefetchHandlerAdded.add(linkTag);
         if (skipLink(linkTag))
-            return;
+            continue;
         linkTag.addEventListener('mouseover', () => {
             prefetchOnEvent(linkTag, 'hover');
         }, { passive: true });
@@ -172,7 +176,7 @@ async function prefetchOnEvent(linkTag, event) {
         prefetchSettings = getPrefetchSettings(pageContextCurrent, linkTag);
     }
     else {
-        // TODO/pageContext-prefetch: remove this dirty hack for @brillout/docpress and, instead, use Vike's default if pageContextCurrent isn't defined yet.
+        // TODO/pageContext-prefetch: remove this dirty hack used by @brillout/docpress and, instead, use Vike's default if pageContextCurrent isn't defined yet.
         prefetchSettings = { staticAssets: 'hover', pageContext: Infinity };
     }
     const urlOfLink = linkTag.getAttribute('href');
@@ -191,7 +195,8 @@ async function prefetchOnEvent(linkTag, event) {
         })(),
         (async () => {
             if (event !== 'viewport' && prefetchSettings.pageContext) {
-                const found = globalObject.prefetchedPageContexts[urlOfLink];
+                const key = getCacheKey(urlOfLink);
+                const found = globalObject.prefetchedPageContexts[key];
                 if (!found || isExpired(found)) {
                     // TODO/pageContext-prefetch: move this logic in getPrefetchSettings()
                     const resultMaxAge = prefetchSettings.pageContext;
@@ -218,3 +223,10 @@ async function getPageContextLink(urlOfLink) {
     objectAssign(pageContextLink, pageContextFromRoute);
     return pageContextLink;
 }
+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

@@ -5,7 +5,7 @@ export { firstRenderStartPromise };
 import { assert, getCurrentUrl, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, executeHook, hasProp, augmentType, genPromise, isCallable } from './utils.js';
 import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient } from './getPageContextFromHooks.js';
 import { createPageContext } from './createPageContext.js';
-import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched } from './prefetch.js';
+import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache } from './prefetch.js';
 import { assertInfo, assertWarning, isReact } from './utils.js';
 import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
 import { assertHook, getHook } from '../../shared/hooks/getHook.js';
@@ -56,6 +56,7 @@ async function renderPageClientSide(renderArgs) {
         const pageContext = await getPageContextBegin();
         if (isRenderOutdated())
             return;
+        objectAssign(pageContext, { isHydration: isFirstRender });
         // onPageTransitionStart()
         if (globalObject.isFirstRenderDone) {
             assert(previousPageContext);
@@ -81,10 +82,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 +129,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));
         }
@@ -144,6 +148,7 @@ async function renderPageClientSide(renderArgs) {
         }
         if (isRenderOutdated())
             return;
+        setPageContextCurrent(pageContext);
         // Set global hydrationCanBeAborted
         if (pageContext.exports.hydrationCanBeAborted) {
             setHydrationCanBeAborted();
@@ -184,6 +189,8 @@ 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) {
                     await onError(err);
@@ -333,6 +340,7 @@ async function renderPageClientSide(renderArgs) {
         }
         if (isRenderOutdated())
             return;
+        setPageContextCurrent(pageContext);
         let pageContextFromServerHooks;
         try {
             const result = await getPageContextFromServerHooks(pageContext, true);
@@ -407,7 +415,6 @@ async function renderPageClientSide(renderArgs) {
         /* We don't abort in order to ensure that onHydrationEnd() is called: we abort only after onHydrationEnd() is called.
         if (isRenderOutdated(true)) return
         */
-        setPageContextCurrent(pageContext);
         // onHydrationEnd()
         if (isFirstRender && !onRenderClientError) {
             assertHook(pageContext, 'onHydrationEnd');

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.197-commit-9db6c02";
+export declare const PROJECT_VERSION: "0.4.197-commit-ab2fbbe";

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-9db6c02';
+export const PROJECT_VERSION = '0.4.197-commit-ab2fbbe';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.197-commit-9db6c02";
+    projectVersion: "0.4.197-commit-ab2fbbe";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.197-commit-9db6c02",
+  "version": "0.4.197-commit-ab2fbbe",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {