vike 0.4.252 → 0.4.253-commit-ca512c3

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { prefetch };
 export { getPageContextPrefetched };
 export { initLinkPrefetchHandlers };
@@ -23,8 +22,9 @@ import { getPageContextCurrent } from './getPageContextCurrent.js';
 import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings, } from './prefetch/getPrefetchSettings.js';
 import pc from '@brillout/picocolors';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
+import '../assertEnvClient.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

@@ -1,8 +1,6 @@
-import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
-export { firstRenderStartPromise };
 export { getPageContextClient };
 export type { PageContextBegin };
 export type { PageContextInternalClientAfterRender };
@@ -13,8 +11,8 @@ import type { PageContextConfig } from '../../shared-server-client/getPageFiles.
 import type { PageContextClient } from '../../types/PageContext.js';
 import { type PageContextPublicClient } from './getPageContextPublicClient.js';
 import type { VikeGlobalInternal } from '../../types/VikeGlobalInternal.js';
+import '../assertEnvClient.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

@@ -1,8 +1,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 +17,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 +32,15 @@ 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();
+import '../assertEnvClient.js';
+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.d.ts

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

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

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { scrollRestoration_init };
 export { scrollRestoration_initialRenderIsDone };
 // Using `window.history.scrollRestoration` to recover scroll position when user reloads the page or Cmd-Shift-T back to it.
@@ -8,7 +7,8 @@ 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', {});
+import '../assertEnvClient.js';
+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

@@ -1,12 +1,15 @@
-import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };
+export { isScrollPosition };
 export type { ScrollTarget };
 import { type ScrollPosition } from './history.js';
+import '../assertEnvClient.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

@@ -1,18 +1,19 @@
-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';
 import { throttle } from '../../utils/throttle.js';
 import { replaceHistoryStateOriginal, saveScrollPosition } from './history.js';
+import '../assertEnvClient.js';
 function setScrollPosition(scrollTarget, url) {
     if (!scrollTarget && url && hasTextFragment(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/client/runtime-server-routing/createPageContextClient.d.ts

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { createPageContextClient };
 export type PageContextCreatedClient_ServerRouting = Awaited<ReturnType<typeof createPageContextClient>>;
+import '../assertEnvClient.js';
 declare function createPageContextClient(): Promise<{
     _isOriginalObject: true;
     isPageContext: true;

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

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { createPageContextClient };
 import { objectAssign } from '../../utils/objectAssign.js';
 import { updateType } from '../../utils/updateType.js';
 import { createPageContextObject, createPageContextShared } from '../../shared-server-client/createPageContextShared.js';
 import { getGlobalContextClientInternal } from './getGlobalContextClientInternal.js';
+import '../assertEnvClient.js';
 async function createPageContextClient() {
     const pageContext = createPageContextBase();
     const globalContext = await getGlobalContextClientInternal();

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

@@ -1,5 +1,5 @@
-import '../assertEnvClient.js';
 import { assertServerRouting } from '../../utils/assertRoutingType.js';
+import '../assertEnvClient.js';
 assertServerRouting();
 import { createPageContextClient } from './createPageContextClient.js';
 import { execHookOnRenderClient } from '../shared/execHookOnRenderClient.js';

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 export type { GlobalContextClientInternalWithServerRouting };
+import '../assertEnvClient.js';
 type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
 declare function getGlobalContextClientInternal(): Promise<{
     _globalConfigPublic: {

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

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
+import '../assertEnvClient.js';
 async function getGlobalContextClientInternal() {
     const globalContext = await getGlobalContextClientInternalShared();
     return globalContext;

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

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 export type { PageContextPublicClient };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 import type { PageContextInternalClient_ServerRouting } from '../../types/PageContext.js';
 import type { PageContextPublicMinimum } from '../../shared-server-client/getPageContextPublicShared.js';
+import '../assertEnvClient.js';
 type PageContextPublicClient = PageContextPublicMinimum & PageContextInternalClient_ServerRouting & PageContextConfig;
 declare function getPageContextPublicClient<PageContext extends PageContextPublicClient>(pageContext: PageContext): PageContext & {
     Page: unknown;

package/dist/client/runtime-server-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-server-routing/index.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvClient.js';
 import type { PageContextBuiltInClientWithServerRouting } from '../../types/PageContext.js';
+import '../assertEnvClient.js';
 /** @deprecated
  * Replace:
  *   ```

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

@@ -1 +1,2 @@
+// TO-DO/next-major-release: remove this file
 import '../assertEnvClient.js';

package/dist/client/shared/execHookOnRenderClient.d.ts

@@ -1,10 +1,10 @@
-import '../assertEnvClient.js';
 export { execHookOnRenderClient };
 export type { PageContextBeforeRenderClient };
 import type { PageFile, PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 import type { GlobalContextClientInternalShared } from './getGlobalContextClientInternalShared.js';
 import type { PageContextCreatedClient } from '../runtime-client-routing/createPageContextClient.js';
 import type { PageContextCreatedClient_ServerRouting } from '../runtime-server-routing/createPageContextClient.js';
+import '../assertEnvClient.js';
 type PageContextCreatedClientShared = PageContextCreatedClient | PageContextCreatedClient_ServerRouting;
 type PageContextBeforeRenderClient = {
     _pageFilesLoaded: PageFile[];

package/dist/client/shared/execHookOnRenderClient.js

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { execHookOnRenderClient };
 import { assert, assertUsage } from '../../utils/assert.js';
 import { getHookFromPageContext } from '../../shared-server-client/hooks/getHook.js';
 import { execHookSingle } from '../../shared-server-client/hooks/execHook.js';
+import '../assertEnvClient.js';
 async function execHookOnRenderClient(pageContext, getPageContextPublic) {
     let hook = null;
     {

package/dist/client/shared/getCurrentUrl.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvClient.js';
 export { getCurrentUrl };
+import '../assertEnvClient.js';
 declare function getCurrentUrl(options?: {
     withoutHash: true;
 }): `/${string}`;

package/dist/client/shared/getCurrentUrl.js

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getCurrentUrl };
 import { normalizeClientSideUrl } from './normalizeClientSideUrl.js';
+import '../assertEnvClient.js';
 function getCurrentUrl(options) {
     return normalizeClientSideUrl(window.location.href, options);
 }

package/dist/client/shared/getGlobalContextClientInternalShared.d.ts

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { setVirtualFileExportsGlobalEntry };
@@ -6,6 +5,7 @@ export { getGlobalContextClientInternalShared };
 export type GlobalContextClientInternalShared = GlobalContextClientInternal | GlobalContextClientInternalWithServerRouting;
 import type { GlobalContextClientInternal } from '../runtime-client-routing/getGlobalContextClientInternal.js';
 import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/getGlobalContextClientInternal.js';
+import '../assertEnvClient.js';
 declare function getGlobalContextClientInternalShared(): Promise<{
     _globalConfigPublic: {
         pages: {

package/dist/client/shared/getGlobalContextClientInternalShared.js

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 // Public usage
 export { getGlobalContext };
 export { getGlobalContextSync };
@@ -12,6 +11,7 @@ import { checkType } from '../../utils/checkType.js';
 import { genPromise } from '../../utils/genPromise.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { objectAssign } from '../../utils/objectAssign.js';
+import '../assertEnvClient.js';
 const globalObject = getGlobalObject('getGlobalContextClientInternalShared.ts', (() => {
     const { promise: globalContextInitialPromise, resolve: globalContextInitialPromiseResolve } = genPromise();
     return {

package/dist/client/shared/getJsonSerializedInHtml.d.ts

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getPageContextSerializedInHtml };
 export { getGlobalContextSerializedInHtml };
+import '../assertEnvClient.js';
 declare function getPageContextSerializedInHtml(): {
     pageId: string;
     routeParams: Record<string, string>;

package/dist/client/shared/getJsonSerializedInHtml.js

@@ -1,10 +1,10 @@
-import '../assertEnvClient.js';
 export { getPageContextSerializedInHtml };
 export { getGlobalContextSerializedInHtml };
 import { parse } from '@brillout/json-serializer/parse';
 import { assert, assertUsage } from '../../utils/assert.js';
 import { hasProp } from '../../utils/hasProp.js';
 import { htmlElementId_globalContext, htmlElementId_pageContext } from '../../shared-server-client/htmlElementIds.js';
+import '../assertEnvClient.js';
 // elements should exist because:
 // 1. <script id="vike_pageContext" type="application/json"> appears before the <script> that loads Vike's client runtime (which includes this file)
 // 2. <script id="vike_pageContext" type="application/json"> is neither async nor defer

package/dist/client/shared/getPageContextPublicClientShared.d.ts

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClientShared };
 export { getPageContextPublicClientMinimal };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 import { type PageContextPublicMinimum } from '../../shared-server-client/getPageContextPublicShared.js';
 import type { PageContextInternalClient } from '../../types/PageContext.js';
+import '../assertEnvClient.js';
 type PageContextPublicClientShared = PageContextPublicMinimum & PageContextInternalClient & PageContextConfig;
 declare function getPageContextPublicClientShared<PageContext extends PageContextPublicClientShared>(pageContext: PageContext): PageContext & {
     Page: unknown;

package/dist/client/shared/getPageContextPublicClientShared.js

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClientShared };
 export { getPageContextPublicClientMinimal };
 import { objectAssign } from '../../utils/objectAssign.js';
 import { assertPropertyGetters, getPageContextPublicShared, } from '../../shared-server-client/getPageContextPublicShared.js';
+import '../assertEnvClient.js';
 function getPageContextPublicClientShared(pageContext) {
     // TO-DO/soon/proxy: use proxy
     const Page = pageContext.config?.Page ||

package/dist/client/shared/loadPageConfigsLazyClientSide.d.ts

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export type { PageContext_loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { type PageFile } from '../../shared-server-client/getPageFiles.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../types/PageConfig.js';
+import '../assertEnvClient.js';
 type PageContext_loadPageConfigsLazyClientSide = {
     pageId: string;
     _pageFilesAll: PageFile[];

package/dist/client/shared/loadPageConfigsLazyClientSide.js

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared-server-client/getPageFiles.js';
@@ -6,6 +5,7 @@ import { resolvePageContextConfig } from '../../shared-server-client/page-config
 import { findPageConfig } from '../../shared-server-client/page-configs/findPageConfig.js';
 import { loadAndParseVirtualFilePageEntry } from '../../shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { objectAssign } from '../../utils/objectAssign.js';
+import '../assertEnvClient.js';
 const errStamp = '_isAssetsError';
 async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);

package/dist/client/shared/normalizeClientSideUrl.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvClient.js';
 export { normalizeClientSideUrl };
+import '../assertEnvClient.js';
 /** Resolves relative URLs */
 declare function normalizeClientSideUrl(url: string, options?: {
     withoutHash: true;

package/dist/client/shared/normalizeClientSideUrl.js

@@ -1,7 +1,7 @@
-import '../assertEnvClient.js';
 export { normalizeClientSideUrl };
 import { assert } from '../../utils/assert.js';
 import { parseUrl } from '../../utils/parseUrl.js';
+import '../assertEnvClient.js';
 /** Resolves relative URLs */
 function normalizeClientSideUrl(url, options) {
     // This function doesn't work for `url === '#some-hash'` because `searchOriginal` will be missing: if window.location.href has a search string then it's going to be missing in the returned `urlCurrent` value because `parseUrl(url)` returns `searchOriginal: null` since there isn't any search string in `url`.

package/dist/client/shared/removeFoucBuster.d.ts

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

package/dist/client/shared/removeFoucBuster.js

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { removeFoucBuster };
 import { assert } from '../../utils/assert.js';
+import '../assertEnvClient.js';
 // See also:
 // - Alternative approach of exactly injecting what Vite injects:
 //   - https://github.com/remix-run/remix/issues/8830#issuecomment-1968368351

package/dist/node/api/{assertEnvApi.js → assertEnvApiDev.js}

@@ -1,8 +1,8 @@
 import '../../utils/trackLogs.js'; // should be loaded ASAP
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
-assertEnv();
-function assertEnv() {
+assertEnvApiDev();
+function assertEnvApiDev() {
     assertIsNotBrowser();
     assertIsNotProductionRuntime();
 }

package/dist/node/api/assertEnvApiDevAndProd.d.ts

@@ -0,0 +1 @@
+import '../../utils/trackLogs.js';

package/dist/node/api/assertEnvApiDevAndProd.js

@@ -0,0 +1,9 @@
+import '../../utils/trackLogs.js'; // should be loaded ASAP
+import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
+assertEnvApiDevAndProd();
+function assertEnvApiDevAndProd() {
+    assertIsNotBrowser();
+    /* It's expected that users programmtically trigger the pre-rendering process in production (it's a common technique), we therefore tolerate `import { prerender } from 'vike/api'` in production. This means that, in this case, we tolerate the `vite` package to be loaded in production (we usually prevent users to do that).
+    assertIsNotProductionRuntime()
+    */
+}

package/dist/node/api/build.d.ts

@@ -1,6 +1,6 @@
-import './assertEnvApi.js';
 export { build };
 import type { ApiOptions } from './types.js';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike build`
  *

package/dist/node/api/build.js

@@ -1,7 +1,7 @@
-import './assertEnvApi.js';
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createBuilder } from 'vite';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike build`
  *

package/dist/node/api/dev.d.ts

@@ -1,8 +1,8 @@
-import './assertEnvApi.js';
 export { dev };
 export { startupLog };
 import { type ResolvedConfig, type ViteDevServer } from 'vite';
 import type { ApiOptions } from './types.js';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike dev`
  *

package/dist/node/api/dev.js

@@ -1,6 +1,5 @@
-import './assertEnvApi.js';
 export { dev };
-// TO-DO/eventually: remove if it doesn't end up being used
+// Enable vike-photon to call startupLog() — TO-DO/eventually: remove if it doesn't end up being used https://github.com/vikejs/vike-photon/issues/57
 export { startupLog };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createServer } from 'vite';
@@ -11,6 +10,7 @@ import { colorVite } from '../../utils/colorsServer.js';
 import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
 import pc from '@brillout/picocolors';
 import { processStartupLog } from '../vite/shared/loggerVite.js';
+import './assertEnvApiDev.js';
 assertIsNotProductionRuntime();
 /**
  * Programmatically trigger `$ vike dev`
@@ -31,7 +31,7 @@ async function dev(options = {}) {
             startupLog(viteServer.resolvedUrls, viteServer);
         }
         else {
-            // TO-DO/eventually: remove if it doesn't end up being used
+            // Enable vike-photon to call startupLog() — TO-DO/eventually: remove if it doesn't end up being used https://github.com/vikejs/vike-photon/issues/57
             ;
             viteConfig.server.startupLog = (resolvedUrls) => startupLog(resolvedUrls, viteServer);
         }

package/dist/node/api/index.d.ts

@@ -1,4 +1,3 @@
-import './assertEnvApi.js';
 export { build_ as build };
 export { dev_ as dev };
 export { preview_ as preview };
@@ -7,6 +6,7 @@ import type { build } from './build.js';
 import type { dev } from './dev.js';
 import type { preview } from './preview.js';
 import type { prerender } from './prerender.js';
+import './assertEnvApiDevAndProd.js';
 declare const build_: typeof build;
 declare const dev_: typeof dev;
 declare const preview_: typeof preview;