vike 0.4.231 → 0.4.232-commit-134207d

package/dist/cjs/node/{plugin → vite}/utils.js

@@ -18,7 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // We call onLoad() here so that it's called even when only a subset of the plugin is loaded. (Making the assert() calls inside onLoad() a lot stronger.)
 const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
-// It's common practice for Vike's Vite plugin to import from Vike's sever runtime
+// - Server-side bloat is negligible
+// - The Vite plugin imports the server runtime anyways
 __exportStar(require("../runtime/utils.js"), exports);
 // Utils only needed by `plugin/*`
 __exportStar(require("../../utils/requireResolve.js"), exports);
@@ -26,22 +27,16 @@ __exportStar(require("../../utils/includes.js"), exports);
 __exportStar(require("../../utils/isDev.js"), exports);
 __exportStar(require("../../utils/getMostSimilar.js"), exports);
 __exportStar(require("../../utils/getRandomId.js"), exports);
-__exportStar(require("../../utils/joinEnglish.js"), exports);
 __exportStar(require("../../utils/escapeRegex.js"), exports);
-__exportStar(require("../../utils/stripAnsi.js"), exports);
 __exportStar(require("../../utils/trimWithAnsi.js"), exports);
 __exportStar(require("../../utils/removeEmptyLines.js"), exports);
 __exportStar(require("../../utils/findPackageJson.js"), exports);
-__exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/deepEqual.js"), exports);
 __exportStar(require("../../utils/assertKeys.js"), exports);
 __exportStar(require("../../utils/injectRollupInputs.js"), exports);
-__exportStar(require("../../utils/humanizeTime.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
 __exportStar(require("../../utils/assertVersion.js"), exports);
 __exportStar(require("../../utils/isFilePathAbsoluteFilesystem.js"), exports);
-__exportStar(require("../../utils/isArray.js"), exports);
-__exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/isEqualStringList.js"), exports);
 __exportStar(require("../../utils/isDocker.js"), exports);
 __exportStar(require("../../utils/isVitest.js"), exports);

package/dist/cjs/shared/assertHookReturnedObject.js

@@ -16,6 +16,6 @@ function assertHookReturnedObject(obj, keysExpected, errPrefix) {
         'returned an object with following unknown keys:',
         (0, utils_js_1.stringifyStringArray)(keysUnknown) + '.',
         'Only following keys are allowed:',
-        (0, utils_js_1.stringifyStringArray)(keysExpected) + '.'
+        (0, utils_js_1.stringifyStringArray)(keysExpected) + '.',
     ].join(' '));
 }

package/dist/cjs/shared/assertPageContextProvidedByUser.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertPageContextProvidedByUser = assertPageContextProvidedByUser;
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName, hookFilePath }) {
+function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName, hookFilePath, }) {
     if (pageContextProvidedByUser === undefined || pageContextProvidedByUser === null)
         return;
     (0, utils_js_1.assert)(!hookName.endsWith(')'));
@@ -15,6 +15,6 @@ function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName,
     (0, utils_js_1.assertUsage)(!('isPageContext' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${picocolors_1.default.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
     // In principle, it's possible to use onBeforeRoute()` to override and define the whole routing.
     // Is that a good idea to allow users to do this? Beyond deep integration with Vue Router or React Router, is there a use case for this?
-    (0, utils_js_1.assertWarning)(!('pageId' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.pageId')} which means that Vike's routing is overriden. This is an experimental feature: make sure to contact a vike maintainer before using this.`, { onlyOnce: true });
+    (0, utils_js_1.assertWarning)(!('pageId' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.pageId')} which means that Vike's routing is overridden. This is an experimental feature: make sure to contact a vike maintainer before using this.`, { onlyOnce: true });
     (0, utils_js_1.assertUsage)(!('is404' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.is404')} which is forbidden, use ${picocolors_1.default.cyan('throw render()')} instead, see https://vike.dev/render`);
 }

package/dist/cjs/shared/createGlobalContextShared.js

@@ -3,40 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextSyncErrMsg = void 0;
 exports.createGlobalContextShared = createGlobalContextShared;
 const utils_js_1 = require("./utils.js");
-const parseGlobResults_js_1 = require("./getPageFiles/parseGlobResults.js");
-const getUserFriendlyConfigs_js_1 = require("./page-configs/getUserFriendlyConfigs.js");
+const parseVirtualFileExports_js_1 = require("./getPageFiles/parseVirtualFileExports.js");
+const resolveVikeConfigPublic_js_1 = require("./page-configs/resolveVikeConfigPublic.js");
 const execHook_js_1 = require("./hooks/execHook.js");
 const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextForPublicUsage.js");
+const getHook_js_1 = require("./hooks/getHook.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
 async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     const globalContextAddendum = await addGlobalContext?.(globalContext);
     (0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
+    const onCreateGlobalContextHooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
+    let hooksCalled = false;
+    if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {
+        globalObject.onCreateGlobalContextHooks = onCreateGlobalContextHooks;
+        await (0, execHook_js_1.execHookGlobal)('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage);
+        hooksCalled = true;
+    }
     if (!globalObject.globalContext) {
         globalObject.globalContext = globalContext;
-        // - We deliberately call onCreateGlobalContext() only at the beginning and only once per process.
-        // - TO-DO/eventually: HMR
-        //    - Once Photon supports it: `server.hot.send({ type: 'full-server-reload' })`
-        //    - Either use:
-        //      - import.meta.hot
-        //        - https://vite.dev/guide/api-hmr.html
-        //        - Use a Vite transformer to inject import.meta.hot code into each user-land `+onCreateGlobalContext.js` file
-        //        - Seems more idiomatic
-        //      - globalContext._viteDevServer.hot.send()
-        //        - Send 'full-server-reload' signal whenever a onCreateGlobalContext() function is modified => we need a globalObject to track all hooks and see if one of them is new/modified.
-        //        - Seems less idiomatic
-        await (0, execHook_js_1.execHookGlobal)('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage);
     }
     else {
         // Singleton: ensure all `globalContext` user-land references are preserved & updated.
-        // We don't use objectReplace() in order to keep user-land properties.
-        (0, utils_js_1.objectAssign)(globalObject.globalContext, globalContext, true);
+        if (hooksCalled) {
+            (0, utils_js_1.objectReplace)(globalObject.globalContext, globalContext);
+        }
+        else {
+            // We don't use objectReplace() in order to keep user-land properties.
+            (0, utils_js_1.objectAssign)(globalObject.globalContext, globalContext, true);
+        }
     }
     return globalObject.globalContext;
 }
 function createGlobalContextBase(virtualFileExports) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, userFriendlyConfigsGlobal, userFriendlyConfigsPageEager } = getConfigsAll(virtualFileExports);
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExports);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -50,29 +51,29 @@ function createGlobalContextBase(virtualFileExports) {
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _allPageIds: allPageIds,
-        _userFriendlyConfigsGlobal: userFriendlyConfigsGlobal,
-        config: userFriendlyConfigsGlobal.config,
-        pages: userFriendlyConfigsPageEager
+        _vikeConfigPublicGlobal: vikeConfigPublicGlobal,
+        config: vikeConfigPublicGlobal.config,
+        pages: vikeConfigPublicPagesEager,
     };
     (0, utils_js_1.changeEnumerable)(globalContext, '_isOriginalObject', false);
     return globalContext;
 }
 function getConfigsAll(virtualFileExports) {
-    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseGlobResults_js_1.parseGlobResults)(virtualFileExports);
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExports_js_1.parseVirtualFileExports)(virtualFileExports);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
-    const userFriendlyConfigsGlobal = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsGlobal)({
-        pageConfigGlobalValues: pageConfigGlobal.configValues
+    const vikeConfigPublicGlobal = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({
+        pageConfigGlobalValues: pageConfigGlobal.configValues,
     });
-    const userFriendlyConfigsPageEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        return (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+    const vikeConfigPublicPagesEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
     }));
     return {
         pageFilesAll,
         allPageIds,
         pageConfigs,
         pageConfigGlobal,
-        userFriendlyConfigsGlobal,
-        userFriendlyConfigsPageEager
+        vikeConfigPublicGlobal,
+        vikeConfigPublicPagesEager,
     };
 }
 function getAllPageIds(pageFilesAll, pageConfigs) {
@@ -81,3 +82,10 @@ function getAllPageIds(pageFilesAll, pageConfigs) {
     const allPageIds2 = pageConfigs.map((p) => p.pageId);
     return [...allPageIds, ...allPageIds2];
 }
+function hooksAreEqual(hooks1, hooks2) {
+    const hooksFn1 = hooks1.map((hook) => hook.hookFn);
+    const hooksFn2 = hooks2.map((hook) => hook.hookFn);
+    return (hooksFn1.every((hook) => hooksFn2.includes(hook)) &&
+        //
+        hooksFn2.every((hook) => hooksFn1.includes(hook)));
+}

package/dist/cjs/shared/createPageContextShared.js

@@ -5,15 +5,15 @@ exports.createPageContextObject = createPageContextObject;
 const execHook_js_1 = require("./hooks/execHook.js");
 const preparePageContextForPublicUsage_js_1 = require("./preparePageContextForPublicUsage.js");
 const utils_js_1 = require("./utils.js");
-async function createPageContextShared(pageContextCreated, pageConfigGlobal, userFriendlyConfigsGlobal) {
-    (0, utils_js_1.objectAssign)(pageContextCreated, userFriendlyConfigsGlobal);
+async function createPageContextShared(pageContextCreated, pageConfigGlobal, vikeConfigPublicGlobal) {
+    (0, utils_js_1.objectAssign)(pageContextCreated, vikeConfigPublicGlobal);
     await (0, execHook_js_1.execHookGlobal)('onCreatePageContext', pageConfigGlobal, pageContextCreated, pageContextCreated, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage);
     return pageContextCreated;
 }
 function createPageContextObject() {
     const pageContext = {
         _isOriginalObject: true,
-        isPageContext: true
+        isPageContext: true,
     };
     (0, utils_js_1.changeEnumerable)(pageContext, '_isOriginalObject', false);
     return pageContext;

package/dist/cjs/shared/getPageContextRequestUrl.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doNotCreateExtraDirectory = exports.pageContextJsonFileExtension = void 0;
 exports.getPageContextRequestUrl = getPageContextRequestUrl;
-// This module isn't loaded by the client-side of Server Routing => we don't inlcude `urlToFile` to `./utils.ts`
+// This module isn't loaded by the client-side of Server Routing => we don't include `urlToFile` to `./utils.ts`
 const urlToFile_js_1 = require("../utils/urlToFile.js");
 const pageContextJsonFileExtension = '.pageContext.json';
 exports.pageContextJsonFileExtension = pageContextJsonFileExtension;

package/dist/cjs/shared/getPageContextUrlComputed.js

@@ -15,17 +15,17 @@ function getPageContextUrlComputed(pageContext) {
     (0, objectDefineProperty_js_1.objectDefineProperty)(pageContextUrlComputed, 'urlPathname', {
         get: urlPathnameGetter,
         enumerable: true,
-        configurable: true
+        configurable: true,
     });
     (0, objectDefineProperty_js_1.objectDefineProperty)(pageContextUrlComputed, 'url', {
         get: urlGetter,
         enumerable: false,
-        configurable: true
+        configurable: true,
     });
     (0, objectDefineProperty_js_1.objectDefineProperty)(pageContextUrlComputed, 'urlParsed', {
         get: urlParsedGetter,
         enumerable: true,
-        configurable: true
+        configurable: true,
     });
     return pageContextUrlComputed;
 }
@@ -111,7 +111,7 @@ function urlParsedGetter() {
         get hashString() {
             (0, utils_js_1.assertWarning)(false, 'pageContext.urlParsed.hashString has been renamed to pageContext.urlParsed.hashOriginal', {
                 onlyOnce: true,
-                showStackTrace: true
+                showStackTrace: true,
             });
             warnHashNotAvailable('hashString');
             return urlParsed.hashOriginal;
@@ -120,7 +120,7 @@ function urlParsedGetter() {
         get searchString() {
             (0, utils_js_1.assertWarning)(false, 'pageContext.urlParsed.searchString has been renamed to pageContext.urlParsed.searchOriginal', { onlyOnce: true, showStackTrace: true });
             return urlParsed.searchOriginal;
-        }
+        },
     };
     (0, utils_js_1.changeEnumerable)(urlParsedEnhanced, 'hashString', false);
     (0, utils_js_1.changeEnumerable)(urlParsedEnhanced, 'searchString', false);

package/dist/cjs/shared/getPageFiles/analyzePageClientSide/analyzeExports.js

@@ -4,7 +4,7 @@ exports.analyzeExports = analyzeExports;
 const getExportNames_js_1 = require("./getExportNames.js");
 const utils_js_1 = require("../../utils.js");
 // TODO/v1-release: remove
-function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId }) {
+function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId, }) {
     return { isHtmlOnly: isHtmlOnly(), isClientRouting: isClientRouting() };
     function isHtmlOnly() {
         {
@@ -37,8 +37,8 @@ function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId }) {
             'See https://vike.dev/render-modes for more information.',
             [
                 'Loaded client-side page files (none of them `export { render }`):',
-                ...pageFilesClientSide.map((p, i) => ` (${i + 1}): ${p.filePath}`)
-            ].join('\n')
+                ...pageFilesClientSide.map((p, i) => ` (${i + 1}): ${p.filePath}`),
+            ].join('\n'),
         ].join(' '));
     }
     function isClientRouting() {

package/dist/cjs/shared/getPageFiles/analyzePageClientSide/determineClientEntry.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineClientEntry = determineClientEntry;
 exports.getVikeClientEntry = getVikeClientEntry;
-function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting }) {
+function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting, }) {
     let clientEntries = [];
     const pageFilesServerSideOnly = pageFilesServerSide.filter((p) => !pageFilesClientSide.includes(p));
     const clientDependencies = [];
@@ -25,6 +25,6 @@ function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtml
 }
 function getVikeClientEntry(isClientRouting) {
     return isClientRouting
-        ? '@@vike/dist/esm/client/client-routing-runtime/entry.js'
-        : '@@vike/dist/esm/client/server-routing-runtime/entry.js';
+        ? '@@vike/dist/esm/client/runtime-client-routing/entry.js'
+        : '@@vike/dist/esm/client/runtime-server-routing/entry.js';
 }

package/dist/cjs/shared/getPageFiles/analyzePageClientSide.js

@@ -16,13 +16,13 @@ function analyzePageClientSide(pageFilesAll, pageId) {
     if (isHtmlOnly) {
         // HTML-only pages don't need any client-side `render()` hook. For apps that have both HTML-only and SSR/SPA pages, we skip the `.page.client.js` file that defines `render()` for HTML-only pages.
         pageFilesClientSide = pageFilesClientSide.filter((p) => p.isEnv('CLIENT_ONLY') && !(0, getExportNames_js_1.getExportNames)(p).includes('render'));
-        pageFilesClientSide = removeOverridenPageFiles(pageFilesClientSide);
+        pageFilesClientSide = removeOverriddenPageFiles(pageFilesClientSide);
     }
     const { clientEntries, clientDependencies } = (0, determineClientEntry_js_1.determineClientEntry)({
         pageFilesClientSide,
         pageFilesServerSide,
         isHtmlOnly,
-        isClientRouting
+        isClientRouting,
     });
     return { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide };
 }
@@ -34,7 +34,6 @@ async function analyzePageClientSideInit(pageFilesAll, pageId, { sharedPageFiles
         if (sharedPageFilesAlreadyLoaded && p.isEnv('CLIENT_AND_SERVER')) {
             return;
         }
-        // TODO: Is `loadExportNames()` cached ? Does it use filesExports if possible? HMR?
         await p.loadExportNames?.();
         /*
         if (pageFile.exportNames) {
@@ -48,7 +47,7 @@ async function analyzePageClientSideInit(pageFilesAll, pageId, { sharedPageFiles
 }
 // [WIP] Just an experiment needed by https://vike.dev/banner
 //  - Not sure I want to make something like a public API: the CSS of `_default.page.server.js` are still loaded -> weird DX.
-function removeOverridenPageFiles(pageFilesClientSide) {
+function removeOverriddenPageFiles(pageFilesClientSide) {
     const pageFilesClientSide_ = [];
     for (const p of pageFilesClientSide) {
         pageFilesClientSide_.push(p);

package/dist/cjs/shared/getPageFiles/fileTypes.js

@@ -14,7 +14,7 @@ const fileTypes = [
     // New type `.page.css`/`.page.server.css`/`.page.client.css` for `extensions[number].pageFileDist`.
     //  - Extensions using `pageFileDist` are expected to use a bundler that generates a `.css` colocated next to the original `.page.js` file (e.g. `/renderer/_default.page.server.css` for `/renderer/_default.page.server.js`.
     //  - Since these `.page.css` files Bundlers We can therefore expect that there isn't any `.page.server.sass`/...
-    '.css'
+    '.css',
 ];
 exports.fileTypes = fileTypes;
 function isValidFileType(filePath) {

package/dist/cjs/shared/getPageFiles/getAllPageIdFiles.js

@@ -30,10 +30,10 @@ function determine(pageFilesAll, pageId, envIsClient) {
     const getRendererFile = (iso) => pageFilesRelevant.filter((p) => p.isRendererPageFile && p.isEnv(iso ? 'CLIENT_AND_SERVER' : env))[0];
     const rendererFileEnv = getRendererFile(false);
     const rendererFileIso = getRendererFile(true);
-    // A page can load multiple `_defaut.page.*` files of the same `fileType`. In other words: non-renderer `_default.page.*` files are cumulative.
+    // A page can load multiple `_default.page.*` files of the same `fileType`. In other words: non-renderer `_default.page.*` files are cumulative.
     // The exception being HTML-only pages because we pick a single page file as client entry. We handle that use case at `renderPage()`.
     const defaultFilesNonRenderer = pageFilesRelevant.filter((p) => p.isDefaultPageFile && !p.isRendererPageFile && (p.isEnv(env) || p.isEnv('CLIENT_AND_SERVER')));
-    // Ordered by `pageContext.exports` precendence
+    // Ordered by `pageContext.exports` precedence
     const pageFiles = [pageIdFileEnv, pageIdFileIso, ...defaultFilesNonRenderer, rendererFileEnv, rendererFileIso].filter(utils_js_1.isNotNullish);
     return pageFiles;
 }

package/dist/cjs/shared/getPageFiles/getPageFileObject.js

@@ -32,7 +32,7 @@ function getPageFileObject(filePath) {
         isDefaultPageFile: isDefaultFilePath(filePath),
         isRendererPageFile: fileType !== '.css' && isDefaultFilePath(filePath) && isRendererFilePath(filePath),
         isErrorPageFile: (0, error_page_js_1.isErrorPageId)(filePath, false),
-        pageId: (0, determinePageIdOld_js_1.determinePageIdOld)(filePath)
+        pageId: (0, determinePageIdOld_js_1.determinePageIdOld)(filePath),
     };
     return pageFile;
 }

package/dist/cjs/shared/getPageFiles/{parseGlobResults.js → parseVirtualFileExports.js}

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseGlobResults = parseGlobResults;
+exports.parseVirtualFileExports = parseVirtualFileExports;
 // TODO/v1-release: remove old design code, and remove all assertions.
 const utils_js_1 = require("../utils.js");
 const assert_exports_old_design_js_1 = require("./assert_exports_old_design.js");
 const getPageFileObject_js_1 = require("./getPageFileObject.js");
 const fileTypes_js_1 = require("./fileTypes.js");
 const parsePageConfigs_js_1 = require("../page-configs/serialize/parsePageConfigs.js");
-// TODO/now: rename
-function parseGlobResults(pageFilesExports) {
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesExportNamesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesExportNamesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports.pageFilesLazy, '.page'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports.pageFilesLazy, '.page.client') || (0, utils_js_1.hasProp)(pageFilesExports.pageFilesLazy, '.page.server'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesList', 'string[]'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageConfigsSerialized'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageConfigGlobalSerialized'));
-    const { pageConfigsSerialized, pageConfigGlobalSerialized } = pageFilesExports;
+function parseVirtualFileExports(virtualFileExports) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.client') ||
+        (0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.server'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesList', 'string[]'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigsSerialized'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigGlobalSerialized'));
+    const { pageConfigsSerialized, pageConfigGlobalSerialized } = virtualFileExports;
     assertPageConfigsSerialized(pageConfigsSerialized);
     assertPageConfigGlobalSerialized(pageConfigGlobalSerialized);
     const { pageConfigs, pageConfigGlobal } = (0, parsePageConfigs_js_1.parsePageConfigs)(pageConfigsSerialized, pageConfigGlobalSerialized);
     const pageFilesMap = {};
-    parseGlobResult(pageFilesExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -34,7 +34,7 @@ function parseGlobResults(pageFilesExports) {
             }
         };
     });
-    parseGlobResult(pageFilesExports.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -47,20 +47,20 @@ function parseGlobResults(pageFilesExports) {
         };
     });
     // `pageFilesEager` contains `.page.route.js` files
-    parseGlobResult(pageFilesExports.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         pageFile.fileExports = moduleExports;
     });
-    parseGlobResult(pageFilesExports.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(moduleExports, 'exportNames', 'string[]'), pageFile.filePath);
         pageFile.exportNames = moduleExports.exportNames;
     });
-    pageFilesExports.pageFilesList.forEach((filePath) => {
+    virtualFileExports.pageFilesList.forEach((filePath) => {
         pageFilesMap[filePath] = pageFilesMap[filePath] ?? (0, getPageFileObject_js_1.getPageFileObject)(filePath);
     });
     const pageFilesAll = Object.values(pageFilesMap);

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -6,13 +6,13 @@ exports.getProxyForPublicUsage = getProxyForPublicUsage;
 //   ```console
 //   TypeError: Invalid property descriptor. Cannot both specify accessors and a value or writable attribute, #<Object>
 //   ```
-// - Previous implementation using property getters: https://github.com/vikejs/vike/blob/main/vike/utils/makePublicCopy.ts
+// - Previous implementation using property getters: https://github.com/vikejs/vike/blob/4dbb354b0bcec04e862041fc9183fc4691bb8711/vike/utils/makePublicCopy.ts
 // Show warning when user is accessing internal `_` properties.
 const NOT_SERIALIZABLE_js_1 = require("./NOT_SERIALIZABLE.js");
 const utils_js_1 = require("./utils.js");
 function getProxyForPublicUsage(obj, objName, skipOnInternalProp, fallback) {
     return new Proxy(obj, {
-        get: getTrapGet(obj, objName, skipOnInternalProp, fallback)
+        get: getTrapGet(obj, objName, skipOnInternalProp, fallback),
     });
 }
 function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
@@ -47,7 +47,7 @@ function onInternalProp(propStr, objName) {
     //     - If Rolldown Vite + Rolldowns always transpiles node_modules/ then we can simply use import.meta.env.SSR
     if ((0, utils_js_1.isBrowser)())
         return;
-    // TODO/now remove this and only warn on built-in access instead
+    // TODO/now-proxy remove this and only warn on built-in access instead
     if (propStr === '_configFromHook')
         return;
     if (propStr.startsWith('_')) {

package/dist/cjs/shared/hooks/execHook.js

@@ -19,7 +19,7 @@ const getHook_js_1 = require("./getHook.js");
 const preparePageContextForPublicUsage_js_1 = require("../preparePageContextForPublicUsage.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/execHook.ts', {
     userHookErrors: new WeakMap(),
-    pageContext: null
+    pageContext: null,
 });
 async function execHookSingle(hook, pageContext, preparePageContextForPublicUsage) {
     const res = await execHooksErrorHandling([hook], pageContext, preparePageContextForPublicUsage);
@@ -85,7 +85,7 @@ async function execHookWithoutPageContext(hookFnCaller, hook) {
     return hookReturn;
 }
 function execHookAsync(hookFnCaller, hook, pageContextForPublicUsage) {
-    const { hookName, hookFilePath, hookTimeout: { error: timeoutErr, warning: timeoutWarn } } = hook;
+    const { hookName, hookFilePath, hookTimeout: { error: timeoutErr, warning: timeoutWarn }, } = hook;
     let resolve;
     let reject;
     const promise = new Promise((resolve_, reject_) => {

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

@@ -120,7 +120,7 @@ function getHookTimeout(hooksTimeoutProvidedByUser, hookName) {
         hookTimeout.warning = providedbyUser.warning;
     return hookTimeout;
 }
-// Ideally this should be called only once and at build-time (to avoid bloating the client-side bundle), but we didn't implement any mechanism to valide config values at build-time yet
+// Ideally this should be called only once and at build-time (to avoid bloating the client-side bundle), but we didn't implement any mechanism to valid config values at build-time yet
 function getHooksTimeoutProvidedByUserNormalized(hooksTimeoutProvidedByUser) {
     if (hooksTimeoutProvidedByUser === undefined)
         return {};
@@ -151,13 +151,13 @@ function getHookTimeoutDefault(hookName) {
     if (hookName === 'onBeforeRoute') {
         return {
             error: 5 * 1000,
-            warning: 1 * 1000
+            warning: 1 * 1000,
         };
     }
     if (globalObject.isPrerendering) {
         return {
             error: 2 * 60 * 1000,
-            warning: 30 * 1000
+            warning: 30 * 1000,
         };
     }
     else {
@@ -165,7 +165,7 @@ function getHookTimeoutDefault(hookName) {
     }
     return {
         error: 30 * 1000,
-        warning: 4 * 1000
+        warning: 4 * 1000,
     };
 }
 function getHook_setIsPrerenderering() {

package/dist/cjs/shared/modifyUrl.js

@@ -16,7 +16,7 @@ function modifyUrl(url, modify) {
     // Origin
     const originParts = [
         modify.protocol ?? urlParsed.protocol ?? '',
-        modify.hostname ?? urlParsed.hostname ?? ''
+        modify.hostname ?? urlParsed.hostname ?? '',
     ];
     const port = modify.port ?? urlParsed.port;
     if (port || port === 0) {

package/dist/cjs/shared/page-configs/assertPlusFileExport.js

@@ -10,7 +10,7 @@ const SIDE_EXPORTS_TOLERATE = [
     // vite-plugin-solid adds `export { $$registrations }`
     '$$registrations',
     // @vitejs/plugin-vue adds `export { _rerender_only }`
-    '_rerender_only'
+    '_rerender_only',
 ];
 // Tolerate `export { frontmatter }` in .mdx files
 const SIDE_EXPORTS_DO_NOT_CHECK = ['.md', '.mdx'];
@@ -22,7 +22,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
     const exportDefault = picocolors_1.default.code('export default');
     const exportNamed = picocolors_1.default.code(`export { ${configName} }`);
     if (exportNamesValid.length === 0) {
-        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should have ${exportNamed} or ${exportDefault}`);
+        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should define ${exportNamed} or ${exportDefault}`);
     }
     if (exportNamesValid.length === 2) {
         (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`);
@@ -35,7 +35,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
     if (!SIDE_EXPORTS_DO_NOT_CHECK.some((ext) => filePathToShowToUser.endsWith(ext))) {
         exportNamesInvalid.forEach((exportInvalid) => {
             (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} unexpected ${picocolors_1.default.cyan(`export { ${exportInvalid} }`)}, see https://vike.dev/no-side-exports`, {
-                onlyOnce: true
+                onlyOnce: true,
             });
         });
     }

package/dist/cjs/shared/page-configs/getConfigValueBuildTime.js

@@ -18,7 +18,7 @@ function getConfigValue(pageConfig, configName) {
         return {
             type: 'computed',
             value: configValueComputed.value,
-            definedAtData: null
+            definedAtData: null,
         };
     }
     const sources = configValueSources[configName];
@@ -33,7 +33,7 @@ function getConfigValue(pageConfig, configName) {
         return {
             type: 'standard',
             value: configValueSource.value,
-            definedAtData: getDefinedAt(configValueSource)
+            definedAtData: getDefinedAt(configValueSource),
         };
     }
     else {
@@ -42,7 +42,7 @@ function getConfigValue(pageConfig, configName) {
         return {
             type: 'cumulative',
             value,
-            definedAtData
+            definedAtData,
         };
     }
 }
@@ -63,6 +63,6 @@ function getDefinedAt(configValueSource) {
         return definedAt;
     return {
         filePathToShowToUser: definedAt.filePathToShowToUser,
-        fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser
+        fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser,
     };
 }

package/dist/cjs/shared/page-configs/loadConfigValues.js

@@ -9,7 +9,7 @@ async function loadConfigValues(pageConfig, isDev) {
         !isDev) {
         return pageConfig;
     }
-    const { moduleId, moduleExports } = pageConfig.loadConfigValuesAll();
+    const { moduleId, moduleExports } = pageConfig.loadConfigLazy();
     const configValuesLoaded = await moduleExports;
     // `configValuesLoaded` is sometimes `undefined` https://github.com/vikejs/vike/discussions/2092
     if (!configValuesLoaded)