vike 0.4.252 → 0.4.253-commit-1658209

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

@@ -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/entry.js

@@ -4,11 +4,7 @@ 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/getGlobalContextClientInternal.d.ts

@@ -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/getPageContextCurrent.js

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

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

@@ -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 & {
@@ -202,6 +202,8 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
+        cspNonce?: undefined;
+        headers?: undefined;
     } & {
         urlOriginal: string;
         isHydration: boolean;
@@ -263,6 +265,8 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
 }, "exports" | "pageId" | "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 & {
@@ -484,6 +488,8 @@ declare function getPageContextFromHooksClient(pageContext: {
     }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
+        cspNonce?: undefined;
+        headers?: undefined;
     } & {
         urlOriginal: string;
         isHydration: boolean;
@@ -543,6 +549,8 @@ declare function getPageContextFromHooksClient(pageContext: {
 }, "exports" | "pageId" | "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

@@ -24,7 +24,7 @@ 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', {});
+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/history.d.ts

@@ -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

@@ -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/initClientRouter.d.ts

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

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

@@ -1,6 +1,7 @@
 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 +9,27 @@ 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';
+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/navigate.js

@@ -4,8 +4,9 @@ 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';
 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/prefetch.js

@@ -24,7 +24,7 @@ import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings, } from './prefetch/g
 import pc from '@brillout/picocolors';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 assertClientRouting();
-const globalObject = getGlobalObject('runtime-client-routing/prefetch.ts', {
+const globalObject = getGlobalObject('prefetch.ts', {
     linkPrefetchHandlerAdded: new WeakSet(),
     addLinkPrefetchHandlers_debounce: null,
     mutationObserver: new MutationObserver(addLinkPrefetchHandlers),

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

@@ -2,7 +2,6 @@ import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
-export { firstRenderStartPromise };
 export { getPageContextClient };
 export type { PageContextBegin };
 export type { PageContextInternalClientAfterRender };
@@ -14,7 +13,6 @@ import type { PageContextClient } from '../../types/PageContext.js';
 import { type PageContextPublicClient } from './getPageContextPublicClient.js';
 import type { VikeGlobalInternal } from '../../types/VikeGlobalInternal.js';
 type PageContextInternalClientAfterRender = NonNullable<Awaited<ReturnType<typeof renderPageClient>>>;
-declare const firstRenderStartPromise: Promise<void>;
 type PreviousPageContext = {
     pageId: string;
 } & PageContextConfig & PageContextRouted & PageContextCreatedClient & PageContextPublicClient;
@@ -105,7 +103,7 @@ declare function renderPageClient(renderArgs: RenderArgs): 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 & PageContextConfig & {
@@ -200,7 +198,7 @@ declare function renderPageClient(renderArgs: RenderArgs): 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 & PageContextConfig & {
@@ -296,7 +294,7 @@ declare function renderPageClient(renderArgs: RenderArgs): 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 & PageContextConfig & {
@@ -395,7 +393,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         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/renderPageClient.js

@@ -2,7 +2,6 @@ import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
-export { firstRenderStartPromise };
 export { getPageContextClient };
 import { assert, assertInfo, assertWarning } from '../../utils/assert.js';
 import { catchInfiniteLoop } from '../../utils/catchInfiniteLoop.js';
@@ -19,11 +18,11 @@ import { createPageContextClient } from './createPageContextClient.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
 import { execHookOnRenderClient } from '../shared/execHookOnRenderClient.js';
 import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide, } from '../shared/loadPageConfigsLazyClientSide.js';
-import { pushHistoryState } from './history.js';
+import { pushHistoryState, saveScrollPosition } from './history.js';
 import { addNewPageContextAborted, getPageContextAddendumAbort, isAbortError, logAbort, } from '../../shared-server-client/route/abort.js';
 import { route } from '../../shared-server-client/route/index.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
-import { setScrollPosition } from './setScrollPosition.js';
+import { isScrollPosition, setScrollPosition } from './setScrollPosition.js';
 import { scrollRestoration_initialRenderIsDone } from './scrollRestoration.js';
 import { getErrorPageId, isErrorPage } from '../../shared-server-client/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
@@ -34,15 +33,14 @@ import { getPageContextPublicClient } from './getPageContextPublicClient.js';
 import { getHooksFromPageContextNew } from '../../shared-server-client/hooks/getHook.js';
 import { getPageContextPublicClientMinimal } from '../shared/getPageContextPublicClientShared.js';
 import { logErrorClient } from './logErrorClient.js';
-const globalObject = getGlobalObject('runtime-client-routing/renderPageClient.ts', (() => {
-    const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
+const globalObject = getGlobalObject('renderPageClient.ts', (() => {
+    const { promise: hydrationAwaitPromise, resolve: hydrationAwaitPromiseResolve } = genPromise();
     return {
         renderCounter: 0,
-        firstRenderStartPromise,
-        firstRenderStartPromiseResolve,
+        hydrationAwaitPromise,
+        hydrationAwaitPromiseResolve,
     };
 })());
-const { firstRenderStartPromise } = globalObject;
 async function renderPageClient(renderArgs) {
     catchInfiniteLoop('renderPageClient()');
     const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation = false, isHistoryNavigation = false, doNotRenderIfSamePage, isClientSideNavigation = true, pageContextInitClient, pageContextsAborted = [], } = renderArgs;
@@ -63,7 +61,15 @@ async function renderPageClient(renderArgs) {
         redirectHard(urlOriginal);
         return;
     }
-    globalObject.firstRenderStartPromiseResolve();
+    // Await hydration (unless +hydrationCanBeAborted)
+    if (!isFirstRender) {
+        await globalObject.hydrationAwaitPromise;
+        if (isRenderOutdated())
+            return;
+    }
+    // Ensure no concurrent onRenderClient() calls.
+    // - We could `await globalObject.onRenderClientPreviousPromise` later just before execHookOnRenderClient() but we prefer doing it early to ensure `getPageContext() === usePageContext()` (and maybe it prevents other potential inconsistencies?).
+    await globalObject.onRenderClientPreviousPromise;
     if (isRenderOutdated())
         return;
     return await renderPageNominal();
@@ -175,7 +181,9 @@ async function renderPageClient(renderArgs) {
             setHydrationCanBeAborted();
         }
         else {
-            assertWarning(!isReact(), 'You seem to be using React; we recommend setting hydrationCanBeAborted to true, see https://vike.dev/hydrationCanBeAborted', { onlyOnce: true });
+            if (globalThis.__VIKE__IS_DEV) {
+                assertWarning(!isReact(), 'You seem to be using React; we recommend setting hydrationCanBeAborted to true, see https://vike.dev/hydrationCanBeAborted', { onlyOnce: true });
+            }
         }
         // There wasn't any `await` but the isRenderOutdated() return value may have changed because we called setHydrationCanBeAborted()
         if (isRenderOutdated())
@@ -396,16 +404,9 @@ async function renderPageClient(renderArgs) {
                 logErrorClient(err);
             }
         };
-        // We use globalObject.onRenderClientPreviousPromise in order to ensure that there is never two concurrent onRenderClient() calls
-        if (globalObject.onRenderClientPreviousPromise) {
-            // Make sure that the previous render has finished
-            await globalObject.onRenderClientPreviousPromise;
-            assert(globalObject.onRenderClientPreviousPromise === undefined);
-            if (isRenderOutdated())
-                return;
-        }
         changeUrl(urlOriginal, overwriteLastHistoryEntry);
         globalObject.previousPageContext = pageContext;
+        // There should never be concurrent onRenderClient() calls
         assert(globalObject.onRenderClientPreviousPromise === undefined);
         const onRenderClientPromise = (async () => {
             let onRenderClientError;
@@ -422,7 +423,6 @@ async function renderPageClient(renderArgs) {
         })();
         globalObject.onRenderClientPreviousPromise = onRenderClientPromise;
         const onRenderClientError = await onRenderClientPromise;
-        assert(globalObject.onRenderClientPreviousPromise === undefined);
         if (onRenderClientError) {
             await onError(onRenderClientError);
             if (!isErrorPage)
@@ -474,6 +474,10 @@ async function renderPageClient(renderArgs) {
         }
         // Page scrolling
         setScrollPosition(scrollTarget, urlOriginal);
+        if (isScrollPosition(scrollTarget)) {
+            // Restore window.history.state.vike.scrollPosition (in case scrolling occurred during rendering)
+            saveScrollPosition(scrollTarget);
+        }
         scrollRestoration_initialRenderIsDone();
         if (pageContext._hasPageContextFromServer)
             setPageContextInitIsPassedToClient(pageContext);
@@ -482,6 +486,7 @@ async function renderPageClient(renderArgs) {
         addLinkPrefetchHandlers();
         globalObject.renderedPageContext = pageContext;
         stampFinished(urlOriginal);
+        globalObject.hydrationAwaitPromiseResolve();
         return pageContext;
     }
 }
@@ -549,6 +554,7 @@ function getIsRenderOutdated() {
     let hydrationCanBeAborted = false;
     const setHydrationCanBeAborted = () => {
         hydrationCanBeAborted = true;
+        globalObject.hydrationAwaitPromiseResolve();
     };
     /** Whether the rendering should be aborted because a new rendering has started. We should call this after each `await`. */
     const isRenderOutdated = (isRenderCleanup) => {

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

@@ -8,7 +8,7 @@ export { scrollRestoration_initialRenderIsDone };
 // See also: https://github.com/cyco130/knave/blob/e9e1bc7687848504293197f1b314b7d12ad0d228/design.md#scroll-restoration
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { onPageHide, onPageShow } from '../../utils/onPageVisibilityChange.js';
-const globalObject = getGlobalObject('runtime-client-routing/scrollRestoration.ts', {});
+const globalObject = getGlobalObject('scrollRestoration.ts', {});
 function scrollRestoration_init() {
     // Use the native scroll restoration mechanism only for the first render
     scrollRestoration_enable();

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

@@ -2,11 +2,14 @@ import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };
+export { isScrollPosition };
 export type { ScrollTarget };
 import { type ScrollPosition } from './history.js';
 type ScrollTarget = undefined | {
     preserveScroll: boolean;
+    y?: undefined;
 } | ScrollPosition;
 declare function setScrollPosition(scrollTarget: ScrollTarget, url?: string): void;
 declare function scrollToHashOrTop(hash: null | string): void;
+declare function isScrollPosition(scrollTarget: ScrollTarget | undefined): scrollTarget is ScrollPosition;
 declare function autoSaveScrollPosition(): void;

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

@@ -2,6 +2,7 @@ import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };
+export { isScrollPosition };
 import { assert } from '../../utils/assert.js';
 import { onPageHide } from '../../utils/onPageVisibilityChange.js';
 import { sleep } from '../../utils/sleep.js';
@@ -12,7 +13,7 @@ function setScrollPosition(scrollTarget, url) {
         scrollToTextFragment(url);
         return;
     }
-    if (scrollTarget && 'x' in scrollTarget) {
+    if (isScrollPosition(scrollTarget)) {
         setScroll(scrollTarget);
         return;
     }
@@ -58,6 +59,9 @@ function scrollToHashOrTop(hash) {
 function scrollToTop() {
     setScroll({ x: 0, y: 0 });
 }
+function isScrollPosition(scrollTarget) {
+    return scrollTarget?.y !== undefined;
+}
 /**
  * Change the browser's scroll position, in a way that works during a repaint.
  *
@@ -118,6 +122,6 @@ function getUrlHash() {
 // Save scroll position (needed for back-/forward navigation)
 function autoSaveScrollPosition() {
     // Safari cannot handle more than 100 `history.replaceState()` calls within 30 seconds (https://github.com/vikejs/vike/issues/46)
-    window.addEventListener('scroll', throttle(saveScrollPosition, Math.ceil(1000 / 3)), { passive: true });
+    window.addEventListener('scroll', throttle(saveScrollPosition, 300), { passive: true });
     onPageHide(saveScrollPosition);
 }

package/dist/node/prerender/runPrerender.d.ts

@@ -127,7 +127,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         viteConfig: ResolvedConfig | undefined;
         isClientSide: false;
         _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;
     } | {
         _isPrerendering: true;
         viteConfig: ResolvedConfig;
@@ -137,7 +137,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _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;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -147,7 +147,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _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;
     }) & {
         baseServer: string;
         baseAssets: string;
@@ -167,7 +167,9 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: import("../../types/PageContext.js").PageContextInit;
+    _pageContextInit: import("../../types/PageContext.js").PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

package/dist/node/vite/plugins/pluginReplaceConstantsEnvVars.js

@@ -5,35 +5,37 @@ import { escapeRegex } from '../../../utils/escapeRegex.js';
 import { isNotNullish } from '../../../utils/isNullish.js';
 import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
 import { isArray } from '../../../utils/isArray.js';
-import { lowerFirst } from '../../../utils/sorter.js';
+import { makeLast } from '../../../utils/sorter.js';
 import { assertPosixPath } from '../../../utils/path.js';
 import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
+import pc from '@brillout/picocolors';
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
 const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK',
+    // https://github.com/vikejs/vike/pull/3069
+    'DEBUG',
 ];
 // TO-DO/eventually:
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 // === Rolldown filter
-const skipNodeModules = '/node_modules/';
-const skipIrrelevant = 'import.meta.env.';
+const skipIrrelevant = 'import.meta.env';
 const filterRolldown = {
+    /* We don't do that, because vike-react-sentry uses import.meta.env.PUBLIC_ENV__SENTRY_DSN
     id: {
-        exclude: `**${skipNodeModules}**`,
+      exclude: `**${'/node_modules/'}**`,
     },
+    */
     code: {
         include: skipIrrelevant,
     },
 };
-const filterFunction = (id, code) => {
-    if (id.includes(skipNodeModules))
-        return false;
+const filterFunction = (code) => {
     if (!code.includes(skipIrrelevant))
         return false;
     return true;
@@ -46,6 +48,11 @@ function pluginReplaceConstantsEnvVars() {
     return [
         {
             name: 'vike:pluginReplaceConstantsEnvVars',
+            // Correct order:
+            // 1. @vitejs/plugin-vue
+            // 2. vike:pluginExtractAssets and vike:pluginExtractExportNames [needs to be applied after @vitejs/plugin-vue]
+            // 3. vike:pluginReplaceConstantsEnvVars [needs to be applied after vike:pluginExtractAssets and vike:pluginExtractExportNames]
+            // 4. vite:define (Vite built-in plugin) [needs to be applied after vike:pluginReplaceConstantsEnvVars]
             enforce: 'post',
             configResolved: {
                 handler(config_) {
@@ -54,7 +61,7 @@ function pluginReplaceConstantsEnvVars() {
                     // Add process.env values defined by .env files
                     Object.entries(envVarsAll).forEach(([key, val]) => { var _a; return ((_a = process.env)[key] ?? (_a[key] = val)); });
                     envPrefix = getEnvPrefix(config);
-                    config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+                    config.plugins.sort(makeLast((plugin) => plugin.name === 'vite:define'));
                 },
             },
             transform: {
@@ -62,10 +69,7 @@ function pluginReplaceConstantsEnvVars() {
                 handler(code, id, options) {
                     id = normalizeId(id);
                     assertPosixPath(id);
-                    assertPosixPath(config.root);
-                    if (!id.startsWith(config.root))
-                        return; // skip linked dependencies
-                    assert(filterFunction(id, code));
+                    assert(filterFunction(code));
                     const isBuild = config.command === 'build';
                     const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
                     const { magicString, getMagicStringResult } = getMagicString(code, id);
@@ -99,6 +103,17 @@ function pluginReplaceConstantsEnvVars() {
                     replacements.forEach(({ regExpStr, replacement }) => {
                         magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
                     });
+                    // Replace bare `import.meta.env` expression with `null` in the user-land.
+                    // - Otherwise Vite replaces it with an object missing PUBLIC_ENV__ variables which is confusing for users.
+                    // - We purposely don't support replacing `import.meta.env` with an object to incentivize users to write tree-shaking friendly code.
+                    // - `define: { 'import.meta.env': JSON.stringify(null) }` doesn't work because it also replaces `import.meta.env` inside `import.meta.env.SONE_ENV`
+                    const bareImportMetaEnvRegex = /\bimport\.meta\.env(?!\.)/g;
+                    const isUserLand = !id.includes('node_modules') && id.startsWith(config.root); // skip node_modules/ as well as linked dependencies
+                    if (isUserLand && bareImportMetaEnvRegex.test(code)) {
+                        assertWarning(false, `The bare ${pc.cyan('import.meta.env')} expression in ${getFilePathToShowToUserModule(id, config)} is replaced with ${pc.cyan('null')} — use ${pc.cyan('import.meta.env.SONE_ENV')} instead ${pc.underline('https://vike.dev/env')}`, { onlyOnce: true });
+                        bareImportMetaEnvRegex.lastIndex = 0; // Reset state after .test() since the /g flag makes the RegExp stateful
+                        magicString.replaceAll(bareImportMetaEnvRegex, JSON.stringify(null));
+                    }
                     return getMagicStringResult();
                 },
             },

package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.d.ts

@@ -9,6 +9,8 @@ declare global {
     /** Like `import.meta.env.SSR` but works for `node_modules/` packages with `ssr.external` */
     var __VIKE__IS_CLIENT: boolean;
     var __VIKE__IS_DEBUG: boolean;
+    /** Whether the code is processed by Vite, e.g. `true` when server code is `ssr.noExternal` */
+    var __VIKE__NO_EXTERNAL: true | undefined;
 }
 declare const VIRTUAL_FILE_ID_constantsGlobalThis = "virtual:vike:server:constantsGlobalThis";
 declare function pluginReplaceConstantsGlobalThis(): Plugin[];

package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js

@@ -33,6 +33,7 @@ function pluginReplaceConstantsGlobalThis() {
                         define: {
                             'globalThis.__VIKE__IS_DEV': JSON.stringify(isDev),
                             'globalThis.__VIKE__IS_DEBUG': JSON.stringify(isDebugVal),
+                            'globalThis.__VIKE__NO_EXTERNAL': 'true',
                         },
                     };
                 },