vike 0.4.235 → 0.4.236-commit-64431e7

package/dist/cjs/node/runtime/html/serializeContext.js

@@ -32,20 +32,41 @@ const passToClientBuiltInPageContext = [
 const pageToClientBuiltInPageContextError = ['pageProps', 'is404', isServerSideError_js_1.isServerSideError];
 function getPageContextClientSerialized(pageContext) {
     const passToClientPageContext = getPassToClientPageContext(pageContext);
-    const pageContextClient = applyPassToClient(passToClientPageContext, pageContext);
-    if (passToClientPageContext.some((prop) => (0, propKeys_js_1.getPropVal)(pageContext._pageContextInit, prop))) {
+    const getObj = (passToClientEntry) => {
+        if (passToClientEntry.once)
+            return undefined; // pass it to client-side globalContext
+        return { obj: pageContext, objName: 'pageContext' };
+    };
+    const res = applyPassToClient(passToClientPageContext, getObj);
+    const pageContextClient = res.objClient;
+    const pageContextClientProps = res.objClientProps;
+    if (pageContextClientProps.some((prop) => (0, propKeys_js_1.getPropVal)(pageContext._pageContextInit, prop))) {
         pageContextClient[pageContextInitIsPassedToClient_js_1.pageContextInitIsPassedToClient] = true;
     }
-    const pageContextClientSerialized = serializeObject(pageContextClient, 'pageContext', passToClientPageContext);
+    const pageContextClientSerialized = serializeObject(pageContextClient, passToClientPageContext, getObj);
     return pageContextClientSerialized;
 }
 function getGlobalContextClientSerialized(pageContext) {
     const passToClient = pageContext._passToClient;
-    const globalContextClient = applyPassToClient(passToClient, pageContext._globalContext);
-    const globalContextClientSerialized = serializeObject(globalContextClient, 'globalContext', passToClient);
+    const globalContext = pageContext._globalContext;
+    const getObj = ({ prop, once }) => {
+        if (once && (0, propKeys_js_1.getPropVal)(pageContext, prop)) {
+            (0, utils_js_1.assert)(typeof pageContext.isClientSideNavigation === 'boolean');
+            if (!pageContext.isClientSideNavigation) {
+                return { obj: pageContext, objName: 'pageContext' }; // pass it to client-side globalContext
+            }
+            else {
+                return undefined; // already passed to client-side
+            }
+        }
+        return { obj: globalContext, objName: 'globalContext' };
+    };
+    const res = applyPassToClient(passToClient, getObj);
+    const globalContextClient = res.objClient;
+    const globalContextClientSerialized = serializeObject(globalContextClient, passToClient, getObj);
     return globalContextClientSerialized;
 }
-function serializeObject(obj, objName, passToClient) {
+function serializeObject(obj, passToClient, getObj) {
     let serialized;
     try {
         serialized = serializeValue(obj);
@@ -54,11 +75,15 @@ function serializeObject(obj, objName, passToClient) {
         const h = (s) => picocolors_1.default.cyan(s);
         let hasWarned = false;
         const propsNonSerializable = [];
-        passToClient.forEach((prop) => {
+        passToClient.forEach((entry) => {
+            const entryNormalized = normalizePassToClientEntry(entry);
+            const { prop } = entryNormalized;
             const res = (0, propKeys_js_1.getPropVal)(obj, prop);
             if (!res)
                 return;
             const { value } = res;
+            const { objName } = getObj(entryNormalized) ?? {};
+            (0, utils_js_1.assert)(objName);
             const varName = `${objName}${(0, propKeys_js_1.getPropKeys)(prop).map(utils_js_1.getPropAccessNotation).join('')}`;
             try {
                 serializeValue(value, varName);
@@ -108,7 +133,20 @@ function serializeObject(obj, objName, passToClient) {
     return serialized;
 }
 function serializeValue(value, varName) {
-    return (0, stringify_1.stringify)(value, { forbidReactElements: true, valueName: varName });
+    return (0, stringify_1.stringify)(value, {
+        forbidReactElements: true,
+        valueName: varName,
+        // Prevent Google from crawling URLs in JSON:
+        //  - https://github.com/vikejs/vike/discussions/2541#discussioncomment-13660198
+        //  - https://github.com/vikejs/vike/discussions/2277
+        //  - https://github.com/vikejs/vike/pull/2542
+        replacer(_key, value) {
+            if (typeof value === 'string' && value.startsWith('/')) {
+                // No need to use a reviver: https://github.com/brillout/json-serializer/blob/70fc8ed3741306391b51655b05df24e6963d1fdb/test/main.spec.ts#L74-L80
+                return { replacement: (value = '!' + value) };
+            }
+        },
+    });
 }
 function getPassToClientPageContext(pageContext) {
     let passToClient = [...pageContext._passToClient, ...passToClientBuiltInPageContext];
@@ -144,7 +182,7 @@ function getPageContextClientSerializedAbort(pageContext) {
         (0, utils_js_1.assert)(unknownProps.length === 0);
     }
     else {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         (0, utils_js_1.assertWarning)(unknownProps.length === 0, [
             "The following pageContext values won't be available on the client-side:",
             unknownProps.map((p) => `  pageContext[${JSON.stringify(p)}]`),
@@ -155,16 +193,36 @@ function getPageContextClientSerializedAbort(pageContext) {
     }
     return serializeValue(pageContext);
 }
-function applyPassToClient(passToClient, pageContext) {
-    const pageContextClient = {};
-    passToClient.forEach((prop) => {
+function applyPassToClient(passToClient, getObj) {
+    const objClient = {};
+    const objClientProps = [];
+    passToClient.forEach((entry) => {
+        const entryNormalized = normalizePassToClientEntry(entry);
+        const { prop } = entryNormalized;
+        const { obj } = getObj(entryNormalized) ?? {};
+        if (!obj)
+            return;
         // Get value from pageContext
-        const res = (0, propKeys_js_1.getPropVal)(pageContext, prop);
+        const res = (0, propKeys_js_1.getPropVal)(obj, prop);
         if (!res)
             return;
         const { value } = res;
         // Set value to pageContextClient
-        (0, propKeys_js_1.setPropVal)(pageContextClient, prop, value);
+        (0, propKeys_js_1.setPropVal)(objClient, prop, value);
+        objClientProps.push(prop);
     });
-    return pageContextClient;
+    return { objClient, objClientProps };
+}
+function normalizePassToClientEntry(entry) {
+    let once;
+    let prop;
+    if (typeof entry === 'string') {
+        prop = entry;
+        once = false;
+    }
+    else {
+        prop = entry.prop;
+        once = entry.once ?? false;
+    }
+    return { prop, once };
 }

package/dist/cjs/node/runtime/index-deprecated.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// TO-DO/soon: point package.json#exports['./server'] to this file.
+// TO-DO/eventually: point package.json#exports['./server'] to this file.
 // - Write migration guide, see comment below.
 __exportStar(require("./index.js"), exports);
 const utils_js_1 = require("./utils.js");

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

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "getGlobalContextSync", { enumerable: true, get:
 Object.defineProperty(exports, "getGlobalContextAsync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextAsync; } });
 var index_js_1 = require("../runtime-dev/index.js");
 Object.defineProperty(exports, "createDevMiddleware", { enumerable: true, get: function () { return index_js_1.createDevMiddleware; } });
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 // Deprecated exports
 __exportStar(require("../../types/index-dreprecated.js"), exports);
 var injectAssets__public_js_1 = require("./html/injectAssets/injectAssets__public.js");

package/dist/cjs/node/runtime/page-files/setup.js

@@ -1,3 +1,3 @@
 "use strict";
-// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+// TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
 // This doesn't do anything anymore. (It's kept to avoid introducing a breaking change.)

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

@@ -15,7 +15,7 @@ function assertArguments(...args) {
         showStackTrace: true,
     });
     (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(pageContextInit), `${prefix} called with ${picocolors_1.default.code(`typeof pageContextInit === ${JSON.stringify(typeof pageContextInit)}`)} but ${picocolors_1.default.code('pageContextInit')} should be an object.`, { showStackTrace: true });
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if ('url' in pageContextInit) {
         (0, utils_js_1.assertWarning)(false, '`pageContextInit.url` has been renamed to `pageContextInit.urlOriginal`: replace `renderPage({ url })` with `renderPage({ urlOriginal })`. (See https://vike.dev/migration/0.4.23 for more information.)', { showStackTrace: true, onlyOnce: true });
         pageContextInit.urlOriginal = pageContextInit.url;

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

@@ -11,8 +11,8 @@ const utils_js_1 = require("../utils.js");
 const error_page_js_1 = require("../../../shared/error-page.js");
 const getHttpResponseBody_js_1 = require("./getHttpResponseBody.js");
 const getEarlyHints_js_1 = require("./getEarlyHints.js");
-const getCacheControl_js_1 = require("./createHttpResponse/getCacheControl.js");
 const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponse/assertNoInfiniteHttpRedirect.js");
+const getCacheControl_js_1 = require("./getCacheControl.js");
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
@@ -31,10 +31,13 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = (0, getEarlyHints_js_1.getEarlyHints)(await pageContext.__getPageAssets());
     const headers = [];
-    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs, statusCode);
-    if (cacheControl) {
-        headers.push(['Cache-Control', cacheControl]);
-    }
+    const headersResponse = pageContext.headersResponse || new Headers();
+    headersResponse.forEach((value, key) => {
+        headers.push([key, value]);
+    });
+    // An 5xx error page shouldn't be cached (it should be temporary)
+    if (statusCode >= 500)
+        headersResponse.set('Cache-Control', getCacheControl_js_1.cacheControlDisable);
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
 }
 function createHttpResponse404(errMsg404) {
@@ -104,7 +107,7 @@ function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyH
     return {
         statusCode,
         headers,
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         get contentType() {
             (0, utils_js_1.assertWarning)(false, 'pageContext.httpResponse.contentType is deprecated and will be removed in the next major release. Use pageContext.httpResponse.headers instead, see https://vike.dev/migration/0.4.134', { onlyOnce: true });
             return contentType;

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

@@ -5,7 +5,7 @@ exports.createPageContextServerSideWithoutGlobalContext = createPageContextServe
 const utils_js_1 = require("../utils.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
 const createPageContextShared_js_1 = require("../../../shared/createPageContextShared.js");
-async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
+function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false,
 }, }) {
@@ -13,7 +13,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     (0, utils_js_1.objectAssign)(pageContextCreated, {
         _globalContext: globalContext,
-        _pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
+        _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
         // We use pageContext._baseServer and pageContext._baseAssets instead of pageContext._globalContext.baseServer and pageContext._globalContext.baseAssets because the Base URLs can (eventually one day if needed) be made non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
@@ -35,7 +35,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         else if (pageContextInit.headers) {
             headers = pageContextInit.headers;
-            // TODO/next-major-release: remove
+            // TO-DO/next-major-release: remove
             (0, utils_js_1.assertWarning)(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
         }
         else {
@@ -43,7 +43,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
+    const pageContextAugmented = (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
     (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -8,7 +8,7 @@ async function execHookDataAndOnBeforeRender(pageContext) {
         return;
     }
     const hooks = await (0, execHookServer_js_1.execHookServer)('data', pageContext);
-    const dataHook = hooks[0]; // TO-DO/soon: support cumulative
+    const dataHook = hooks[0]; // TO-DO/soon/cumulative-hooks: support cumulative
     if (dataHook) {
         // Note: hookReturn can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
@@ -21,7 +21,7 @@ async function execHookDataAndOnBeforeRender(pageContext) {
         }
     }
     const res = await (0, execHookServer_js_1.execHookServer)('onBeforeRender', pageContext);
-    const onBeforeRenderHook = res[0]; // TO-DO/soon: support cumulative
+    const onBeforeRenderHook = res[0]; // TO-DO/soon/cumulative-hooks: support cumulative
     if (onBeforeRenderHook) {
         const { hookReturn } = onBeforeRenderHook;
         (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookReturn, onBeforeRenderHook.hookFilePath);

package/dist/cjs/node/runtime/renderPage/{createHttpResponse/getCacheControl.js → getCacheControl.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cacheControlDisable = void 0;
 exports.getCacheControl = getCacheControl;
-const helpers_js_1 = require("../../../../shared/page-configs/helpers.js");
-const getConfigValueRuntime_js_1 = require("../../../../shared/page-configs/getConfigValueRuntime.js");
-const defaultValue = 'no-store, max-age=0';
-function getCacheControl(pageId, pageConfigs, statusCode) {
-    // TODO/v1-release: remove
+const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
+const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
+const cacheControlDisable = 'no-store, max-age=0';
+exports.cacheControlDisable = cacheControlDisable;
+function getCacheControl(pageId, pageConfigs) {
+    // TO-DO/next-major-release: remove this line
     if (pageConfigs.length === 0)
-        return defaultValue;
-    if (statusCode > 499)
-        return defaultValue;
+        return cacheControlDisable;
     if (pageId) {
         const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
         const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
@@ -20,5 +20,5 @@ function getCacheControl(pageId, pageConfigs, statusCode) {
     // - Disabling caching by default is the safest strategy, because caching is problematic with authentication as described in https://github.com/vikejs/vike/issues/1275#issuecomment-1824366875
     // - Are there use cases when we don't need to disable caching?
     //   - When there isn't any <script id="vike_pageContext" type="application/json"> then we can safely have caching. (We don't implement this exception because we're lazy and it's quite a rare situation.)
-    return defaultValue;
+    return cacheControlDisable;
 }

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

@@ -61,7 +61,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             const body = await (0, renderHtml_js_1.getHtmlString)(htmlRender);
             return body;
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         async getNodeStream() {
             (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.getNodeStream()` is outdated, use `pageContext.httpResponse.getReadableNodeStream()` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
@@ -71,7 +71,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return nodeStream;
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         getWebStream() {
             (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.getWebStream(res)` is outdated, use `pageContext.httpResponse.getReadableWebStream(res)` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
@@ -81,7 +81,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return webStream;
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         pipeToWebWritable(writable) {
             (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.pipeToWebWritable(res)` is outdated, use `pageContext.httpResponse.pipe(res)` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
@@ -90,7 +90,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
                 (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'pipeToWebWritable()'));
             }
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         pipeToNodeWritable(writable) {
             (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.pipeToNodeWritable(res)` is outdated, use `pageContext.httpResponse.pipe(res)` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });

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

@@ -11,7 +11,7 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
             return; // Eagerly imported assets aren't imported with import() and therefore don't create a new Rollup entry and aren't listed in the manifest file
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         if (includeAssetsImportedByServer &&
             onlyAssets &&
             id.includes('.page.server.') &&

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

@@ -16,18 +16,11 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
-    let assetUrls;
-    let clientEntriesSrc;
-    if (isDev) {
-        const { _viteDevServer: viteDevServer } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
-        assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
-    }
-    else {
-        const { assetsManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
-    }
+    const { assetUrls, clientEntriesSrc } = isDev
+        ? !globalContext._viteDevServer
+            ? await (0, utils_js_1.getViteRPC)().retrievePageAssetsDevRPC(clientDependencies, clientEntries)
+            : await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
+        : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
         const { mediaType = null, assetType = null } = (0, inferMediaType_js_1.inferMediaType)(src) || {};
@@ -61,6 +54,16 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     await (0, sortPageAssetsForEarlyHintsHeader_js_1.sortPageAssetsForEarlyHintsHeader)(pageAssets, isProduction);
     return pageAssets;
 }
+async function retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
+    const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
+    return { clientEntriesSrc, assetUrls };
+}
+function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, includeAssetsImportedByServer) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+    const assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(includeAssetsImportedByServer));
+    return { clientEntriesSrc, assetUrls };
+}
 function resolveClientEntriesProd(clientEntry, assetsManifest) {
     const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, assetsManifest);
     (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });

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

@@ -11,17 +11,19 @@ const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig
 const analyzePage_js_1 = require("./analyzePage.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.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);
     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, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
+    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,
         }),
@@ -31,28 +33,27 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     const passToClient = [];
     const errMsg = ' should be an array of strings.';
     if (!isV1Design) {
-        pageContextExports.exportsAll.passToClient?.forEach((e) => {
+        configPublicPageLazy.exportsAll.passToClient?.forEach((e) => {
             (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsg}`);
             passToClient.push(...e.exportValue);
         });
     }
     else {
-        pageContextExports.configEntries.passToClient?.forEach((e) => {
-            const { configValue } = e;
-            (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue));
-            const vals = configValue.flat(1);
-            // TODO: improve error message by using (upcoming) new data structure instead of configEntries
-            (0, utils_js_1.assertUsage)((0, utils_js_1.isArrayOfStrings)(vals), `${e.configDefinedAt}${errMsg}`);
-            passToClient.push(...vals);
+        configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
+            const { value } = v;
+            // const { definedAt } = v
+            // assertUsage(isArrayOfStrings(value), `+passToClient value defined at ${definedAt}${errMsg}`)
+            passToClient.push(...value);
         });
     }
     const pageContextAddendum = {};
-    (0, utils_js_1.objectAssign)(pageContextAddendum, pageContextExports);
+    (0, utils_js_1.objectAssign)(pageContextAddendum, configPublicPageLazy);
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
-        Page: pageContextExports.exports.Page,
+        Page: configPublicPageLazy.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
         _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
+        headersResponse: resolveHeadersResponse(pageContext, pageContextAddendum),
     });
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
         __getPageAssets: async () => {
@@ -66,7 +67,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             }
         },
     });
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     Object.assign(pageContextAddendum, {
         _getPageAssets: async () => {
             (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
@@ -105,13 +106,31 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     });
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
+async function loadPageConfigFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
-        pageContextExports,
+        configPublicPageLazy,
         pageFilesLoaded: pageFilesServerSide,
     };
 }
+function resolveHeadersResponse(pageContext, pageContextAddendum) {
+    const headersResponse = mergeHeaders(pageContextAddendum.config.headersResponse);
+    if (!headersResponse.get('Cache-Control')) {
+        const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs);
+        if (cacheControl)
+            headersResponse.set('Cache-Control', cacheControl);
+    }
+    return headersResponse;
+}
+function mergeHeaders(headersList = []) {
+    const headersMerged = new Headers();
+    headersList.forEach((headers) => {
+        new Headers(headers).forEach((value, key) => {
+            headersMerged.append(key, value);
+        });
+    });
+    return headersMerged;
+}

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePageContextForPublicUsageServer = preparePageContextForPublicUsageServer;
 const preparePageContextForPublicUsage_js_1 = require("../../../shared/preparePageContextForPublicUsage.js");
 function preparePageContextForPublicUsageServer(pageContext) {
-    // TODO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
+    // TO-DO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
     (0, preparePageContextForPublicUsage_js_1.assertPropertyGetters)(pageContext);
     pageContext = (0, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage)(pageContext);
     return pageContext;

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

@@ -19,6 +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) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the

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

@@ -84,7 +84,7 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
         }
     }
     const { globalContext } = await (0, globalContext_js_1.getGlobalContextServerInternal)();
-    const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, httpRequestId);
+    const pageContextBegin = getPageContextBegin(pageContextInit, globalContext, httpRequestId);
     // Check Base URL
     {
         const pageContextHttpResponse = await checkBaseUrl(pageContextBegin, globalContext);
@@ -174,9 +174,7 @@ async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNo
             (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: null });
             return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContextErrorPageInit);
         }
-        else {
-            (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: errorPageId });
-        }
+        (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: errorPageId });
     }
     let pageContextErrorPage;
     try {
@@ -313,9 +311,9 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;
 }
-async function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
+function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
     const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextBegin = await (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
+    const pageContextBegin = (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
         isPrerendering: false,
         ssr: {
             urlHandler: _urlHandler,

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

@@ -76,3 +76,4 @@ __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/genPromise.js"), exports);
 __exportStar(require("../../utils/augmentType.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
+__exportStar(require("../../utils/getViteRPC.js"), exports);

package/dist/cjs/node/vite/index.js

@@ -29,6 +29,7 @@ const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.j
 const pluginWorkaroundCssModuleHmr_js_1 = require("./plugins/pluginWorkaroundCssModuleHmr.js");
 const pluginWorkaroundVite6HmrRegression_js_1 = require("./plugins/pluginWorkaroundVite6HmrRegression.js");
 const pluginReplaceConstants_js_1 = require("./plugins/pluginReplaceConstants.js");
+const pluginViteRPC_js_1 = require("./plugins/pluginViteRPC.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -48,6 +49,7 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, pluginWorkaroundCssModuleHmr_js_1.pluginWorkaroundCssModuleHmr)(),
         (0, pluginWorkaroundVite6HmrRegression_js_1.pluginWorkaroundVite6HmrRegression)(),
         (0, pluginReplaceConstants_js_1.pluginReplaceConstants)(),
+        (0, pluginViteRPC_js_1.pluginViteRPC)(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

package/dist/cjs/node/vite/onLoad.js

@@ -12,7 +12,7 @@ function onLoad() {
     (0, assertNodeVersion_js_1.assertNodeVersion)();
     // package.json#peerDependencies isn't enough as users often ignore it
     // This assertion isn't reliable: the user may still use a Vite version older than 5.1.0 — see https://github.com/vitejs/vite/pull/19355
-    // TO-DO/soon: let's also use this.meta.viteVersion https://github.com/vitejs/vite/pull/20088
+    // TO-DO/eventually: let's also use this.meta.viteVersion https://github.com/vitejs/vite/pull/20088
     (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, '5.1.0');
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     (0, assertSetup_js_1.assertIsNotProductionRuntime)();

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

@@ -300,8 +300,8 @@ async function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsREnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
-    if (isSsREnv) {
+    const isSsrEnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    if (isSsrEnv) {
         (0, utils_js_1.assert)(!assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
         assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
@@ -315,7 +315,7 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
         // - Also in some other server builds such as dist/vercel/ from vike-vercel
         // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
         const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(assetsJsonFilePath, bundle, outDir);
-        if (isSsREnv)
+        if (isSsrEnv)
             (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }

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

@@ -16,7 +16,8 @@ const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
-const manifestTempFile = '_temp_manifest.json';
+// TODO/now: stop setting `manifest` altogether and use the resolved value instead? So that other tools can easily read the manifest (e.g. @cloudflare/plugin-vite reads the manifest).
+const manifestTempFile = '.vite/manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
     let config;
@@ -59,7 +60,7 @@ function pluginBuildConfig() {
 async function getEntries(config) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const { _pageConfigs: pageConfigs } = vikeConfig;
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     const pageFileEntries = await getPageFileEntries(config, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {