vike 0.4.250-commit-2686732 → 0.4.250-commit-0d50da9

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

@@ -1,7 +1,6 @@
-export { createPageContextClientSide };
-export type PageContextCreatedClient = Awaited<ReturnType<typeof createPageContextClientSide>>;
-export type PageContextCreatedClientBase = Awaited<ReturnType<typeof createPageContextBase>>;
-declare function createPageContextClientSide(urlOriginal: string): Promise<{
+export { createPageContextClient };
+export type PageContextCreatedClient = Awaited<ReturnType<typeof createPageContextClient>>;
+declare function createPageContextClient(urlOriginal: string): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -12,7 +11,7 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
 } & {
     _baseServer: string;
 } & {
-    urlParsed: import("./utils.js").UrlPublic;
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {
@@ -70,18 +69,3 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
-declare function createPageContextBase(urlOriginal: string): {
-    _isOriginalObject: true;
-    isPageContext: true;
-} & {
-    isClientSide: true;
-    isPrerendering: false;
-    urlOriginal: string;
-    _urlHandler: null;
-} & {
-    _baseServer: string;
-} & {
-    urlParsed: import("./utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
-};

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

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

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

@@ -1,7 +1,7 @@
 import { assertClientRouting } from '../../utils/assertRoutingType.js';
 assertClientRouting();
 import { initClientRouter } from './initClientRouter.js';
-import { assertSingleInstance_onClientEntryClientRouting } from './utils.js';
+import { assertSingleInstance_onClientEntryClientRouting } from '../../utils/assertSingleInstance.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
 // @ts-expect-error

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

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

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

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

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

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

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

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

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

@@ -5,9 +5,9 @@ export { getPageContextFromHooksServer_firstRender };
 export { setPageContextInitIsPassedToClient };
 export type { PageContextFromHooksServer };
 import type { PageContextConfig, PageFile } from '../../shared-server-client/getPageFiles.js';
-import type { PageContextCreatedClient } from './createPageContextClientSide.js';
+import type { PageContextCreatedClient } from './createPageContextClient.js';
 import type { PageContextBegin } from './renderPageClient.js';
-import { type PageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
+import { type PageContextPublicClient } from './getPageContextPublicClient.js';
 type PageContextSerialized = {
     pageId: string;
     _hasPageContextFromServer: true;
@@ -18,7 +18,7 @@ declare function getPageContextFromHooksServer_firstRender(): PageContextSeriali
 };
 declare function getPageContextFromHooksClient_firstRender(pageContext: PageContextSerialized & PageContextBegin & PageContextConfig & {
     _hasPageContextFromServer: true;
-} & PageContextForPublicUsageClient): Promise<((PageContextSerialized & ({
+} & PageContextPublicClient): Promise<((PageContextSerialized & ({
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -29,7 +29,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
 } & {
     _baseServer: string;
 } & {
-    urlParsed: import("./utils.js").UrlPublic;
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {
@@ -107,7 +107,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     } & {
         _baseServer: string;
     } & {
-        urlParsed: import("./utils.js").UrlPublic;
+        urlParsed: import("../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -164,9 +164,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
         };
         _pageFilesAll: PageFile[];
-    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
-        _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
-    } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
@@ -214,7 +212,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     } & {
         urlOriginal: string;
     } & {
-        urlParsed: import("./utils.js").UrlPublic;
+        urlParsed: import("../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
@@ -227,9 +225,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     pageContextsAborted: import("../../shared-server-client/route/abort.js").PageContextAborted[];
 } & (import("../../shared-server-client/route/abort.js").PageContextAbort | null))) & PageContextConfig & {
     _hasPageContextFromServer: true;
-}) & {
-    _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
-} & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & Omit<Partial<PageContextConfig & {
+}) & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
@@ -277,7 +273,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
 } & {
     urlOriginal: string;
 } & {
-    urlParsed: import("./utils.js").UrlPublic;
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
@@ -301,10 +297,10 @@ declare function getPageContextFromHooksServer(pageContext: {
 declare function getPageContextFromHooksClient(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContextBegin & PageContextConfig & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<(({
+} & PageContextBegin & PageContextConfig & PageContextPublicClient, isErrorPage: boolean): Promise<({
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & ({
+} & (({
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -315,7 +311,7 @@ declare function getPageContextFromHooksClient(pageContext: {
 } & {
     _baseServer: string;
 } & {
-    urlParsed: import("./utils.js").UrlPublic;
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {
@@ -393,7 +389,7 @@ declare function getPageContextFromHooksClient(pageContext: {
     } & {
         _baseServer: string;
     } & {
-        urlParsed: import("./utils.js").UrlPublic;
+        urlParsed: import("../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -450,9 +446,7 @@ declare function getPageContextFromHooksClient(pageContext: {
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
         };
         _pageFilesAll: PageFile[];
-    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
-        _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
-    } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
@@ -500,7 +494,7 @@ declare function getPageContextFromHooksClient(pageContext: {
     } & {
         urlOriginal: string;
     } & {
-        urlParsed: import("./utils.js").UrlPublic;
+        urlParsed: import("../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
@@ -511,9 +505,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         urlOriginal: string;
     }) | null;
     pageContextsAborted: import("../../shared-server-client/route/abort.js").PageContextAborted[];
-} & (import("../../shared-server-client/route/abort.js").PageContextAbort | null))) & PageContextConfig & {
-    _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
-}) & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & Omit<Partial<PageContextConfig & {
+} & (import("../../shared-server-client/route/abort.js").PageContextAbort | null)) & PageContextConfig)) & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
@@ -561,7 +553,7 @@ declare function getPageContextFromHooksClient(pageContext: {
 } & {
     urlOriginal: string;
 } & {
-    urlParsed: import("./utils.js").UrlPublic;
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {

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

@@ -3,7 +3,12 @@ export { getPageContextFromHooksClient_firstRender };
 export { getPageContextFromHooksServer };
 export { getPageContextFromHooksServer_firstRender };
 export { setPageContextInitIsPassedToClient };
-import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard, isObject, getGlobalObject, } from './utils.js';
+import { assert, assertUsage, getProjectError } from '../../utils/assert.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isObject } from '../../utils/isObject.js';
+import { objectAssign } from '../../utils/objectAssign.js';
+import { redirectHard } from '../../utils/redirectHard.js';
 import { parse } from '@brillout/json-serializer/parse';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
 import { analyzePageServerSide } from '../../shared-server-client/getPageFiles/analyzePageServerSide.js';
@@ -17,7 +22,7 @@ import { AbortRender, isAbortPageContext } from '../../shared-server-client/rout
 import { pageContextInitIsPassedToClient } from '../../shared-server-client/misc/pageContextInitIsPassedToClient.js';
 import { isServerSideError } from '../../shared-server-client/misc/isServerSideError.js';
 import { execHook } from '../../shared-server-client/hooks/execHook.js';
-import { preparePageContextForPublicUsageClient, } from './preparePageContextForPublicUsageClient.js';
+import { getPageContextPublicClient } from './getPageContextPublicClient.js';
 const globalObject = getGlobalObject('runtime-client-routing/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
@@ -100,7 +105,7 @@ async function getPageContextFromHooksClient(pageContext, isErrorPage) {
     return pageContextFromHooksClient;
 }
 async function execHookClient(hookName, pageContext) {
-    return await execHook(hookName, pageContext, (p) => preparePageContextForPublicUsageClient(p));
+    return await execHook(hookName, pageContext, (p) => getPageContextPublicClient(p));
 }
 // It's a no-op if:
 // - No hook has been defined, or
@@ -227,5 +232,5 @@ function isOldDesign(pageContext) {
     return pageContext._globalContext._pageConfigs.length === 0;
 }
 async function execHookGuardClient(pageContext) {
-    await execHookGuard(pageContext, (pageContext) => preparePageContextForPublicUsageClient(pageContext));
+    await execHookGuard(pageContext, (pageContext) => getPageContextPublicClient(pageContext));
 }

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

@@ -0,0 +1,13 @@
+export { getPageContextPublicClient };
+export type { PageContextPublicClient };
+export type { PageContextPublicProxyClient };
+import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
+import type { PageContextInternalClient_ClientRouting } from '../../types/PageContext.js';
+import type { PageContextPublicMinimum } from '../../shared-server-client/getPageContextPublicShared.js';
+type PageContextPublicClient = PageContextPublicMinimum & PageContextInternalClient_ClientRouting & PageContextConfig & {
+    urlOriginal: string;
+};
+type PageContextPublicProxyClient = ReturnType<typeof getPageContextPublicClient>;
+declare function getPageContextPublicClient<PageContext extends PageContextPublicClient>(pageContext: PageContext): PageContext & {
+    Page: unknown;
+};

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

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

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

@@ -4,7 +4,10 @@ export { onPopStateBegin };
 export { saveScrollPosition };
 export { initHistory };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-import { assert, assertUsage, getGlobalObject, isObject, redirectHard } from './utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { isObject } from '../../utils/isObject.js';
+import { redirectHard } from '../../utils/redirectHard.js';
 const globalObject = getGlobalObject('history.ts', {
     monkeyPatched: false,
     previous: undefined,

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

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

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

@@ -6,4 +6,4 @@
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
 export { getPageContextClient } from './renderPageClient.js';
-export { PROJECT_VERSION as version } from './utils.js';
+export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';

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

@@ -1,5 +1,5 @@
 export { initClientRouter };
-import { assert } from './utils.js';
+import { assert } from '../../utils/assert.js';
 import { getRenderCount, renderPageClient } from './renderPageClient.js';
 import { initOnPopState } from './initOnPopState.js';
 import { initOnLinkClick } from './initOnLinkClick.js';

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@ export { reload };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 import { firstRenderStartPromise, renderPageClient } from './renderPageClient.js';
-import { assertClientRouting } from './utils.js';
+import { assertClientRouting } from '../../utils/assertRoutingType.js';
 assertClientRouting();
 /** Programmatically navigate to a new page.
  *

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

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

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

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

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

@@ -5,7 +5,7 @@ export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
-import { type PageContextCreatedClient } from './createPageContextClientSide.js';
+import { type PageContextCreatedClient } from './createPageContextClient.js';
 import { type PageContextFromHooksServer, getPageContextFromHooksServer } from './getPageContextFromHooks.js';
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromHooksServer>>;

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

@@ -5,12 +5,16 @@ export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
-import { assert, assertClientRouting, assertUsage, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign, } from './utils.js';
+import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
+import { assertClientRouting, checkIfClientRouting } from '../../utils/assertRoutingType.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { objectAssign } from '../../utils/objectAssign.js';
 import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide } from '../shared/loadPageConfigsLazyClientSide.js';
 import { isLinkSkipped } from './isLinkSkipped.js';
 import { disableClientRouting } from './renderPageClient.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
-import { createPageContextClientSide } from './createPageContextClientSide.js';
+import { createPageContextClient } from './createPageContextClient.js';
 import { route } from '../../shared-server-client/route/index.js';
 import { noRouteMatch } from '../../shared-server-client/route/noRouteMatch.js';
 import { getPageContextFromHooksServer } from './getPageContextFromHooks.js';
@@ -238,7 +242,7 @@ function isExpired(found) {
 }
 // TO-DO/next-major-release: make it sync
 async function getPageContextLink(urlOfLink) {
-    const pageContextLink = await createPageContextClientSide(urlOfLink);
+    const pageContextLink = await createPageContextClient(urlOfLink);
     let pageContextFromRoute;
     try {
         pageContextFromRoute = await route(pageContextLink);