vike 0.4.237-commit-92dc549 → 0.4.237-commit-2d6f480

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

@@ -1,45 +1,19 @@
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
-import { build as buildVite, version, createBuilder } from 'vite';
-import { isVikeCli } from '../cli/context.js';
-import { wasPrerenderRun } from '../prerender/context.js';
-import { assert, assertVersion } from './utils.js';
+import { createBuilder } from 'vite';
 /**
  * Programmatically trigger `$ vike build`
  *
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigFromUserEnhanced, vikeConfig } = await prepareViteApiCall(options, 'build');
+    const { viteConfigFromUserEnhanced } = await prepareViteApiCall(options, 'build');
     // Pass it to pluginAutoFullBuild()
     if (viteConfigFromUserEnhanced)
         viteConfigFromUserEnhanced._viteConfigFromUserEnhanced = viteConfigFromUserEnhanced;
-    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
-        await builder.buildApp();
-    }
-    else {
-        // This buildVite() call does everything:
-        // 1. Build client-side
-        // 2. Build server-side
-        //    > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L90
-        // 3. Pre-render (if enabled)
-        //    > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L98
-        //    > We purposely don't start the pre-rendering in this `build()` function but in a Rollup hook instead.
-        //    > 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 (
-        // When calling Vike's prerender() API pre-rendering is run without force exit
-        ![false, 'prerender()'].includes(wasPrerenderRun()) &&
-            // When calling Vike's build() API pre-rendering is auto run without force exit
-            isVikeCli()) {
-            assert(false);
-        }
-    }
+    const builder = await createBuilder(viteConfigFromUserEnhanced);
+    // buildApp() is implemented by vike:build:pluginBuildApp
+    await builder.buildApp();
     return {
     /* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`
     viteConfig: viteConfigFromUserEnhanced,

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

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

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

@@ -33,7 +33,6 @@ async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
     const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
-        vikeConfig,
         viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)
         viteConfigFromUserEnhanced,
     };

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

@@ -64,105 +64,7 @@ type PrerenderTrigger = '$ vike prerender' | 'prerender()' | 'auto-run';
 declare function runPrerender(options: PrerenderOptions | undefined, trigger: PrerenderTrigger): Promise<{
     viteConfig: ResolvedConfig;
 }>;
-declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextServerInternal, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<((({
-    _isOriginalObject: true;
-    isPageContext: true;
-} & {
-    isClientSide: false;
-    isPrerendering: boolean;
-} & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-    url?: string;
-    headers?: Record<string, string>;
-} & {
-    _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: 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").VikeConfigPublicPageEagerLoaded;
-        };
-    } & (({
-        _isProduction: false;
-        _isPrerendering: false;
-        assetsManifest: null;
-        _viteDevServer: import("vite").ViteDevServer | undefined;
-        viteConfig: ResolvedConfig | undefined;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } | {
-        _isPrerendering: true;
-        viteConfig: ResolvedConfig;
-        _isProduction: true;
-        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
-        _viteDevServer: null;
-        _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } | {
-        _isPrerendering: false;
-        viteConfig: null;
-        _isProduction: true;
-        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
-        _viteDevServer: null;
-        _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    }) & {
-        baseServer: string;
-        baseAssets: string;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-    });
-    _pageFilesAll: PageFile[];
-    _baseServer: string;
-    _baseAssets: string;
-    _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
-    _urlRewrite: null;
-    _urlHandler: ((url: string) => string) | null;
-    isClientSideNavigation: boolean;
-} & {
-    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;
-} & {
-    urlParsed: import("../runtime/utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
-} & {
-    headers: Record<string, string> | null;
-} & {
-    _urlHandler: null;
-    _httpRequestId: null;
-    _urlRewrite: null;
-    _noExtraDir: boolean | null;
-    _prerenderContext: PrerenderContext;
-    _providedByHook: ProvidedByHook;
-    _urlOriginalModifiedByHook: ProvidedByHookTransformer;
-    is404: boolean;
-} & import("../../shared/route/index.js").PageContextFromRoute & Record<"pageId", string>) | ({
+declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextServerInternal, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -262,216 +164,23 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     is404: boolean;
 } & {
     pageId: string;
-    _debugRouteMatches: never[];
     routeParams: {};
-})) & (((({
-    _isOriginalObject: true;
-    isPageContext: true;
-} & {
-    isClientSide: false;
-    isPrerendering: boolean;
-} & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-    url?: string;
-    headers?: Record<string, string>;
-} & {
-    _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: 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").VikeConfigPublicPageEagerLoaded;
-        };
-    } & (({
-        _isProduction: false;
-        _isPrerendering: false;
-        assetsManifest: null;
-        _viteDevServer: import("vite").ViteDevServer | undefined;
-        viteConfig: ResolvedConfig | undefined;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } | {
-        _isPrerendering: true;
-        viteConfig: ResolvedConfig;
-        _isProduction: true;
-        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
-        _viteDevServer: null;
-        _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } | {
-        _isPrerendering: false;
-        viteConfig: null;
-        _isProduction: true;
-        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
-        _viteDevServer: null;
-        _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    }) & {
-        baseServer: string;
-        baseAssets: string;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-    });
-    _pageFilesAll: PageFile[];
-    _baseServer: string;
-    _baseAssets: string;
-    _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
-    _urlRewrite: null;
-    _urlHandler: ((url: string) => string) | null;
-    isClientSideNavigation: boolean;
-} & {
-    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;
-} & {
-    urlParsed: import("../runtime/utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
-} & {
-    headers: Record<string, string> | null;
-} & {
-    _urlHandler: null;
-    _httpRequestId: null;
-    _urlRewrite: null;
-    _noExtraDir: boolean | null;
-    _prerenderContext: PrerenderContext;
-    _providedByHook: ProvidedByHook;
-    _urlOriginalModifiedByHook: ProvidedByHookTransformer;
-    is404: boolean;
-} & import("../../shared/route/index.js").PageContextFromRoute & Record<"pageId", string>) | ({
-    _isOriginalObject: true;
-    isPageContext: true;
-} & {
-    isClientSide: false;
-    isPrerendering: boolean;
-} & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-    url?: string;
-    headers?: Record<string, string>;
-} & {
-    _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: 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").VikeConfigPublicPageEagerLoaded;
-        };
-    } & (({
-        _isProduction: false;
-        _isPrerendering: false;
-        assetsManifest: null;
-        _viteDevServer: import("vite").ViteDevServer | undefined;
-        viteConfig: ResolvedConfig | undefined;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } | {
-        _isPrerendering: true;
-        viteConfig: ResolvedConfig;
-        _isProduction: true;
-        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
-        _viteDevServer: null;
-        _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } | {
-        _isPrerendering: false;
-        viteConfig: null;
-        _isProduction: true;
-        assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
-        _viteDevServer: null;
-        _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    }) & {
-        baseServer: string;
-        baseAssets: string;
-        viteConfigRuntime: {
-            root: string;
-            build: {
-                outDir: string;
-            };
-            _baseViteOriginal: string;
-            vitePluginServerEntry: {
-                inject: boolean | undefined;
-            };
-        };
-    });
-    _pageFilesAll: PageFile[];
-    _baseServer: string;
-    _baseAssets: string;
-    _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
-    _urlRewrite: null;
-    _urlHandler: ((url: string) => string) | null;
-    isClientSideNavigation: boolean;
-} & {
-    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;
-} & {
-    urlParsed: import("../runtime/utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
+} & import("../../shared/route/index.js").PageContextAfterRoute & {
+    is404: boolean | null;
+    pageId: string;
 } & {
-    headers: Record<string, string> | null;
+    _pageConfig: import("../../types/PageConfig.js").PageConfigRuntime | null;
 } & {
-    _urlHandler: null;
-    _httpRequestId: null;
-    _urlRewrite: null;
-    _noExtraDir: boolean | null;
-    _prerenderContext: PrerenderContext;
-    _providedByHook: ProvidedByHook;
-    _urlOriginalModifiedByHook: ProvidedByHookTransformer;
-    is404: boolean;
+    _pageConfig: null | import("../../types/PageConfig.js").PageConfigRuntime;
+} & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+    _pageConfig: null | import("../../types/PageConfig.js").PageConfigRuntime;
 } & {
-    pageId: string;
-    _debugRouteMatches: never[];
-    routeParams: {};
-})) & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded) & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: import("../runtime/html/serializeContext.js").PassToClient;
-    _pageFilePathsLoaded: string[];
     headersResponse: Headers;
 } & {
     __getPageAssets: () => Promise<import("../runtime/renderPage/getPageAssets.js").PageAsset[]>;
-})) & {
+} & {
     _usesClientRouter: boolean;
 }>;

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

@@ -5,7 +5,7 @@ export { runPrerender };
 import path from 'node:path';
 import { route } from '../../shared/route/index.js';
 import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, PROJECT_VERSION, preservePropertyGetters, changeEnumerable, escapeHtml, } from './utils.js';
-import { prerenderPage } from '../runtime/renderPage/renderPageAlreadyRouted.js';
+import { prerenderPage } from '../runtime/renderPage/renderPageAfterRoute.js';
 import { createPageContextServerSide } from '../runtime/renderPage/createPageContextServerSide.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'node:os';
@@ -15,10 +15,10 @@ import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
 import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueRuntime.js';
-import { loadPageEntry } from '../../shared/page-configs/loadPageEntry.js';
+import { loadAndParseVirtualFilePageEntry } from '../../shared/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { getErrorPageId, isErrorPage } from '../../shared/error-page.js';
 import { isAbortError } from '../../shared/route/abort.js';
-import { loadPageConfigsLazyServerSideAndExecHook } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
+import { loadPageConfigsLazyServerSide } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
 import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, getHook_setIsPrerenderering, } from '../../shared/hooks/getHook.js';
 import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
@@ -29,7 +29,7 @@ import { getOutDirs } from '../vite/shared/getOutDirs.js';
 import fs from 'node:fs';
 import { getProxyForPublicUsage } from '../../shared/getProxyForPublicUsage.js';
 import { getStaticRedirectsForPrerender } from '../runtime/renderPage/resolveRedirects.js';
-import { augmentType } from '../runtime/utils.js';
+import { updateType } from '../runtime/utils.js';
 const docLink = 'https://vike.dev/i18n#pre-rendering';
 async function runPrerender(options = {}, trigger) {
     setWasPrerenderRun(trigger);
@@ -174,7 +174,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
     // V1 design
     await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
-        const pageConfigLoaded = await loadPageEntry(pageConfig, false);
+        const pageConfigLoaded = await loadAndParseVirtualFilePageEntry(pageConfig, false);
         const hook = getHookFromPageConfig(pageConfigLoaded, hookName);
         if (!hook)
             return;
@@ -319,11 +319,10 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
         assert(pageId);
         objectAssign(pageContext, {
             pageId,
-            _debugRouteMatches: [],
             routeParams: {},
         });
     }
-    augmentType(pageContext, await loadPageConfigsLazyServerSideAndExecHook(pageContext));
+    updateType(pageContext, await loadPageConfigsLazyServerSide(pageContext));
     let usesClientRouter;
     {
         const { pageId } = pageContext;

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

@@ -1,6 +1,7 @@
 export { analyzePage };
-import type { PageFile } from '../../../shared/getPageFiles/getPageFileObject.js';
 import type { PageConfigRuntime } from '../../../types/PageConfig.js';
 import { type AnalysisResult } from '../../../shared/getPageFiles/analyzePageClientSide.js';
-import type { GlobalContextServerInternal } from '../globalContext.js';
-declare function analyzePage(pageFilesAll: PageFile[], pageConfig: null | PageConfigRuntime, pageId: string, globalContext: GlobalContextServerInternal): Promise<AnalysisResult>;
+import type { PageContext_loadPageConfigsLazyServerSide } from './loadPageConfigsLazyServerSide.js';
+declare function analyzePage(pageContext: PageContext_loadPageConfigsLazyServerSide & {
+    _pageConfig: null | PageConfigRuntime;
+}): AnalysisResult;

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

@@ -4,7 +4,9 @@ import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageC
 import { generateVirtualFileId } from '../../shared/virtualFileId.js';
 import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
 import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValueRuntime.js';
-async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
+function analyzePage(pageContext) {
+    const { pageId, _pageConfig: pageConfig, _globalContext: globalContext } = pageContext;
+    const { _pageFilesAll: pageFilesAll } = globalContext;
     if (pageConfig) {
         const { isClientRuntimeLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];

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

@@ -1,6 +1,6 @@
 export { createPageContextServerSide };
 export { createPageContextServerSideWithoutGlobalContext };
-import { assert, assertUsage, assertWarning, augmentType, normalizeHeaders, objectAssign } from '../utils.js';
+import { assert, assertUsage, assertWarning, updateType, normalizeHeaders, objectAssign } from '../utils.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
 import { createPageContextObject, createPageContextShared } from '../../../shared/createPageContextShared.js';
 function createPageContextServerSide(pageContextInit, globalContext, args) {
@@ -39,7 +39,7 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
         objectAssign(pageContextCreated, { headers });
     }
     const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
-    augmentType(pageContextCreated, pageContextAugmented);
+    updateType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }
 function createPageContextServerSideWithoutGlobalContext(pageContextInit) {

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

@@ -17,7 +17,6 @@ declare function execHookOnRenderHtml(pageContext: PageContextForPublicUsageServ
     __getPageAssets: GetPageAssets;
     _isHtmlOnly: boolean;
     _baseServer: string;
-    _pageFilePathsLoaded: string[];
     _httpRequestId: number | null;
 }): Promise<{
     renderHook: RenderHook;

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

@@ -53,17 +53,7 @@ function getRenderHook(pageContext) {
     }
     if (!hookFound) {
         const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
-        assertUsage(false, [
-            `No ${hookName}() hook found, see https://vike.dev/${hookName}`,
-            /*
-            'See https://vike.dev/render-modes for more information.',
-            [
-              // 'Loaded config files (none of them define the onRenderHtml() hook):',
-              'Loaded server-side page files (none of them `export { render }`):',
-              ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
-            ].join('\n')
-            */
-        ].join(' '));
+        assertUsage(false, `No ${hookName}() hook found, see https://vike.dev/${hookName}`);
     }
     return hookFound;
 }

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

@@ -1,7 +1,6 @@
 export { getPageAssets };
 export type { PageAsset };
 export type { GetPageAssets };
-export type { PageContextGetPageAssets };
 import { type MediaType } from './inferMediaType.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
@@ -12,9 +11,8 @@ type PageAsset = {
     isEntry: boolean;
 };
 type GetPageAssets = () => Promise<PageAsset[]>;
-type PageContextGetPageAssets = {
+declare function getPageAssets(pageContext: {
     _baseServer: string;
     _baseAssets: string | null;
     _globalContext: GlobalContextServerInternal;
-};
-declare function getPageAssets(pageContext: PageContextGetPageAssets, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;
+}, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;

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

@@ -1,6 +1,6 @@
 export { handleErrorWithoutErrorPage };
 import type { GlobalContextServerInternal } from '../globalContext.js';
-import type { PageContextAfterRender } from './renderPageAlreadyRouted.js';
+import type { PageContextAfterRender } from './renderPageAfterRoute.js';
 import type { PageContextCreated } from './createPageContextServerSide.js';
 declare function handleErrorWithoutErrorPage<PageContext extends PageContextCreated & {
     errorWhileRendering: null | Error;