vike 0.4.217-commit-99ea561 → 0.4.218-commit-01a099d

package/dist/esm/node/plugin/plugins/{vite6HmrRegressionWorkaround.js → workaroundVite6HmrRegression.js}

@@ -1,11 +1,11 @@
-export { vite6HmrRegressionWorkaround };
+export { workaroundVite6HmrRegression };
 // https://vite.dev/guide/migration (will be 404 after vite@7 release) > search for `hmrReload()`
 // https://v6.vite.dev/guide/migration (will exist after vite@7 release) > search for `hmrReload()`
 // Workaround seems to work for docs page /banner (which is HTML-only)
 // But doesn't seem to work for /examples/render-modes/ (see https://github.com/vikejs/vike/pull/2069 commit `renable HMR test for HTML-only`)
-function vite6HmrRegressionWorkaround() {
+function workaroundVite6HmrRegression() {
     return {
-        name: 'vike:vite6HmrRegressionWorkaround',
+        name: 'vike:workaroundVite6HmrRegression',
         enforce: 'post',
         hotUpdate: {
             order: 'post',

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

@@ -0,0 +1,3 @@
+export { isPrerenderEnabled };
+import type { VikeConfigGlobal } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+declare function isPrerenderEnabled(vikeConfigGlobal: VikeConfigGlobal): boolean;

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

@@ -0,0 +1,6 @@
+export { isPrerenderEnabled };
+function isPrerenderEnabled(vikeConfigGlobal) {
+    return (vikeConfigGlobal.prerender &&
+        !vikeConfigGlobal.prerender.disableAutoRun &&
+        vikeConfigGlobal.disableAutoFullBuild !== 'prerender');
+}

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

@@ -3,7 +3,6 @@ export { runPrerenderFromCLIPrerenderCommand };
 export { runPrerenderFromAutoRun };
 export { runPrerender_forceExit };
 export type { PrerenderOptions };
-import '../runtime/page-files/setup.js';
 import type { InlineConfig, ResolvedConfig } from 'vite';
 import type { APIOptions } from '../api/types.js';
 type PrerenderOptions = APIOptions & {
@@ -30,5 +29,5 @@ declare function runPrerenderFromAPI(options?: PrerenderOptions): Promise<{
     viteConfig: ResolvedConfig;
 }>;
 declare function runPrerenderFromCLIPrerenderCommand(): Promise<void>;
-declare function runPrerenderFromAutoRun(viteConfig: InlineConfig, forceExit: boolean): Promise<void>;
+declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined, forceExit: boolean): Promise<void>;
 declare function runPrerender_forceExit(): void;

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

@@ -2,7 +2,6 @@ export { runPrerenderFromAPI };
 export { runPrerenderFromCLIPrerenderCommand };
 export { runPrerenderFromAutoRun };
 export { runPrerender_forceExit };
-import '../runtime/page-files/setup.js';
 import path from 'path';
 import { route } from '../../shared/route/index.js';
 import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, changeEnumerable, onSetupPrerender } from './utils.js';
@@ -15,7 +14,7 @@ import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
 import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
-import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueRuntime.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
@@ -68,7 +67,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
         console.log(`${pc.cyan(`vike v${projectInfo.projectVersion}`)} ${pc.green('pre-rendering HTML...')}`);
     }
     await disableReactStreaming();
-    const viteConfig = await resolveConfig(options.viteConfig || {}, 'vike pre-rendering', 'production');
+    const viteConfig = await resolveConfig(options.viteConfig || {}, 'build', 'production');
     assertLoadedConfig(viteConfig, options);
     const vikeConfig = await getVikeConfig(viteConfig);
     const { outDirClient } = getOutDirs(viteConfig);
@@ -481,7 +480,7 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
                 usesClientRouter = getConfigValueRuntime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
-                usesClientRouter = globalContext.pluginManifest.usesClientRouter;
+                usesClientRouter = globalContext.usesClientRouter;
             }
         }
         objectAssign(pageContext, {

package/dist/esm/node/runtime/globalContext.d.ts

@@ -12,10 +12,10 @@ export { setGlobalContext_viteConfig };
 export { setGlobalContext_vikeConfig };
 export { setGlobalContext_isViteDev };
 export { setGlobalContext_isPrerendering };
+export { setBuildEntry };
 import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
-import { PluginManifest } from '../shared/assertPluginManifest.js';
-import type { VikeConfigGlobal } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
+import type { VikeConfigGlobal } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 import { type RuntimeManifest } from '../shared/assertRuntimeManifest.js';
 import type { VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 type GlobalContextPublic = {
@@ -35,17 +35,16 @@ type GlobalContext = {
     vikeConfig: VikeConfigObject;
     viteDevServer: ViteDevServer;
     assetsManifest: null;
-    pluginManifest: null;
 } | ({
     isProduction: true;
     assetsManifest: ViteManifest;
-    pluginManifest: PluginManifest;
     viteDevServer: null;
 } & ({
     isPrerendering: false;
     viteConfig: null;
 } | {
     isPrerendering: true;
+    usesClientRouter: boolean;
     viteConfig: ResolvedConfig;
 })));
 declare function getGlobalContext(): GlobalContext;
@@ -64,3 +63,4 @@ declare function initGlobalContext_renderPage(): Promise<void>;
 declare function initGlobalContext_runPrerender(): Promise<void>;
 declare function initGlobalContext_getGlobalContextAsync(isProduction: boolean): Promise<void>;
 declare function getRuntimeManifest(vikeConfigGlobal: VikeConfigGlobal, viteConfig: ResolvedConfig): RuntimeManifest;
+declare function setBuildEntry(buildEntry: unknown): void;

package/dist/esm/node/runtime/globalContext.js

@@ -14,13 +14,14 @@ export { setGlobalContext_viteConfig };
 export { setGlobalContext_vikeConfig };
 export { setGlobalContext_isViteDev };
 export { setGlobalContext_isPrerendering };
-import { assert, onSetupRuntime, assertUsage, assertWarning, getGlobalObject, isPlainObject, objectAssign, objectKeys, genPromise } from './utils.js';
-import { loadImportBuild } from './globalContext/loadImportBuild.js';
-import { setPageFiles } from '../../shared/getPageFiles.js';
+export { setBuildEntry };
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectAssign, objectKeys, isObject, hasProp, debugGlob, getGlobalObject, genPromise } from './utils.js';
+import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
+import { virtualFileIdImportUserCodeServer } from '../shared/virtual-files/virtualFileImportUserCode.js';
+import { setPageFiles, setPageFilesAsync } from '../../shared/getPageFiles/getPageFiles.js';
 import { assertPluginManifest } from '../shared/assertPluginManifest.js';
 import { assertRuntimeManifest } from '../shared/assertRuntimeManifest.js';
 import pc from '@brillout/picocolors';
-import { getPageFilesExports } from './page-files/getPageFilesExports.js';
 import { resolveBaseFromResolvedConfig } from '../shared/resolveBase.js';
 const globalObject = getGlobalObject('globalContext.ts', (() => {
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = genPromise();
@@ -29,6 +30,7 @@ const globalObject = getGlobalObject('globalContext.ts', (() => {
         viteDevServerPromiseResolve
     };
 })());
+initDevEntry();
 function getGlobalContext() {
     assert(globalObject.globalContext);
     return globalObject.globalContext;
@@ -152,13 +154,11 @@ async function initGlobalContext(isProduction) {
         assert(vikeConfig);
         assert(viteDevServer);
         assert(!isPrerendering);
-        const vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
-        const pluginManifest = getRuntimeManifest(vikeConfigGlobal, viteConfig);
+        const pluginManifest = getRuntimeManifest(vikeConfig.vikeConfigGlobal, viteConfig);
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
             assetsManifest: null,
-            pluginManifest: null,
             viteDevServer,
             viteConfig,
             vikeConfig,
@@ -171,22 +171,21 @@ async function initGlobalContext(isProduction) {
         };
     }
     else {
-        const buildEntries = await loadImportBuild(globalObject.outDirRoot);
-        assertBuildEntries(buildEntries, isPrerendering ?? false);
-        const { pageFiles, assetsManifest, pluginManifest } = buildEntries;
-        setPageFiles(pageFiles);
+        const buildEntry = await getBuildEntry(globalObject.outDirRoot);
+        const { assetsManifest, pluginManifest } = buildEntry;
+        setPageFiles(buildEntry.pageFiles);
         assertViteManifest(assetsManifest);
         assertPluginManifest(pluginManifest);
         const globalContext = {
             isProduction: true,
             assetsManifest,
-            pluginManifest,
             viteDevServer: null,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
             redirects: pluginManifest.redirects,
             trailingSlash: pluginManifest.trailingSlash,
+            usesClientRouter: pluginManifest.usesClientRouter,
             disableUrlNormalization: pluginManifest.disableUrlNormalization
         };
         if (isPrerendering) {
@@ -220,15 +219,6 @@ function getRuntimeManifest(vikeConfigGlobal, viteConfig) {
     assertRuntimeManifest(manifest);
     return manifest;
 }
-function assertBuildEntries(buildEntries, isPreRendering) {
-    const errMsg = [
-        `You are tyring to run`,
-        isPreRendering ? 'pre-rendering' : 'the server for production',
-        `but your app isn't built yet. Run ${pc.cyan('$ vike build')} before `,
-        isPreRendering ? 'pre-rendering.' : 'running the server.'
-    ].join(' ');
-    assertUsage(buildEntries, errMsg);
-}
 function assertViteManifest(manifest) {
     assert(isPlainObject(manifest));
     /* We should include these assertions but we don't as a workaround for PWA manifests: https://github.com/vikejs/vike/issues/769
@@ -247,3 +237,36 @@ function eagerlyLoadUserFiles() {
     // We call it as early as possible here for better performance.
     getPageFilesExports();
 }
+async function getBuildEntry(outDir) {
+    if (!globalObject.buildEntry) {
+        await importServerProductionEntry({ outDir });
+        assert(globalObject.buildEntry);
+    }
+    return globalObject.buildEntry;
+}
+function setBuildEntry(buildEntry) {
+    assert(isObject(buildEntry));
+    assert(hasProp(buildEntry, 'pageFiles', 'object'));
+    assert(hasProp(buildEntry, 'assetsManifest', 'object'));
+    assert(hasProp(buildEntry, 'pluginManifest', 'object'));
+    globalObject.buildEntry = buildEntry;
+}
+function initDevEntry() {
+    setPageFilesAsync(getPageFilesExports);
+}
+async function getPageFilesExports() {
+    const viteDevServer = getViteDevServer();
+    assert(viteDevServer);
+    let moduleExports;
+    try {
+        moduleExports = await viteDevServer.ssrLoadModule(virtualFileIdImportUserCodeServer);
+    }
+    catch (err) {
+        debugGlob(`Glob error: ${virtualFileIdImportUserCodeServer} transpile error: `, err);
+        throw err;
+    }
+    moduleExports = moduleExports.default || moduleExports;
+    debugGlob('Glob result: ', moduleExports);
+    assert(isObject(moduleExports));
+    return moduleExports;
+}

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -5,7 +5,7 @@ import { sanitizeJson } from './sanitizeJson.js';
 import { inferAssetTag, inferPreloadTag } from './inferHtmlTags.js';
 import { mergeScriptTags } from './mergeScriptTags.js';
 import { getPageConfig } from '../../../../shared/page-configs/helpers.js';
-import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfigValueRuntime.js';
 import { getGlobalContext } from '../../globalContext.js';
 import pc from '@brillout/picocolors';
 import { getConfigDefinedAt } from '../../../../shared/page-configs/getConfigDefinedAt.js';

package/dist/esm/node/runtime/index-common.d.ts

@@ -6,4 +6,3 @@ export { getGlobalContextSync, getGlobalContextAsync } from './globalContext.js'
 export { createDevMiddleware } from '../runtime-dev/index.js';
 export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
 export { createPageRenderer } from '../createPageRenderer.js';
-import './page-files/setup.js';

package/dist/esm/node/runtime/index-common.js

@@ -8,18 +8,3 @@ export { createDevMiddleware } from '../runtime-dev/index.js';
 export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
 // TODO/v1-release: remove
 export { createPageRenderer } from '../createPageRenderer.js';
-addEcosystemStamp();
-import './page-files/setup.js';
-// Used by:
-// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
-function addEcosystemStamp() {
-    const g = globalThis;
-    g._isVikeApp =
-        /* Don't set to true so that consumers do `!!globalThis._isVikeApp` instead of `globalThis._isVikeApp === true`.
-        true
-        */
-        // We use an object so that we can eventually, in the future, add helpful information as needed. (E.g. the Vike version, or global settings.)
-        {};
-    // We keep the old stamp for older Telefunc versions
-    g._isVitePluginSsr = true;
-}

package/dist/esm/node/runtime/index-deprecated.d.ts

@@ -1,5 +1,6 @@
 export * from './index-common.js';
 export * from '../../types/index-dreprecated.js';
+import { RenderErrorPage as RenderErrorPage_ } from '../../shared/route/abort.js';
 /** @deprecated
  * Replace:
  *   ```

package/dist/esm/node/runtime/onLoad.js

@@ -1,13 +1,27 @@
 export { onLoad };
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
 import { assertNodeVersion } from '../../utils/assertNodeVersion.js';
+import { setAlwaysShowStackTrace } from '../../utils/assert.js';
 import { installRequireShim } from '@brillout/require-shim';
-import { setAlwaysShowStackTrace } from './utils.js';
 import { isErrorDebug } from '../shared/isErrorDebug.js';
 function onLoad() {
     assertIsNotBrowser();
     assertNodeVersion();
-    installRequireShim();
     if (isErrorDebug())
         setAlwaysShowStackTrace();
+    addEcosystemStamp();
+    installRequireShim();
+}
+// Used by:
+// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
+function addEcosystemStamp() {
+    const g = globalThis;
+    g._isVikeApp =
+        /* Don't set to true so that consumers do `!!globalThis._isVikeApp` instead of `globalThis._isVikeApp === true`.
+        true
+        */
+        // We use an object so that we can eventually, in the future, add helpful information as needed. (E.g. the Vike version, or global settings.)
+        {};
+    // We keep the old stamp for older Telefunc versions
+    g._isVitePluginSsr = true;
 }

package/dist/esm/node/runtime/renderPage/analyzePage.js

@@ -4,7 +4,7 @@ import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageC
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
 import { getGlobalContext } from '../globalContext.js';
-import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValueRuntime.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientRuntimeLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);

package/dist/esm/node/runtime/renderPage/createHttpResponse/getCacheControl.js

@@ -1,6 +1,6 @@
 export { getCacheControl };
 import { getPageConfig } from '../../../../shared/page-configs/helpers.js';
-import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfigValueRuntime.js';
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs, statusCode) {
     // TODO/v1-release: remove

package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.d.ts

@@ -1,7 +1,7 @@
 export { executeOnBeforeRenderAndDataHooks };
-import { type PageContextExports } from '../../../shared/getPageFiles.js';
+import { type PageConfigUserFriendly } from '../../../shared/getPageFiles.js';
 import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
 declare function executeOnBeforeRenderAndDataHooks(pageContext: {
     pageId: string;
     _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-} & PageContextExports & PageContextForUserConsumptionServerSide): Promise<void>;
+} & PageConfigUserFriendly & PageContextForUserConsumptionServerSide): Promise<void>;

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.d.ts

@@ -14,7 +14,7 @@ type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContex
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageContextExports & {
+} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.js

@@ -1,5 +1,5 @@
 export { loadUserFilesServerSide };
-import { getPageFilesServerSide, getPageContextExports } from '../../../shared/getPageFiles.js';
+import { getPageFilesServerSide, getPageConfigUserFriendly } from '../../../shared/getPageFiles.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
 import { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
@@ -99,7 +99,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = getPageContextExports(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = getPageConfigUserFriendly(pageFilesServerSide, pageConfigLoaded);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts

@@ -2,9 +2,9 @@ export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
 import { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { PageContextExports } from '../../../shared/getPageFiles/getExports.js';
+import type { PageConfigUserFriendly } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
-type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageContextExports & {
+type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendly & {
     urlOriginal: string;
     /** @deprecated */
     url: string;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -6,7 +6,7 @@ export { getRenderContext };
 export type { RenderContext };
 export type { PageContextAfterRender };
 export type { PageContextInitEnhanced };
-import { type PageFile } from '../../../shared/getPageFiles.js';
+import type { PageFile } from '../../../shared/getPageFiles/getPageFileObject.js';
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
@@ -65,7 +65,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageContextExports & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -116,7 +116,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageContextExports & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -168,7 +168,7 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageContextExports & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -219,7 +219,7 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageContextExports & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -5,7 +5,7 @@ export { getPageContextInitEnhanced };
 export { getRenderContext };
 import { getErrorPageId } from '../../../shared/error-page.js';
 import { getHtmlString } from '../html/renderHtml.js';
-import { getPageFilesAll } from '../../../shared/getPageFiles.js';
+import { getPageFilesAll } from '../../../shared/getPageFiles/getPageFiles.js';
 import { assert, assertUsage, assertWarning, hasProp, normalizeHeaders, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
@@ -169,10 +169,10 @@ async function getRenderContext() {
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     pageConfigs.length > 0, pageFilesAll);
     const renderContext = {
-        pageFilesAll: pageFilesAll,
+        pageFilesAll,
         pageConfigs,
         pageConfigGlobal,
-        allPageIds: allPageIds,
+        allPageIds,
         pageRoutes,
         onBeforeRouteHook
     };

package/dist/esm/node/shared/resolveBase.js

@@ -4,12 +4,12 @@ import { assert, assertUsage, isBaseServer, isBaseAssets } from './utils.js';
 import pc from '@brillout/picocolors';
 function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
     let baseViteOriginal = config._baseViteOriginal;
-    if (baseViteOriginal === '/__UNSET__')
-        baseViteOriginal = null;
     assert(baseViteOriginal === null || typeof baseViteOriginal == 'string');
     return resolveBase(baseViteOriginal, baseServer, baseAssets);
 }
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
+    if (baseViteOriginal === '/__UNSET__')
+        baseViteOriginal = null;
     {
         const wrongBase = (val) => `should start with ${pc.cyan('/')}, ${pc.cyan('http://')}, or ${pc.cyan('https://')} (it's ${pc.cyan(val)} instead)`;
         assertUsage(baseViteOriginal === null || isBaseAssets(baseViteOriginal), `vite.config.js#base ${wrongBase(baseViteOriginal)}`);

package/dist/esm/shared/getPageFiles/analyzeClientSide.js

@@ -1,5 +1,5 @@
 export { analyzeClientSide };
-import { getConfigValueRuntime } from '../page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../page-configs/getConfigValueRuntime.js';
 import { analyzePageClientSide } from './analyzePageClientSide.js';
 function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design

package/dist/esm/shared/getPageFiles/{setPageFiles.js → getPageFiles.js}

@@ -1,11 +1,10 @@
+export { getPageFilesAll };
 export { setPageFiles };
 export { setPageFilesAsync };
-export { getPageFilesAll };
 import { assert, unique } from '../utils.js';
 import { parseGlobResults } from './parseGlobResults.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 const globalObject = getGlobalObject('setPageFiles.ts', {});
-// TODO:v1-design-release: rename setPageFiles() getPageFilesAll() parseGlobResult()
 function setPageFiles(pageFilesExports) {
     const { pageFiles, pageConfigs, pageConfigGlobal } = parseGlobResults(pageFilesExports);
     globalObject.pageFilesAll = pageFiles;
@@ -23,11 +22,11 @@ async function getPageFilesAll(isClientSide, isProduction) {
         assert(isProduction === undefined);
     }
     else {
-        assert(globalObject.pageFilesGetter);
         assert(typeof isProduction === 'boolean');
         if (!globalObject.pageFilesAll ||
             // We reload all glob imports in dev to make auto-reload work
             !isProduction) {
+            assert(globalObject.pageFilesGetter);
             await globalObject.pageFilesGetter();
         }
     }

package/dist/esm/shared/getPageFiles.d.ts

@@ -1,8 +1,5 @@
 export type { PageFile } from './getPageFiles/getPageFileObject.js';
-export type { ExportsAll, PageContextExports } from './getPageFiles/getExports.js';
-export { getPageFilesAll } from './getPageFiles/setPageFiles.js';
-export { setPageFiles } from './getPageFiles/setPageFiles.js';
-export { setPageFilesAsync } from './getPageFiles/setPageFiles.js';
+export type { ExportsAll, PageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';
-export { getPageContextExports } from './getPageFiles/getExports.js';
+export { getPageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';

package/dist/esm/shared/getPageFiles.js

@@ -1,6 +1,3 @@
-export { getPageFilesAll } from './getPageFiles/setPageFiles.js';
-export { setPageFiles } from './getPageFiles/setPageFiles.js';
-export { setPageFilesAsync } from './getPageFiles/setPageFiles.js';
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';
-export { getPageContextExports } from './getPageFiles/getExports.js';
+export { getPageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';

package/dist/esm/shared/hooks/getHook.d.ts

@@ -9,7 +9,7 @@ export type { HookLoc };
 export type { HookTimeout };
 export type { HooksTimeoutProvidedByUser };
 export { getHookTimeoutDefault };
-import type { PageContextExports } from '../getPageFiles.js';
+import type { PageConfigUserFriendly } from '../getPageFiles.js';
 import type { HookName, HookNamePage, HookNameGlobal } from '../page-configs/Config.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../page-configs/PageConfig.js';
 type Hook = HookLoc & {
@@ -26,10 +26,10 @@ type HookTimeout = {
     warning: number | false;
 };
 type HooksTimeoutProvidedByUser = false | Partial<Record<HookName, false | Partial<HookTimeout>>>;
-declare function getHook(pageContext: PageContextExports, hookName: HookName): null | Hook;
+declare function getHook(pageContext: PageConfigUserFriendly, hookName: HookName): null | Hook;
 declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | Hook;
 declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | Hook;
-declare function assertHook<TPageContext extends PageContextExports, THookName extends PropertyKey & HookName>(pageContext: TPageContext, hookName: THookName): asserts pageContext is TPageContext & {
+declare function assertHook<TPageContext extends PageConfigUserFriendly, THookName extends PropertyKey & HookName>(pageContext: TPageContext, hookName: THookName): asserts pageContext is TPageContext & {
     exports: Record<THookName, Function | undefined>;
 };
 declare function getHookTimeoutDefault(hookName: HookName): HookTimeout;

package/dist/esm/shared/hooks/getHook.js

@@ -8,7 +8,7 @@ export { getHook_setIsPrerenderering };
 export { getHookTimeoutDefault };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { getHookFilePathToShowToUser } from '../page-configs/helpers.js';
-import { getConfigValueRuntime } from '../page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../page-configs/getConfigValueRuntime.js';
 import { assert, assertUsage, checkType, isCallable, isObject } from '../utils.js';
 import pc from '@brillout/picocolors';
 const globalObject = getGlobalObject('getHook.ts', {});

package/dist/esm/shared/page-configs/Config.d.ts

@@ -35,7 +35,7 @@ import type { PrefetchSetting, PrefetchStaticAssets } from '../../client/client-
 import type { ConfigDefinition } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
 import type { DocumentHtml } from '../../node/runtime/html/renderHtml.js';
 import type { InjectFilterEntry } from '../../types/index.js';
-import type { VikeVitePluginOptions } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
+import type { VikeVitePluginOptions } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 import type { Vike, VikePackages } from '../VikeNamespace.js';
 import type { HooksTimeoutProvidedByUser } from '../hooks/getHook.js';
 import type { PageContextClient, PageContextServer } from '../types.js';

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -54,6 +54,7 @@ type PageConfigGlobalRuntime = {
 type PageConfigGlobalBuildTime = {
     configValueSources: ConfigValueSources;
     configDefinitions: ConfigDefinitions;
+    configValuesComputed?: undefined;
 };
 /** In what environment(s) the config value is loaded.
  *
@@ -70,6 +71,8 @@ type ConfigEnvInternal = Omit<ConfigEnv, 'client'> & {
     /** Load value only in production, or only in development. */
     production?: boolean;
 };
+type ConfigValueSources = Record<string, // configName
+ConfigValueSource[]>;
 type ConfigValueSource = {
     value?: unknown;
     configEnv: ConfigEnvInternal;
@@ -85,11 +88,13 @@ type ConfigValueSource = {
 type DefinedAtFilePath = DefinedAtFile & FilePath & {
     fileExportName?: string;
 };
-type ConfigValueSources = Record<string, ConfigValueSource[]>;
-type ConfigValuesComputed = Record<string, {
+type ConfigValuesComputed = Record<string, // configName
+{
     configEnv: ConfigEnvInternal;
     value: unknown;
 }>;
+type ConfigValues = Record<string, // configName
+ConfigValue>;
 type ConfigValue = ConfigValueStandard | ConfigValueCumulative | ConfigValueComputed;
 /** Defined by a unique source (thus unique file path). */
 type ConfigValueStandard = {
@@ -109,7 +114,6 @@ type ConfigValueComputed = {
     value: unknown;
     definedAtData: null;
 };
-type ConfigValues = Record<string, ConfigValue>;
 type DefinedAtData = DefinedAtFile | DefinedAtFile[] | null;
 type DefinedAtFile = {
     filePathToShowToUser: string;