vike 0.4.231 → 0.4.232-commit-134207d

package/dist/cjs/shared/page-configs/{getUserFriendlyConfigs.js → resolveVikeConfigPublic.js}

@@ -3,54 +3,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserFriendlyConfigsGlobal = getUserFriendlyConfigsGlobal;
-exports.getUserFriendlyConfigsPageEager = getUserFriendlyConfigsPageEager;
-exports.getUserFriendlyConfigsPageLazy = getUserFriendlyConfigsPageLazy;
+exports.resolveVikeConfigPublicGlobal = resolveVikeConfigPublicGlobal;
+exports.resolveVikeConfigPublicPageEager = resolveVikeConfigPublicPageEager;
+exports.resolveVikeConfigPublicPageLazy = resolveVikeConfigPublicPageLazy;
 const assert_exports_old_design_js_1 = require("../getPageFiles/assert_exports_old_design.js");
 const getConfigDefinedAt_js_1 = require("./getConfigDefinedAt.js");
 const helpers_js_1 = require("./helpers.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function getUserFriendlyConfigsPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
-    const pageConfigUserFriendly = getUserFriendlyConfigs_public({ pageConfigGlobalValues, pageConfigValues });
+function resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
+    const vikeConfigPublicPage = getPublicCopy(vikeConfigPublicPage_);
     let page;
     if (!pageConfig.isErrorPage) {
-        const route = pageConfigUserFriendly.config.route ?? pageConfig.routeFilesystem.routeString;
+        const route = vikeConfigPublicPage.config.route ?? pageConfig.routeFilesystem.routeString;
         page = {
-            ...pageConfigUserFriendly,
-            route
+            ...vikeConfigPublicPage,
+            route,
         };
     }
     else {
         page = {
-            ...pageConfigUserFriendly,
-            isErrorPage: true
+            ...vikeConfigPublicPage,
+            isErrorPage: true,
         };
     }
     return [pageConfig.pageId, page];
 }
-function getUserFriendlyConfigs_public({ pageConfigGlobalValues, pageConfigValues }) {
-    const pageConfigUserFriendly = getUserFriendlyConfigs_base({ pageConfigGlobalValues, pageConfigValues });
-    return getPublicCopy(pageConfigUserFriendly);
-}
-function getPublicCopy(pageConfigUserFriendly) {
-    const p = pageConfigUserFriendly;
+function getPublicCopy(vikeConfigPublic) {
     return {
-        config: p.config,
-        _source: p.source,
-        _sources: p.sources,
-        _from: p.from
+        config: vikeConfigPublic.config,
+        _source: vikeConfigPublic.source,
+        _sources: vikeConfigPublic.sources,
+        _from: vikeConfigPublic.from,
     };
 }
-function getUserFriendlyConfigs_base({ pageConfigGlobalValues, pageConfigValues }) {
+function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues, }) {
     const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
-    return getUserFriendlyConfigs_V1Design({ configValues });
+    return resolveVikeConfigPublic_V1Design({ configValues });
 }
-function getUserFriendlyConfigsGlobal({ pageConfigGlobalValues }) {
-    const pageConfigGlobalUserFriendly = getUserFriendlyConfigs_V1Design({ configValues: pageConfigGlobalValues });
-    return getPublicCopy(pageConfigGlobalUserFriendly);
+function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
+    const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
+    return getPublicCopy(vikeConfigPublicGlobal);
 }
-function getUserFriendlyConfigsPageLazy(pageFiles, // V0.4 design
+function resolveVikeConfigPublicPageLazy(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};
@@ -69,7 +65,7 @@ pageConfigGlobal) {
                 filePath: pageFile.filePath,
                 _filePath: pageFile.filePath, // TODO/next-major-release: remove
                 _fileType: pageFile.fileType,
-                _isFromDefaultExport: isFromDefaultExport
+                _isFromDefaultExport: isFromDefaultExport,
             });
         });
     });
@@ -77,9 +73,9 @@ pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getUserFriendlyConfigs_base({
+        const res = resolveVikeConfigPublic_base({
             pageConfigGlobalValues: pageConfigGlobal.configValues,
-            pageConfigValues: pageConfig.configValues
+            pageConfigValues: pageConfig.configValues,
         });
         source = res.source;
         sources = res.sources;
@@ -94,7 +90,7 @@ pageConfigGlobal) {
         from = {
             configsStandard: {},
             configsCumulative: {},
-            configsComputed: {}
+            configsComputed: {},
         };
     }
     const pageExports = {};
@@ -117,10 +113,10 @@ pageConfigGlobal) {
         from,
         source,
         sources,
-        // TODO/eventually: deprecate/remove every prop below
+        // TODO/now-flat-pageContext: deprecate every prop below
         configEntries,
         exports,
-        exportsAll
+        exportsAll,
     };
     // TODO/v1-release: remove
     (0, utils_js_1.objectDefineProperty)(pageContextExports, 'pageExports', {
@@ -129,18 +125,18 @@ pageConfigGlobal) {
             if (!(0, utils_js_1.isBrowser)()) {
                 (0, utils_js_1.assertWarning)(false, 'pageContext.pageExports is outdated, use pageContext.exports instead', {
                     onlyOnce: true,
-                    showStackTrace: true
+                    showStackTrace: true,
                 });
             }
             return pageExports;
         },
         enumerable: false,
-        configurable: true
+        configurable: true,
     });
     return pageContextExports;
 }
 // V1 design
-function getUserFriendlyConfigs_V1Design(pageConfig) {
+function resolveVikeConfigPublic_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};
@@ -149,7 +145,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
     const from = {
         configsStandard: {},
         configsCumulative: {},
-        configsComputed: {}
+        configsComputed: {},
     };
     const addSrc = (src, configName) => {
         source[configName] = src;
@@ -163,7 +159,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
         configEntries[configName].push({
             configValue: value,
             configDefinedAt,
-            configDefinedByFile: configValueFilePathToShowToUser
+            configDefinedByFile: configValueFilePathToShowToUser,
         });
         // TODO/v1-release: remove
         const exportName = configName;
@@ -174,7 +170,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
             filePath: configValueFilePathToShowToUser,
             _filePath: configValueFilePathToShowToUser,
             _fileType: null,
-            _isFromDefaultExport: null
+            _isFromDefaultExport: null,
         });
     };
     Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
@@ -184,7 +180,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
             const src = {
                 type: 'configsStandard',
                 value: configValue.value,
-                definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName)
+                definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName),
             };
             addSrc(src, configName);
             from.configsStandard[configName] = src;
@@ -193,6 +189,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
         if (configValue.type === 'cumulative') {
             const src = {
                 type: 'configsCumulative',
+                definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName),
                 values: configValue.value.map((value, i) => {
                     const definedAtFile = configValue.definedAtData[i];
                     (0, utils_js_1.assert)(definedAtFile);
@@ -200,9 +197,9 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
                     addLegacy(configName, value, definedAtFile);
                     return {
                         value,
-                        definedAt
+                        definedAt,
                     };
-                })
+                }),
             };
             addSrc(src, configName);
             from.configsCumulative[configName] = src;
@@ -210,7 +207,8 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
         if (configValue.type === 'computed') {
             const src = {
                 type: 'configsComputed',
-                value: configValue.value
+                definedAt: 'Vike', // Vike currently doesn't support user-land computed configs => computed configs are always defined by Vike => there isn't any file path to show.
+                value: configValue.value,
             };
             addSrc(src, configName);
             from.configsComputed[configName] = src;
@@ -223,7 +221,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
         exportsAll,
         source,
         sources,
-        from
+        from,
     };
 }
 function getExportValues(pageFile) {
@@ -246,7 +244,7 @@ function getExportValues(pageFile) {
                     exportValues.push({
                         exportName: defaultExportName,
                         exportValue: defaultExportValue,
-                        isFromDefaultExport
+                        isFromDefaultExport,
                     });
                 });
                 return;
@@ -255,7 +253,7 @@ function getExportValues(pageFile) {
         exportValues.push({
             exportName,
             exportValue,
-            isFromDefaultExport
+            isFromDefaultExport,
         });
     });
     exportValues.forEach(({ exportName, isFromDefaultExport }) => {

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

@@ -119,9 +119,9 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
                         value: exportValue,
                         definedAtData: {
                             filePathToShowToUser: definedAtFile.filePathToShowToUser,
-                            fileExportPathToShowToUser: [exportName]
-                        }
-                    }
+                            fileExportPathToShowToUser: [exportName],
+                        },
+                    },
                 });
             }
         });

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

@@ -7,12 +7,12 @@ exports.serializeConfigValues = serializeConfigValues;
 exports.getConfigValuesBase = getConfigValuesBase;
 exports.isJsonValue = isJsonValue;
 const assertSetup_js_1 = require("../../../utils/assertSetup.js");
-const utils_js_1 = require("../../../node/plugin/utils.js");
-const pointerImports_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/pointerImports.js");
+const utils_js_1 = require("../../../node/vite/utils.js");
+const pointerImports_js_1 = require("../../../node/vite/shared/resolveVikeConfigInternal/pointerImports.js");
 const helpers_js_1 = require("../helpers.js");
 const stringify_1 = require("@brillout/json-serializer/stringify");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getVikeConfig_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../../node/vite/shared/resolveVikeConfigInternal.js");
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
@@ -111,14 +111,14 @@ function getValueSerializedWithImport(configValueSource, importStatements, files
     const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
     return {
         type: valueIsDefinedByPlusValueFile ? 'plus-file' : 'pointer-import',
-        valueAsJsCode: importName
+        valueAsJsCode: importName,
     };
 }
 function getValueSerializedWithJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
     const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv);
     return {
         type: 'js-serialized',
-        valueAsJsCode
+        valueAsJsCode,
     };
 }
 function valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
@@ -141,7 +141,7 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
                         return { replacement };
                     }
                 }
-            }
+            },
         });
     }
     catch (err) {
@@ -190,7 +190,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             return 'SKIP';
         const configValueBase = {
             type: 'computed',
-            definedAtData: null
+            definedAtData: null,
         };
         return { configValueBase, value, configName, configEnv };
     });
@@ -207,13 +207,13 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             const definedAtFile = getDefinedAtFileSource(source);
             const configValueBase = {
                 type: 'standard',
-                definedAtData: definedAtFile
+                definedAtData: definedAtFile,
             };
             return { configValueBase, sourceRelevant: source, configName };
         }
         else {
             const sourcesRelevant = sources
-                .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
+                .filter((source) => !(0, resolveVikeConfigInternal_js_1.isOverridden)(source, configName, pageConfig))
                 .filter((source) => isEnvMatch(source.configEnv));
             if (sourcesRelevant.length === 0)
                 return 'SKIP';
@@ -224,7 +224,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             });
             const configValueBase = {
                 type: 'cumulative',
-                definedAtData
+                definedAtData,
             };
             return { configValueBase, sourcesRelevant, configName };
         }
@@ -237,7 +237,7 @@ function getDefinedAtFileSource(source) {
         return definedAt;
     const definedAtFile = {
         filePathToShowToUser: definedAt.filePathToShowToUser,
-        fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser
+        fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser,
     };
     return definedAtFile;
 }
@@ -284,7 +284,7 @@ function assertFileEnv(importPath, configEnv, configName, filesEnv) {
         (0, utils_js_1.assertUsage)(false, [
             `${importPath} defines the value of configs living in different environments:`,
             ...[fileEnvDiff, fileEnvNew].map((c) => `  - config ${picocolors_1.default.code(c.configName)} which value lives in environment ${picocolors_1.default.code(JSON.stringify(c.configEnv))}`),
-            'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports'
+            'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports',
         ].join('\n'));
     }
 }

package/dist/cjs/shared/preparePageContextForPublicUsage.js

@@ -17,11 +17,11 @@ function preparePageContextForPublicUsage(pageContext) {
             get() {
                 (0, utils_js_1.assertWarning)(false, 'pageContext._pageId has been renamed to pageContext.pageId', {
                     showStackTrace: true,
-                    onlyOnce: true
+                    onlyOnce: true,
                 });
                 return pageContext.pageId;
             },
-            enumerable: false
+            enumerable: false,
         });
     }
     // For a more readable `console.log(pageContext)` output
@@ -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: double check whether that's true
+    // - TODO/now-proxy: double check whether that's true
     true, (prop) => {
         if (prop === 'globalContext') {
             return globalContextPublic;
@@ -72,7 +72,7 @@ function assertPropertyGetters(pageContext) {
         // TODO/v1-release: remove
         'url',
         // TODO/v1-release: remove
-        'pageExports'
+        'pageExports',
     ].forEach((prop) => {
         if (pageContext.prop)
             (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, prop));

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

@@ -40,8 +40,8 @@ function redirect(url, statusCode) {
         _abortCall: `redirect(${args.join(', ')})`,
         _urlRedirect: {
             url,
-            statusCode
-        }
+            statusCode,
+        },
     });
     return AbortRender(pageContextAbort);
 }
@@ -57,7 +57,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
     const pageContextAbort = {
         abortReason,
         _abortCaller: abortCaller,
-        _abortCall: abortCall
+        _abortCall: abortCall,
     };
     if (pageContextAddendum) {
         (0, utils_js_1.assert)(pageContextAddendum._isLegacyRenderErrorPage === true);
@@ -67,7 +67,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
         const url = urlOrStatusCode;
         (0, utils_js_1.assertUsageUrlPathnameAbsolute)(url, getErrPrefix(abortCaller));
         (0, utils_js_1.objectAssign)(pageContextAbort, {
-            _urlRewrite: url
+            _urlRewrite: url,
         });
         return AbortRender(pageContextAbort);
     }
@@ -76,7 +76,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
         assertStatusCode(urlOrStatusCode, [401, 403, 404, 410, 429, 500, 503], 'render');
         (0, utils_js_1.objectAssign)(pageContextAbort, {
             abortStatusCode,
-            is404: abortStatusCode === 404
+            is404: abortStatusCode === 404,
         });
         return AbortRender(pageContextAbort);
     }
@@ -133,7 +133,7 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
         // hookLoc is missing when serializing abort errors from server to client
     }
     (0, utils_js_1.assertInfo)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while rendering ${picocolors_1.default.cyan(urlCurrent)}`, {
-        onlyOnce: false
+        onlyOnce: false,
     });
 }
 function assertStatusCode(statusCode, expected, caller) {
@@ -167,7 +167,7 @@ function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
         // prettier-ignore
         // biome-ignore format:
         rewriteCount > 0 && picocolors_1.default.cyan("throw render('/some-url')"),
-        redirectCount > 0 && picocolors_1.default.cyan("throw redirect('/some-url')")
+        redirectCount > 0 && picocolors_1.default.cyan("throw redirect('/some-url')"),
     ]
         .filter(Boolean)
         .join(' and ');

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

@@ -4,7 +4,7 @@ exports.debug = debug;
 exports.setCreateDebugger = setCreateDebugger;
 // Using createDebugger() for isomorphic code without bloating the client-side.
 // On the server-side, this is just a transparent proxy.
-// On the client-side, this is an emtpy shell.
+// On the client-side, this is an empty shell.
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('route/debug.ts', {});
 function debug(...args) {

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

@@ -37,7 +37,7 @@ function deduceRouteStringFromFilesystemPath(pageId, filesystemRoots) {
         .split('/')
         .filter((dir) => dir !== 'pages' && dir !== 'src' && dir !== 'index')
         .join('/');
-    // Hanlde `/index.page.*` suffix
+    // Handle `/index.page.*` suffix
     (0, utils_js_1.assert)(!filesystemRoute.includes('.page.'));
     (0, utils_js_1.assert)(!filesystemRoute.endsWith('.'));
     if (filesystemRoute.endsWith('/index')) {

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

@@ -7,11 +7,11 @@ const execHook_js_1 = require("../hooks/execHook.js");
 const errIntro = 'The guard() hook defined by';
 async function executeGuardHook(pageContext, prepareForPublicUsage) {
     let hook;
-    if (pageContext._pageFilesAll.length > 0) {
+    if (pageContext._globalContext._pageFilesAll.length > 0) {
         // TODO/v1-release: remove
         // V0.4 design
-        (0, utils_js_1.assert)(pageContext._pageConfigs.length === 0);
-        hook = findPageGuard(pageContext.pageId, pageContext._pageFilesAll);
+        (0, utils_js_1.assert)(pageContext._globalContext._pageConfigs.length === 0);
+        hook = findPageGuard(pageContext.pageId, pageContext._globalContext._pageFilesAll);
     }
     else {
         // V1 design

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

@@ -12,9 +12,9 @@ const execHook_js_1 = require("../hooks/execHook.js");
 const preparePageContextForPublicUsage_js_1 = require("../preparePageContextForPublicUsage.js");
 async function executeOnBeforeRouteHook(pageContext) {
     const pageContextFromOnBeforeRouteHook = {};
-    if (!pageContext._onBeforeRouteHook)
+    if (!pageContext._globalContext._onBeforeRouteHook)
         return null;
-    const pageContextFromHook = await getPageContextFromHook(pageContext._onBeforeRouteHook, pageContext);
+    const pageContextFromHook = await getPageContextFromHook(pageContext._globalContext._onBeforeRouteHook, pageContext);
     if (pageContextFromHook) {
         (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, pageContextFromHook);
         if ((0, utils_js_1.hasProp)(pageContextFromOnBeforeRouteHook, 'pageId', 'string') ||
@@ -28,13 +28,13 @@ async function executeOnBeforeRouteHook(pageContext) {
             }
             (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
                 _routingProvidedByOnBeforeRouteHook: true,
-                _debugRouteMatches: 'CUSTOM_ROUTING'
+                _debugRouteMatches: 'CUSTOM_ROUTING',
             });
             return pageContextFromOnBeforeRouteHook;
         }
     }
     (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
-        _routingProvidedByOnBeforeRouteHook: false
+        _routingProvidedByOnBeforeRouteHook: false,
     });
     return pageContextFromOnBeforeRouteHook;
 }
@@ -54,7 +54,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId') && !(0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId', 'null')) {
         const errPrefix2 = `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { pageId } }')} but ${picocolors_1.default.cyan('pageId')} should be`;
         (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId', 'string'), `${errPrefix2} a string or null`);
-        (0, utils_js_1.assertUsage)(pageContext._allPageIds.includes(hookReturn.pageContext.pageId), `${errPrefix2} ${(0, utils_js_1.joinEnglish)(pageContext._allPageIds.map((s) => picocolors_1.default.cyan(s)), 'or')}`);
+        (0, utils_js_1.assertUsage)(pageContext._globalContext._allPageIds.includes(hookReturn.pageContext.pageId), `${errPrefix2} ${(0, utils_js_1.joinEnglish)(pageContext._globalContext._allPageIds.map((s) => picocolors_1.default.cyan(s)), 'or')}`);
     }
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'routeParams')) {
         (0, resolveRouteFunction_js_1.assertRouteParams)(hookReturn.pageContext, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { routeParams } }')} but routeParams should`);
@@ -77,7 +77,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     }
     (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(hookReturn.pageContext, {
         hookFilePath: onBeforeRouteHook.hookFilePath,
-        hookName: 'onBeforeRoute'
+        hookName: 'onBeforeRoute',
     });
     const pageContextAddendumHook = {};
     (0, utils_js_1.objectAssign)(pageContextAddendumHook, hookReturn.pageContext);

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

@@ -18,7 +18,7 @@ const executeOnBeforeRouteHook_js_1 = require("./executeOnBeforeRouteHook.js");
 const debug_js_1 = require("./debug.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function route(pageContext, skipOnBeforeRouteHook) {
-    (0, debug_js_1.debug)('Pages routes:', pageContext._pageRoutes);
+    (0, debug_js_1.debug)('Pages routes:', pageContext._globalContext._pageRoutes);
     const pageContextFromRoute = {};
     // onBeforeRoute()
     if (!skipOnBeforeRouteHook) {
@@ -36,15 +36,15 @@ async function route(pageContext, skipOnBeforeRouteHook) {
         (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
     }
     // Vike's routing
-    const allPageIds = pageContext._allPageIds;
+    const allPageIds = pageContext._globalContext._allPageIds;
     (0, utils_js_1.assertUsage)(allPageIds.length > 0, 'No page found. You must create at least one page.');
-    (0, utils_js_1.assert)(pageContext._pageFilesAll.length > 0 || pageContext._pageConfigs.length > 0);
+    (0, utils_js_1.assert)(pageContext._globalContext._pageFilesAll.length > 0 || pageContext._globalContext._pageConfigs.length > 0);
     const { urlPathname } = pageContext;
     (0, utils_js_1.assert)(urlPathname.startsWith('/'));
     const routeMatches = [];
-    await Promise.all(pageContext._pageRoutes.map(async (pageRoute) => {
+    await Promise.all(pageContext._globalContext._pageRoutes.map(async (pageRoute) => {
         const { pageId, routeType } = pageRoute;
-        // Filesytem Routing
+        // Filesystem Routing
         if (pageRoute.routeType === 'FILESYSTEM') {
             const { routeString } = pageRoute;
             const match = (0, resolveRouteString_js_1.resolveRouteString)(routeString, urlPathname);
@@ -65,7 +65,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
                     pageId,
                     routeString,
                     routeParams,
-                    routeType
+                    routeType,
                 });
             }
             return;
@@ -82,7 +82,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
         }
         (0, utils_js_1.assert)(false);
     }));
-    (0, resolvePrecedence_js_1.resolvePrecendence)(routeMatches);
+    (0, resolvePrecedence_js_1.resolvePrecedence)(routeMatches);
     const winner = routeMatches[0] ?? null;
     (0, debug_js_1.debug)(`Route matches for URL ${picocolors_1.default.cyan(urlPathname)} (in precedence order):`, routeMatches);
     (0, utils_js_1.objectAssign)(pageContextFromRoute, { _debugRouteMatches: routeMatches });
@@ -91,7 +91,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
     if (!winner) {
         (0, utils_js_1.objectAssign)(pageContextFromRoute, {
             pageId: null,
-            routeParams: {}
+            routeParams: {},
         });
         return pageContextFromRoute;
     }
@@ -100,7 +100,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
         (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(routeParams));
         (0, utils_js_1.objectAssign)(pageContextFromRoute, {
             pageId: winner.pageId,
-            routeParams: winner.routeParams
+            routeParams: winner.routeParams,
         });
     }
     return pageContextFromRoute;

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

@@ -42,7 +42,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                             comesFromV1PageConfig,
                             routeString: route,
                             routeDefinedAtString: definedAtString,
-                            routeType: 'STRING'
+                            routeType: 'STRING',
                         };
                     }
                     else {
@@ -60,7 +60,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                             routeFunction: route,
                             routeFunctionFilePath: filePathToShowToUser,
                             routeDefinedAtString: definedAtString,
-                            routeType: 'FUNCTION'
+                            routeType: 'FUNCTION',
                         };
                     }
                 }
@@ -76,7 +76,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                     comesFromV1PageConfig,
                     routeString,
                     routeDefinedAtString: null,
-                    routeType: 'FILESYSTEM'
+                    routeType: 'FILESYSTEM',
                 };
             }
             (0, utils_js_1.assert)(pageRoute);
@@ -102,7 +102,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                     routeString,
                     routeDefinedAtString: null,
                     routeFilesystemDefinedBy: `${pageId}.page.*`,
-                    routeType: 'FILESYSTEM'
+                    routeType: 'FILESYSTEM',
                 });
             }
             else {
@@ -116,7 +116,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                         comesFromV1PageConfig,
                         routeString,
                         routeDefinedAtString: filePath,
-                        routeType: 'STRING'
+                        routeType: 'STRING',
                     });
                     return;
                 }
@@ -134,7 +134,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                         routeFunction,
                         routeFunctionFilePath: filePath,
                         routeDefinedAtString: filePath,
-                        routeType: 'FUNCTION'
+                        routeType: 'FUNCTION',
                     });
                     return;
                 }
@@ -166,7 +166,7 @@ function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
                 hookFilePath: filePath,
                 hookFn: onBeforeRoute,
                 hookName,
-                hookTimeout: (0, getHook_js_1.getHookTimeoutDefault)(hookName)
+                hookTimeout: (0, getHook_js_1.getHookTimeoutDefault)(hookName),
             };
         }
         if ('filesystemRoutingRoot' in fileExports) {
@@ -174,7 +174,7 @@ function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
             (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(fileExports, 'filesystemRoutingRoot', 'string'), `\`export { filesystemRoutingRoot }\` of ${filePath} is \`'${fileExports.filesystemRoutingRoot}'\` but it should start with a leading slash \`/\`.`);
             filesystemRoots.push({
                 filesystemRoot: dirname(filePath),
-                urlRoot: fileExports.filesystemRoutingRoot
+                urlRoot: fileExports.filesystemRoutingRoot,
             });
         }
     });

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePrecendence = resolvePrecendence;
+exports.resolvePrecedence = resolvePrecedence;
 // export type { RouteMatch }
 const resolveRouteString_js_1 = require("./resolveRouteString.js");
 const utils_js_1 = require("./utils.js");
 const utils_js_2 = require("./utils.js");
 const resolveRouteString_js_2 = require("./resolveRouteString.js");
 // See https://vike.dev/route-function#precedence
-function resolvePrecendence(routeMatches) {
+function resolvePrecedence(routeMatches) {
     // prettier-ignore
     // biome-ignore format:
     routeMatches