vike 0.4.235 → 0.4.236-commit-64431e7

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/createGlobalContextShared.d.ts

@@ -9,10 +9,10 @@ import type { GlobalContextServerInternal } from '../node/runtime/globalContext.
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-declare function createGlobalContextShared<GlobalContextAddendum extends object>(virtualFileExports: unknown, globalObject: {
+declare function createGlobalContextShared<GlobalContextAdded extends Record<string, any>, GlobalContextAddedAsync extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
     globalContext?: Record<string, unknown>;
     onCreateGlobalContextHooks?: Hook[];
-}, addGlobalContext?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>): Promise<{
+}, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     /**
      * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
      *
@@ -35,7 +35,7 @@ declare function createGlobalContextShared<GlobalContextAddendum extends object>
     pages: {
         [k: string]: import("./page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
     };
-} & Awaited<GlobalContextAddendum>>;
+} & GlobalContextAdded & GlobalContextAddedAsync>;
 type GlobalContextBasePublic = Pick<GlobalContextBase, 'config' | 'pages' | 'isGlobalContext'>;
 type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
 declare function createGlobalContextBase(virtualFileExports: unknown): {

package/dist/esm/shared/createGlobalContextShared.js

@@ -7,10 +7,34 @@ import { execHookGlobal } from './hooks/execHook.js';
 import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
 import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext) {
+async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
+// TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
+addGlobalContextTmp, addGlobalContextAsync) {
     const globalContext = createGlobalContextBase(virtualFileExports);
-    const globalContextAddendum = await addGlobalContext?.(globalContext);
-    objectAssign(globalContext, globalContextAddendum);
+    let isNewGlobalContext;
+    if (!globalObject.globalContext) {
+        // We set globalObject.globalContext early and before any async operations, so that getGlobalContextSync() can be used early.
+        // - Required by vike-vercel
+        globalObject.globalContext = globalContext;
+        isNewGlobalContext = false;
+    }
+    else {
+        isNewGlobalContext = true;
+    }
+    if (addGlobalContext &&
+        // TODO/next-major-release: remove
+        globalContext._pageConfigs.length > 0) {
+        const globalContextAdded = addGlobalContext?.(globalContext);
+        objectAssign(globalContext, globalContextAdded);
+    }
+    else {
+        const globalContextAdded = await addGlobalContextTmp?.(globalContext);
+        objectAssign(globalContext, globalContextAdded);
+    }
+    {
+        const globalContextAddedAsync = await addGlobalContextAsync?.(globalContext);
+        objectAssign(globalContext, globalContextAddedAsync);
+    }
     const onCreateGlobalContextHooks = getHookFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
     let hooksCalled = false;
     if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {
@@ -18,10 +42,7 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
         await execHookGlobal('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext, prepareGlobalContextForPublicUsage);
         hooksCalled = true;
     }
-    if (!globalObject.globalContext) {
-        globalObject.globalContext = globalContext;
-    }
-    else {
+    if (isNewGlobalContext) {
         // Singleton: ensure all `globalContext` user-land references are preserved & updated.
         if (hooksCalled) {
             objectReplace(globalObject.globalContext, globalContext);

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'
  */

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

@@ -1,7 +1,7 @@
 // Unit tests at ./deduceRouteStringFromFilesystemPath.spec.ts
 import { assert, higherFirst, slice } from './utils.js';
 export { deduceRouteStringFromFilesystemPath };
-// 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/esm/shared/route/execHookGuard.js

@@ -6,7 +6,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
         assert(pageContext._globalContext._pageConfigs.length === 0);
         hook = findPageGuard(pageContext.pageId, pageContext._globalContext._pageFilesAll);

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

@@ -36,7 +36,7 @@ async function execHookOnBeforeRoute(pageContext) {
 async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     let { hookReturn } = execHookDirectSync(onBeforeRouteHook, pageContext, preparePageContextForPublicUsage);
     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}`;
     assertUsage(hookReturn === null ||

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

@@ -12,7 +12,7 @@ import { resolveRouteFunction } from './resolveRouteFunction.js';
 import { execHookOnBeforeRoute } from './execHookOnBeforeRoute.js';
 import { debug } from './debug.js';
 import pc from '@brillout/picocolors';
-// TODO/next-major-release: make it sync
+// TO-DO/next-major-release: make it sync
 async function route(pageContext, skipOnBeforeRouteHook) {
     debug('Pages routes:', pageContext._globalContext._pageRoutes);
     const pageContextFromRoute = {};

package/dist/esm/shared/route/loadPageRoutes.d.ts

@@ -1,4 +1,5 @@
 export { loadPageRoutes };
+export { loadPageRoutesSync };
 export type { PageRoutes };
 export type { RouteType };
 import type { PageFile } from '../getPageFiles.js';
@@ -28,3 +29,7 @@ declare function loadPageRoutes(pageFilesAll: PageFile[], pageConfigs: PageConfi
     pageRoutes: PageRoutes;
     onBeforeRouteHook: null | Hook;
 }>;
+declare function loadPageRoutesSync(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime, allPageIds: string[]): {
+    pageRoutes: PageRoutes;
+    onBeforeRouteHook: null | Hook;
+};

package/dist/esm/shared/route/loadPageRoutes.js

@@ -1,4 +1,5 @@
 export { loadPageRoutes };
+export { loadPageRoutesSync };
 import { isErrorPageId } from '../error-page.js';
 import { assert, assertUsage, hasProp, slice } from './utils.js';
 import { deduceRouteStringFromFilesystemPath } from './deduceRouteStringFromFilesystemPath.js';
@@ -10,8 +11,13 @@ import { getHookFromPageConfigGlobal, getHookTimeoutDefault } from '../hooks/get
 async function loadPageRoutes(
 // Remove all arguments and use GlobalContextServerInternal instead?
 pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
-    // TODO/next-major: remove & make this function sync
+    // TO-DO/next-major-release: remove this line, remove this function, rename loadPageRoutesSync() to loadPageRoutes()
     await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));
+    return loadPageRoutesSync(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
+}
+function loadPageRoutesSync(
+// Remove all arguments and use GlobalContextServerInternal instead?
+pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
     const { onBeforeRouteHook, filesystemRoots } = getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal);
     const pageRoutes = getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds);
     return { pageRoutes, onBeforeRouteHook };
@@ -49,7 +55,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                         const { filePathToShowToUser } = definedAtData;
                         assert(filePathToShowToUser);
                         assert(isCallable(route));
-                        // TODO/next-major: remove
+                        // TO-DO/next-major-release: remove
                         if (getConfigValueRuntime(pageConfig, 'iKnowThePerformanceRisksOfAsyncRouteFunctions', 'boolean'))
                             warnDeprecatedAllowKey();
                         pageRoute = {
@@ -82,7 +88,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
         });
     }
     // Old design
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if (pageConfigs.length === 0) {
         assert(filesystemRoots);
         const comesFromV1PageConfig = false;
@@ -149,7 +155,7 @@ function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
         return { onBeforeRouteHook: hook, filesystemRoots: null };
     }
     // Old design
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     let onBeforeRouteHook = null;
     const filesystemRoots = [];
     pageFilesAll

package/dist/esm/shared/route/resolveRouteFunction.js

@@ -13,7 +13,7 @@ async function resolveRouteFunction(routeFunction, pageContext, routeFunctionFil
         hookName: 'route',
     }, pageContext, preparePageContextForPublicUsage);
     assertSyncRouting(result, `The Route Function ${routeFunctionFilePath}`);
-    // TODO/v1-release: make resolveRouteFunction() and route() sync
+    // TO-DO/next-major-release: make resolveRouteFunction() and route() sync
     //* We disallow asynchronous routing, because we need to check whether a link is a Vike link in a synchronous fashion before calling ev.preventDefault() in the 'click' event listener
     result = await result;
     //*/
@@ -49,11 +49,11 @@ async function resolveRouteFunction(routeFunction, pageContext, routeFunctionFil
         routeParams,
     };
 }
-// TODO/v1-release: remove, and make routing synchronous (enabling Vike to synchronously check whether a link is a Vike link before even calling ev.preventDefault())
+// TO-DO/next-major-release: remove, and make routing synchronous (enabling Vike to synchronously check whether a link is a Vike link before even calling ev.preventDefault())
 function assertSyncRouting(res, errPrefix) {
     assertWarning(!isPromise(res), `${errPrefix} returned a promise, but asynchronous routing is deprecated and will be removed in the next major release, see https://vike.dev/route-function#async`, { onlyOnce: true });
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function warnDeprecatedAllowKey() {
     const allowKey = pc.cyan('iKnowThePerformanceRisksOfAsyncRouteFunctions');
     assertWarning(false, `${allowKey} is deprecated and will be removed in the next major release`, { onlyOnce: true });

package/dist/esm/shared/route/resolveRouteString.js

@@ -8,7 +8,7 @@ import { assertWarning, isBrowser, escapeRegex } from '../utils.js';
 import { assert, assertUsage } from './utils.js';
 import pc from '@brillout/picocolors';
 const PARAM_TOKEN_NEW = '@';
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 const PARAM_TOKEN_OLD = ':';
 function assertRouteString(routeString, errPrefix = 'Invalid') {
     let errPrefix2 = `${errPrefix} Route String ${highlight(routeString)}`;