vike 0.4.143 → 0.4.144-commit-68c730d

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.js

@@ -1,27 +1,28 @@
 export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
-export { getConfigExececutionErrorIntroMsg };
+export { getConfigExecutionErrorIntroMsg as getConfigExecutionErrorIntroMsg };
 export { isTmpFile };
 import { build, formatMessages } from 'esbuild';
 import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertDefaultExportObject, unique, assertWarning, isObject, toPosixPath, assertUsage } from '../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, unique, assertWarning, isObject, toPosixPath, assertUsage } from '../../../utils.js';
 import { isImportData, replaceImportStatements } from './replaceImportStatements.js';
 import { vikeConfigDependencies } from './getVikeConfig.js';
 import 'source-map-support/register.js';
 import { getFilePathToShowToUser } from './getFilePathToShowToUser.js';
+import { assertExportsOfConfigFile } from '../../../../../shared/page-configs/assertExports.js';
 assertIsNotProductionRuntime();
 async function transpileAndExecuteFile(filePath, isValueFile, userRootDir) {
     const { code, fileImports } = await transpileFile(filePath, isValueFile, userRootDir);
-    const { fileExports } = await executeFile(filePath, code, fileImports);
+    const { fileExports } = await executeFile(filePath, code, fileImports, isValueFile);
     return { fileExports };
 }
 async function transpileFile(filePath, isValueFile, userRootDir) {
-    const { filePathAbsolute } = filePath;
-    assertPosixPath(filePathAbsolute);
-    vikeConfigDependencies.add(filePathAbsolute);
+    const { filePathAbsoluteFilesystem } = filePath;
+    assertPosixPath(filePathAbsoluteFilesystem);
+    vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     let code = await transpileWithEsbuild(filePath, isValueFile, userRootDir);
     let fileImports = null;
     {
@@ -35,9 +36,9 @@ async function transpileFile(filePath, isValueFile, userRootDir) {
 }
 function transpileImports(codeOriginal, filePath, isValueFile) {
     // Do we need to remove the imports?
-    const { filePathAbsolute } = filePath;
-    assertPosixPath(filePathAbsolute);
-    const isHeader = isHeaderFile(filePathAbsolute);
+    const { filePathAbsoluteFilesystem } = filePath;
+    assertPosixPath(filePathAbsoluteFilesystem);
+    const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     const isPageConfigFile = !isValueFile;
     if (!isHeader && !isPageConfigFile) {
         return null;
@@ -59,7 +60,7 @@ function transpileImports(codeOriginal, filePath, isValueFile) {
     return { code, fileImports };
 }
 async function transpileWithEsbuild(filePath, bundle, userRootDir) {
-    const entryFilePath = filePath.filePathAbsolute;
+    const entryFilePath = filePath.filePathAbsoluteFilesystem;
     const entryFileDir = path.posix.dirname(entryFilePath);
     const options = {
         platform: 'node',
@@ -124,19 +125,19 @@ async function transpileWithEsbuild(filePath, bundle, userRootDir) {
         Object.keys(result.metafile.inputs).forEach((filePathRelative) => {
             filePathRelative = toPosixPath(filePathRelative);
             assertPosixPath(userRootDir);
-            const filePathAbsolute = path.posix.join(userRootDir, filePathRelative);
-            vikeConfigDependencies.add(filePathAbsolute);
+            const filePathAbsoluteFilesystem = path.posix.join(userRootDir, filePathRelative);
+            vikeConfigDependencies.add(filePathAbsoluteFilesystem);
         });
     }
     const code = result.outputFiles[0].text;
     assert(typeof code === 'string');
     return code;
 }
-async function executeFile(filePath, code, fileImports) {
-    const { filePathAbsolute, filePathRelativeToUserRootDir } = filePath;
+async function executeFile(filePath, code, fileImports, isValueFile) {
+    const { filePathAbsoluteFilesystem, filePathRelativeToUserRootDir } = filePath;
     // Alternative to using a temporary file: https://github.com/vitejs/vite/pull/13269
     //  - But seems to break source maps, so I don't think it's worth it
-    const filePathTmp = getFilePathTmp(filePathAbsolute);
+    const filePathTmp = getFilePathTmp(filePathAbsoluteFilesystem);
     fs.writeFileSync(filePathTmp, code);
     const clean = () => fs.unlinkSync(filePathTmp);
     let fileExports = {};
@@ -157,10 +158,10 @@ async function executeFile(filePath, code, fileImports) {
     //  - import() returns `[Module: null prototype] { default: { onRenderClient: '...' }}`
     //  - We don't need this special object
     fileExports = { ...fileExports };
-    if (fileImports) {
+    if (fileImports && !isValueFile) {
         assert(filePathRelativeToUserRootDir !== undefined);
-        const filePath = filePathRelativeToUserRootDir ?? filePathAbsolute;
-        assertFileImports(fileImports, fileExports, filePath);
+        const filePathToShowToUser = filePathRelativeToUserRootDir ?? filePathAbsoluteFilesystem;
+        assertImportsAreReExported(fileImports, fileExports, filePathToShowToUser);
     }
     return { fileExports };
 }
@@ -185,7 +186,7 @@ async function formatBuildErr(err, filePath) {
     err[formatted] = `${msgIntro}\n${msgEsbuild}`;
 }
 const execErrIntroMsg = new WeakMap();
-function getConfigExececutionErrorIntroMsg(err) {
+function getConfigExecutionErrorIntroMsg(err) {
     if (!isObject(err))
         return null;
     const errIntroMsg = execErrIntroMsg.get(err);
@@ -206,17 +207,17 @@ function isTmpFile(filePath) {
     const fileName = path.posix.basename(filePath);
     return fileName.startsWith(tmpPrefix);
 }
-function assertFileImports(fileImports, fileExports, filePath) {
-    assertDefaultExportObject(fileExports, filePath);
+function assertImportsAreReExported(fileImports, fileExports, filePathToShowToUser) {
+    assertExportsOfConfigFile(fileExports, filePathToShowToUser);
     const exportedStrings = getExportedStrings(fileExports.default);
     Object.values(exportedStrings).forEach((exportVal) => {
         if (typeof exportVal !== 'string')
             return;
         if (!isImportData(exportVal))
             return;
-        const importDataString = exportVal;
+        const importString = exportVal;
         fileImports.forEach((fileImport) => {
-            if (fileImport.importDataString === importDataString) {
+            if (fileImport.importString === importString) {
                 fileImport.isReExported = true;
             }
         });
@@ -228,7 +229,7 @@ function assertFileImports(fileImports, fileExports, filePath) {
     const importNamesUnused = fileImportsUnused.map((fi) => pc.cyan(fi.importLocalName)).join(', ');
     const singular = fileImportsUnused.length === 1;
     assertUsage(fileImportsUnused.length === 0, [
-        `${filePath} imports the following:`,
+        `${filePathToShowToUser} imports the following:`,
         ...importStatements.map((s) => pc.cyan(`  ${s}`)),
         `But the import${singular ? '' : 's'} ${importNamesUnused} ${singular ? "isn't" : "aren't"} re-exported at ${pc.cyan('export default { ... }')} and therefore ${singular ? 'has' : 'have'} no effect, see explanation at https://vike.dev/header-file`
     ].join('\n'));

package/dist/esm/node/plugin/shared/findPageFiles.js

@@ -1,11 +1,12 @@
 export { findPageFiles };
 import glob from 'fast-glob';
-import { assertWarning, toPosixPath, scriptFileExtensions } from '../utils.js';
+import { assertWarning, toPosixPath, scriptFileExtensions, getOutDirs } from '../utils.js';
 import pc from '@brillout/picocolors';
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
+    const { outDirRoot } = getOutDirs(config);
     const timeBase = new Date().getTime();
-    let pageFiles = await glob(fileTypes.map((fileType) => `**/*${fileType}.${scriptFileExtensions}`), { ignore: ['**/node_modules/**'], cwd, dot: false });
+    let pageFiles = await glob(fileTypes.map((fileType) => `**/*${fileType}.${scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false });
     pageFiles = pageFiles.map((p) => '/' + toPosixPath(p));
     const time = new Date().getTime() - timeBase;
     if (isDev) {

package/dist/esm/node/plugin/shared/{getConfigValueSource.d.ts → getConfigValueSourcesRelevant.d.ts}

@@ -1,7 +1,5 @@
-export { getConfigValueSource };
 export { getConfigValueSourcesRelevant };
 import type { ConfigValueSource, PageConfigBuildTime } from '../../../shared/page-configs/PageConfig.js';
-declare function getConfigValueSource(pageConfig: PageConfigBuildTime, configName: string): null | ConfigValueSource;
 declare function getConfigValueSourcesRelevant(pageConfig: PageConfigBuildTime): (ConfigValueSource & {
     configName: string;
 })[];

package/dist/esm/node/plugin/shared/{getConfigValueSource.js → getConfigValueSourcesRelevant.js}

@@ -1,17 +1,6 @@
-export { getConfigValueSource };
 export { getConfigValueSourcesRelevant };
 import { assert, assertIsNotBrowser } from '../../shared/utils.js';
 assertIsNotBrowser();
-function getConfigValueSource(pageConfig, configName) {
-    // Doesn't exist on the client-side, but we are on the server-side as attested by assertIsNotBrowser()
-    assert(pageConfig.configValueSources);
-    const sources = pageConfig.configValueSources[configName];
-    if (!sources)
-        return null;
-    const configValueSource = sources[0];
-    assert(configValueSource);
-    return configValueSource;
-}
 function getConfigValueSourcesRelevant(pageConfig) {
     const configValueSourcesRelevant = Object.entries(pageConfig.configValueSources).map(([configName, sources]) => {
         const configValueSource = sources[0];

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

@@ -18,7 +18,7 @@ import { assert, assertIsNotProductionRuntime, getAssertErrMsg, isUserHookError,
 import { getHttpRequestAsyncStore } from './getHttpRequestAsyncStore.js';
 import { isErrorDebug } from './isErrorDebug.js';
 import { isErrorWithCodeSnippet, getPrettyErrorWithCodeSnippet } from './loggerNotProd/errorWithCodeSnippet.js';
-import { getConfigExececutionErrorIntroMsg, getConfigBuildErrorFormatted } from '../plugins/importUserCode/v1-design/transpileAndExecuteFile.js';
+import { getConfigExecutionErrorIntroMsg, getConfigBuildErrorFormatted } from '../plugins/importUserCode/v1-design/transpileAndExecuteFile.js';
 import { logWithVikeTag, logWithViteTag, logDirectly, isFirstLog, screenHasErrors, clearScreen } from './loggerNotProd/log.js';
 import pc from '@brillout/picocolors';
 import { setAlreadyLogged } from '../../runtime/renderPage/isNewError.js';
@@ -108,7 +108,7 @@ function logConfigError(err) {
     warnIfErrorIsNotObject(err);
     const category = getConfigCategory();
     {
-        const errIntroMsg = getConfigExececutionErrorIntroMsg(err);
+        const errIntroMsg = getConfigExecutionErrorIntroMsg(err);
         if (errIntroMsg) {
             assert(stripAnsi(errIntroMsg).startsWith('Failed to execute'));
             logWithVikeTag(errIntroMsg, 'error', category);

package/dist/esm/node/plugin/utils.d.ts

@@ -2,8 +2,7 @@ export * from '../runtime/utils.js';
 export * from '../../utils/viteIsSSR.js';
 export * from '../../utils/getFilePathAbsolute.js';
 export * from '../../utils/getDependencyPackageJson.js';
-export * from '../../utils/resolve.js';
-export * from '../../utils/assertDefaultExport.js';
+export * from '../../utils/requireResolve.js';
 export * from '../../utils/arrayIncludes.js';
 export * from '../../utils/isDev.js';
 export * from '../../utils/objectKeys.js';

package/dist/esm/node/plugin/utils.js

@@ -1,4 +1,4 @@
-// Utils needed by vike's Vite plugin.
+// Utils needed by Vike's Vite plugin.
 // We assume all runtime entries will load this utils.ts file
 import { onLoad } from './onLoad.js';
 onLoad();
@@ -8,8 +8,7 @@ export * from '../runtime/utils.js';
 export * from '../../utils/viteIsSSR.js';
 export * from '../../utils/getFilePathAbsolute.js';
 export * from '../../utils/getDependencyPackageJson.js';
-export * from '../../utils/resolve.js';
-export * from '../../utils/assertDefaultExport.js';
+export * from '../../utils/requireResolve.js';
 export * from '../../utils/arrayIncludes.js';
 export * from '../../utils/isDev.js';
 export * from '../../utils/objectKeys.js';

package/dist/esm/node/prerender/runPrerender.js

@@ -5,7 +5,7 @@ export { prerenderForceExit };
 import '../runtime/page-files/setup.js';
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs_prerender, hasPropertyGetter, assertPosixPath, urlToFile, executeHook, isPlainObject, setNodeEnvToProduction } from './utils.js';
+import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, hasPropertyGetter, assertPosixPath, urlToFile, executeHook, isPlainObject, setNodeEnvToProduction } from './utils.js';
 import { pLimit } from '../../utils/pLimit.js';
 import { prerenderPage, prerender404Page, getRenderContext, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
@@ -16,8 +16,8 @@ import { getConfigVike } from '../shared/getConfigVike.js';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
-import { getConfigDefinedAtInfo, getConfigValue } from '../../shared/page-configs/utils.js';
-import { loadPageCode } from '../../shared/page-configs/loadPageCode.js';
+import { getConfigValue, getConfigValueFilePathToShowToUser, getHookFilePathToShowToUser } from '../../shared/page-configs/utils.js';
+import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
 import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
 import { assertPathIsFilesystemAbsolute } from '../../utils/assertPathIsFilesystemAbsolute.js';
@@ -44,7 +44,7 @@ async function runPrerender(options, manuallyTriggered) {
     const viteConfig = await resolveConfig(options.viteConfig || {}, 'vike pre-rendering', 'production');
     assertLoadedConfig(viteConfig, options);
     const configVike = await getConfigVike(viteConfig);
-    const { outDirClient, outDirRoot } = getOutDirs_prerender(viteConfig);
+    const { outDirClient, outDirRoot } = getOutDirs(viteConfig);
     const { root } = viteConfig;
     const prerenderConfig = configVike.prerender;
     if (!prerenderConfig) {
@@ -87,12 +87,13 @@ async function collectDoNoPrerenderList(renderContext, doNotPrerenderList, concu
         const configName = 'prerender';
         const configValue = getConfigValue(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
-            const definedAtInfo = getConfigDefinedAtInfo(pageConfig, configName);
+            const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue);
+            assert(configValueFilePathToShowToUser);
             doNotPrerenderList.push({
                 pageId: pageConfig.pageId,
                 setByConfigName: 'prerender',
                 setByConfigValue: false,
-                setByConfigFile: definedAtInfo.filePath
+                setByConfigFile: configValueFilePathToShowToUser
             });
         }
     });
@@ -143,13 +144,12 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
     // V1 design
     await Promise.all(renderContext.pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
-        const pageConfigLoaded = await loadPageCode(pageConfig, false);
+        const pageConfigLoaded = await loadConfigValues(pageConfig, false);
         const configValue = getConfigValue(pageConfigLoaded, hookName);
         if (!configValue)
             return;
         const hookFn = configValue.value;
-        const definedAtInfo = getConfigDefinedAtInfo(pageConfigLoaded, hookName);
-        const hookFilePath = definedAtInfo.filePath;
+        const hookFilePath = getHookFilePathToShowToUser(configValue);
         assert(hookFilePath);
         assertHookFn(hookFn, { hookName, hookFilePath });
         onBeforePrerenderStartHooks.push({
@@ -281,20 +281,18 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
     let onPrerenderStartHook;
     // V1 design
     if (renderContext.pageConfigs.length > 0) {
-        const configValueSource = renderContext.pageConfigGlobal.onPrerenderStart;
-        if (configValueSource) {
-            const hookFn = configValueSource.value;
-            assert(!configValueSource.isComputed);
-            const hookFilePath = configValueSource.definedAtInfo.filePath;
-            assert(hookFn);
+        const { pageConfigGlobal } = renderContext;
+        const configValue = pageConfigGlobal.configValues.onPrerenderStart;
+        if (configValue?.value) {
+            const { value: hookFn } = configValue;
+            // config.onPrerenderStart isn't a computed nor a cumulative config => definedAtInfo should always be defined
+            const hookFilePath = getHookFilePathToShowToUser(configValue);
             assert(hookFilePath);
-            if (hookFn) {
-                onPrerenderStartHook = {
-                    hookFn,
-                    hookName: 'onPrerenderStart',
-                    hookFilePath
-                };
-            }
+            onPrerenderStartHook = {
+                hookFn,
+                hookName: 'onPrerenderStart',
+                hookFilePath
+            };
         }
     }
     // Old design

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -106,7 +106,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     if (!isHtmlOnly) {
         // Don't allow the user to manipulate with injectFilter(): injecting <script type="application/json"> before the stream can break the app when:
         //  - using https://vike.dev/stream#initial-data-after-stream-end
-        //  - `pageContext` is modified during the stream, e.g. /examples/vue-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
+        //  - `pageContext` is modified during the stream, e.g. https://github.com/brillout/vike-with-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
         // The <script> tags are handled separately by vike down below.
         htmlTags.push({
             // Needs to be called after `resolvePageContextPromise()`

package/dist/esm/node/runtime/html/injectAssets.d.ts

@@ -6,7 +6,7 @@ import type { PageAsset } from '../renderPage/getPageAssets.js';
 import type { HtmlPart } from './renderHtml.js';
 import { type PreloadFilter } from './injectAssets/getHtmlTags.js';
 import type { InjectToStream } from './stream/react-streaming.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from './serializePageContextClientSide.js';
 type PageContextInjectAssets = {
     urlPathname: string;
@@ -19,7 +19,7 @@ type PageContextInjectAssets = {
         hookName: 'onRenderHtml' | 'render';
     };
     _baseServer: string;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
 } & PageContextSerialization;
 declare function injectHtmlTagsToString(htmlParts: HtmlPart[], pageContext: PageContextInjectAssets & {

package/dist/esm/node/runtime/html/serializePageContextClientSide.d.ts

@@ -1,12 +1,12 @@
 export { serializePageContextClientSide };
 export { serializePageContextAbort };
 export type { PageContextSerialization };
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { UrlRedirect } from '../../../shared/route/abort.js';
 type PageContextSerialization = {
     _pageId: string;
     _passToClient: string[];
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
     pageProps?: Record<string, unknown>;
     _isError?: true;

package/dist/esm/node/runtime/renderPage/analyzePage.d.ts

@@ -1,5 +1,5 @@
 export { analyzePage };
 import type { PageFile } from '../../../shared/getPageFiles/getPageFileObject.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import { type AnalysisResult } from '../../../shared/getPageFiles/analyzePageClientSide.js';
-declare function analyzePage(pageFilesAll: PageFile[], pageConfig: null | PageConfig, pageId: string): AnalysisResult;
+declare function analyzePage(pageFilesAll: PageFile[], pageConfig: null | PageConfigRuntime, pageId: string): AnalysisResult;

package/dist/esm/node/runtime/renderPage/analyzePage.js

@@ -26,14 +26,14 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
         }
         /* Remove?
         Object.values(pageConfig.configElements).forEach((configElement) => {
-          if (configElement.importFilePath) {
+          if (configElement.importPath) {
             const { env } = configElement
             assert(env)
             const onlyAssets = env === 'server-only'
             const eagerlyImported = env === '_routing-eager'
             if (onlyAssets || eagerlyImported) {
               clientDependencies.push({
-                id: configElement.importFilePath,
+                id: configElement.importPath,
                 onlyAssets,
                 eagerlyImported
               })

package/dist/esm/node/runtime/renderPage/createHttpResponseObject.d.ts

@@ -4,7 +4,7 @@ export { createHttpResponseObjectRedirect };
 export type { HttpResponse };
 import type { GetPageAssets } from './getPageAssets.js';
 import type { HtmlRender } from '../html/renderHtml.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { RenderHook } from './executeOnRenderHtmlHook.js';
 import type { RedirectStatusCode, AbortStatusCode, UrlRedirect } from '../../../shared/route/abort.js';
 import { HttpResponseBody } from './getHttpResponseBody.js';
@@ -21,7 +21,7 @@ declare function createHttpResponseObject(htmlRender: null | HtmlRender, renderH
     is404: null | boolean;
     errorWhileRendering: null | Error;
     __getPageAssets: GetPageAssets;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     abortStatusCode?: AbortStatusCode;
 }): Promise<HttpResponse | null>;
 declare function createHttpResponsePageContextJson(pageContextSerialized: string): Promise<HttpResponse>;

package/dist/esm/node/runtime/renderPage/debugPageFiles.d.ts

@@ -3,7 +3,7 @@ export type { PageContextDebug };
 import { RouteMatches } from '../../../shared/route/index.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
 import type { PageFile } from '../../../shared/getPageFiles.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 type PageContextDebug = {
     _routeMatches: 'ROUTE_ERROR' | RouteMatches;
 };
@@ -12,7 +12,7 @@ declare function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, page
         urlOriginal: string;
         _pageId: string;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
+        _pageConfigs: PageConfigRuntime[];
     } & PageContextDebug;
     isHtmlOnly: boolean;
     isClientRouting: boolean;

package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.d.ts

@@ -3,7 +3,7 @@ export type { RenderHook };
 import { type HtmlRender } from '../html/renderHtml.js';
 import type { PageAsset } from './getPageAssets.js';
 import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from '../html/serializePageContextClientSide.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
 type RenderHook = {
@@ -13,7 +13,7 @@ type RenderHook = {
 type HookName = 'onRenderHtml' | 'render';
 declare function executeOnRenderHtmlHook(pageContext: PageContextForUserConsumptionServerSide & PageContextSerialization & {
     _pageId: string;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     __getPageAssets: GetPageAssets;
     _isHtmlOnly: boolean;
     _baseServer: string;

package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.d.ts

@@ -1,11 +1,11 @@
 export { handleErrorWithoutErrorPage };
 import type { PageContextAfterRender } from './renderPageAlreadyRouted.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 declare function handleErrorWithoutErrorPage<PageContext extends {
     isClientSideNavigation: boolean;
     errorWhileRendering: null | Error;
     is404: null | boolean;
     _pageId: null;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     urlOriginal: string;
 }>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;

package/dist/esm/node/runtime/renderPage/loadPageFilesServerSide.d.ts

@@ -5,11 +5,11 @@ import { type PageFile } from '../../../shared/getPageFiles.js';
 import { PromiseType } from '../utils.js';
 import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebug } from './debugPageFiles.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 type PageContext_loadPageFilesServerSide = PageContextGetPageAssets & PageContextDebug & {
     urlOriginal: string;
     _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
 };
 type PageFiles = PromiseType<ReturnType<typeof loadPageFilesServerSide>>;
 declare function loadPageFilesServerSide(pageContext: {

package/dist/esm/node/runtime/renderPage/loadPageFilesServerSide.js

@@ -7,7 +7,7 @@ import { debugPageFiles } from './debugPageFiles.js';
 import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';
 import { getGlobalContext } from '../globalContext.js';
-import { loadPageCode } from '../../../shared/page-configs/loadPageCode.js';
+import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 async function loadPageFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const [{ config, configEntries, exports, exportsAll, pageExports, pageFilesLoaded, pageConfigLoaded }] = await Promise.all([
@@ -82,7 +82,7 @@ async function loadPageFilesServerSide(pageContext) {
 }
 async function loadPageFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
-    const pageConfigLoaded = !pageConfig ? null : await loadPageCode(pageConfig, isDev);
+    const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const { config, configEntries, exports, exportsAll, pageExports } = getExports(pageFilesServerSide, pageConfigLoaded);
     return {

package/dist/esm/node/runtime/renderPage/log404/index.js

@@ -67,8 +67,8 @@ function getPagesAndRoutesInfo(pageRoutes) {
         ...entries
     ];
     const terminalWidth = getTerminalWidth() || 134;
-    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => routeTypeSrc.length));
-    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => routeDefinedBy.length));
+    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => stripAnsi(routeTypeSrc).length));
+    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => stripAnsi(routeDefinedBy).length));
     let width1 = terminalWidth - width3 - width2 - 10;
     linesContent.forEach((lineContent) => {
         let { routeStr } = lineContent;
@@ -83,9 +83,9 @@ function getPagesAndRoutesInfo(pageRoutes) {
     });
     width1 = Math.max(...linesContent.map(({ routeStr }) => stripAnsi(routeStr).length));
     let lines = linesContent.map(({ routeStr, routeTypeSrc, routeDefinedBy }, i) => {
-        let cell1 = routeStr.padEnd(width1 + (routeStr.length - stripAnsi(routeStr).length), ' ');
-        let cell2 = routeTypeSrc.padEnd(width2, ' ');
-        let cell3 = routeDefinedBy.padEnd(width3, ' ');
+        let cell1 = padEnd(routeStr, width1 + (stripAnsi(routeStr).length - stripAnsi(routeStr).length));
+        let cell2 = padEnd(routeTypeSrc, width2);
+        let cell3 = padEnd(routeDefinedBy, width3);
         const isHeader = i === 0;
         if (isHeader) {
             cell1 = pc.dim(cell1);
@@ -119,6 +119,11 @@ function truncateRouteFunction(routeStr, lenMax) {
     routeStr = truncateString(routeStr, lenMax, (s) => pc.dim(s));
     return routeStr;
 }
+/** Same as String.prototype.padEnd but with stripAnsi() */
+function padEnd(str, width) {
+    const padWidth = Math.max(0, width - stripAnsi(str).length);
+    return str + ''.padEnd(padWidth, ' ');
+}
 function removeNonAscii(str) {
     // https://stackoverflow.com/questions/20856197/remove-non-ascii-character-in-string/20856346#20856346
     return str.replace(/[^\x00-\x7F]/g, '');

package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts

@@ -1,7 +1,7 @@
 export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
 import { PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { ConfigEntries, ExportsAll } from '../../../shared/getPageFiles/getExports.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
 type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & {
@@ -18,7 +18,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     exports: Record<string, unknown>;
     exportsAll: ExportsAll;
     _pageId: string;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
     isClientSideNavigation: boolean;
     pageProps?: Record<string, unknown>;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -10,7 +10,7 @@ import { type PageFile } from '../../../shared/getPageFiles.js';
 import { type PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
 import { HttpResponse } from './createHttpResponseObject.js';
 import { PageContext_loadPageFilesServerSide, type PageFiles } from './loadPageFilesServerSide.js';
-import type { PageConfig, PageConfigGlobal } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../../shared/page-configs/PageConfig.js';
 import { type PageRoutes } from '../../../shared/route/loadPageRoutes.js';
 import type { OnBeforeRouteHook } from '../../../shared/route/executeOnBeforeRouteHook.js';
 type PageContextAfterRender = {
@@ -42,8 +42,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -89,8 +89,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -137,8 +137,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -184,8 +184,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -239,8 +239,8 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _baseAssets: string | null;
     _includeAssetsImportedByServer: boolean;
     _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfig[];
-    _pageConfigGlobal: PageConfigGlobal;
+    _pageConfigs: PageConfigRuntime[];
+    _pageConfigGlobal: PageConfigGlobalRuntime;
     _allPageIds: string[];
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -256,8 +256,8 @@ declare function getPageContextInitEnhanced(pageContextInit: {
 };
 type RenderContext = {
     pageFilesAll: PageFile[];
-    pageConfigs: PageConfig[];
-    pageConfigGlobal: PageConfigGlobal;
+    pageConfigs: PageConfigRuntime[];
+    pageConfigGlobal: PageConfigGlobalRuntime;
     allPageIds: string[];
     pageRoutes: PageRoutes;
     onBeforeRouteHook: OnBeforeRouteHook | null;