vike 0.4.237-commit-92dc549 → 0.4.237-commit-fd8294f

package/dist/cjs/client/runtime-server-routing/utils.js

@@ -30,5 +30,5 @@ __exportStar(require("../../utils/parseUrl.js"), exports);
 __exportStar(require("../../utils/slice.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports); // Only used by Server Routing (not needed for Client Routing)
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
-__exportStar(require("../../utils/augmentType.js"), exports);
+__exportStar(require("../../utils/updateType.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);

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

@@ -3,45 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
-const context_js_1 = require("../cli/context.js");
-const context_js_2 = require("../prerender/context.js");
-const utils_js_1 = require("./utils.js");
 /**
  * Programmatically trigger `$ vike build`
  *
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigFromUserEnhanced, vikeConfig } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'build');
+    const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.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
-        (0, utils_js_1.assertVersion)('Vite', vite_1.version, '6.0.0');
-        const builder = await (0, vite_1.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 (0, vite_1.build)(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((0, context_js_2.wasPrerenderRun)()) &&
-            // When calling Vike's build() API pre-rendering is auto run without force exit
-            (0, context_js_1.isVikeCli)()) {
-            (0, utils_js_1.assert)(false);
-        }
-    }
+    const builder = await (0, vite_1.createBuilder)(viteConfigFromUserEnhanced);
+    // See Vite plugin vike:build:pluginBuildApp
+    await builder.buildApp();
     return {
     /* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`
     viteConfig: viteConfigFromUserEnhanced,

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

@@ -43,7 +43,7 @@ exports.runPrerender = runPrerender;
 const node_path_1 = __importDefault(require("node:path"));
 const index_js_1 = require("../../shared/route/index.js");
 const utils_js_1 = require("./utils.js");
-const renderPageAlreadyRouted_js_1 = require("../runtime/renderPage/renderPageAlreadyRouted.js");
+const renderPageAfterRoute_js_1 = require("../runtime/renderPage/renderPageAfterRoute.js");
 const createPageContextServerSide_js_1 = require("../runtime/renderPage/createPageContextServerSide.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const node_os_1 = require("node:os");
@@ -53,7 +53,7 @@ const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
 const getConfigValueRuntime_js_1 = require("../../shared/page-configs/getConfigValueRuntime.js");
-const loadPageEntry_js_1 = require("../../shared/page-configs/loadPageEntry.js");
+const loadAndParseVirtualFilePageEntry_js_1 = require("../../shared/page-configs/loadAndParseVirtualFilePageEntry.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const abort_js_1 = require("../../shared/route/abort.js");
 const loadPageConfigsLazyServerSide_js_1 = require("../runtime/renderPage/loadPageConfigsLazyServerSide.js");
@@ -212,7 +212,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
     // V1 design
     await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
-        const pageConfigLoaded = await (0, loadPageEntry_js_1.loadPageEntry)(pageConfig, false);
+        const pageConfigLoaded = await (0, loadAndParseVirtualFilePageEntry_js_1.loadAndParseVirtualFilePageEntry)(pageConfig, false);
         const hook = (0, getHook_js_1.getHookFromPageConfig)(pageConfigLoaded, hookName);
         if (!hook)
             return;
@@ -357,11 +357,10 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
         (0, utils_js_1.assert)(pageId);
         (0, utils_js_1.objectAssign)(pageContext, {
             pageId,
-            _debugRouteMatches: [],
             routeParams: {},
         });
     }
-    (0, utils_js_2.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSideAndExecHook)(pageContext));
+    (0, utils_js_2.updateType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
     let usesClientRouter;
     {
         const { pageId } = pageContext;
@@ -541,7 +540,7 @@ async function prerenderPages(prerenderContext, concurrencyLimit, onComplete) {
     await Promise.all(prerenderContext.pageContexts.map((pageContextBeforeRender) => concurrencyLimit(async () => {
         let res;
         try {
-            res = await (0, renderPageAlreadyRouted_js_1.prerenderPage)(pageContextBeforeRender);
+            res = await (0, renderPageAfterRoute_js_1.prerenderPage)(pageContextBeforeRender);
         }
         catch (err) {
             assertIsNotAbort(err, picocolors_1.default.cyan(pageContextBeforeRender.urlOriginal));

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

@@ -6,7 +6,9 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 const virtualFileId_js_1 = require("../../shared/virtualFileId.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const getConfigValueRuntime_js_1 = require("../../../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 } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];

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

@@ -41,7 +41,7 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
     const pageContextAugmented = (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
-    (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
+    (0, utils_js_1.updateType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }
 function createPageContextServerSideWithoutGlobalContext(pageContextInit) {

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

@@ -58,17 +58,7 @@ function getRenderHook(pageContext) {
     }
     if (!hookFound) {
         const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
-        (0, utils_js_1.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(' '));
+        (0, utils_js_1.assertUsage)(false, `No ${hookName}() hook found, see https://vike.dev/${hookName}`);
     }
     return hookFound;
 }

package/dist/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js

@@ -1,45 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPageConfigsLazyServerSideAndExecHook = loadPageConfigsLazyServerSideAndExecHook;
+exports.loadPageConfigsLazyServerSide = loadPageConfigsLazyServerSide;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
 const resolveVikeConfigPublic_js_1 = require("../../../shared/page-configs/resolveVikeConfigPublic.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
 const getPageAssets_js_1 = require("./getPageAssets.js");
-const debugPageFiles_js_1 = require("./debugPageFiles.js");
 const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig.js");
 const analyzePage_js_1 = require("./analyzePage.js");
-const loadPageEntry_js_1 = require("../../../shared/page-configs/loadPageEntry.js");
+const loadAndParseVirtualFilePageEntry_js_1 = require("../../../shared/page-configs/loadAndParseVirtualFilePageEntry.js");
 const execHookServer_js_1 = require("./execHookServer.js");
 const getCacheControl_js_1 = require("./getCacheControl.js");
-async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
-    const pageContextAddendum = await loadPageConfigsLazyServerSide(pageContext);
-    (0, utils_js_1.objectAssign)(pageContext, pageContextAddendum);
+async function loadPageConfigsLazyServerSide(pageContext) {
+    (0, utils_js_1.objectAssign)(pageContext, {
+        _pageConfig: (0, findPageConfig_js_1.findPageConfig)(pageContext._globalContext._pageConfigs, pageContext.pageId),
+    });
+    // Load the page's + files
+    (0, utils_js_1.updateType)(pageContext, await loadPageUserFiles(pageContext));
+    // Resolve new computed pageContext properties
+    (0, utils_js_1.updateType)(pageContext, await resolvePageContext(pageContext));
+    // Execute +onCreatePageContext
     await (0, execHookServer_js_1.execHookServer)('onCreatePageContext', pageContext);
     return pageContext;
 }
-// TODO/now: define new function resolveAfterLoad() ?
-async function loadPageConfigsLazyServerSide(pageContext) {
-    const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
-    const globalContext = pageContext._globalContext;
-    const [{ pageFilesLoaded, configPublicPageLazy }] = await Promise.all([
-        loadPageConfigFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
-        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
-            sharedPageFilesAlreadyLoaded: true,
-        }),
-    ]);
-    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
-    const isV1Design = !!pageConfig;
+async function resolvePageContext(pageContext) {
+    const { isHtmlOnly, clientEntries, clientDependencies } = (0, analyzePage_js_1.analyzePage)(pageContext);
     const passToClient = [];
     const errMsgSuffix = ' should be an array of strings.';
+    const isV1Design = !!pageContext._pageConfig;
     if (!isV1Design) {
-        configPublicPageLazy.exportsAll.passToClient?.forEach((e) => {
+        pageContext.exportsAll.passToClient?.forEach((e) => {
             (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsgSuffix}`);
             passToClient.push(...e.exportValue);
         });
     }
     else {
-        configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
+        pageContext.from.configsCumulative.passToClient?.values.forEach((v) => {
             const { value, definedAt } = v;
             const errMsg = `+passToClient value defined at ${definedAt}${errMsgSuffix}`;
             //*/ TO-DO/next-major-release: remove the passToClient once setting from the public API
@@ -59,16 +55,13 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             passToClient.push(...valS);
         });
     }
-    const pageContextAddendum = {};
-    (0, utils_js_1.objectAssign)(pageContextAddendum, configPublicPageLazy);
-    (0, utils_js_1.objectAssign)(pageContextAddendum, {
-        Page: configPublicPageLazy.exports.Page,
+    (0, utils_js_1.objectAssign)(pageContext, {
+        Page: pageContext.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
-        _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
-        headersResponse: resolveHeadersResponse(pageContext, pageContextAddendum),
+        headersResponse: resolveHeadersResponse(pageContext),
     });
-    (0, utils_js_1.objectAssign)(pageContextAddendum, {
+    (0, utils_js_1.objectAssign)(pageContext, {
         __getPageAssets: async () => {
             if ('_pageAssets' in pageContext) {
                 return pageContext._pageAssets;
@@ -81,14 +74,14 @@ async function loadPageConfigsLazyServerSide(pageContext) {
         },
     });
     // TO-DO/next-major-release: remove
-    Object.assign(pageContextAddendum, {
+    Object.assign(pageContext, {
         _getPageAssets: async () => {
             (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
                 onlyOnce: true,
                 showStackTrace: true,
             });
             const pageAssetsOldFormat = [];
-            (await pageContextAddendum.__getPageAssets()).forEach((p) => {
+            (await pageContext.__getPageAssets()).forEach((p) => {
                 if (p.assetType === 'script' && p.isEntry) {
                     pageAssetsOldFormat.push({
                         src: p.src,
@@ -107,30 +100,33 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             return pageAssetsOldFormat;
         },
     });
-    (0, debugPageFiles_js_1.debugPageFiles)({
-        pageContext,
-        isHtmlOnly,
-        isClientRouting,
-        pageFilesLoaded,
-        pageFilesClientSide,
-        pageFilesServerSide,
-        clientEntries,
-        clientDependencies,
-    });
-    return pageContextAddendum;
+    return pageContext;
+}
+async function loadPageUserFiles(pageContext) {
+    const [{ configPublicPageLazy }] = await Promise.all([
+        loadPageUserFiles_v1Design(pageContext),
+        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
+            sharedPageFilesAlreadyLoaded: true,
+        }),
+    ]);
+    (0, utils_js_1.objectAssign)(pageContext, configPublicPageLazy);
+    return pageContext;
 }
-async function loadPageConfigFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
-    const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
-    const pageConfigLoaded = !pageConfig ? null : await (0, loadPageEntry_js_1.loadPageEntry)(pageConfig, isDev);
+async function loadPageUserFiles_v1Design(pageContext) {
+    const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageContext._pageFilesAll, pageContext.pageId);
+    const isDev = !pageContext._globalContext._isProduction;
+    const pageConfigLoaded = !pageContext._pageConfig
+        ? null
+        : await (0, loadAndParseVirtualFilePageEntry_js_1.loadAndParseVirtualFilePageEntry)(pageContext._pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazyLoaded)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazyLoaded)(pageFilesServerSide, pageConfigLoaded, pageContext._globalContext._pageConfigGlobal);
     return {
         configPublicPageLazy,
         pageFilesLoaded: pageFilesServerSide,
     };
 }
-function resolveHeadersResponse(pageContext, pageContextAddendum) {
-    const headersResponse = mergeHeaders(pageContextAddendum.config.headersResponse);
+function resolveHeadersResponse(pageContext) {
+    const headersResponse = mergeHeaders(pageContext.config.headersResponse);
     if (!headersResponse.get('Cache-Control')) {
         const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs);
         if (cacheControl)

package/dist/cjs/node/runtime/renderPage/{renderPageAlreadyRouted.js → renderPageAfterRoute.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderPageAlreadyRouted = renderPageAlreadyRouted;
+exports.renderPageAfterRoute = renderPageAfterRoute;
 exports.prerenderPage = prerenderPage;
 const error_page_js_1 = require("../../../shared/error-page.js");
 const renderHtml_js_1 = require("../html/renderHtml.js");
@@ -19,8 +19,7 @@ const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContex
 const execHookGuard_js_1 = require("../../../shared/route/execHookGuard.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
-// TODO/now: rename?
-async function renderPageAlreadyRouted(pageContext) {
+async function renderPageAfterRoute(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
     //  - ID of the error page `_error.page.js`.
@@ -29,7 +28,7 @@ async function renderPageAlreadyRouted(pageContext) {
     (0, utils_js_1.assert)(isError ===
         (pageContext.pageId ===
             (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs)));
-    (0, utils_js_1.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSideAndExecHook)(pageContext));
+    (0, utils_js_1.updateType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
     if (!isError) {
         await (0, execHookGuard_js_1.execHookGuard)(pageContext, (pageContext) => (0, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer)(pageContext));
     }

package/dist/cjs/node/runtime/renderPage.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderPage = renderPage;
 exports.renderPage_addAsyncHookwrapper = renderPage_addAsyncHookwrapper;
-const renderPageAlreadyRouted_js_1 = require("./renderPage/renderPageAlreadyRouted.js");
+const renderPageAfterRoute_js_1 = require("./renderPage/renderPageAfterRoute.js");
 const createPageContextServerSide_js_1 = require("./renderPage/createPageContextServerSide.js");
 const index_js_1 = require("../../shared/route/index.js");
 const utils_js_1 = require("./utils.js");
@@ -158,7 +158,7 @@ async function renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRe
 async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNominalPageBegin, globalContext, httpRequestId, pageContextsFromRewrite) {
     (0, utils_js_1.assert)(pageContextNominalPageBegin);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageBegin, 'urlOriginal', 'string'));
-    const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPageBegin);
+    const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextBegin, errNominalPage);
     // Handle `throw redirect()` and `throw render()` while rendering nominal page
     if ((0, abort_js_1.isAbortError)(errNominalPage)) {
         const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
@@ -183,7 +183,7 @@ async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNo
     }
     let pageContextErrorPage;
     try {
-        pageContextErrorPage = await (0, renderPageAlreadyRouted_js_1.renderPageAlreadyRouted)(pageContextErrorPageInit);
+        pageContextErrorPage = await (0, renderPageAfterRoute_js_1.renderPageAfterRoute)(pageContextErrorPageInit);
     }
     catch (errErrorPage) {
         // Handle `throw redirect()` and `throw render()` while rendering error page
@@ -298,11 +298,11 @@ async function renderPageNominal(pageContext) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'pageId', 'string'));
     (0, utils_js_1.assert)(pageContext.errorWhileRendering === null);
     // Render
-    const pageContextAfterRender = await (0, renderPageAlreadyRouted_js_1.renderPageAlreadyRouted)(pageContext);
+    const pageContextAfterRender = await (0, renderPageAfterRoute_js_1.renderPageAfterRoute)(pageContext);
     (0, utils_js_1.assert)(pageContext === pageContextAfterRender);
     return pageContextAfterRender;
 }
-async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPagePartial) {
+async function getPageContextErrorPageInit(pageContextBegin, errNominalPage) {
     const pageContext = forkPageContext(pageContextBegin);
     (0, utils_js_1.assert)(errNominalPage);
     (0, utils_js_1.objectAssign)(pageContext, {
@@ -310,9 +310,6 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
         errorWhileRendering: errNominalPage,
         routeParams: {},
     });
-    (0, utils_js_1.objectAssign)(pageContext, {
-        _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR',
-    });
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;
 }
@@ -428,7 +425,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
             (0, utils_js_1.objectAssign)(pageContext, { pageId: errorPageId });
             (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
             (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit, true);
-            (0, utils_js_1.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSideAndExecHook)(pageContext));
+            (0, utils_js_1.updateType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext, false);
         }

package/dist/cjs/node/runtime/utils.js

@@ -75,7 +75,7 @@ __exportStar(require("../../utils/isVikeReactApp.js"), exports);
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/genPromise.js"), exports);
-__exportStar(require("../../utils/augmentType.js"), exports);
+__exportStar(require("../../utils/updateType.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
 __exportStar(require("../../utils/getViteRPC.js"), exports);
 __exportStar(require("../../utils/isRunnableDevEnvironment.js"), exports);

package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js

@@ -285,7 +285,6 @@ async function writeManifestFile(manifest, manifestFilePath) {
     await promises_1.default.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
 async function handleAssetsManifest_getBuildConfig(config) {
-    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
     return {
         // https://github.com/vikejs/vike/issues/1339
@@ -293,10 +292,9 @@ async function handleAssetsManifest_getBuildConfig(config) {
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: true,
-        copyPublicDir: vikeConfig.config.vite6BuilderApp
-            ? // Already set by vike:build:pluginBuildApp
-                undefined
-            : !(0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(config),
+        /* Already set by vike:build:pluginBuildApp
+        copyPublicDir: !isViteServerSide_withoutEnv(config),
+        */
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {

package/dist/cjs/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginAutoFullBuild = pluginAutoFullBuild;
 exports.isPrerenderForceExit = isPrerenderForceExit;
-const vite_1 = require("vite");
 const utils_js_1 = require("../../utils.js");
 const context_js_1 = require("../../../prerender/context.js");
 const isViteCliCall_js_1 = require("../../shared/isViteCliCall.js");
@@ -59,16 +58,12 @@ function pluginAutoFullBuild() {
             closeBundle: {
                 sequential: true,
                 order: 'post',
-                async handler() {
+                handler() {
                     (0, utils_js_1.onSetupBuild)();
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config, this.environment);
-                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                    if (globalObject.forceExit &&
-                        // Let vike:build:pluginBuildApp force exit
-                        !vikeConfig.config.vite6BuilderApp) {
-                        (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
-                        (0, utils_js_1.assert)(false);
-                    }
+                    /* Let vike:build:pluginBuildApp force exit
+                    runPrerender_forceExit()
+                    */
                 },
             },
         },
@@ -77,10 +72,9 @@ function pluginAutoFullBuild() {
 async function triggerFullBuild(config, viteEnv, bundle) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
-    const isBuilderApp = vikeConfig.config.vite6BuilderApp;
     // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
     // Else => trigger at end of client-side build.
-    if (isBuilderApp ? !(0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv) : !(0, isViteServerSide_js_1.isViteClientSide)(config, viteEnv))
+    if (!(0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv))
         return;
     if (isEntirelyDisabled(vikeConfig))
         return;
@@ -91,27 +85,15 @@ async function triggerFullBuild(config, viteEnv, bundle) {
     if (!bundle[(0, getManifestFilePathRelative_js_1.getManifestFilePathRelative)(config.build.manifest)])
         return;
     const configInline = getFullBuildInlineConfig(config);
-    if (!isBuilderApp) {
-        await (0, vite_1.build)(setSSR(configInline));
-    }
-    else {
-        // The server build is already called by builder.buildApp()
-    }
+    /* Already triggered by vike:build:pluginBuildApp
+    await build(setSSR(configInline))
+    */
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
         const res = await (0, runPrerenderEntry_js_1.runPrerenderFromAutoRun)(configInline);
         globalObject.forceExit = res.forceExit;
         (0, utils_js_1.assert)((0, context_js_1.wasPrerenderRun)());
     }
 }
-function setSSR(configInline) {
-    return {
-        ...configInline,
-        build: {
-            ...configInline.build,
-            ssr: true,
-        },
-    };
-}
 async function abortViteBuildSsr() {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     if (vikeConfig.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js

@@ -5,7 +5,6 @@ const runPrerenderEntry_js_1 = require("../../../prerender/runPrerenderEntry.js"
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const utils_js_1 = require("../../utils.js");
 const pluginAutoFullBuild_js_1 = require("./pluginAutoFullBuild.js");
-const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 function pluginBuildApp() {
     return [
         {
@@ -14,10 +13,7 @@ function pluginBuildApp() {
             enforce: 'pre',
             config: {
                 order: 'pre',
-                async handler(_config) {
-                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                    if (!vikeConfig.config.vite6BuilderApp)
-                        return;
+                handler(_config) {
                     return {
                         builder: {
                             // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
@@ -39,10 +35,7 @@ function pluginBuildApp() {
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            async config(config) {
-                const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                if (!vikeConfig.config.vite6BuilderApp)
-                    return;
+            config(config) {
                 return {
                     environments: {
                         ssr: {

package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js

@@ -15,8 +15,9 @@ async function determineOptimizeDeps(config) {
     const { entriesClient, entriesServer, includeClient, includeServer } = await getPageDeps(config, pageConfigs);
     config.optimizeDeps.include = add(config.optimizeDeps.include, includeClient);
     config.optimizeDeps.entries = add(config.optimizeDeps.entries, entriesClient);
-    // Workaround until https://github.com/vitejs/vite-plugin-react/issues/650
-    // - TODO/soon: remove workaround once https://github.com/vitejs/vite/pull/20495 is released
+    // Workaround for https://github.com/vitejs/vite-plugin-react/issues/650
+    // - The issue was closed as completed with https://github.com/vitejs/vite/pull/20495 but it doesn't fix the issue and the workaround is still needed.
+    // - TO-DO/eventually: try removing the workaround and see if the CI fails (at test/@cloudflare_vite-plugin/) — maybe the issue will get fixed at some point.
     includeServer.push('react/jsx-dev-runtime');
     for (const envName in config.environments) {
         const env = config.environments[envName];

package/dist/cjs/node/vite/plugins/pluginFileEnv.js

@@ -12,6 +12,7 @@ const getFilePath_js_1 = require("../shared/getFilePath.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 function pluginFileEnv() {
     let config;
     let viteDevServer;
@@ -33,7 +34,7 @@ function pluginFileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(id, !!options?.ssr, importers, 
+            assertFileEnv(id, (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment), importers, 
             // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
             true);
         },
@@ -45,7 +46,7 @@ function pluginFileEnv() {
                 return;
             if (skip(id))
                 return;
-            const isServerSide = !!options?.ssr;
+            const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment);
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);
@@ -71,7 +72,7 @@ function pluginFileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(moduleId, (0, isViteServerSide_js_1.isViteServerSide)(config, this.environment), importers, false);
             });
         },
         configResolved(config_) {

package/dist/cjs/node/vite/shared/getOutDirs.js

@@ -12,7 +12,7 @@ const isViteServerSide_js_1 = require("./isViteServerSide.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromResolvedConfig(configGlobal);
+    const outDir = getOutDirFromResolvedConfig(configGlobal, viteEnv);
     assertOutDirResolved(outDir, configGlobal, viteEnv);
     const outDirs = getOutDirsAll(outDir, configGlobal.root);
     assertNormalization(outDirs.outDirRoot);
@@ -119,7 +119,8 @@ function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
-    if ((0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv)) {
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv);
+    if (isServerSide) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
@@ -133,8 +134,8 @@ function getOutDirFromViteUserConfig(config) {
     outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function getOutDirFromResolvedConfig(config) {
-    let outDir = config.build.outDir;
+function getOutDirFromResolvedConfig(config, viteEnv) {
+    let outDir = viteEnv?.config.build?.outDir ?? config.build.outDir;
     (0, utils_js_1.assert)(outDir);
     outDir = normalizeOutDir(outDir);
     return outDir;