vike 0.4.197-commit-ab2fbbe → 0.4.197-commit-9330153

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

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: I guess 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))
@@ -55,13 +59,17 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext, result) {
+function populatePageContextPrefetchCache(pageContext /*& PageContextExports*/, result) {
+    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageContextExports as it isn't available here.)
+    if (!isBrilloutDocpress())
+        return;
     setPageContextPrefetchCache(pageContext, result, null);
 }
 function setPageContextPrefetchCache(pageContext, result, resultMaxAge) {
     if (resultMaxAge === null)
         resultMaxAge = getResultMaxAge();
     const key = getCacheKey(pageContext.urlPathname);
+    assert(isBrilloutDocpress()); // Ensure this API isn't used by anyone else
     globalObject.prefetchedPageContexts[key] = {
         resultFetchedAt: Date.now(),
         resultMaxAge,
@@ -230,3 +238,7 @@ function getCacheKey(url) {
     const key = url.split('#')[0];
     return key;
 }
+// TODO/pageContext-prefetch: remove
+function isBrilloutDocpress() {
+    return '_isBrilloutDocpress' in window;
+}

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

@@ -53,10 +53,9 @@ async function renderPageClientSide(renderArgs) {
         const onError = async (err) => {
             await renderErrorPage({ err });
         };
-        const pageContext = await getPageContextBegin();
+        const pageContext = await getPageContextBegin(false);
         if (isRenderOutdated())
             return;
-        objectAssign(pageContext, { isHydration: isFirstRender });
         // onPageTransitionStart()
         if (globalObject.isFirstRenderDone) {
             assert(previousPageContext);
@@ -217,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
         });
         {
@@ -256,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-ab2fbbe";
+export declare const PROJECT_VERSION: "0.4.197-commit-9330153";

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

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

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

package/package.json

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