vike 0.4.234 → 0.4.235-commit-7b1ab35

package/dist/esm/node/vite/plugins/pluginCommon.js

@@ -25,13 +25,13 @@ function pluginCommon(vikeVitePluginOptions) {
                         ? normalizeViteRoot(configFromUser.root)
                         : await getViteRoot(operation);
                     assert(rootResolvedEarly);
-                    // TODO/v1-release: we can remove setVikeConfigContext() call here since with Vike's CLI it's already called at vike/node/api/prepareViteApiCall.ts
+                    // TO-DO/next-major-release: we can remove setVikeConfigContext() call here since with Vike's CLI it's already called at vike/node/api/prepareViteApiCall.ts
                     setVikeConfigContext({ userRootDir: rootResolvedEarly, isDev, vikeVitePluginOptions });
                     const vikeConfig = await getVikeConfigInternal();
                     return {
                         _isDev: isDev,
                         _rootResolvedEarly: rootResolvedEarly,
-                        // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+                        // TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
                             prerender: vikeConfig.prerenderContext.isPrerenderingEnabled,
                         }),
@@ -53,7 +53,11 @@ function pluginCommon(vikeVitePluginOptions) {
             configResolved: {
                 order: 'post',
                 async handler(config) {
-                    /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
+                    /* Also externalize linked dependencies by default?
+                     * - Can this be done while the user sets ssr.external to `string[]`? I guess not?
+                     *   - If not then it's a problem: it makes the default inconsistent.
+                     * - https://vite.dev/config/ssr-options.html#ssr-external
+                     * - New setting +transpileLinkedDependencies ?
                     overrideViteDefaultSsrExternal(config)
                     //*/
                     workaroundCI(config);
@@ -157,7 +161,7 @@ function assertVikeCliOrApi(config) {
         onlyOnce: true,
     });
 }
-// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+// TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
 function temp_supportOldInterface(config) {
     if (!('vitePluginSsr' in config))
         return;

package/dist/esm/node/vite/plugins/pluginDev.js

@@ -20,7 +20,7 @@ function pluginDev() {
             config() {
                 return {
                     appType: 'custom',
-                    // TODO:v1-release: remove (AFAICT we only need to use config.optimizeDeps for the old design)
+                    // TO-DO/next-major-release: remove (AFAICT we only need to use config.optimizeDeps for the old design)
                     optimizeDeps: {
                         exclude: [
                             // We exclude Vike's client runtime to be able to use Vite's import.meta.glob()

package/dist/esm/node/vite/plugins/pluginEnvVars.js

@@ -6,7 +6,7 @@ import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
 import { applyRegExpWithMagicString } from '../shared/applyRegExWithMagicString.js';
-// TODO/enventually:
+// TO-DO/eventually:
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)

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

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

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

@@ -20,7 +20,7 @@ function pluginVirtualFiles() {
         name: 'vike:pluginVirtualFiles',
         async configResolved(config_) {
             config = config_;
-            // TODO/v1-release: remove
+            // TO-DO/next-major-release: remove
             if (!isV1Design())
                 config.experimental.importGlobRestoreExtension = true;
         },
@@ -68,28 +68,33 @@ function handleFileAddRemove(server, config) {
         if (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
-                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 (isScriptFile(file) && getVikeConfigError() && !existsInViteModuleGraph(file, moduleGraph)) {
-                reload();
-            }
+        // New or deleted + file
+        if (isPlusFile(file)) {
+            reload();
+            return;
+        }
+        // Runtime code => let Vite handle it
+        if (isVikeConfigDep && isVikeConfigDep.isProcessedByVite) {
+            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 (isScriptFile(file) && getVikeConfigError() && !existsInViteModuleGraph(file, moduleGraph)) {
+            reload();
+            return;
         }
     }
 }
@@ -102,9 +107,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)
@@ -134,7 +139,7 @@ async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
         const { _vikeConfigDependencies: vikeConfigDependencies } = vikeConfigObject;
         vikeConfigDependencies.forEach((f) => 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.
@@ -143,7 +148,7 @@ async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
     const importers = getImporters(filePathAbsoluteFilesystem, moduleGraph);
     const isPlusValueFileDependency = Array.from(importers).some((importer) => importer.file && isPlusFile(importer.file));
     if (isPlusValueFileDependency)
-        return { isNotProcessedByVite: false };
+        return { isProcessedByVite: true };
     return null;
 }
 function reloadConfig(filePath, config, op, server) {

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

@@ -16,7 +16,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()
                 assertWarning(false, `${pc.cyan('pageContext.userAgent')} is deprecated: use ${pc.cyan("pageContext.headers['user-agent']")} instead.`, {
                     showStackTrace: true,
                     onlyOnce: true,

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

@@ -1,3 +1,13 @@
+// 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)
 // Non-production logger used for:
 //  - Development
 //  - Preview

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

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

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

@@ -347,7 +347,7 @@ function isTemporaryBuildFile(filePath) {
     const fileName = path.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) {
     assertPosixPath(filePath);
     const fileExtensions = getFileExtensions(filePath);

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

@@ -41,7 +41,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;
@@ -53,14 +53,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) {
     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() {
     assert(vikeConfigSync);
     return vikeConfigSync;
@@ -484,7 +484,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(makeLast((source) => !source.plusFile));
     });
@@ -780,7 +780,7 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
             }
             configEnv = getConfigEnvValue(def.env, `${metaConfigDefinedAt} sets ${pc.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;
         }
@@ -1026,7 +1026,7 @@ function determineIsErrorPage(routeFilesystem) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${pc.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/esm/shared/RenderErrorPage.js

@@ -1,2 +1,2 @@
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 export { RenderErrorPage } from './route/abort.js';

package/dist/esm/shared/abort.js

@@ -1,4 +1,4 @@
-// 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/esm/shared/createPageContextShared.d.ts

@@ -1,14 +1,13 @@
 export { createPageContextShared };
 export { createPageContextObject };
 import type { VikeConfigPublicGlobal } from './page-configs/resolveVikeConfigPublic.js';
-import type { PageConfigGlobalRuntime } from '../types/PageConfig.js';
 import { type PageContextPrepareMinimum } from './preparePageContextForPublicUsage.js';
-declare function createPageContextShared<T extends PageContextPrepareMinimum>(pageContextCreated: T, pageConfigGlobal: PageConfigGlobalRuntime, vikeConfigPublicGlobal: VikeConfigPublicGlobal): Promise<T & {
+declare function createPageContextShared<T extends PageContextPrepareMinimum>(pageContextCreated: T, vikeConfigPublicGlobal: VikeConfigPublicGlobal): T & {
     config: import("../types/index.js").ConfigResolved;
     _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("./page-configs/resolveVikeConfigPublic.js").From;
-}>;
+};
 declare function createPageContextObject(): {
     _isOriginalObject: true;
     isPageContext: true;

package/dist/esm/shared/createPageContextShared.js

@@ -1,8 +1,7 @@
 export { createPageContextShared };
 export { createPageContextObject };
 import { changeEnumerable, objectAssign } from './utils.js';
-// TODO/now: make this and parents sync
-async function createPageContextShared(pageContextCreated, pageConfigGlobal, vikeConfigPublicGlobal) {
+function createPageContextShared(pageContextCreated, vikeConfigPublicGlobal) {
     objectAssign(pageContextCreated, vikeConfigPublicGlobal);
     return pageContextCreated;
 }

package/dist/esm/shared/determinePageIdOld.js

@@ -1,6 +1,6 @@
 export { determinePageIdOld };
 import { slice, assert } from './utils.js';
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function determinePageIdOld(filePath) {
     const pageSuffix = '.page.';
     const pageId = slice(filePath.split(pageSuffix), 0, -1).join(pageSuffix);

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

@@ -1,7 +1,7 @@
 export { getErrorPageId };
 export { isErrorPageId };
 export { 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
 import { assert, assertUsage, unique } from './utils.js';
 function getErrorPageId(pageFilesAll, pageConfigs) {
     if (pageConfigs.length > 0) {
@@ -11,7 +11,7 @@ function getErrorPageId(pageFilesAll, pageConfigs) {
         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 = unique(pageFilesAll.map(({ pageId }) => pageId).filter((pageId) => isErrorPageId(pageId, false)));
     assertUsage(errorPageIds.length <= 1, `Only one _error.page.js is allowed, but found several: ${errorPageIds.join(' ')}`);
     if (errorPageIds.length > 0) {
@@ -21,7 +21,7 @@ function getErrorPageId(pageFilesAll, pageConfigs) {
     }
     return null;
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function isErrorPageId(pageId, _isV1Design) {
     assert(!pageId.includes('\\'));
     return pageId.includes('/_error');

package/dist/esm/shared/getPageContextUrlComputed.js

@@ -38,7 +38,7 @@ function getUrlParsed(pageContext) {
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
     const assertUrlResolved = (src) => 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 });
@@ -83,7 +83,7 @@ function urlPathnameGetter() {
     return urlPathname;
 }
 function urlGetter() {
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     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);
 }
@@ -105,7 +105,7 @@ function urlParsedGetter() {
             warnHashNotAvailable('hashOriginal');
             return urlParsed.hashOriginal;
         },
-        // TODO/next-major-release: remove
+        // TO-DO/next-major-release: remove
         get hashString() {
             assertWarning(false, 'pageContext.urlParsed.hashString has been renamed to pageContext.urlParsed.hashOriginal', {
                 onlyOnce: true,
@@ -114,7 +114,7 @@ function urlParsedGetter() {
             warnHashNotAvailable('hashString');
             return urlParsed.hashOriginal;
         },
-        // TODO/next-major-release: remove
+        // TO-DO/next-major-release: remove
         get searchString() {
             assertWarning(false, 'pageContext.urlParsed.searchString has been renamed to pageContext.urlParsed.searchOriginal', { onlyOnce: true, showStackTrace: true });
             return urlParsed.searchOriginal;

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

@@ -9,7 +9,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 } = analyzePageClientSide(pageFilesAll, pageId);
         return { isClientRuntimeLoaded: !isHtmlOnly, isClientRouting };

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

@@ -1,7 +1,7 @@
 export { analyzeExports };
 import { getExportNames } from './getExportNames.js';
 import { assertUsage } from '../../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/esm/shared/getPageFiles/analyzePageClientSide/determineClientEntry.js

@@ -1,4 +1,4 @@
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 export { determineClientEntry };
 export { getVikeClientEntry };
 function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting, }) {

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

@@ -6,7 +6,7 @@ import { getPageFilesClientSide } from './getAllPageIdFiles.js';
 import { getPageFilesServerSide } from './getAllPageIdFiles.js';
 import { assert } from '../utils.js';
 import { getExportNames } from './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 = getPageFilesClientSide(pageFilesAll, pageId);
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
@@ -24,7 +24,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 = getPageFilesClientSide(pageFilesAll, pageId);
     await Promise.all(pageFilesClientSide.map(async (p) => {

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

@@ -1,4 +1,4 @@
-// TODO/v1-release: remove this
+// TO-DO/next-major-release: remove this
 export { assertDefaultExports };
 export { assertExportValues };
 export { forbiddenDefaultExports };

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

@@ -1,4 +1,4 @@
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 export { fileTypes };
 export { isValidFileType };
 export { determineFileType };

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

@@ -1,4 +1,4 @@
-// TODO:v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 export { getPageFilesClientSide };
 export { getPageFilesServerSide };
 import { assert, assertUsage, isNotNullish } from '../utils.js';

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

@@ -1,4 +1,4 @@
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 export { getPageFileObject };
 import { determinePageIdOld } from '../determinePageIdOld.js';
 import { isErrorPageId } from '../error-page.js';

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

@@ -1,5 +1,5 @@
 export { 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.
 import { assert, hasProp, isCallable, isObject, cast, isArray } from '../utils.js';
 import { assertExportValues } from './assert_exports_old_design.js';
 import { getPageFileObject } from './getPageFileObject.js';

package/dist/esm/shared/getProxyForPublicUsage.js

@@ -45,7 +45,7 @@ function onInternalProp(propStr, objName) {
     //     - If Rolldown Vite + Rolldowns always transpiles node_modules/ then we can simply use import.meta.env.SSR
     if (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/esm/shared/hooks/getHook.js

@@ -4,7 +4,7 @@ export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
 export { getHookFromPageConfigGlobalCumulative };
 export { getHook_setIsPrerenderering };
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 // We export for old V0.4 design which doesn't support config.hooksTimeout
 export { getHookTimeoutDefault };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';

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

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

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

@@ -1,5 +1,5 @@
-// TODO/now-same-api: use public API internally?
-// TODO/now-flat-pageContext: rename definedAt => definedBy
+// TO-DO/soon/same-api: use public API internally?
+// TO-DO/soon/flat-pageContext: rename definedAt => definedBy
 export { resolveVikeConfigPublicGlobal };
 export { resolveVikeConfigPublicPageEager };
 export { resolveVikeConfigPublicPageLazy };
@@ -47,10 +47,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 }) => {
@@ -60,7 +60,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,
             });
@@ -105,18 +105,18 @@ pageConfigGlobal) {
     });
     assert(!('default' in exports));
     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
-    objectDefineProperty(pageContextExports, 'pageExports', {
+    // TO-DO/next-major-release: remove
+    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 (!isBrowser()) {
@@ -130,7 +130,7 @@ pageConfigGlobal) {
         enumerable: false,
         configurable: true,
     });
-    return pageContextExports;
+    return configPublicPageLazy;
 }
 // V1 design
 function resolveVikeConfigPublic_V1Design(pageConfig) {
@@ -158,7 +158,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/esm/shared/page-configs/serialize/serializeConfigValues.js

@@ -173,7 +173,7 @@ function logJsonSerializeError(err, configName, definedAtData) {
     //*/
     const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(definedAtData);
     assert(configValueFilePathToShowToUser);
-    assertUsage(false, `${pc.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
+    assertUsage(false, `${pc.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined using a separate file ${pc.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/esm/shared/preparePageContextForPublicUsage.js

@@ -9,7 +9,7 @@ function preparePageContextForPublicUsage(pageContext) {
     assert(!pageContext.globalContext); // pageContext.globalContext should only be available to users — Vike itself should use pageContext._globalContext instead
     assert(pageContext._isOriginalObject); // ensure we preserve the original object reference
     addIs404ToPageProps(pageContext);
-    // TODO/next-major-release: remove
+    // TO-DO/next-major-release: remove
     if (!('_pageId' in pageContext)) {
         Object.defineProperty(pageContext, '_pageId', {
             get() {
@@ -27,7 +27,7 @@ function preparePageContextForPublicUsage(pageContext) {
     const globalContextPublic = prepareGlobalContextForPublicUsage(pageContext._globalContext);
     const pageContextPublic = 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;
@@ -65,11 +65,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/esm/shared/route/abort.js

@@ -82,7 +82,7 @@ function AbortRender(pageContextAbort) {
     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'
  */