vike 0.4.252-commit-3c0065c → 0.4.252-commit-e3a6e9d

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/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.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;

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/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -219,7 +219,12 @@ const configDefinitionsBuiltIn = {
     keepScrollPosition: {
         env: { client: true },
     },
-    middleware: { env: { server: true }, cumulative: true, eager: true, global: true },
+    middleware: {
+        env: { server: true },
+        cumulative: true,
+        eager: true,
+        global: true,
+    },
     cli: {
         env: { config: true },
         global: true,
@@ -229,7 +234,6 @@ const configDefinitionsBuiltIn = {
         eager: true,
         global: true,
     },
-    // TODO: align all meta configs
     prerender: {
         env: { config: true },
         global: (value, { isGlobalLocation }) => typeof value === 'object' || isGlobalLocation,

package/dist/server/runtime/renderPageServer/handlePageContextRequestUrl.js

@@ -8,6 +8,7 @@ import { assert } from '../../../utils/assert.js';
 import { hasProp } from '../../../utils/hasProp.js';
 import { isObject } from '../../../utils/isObject.js';
 import { parseUrl } from '../../../utils/parseUrl.js';
+const pageContextJsonFileExtensionUrl = `/index${pageContextJsonFileExtension}`;
 // See also shared/getPageContextRequestUrl.ts
 function handlePageContextRequestUrl(url) {
     const urlParsed = parseUrl(url, baseServer);
@@ -33,16 +34,15 @@ function handlePageContextRequestUrl(url) {
 }
 function isMatch(urlParsed) {
     const { pathnameOriginal, pathname } = urlParsed;
-    assert(pathname.endsWith(pageContextJsonFileExtension) === pathnameOriginal.endsWith(pageContextJsonFileExtension));
-    return pathname.endsWith(pageContextJsonFileExtension);
+    assert(pathname.endsWith(pageContextJsonFileExtensionUrl) === pathnameOriginal.endsWith(pageContextJsonFileExtensionUrl));
+    return pathname.endsWith(pageContextJsonFileExtensionUrl);
 }
 function processUrl(urlParsed, url) {
     // We cannot use `urlParsed.pathname` because it would break the `urlParsed.pathnameOriginal` value of subsequent `parseUrl()` calls.
     const { pathnameOriginal, search } = urlParsed;
     assert(doNotCreateExtraDirectory === false);
-    const urlSuffix = `/index${pageContextJsonFileExtension}`;
-    assert(pathnameOriginal.endsWith(urlSuffix), { url });
-    let pathnameModified = slice(pathnameOriginal, 0, -1 * urlSuffix.length);
+    assert(pathnameOriginal.endsWith(pageContextJsonFileExtensionUrl), { url });
+    let pathnameModified = slice(pathnameOriginal, 0, -1 * pageContextJsonFileExtensionUrl.length);
     if (pathnameModified === '')
         pathnameModified = '/';
     const searchVikeArgs = search?._vike;

package/dist/shared-server-client/assertVirtualFileExports.js

@@ -1,7 +1,9 @@
+// TO-DO/eventually: remove
 export { assertVirtualFileExports };
 import { assert } from '../utils/assert.js';
 function assertVirtualFileExports(moduleExports, test, moduleId) {
-    if (!moduleExports || !test(moduleExports)) {
+    assert(moduleExports, typeof moduleExports);
+    if (!test(moduleExports)) {
         /* https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811
         throw getProjectError('@cloudflare/vite-plugin error https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811')
         /*/
@@ -10,7 +12,5 @@ function assertVirtualFileExports(moduleExports, test, moduleId) {
     }
 }
 function getKeys(obj) {
-    if (obj === undefined)
-        return null;
     return [...Object.getOwnPropertyNames(obj), ...Object.getOwnPropertySymbols(obj), ...Object.keys(obj)];
 }

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.252-commit-3c0065c";
+export declare const PROJECT_VERSION: "0.4.252-commit-e3a6e9d";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.252-commit-3c0065c';
+export const PROJECT_VERSION = '0.4.252-commit-e3a6e9d';

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "vike",
-  "version": "0.4.252-commit-3c0065c",
+  "version": "0.4.252-commit-e3a6e9d",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
+      "types": "./dist/server/runtime/index.d.ts",
       "worker": "./dist/server/runtime/index.js",
       "workerd": "./dist/server/runtime/index.js",
       "node": "./dist/server/runtime/index.js",
       "browser": "./dist/client/node.js",
-      "types": "./dist/server/runtime/index.d.ts",
       "default": "./dist/server/runtime/index.js"
     },
     "./client": {
@@ -19,89 +19,89 @@
       "default": "./dist/types/index.js"
     },
     "./client/router": {
+      "types": "./dist/client/runtime-client-routing/index.d.ts",
       "worker": "./dist/server/client/router.js",
       "workerd": "./dist/server/client/router.js",
       "node": "./dist/server/client/router.js",
       "browser": "./dist/client/runtime-client-routing/index.js",
-      "types": "./dist/client/runtime-client-routing/index.d.ts",
       "default": "./dist/client/runtime-client-routing/index.js"
     },
     "./routing": {
+      "types": "./dist/shared-server-client/route/routing.d.ts",
       "worker": "./dist/shared-server-client/route/routing.js",
       "workerd": "./dist/shared-server-client/route/routing.js",
       "node": "./dist/shared-server-client/route/routing.js",
       "browser": "./dist/shared-server-client/route/routing.js",
-      "types": "./dist/shared-server-client/route/routing.d.ts",
       "default": "./dist/shared-server-client/route/routing.js"
     },
     "./cli": {
-      "node": "./dist/node/cli/index.js",
       "types": "./dist/node/cli/index.d.ts",
+      "node": "./dist/node/cli/index.js",
       "default": "./dist/node/cli/index.js"
     },
     "./api": {
-      "node": "./dist/node/api/index.js",
       "types": "./dist/node/api/index.d.ts",
+      "node": "./dist/node/api/index.js",
       "default": "./dist/node/api/index.js"
     },
     "./prerender": {
-      "node": "./dist/node/prerender/index.js",
       "types": "./dist/node/prerender/index.d.ts",
+      "node": "./dist/node/prerender/index.js",
       "default": "./dist/node/prerender/index.js"
     },
     "./plugin": {
-      "node": "./dist/node/vite/index.js",
       "types": "./dist/node/vite/index.d.ts",
+      "node": "./dist/node/vite/index.js",
       "default": "./dist/node/vite/index.js"
     },
     "./RenderErrorPage": {
+      "types": "./dist/shared-server-client/RenderErrorPage.d.ts",
       "worker": "./dist/shared-server-client/RenderErrorPage.js",
       "workerd": "./dist/shared-server-client/RenderErrorPage.js",
       "node": "./dist/shared-server-client/RenderErrorPage.js",
       "browser": "./dist/shared-server-client/RenderErrorPage.js",
-      "types": "./dist/shared-server-client/RenderErrorPage.d.ts",
       "default": "./dist/shared-server-client/RenderErrorPage.js"
     },
     "./abort": {
+      "types": "./dist/shared-server-client/abort.d.ts",
       "worker": "./dist/shared-server-client/abort.js",
       "workerd": "./dist/shared-server-client/abort.js",
       "node": "./dist/shared-server-client/abort.js",
       "browser": "./dist/shared-server-client/abort.js",
-      "types": "./dist/shared-server-client/abort.d.ts",
       "default": "./dist/shared-server-client/abort.js"
     },
     "./getPageContext": {
+      "types": "./dist/server/runtime/getPageContext.d.ts",
       "worker": "./dist/server/runtime/getPageContext.js",
       "workerd": "./dist/server/runtime/getPageContext.js",
       "node": "./dist/server/runtime/getPageContext.js",
       "browser": "./dist/client/runtime-client-routing/getPageContext.js",
-      "types": "./dist/server/runtime/getPageContext.d.ts",
       "default": "./dist/server/runtime/getPageContext.js"
     },
     "./modifyUrl": {
+      "types": "./dist/shared-server-client/modifyUrl.d.ts",
       "worker": "./dist/shared-server-client/modifyUrl.js",
       "workerd": "./dist/shared-server-client/modifyUrl.js",
       "node": "./dist/shared-server-client/modifyUrl.js",
       "browser": "./dist/shared-server-client/modifyUrl.js",
-      "types": "./dist/shared-server-client/modifyUrl.d.ts",
       "default": "./dist/shared-server-client/modifyUrl.js"
     },
     "./universal-middleware": {
+      "types": "./dist/server/runtime/universal-middleware.d.ts",
       "worker": "./dist/server/runtime/universal-middleware.js",
       "workerd": "./dist/server/runtime/universal-middleware.js",
       "node": "./dist/server/runtime/universal-middleware.js",
       "browser": "./dist/client/node.js",
-      "types": "./dist/server/runtime/universal-middleware.d.ts",
       "default": "./dist/server/runtime/universal-middleware.js"
     },
     "./__internal": {
-      "node": "./dist/server/__internal/index.js",
       "types": "./dist/server/__internal/index.d.ts",
+      "node": "./dist/server/__internal/index.js",
       "default": "./dist/server/__internal/index.js"
     },
     "./__internal/setup": {
-      "node": "./dist/server/runtime/page-files/setup.js",
       "types": "./dist/server/runtime/page-files/setup.d.ts",
+      "node": "./dist/server/runtime/page-files/setup.js",
       "default": "./dist/server/runtime/page-files/setup.js"
     },
     "./__internal/vite": {
@@ -109,11 +109,11 @@
       "default": "./dist/server/__internal/vite.js"
     },
     ".": {
+      "types": "./dist/server/runtime/index.d.ts",
       "worker": "./dist/server/runtime/index.js",
       "workerd": "./dist/server/runtime/index.js",
       "node": "./dist/server/runtime/index.js",
       "browser": "./dist/client/index.js",
-      "types": "./dist/server/runtime/index.d.ts",
       "default": "./dist/server/runtime/index.js"
     }
   },
@@ -153,7 +153,7 @@
     "node": ">=20.19.0"
   },
   "license": "MIT",
-  "description": "(Replaces Next.js/Nuxt) 🔨 Composable framework to build (advanced) applications with flexibility and stability.",
+  "description": "(Replaces Next.js/Nuxt) 🔨 Composable framework to build advanced applications with flexibility and stability.",
   "keywords": [
     "vite-plugin",
     "ssr",