vike 0.4.252 → 0.4.253-commit-ca512c3

package/dist/client/assertEnvClient.js

@@ -1,5 +1,5 @@
 import { assertIsBrowser } from '../utils/assertIsBrowser.js';
-assertEnv();
-function assertEnv() {
+assertEnvClient();
+function assertEnvClient() {
     assertIsBrowser();
 }

package/dist/client/index.js

@@ -1,5 +1,5 @@
-import './assertEnvClient.js';
 import { isBrowser } from '../utils/isBrowser.js';
 import { assert } from '../utils/assert.js';
+import './assertEnvClient.js';
 assert(isBrowser());
 export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync, } from './shared/getGlobalContextClientInternalShared.js';

package/dist/client/node.js

@@ -1,5 +1,5 @@
-import './assertEnvClient.js';
 import { assertUsage } from '../utils/assert.js';
+import './assertEnvClient.js';
 assertUsage(false, [
     'Server imports are forbidden on the client-side:',
     "  import { something } from 'vike/server'",

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { createPageContextClient };
 export type PageContextCreatedClient = Awaited<ReturnType<typeof createPageContextClient>>;
+import '../assertEnvClient.js';
 declare function createPageContextClient(urlOriginal: string): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
@@ -66,7 +66,7 @@ declare function createPageContextClient(urlOriginal: string): Promise<{
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { createPageContextClient };
 import { createPageContextObject, createPageContextShared } from '../../shared-server-client/createPageContextShared.js';
 import { getPageContextUrlComputed } from '../../shared-server-client/getPageContextUrlComputed.js';
@@ -8,6 +7,7 @@ import { assert } from '../../utils/assert.js';
 import { objectAssign } from '../../utils/objectAssign.js';
 import { isBaseServer } from '../../utils/parseUrl.js';
 import { updateType } from '../../utils/updateType.js';
+import '../assertEnvClient.js';
 async function createPageContextClient(urlOriginal) {
     const pageContext = createPageContextBase(urlOriginal);
     const globalContext = await getGlobalContextClientInternal();

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

@@ -1,14 +1,10 @@
-import '../assertEnvClient.js';
 import { assertClientRouting } from '../../utils/assertRoutingType.js';
+import '../assertEnvClient.js';
 assertClientRouting();
 import { initClientRouter } from './initClientRouter.js';
 import { assertSingleInstance_onClientEntryClientRouting } from '../../utils/assertSingleInstance.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';
-import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
-// @ts-expect-error
-import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:client-routing';
 assertSingleInstance_onClientEntryClientRouting(import.meta.env.PROD);
-setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry);
 initClientRouter();
 if (import.meta.env.DEV)
     removeFoucBuster();

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

@@ -1,3 +1,3 @@
-import '../assertEnvClient.js';
 export { getBaseServer };
+import '../assertEnvClient.js';
 declare function getBaseServer(): string;

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getBaseServer };
 import { assert } from '../../utils/assert.js';
+import '../assertEnvClient.js';
 function getBaseServer() {
     const baseServer = import.meta.env.BASE_SERVER;
     assert(isBaseServer(baseServer));

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 export type { GlobalContextClientInternal };
+import '../assertEnvClient.js';
 type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
 declare function getGlobalContextClientInternal(): Promise<{
     _globalConfigPublic: {
@@ -52,5 +52,5 @@ declare function getGlobalContextClientInternal(): Promise<{
     isClientSide: true;
 } & {
     _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+    _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
 }>;

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

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
 import { loadPageRoutes } from '../../shared-server-client/route/loadPageRoutes.js';
 import { objectAssign } from '../../utils/objectAssign.js';
+import '../assertEnvClient.js';
 async function getGlobalContextClientInternal() {
     const globalContext = await getGlobalContextClientInternalShared();
     objectAssign(globalContext, await addGlobalContext(globalContext));

package/dist/client/runtime-client-routing/getPageContext/removeBuiltInOverrides.d.ts

@@ -1,5 +1,5 @@
-import '../../assertEnvClient.js';
 export { removeBuiltInOverrides };
+import '../../assertEnvClient.js';
 declare const BUILT_IN_CLIENT_ROUTER: readonly ["urlPathname", "urlParsed"];
 declare const BUILT_IN_CLIENT: readonly ["Page", "pageExports", "exports"];
 type DeletedKeys = (typeof BUILT_IN_CLIENT)[number] | (typeof BUILT_IN_CLIENT_ROUTER)[number];

package/dist/client/runtime-client-routing/getPageContext/removeBuiltInOverrides.js

@@ -1,6 +1,6 @@
-import '../../assertEnvClient.js';
 export { removeBuiltInOverrides };
 import { assert, assertWarning } from '../../../utils/assert.js';
+import '../../assertEnvClient.js';
 const BUILT_IN_CLIENT_ROUTER = ['urlPathname', 'urlParsed'];
 const BUILT_IN_CLIENT = ['Page', 'pageExports', 'exports'];
 function removeBuiltInOverrides(pageContext) {

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

@@ -1,7 +1,7 @@
-import '../assertEnvClient.js';
 export { getPageContext };
 export { providePageContext };
 import { providePageContext } from '../../shared-server-client/hooks/execHook.js';
 import type { GetPageContextParams } from '../../server/runtime/getPageContext.js';
+import '../assertEnvClient.js';
 type TypeIsNotExported = never;
 declare function getPageContext({ asyncHook }?: GetPageContextParams): TypeIsNotExported;

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

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { getPageContext };
 export { providePageContext };
 // TO-DO/eventually: create new setting `+asyncHook: true` that sets the default value of the `asyncHook` parameter below to `true`
 import { getPageContext_sync, providePageContext } from '../../shared-server-client/hooks/execHook.js';
 import { getPageContextClient } from './renderPageClient.js';
+import '../assertEnvClient.js';
 function getPageContext({ asyncHook } = {}) {
     {
         const pageContext = getPageContext_sync();

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

@@ -1,7 +1,7 @@
-import '../assertEnvClient.js';
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
+import '../assertEnvClient.js';
 type PageContextCurrent = PageContextConfig & {
     urlPathname: string;
 };

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

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
-const globalObject = getGlobalObject('runtime-client-routing/getPageContextCurrent.ts', {
+import '../assertEnvClient.js';
+const globalObject = getGlobalObject('getPageContextCurrent.ts', {
     pageContextCurrent: null,
 });
 function getPageContextCurrent() {

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { getPageContextFromHooksClient };
 export { getPageContextFromHooksClient_firstRender };
 export { getPageContextFromHooksServer };
@@ -9,6 +8,7 @@ import type { PageContextConfig, PageFile } from '../../shared-server-client/get
 import type { PageContextCreatedClient } from './createPageContextClient.js';
 import type { PageContextBegin } from './renderPageClient.js';
 import { type PageContextPublicClient } from './getPageContextPublicClient.js';
+import '../assertEnvClient.js';
 type PageContextSerialized = {
     pageId: string;
     _hasPageContextFromServer: true;
@@ -84,7 +84,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
@@ -162,7 +162,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
             isClientSide: true;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
         };
         _pageFilesAll: PageFile[];
     } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {
@@ -199,9 +199,11 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
+    }, "pageId" | "exports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
+        cspNonce?: undefined;
+        headers?: undefined;
     } & {
         urlOriginal: string;
         isHydration: boolean;
@@ -260,9 +262,11 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
+}, "pageId" | "exports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
+    cspNonce?: undefined;
+    headers?: undefined;
 } & {
     urlOriginal: string;
     isHydration: boolean;
@@ -366,7 +370,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
@@ -444,7 +448,7 @@ declare function getPageContextFromHooksClient(pageContext: {
             isClientSide: true;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
         };
         _pageFilesAll: PageFile[];
     } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {
@@ -481,9 +485,11 @@ declare function getPageContextFromHooksClient(pageContext: {
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
+    }, "pageId" | "exports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
+        cspNonce?: undefined;
+        headers?: undefined;
     } & {
         urlOriginal: string;
         isHydration: boolean;
@@ -540,9 +546,11 @@ declare function getPageContextFromHooksClient(pageContext: {
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
+}, "pageId" | "exports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
+    cspNonce?: undefined;
+    headers?: undefined;
 } & {
     urlOriginal: string;
     isHydration: boolean;

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { getPageContextFromHooksClient };
 export { getPageContextFromHooksClient_firstRender };
 export { getPageContextFromHooksServer };
@@ -24,7 +23,8 @@ import { pageContextInitIsPassedToClient } from '../../shared-server-client/misc
 import { isServerSideError } from '../../shared-server-client/misc/isServerSideError.js';
 import { execHook } from '../../shared-server-client/hooks/execHook.js';
 import { getPageContextPublicClient } from './getPageContextPublicClient.js';
-const globalObject = getGlobalObject('runtime-client-routing/getPageContextFromHooks.ts', {});
+import '../assertEnvClient.js';
+const globalObject = getGlobalObject('getPageContextFromHooks.ts', {});
 // TO-DO/soon/cumulative-hooks: filter & execute all client-only hooks (see other TO-DO/soon/cumulative-hooks comments)
 // - The client-side needs to know what hooks are client-only
 //   - Possible implementation: new computed prop `clientOnlyHooks: string[]` (list of hook ids) and add `hookId` to serialized config values

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

@@ -1,10 +1,10 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 export type { PageContextPublicClient };
 export type { PageContextPublicProxyClient };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 import type { PageContextInternalClient_ClientRouting } from '../../types/PageContext.js';
 import type { PageContextPublicMinimum } from '../../shared-server-client/getPageContextPublicShared.js';
+import '../assertEnvClient.js';
 type PageContextPublicClient = PageContextPublicMinimum & PageContextInternalClient_ClientRouting & PageContextConfig & {
     urlOriginal: string;
 };

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 import { getPageContextPublicClientShared } from '../shared/getPageContextPublicClientShared.js';
+import '../assertEnvClient.js';
 function getPageContextPublicClient(pageContext) {
     return getPageContextPublicClientShared(pageContext);
 }

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
@@ -6,6 +5,7 @@ export { saveScrollPosition };
 export { initHistory };
 export type { HistoryInfo };
 export type { ScrollPosition };
+import '../assertEnvClient.js';
 type StateEnhanced = {
     vike: {
         timestamp: number;
@@ -17,7 +17,7 @@ type ScrollPosition = {
     x: number;
     y: number;
 };
-declare function saveScrollPosition(): void;
+declare function saveScrollPosition(scrollPosition?: ScrollPosition): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
 declare function replaceHistoryStateOriginal(state: unknown, url?: Parameters<typeof window.history.replaceState>[2]): void;
 type HistoryInfo = {

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
@@ -9,6 +8,7 @@ import { assert, assertUsage } from '../../utils/assert.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { isObject } from '../../utils/isObject.js';
 import { redirectHard } from '../../utils/redirectHard.js';
+import '../assertEnvClient.js';
 const globalObject = getGlobalObject('history.ts', {
     monkeyPatched: false,
     previous: undefined,
@@ -48,8 +48,8 @@ function getScrollPosition() {
 function getTimestamp() {
     return new Date().getTime();
 }
-function saveScrollPosition() {
-    const scrollPosition = getScrollPosition();
+function saveScrollPosition(scrollPosition) {
+    scrollPosition || (scrollPosition = getScrollPosition());
     // Don't overwrite history.state if it was set by a non-Vike history.pushState() call.
     // https://github.com/vikejs/vike/issues/2801#issuecomment-3490431479
     if (!isEnhanced(window.history.state))

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

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
 export { getPageContextClient } from './renderPageClient.js';
 export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';
 import type { PageContextBuiltInClientWithClientRouting } from '../../types/PageContext.js';
+import '../assertEnvClient.js';
 /** @deprecated
  * Replace:
  *   ```

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 // TO-DO/next-major-release: move
 //   import { navigate, prefetch } from 'vike/client/router'
 // to:
@@ -8,3 +7,4 @@ export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
 export { getPageContextClient } from './renderPageClient.js';
 export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';
+import '../assertEnvClient.js';

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

@@ -1,3 +1,3 @@
-import '../assertEnvClient.js';
 export { initClientRouter };
-declare function initClientRouter(): Promise<void>;
+import '../assertEnvClient.js';
+declare function initClientRouter(): void;

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { initClientRouter };
 import { assert } from '../../utils/assert.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { getRenderCount, renderPageClient } from './renderPageClient.js';
 import { initOnPopState } from './initOnPopState.js';
 import { initOnLinkClick } from './initOnLinkClick.js';
@@ -8,21 +8,28 @@ import { scrollRestoration_init } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 import { initLinkPrefetchHandlers } from './prefetch.js';
 import { initHistory } from './history.js';
-async function initClientRouter() {
+import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
+// @ts-expect-error
+import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:client-routing';
+import '../assertEnvClient.js';
+const globalObject = getGlobalObject('initClientRouter.ts', {});
+function initClientRouter() {
+    setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry);
+    if (globalObject.done)
+        return;
+    globalObject.done = true;
     // Init navigation history and scroll restoration
     initHistoryAndScroll();
     // Render/hydrate
-    const renderFirstPagePromise = renderFirstPage();
+    renderFirstPage();
     // Intercept <a> clicks
     initOnLinkClick();
     // Add <a> prefetch handlers
     initLinkPrefetchHandlers();
-    // Preserve stack track
-    await renderFirstPagePromise;
 }
-async function renderFirstPage() {
+function renderFirstPage() {
     assert(getRenderCount() === 0);
-    await renderPageClient({
+    renderPageClient({
         scrollTarget: { preserveScroll: true },
         isClientSideNavigation: false,
     });

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

@@ -1,3 +1,3 @@
-import '../assertEnvClient.js';
 export { initOnLinkClick };
+import '../assertEnvClient.js';
 declare function initOnLinkClick(): void;

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

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { initOnLinkClick };
 import { isLinkIgnored, isHrefCurrentUrl, isLinkSkipped } from './isLinkSkipped.js';
 import { renderPageClient } from './renderPageClient.js';
 import { scrollToHashOrTop } from './setScrollPosition.js';
+import '../assertEnvClient.js';
 function initOnLinkClick() {
     document.addEventListener('click', onLinkClick);
 }

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

@@ -1,3 +1,3 @@
-import '../assertEnvClient.js';
 export { initOnPopState };
+import '../assertEnvClient.js';
 declare function initOnPopState(): void;

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

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { initOnPopState };
 import { onPopStateBegin } from './history.js';
 import { renderPageClient } from './renderPageClient.js';
 import { setScrollPosition } from './setScrollPosition.js';
 import { catchInfiniteLoop } from '../../utils/catchInfiniteLoop.js';
+import '../assertEnvClient.js';
 // The 'popstate' event is triggered when the browser doesn't fully load the new URL, for example:
 // - `location.hash='#foo'` triggers the popstate event while `location.href='/foo'` doesn't.
 // - Clicking on the browser's back-/forward button triggers a popstate event only if the history entry was generated with history.pushState() — no popstate event is fired upon Server Routing.

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

@@ -1,7 +1,7 @@
-import '../assertEnvClient.js';
 export { isClientSideRoutable };
 import type { GlobalContextClientInternal } from './getGlobalContextClientInternal.js';
 import type { PageFile } from '../../shared-server-client/getPageFiles.js';
+import '../assertEnvClient.js';
 declare function isClientSideRoutable(pageId: string, pageContext: {
     _globalContext: GlobalContextClientInternal;
     _pageFilesAll: PageFile[];

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

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { isClientSideRoutable };
 import { analyzePageClientSideInit } from '../../shared-server-client/getPageFiles/analyzePageClientSide.js';
 import { findPageConfig } from '../../shared-server-client/page-configs/findPageConfig.js';
 import { analyzeClientSide } from '../../shared-server-client/getPageFiles/analyzeClientSide.js';
+import '../assertEnvClient.js';
 // TO-DO/next-major-release: make it sync
 async function isClientSideRoutable(pageId, pageContext) {
     await analyzePageClientSideInit(pageContext._pageFilesAll, pageId, {

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

@@ -1,7 +1,7 @@
-import '../assertEnvClient.js';
 export { isLinkSkipped };
 export { isLinkIgnored };
 export { isHrefCurrentUrl };
+import '../assertEnvClient.js';
 declare function isLinkSkipped(linkTag: HTMLElement): boolean;
 declare function isLinkIgnored(linkTag: HTMLElement): boolean;
 declare function isHrefCurrentUrl(href: string): boolean;

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { isLinkSkipped };
 export { isLinkIgnored };
 export { isHrefCurrentUrl };
@@ -6,6 +5,7 @@ import { normalizeClientSideUrl } from '../shared/normalizeClientSideUrl.js';
 import { getBaseServer } from './getBaseServer.js';
 import { assert } from '../../utils/assert.js';
 import { parseUrl, isBaseServer, isUrl, isUrlExternal } from '../../utils/parseUrl.js';
+import '../assertEnvClient.js';
 function isLinkSkipped(linkTag) {
     const href = linkTag.getAttribute('href');
     return (href === null ||

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

@@ -1,3 +1,3 @@
-import '../assertEnvClient.js';
 export { logErrorClient };
+import '../assertEnvClient.js';
 declare function logErrorClient(err: unknown): void;

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { logErrorClient };
 import { isObject } from '../../utils/isObject.js';
+import '../assertEnvClient.js';
 function logErrorClient(err) {
     if (isObject(err) &&
         // Set by vike-react

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { navigate };
 export { reload };
+import '../assertEnvClient.js';
 type Options = {
     keepScrollPosition?: boolean;
     overwriteLastHistoryEntry?: boolean;

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

@@ -1,11 +1,12 @@
-import '../assertEnvClient.js';
 export { navigate };
 export { reload };
 // import { modifyUrlSameOrigin, ModifyUrlSameOriginOptions } from '../../shared/modifyUrlSameOrigin.js'
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
-import { firstRenderStartPromise, renderPageClient } from './renderPageClient.js';
+import { renderPageClient } from './renderPageClient.js';
 import { assertClientRouting } from '../../utils/assertRoutingType.js';
+import { initClientRouter } from './initClientRouter.js';
+import '../assertEnvClient.js';
 assertClientRouting();
 /** Programmatically navigate to a new page.
  *
@@ -19,8 +20,8 @@ async function navigate(url, options) {
     // let url = normalizeUrlArgument(options.url ?? getCurrentUrl(), 'navigate')
     // url = modifyUrlSameOrigin(url, options)
     normalizeUrlArgument(url, 'navigate');
-    // If `hydrationCanBeAborted === false` (e.g. Vue) then we can apply navigate() only after hydration is done
-    await firstRenderStartPromise;
+    // Ensure initClientRouter() is called before navigate() — otherwise race condition when +client.js calls navigate() before initClientRouter() is called in runtime-client-routing/entry.ts
+    initClientRouter();
     const { keepScrollPosition, overwriteLastHistoryEntry, pageContext } = options ?? {};
     const scrollTarget = { preserveScroll: keepScrollPosition ?? false };
     await renderPageClient({

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

@@ -1,3 +1,3 @@
-import '../assertEnvClient.js';
 export { normalizeUrlArgument };
+import '../assertEnvClient.js';
 declare function normalizeUrlArgument(url: string, fnName: 'prefetch' | 'navigate'): string;

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

@@ -1,7 +1,7 @@
-import '../assertEnvClient.js';
 export { normalizeUrlArgument };
 import { assertUsage } from '../../utils/assert.js';
 import { isUrl, isUrlRelative } from '../../utils/parseUrl.js';
+import '../assertEnvClient.js';
 function normalizeUrlArgument(url, fnName) {
     // Succinct error message to save client-side KBs
     const errMsg = `URL ${url} passed to ${fnName}() is invalid`;

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

@@ -1,8 +1,8 @@
-import '../../assertEnvClient.js';
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };
 import type { PageContextConfig } from '../../../shared-server-client/getPageFiles.js';
+import '../../assertEnvClient.js';
 declare const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 type PrefetchSettingResolved = {
     staticAssets: false | 'hover' | 'viewport';

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

@@ -1,8 +1,8 @@
-import '../../assertEnvClient.js';
 // TO-DO/pageContext-prefetch: rename this file to getPrefetchSettingResolved.ts
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 import { assertUsage, assertInfo } from '../../../utils/assert.js';
+import '../../assertEnvClient.js';
 // TO-DO/pageContext-prefetch: Make it `Infinity` for pre-rendered pages.
 const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 const prefetchSettingTrue = {

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { prefetch };
 export { getPageContextPrefetched };
 export { initLinkPrefetchHandlers };
@@ -9,6 +8,7 @@ export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextCreatedClient } from './createPageContextClient.js';
 import { type PageContextFromHooksServer, getPageContextFromHooksServer } from './getPageContextFromHooks.js';
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
+import '../assertEnvClient.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromHooksServer>>;
 type PageContextForPrefetch = PageContextCreatedClient & {
     pageId: string;