vike 0.4.230 → 0.4.231-commit-a0ca5e4

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/renderPageClientSide.d.ts

@@ -6,8 +6,8 @@ export { getPageContextClient };
 export type { PageContextBegin };
 import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
-import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
-import type { PageContextClient } from '../../shared/types.js';
+import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { PageContextClient } from '../../types/PageContext.js';
 declare const firstRenderStartPromise: Promise<void>;
 type PageContextRouted = {
     pageId: string;
@@ -45,19 +45,18 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
-                route: import("../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & {
         isClientSide: true;
@@ -66,11 +65,6 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     _urlHandler: null;
     _urlRewrite: null | string;
     _baseServer: string;
@@ -78,18 +72,23 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
+} & {
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+} & {
     isBackwardNavigation: boolean | null;
     isClientSideNavigation: boolean;
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & PageConfigUserFriendlyOld & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../shared/types.js").PageContextInternalClient & Omit<Partial<{
+    } & VikeConfigPublicPageLazy & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
         isPageContext: true;
-        Page: import("../../types/index.js").Config["Page"];
+        Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
         configEntries: import("../../types/index.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
@@ -102,18 +101,18 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
         errorWhileRendering?: unknown;
         pageId: string | null;
-        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
-        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
-        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
     }> & Pick<{
         isPageContext: true;
-        Page: import("../../types/index.js").Config["Page"];
+        Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
         configEntries: import("../../types/index.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
@@ -126,13 +125,13 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
         errorWhileRendering?: unknown;
         pageId: string | null;
-        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
-        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
-        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "Page" | "data" | "config" | "pageExports" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "source" | "sources" | "from"> & {
+    }, "exports" | "pageId" | "pageExports" | "Page" | "data" | "config" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "from" | "source" | "sources"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/renderPageClientSide.js

@@ -24,7 +24,7 @@ import { execHooksErrorHandling, execHookErrorHandling } from '../../shared/hook
 import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
 import { getHookFromPageContextNew } from '../../shared/hooks/getHook.js';
 import { preparePageContextForPublicUsageClientMinimal } from '../shared/preparePageContextForPublicUsageClientShared.js';
-const globalObject = getGlobalObject('client-routing-runtime/renderPageClientSide.ts', (() => {
+const globalObject = getGlobalObject('runtime-client-routing/renderPageClientSide.ts', (() => {
     const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
     return {
         renderCounter: 0,
@@ -135,7 +135,7 @@ async function renderPageClientSide(renderArgs) {
             objectAssign(pageContext, pageContextFromRoute);
         }
         try {
-            objectAssign(pageContext, await loadPageConfigsLazyClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs, pageContext._pageConfigGlobal));
+            objectAssign(pageContext, await loadPageConfigsLazyClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._globalContext._pageConfigs, pageContext._globalContext._pageConfigGlobal));
         }
         catch (err) {
             if (handleErrorFetchingStaticAssets(err, pageContext, isFirstRender)) {
@@ -300,7 +300,7 @@ async function renderPageClientSide(renderArgs) {
                 objectAssign(pageContext, { is404: false });
             }
         }
-        const errorPageId = getErrorPageId(pageContext._pageFilesAll, pageContext._pageConfigs);
+        const errorPageId = getErrorPageId(pageContext._pageFilesAll, pageContext._globalContext._pageConfigs);
         if (!errorPageId)
             throw new Error('No error page defined.');
         objectAssign(pageContext, {
@@ -314,7 +314,7 @@ async function renderPageClientSide(renderArgs) {
             return;
         }
         try {
-            objectAssign(pageContext, await loadPageConfigsLazyClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs, pageContext._pageConfigGlobal));
+            objectAssign(pageContext, await loadPageConfigsLazyClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._globalContext._pageConfigs, pageContext._globalContext._pageConfigGlobal));
         }
         catch (err) {
             if (handleErrorFetchingStaticAssets(err, pageContext, isFirstRender)) {

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/scrollRestoration.js

@@ -6,7 +6,7 @@ export { scrollRestoration_initialRenderIsDone };
 // - 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';
-const globalObject = getGlobalObject('client-routing-runtime/scrollRestoration.ts', {});
+const globalObject = getGlobalObject('runtime-client-routing/scrollRestoration.ts', {});
 function scrollRestoration_init() {
     // Use the native scroll restoration mechanism only for the first render
     scrollRestoration_enable();

package/dist/esm/client/runtime-server-routing/createPageContextClientSide.d.ts

@@ -0,0 +1,43 @@
+export { createPageContextClientSide };
+declare function createPageContextClientSide(): Promise<{
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: true;
+    isPrerendering: false;
+    isHydration: true;
+    _globalContext: {
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExports: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
+        _vikeConfigPublicGlobal: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        };
+        config: import("../../types/index.js").ConfigResolved;
+        pages: {
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+        };
+    } & {
+        isClientSide: true;
+    } & object;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    isBackwardNavigation: null;
+    _hasPageContextFromServer: true;
+} & {
+    pageId: string;
+    routeParams: Record<string, string>;
+} & {
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+} & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
+    _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
+}>;

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

@@ -14,19 +14,16 @@ async function createPageContextClientSide() {
         isPrerendering: false,
         isHydration: true,
         _globalContext: globalContext,
-        _pageFilesAll: globalContext._pageFilesAll,
-        _pageConfigs: globalContext._pageConfigs,
-        _pageConfigGlobal: globalContext._pageConfigGlobal,
-        _allPageIds: globalContext._allPageIds,
+        _pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
         isBackwardNavigation: null,
         _hasPageContextFromServer: true
     });
     objectAssign(pageContextCreated, getPageContextSerializedInHtml());
     // Sets pageContext.config to global configs
-    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
     augmentType(pageContextCreated, pageContextAugmented);
     // Sets pageContext.config to local configs (overrides the pageContext.config set above)
-    objectAssign(pageContextCreated, await loadPageConfigsLazyClientSide(pageContextCreated.pageId, pageContextCreated._pageFilesAll, pageContextCreated._pageConfigs, pageContextCreated._pageConfigGlobal));
+    objectAssign(pageContextCreated, await loadPageConfigsLazyClientSide(pageContextCreated.pageId, globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal));
     assertPristineUrl();
     return pageContextCreated;
 }

package/dist/esm/client/runtime-server-routing/globalContext.d.ts

@@ -0,0 +1,27 @@
+export { getGlobalContextClientInternal };
+export type { GlobalContextClientWithServerRouting };
+export type { GlobalContextClientInternalWithServerRouting };
+import type { GlobalContextBasePublic } from '../../shared/createGlobalContextShared.js';
+type GlobalContextClientWithServerRouting = GlobalContextBasePublic & Pick<GlobalContextClientInternalWithServerRouting, 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextClient & {};
+type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
+declare const getGlobalContextClientInternal: () => Promise<{
+    isGlobalContext: true;
+    _isOriginalObject: true;
+    _virtualFileExports: unknown;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
+    _vikeConfigPublicGlobal: {
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+    };
+    config: import("../../types/index.js").ConfigResolved;
+    pages: {
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+    };
+} & {
+    isClientSide: true;
+} & object>;

package/dist/esm/client/{server-routing-runtime → runtime-server-routing}/globalContext.js

@@ -1,5 +1,5 @@
 export { getGlobalContextClientInternal };
 import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
 // @ts-ignore
-import * as virtualFileExports from 'virtual:vike:importUserCode:client:server-routing';
+import * as virtualFileExports from 'virtual:vike:entry:client:server-routing';
 const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExports, false);

package/dist/esm/client/{server-routing-runtime → runtime-server-routing}/index.d.ts

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

package/dist/esm/client/{server-routing-runtime → runtime-server-routing}/preparePageContextForPublicUsageClient.d.ts

@@ -1,9 +1,9 @@
 export { preparePageContextForPublicUsageClient };
 export type { PageContextForPublicUsageClient };
-import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
-import type { PageContextInternalClient_ServerRouting } from '../../shared/types.js';
+import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { PageContextInternalClient_ServerRouting } from '../../types/PageContext.js';
 import type { PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
-type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting & PageConfigUserFriendlyOld;
+type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting & VikeConfigPublicPageLazy;
 declare function preparePageContextForPublicUsageClient<PageContext extends PageContextForPublicUsageClient>(pageContext: PageContext): PageContext & {
     Page: unknown;
 };

package/dist/esm/client/shared/createGetGlobalContextClient.d.ts

@@ -1,25 +1,27 @@
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { createGetGlobalContextClient };
-import { type GlobalContextShared } from '../../shared/createGlobalContextShared.js';
-declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExports: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextShared) => Promise<GlobalContextAddendum>): () => Promise<{
+export type GlobalContextClientInternalShared = GlobalContextClientInternal | GlobalContextClientInternalWithServerRouting;
+import { type GlobalContextBase } from '../../shared/createGlobalContextShared.js';
+import type { GlobalContextClientInternal } from '../runtime-client-routing/globalContext.js';
+import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/globalContext.js';
+declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExports: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>): () => Promise<{
     isGlobalContext: true;
     _isOriginalObject: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
-    _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+    _vikeConfigPublicGlobal: {
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+    };
     config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
-            route: import("../../shared/page-configs/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
     };
 } & Awaited<{
     /**

package/dist/esm/client/shared/executeOnRenderClientHook.d.ts

@@ -1,13 +1,13 @@
 export { executeOnRenderClientHook };
 export type { PageContextBeforeRenderClient };
-import type { PageFile, PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
+import type { PageFile, VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
 import type { PageContextForPublicUsageClientShared } from './preparePageContextForPublicUsageClientShared.js';
-import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
+import type { GlobalContextClientInternalShared } from './createGetGlobalContextClient.js';
 type PageContextBeforeRenderClient = {
     _pageFilesLoaded: PageFile[];
     urlOriginal?: string;
     urlPathname?: string;
     pageId: string;
-    _pageConfigs: PageConfigRuntime[];
-} & PageConfigUserFriendlyOld & PageContextForPublicUsageClientShared;
+    _globalContext: GlobalContextClientInternalShared;
+} & VikeConfigPublicPageLazy & PageContextForPublicUsageClientShared;
 declare function executeOnRenderClientHook<PageContext extends PageContextBeforeRenderClient>(pageContext: PageContext, prepareForPublicUsage: (pageConfig: PageContext) => PageContext): Promise<void>;

package/dist/esm/client/shared/executeOnRenderClientHook.js

@@ -1,5 +1,5 @@
 export { executeOnRenderClientHook };
-import { assert, assertUsage } from '../server-routing-runtime/utils.js';
+import { assert, assertUsage } from '../runtime-server-routing/utils.js';
 import { getHookFromPageContext } from '../../shared/hooks/getHook.js';
 import { execHookSingle } from '../../shared/hooks/execHook.js';
 async function executeOnRenderClientHook(pageContext, prepareForPublicUsage) {
@@ -17,7 +17,7 @@ async function executeOnRenderClientHook(pageContext, prepareForPublicUsage) {
     if (!hook) {
         const urlToShowToUser = getUrlToShowToUser(pageContext);
         assert(urlToShowToUser);
-        if (pageContext._pageConfigs.length > 0) {
+        if (pageContext._globalContext._pageConfigs.length > 0) {
             // V1 design
             assertUsage(false, `No onRenderClient() hook defined for URL '${urlToShowToUser}', but it's needed, see https://vike.dev/onRenderClient`);
         }

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

@@ -1,15 +1,9 @@
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
-export type { PageContextUserFiles };
-import { type PageFile, type PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
-import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-type PageContextUserFilesLoaded = PageConfigUserFriendlyOld & {
+import { type PageFile, type VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../types/PageConfig.js';
+type PageContextUserFilesLoaded = VikeConfigPublicPageLazy & {
     _pageFilesLoaded: PageFile[];
 };
-type PageContextUserFiles = {
-    _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfigRuntime[];
-    _pageConfigGlobal: PageConfigGlobalRuntime;
-};
 declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<PageContextUserFilesLoaded>;
 declare function isErrorFetchingStaticAssets(err: unknown): boolean;

package/dist/esm/client/shared/loadPageConfigsLazyClientSide.js

@@ -1,10 +1,10 @@
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { getUserFriendlyConfigsPageLazy } from '../../shared/page-configs/getUserFriendlyConfigs.js';
+import { resolveVikeConfigPublicPageLazy } from '../../shared/page-configs/resolveVikeConfigPublic.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
-import { objectAssign } from '../server-routing-runtime/utils.js';
+import { objectAssign } from '../runtime-server-routing/utils.js';
 const stamp = '__whileFetchingAssets';
 async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);
@@ -30,7 +30,7 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
         }
         throw err;
     }
-    const pageContextExports = getUserFriendlyConfigsPageLazy(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = resolveVikeConfigPublicPageLazy(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

package/dist/esm/client/shared/preparePageContextForPublicUsageClientShared.d.ts

@@ -1,10 +1,10 @@
 export { preparePageContextForPublicUsageClientShared };
 export { preparePageContextForPublicUsageClientMinimal };
 export type { PageContextForPublicUsageClientShared };
-import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
 import { type PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
-import type { PageContextInternalClient } from '../../shared/types.js';
-type PageContextForPublicUsageClientShared = PageContextPrepareMinimum & PageContextInternalClient & PageConfigUserFriendlyOld;
+import type { PageContextInternalClient } from '../../types/PageContext.js';
+type PageContextForPublicUsageClientShared = PageContextPrepareMinimum & PageContextInternalClient & VikeConfigPublicPageLazy;
 declare function preparePageContextForPublicUsageClientShared<PageContext extends PageContextForPublicUsageClientShared>(pageContext: PageContext): PageContext & {
     Page: unknown;
 };

package/dist/esm/client/shared/preparePageContextForPublicUsageClientShared.js

@@ -1,9 +1,9 @@
 export { preparePageContextForPublicUsageClientShared };
 export { preparePageContextForPublicUsageClientMinimal };
-import { objectAssign } from '../server-routing-runtime/utils.js';
+import { objectAssign } from '../runtime-server-routing/utils.js';
 import { assertPropertyGetters, preparePageContextForPublicUsage } from '../../shared/preparePageContextForPublicUsage.js';
 function preparePageContextForPublicUsageClientShared(pageContext) {
-    // TODO/now use proxy
+    // TODO/now-proxy use proxy
     const Page = pageContext.config?.Page ||
         // TODO/next-major-release: remove
         pageContext.exports?.Page;

package/dist/esm/node/api/build.js

@@ -1,9 +1,7 @@
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { build as buildVite, version, createBuilder } from 'vite';
-import { isVikeCli } from '../cli/context.js';
-import { isPrerendering } from '../prerender/context.js';
-import { assert, assertVersion } from './utils.js';
+import { assertVersion } from './utils.js';
 /**
  * Programmatically trigger `$ vike build`
  *
@@ -14,7 +12,8 @@ async function build(options = {}) {
     // Pass it to pluginAutoFullBuild()
     if (viteConfigFromUserEnhanced)
         viteConfigFromUserEnhanced._viteConfigFromUserEnhanced = viteConfigFromUserEnhanced;
-    if (vikeConfig.global.config.vite6BuilderApp) {
+    if (vikeConfig.config.vite6BuilderApp) {
+        // This assertion isn't reliable: the user may still use a Vite version older than 6.0.0 — see https://github.com/vitejs/vite/pull/19355
         assertVersion('Vite', version, '6.0.0');
         const builder = await createBuilder(viteConfigFromUserEnhanced);
         // See Vite plugin vike:build:pluginBuildApp
@@ -31,8 +30,7 @@ async function build(options = {}) {
         //    > Rationale: https://github.com/vikejs/vike/issues/2123
         await buildVite(viteConfigFromUserEnhanced);
         // After pre-rendering, when using the Vike CLI, the process is forcefully exited at the end of the buildVite() call above.
-        if (isVikeCli() && isPrerendering())
-            assert(false);
+        // if (isVikeCli() && isPrerendering()) assert(false)
     }
     return {
     /* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`

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

@@ -4,9 +4,9 @@ export { assertViteRoot };
 export { normalizeViteRoot };
 import type { InlineConfig, ResolvedConfig } from 'vite';
 import type { APIOptions, Operation } from './types.js';
-import { type VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+import { type VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
 declare function prepareViteApiCall(options: APIOptions, operation: Operation): Promise<{
-    vikeConfig: VikeConfigObject;
+    vikeConfig: VikeConfigInternal;
     viteConfigResolved: ResolvedConfig;
     viteConfigFromUserEnhanced: InlineConfig | undefined;
 }>;

package/dist/esm/node/api/prepareViteApiCall.js

@@ -4,12 +4,12 @@ export { assertViteRoot };
 export { normalizeViteRoot };
 import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite';
 import { clearContextApiOperation, setContextApiOperation } from './context.js';
-import { getVikeConfig2, getVikeConfigFromCliOrEnv } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfigInternal, getVikeConfigFromCliOrEnv, setVikeConfigContext } from '../vite/shared/resolveVikeConfigInternal.js';
 import path from 'path';
 import { assert, assertUsage, getGlobalObject, isObject, pick, toPosixPath } from './utils.js';
 import pc from '@brillout/picocolors';
 import { clearGlobalContext } from '../runtime/globalContext.js';
-import { getEnvVarObject } from '../plugin/shared/getEnvVarObject.js';
+import { getEnvVarObject } from '../vite/shared/getEnvVarObject.js';
 const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
 async function prepareViteApiCall(options, operation) {
     clear();
@@ -24,7 +24,12 @@ function clear() {
 }
 async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteInfo = await getViteInfo(viteConfigFromUserApiOptions, operation);
-    const vikeConfig = await getVikeConfig2(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
+    setVikeConfigContext({
+        userRootDir: viteInfo.root,
+        isDev: operation === 'dev',
+        vikeVitePluginOptions: viteInfo.vikeVitePluginOptions
+    });
+    const vikeConfig = await getVikeConfigInternal();
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
     const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
@@ -36,7 +41,7 @@ async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
 // Apply +vite
 // - For example, Vike extensions adding Vite plugins
 function applyVikeViteConfig(viteConfigFromUserEnhanced, vikeConfig) {
-    const viteConfigs = vikeConfig.global._from.configsCumulative.vite;
+    const viteConfigs = vikeConfig._from.configsCumulative.vite;
     if (!viteConfigs)
         return viteConfigFromUserEnhanced;
     viteConfigs.values.forEach((v) => {
@@ -89,7 +94,7 @@ async function getViteInfo(viteConfigFromUserApiOptions, operation) {
     else {
         // Add Vike to plugins if not present.
         // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus vike/plugin may resolved to two different node_modules/vike directories.
-        const { plugin: vikePlugin } = await import('../plugin/index.js');
+        const { plugin: vikePlugin } = await import('../vite/index.js');
         viteConfigFromUserEnhanced = {
             ...viteConfigFromUserEnhanced,
             plugins: [...(viteConfigFromUserEnhanced?.plugins ?? []), vikePlugin()]
@@ -105,9 +110,9 @@ function findVikeVitePlugin(viteConfig) {
     let vikeVitePluginOptions;
     let vikeVitePuginFound = false;
     viteConfig?.plugins?.forEach((p) => {
-        if (p && '__vikeVitePluginOptions' in p) {
+        if (p && '_vikeVitePluginOptions' in p) {
             vikeVitePuginFound = true;
-            const options = p.__vikeVitePluginOptions;
+            const options = p._vikeVitePluginOptions;
             vikeVitePluginOptions ?? (vikeVitePluginOptions = {});
             Object.assign(vikeVitePluginOptions, options);
         }

package/dist/esm/node/api/preview.js

@@ -2,7 +2,7 @@ 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 '../plugin/shared/getOutDirs.js';
+import { getOutDirs } from '../vite/shared/getOutDirs.js';
 import { assertWarning } from './utils.js';
 import pc from '@brillout/picocolors';
 import path from 'node:path';

package/dist/esm/node/api/types.d.ts

@@ -1,7 +1,7 @@
 export type { APIOptions };
 export type { Operation };
 import type { InlineConfig } from 'vite';
-import type { Config } from '../../shared/page-configs/Config.js';
+import type { Config } from '../../types/Config.js';
 type APIOptions = {
     /**
      * Vite config.

package/dist/esm/node/cli/parseCli.js

@@ -1,7 +1,7 @@
 export { parseCli };
 import pc from '@brillout/picocolors';
 import { assert, includes, PROJECT_VERSION } from './utils.js';
-import { parseJson5 } from '../plugin/shared/getEnvVarObject.js';
+import { parseJson5 } from '../vite/shared/getEnvVarObject.js';
 const commands = [
     { name: 'dev', desc: 'Start development server' },
     { name: 'build', desc: 'Build for production' },

package/dist/esm/node/prerender/context.d.ts

@@ -2,8 +2,8 @@ export { isPrerenderAutoRunEnabled };
 export { temp_disablePrerenderAutoRun };
 export { isPrerendering };
 export { setContextIsPrerendering };
-import type { VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
-declare function isPrerenderAutoRunEnabled(vikeConfig: VikeConfigObject): boolean;
+import type { VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
+declare function isPrerenderAutoRunEnabled(vikeConfig: VikeConfigInternal): boolean;
 declare function temp_disablePrerenderAutoRun(): void;
 declare function isPrerendering(): boolean;
 declare function setContextIsPrerendering(): void;

package/dist/esm/node/prerender/context.js

@@ -10,7 +10,7 @@ function isPrerenderAutoRunEnabled(vikeConfig) {
     return (prerenderConfigGlobal.isPrerenderingEnabled &&
         !(prerenderConfigGlobal || {}).disableAutoRun &&
         !globalObject.isDisabled &&
-        vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
+        vikeConfig.config.disableAutoFullBuild !== 'prerender');
 }
 // TODO/v1-release: remove
 function temp_disablePrerenderAutoRun() {

package/dist/esm/node/prerender/resolvePrerenderConfig.d.ts

@@ -1,8 +1,8 @@
 export { resolvePrerenderConfigGlobal };
 export { resolvePrerenderConfigLocal };
-import { VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
-import type { PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
-declare function resolvePrerenderConfigGlobal(vikeConfig: VikeConfigObject): {
+import { VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
+import type { PageConfigBuildTime } from '../../types/PageConfig.js';
+declare function resolvePrerenderConfigGlobal(vikeConfig: Pick<VikeConfigInternal, 'config' | '_pageConfigs' | '_from'>): {
     partial: boolean;
     noExtraDir: boolean | null;
     keepDistServer: boolean;