vike 0.4.143 → 0.4.144-commit-68c730d

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

@@ -1,8 +1,9 @@
 export { getConfigValue };
 export { getPageConfig };
 export { getConfigDefinedAtString };
-export { getConfigDefinedAtInfo };
 export { getDefinedAtString };
+export { getConfigValueFilePathToShowToUser };
+export { getHookFilePathToShowToUser };
 import { assert, assertUsage, getValuePrintable } from '../utils.js';
 import pc from '@brillout/picocolors';
 import { getExportPath } from './getExportPath.js';
@@ -11,31 +12,29 @@ function getConfigValue(pageConfig, configName, type) {
     const configValue = getConfigValueEntry(pageConfig, configName);
     if (configValue === null)
         return null;
-    const { value, definedAtInfo } = configValue;
+    const { value, definedAt } = configValue;
     if (type)
-        assertConfigValueType(value, type, configName, definedAtInfo);
-    return { value };
+        assertConfigValueType(value, type, configName, definedAt);
+    return configValue;
 }
-function getConfigDefinedAtInfo(pageConfig, configName) {
-    const configValue = getConfigValueEntry(pageConfig, configName);
-    // We assume the caller to have ensured that the config value exists prior to calling getConfigDefinedAtInfo()
-    assert(configValue);
-    const { definedAtInfo } = configValue;
-    // definedAtInfo is available only for config values that aren't:
-    //  - computed, nor
-    //  - cumulative
-    assert(definedAtInfo);
-    return definedAtInfo;
+function assertConfigValueType(value, type, configName, definedAt) {
+    assert(value !== null);
+    const typeActual = typeof value;
+    if (typeActual === type)
+        return;
+    const valuePrintable = getValuePrintable(value);
+    const problem = valuePrintable !== null ? `value ${pc.cyan(valuePrintable)}` : `type ${pc.cyan(typeActual)}`;
+    const configDefinedAt = getConfigDefinedAtString(configName, { definedAt }, true);
+    assertUsage(false, `${configDefinedAt} has an invalid ${problem}: it should be a ${pc.cyan(type)} instead`);
 }
 function getConfigValueEntry(pageConfig, configName) {
     const configValue = pageConfig.configValues[configName];
     if (!configValue)
         return null;
-    const { value, definedAtInfo } = configValue;
     // Enable users to suppress global config values by setting the local config value to null
-    if (value === null)
+    if (configValue.value === null)
         return null;
-    return { value, definedAtInfo };
+    return configValue;
 }
 function getPageConfig(pageId, pageConfigs) {
     const pageConfig = pageConfigs.find((p) => p.pageId === pageId);
@@ -43,32 +42,56 @@ function getPageConfig(pageId, pageConfigs) {
     assert(pageConfig);
     return pageConfig;
 }
-function assertConfigValueType(value, type, configName, definedAtInfo) {
-    assert(value !== null);
-    const typeActual = typeof value;
-    if (typeActual === type)
-        return;
-    const valuePrintable = getValuePrintable(value);
-    const problem = valuePrintable !== null ? `value ${pc.cyan(valuePrintable)}` : `type ${pc.cyan(typeActual)}`;
-    const configDefinedAt = getConfigDefinedAtString(configName, { definedAtInfo }, true);
-    assertUsage(false, `${configDefinedAt} has an invalid ${problem}: it should be a ${pc.cyan(type)} instead`);
-}
-function getConfigDefinedAtString(configName, { definedAtInfo }, sentenceBegin, append) {
-    let configDefinedAt = `${sentenceBegin ? `Config` : `config`} ${pc.cyan(configName)}`;
-    if (definedAtInfo !== null) {
-        configDefinedAt = `${configDefinedAt} defined at ${getDefinedAtString(definedAtInfo, append)}`;
-    }
+function getConfigDefinedAtString(configName, { definedAt }, sentenceBegin) {
+    const configDefinedAt = `${sentenceBegin ? `Config` : `config`} ${pc.cyan(configName)} defined ${getSourceString(definedAt, configName)}`;
     return configDefinedAt;
 }
-function getDefinedAtString(definedAtInfo, append) {
-    const { filePath, fileExportPath } = definedAtInfo;
-    let definedAt = filePath;
-    const exportPath = getExportPath(fileExportPath);
-    if (exportPath) {
-        definedAt = `${definedAt} > ${pc.cyan(exportPath)}`;
+function getSourceString(definedAt, configName) {
+    if (definedAt.isComputed) {
+        return 'internally';
     }
-    if (append) {
-        definedAt = `${definedAt} > (${pc.blue(append)})`;
+    let files;
+    if (definedAt.isCumulative) {
+        files = definedAt.files;
     }
-    return definedAt;
+    else {
+        files = [definedAt.file];
+    }
+    assert(files.length >= 1);
+    const sourceString = files
+        .map((source) => {
+        const { filePathToShowToUser, fileExportPath } = source;
+        let s = filePathToShowToUser;
+        const exportPath = getExportPath(fileExportPath, configName);
+        if (exportPath) {
+            s = `${s} > ${pc.cyan(exportPath)}`;
+        }
+        if (definedAt.isEffect) {
+            s = `${s} > (${pc.blue('effect')})`;
+        }
+        return s;
+    })
+        .join(' / ');
+    return `at ${sourceString}`;
+}
+function getDefinedAtString(configValue, configName) {
+    let sourceString = getSourceString(configValue.definedAt, configName);
+    if (sourceString.startsWith('at '))
+        sourceString = sourceString.slice('at '.length);
+    return sourceString;
+}
+function getConfigValueFilePathToShowToUser({ definedAt }) {
+    // A unique file path only exists if the config value isn't cumulative nor computed:
+    //  - cumulative config values have multiple file paths
+    //  - computed values don't have any file path
+    if (definedAt.isComputed || definedAt.isCumulative)
+        return null;
+    const { filePathToShowToUser } = definedAt.file;
+    assert(filePathToShowToUser);
+    return filePathToShowToUser;
+}
+function getHookFilePathToShowToUser({ definedAt }) {
+    const filePathToShowToUser = getConfigValueFilePathToShowToUser({ definedAt });
+    assert(filePathToShowToUser);
+    return filePathToShowToUser;
 }

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

@@ -1,8 +1,8 @@
 export { executeGuardHook };
 import type { PageContextExports, PageFile } from '../getPageFiles.js';
-import type { PageConfig } from '../page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../page-configs/PageConfig.js';
 declare function executeGuardHook<T extends PageContextExports & {
     _pageId: string;
     _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
 }>(pageContext: T, prepareForUserConsumption: (pageConfig: T) => T | void): Promise<void>;

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

@@ -4,12 +4,12 @@ import type { PageFile } from '../getPageFiles.js';
 import { PageContextUrlComputedPropsInternal, PageContextUrlSources } from '../addUrlComputedProps.js';
 import { type OnBeforeRouteHook } from './executeOnBeforeRouteHook.js';
 import type { PageRoutes, RouteType } from './loadPageRoutes.js';
-import type { PageConfig, PageConfigGlobal } from '../page-configs/PageConfig.js';
+import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../page-configs/PageConfig.js';
 type PageContextForRoute = PageContextUrlComputedPropsInternal & {
     _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     _allPageIds: string[];
-    _pageConfigGlobal: PageConfigGlobal;
+    _pageConfigGlobal: PageConfigGlobalRuntime;
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: OnBeforeRouteHook | null;
 } & PageContextUrlSources;

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

@@ -3,7 +3,7 @@ export type { PageRoutes };
 export type { RouteType };
 import type { PageFile } from '../getPageFiles.js';
 import type { OnBeforeRouteHook } from './executeOnBeforeRouteHook.js';
-import type { PageConfig, PageConfigGlobal } from '../page-configs/PageConfig.js';
+import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../page-configs/PageConfig.js';
 type PageRoute = {
     pageId: string;
     comesFromV1PageConfig: boolean;
@@ -23,7 +23,7 @@ type PageRoute = {
 });
 type PageRoutes = PageRoute[];
 type RouteType = 'STRING' | 'FUNCTION' | 'FILESYSTEM';
-declare function loadPageRoutes(pageFilesAll: PageFile[], pageConfigs: PageConfig[], pageConfigGlobal: PageConfigGlobal, allPageIds: string[]): Promise<{
+declare function loadPageRoutes(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime, allPageIds: string[]): Promise<{
     pageRoutes: PageRoutes;
     onBeforeRouteHook: null | OnBeforeRouteHook;
 }>;

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

@@ -3,7 +3,7 @@ import { isErrorPageId } from '../error-page.js';
 import { assert, assertUsage, hasProp, slice } from './utils.js';
 import { deduceRouteStringFromFilesystemPath } from './deduceRouteStringFromFilesystemPath.js';
 import { isCallable } from '../utils.js';
-import { getConfigDefinedAtInfo, getConfigValue, getDefinedAtString } from '../page-configs/utils.js';
+import { getConfigValue, getDefinedAtString, getHookFilePathToShowToUser } from '../page-configs/utils.js';
 import { warnDeprecatedAllowKey } from './resolveRouteFunction.js';
 async function loadPageRoutes(
 // TODO: remove all arguments and use GlobalContext instead
@@ -30,9 +30,8 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                 const configName = 'route';
                 const configValue = getConfigValue(pageConfig, configName);
                 if (configValue) {
-                    const definedAtInfo = getConfigDefinedAtInfo(pageConfig, configName);
                     const route = configValue.value;
-                    const definedAt = getDefinedAtString(definedAtInfo);
+                    const definedAt = getDefinedAtString(configValue, configName);
                     if (typeof route === 'string') {
                         pageRoute = {
                             pageId,
@@ -137,19 +136,17 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
 function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
     // V1 Design
     if (pageConfigs.length > 0) {
-        if (pageConfigGlobal.onBeforeRoute) {
-            const hookFn = pageConfigGlobal.onBeforeRoute.value;
-            if (hookFn) {
-                assert(!pageConfigGlobal.onBeforeRoute.isComputed);
-                const hookFilePath = pageConfigGlobal.onBeforeRoute.definedAtInfo.filePath;
-                assert(hookFilePath);
-                assertUsage(isCallable(hookFn), `The hook onBeforeRoute() defined by ${hookFilePath} should be a function.`);
-                const onBeforeRouteHook = {
-                    hookFilePath: hookFilePath,
-                    onBeforeRoute: hookFn
-                };
-                return { onBeforeRouteHook, filesystemRoots: null };
-            }
+        if (pageConfigGlobal.configValues.onBeforeRoute?.value) {
+            const configValue = pageConfigGlobal.configValues.onBeforeRoute;
+            const { value: hookFn } = configValue;
+            const hookFilePath = getHookFilePathToShowToUser(configValue);
+            // TODO: use getConfigDefinedAtString()
+            assertUsage(isCallable(hookFn), `The hook onBeforeRoute() defined by ${hookFilePath} should be a function.`);
+            const onBeforeRouteHook = {
+                hookFilePath: hookFilePath,
+                onBeforeRoute: hookFn
+            };
+            return { onBeforeRouteHook, filesystemRoots: null };
         }
         return { onBeforeRouteHook: null, filesystemRoots: null };
     }

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

@@ -7,7 +7,7 @@ import { assertRouteString, resolveRouteString } from './resolveRouteString.js';
 import pc from '@brillout/picocolors';
 assertIsNotBrowser(); // Don't bloat the client
 // TODO/v1-release: update
-const configSrc = '[vite.config.js > ssr({ redirects })]';
+const configSrc = '[vite.config.js > vike({ redirects })]';
 function resolveRedirects(redirects, urlPathname) {
     for (const [urlSource, urlTarget] of Object.entries(redirects)) {
         const urlResolved = resolveRouteStringRedirect(urlSource, urlTarget, urlPathname);

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

@@ -20,6 +20,7 @@ async function resolveRouteFunction(routeFunction, pageContext, routeDefinedAt)
         result = {};
     }
     assertUsage(isPlainObject(result), `The Route Function ${routeDefinedAt} should return a boolean or a plain JavaScript object (but it's ${pc.cyan(`typeof result === ${JSON.stringify(typeof result)}`)} instead)`);
+    // AFAICT this return interface is superfluous. Should we soft-deprecate it and remove it?
     if ('match' in result) {
         const { match } = result;
         assertUsage(typeof match === 'boolean', `The ${pc.cyan('match')} value returned by the Route Function ${routeDefinedAt} should be a boolean.`);

package/dist/esm/shared/types.d.ts

@@ -12,18 +12,17 @@ import type { ConfigEntries, ExportsAll } from './getPageFiles/getExports.js';
 import type { Config } from './page-configs/Config.js';
 import type { PageContextConfig } from './page-configs/Config/PageContextConfig.js';
 import type { AbortStatusCode } from './route/abort.js';
-type PageContext = PageContextWithClientRouting;
-type PageContextClient = PageContextClientWithClientRouting;
-type PageContextWithClientRouting = PageContextClientWithClientRouting | PageContextServer;
-type PageContextWithServerRouting = PageContextClientWithServerRouting | PageContextServer;
 type PageContextServer = PageContextBuiltInServer & Vike.PageContext;
-type PageContextClientWithClientRouting = PageContextBuiltInClientWithClientRouting & Vike.PageContext;
+type PageContext = PageContextClient | PageContextServer;
+type PageContextClient = PageContextBuiltInClientWithClientRouting & Vike.PageContext;
+type PageContextWithServerRouting = PageContextClientWithServerRouting | PageContextServer;
 type PageContextClientWithServerRouting = PageContextBuiltInClientWithServerRouting & Vike.PageContext;
 /** Built-in `pageContext` properties set by vike.
  *
  * https://vike.dev/pageContext
  */
 type PageContextBuiltInServer<Page = [never]> = PageContextBuiltInCommon<Page> & PageContextUrlComputedPropsServer;
+/** For Vike internal use */
 type PageContextBuiltInServerInternal<Page = [never]> = PageContextBuiltInCommon<Page> & PageContextUrlComputedPropsInternal;
 type PageContextBuiltInCommon<Page = [never]> = {
     /** The `export { Page }` of your `.page.js` file.
@@ -57,7 +56,10 @@ type PageContextBuiltInCommon<Page = [never]> = {
      * https://vike.dev/exports
      */
     exportsAll: ExportsAll;
-    /** The URL of the current page */
+    /** The URL you provided to Vike when calling `renderPage({ urlOriginal })` in your server middleware.
+     *
+     * https://vike.dev/renderPage
+     */
     urlOriginal: string;
     /** If an error occurs, whether the error is a `404 Page Not Found`.
      *

package/dist/esm/shared/utils.d.ts

@@ -18,7 +18,6 @@ export * from '../utils/projectInfo.js';
 export * from '../utils/hasPropertyGetter.js';
 export * from '../utils/isPromise.js';
 export * from '../utils/checkType.js';
-export * from '../utils/assertDefaultExport.js';
 export * from '../utils/objectEntries.js';
 export * from '../utils/getValuePrintable.js';
 export * from '../utils/escapeRegex.js';

package/dist/esm/shared/utils.js

@@ -22,7 +22,6 @@ export * from '../utils/projectInfo.js';
 export * from '../utils/hasPropertyGetter.js';
 export * from '../utils/isPromise.js';
 export * from '../utils/checkType.js';
-export * from '../utils/assertDefaultExport.js';
 export * from '../utils/objectEntries.js';
 export * from '../utils/getValuePrintable.js';
 export * from '../utils/escapeRegex.js';

package/dist/esm/types/index.d.ts

@@ -6,10 +6,11 @@ export type { PageContextClientWithServerRouting } from '../shared/types.js';
 export type { PageContextBuiltInServer } from '../shared/types.js';
 export type { PageContextBuiltInClientWithClientRouting } from '../shared/types.js';
 export type { PageContextBuiltInClientWithServerRouting } from '../shared/types.js';
-export type { Config, ConfigMeta as Meta } from '../shared/page-configs/Config.js';
+export type { Config, ConfigMeta as Meta, GuardAsync, GuardSync, OnBeforePrerenderStartAsync, OnBeforePrerenderStartSync, OnBeforeRenderAsync, OnBeforeRenderSync, OnBeforeRouteAsync, OnBeforeRouteSync, OnHydrationEndAsync, OnHydrationEndSync, OnPageTransitionEndAsync, OnPageTransitionEndSync, OnPageTransitionStartAsync, OnPageTransitionStartSync, OnPrerenderStartAsync, OnPrerenderStartSync, OnRenderClientAsync, OnRenderClientSync, OnRenderHtmlAsync, OnRenderHtmlSync, RouteAsync, RouteSync } from '../shared/page-configs/Config.js';
 export type { ConfigEnv } from '../shared/page-configs/PageConfig.js';
 export type { ConfigDefinition, ConfigEffect } from '../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
 export type { ConfigEntries } from '../shared/getPageFiles/getExports.js';
+export type { Url } from '../shared/addUrlComputedProps.js';
 export type { InjectFilterEntry } from '../node/runtime/html/injectAssets/getHtmlTags.js';
 export { defineConfig } from './defineConfig.js';
 import type { ConfigEnv } from '../shared/page-configs/PageConfig.js';

package/dist/esm/utils/getFilePathAbsolute.d.ts

@@ -2,4 +2,4 @@ export { getFilePathAbsolute };
 export { getFilePathRelativeToUserRootDir };
 import type { ResolvedConfig } from 'vite';
 declare function getFilePathAbsolute(filePath: string, config: ResolvedConfig): string;
-declare function getFilePathRelativeToUserRootDir(filePathAbsolute: string, userRootDir: string, alwaysRelative?: boolean): string;
+declare function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem: string, userRootDir: string, alwaysRelative?: boolean): string;

package/dist/esm/utils/getFilePathAbsolute.js

@@ -30,26 +30,26 @@ function getFilePathAbsolute(filePath, config) {
         filePathUnresolved = path.posix.join(root, filePath);
         assertPathIsFilesystemAbsolute(filePathUnresolved);
     }
-    let filePathAbsolute;
+    let filePathAbsoluteFilesystem;
     try {
-        filePathAbsolute = require_.resolve(filePathUnresolved, { paths: [config.root] });
+        filePathAbsoluteFilesystem = require_.resolve(filePathUnresolved, { paths: [config.root] });
     }
     catch (err) {
         console.error(err);
         assert(false);
     }
-    filePathAbsolute = toPosixPath(filePathAbsolute);
-    assertPathIsFilesystemAbsolute(filePathAbsolute);
-    return filePathAbsolute;
+    filePathAbsoluteFilesystem = toPosixPath(filePathAbsoluteFilesystem);
+    assertPathIsFilesystemAbsolute(filePathAbsoluteFilesystem);
+    return filePathAbsoluteFilesystem;
 }
-function getFilePathRelativeToUserRootDir(filePathAbsolute, userRootDir, alwaysRelative = false) {
-    assertPosixPath(filePathAbsolute);
+function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
+    assertPosixPath(filePathAbsoluteFilesystem);
     assertPosixPath(userRootDir);
-    let filePathRelativeToUserRootDir = path.posix.relative(userRootDir, filePathAbsolute);
-    if (filePathAbsolute.startsWith(userRootDir)) {
+    let filePathRelativeToUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
+    if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
         assert(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'), 
         // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
-        { filePathRelativeToUserRootDir, filePathAbsolute, userRootDir });
+        { filePathRelativeToUserRootDir, filePathAbsoluteFilesystem, userRootDir });
         filePathRelativeToUserRootDir = `/${filePathRelativeToUserRootDir}`;
         return filePathRelativeToUserRootDir;
     }
@@ -58,7 +58,7 @@ function getFilePathRelativeToUserRootDir(filePathAbsolute, userRootDir, alwaysR
             return filePathRelativeToUserRootDir;
         }
         else {
-            return filePathAbsolute;
+            return filePathAbsoluteFilesystem;
         }
     }
 }

package/dist/esm/utils/getOutDirs.d.ts

@@ -1,5 +1,4 @@
 export { getOutDirs };
-export { getOutDirs_prerender };
 export { resolveOutDir };
 import type { UserConfig, ResolvedConfig } from 'vite';
 type OutDirs = {
@@ -11,6 +10,5 @@ type OutDirs = {
     outDirServer: string;
 };
 declare function getOutDirs(config: ResolvedConfig): OutDirs;
-declare function getOutDirs_prerender(config: ResolvedConfig): OutDirs;
 /** Appends `client/` or `server/` to `config.build.outDir` */
 declare function resolveOutDir(config: UserConfig): string;

package/dist/esm/utils/getOutDirs.js

@@ -1,5 +1,4 @@
 export { getOutDirs };
-export { getOutDirs_prerender };
 export { resolveOutDir };
 import { viteIsSSR } from './viteIsSSR.js';
 import { assert, assertUsage } from './assert.js';
@@ -7,21 +6,24 @@ import { pathJoin } from './path-shim.js';
 import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
 import pc from '@brillout/picocolors';
 function getOutDirs(config) {
-    const outDir = getOutDirFromResolvedConfig(config);
-    assertOutDirResolved(outDir, config);
-    assert(outDir.endsWith('/server') || outDir.endsWith('/client'));
-    assert('/client'.length === '/server'.length);
-    const outDirRoot = outDir.slice(0, -1 * '/client'.length);
-    return getOutDirsAll(outDirRoot, config.root);
-}
-function getOutDirs_prerender(config) {
-    const outDirRoot = getOutDirFromResolvedConfig(config);
-    assert(isOutDirRoot(outDirRoot));
+    let outDirRoot;
+    {
+        const outDir = getOutDirFromViteResolvedConfig(config);
+        if (isOutDirRoot(outDir)) {
+            outDirRoot = outDir;
+        }
+        else {
+            assertOutDirResolved(outDir, config);
+            assert(outDir.endsWith('/server') || outDir.endsWith('/client'));
+            assert('/client'.length === '/server'.length);
+            outDirRoot = outDir.slice(0, -1 * '/client'.length);
+        }
+    }
     return getOutDirsAll(outDirRoot, config.root);
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
 function resolveOutDir(config) {
-    const outDir = getOutDirFromUserConfig(config) || 'dist';
+    const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     // outDir may already be resolved when using Telefunc + vike (because both Telefunc and vike use this logic)
     if (!isOutDirRoot(outDir)) {
         assertOutDirResolved(outDir, config);
@@ -39,6 +41,7 @@ function resolveOutDir(config) {
 }
 function determineOutDirs(outDirRoot) {
     assertPosixPath(outDirRoot);
+    assert(!outDirRoot.endsWith('/'));
     assert(isOutDirRoot(outDirRoot));
     const outDirClient = pathJoin(outDirRoot, 'client');
     const outDirServer = pathJoin(outDirRoot, 'server');
@@ -89,18 +92,22 @@ function assertOutDirResolved(outDir, config) {
         assertUsage(outDir.endsWith('/client'), wrongUsage);
     }
 }
-function getOutDirFromUserConfig(config) {
+function getOutDirFromViteUserConfig(config) {
     let outDir = config.build?.outDir;
     if (outDir === undefined)
         return undefined;
-    // I believe Vite normalizes config.build.outDir only if config is ResolvedConfig
-    outDir = toPosixPath(outDir);
+    outDir = normalize(outDir);
     return outDir;
 }
-function getOutDirFromResolvedConfig(config) {
+function getOutDirFromViteResolvedConfig(config) {
     let outDir = config.build.outDir;
-    // Vite seems to be buggy and doesn't always normalize config.build.outDir
+    assert(outDir);
+    outDir = normalize(outDir);
+    return outDir;
+}
+function normalize(outDir) {
     outDir = toPosixPath(outDir);
+    outDir = outDir.replace(/\/+$/, ''); // remove trailing slashes
     return outDir;
 }
 function outDirIsAbsolutePath(outDir) {

package/dist/esm/utils/getValuePrintable.js

@@ -1,7 +1,7 @@
 export function getValuePrintable(value) {
     if ([null, undefined].includes(value))
         return String(value);
-    if (['undefined', 'boolean', 'number', 'string'].includes(typeof value))
+    if (['boolean', 'number', 'string'].includes(typeof value))
         return JSON.stringify(value);
     return null;
 }

package/dist/esm/utils/objectAssign.js

@@ -3,5 +3,7 @@ export { objectAssign };
 //  - With type inference
 //  - Preserves property descriptors, which we need for preserving the getters added by addUrlComputedProps()
 function objectAssign(obj, objAddendum) {
-    Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));
+    if (objAddendum) {
+        Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));
+    }
 }

package/dist/esm/utils/parseUrl.js

@@ -51,7 +51,7 @@ function parseUrl(url, baseServer) {
     const searchAll = {};
     Array.from(new URLSearchParams(searchOriginal || '')).forEach(([key, val]) => {
         search[key] = val;
-        searchAll[key] = [...(searchAll[key] || []), val];
+        searchAll[key] = [...(searchAll.hasOwnProperty(key) ? searchAll[key] : []), val];
     });
     // Origin + pathname
     const { origin, pathname: pathnameResolved } = parsePathname(urlWithoutHashNorSearch, baseServer);

package/dist/esm/utils/projectInfo.d.ts

@@ -5,7 +5,7 @@ type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.143";
+    projectVersion: "0.4.144-commit-68c730d";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.143';
+const PROJECT_VERSION = '0.4.144-commit-68c730d';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/dist/esm/utils/requireResolve.d.ts

@@ -0,0 +1,2 @@
+export { requireResolve };
+declare function requireResolve(importPath: string, cwd: string): string | null;

package/dist/esm/utils/{resolve.js → requireResolve.js}

@@ -1,4 +1,4 @@
-export { resolve };
+export { requireResolve };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from './assertIsNotProductionRuntime.js';
@@ -10,7 +10,7 @@ const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotBrowser();
 assertIsNotProductionRuntime();
-function resolve(importPath, cwd) {
+function requireResolve(importPath, cwd) {
     assertPosixPath(cwd);
     const clean = addFileExtensionsToRequireResolve();
     importPath = removeFileExtention(importPath);

package/dist/esm/utils/warnIfErrorIsNotObject.js

@@ -7,7 +7,7 @@ assertIsNotBrowser();
 // It would be cleaner to:
 //  - Call assertUsageErrorIsObject() right after calling the user's hook
 //    - Attach the original error: assertUsageError.originalErrorValue = err
-//      - Show the original error in vike's error handling
+//      - Show the original error in Vike's error handling
 //  - Use assertErrorIsObject() throughout Vike's source code
 function warnIfErrorIsNotObject(err) {
     if (!isObject(err)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.143",
+  "version": "0.4.144-commit-68c730d",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -162,8 +162,7 @@
     "vike": "./node/cli/bin-entry.js"
   },
   "devDependencies": {
-    "@brillout/part-regex": "^0.1.2",
-    "@brillout/release-me": "^0.1.7",
+    "@brillout/release-me": "^0.1.8",
     "@types/estree": "^1.0.0",
     "@types/jest": "^27.4.1",
     "@types/node": "^20.1.0",

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/isConfigEnvMatch.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isConfigEnvMatch = void 0;
-function isConfigEnvMatch(configEnv, isForClientSide, isClientRouting) {
-    if (configEnv === '_routing-eager' || configEnv === 'config-only')
-        return false;
-    if (configEnv === (isForClientSide ? 'server-only' : 'client-only'))
-        return false;
-    if (configEnv === '_routing-lazy' && isForClientSide && !isClientRouting)
-        return false;
-    return true;
-}
-exports.isConfigEnvMatch = isConfigEnvMatch;

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

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertPageConfigGlobal = exports.assertPageConfigs = void 0;
-const utils_js_1 = require("../utils.js");
-function assertPageConfigs(pageConfigs) {
-    (0, utils_js_1.assert)(Array.isArray(pageConfigs));
-    pageConfigs.forEach((pageConfig) => {
-        (0, utils_js_1.assert)((0, utils_js_1.isObject)(pageConfig));
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfig, 'pageId', 'string'));
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfig, 'routeFilesystem'));
-    });
-}
-exports.assertPageConfigs = assertPageConfigs;
-function assertPageConfigGlobal(pageConfigGlobal) {
-    (0, utils_js_1.assert)(pageConfigGlobal);
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigGlobal, 'onBeforeRoute'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigGlobal, 'onPrerenderStart'));
-}
-exports.assertPageConfigGlobal = assertPageConfigGlobal;