vike 0.4.250-commit-2686732 → 0.4.250-commit-7552006

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

@@ -1,13 +1,22 @@
+import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
 export { firstRenderStartPromise };
 export { getPageContextClient };
-import { assert, objectAssign, redirectHard, getGlobalObject, hasProp, updateType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
+import { assert, assertInfo, assertWarning } from '../../utils/assert.js';
+import { catchInfiniteLoop } from '../../utils/catchInfiniteLoop.js';
+import { genPromise } from '../../utils/genPromise.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isCallable } from '../../utils/isCallable.js';
+import { isReact } from '../../utils/isReact.js';
+import { objectAssign } from '../../utils/objectAssign.js';
+import { redirectHard } from '../../utils/redirectHard.js';
+import { updateType } from '../../utils/updateType.js';
 import { getPageContextFromHooksClient, getPageContextFromHooksServer, getPageContextFromHooksClient_firstRender, getPageContextFromHooksServer_firstRender, setPageContextInitIsPassedToClient, } from './getPageContextFromHooks.js';
-import { createPageContextClientSide } from './createPageContextClientSide.js';
+import { createPageContextClient } from './createPageContextClient.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
-import { assertInfo, assertWarning, isReact } from './utils.js';
 import { execHookOnRenderClient } from '../shared/execHookOnRenderClient.js';
 import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide, } from '../shared/loadPageConfigsLazyClientSide.js';
 import { pushHistoryState } from './history.js';
@@ -20,10 +29,10 @@ import { getErrorPageId, isErrorPage } from '../../shared-server-client/error-pa
 import { setPageContextCurrent } from './getPageContextCurrent.js';
 import { getRouteStringParameterList } from '../../shared-server-client/route/resolveRouteString.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-import { execHookDirect, execHook } from '../../shared-server-client/hooks/execHook.js';
-import { preparePageContextForPublicUsageClient, } from './preparePageContextForPublicUsageClient.js';
-import { getHookFromPageContextNew } from '../../shared-server-client/hooks/getHook.js';
-import { preparePageContextForPublicUsageClientMinimal } from '../shared/preparePageContextForPublicUsageClientShared.js';
+import { execHookList, execHook } from '../../shared-server-client/hooks/execHook.js';
+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();
@@ -72,9 +81,9 @@ async function renderPageClient(renderArgs) {
             // https://github.com/vikejs/vike/issues/1560
             if (!globalObject.isTransitioning) {
                 globalObject.isTransitioning = true;
-                const hooks = getHookFromPageContextNew('onPageTransitionStart', previousPageContext);
+                const hooks = getHooksFromPageContextNew('onPageTransitionStart', previousPageContext);
                 try {
-                    await execHookDirect(hooks, pageContext, preparePageContextForPublicUsageClientMinimal);
+                    await execHookList(hooks, pageContext, getPageContextPublicClientMinimal);
                 }
                 catch (err) {
                     await onError(err);
@@ -401,7 +410,7 @@ async function renderPageClient(renderArgs) {
         const onRenderClientPromise = (async () => {
             let onRenderClientError;
             try {
-                await execHookOnRenderClient(pageContext, preparePageContextForPublicUsageClient);
+                await execHookOnRenderClient(pageContext, getPageContextPublicClient);
             }
             catch (err) {
                 assert(err);
@@ -425,7 +434,7 @@ async function renderPageClient(renderArgs) {
         // onHydrationEnd()
         if (isFirstRender && !onRenderClientError) {
             try {
-                await execHook('onHydrationEnd', pageContext, preparePageContextForPublicUsageClient);
+                await execHook('onHydrationEnd', pageContext, getPageContextPublicClient);
             }
             catch (err) {
                 await onError(err);
@@ -442,9 +451,9 @@ async function renderPageClient(renderArgs) {
         if (globalObject.isTransitioning) {
             globalObject.isTransitioning = undefined;
             assert(previousPageContext);
-            const hooks = getHookFromPageContextNew('onPageTransitionEnd', previousPageContext);
+            const hooks = getHooksFromPageContextNew('onPageTransitionEnd', previousPageContext);
             try {
-                await execHookDirect(hooks, pageContext, preparePageContextForPublicUsageClient);
+                await execHookList(hooks, pageContext, getPageContextPublicClient);
             }
             catch (err) {
                 await onError(err);
@@ -478,7 +487,7 @@ async function renderPageClient(renderArgs) {
 }
 async function getPageContextBegin(isForErrorPage, { urlOriginal, isBackwardNavigation, isHistoryNavigation, pageContextsAborted, isClientSideNavigation, pageContextInitClient, isFirstRender, }) {
     const previousPageContext = globalObject.previousPageContext ?? null;
-    const pageContext = await createPageContextClientSide(urlOriginal);
+    const pageContext = await createPageContextClient(urlOriginal);
     objectAssign(pageContext, {
         isBackwardNavigation,
         isHistoryNavigation,
@@ -606,7 +615,7 @@ function getPageContextClient() {
     const pageContext = globalObject.currentPageContext;
     if (!pageContext)
         return null;
-    return preparePageContextForPublicUsageClient(pageContext);
+    return getPageContextPublicClient(pageContext);
 }
 async function loadPageConfigsLazyClientSideAndExecHook(pageContext, isFirstRender, isRenderOutdated) {
     let hasErr = false;
@@ -631,7 +640,7 @@ async function loadPageConfigsLazyClientSideAndExecHook(pageContext, isFirstRend
         return { err };
     objectAssign(pageContext, pageContextAddendum);
     try {
-        await execHook('onCreatePageContext', pageContext, preparePageContextForPublicUsageClient);
+        await execHook('onCreatePageContext', pageContext, getPageContextPublicClient);
     }
     catch (err_) {
         err = err;

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

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

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

@@ -1,3 +1,4 @@
+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.
@@ -5,7 +6,8 @@ export { scrollRestoration_initialRenderIsDone };
 // - Alternatively we could inject an inline script `<script>scrollTo(history.state.scrollPosition)</script>` early, which seems to be equally fast. (See for example https://vike.dev/usePageContext which sets the main scroll position and the navigation scroll position equally fast.)
 // - Firefox doesn't restore the scroll position upon page reload but does upon Cmd-Shift-T
 // See also: https://github.com/cyco130/knave/blob/e9e1bc7687848504293197f1b314b7d12ad0d228/design.md#scroll-restoration
-import { getGlobalObject, onPageHide, onPageShow } from './utils.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { onPageHide, onPageShow } from '../../utils/onPageVisibilityChange.js';
 const globalObject = getGlobalObject('runtime-client-routing/scrollRestoration.ts', {});
 function scrollRestoration_init() {
     // Use the native scroll restoration mechanism only for the first render

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

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };

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

@@ -1,7 +1,11 @@
+import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };
-import { assert, onPageHide, sleep, throttle } from './utils.js';
+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';
 function setScrollPosition(scrollTarget, url) {
     if (!scrollTarget && url && hasTextFragment(url)) {

package/dist/client/runtime-server-routing/{createPageContextClientSide.d.ts → createPageContextClient.d.ts}

@@ -1,7 +1,7 @@
-export { createPageContextClientSide };
-export type PageContextCreatedClient_ServerRouting = Awaited<ReturnType<typeof createPageContextClientSide>>;
-export type PageContextCreatedClientBase_ServerRouting = Awaited<ReturnType<typeof createPageContextBase>>;
-declare function createPageContextClientSide(): Promise<{
+import '../assertEnvClient.js';
+export { createPageContextClient };
+export type PageContextCreatedClient_ServerRouting = Awaited<ReturnType<typeof createPageContextClient>>;
+declare function createPageContextClient(): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -63,14 +63,3 @@ declare function createPageContextClientSide(): Promise<{
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
-declare function createPageContextBase(): {
-    _isOriginalObject: true;
-    isPageContext: true;
-} & {
-    isClientSide: true;
-    isPrerendering: false;
-    isHydration: true;
-    isBackwardNavigation: null;
-    isHistoryNavigation: null;
-    _hasPageContextFromServer: true;
-};

package/dist/client/runtime-server-routing/{createPageContextClientSide.js → createPageContextClient.js}

@@ -1,8 +1,10 @@
-export { createPageContextClientSide };
-import { updateType, objectAssign } from './utils.js';
+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';
-async function createPageContextClientSide() {
+async function createPageContextClient() {
     const pageContext = createPageContextBase();
     const globalContext = await getGlobalContextClientInternal();
     objectAssign(pageContext, {

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

@@ -1 +1 @@
-export {};
+import '../assertEnvClient.js';

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

@@ -1,11 +1,14 @@
+import '../assertEnvClient.js';
 import { assertServerRouting } from '../../utils/assertRoutingType.js';
 assertServerRouting();
-import { createPageContextClientSide } from './createPageContextClientSide.js';
+import { createPageContextClient } from './createPageContextClient.js';
 import { execHookOnRenderClient } from '../shared/execHookOnRenderClient.js';
-import { assertSingleInstance_onClientEntryServerRouting, assertUsage, objectAssign } from './utils.js';
+import { assertUsage } from '../../utils/assert.js';
+import { assertSingleInstance_onClientEntryServerRouting } from '../../utils/assertSingleInstance.js';
+import { objectAssign } from '../../utils/objectAssign.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 import { execHook } from '../../shared-server-client/hooks/execHook.js';
-import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
+import { getPageContextPublicClient } from './getPageContextPublicClient.js';
 import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
 // @ts-expect-error
 import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:server-routing';
@@ -19,15 +22,15 @@ if (import.meta.env.DEV)
     removeFoucBuster();
 hydrate();
 async function hydrate() {
-    const pageContext = await createPageContextClientSide();
+    const pageContext = await createPageContextClient();
     objectAssign(pageContext, getPageContextSerializedInHtml());
-    // Sets pageContext.config using local configs — overrides the pageContext.config set using global configs at createPageContextClientSide()
+    // Sets pageContext.config using non-global configs — overrides the pageContext.config set using global configs at createPageContextClient()
     const pageContextAddendum = await loadPageConfigsLazyClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._globalContext._pageConfigs, pageContext._globalContext._pageConfigGlobal);
     objectAssign(pageContext, pageContextAddendum);
-    await execHook('onCreatePageContext', pageContext, preparePageContextForPublicUsageClient);
+    await execHook('onCreatePageContext', pageContext, getPageContextPublicClient);
     assertPristineUrl();
-    await execHookOnRenderClient(pageContext, preparePageContextForPublicUsageClient);
-    await execHook('onHydrationEnd', pageContext, preparePageContextForPublicUsageClient);
+    await execHookOnRenderClient(pageContext, getPageContextPublicClient);
+    await execHook('onHydrationEnd', pageContext, getPageContextPublicClient);
 }
 function assertPristineUrl() {
     const urlCurrent = getCurrentUrl({ withoutHash: true });

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

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 export type { GlobalContextClientInternalWithServerRouting };
 type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;

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

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
 async function getGlobalContextClientInternal() {

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

@@ -0,0 +1,10 @@
+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';
+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

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

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

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

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

@@ -1,2 +1 @@
-// TO-DO/next-major-release: remove this file
-export {};
+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 { PageContextForPublicUsageClientShared } from './preparePageContextForPublicUsageClientShared.js';
 import type { GlobalContextClientInternalShared } from './getGlobalContextClientInternalShared.js';
-import type { PageContextCreatedClient } from '../runtime-client-routing/createPageContextClientSide.js';
-import type { PageContextCreatedClient_ServerRouting } from '../runtime-server-routing/createPageContextClientSide.js';
+import type { PageContextCreatedClient } from '../runtime-client-routing/createPageContextClient.js';
+import type { PageContextCreatedClient_ServerRouting } from '../runtime-server-routing/createPageContextClient.js';
 type PageContextCreatedClientShared = PageContextCreatedClient | PageContextCreatedClient_ServerRouting;
 type PageContextBeforeRenderClient = {
     _pageFilesLoaded: PageFile[];
@@ -12,5 +12,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _globalContext: GlobalContextClientInternalShared;
-} & PageContextCreatedClientShared & PageContextConfig & PageContextForPublicUsageClientShared;
-declare function execHookOnRenderClient<PageContext extends PageContextBeforeRenderClient>(pageContext: PageContext, prepareForPublicUsage: (pageConfig: PageContext) => PageContext): Promise<void>;
+} & PageContextCreatedClientShared & PageContextConfig;
+declare function execHookOnRenderClient<PageContext extends PageContextBeforeRenderClient>(pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<void>;

package/dist/client/shared/execHookOnRenderClient.js

@@ -1,8 +1,9 @@
+import '../assertEnvClient.js';
 export { execHookOnRenderClient };
-import { assert, assertUsage } from '../runtime-server-routing/utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
 import { getHookFromPageContext } from '../../shared-server-client/hooks/getHook.js';
-import { execHookDirectSingle } from '../../shared-server-client/hooks/execHook.js';
-async function execHookOnRenderClient(pageContext, prepareForPublicUsage) {
+import { execHookSingle } from '../../shared-server-client/hooks/execHook.js';
+async function execHookOnRenderClient(pageContext, getPageContextPublic) {
     let hook = null;
     {
         const renderHook = getHookFromPageContext(pageContext, 'render');
@@ -38,11 +39,11 @@ async function execHookOnRenderClient(pageContext, prepareForPublicUsage) {
         }
     }
     // We don't use a try-catch wrapper because rendering errors are usually handled by the UI framework. (E.g. React's Error Boundaries.)
-    await execHookDirectSingle(hook, pageContext, prepareForPublicUsage);
+    await execHookSingle(hook, pageContext, getPageContextPublic);
 }
 function getUrlToShowToUser(pageContext) {
     let url;
-    // try/catch to avoid passToClient assertUsage() (although: this may not be needed anymore, since we're now accessing pageContext and not pageContextForPublicUsage)
+    // try/catch to avoid passToClient assertUsage() (although: this may not be needed anymore, since we're now accessing pageContext and not pageContextPublic)
     try {
         url =
             // Client Routing

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

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getCurrentUrl };
 declare function getCurrentUrl(options?: {
     withoutHash: true;

package/dist/client/shared/getCurrentUrl.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getCurrentUrl };
 import { normalizeClientSideUrl } from './normalizeClientSideUrl.js';
 function getCurrentUrl(options) {

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

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { setVirtualFileExportsGlobalEntry };

package/dist/client/shared/getGlobalContextClientInternalShared.js

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

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

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

package/dist/client/shared/getJsonSerializedInHtml.js

@@ -1,7 +1,9 @@
+import '../assertEnvClient.js';
 export { getPageContextSerializedInHtml };
 export { getGlobalContextSerializedInHtml };
 import { parse } from '@brillout/json-serializer/parse';
-import { hasProp, assert, assertUsage } from './utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { hasProp } from '../../utils/hasProp.js';
 import { htmlElementId_globalContext, htmlElementId_pageContext } from '../../shared-server-client/htmlElementIds.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)

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

@@ -0,0 +1,16 @@
+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';
+type PageContextPublicClientShared = PageContextPublicMinimum & PageContextInternalClient & PageContextConfig;
+declare function getPageContextPublicClientShared<PageContext extends PageContextPublicClientShared>(pageContext: PageContext): PageContext & {
+    Page: unknown;
+};
+declare function getPageContextPublicClientMinimal<PageContext extends PageContextPublicMinimum>(pageContext: PageContext): PageContext & {
+    _isProxyObject: true;
+    _originalObject: PageContext;
+} & {
+    dangerouslyUseInternals: import("../../shared-server-client/getPublicProxy.js").DangerouslyUseInternals<PageContext>;
+};

package/dist/client/shared/{preparePageContextForPublicUsageClientShared.js → getPageContextPublicClientShared.js}

@@ -1,23 +1,24 @@
-export { preparePageContextForPublicUsageClientShared };
-export { preparePageContextForPublicUsageClientMinimal };
-import { objectAssign } from '../runtime-server-routing/utils.js';
-import { assertPropertyGetters, preparePageContextForPublicUsage, } from '../../shared-server-client/preparePageContextForPublicUsage.js';
-function preparePageContextForPublicUsageClientShared(pageContext) {
+import '../assertEnvClient.js';
+export { getPageContextPublicClientShared };
+export { getPageContextPublicClientMinimal };
+import { objectAssign } from '../../utils/objectAssign.js';
+import { assertPropertyGetters, getPageContextPublicShared, } from '../../shared-server-client/getPageContextPublicShared.js';
+function getPageContextPublicClientShared(pageContext) {
     // TO-DO/soon/proxy: use proxy
     const Page = pageContext.config?.Page ||
         // TO-DO/next-major-release: remove
         pageContext.exports?.Page;
     objectAssign(pageContext, { Page });
-    // TO-DO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
+    // TO-DO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic getPageContextPublicShared()
     assertPropertyGetters(pageContext);
     // TO-DO/next-major-release: remove
     // - Requires https://github.com/vikejs/vike-vue/issues/198
     // - Last time I tried to remove it (https://github.com/vikejs/vike/commit/705fd23598d9d69bf46a52c8550216cd7117ce71) the tests were failing as expected: only the Vue integrations that used shallowReactive() failed.
     supportVueReactiviy(pageContext);
-    return preparePageContextForPublicUsageClientMinimal(pageContext);
+    return getPageContextPublicClientMinimal(pageContext);
 }
-function preparePageContextForPublicUsageClientMinimal(pageContext) {
-    const pageContextPublic = preparePageContextForPublicUsage(pageContext);
+function getPageContextPublicClientMinimal(pageContext) {
+    const pageContextPublic = getPageContextPublicShared(pageContext);
     return pageContextPublic;
 }
 // With Vue + Client Routing, the `pageContext` is made reactive:

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

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export type { PageContext_loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };

package/dist/client/shared/loadPageConfigsLazyClientSide.js

@@ -1,10 +1,11 @@
+import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared-server-client/getPageFiles.js';
 import { resolvePageContextConfig } from '../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import { findPageConfig } from '../../shared-server-client/page-configs/findPageConfig.js';
 import { loadAndParseVirtualFilePageEntry } from '../../shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js';
-import { objectAssign } from '../runtime-server-routing/utils.js';
+import { objectAssign } from '../../utils/objectAssign.js';
 const errStamp = '_isAssetsError';
 async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);

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

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

package/dist/client/shared/normalizeClientSideUrl.js

@@ -1,5 +1,7 @@
+import '../assertEnvClient.js';
 export { normalizeClientSideUrl };
-import { assert, parseUrl } from './utils.js';
+import { assert } from '../../utils/assert.js';
+import { parseUrl } from '../../utils/parseUrl.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,2 +1,3 @@
+import '../assertEnvClient.js';
 export { removeFoucBuster };
 declare function removeFoucBuster(): void;

package/dist/client/shared/removeFoucBuster.js

@@ -1,5 +1,6 @@
+import '../assertEnvClient.js';
 export { removeFoucBuster };
-import { assert } from './utils.js';
+import { assert } from '../../utils/assert.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.d.ts

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

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

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

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

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { build };
 import type { ApiOptions } from './types.js';
 /**

package/dist/node/api/build.js

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createBuilder } from 'vite';

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

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { dev };
 export { startupLog };
 import { type ResolvedConfig, type ViteDevServer } from 'vite';

package/dist/node/api/dev.js

@@ -1,9 +1,14 @@
+import './assertEnvApi.js';
 export { dev };
 // TO-DO/eventually: remove if it doesn't end up being used
 export { startupLog };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createServer } from 'vite';
-import { assert, assertIsNotProductionRuntime, colorVike, colorVite, PROJECT_VERSION } from './utils.js';
+import { assert } from '../../utils/assert.js';
+import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
+import { colorVike } from '../../utils/colorsClient.js';
+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';
 assertIsNotProductionRuntime();

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

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { build_ as build };
 export { dev_ as dev };
 export { preview_ as preview };

package/dist/node/api/index.js

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { build_ as build };
 export { dev_ as dev };
 export { preview_ as preview };

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

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { prepareViteApiCall };
 import type { ApiOptions, ApiOperation } from './types.js';
 declare function prepareViteApiCall(options: ApiOptions, operation: ApiOperation): Promise<{

package/dist/node/api/prepareViteApiCall.js

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { prepareViteApiCall };
 import { clearContextVikeApiOperation, setContextVikeApiOperation } from '../../shared-server-node/api-context.js';
 import { clearGlobalContext } from '../../server/runtime/globalContext.js';

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

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { prerender };
 import type { PrerenderOptions } from '../prerender/runPrerender.js';
 import type { ResolvedConfig } from 'vite';

package/dist/node/api/prerender.js

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { prerender };
 import { runPrerenderFromAPI } from '../prerender/runPrerenderEntry.js';
 import { prepareViteApiCall } from './prepareViteApiCall.js';

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

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { preview };
 export type { CliPreviewConfig };
 import { type ResolvedConfig, type PreviewServer } from 'vite';

package/dist/node/api/preview.js

@@ -1,9 +1,12 @@
+import './assertEnvApi.js';
 export { preview };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { preview as previewVite } from 'vite';
 import { importServerProductionIndex } from '@brillout/vite-plugin-server-entry/runtime';
 import { getOutDirs } from '../vite/shared/getOutDirs.js';
-import { assertUsage, assertWarning, onSetupPreview, isCallable } from './utils.js';
+import { assertUsage, assertWarning } from '../../utils/assert.js';
+import { onSetupPreview } from '../../utils/assertSetup.js';
+import { isCallable } from '../../utils/isCallable.js';
 import pc from '@brillout/picocolors';
 import path from 'node:path';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';

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

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { resolveViteConfigFromUser };
 export { isOnlyResolvingUserConfig };
 export { getVikeConfigInternalEarly };