vike 0.4.195-commit-486b49a → 0.4.195-commit-3f77496

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.195-commit-486b49a';
+exports.PROJECT_VERSION = '0.4.195-commit-3f77496';

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

@@ -16,15 +16,13 @@ async function installClientRouter() {
     // Preserve stack track
     await renderPromise;
 }
-function render() {
+async function render() {
     assert(getRenderCount() === 0);
-    const renderPromise = renderPageClientSide({
+    await renderPageClientSide({
         scrollTarget: { preserveScroll: true },
         isBackwardNavigation: null,
         isClientSideNavigation: false
     });
-    assert(getRenderCount() === 1);
-    return renderPromise;
 }
 function initHistoryAndScroll() {
     setupNativeScrollRestoration();

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

@@ -1,6 +1,6 @@
 export { navigate };
 export { reload };
-import { renderPageClientSide } from './renderPageClientSide.js';
+import { firstRenderStartPromise, renderPageClientSide } from './renderPageClientSide.js';
 import { assertClientRouting, assertUsageUrlPathname, getCurrentUrl } from './utils.js';
 assertClientRouting();
 /** Programmatically navigate to a new page.
@@ -13,6 +13,8 @@ assertClientRouting();
  */
 async function navigate(url, { keepScrollPosition = false, overwriteLastHistoryEntry = false } = {}) {
     assertUsageUrlPathname(url, '[navigate(url)] url');
+    // If `hydrationCanBeAborted === false` (e.g. Vue) then we can apply navigate() only after hydration is done
+    await firstRenderStartPromise;
     const scrollTarget = { preserveScroll: keepScrollPosition };
     await renderPageClientSide({
         scrollTarget,

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

@@ -1,8 +1,10 @@
 export { renderPageClientSide };
 export { getRenderCount };
 export { disableClientRouting };
+export { firstRenderStartPromise };
 import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
+declare const firstRenderStartPromise: Promise<void>;
 type RenderArgs = {
     scrollTarget: ScrollTarget;
     isBackwardNavigation: boolean | null;

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

@@ -1,7 +1,8 @@
 export { renderPageClientSide };
 export { getRenderCount };
 export { disableClientRouting };
-import { assert, getCurrentUrl, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, executeHook, hasProp, augmentType } from './utils.js';
+export { firstRenderStartPromise };
+import { assert, getCurrentUrl, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, executeHook, hasProp, augmentType, genPromise } from './utils.js';
 import { getPageContextFromHooks_isHydration, getPageContextFromHooks_isNotHydration, getPageContextFromHooks_serialized } from './getPageContextFromHooks.js';
 import { createPageContext } from './createPageContext.js';
 import { addLinkPrefetchHandlers } from './prefetch.js';
@@ -17,7 +18,15 @@ import { setScrollPosition } from './setScrollPosition.js';
 import { updateState } from './onBrowserHistoryNavigation.js';
 import { browserNativeScrollRestoration_disable, setInitialRenderIsDone } from './scrollRestoration.js';
 import { getErrorPageId } from '../../shared/error-page.js';
-const globalObject = getGlobalObject('renderPageClientSide.ts', { renderCounter: 0 });
+const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
+    const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
+    return {
+        renderCounter: 0,
+        firstRenderStartPromise,
+        firstRenderStartPromiseResolve
+    };
+})());
+const { firstRenderStartPromise } = globalObject;
 async function renderPageClientSide(renderArgs) {
     const { scrollTarget, urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, isUserLandPushStateNavigation, isClientSideNavigation = true } = renderArgs;
     const { previousPageContext } = globalObject;
@@ -31,6 +40,9 @@ async function renderPageClientSide(renderArgs) {
         redirectHard(urlOriginal);
         return;
     }
+    globalObject.firstRenderStartPromiseResolve();
+    if (isRenderOutdated())
+        return;
     await renderPageNominal();
     return;
     async function renderPageNominal() {

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

@@ -34,7 +34,7 @@ function isHashUrl(url) {
         return true;
     }
     const removeHash = (url) => url.split('#')[0];
-    if (url.includes('#') && removeHash(url) === removeHash(window.location.href)) {
+    if (url.includes('#') && removeHash(url) === removeHash(window.location.pathname)) {
         return true;
     }
     return false;

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

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

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

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

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.195-commit-486b49a";
+export declare const PROJECT_VERSION: "0.4.195-commit-3f77496";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.195-commit-486b49a';
+export const PROJECT_VERSION = '0.4.195-commit-3f77496';

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

@@ -1,4 +1,4 @@
-export declare function genPromise<T>(): {
+export declare function genPromise<T = void>(): {
     promise: Promise<T>;
     resolve: (val: T) => void;
 };

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.195-commit-486b49a";
+    projectVersion: "0.4.195-commit-3f77496";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.195-commit-486b49a",
+  "version": "0.4.195-commit-3f77496",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {