vike 0.4.234 → 0.4.235-commit-16164c3

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

@@ -124,7 +124,7 @@ function pluginFileEnv() {
         return modulePath.includes(suffixWrong);
     }
     function skip(id) {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         if (pluginExtractAssets_js_1.extractAssetsRE.test(id) || pluginExtractExportNames_js_1.extractExportNamesRE.test(id))
             return true;
         if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))

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

@@ -25,7 +25,7 @@ function pluginVirtualFiles() {
         name: 'vike:pluginVirtualFiles',
         async configResolved(config_) {
             config = config_;
-            // TODO/v1-release: remove
+            // TO-DO/next-major-release: remove
             if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
                 config.experimental.importGlobRestoreExtension = true;
         },
@@ -73,28 +73,33 @@ function handleFileAddRemove(server, config) {
         if ((0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(file))
             return;
         const { moduleGraph } = server;
-        const isVikeConfig = await isVikeConfigDependency(file, moduleGraph);
+        const isVikeConfigDep = await isVikeConfigDependency(file, moduleGraph);
         const reload = () => reloadConfig(file, config, isRemove ? 'removed' : 'created', server);
-        if (isVikeConfig) {
-            if (isVikeConfig.isNotProcessedByVite) {
-                reload();
-            }
-            else {
-                // Let Vite handle it
-                (0, utils_js_1.assert)(existsInViteModuleGraph(file, moduleGraph));
-            }
+        // Config code
+        if (isVikeConfigDep && !isVikeConfigDep.isProcessedByVite) {
+            reload();
+            return;
         }
-        else {
-            // Trick: when importing a file that doesn't exist => we don't know whether `file` is that missing file => we take a leap of faith when the conditions below are met.
-            // - Not sure how reliable that trick is.
-            // - Reloading Vike's config is cheap and file creation/removal is rare => the trick is worth it.
-            // - Reproduction:
-            //   ```bash
-            //   rm someDep.js && sleep 2 && git checkout someDep.js
-            //   ```
-            if ((0, utils_js_1.isScriptFile)(file) && (0, getVikeConfigError_js_1.getVikeConfigError)() && !existsInViteModuleGraph(file, moduleGraph)) {
-                reload();
-            }
+        // New or deleted + file
+        if ((0, crawlPlusFiles_js_1.isPlusFile)(file)) {
+            reload();
+            return;
+        }
+        // Runtime code => let Vite handle it
+        if (isVikeConfigDep && isVikeConfigDep.isProcessedByVite) {
+            (0, utils_js_1.assert)(existsInViteModuleGraph(file, moduleGraph));
+            return;
+        }
+        // Trick: when importing a file that doesn't exist => we don't know whether `file` is that missing file => we take a leap of faith when the conditions below are met.
+        // - Not sure how reliable that trick is.
+        // - Reloading Vike's config is cheap and file creation/removal is rare => the trick is worth it.
+        // - Reproduction:
+        //   ```bash
+        //   rm someDep.js && sleep 2 && git checkout someDep.js
+        //   ```
+        if ((0, utils_js_1.isScriptFile)(file) && (0, getVikeConfigError_js_1.getVikeConfigError)() && !existsInViteModuleGraph(file, moduleGraph)) {
+            reload();
+            return;
         }
     }
 }
@@ -107,9 +112,9 @@ function invalidateVikeVirtualFiles(server) {
 // Vite calls its hook handleHotUpdate() whenever *any file* is modified — including files that aren't in Vite's module graph such as `pages/+config.js`
 async function handleHotUpdate(ctx, config) {
     const { file, server } = ctx;
-    const isVikeConfig = await isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
-    if (isVikeConfig) {
-        if (isVikeConfig.isNotProcessedByVite) {
+    const isVikeConfigDep = await isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
+    if (isVikeConfigDep) {
+        if (!isVikeConfigDep.isProcessedByVite) {
             /* Tailwind breaks this assertion, see https://github.com/vikejs/vike/discussions/1330#discussioncomment-7787238
             const isViteModule = ctx.modules.length > 0
             assert(!isViteModule)
@@ -139,7 +144,7 @@ async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
         const { _vikeConfigDependencies: vikeConfigDependencies } = vikeConfigObject;
         vikeConfigDependencies.forEach((f) => (0, utils_js_1.assertPosixPath)(f));
         if (vikeConfigDependencies.has(filePathAbsoluteFilesystem))
-            return { isNotProcessedByVite: true };
+            return { isProcessedByVite: false };
     }
     // Runtime Vike config files such as +data.js which are processed by Vite.
     // - They're included in Vite's module graph.
@@ -148,7 +153,7 @@ async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
     const importers = getImporters(filePathAbsoluteFilesystem, moduleGraph);
     const isPlusValueFileDependency = Array.from(importers).some((importer) => importer.file && (0, crawlPlusFiles_js_1.isPlusFile)(importer.file));
     if (isPlusValueFileDependency)
-        return { isNotProcessedByVite: false };
+        return { isProcessedByVite: true };
     return null;
 }
 function reloadConfig(filePath, config, op, server) {

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

@@ -21,7 +21,7 @@ function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled)
         };
         Object.defineProperty(pageContextInit, 'userAgent', {
             get() {
-                // TODO/next-major-release: assertUsage() instead of assertWarning()
+                // TO-DO/next-major-release: assertUsage() instead of assertWarning()
                 (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('pageContext.userAgent')} is deprecated: use ${picocolors_1.default.cyan("pageContext.headers['user-agent']")} instead.`, {
                     showStackTrace: true,
                     onlyOnce: true,

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

@@ -1,10 +1,14 @@
 "use strict";
-// Non-production logger used for:
-//  - Development
-//  - Preview
-//  - Build
-//  - Pre-rendering
-// In other words: everywhere except in production
+// TO-DO/eventually:
+// - New hook onLog(): https://github.com/vikejs/vike/issues/1438
+// - Exact same logs between prod and dev, only difference is that some log objects have:
+//   - `isDevLog: true`
+//   - `willBeLogged: false` in production
+//   - `showTimestamp: true`
+// - Never clear screen (it's complex with little benefit)
+//   - Add shortcut to clear screen
+//   - Maybe rotate colors upon no requests within 30s?
+// - Only show a one-liner init log (instead of Vite's multi-line log)
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -87,7 +87,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
     },
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     prefetchStaticAssets: {
         env: { client: true },
     },

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js

@@ -352,7 +352,7 @@ function isTemporaryBuildFile(filePath) {
     const fileName = node_path_1.default.posix.basename(filePath);
     return /\.build-[a-z0-9]{12}\.mjs$/.test(fileName);
 }
-// TODO/next-major: remove
+// TO-DO/next-major-release: remove
 function isHeaderFile(filePath) {
     (0, utils_js_1.assertPosixPath)(filePath);
     const fileExtensions = getFileExtensions(filePath);

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

@@ -44,7 +44,7 @@ let restartVite = false;
 let vikeConfigHasBuildError = null;
 let isV1Design_ = null;
 let vikeConfigPromise = null;
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 let vikeConfigSync = null;
 let vikeConfigCtx = null; // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
 let prerenderContext;
@@ -56,14 +56,14 @@ function reloadVikeConfig() {
 }
 async function getVikeConfigInternal(
 // I don't remember the logic behind it — neither why we restart Vite's dev server, nor why we sometimes don't.
-// TO-DO: eventually rethink all that. Some + settings are expected to influence Vite's config (restarting Vite's dev server is needed) while some don't.
+// TO-DO/eventually: re-think all that. Some + settings are expected to influence Vite's config (restarting Vite's dev server is needed) while some don't.
 doNotRestartViteOnError = false) {
     (0, utils_js_1.assert)(vikeConfigCtx);
     const { userRootDir, isDev, vikeVitePluginOptions } = vikeConfigCtx;
     const vikeConfig = await getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     return vikeConfig;
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function getVikeConfigInternalSync() {
     (0, utils_js_1.assert)(vikeConfigSync);
     return vikeConfigSync;
@@ -487,7 +487,7 @@ function sortConfigValueSources(configValueSources, locationIdPage) {
                 return sortAfterInheritanceOrderPage(source1.plusFile, source2.plusFile, locationIdPage, configName);
             }
         })
-            // TODO/next-major: remove
+            // TO-DO/next-major-release: remove
             // Interop with vike(options) in vite.config.js — make it least precedence.
             .sort((0, utils_js_1.makeLast)((source) => !source.plusFile));
     });
@@ -783,7 +783,7 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
             }
             configEnv = getConfigEnvValue(def.env, `${metaConfigDefinedAt} sets ${picocolors_1.default.cyan(`meta.${configName}.env`)} to`);
             // Overwrite deprecated value with valid value
-            // TODO/v1-release: remove once support for the deprecated values is removed
+            // TO-DO/next-major-release: remove once support for the deprecated values is removed
             if (typeof def.env === 'string')
                 def.env = configEnv;
         }
@@ -1029,7 +1029,7 @@ function determineIsErrorPage(routeFilesystem) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${picocolors_1.default.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

package/dist/cjs/shared/RenderErrorPage.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderErrorPage = void 0;
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 var abort_js_1 = require("./route/abort.js");
 Object.defineProperty(exports, "RenderErrorPage", { enumerable: true, get: function () { return abort_js_1.RenderErrorPage; } });

package/dist/cjs/shared/abort.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.render = exports.redirect = void 0;
-// TODO/v1-release: Move all universal imports (when using Client Routing) to:
+// TO-DO/next-major-release: Move all universal imports (when using Client Routing) to:
 //   import {
 //     redirect,
 //     render,

package/dist/cjs/shared/createPageContextShared.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPageContextShared = createPageContextShared;
 exports.createPageContextObject = createPageContextObject;
 const utils_js_1 = require("./utils.js");
-// TODO/now: make this and parents sync
-async function createPageContextShared(pageContextCreated, pageConfigGlobal, vikeConfigPublicGlobal) {
+function createPageContextShared(pageContextCreated, vikeConfigPublicGlobal) {
     (0, utils_js_1.objectAssign)(pageContextCreated, vikeConfigPublicGlobal);
     return pageContextCreated;
 }

package/dist/cjs/shared/determinePageIdOld.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determinePageIdOld = determinePageIdOld;
 const utils_js_1 = require("./utils.js");
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function determinePageIdOld(filePath) {
     const pageSuffix = '.page.';
     const pageId = (0, utils_js_1.slice)(filePath.split(pageSuffix), 0, -1).join(pageSuffix);

package/dist/cjs/shared/error-page.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getErrorPageId = getErrorPageId;
 exports.isErrorPageId = isErrorPageId;
 exports.isErrorPage = isErrorPage;
-// TODO/v1-release: consider loading this file only for Client Routing
+// TO-DO/next-major-release: consider loading this file only for Client Routing
 const utils_js_1 = require("./utils.js");
 function getErrorPageId(pageFilesAll, pageConfigs) {
     if (pageConfigs.length > 0) {
@@ -13,7 +13,7 @@ function getErrorPageId(pageFilesAll, pageConfigs) {
         (0, utils_js_1.assertUsage)(errorPageConfigs.length === 1, 'Only one error page can be defined');
         return errorPageConfigs[0].pageId;
     }
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     const errorPageIds = (0, utils_js_1.unique)(pageFilesAll.map(({ pageId }) => pageId).filter((pageId) => isErrorPageId(pageId, false)));
     (0, utils_js_1.assertUsage)(errorPageIds.length <= 1, `Only one _error.page.js is allowed, but found several: ${errorPageIds.join(' ')}`);
     if (errorPageIds.length > 0) {
@@ -23,7 +23,7 @@ function getErrorPageId(pageFilesAll, pageConfigs) {
     }
     return null;
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function isErrorPageId(pageId, _isV1Design) {
     (0, utils_js_1.assert)(!pageId.includes('\\'));
     return pageId.includes('/_error');

package/dist/cjs/shared/getPageContextUrlComputed.js

@@ -40,7 +40,7 @@ function getUrlParsed(pageContext) {
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
     const assertUrlResolved = (src) => (0, utils_js_1.assert)(typeof urlResolved === 'string', 
-    // TODO/eventually: remove debug logs, see:
+    // TO-DO/eventually: remove debug logs, see:
     // - https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
     // - https://github.com/vikejs/vike/commit/5c7810f3080ab62536950f26e019bb2a3a517082
     { src, urlResolved });
@@ -85,7 +85,7 @@ function urlPathnameGetter() {
     return urlPathname;
 }
 function urlGetter() {
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     (0, utils_js_1.assertWarning)(false, '`pageContext.url` is outdated. Use `pageContext.urlPathname`, `pageContext.urlParsed`, or `pageContext.urlOriginal` instead. (See https://vike.dev/migration/0.4.23 for more information.)', { onlyOnce: true, showStackTrace: true });
     return urlPathnameGetter.call(this);
 }
@@ -107,7 +107,7 @@ function urlParsedGetter() {
             warnHashNotAvailable('hashOriginal');
             return urlParsed.hashOriginal;
         },
-        // TODO/next-major-release: remove
+        // TO-DO/next-major-release: remove
         get hashString() {
             (0, utils_js_1.assertWarning)(false, 'pageContext.urlParsed.hashString has been renamed to pageContext.urlParsed.hashOriginal', {
                 onlyOnce: true,
@@ -116,7 +116,7 @@ function urlParsedGetter() {
             warnHashNotAvailable('hashString');
             return urlParsed.hashOriginal;
         },
-        // TODO/next-major-release: remove
+        // TO-DO/next-major-release: remove
         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;

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

@@ -11,7 +11,7 @@ function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
         return { isClientRuntimeLoaded, isClientRouting };
     }
     else {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         // V0.4 design
         const { isHtmlOnly, isClientRouting } = (0, analyzePageClientSide_js_1.analyzePageClientSide)(pageFilesAll, pageId);
         return { isClientRuntimeLoaded: !isHtmlOnly, isClientRouting };

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzeExports = analyzeExports;
 const getExportNames_js_1 = require("./getExportNames.js");
 const utils_js_1 = require("../../utils.js");
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId, }) {
     return { isHtmlOnly: isHtmlOnly(), isClientRouting: isClientRouting() };
     function isHtmlOnly() {

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

@@ -1,5 +1,5 @@
 "use strict";
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineClientEntry = determineClientEntry;
 exports.getVikeClientEntry = getVikeClientEntry;

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

@@ -8,7 +8,7 @@ const getAllPageIdFiles_js_1 = require("./getAllPageIdFiles.js");
 const getAllPageIdFiles_js_2 = require("./getAllPageIdFiles.js");
 const utils_js_1 = require("../utils.js");
 const getExportNames_js_1 = require("./analyzePageClientSide/getExportNames.js");
-// TODO/v1-release: remove analyzePageClientSide(), use analyzeClientSide() instead
+// TO-DO/next-major-release: remove analyzePageClientSide(), use analyzeClientSide() instead
 function analyzePageClientSide(pageFilesAll, pageId) {
     let pageFilesClientSide = (0, getAllPageIdFiles_js_1.getPageFilesClientSide)(pageFilesAll, pageId);
     const pageFilesServerSide = (0, getAllPageIdFiles_js_2.getPageFilesServerSide)(pageFilesAll, pageId);
@@ -26,7 +26,7 @@ function analyzePageClientSide(pageFilesAll, pageId) {
     });
     return { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide };
 }
-// TODO:v1-release: remove
+// TO-DO/next-major-release: remove
 async function analyzePageClientSideInit(pageFilesAll, pageId, { sharedPageFilesAlreadyLoaded }) {
     const pageFilesClientSide = (0, getAllPageIdFiles_js_1.getPageFilesClientSide)(pageFilesAll, pageId);
     await Promise.all(pageFilesClientSide.map(async (p) => {

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

@@ -1,5 +1,5 @@
 "use strict";
-// TODO/v1-release: remove this
+// TO-DO/next-major-release: remove this
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.forbiddenDefaultExports = void 0;
 exports.assertDefaultExports = assertDefaultExports;

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

@@ -1,5 +1,5 @@
 "use strict";
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileTypes = void 0;
 exports.isValidFileType = isValidFileType;

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

@@ -1,5 +1,5 @@
 "use strict";
-// TODO:v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageFilesClientSide = getPageFilesClientSide;
 exports.getPageFilesServerSide = getPageFilesServerSide;

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

@@ -1,5 +1,5 @@
 "use strict";
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageFileObject = getPageFileObject;
 const determinePageIdOld_js_1 = require("../determinePageIdOld.js");

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVirtualFileExports = parseVirtualFileExports;
-// TODO/v1-release: remove old design code, and remove all assertions.
+// TO-DO/next-major-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");

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -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-proxy remove this and only warn on built-in access instead
+    // TO-DO/soon/proxy: remove this and only warn on built-in access instead
     if (propStr === '_configFromHook')
         return;
     if (propStr.startsWith('_')) {

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

@@ -38,12 +38,13 @@ function getDefinedAtString(definedAtData, configName) {
         if (definedAt.definedBy)
             return getDefinedByString(definedAt, configName);
         const { filePathToShowToUser, fileExportPathToShowToUser } = definedAt;
-        let s = filePathToShowToUser;
         const exportPath = (0, getExportPath_js_1.getExportPath)(fileExportPathToShowToUser, configName);
         if (exportPath) {
-            s = `${s} > ${picocolors_1.default.cyan(exportPath)}`;
+            return `${filePathToShowToUser} > ${picocolors_1.default.cyan(exportPath)}`;
+        }
+        else {
+            return filePathToShowToUser;
         }
-        return s;
     })
         .join(' / ');
     return definedAtString;

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

@@ -50,10 +50,10 @@ function resolveVikeConfigPublicPageLazy(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};
-    const configEntries = {}; // TODO/v1-release: remove
-    const exportsAll = {}; // TODO/v1-release: remove
+    const configEntries = {}; // TO-DO/next-major-release: remove
+    const exportsAll = {}; // TO-DO/next-major-release: remove
     // V0.4 design
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     pageFiles.forEach((pageFile) => {
         const exportValues = getExportValues(pageFile);
         exportValues.forEach(({ exportName, exportValue, isFromDefaultExport }) => {
@@ -63,7 +63,7 @@ pageConfigGlobal) {
                 exportValue,
                 exportSource: `${pageFile.filePath} > ${isFromDefaultExport ? `\`export default { ${exportName} }\`` : `\`export { ${exportName} }\``}`,
                 filePath: pageFile.filePath,
-                _filePath: pageFile.filePath, // TODO/next-major-release: remove
+                _filePath: pageFile.filePath, // TO-DO/next-major-release: remove
                 _fileType: pageFile.fileType,
                 _isFromDefaultExport: isFromDefaultExport,
             });
@@ -108,18 +108,18 @@ pageConfigGlobal) {
     });
     (0, utils_js_1.assert)(!('default' in exports));
     (0, utils_js_1.assert)(!('default' in exportsAll));
-    const pageContextExports = {
+    const configPublicPageLazy = {
         config: config,
         from,
         source,
         sources,
-        // TODO/now-flat-pageContext: deprecate every prop below
+        // TO-DO/soon/flat-pageContext: deprecate every prop below
         configEntries,
         exports,
         exportsAll,
     };
-    // TODO/v1-release: remove
-    (0, utils_js_1.objectDefineProperty)(pageContextExports, 'pageExports', {
+    // TO-DO/next-major-release: remove
+    (0, utils_js_1.objectDefineProperty)(configPublicPageLazy, 'pageExports', {
         get: () => {
             // We only show the warning in Node.js because when using Client Routing Vue integration uses `Object.assign(pageContextReactive, pageContext)` which will wrongully trigger the warning. There is no cross-browser way to catch whether the property accessor was initiated by an `Object.assign()` call.
             if (!(0, utils_js_1.isBrowser)()) {
@@ -133,7 +133,7 @@ pageConfigGlobal) {
         enumerable: false,
         configurable: true,
     });
-    return pageContextExports;
+    return configPublicPageLazy;
 }
 // V1 design
 function resolveVikeConfigPublic_V1Design(pageConfig) {
@@ -161,7 +161,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
             configDefinedAt,
             configDefinedByFile: configValueFilePathToShowToUser,
         });
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         const exportName = configName;
         exportsAll[exportName] = exportsAll[exportName] ?? [];
         exportsAll[exportName].push({

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -178,7 +178,7 @@ function logJsonSerializeError(err, configName, definedAtData) {
     //*/
     const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(definedAtData);
     (0, utils_js_1.assert)(configValueFilePathToShowToUser);
-    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
+    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined using a separate file ${picocolors_1.default.bold(`+${configName}.js`)}, see https://vike.dev/error/runtime-in-config`);
 }
 function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
     const fromComputed = Object.entries(pageConfig.configValuesComputed ?? {}).map(([configName, valueInfo]) => {

package/dist/cjs/shared/preparePageContextForPublicUsage.js

@@ -11,7 +11,7 @@ function preparePageContextForPublicUsage(pageContext) {
     (0, utils_js_1.assert)(!pageContext.globalContext); // pageContext.globalContext should only be available to users — Vike itself should use pageContext._globalContext instead
     (0, utils_js_1.assert)(pageContext._isOriginalObject); // ensure we preserve the original object reference
     (0, addIs404ToPageProps_js_1.addIs404ToPageProps)(pageContext);
-    // TODO/next-major-release: remove
+    // TO-DO/next-major-release: remove
     if (!('_pageId' in pageContext)) {
         Object.defineProperty(pageContext, '_pageId', {
             get() {
@@ -29,7 +29,7 @@ function preparePageContextForPublicUsage(pageContext) {
     const globalContextPublic = (0, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage)(pageContext._globalContext);
     const pageContextPublic = (0, getProxyForPublicUsage_js_1.getProxyForPublicUsage)(pageContext, 'pageContext', 
     // We must skip it in the client-side because of the reactivity mechanism of UI frameworks like Solid.
-    // - TODO/now-proxy: double check whether that's true
+    // - TO-DO/soon/proxy: double check whether that's true
     true, (prop) => {
         if (prop === 'globalContext') {
             return globalContextPublic;
@@ -67,11 +67,11 @@ function assertPropertyGetters(pageContext) {
     ;
     [
         'urlPathname',
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         'urlParsed',
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         'url',
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         'pageExports',
     ].forEach((prop) => {
         if (pageContext.prop)

package/dist/cjs/shared/route/abort.js

@@ -87,7 +87,7 @@ function AbortRender(pageContextAbort) {
     (0, utils_js_1.checkType)(err);
     return err;
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 /**
  * @deprecated Use `throw render()` or `throw redirect()` instead, see https://vike.dev/render'
  */

package/dist/cjs/shared/route/deduceRouteStringFromFilesystemPath.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deduceRouteStringFromFilesystemPath = deduceRouteStringFromFilesystemPath;
 const utils_js_1 = require("./utils.js");
-// TODO/next-major-update: remove this and whole filesystemRoot mechanism
+// TO-DO/next-major-release: remove this and whole filesystemRoot mechanism
 function deduceRouteStringFromFilesystemPath(pageId, filesystemRoots) {
     // Handle Filesystem Routing Root
     const filesystemRootsMatch = filesystemRoots

package/dist/cjs/shared/route/execHookGuard.js

@@ -8,7 +8,7 @@ const errIntro = 'The guard() hook defined by';
 async function execHookGuard(pageContext, prepareForPublicUsage) {
     let hook;
     if (pageContext._globalContext._pageFilesAll.length > 0) {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         // V0.4 design
         (0, utils_js_1.assert)(pageContext._globalContext._pageConfigs.length === 0);
         hook = findPageGuard(pageContext.pageId, pageContext._globalContext._pageFilesAll);

package/dist/cjs/shared/route/execHookOnBeforeRoute.js

@@ -41,7 +41,7 @@ async function execHookOnBeforeRoute(pageContext) {
 async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     let { hookReturn } = (0, execHook_js_1.execHookDirectSync)(onBeforeRouteHook, pageContext, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage);
     (0, resolveRouteFunction_js_1.assertSyncRouting)(hookReturn, `The onBeforeRoute() hook ${onBeforeRouteHook.hookFilePath}`);
-    // TODO/v1-release: make execHookOnBeforeRoute() and route() sync
+    // TO-DO/next-major-release: make execHookOnBeforeRoute() and route() sync
     hookReturn = await hookReturn;
     const errPrefix = `The onBeforeRoute() hook defined by ${onBeforeRouteHook.hookFilePath}`;
     (0, utils_js_1.assertUsage)(hookReturn === null ||

package/dist/cjs/shared/route/index.js

@@ -17,7 +17,7 @@ const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
 const execHookOnBeforeRoute_js_1 = require("./execHookOnBeforeRoute.js");
 const debug_js_1 = require("./debug.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-// TODO/next-major-release: make it sync
+// TO-DO/next-major-release: make it sync
 async function route(pageContext, skipOnBeforeRouteHook) {
     (0, debug_js_1.debug)('Pages routes:', pageContext._globalContext._pageRoutes);
     const pageContextFromRoute = {};