vike 0.4.250 → 0.4.251-commit-9c5fb90

package/dist/shared-server-client/route/loadPageRoutes.js

@@ -1,9 +1,12 @@
 export { loadPageRoutes };
 export { loadPageRoutesSync };
 import { isErrorPageId } from '../error-page.js';
-import { assert, assertUsage, hasProp, slice } from './utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isArray } from '../../utils/isArray.js';
+import { isCallable } from '../../utils/isCallable.js';
+import { slice } from '../../utils/slice.js';
 import { deduceRouteStringFromFilesystemPath } from './deduceRouteStringFromFilesystemPath.js';
-import { isArray, isCallable } from '../utils.js';
 import { getConfigValueRuntime } from '../page-configs/getConfigValueRuntime.js';
 import { getDefinedAtString } from '../page-configs/getConfigDefinedAt.js';
 import { warnDeprecatedAllowKey } from './resolveRouteFunction.js';

package/dist/shared-server-client/route/resolvePrecedence.js

@@ -1,8 +1,7 @@
 export { resolvePrecedence };
 // export type { RouteMatch }
 import { analyzeRouteString } from './resolveRouteString.js';
-import { higherFirst, lowerFirst } from './utils.js';
-import { makeFirst } from './utils.js';
+import { higherFirst, lowerFirst, makeFirst } from '../../utils/sorter.js';
 import { isStaticRouteString } from './resolveRouteString.js';
 // See https://vike.dev/route-function#precedence
 function resolvePrecedence(routeMatches) {

package/dist/shared-server-client/route/resolveRoute.js

@@ -1,5 +1,5 @@
 export { resolveRoute };
-import { assertUsage } from './utils.js';
+import { assertUsage } from '../../utils/assert.js';
 import { resolveRouteString } from './resolveRouteString.js';
 import pc from '@brillout/picocolors';
 function resolveRoute(routeString, urlPathname) {

package/dist/shared-server-client/route/resolveRouteFunction.js

@@ -2,16 +2,19 @@ export { resolveRouteFunction };
 export { assertRouteParams };
 export { assertSyncRouting };
 export { warnDeprecatedAllowKey };
-import { execHookDirectSync } from '../hooks/execHook.js';
-import { preparePageContextForPublicUsage } from '../preparePageContextForPublicUsage.js';
-import { assert, assertUsage, assertWarning, hasProp, isPlainObject, isPromise } from './utils.js';
+import { execHookSingleSync } from '../hooks/execHook.js';
+import { getPageContextPublicShared } from '../getPageContextPublicShared.js';
+import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isPlainObject } from '../../utils/isPlainObject.js';
+import { isPromise } from '../../utils/isPromise.js';
 import pc from '@brillout/picocolors';
 async function resolveRouteFunction(routeFunction, pageContext, routeFunctionFilePath) {
-    let { hookReturn: result } = execHookDirectSync({
+    let { hookReturn: result } = execHookSingleSync({
         hookFn: routeFunction,
         hookFilePath: routeFunctionFilePath,
         hookName: 'route',
-    }, pageContext, preparePageContextForPublicUsage);
+    }, pageContext._globalContext, pageContext, getPageContextPublicShared);
     assertSyncRouting(result, `The Route Function ${routeFunctionFilePath}`);
     // TO-DO/next-major-release: make resolveRouteFunction() and route() sync
     //* We disallow asynchronous routing, because we need to check whether a link is a Vike link in a synchronous fashion before calling ev.preventDefault() in the 'click' event listener

package/dist/shared-server-client/route/resolveRouteString.js

@@ -4,8 +4,9 @@ export { isStaticRouteString };
 export { analyzeRouteString };
 export { assertRouteString };
 export { getRouteStringParameterList };
-import { assertWarning, isBrowser, escapeRegex } from '../utils.js';
-import { assert, assertUsage } from './utils.js';
+import { assertWarning, assert, assertUsage } from '../../utils/assert.js';
+import { escapeRegex } from '../../utils/escapeRegex.js';
+import { isBrowser } from '../../utils/isBrowser.js';
 import pc from '@brillout/picocolors';
 const PARAM_TOKEN_NEW = '@';
 // TO-DO/next-major-release: remove

package/dist/shared-server-client/route/resolveUrlPathname.js

@@ -1,6 +1,6 @@
 export { resolveUrlPathname };
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
-import { assert, assertUsage } from '../utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
 assertIsNotBrowser(); // Don't bloat the client
 /** Given a `routeString` and `routeParams`, resolve `urlPathname`.
  *

package/dist/shared-server-node/api-context.js

@@ -3,7 +3,8 @@ export { setContextVikeApiOperation };
 export { clearContextVikeApiOperation };
 export { getVikeApiOperation };
 // We don't import ./utils.js because this file is imported by server/
-import { assert, getGlobalObject } from '../server/utils.js';
+import { assert } from '../utils/assert.js';
+import { getGlobalObject } from '../utils/getGlobalObject.js';
 const globalObject = getGlobalObject('api/context.ts', {});
 function getVikeApiOperation() {
     return globalObject.vikeApiOperation ?? null;

package/dist/shared-server-node/assertV1Design.js

@@ -1,5 +1,7 @@
 export { assertV1Design };
-import { assert, assertUsage, assertWarning, isNotNullish, unique } from './utils.js';
+import { assert, assertUsage, assertWarning } from '../utils/assert.js';
+import { isNotNullish } from '../utils/isNullish.js';
+import { unique } from '../utils/unique.js';
 function assertV1Design(pageConfigs, pageFilesAll) {
     const isOldDesign = pageFilesAll === true || (pageFilesAll !== false && pageFilesAll.length > 0);
     const isV1Design = pageConfigs === true || (pageConfigs !== false && pageConfigs.length > 0);

package/dist/shared-server-node/extractAssetsQuery.js

@@ -1,7 +1,8 @@
 export { extractAssetsAddQuery };
 export { extractAssetsRemoveQuery };
 // We import from node/utils.ts instead of node/vite/utils.ts because this file is loaded by the server runtime
-import { assert, getFileExtension } from './utils.js';
+import { assert } from '../utils/assert.js';
+import { getFileExtension } from '../utils/getFileExtension.js';
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {
     const fileExtension = getFileExtension(id);

package/dist/shared-server-node/getVikeConfigError.js

@@ -2,7 +2,8 @@ export { getVikeConfigError };
 export { getVikeConfigErrorBuild };
 export { setVikeConfigError };
 export { debugFileChange };
-import { getGlobalObject, createDebug } from './utils.js';
+import { createDebug } from '../utils/debug.js';
+import { getGlobalObject } from '../utils/getGlobalObject.js';
 const globalObject = getGlobalObject('server/shared/getVikeConfigError.ts', {
     errorRuntime: false,
     errorBuild: false,

package/dist/shared-server-node/prependEntriesDir.js

@@ -1,5 +1,5 @@
 export { prependEntriesDir };
-import { assert } from './utils.js';
+import { assert } from '../utils/assert.js';
 function prependEntriesDir(entryName) {
     if (entryName.startsWith('/')) {
         entryName = entryName.slice(1);

package/dist/shared-server-node/resolveBase.js

@@ -1,5 +1,7 @@
 export { resolveBase };
-import { assert, assertUsage, isBaseServer, isBaseAssets } from './utils.js';
+import { assert, assertUsage } from '../utils/assert.js';
+import { isBaseServer } from '../utils/parseUrl.js';
+import { isBaseAssets } from '../utils/parseUrl-extras.js';
 import pc from '@brillout/picocolors';
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
     if (baseViteOriginal === '/__UNSET__')

package/dist/shared-server-node/virtualFileId.js

@@ -4,7 +4,9 @@ export { virtualFileIdGlobalEntryServer };
 export { virtualFileIdGlobalEntryClientSR };
 export { virtualFileIdGlobalEntryClientCR };
 import { extractAssetsRemoveQuery } from './extractAssetsQuery.js';
-import { assert, assertIsNotBrowser, removeVirtualFileIdPrefix } from './utils.js';
+import { assert } from '../utils/assert.js';
+import { assertIsNotBrowser } from '../utils/assertIsNotBrowser.js';
+import { removeVirtualFileIdPrefix } from '../utils/virtualFileId.js';
 assertIsNotBrowser();
 // Global entries
 const virtualFileIdGlobalEntryServer = 

package/dist/types/Config.d.ts

@@ -51,7 +51,7 @@ import type { ImportStringList } from '../node/vite/shared/importString.js';
 type HookNameOld = HookName | HookNameOldDesign;
 type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
-type HookNameGlobal = 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext' | 'onCreateGlobalContext' | 'onError';
+type HookNameGlobal = 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext' | 'onCreateGlobalContext' | 'onError' | 'onHookCall';
 type HookNameOldDesign = 'render' | 'prerender' | 'onBeforePrerender';
 type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'hasServerOnlyHook' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'guardEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
 type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
@@ -265,76 +265,7 @@ type ConfigBuiltIn = {
      *
      * @default false
      */
-    prerender?: boolean | ImportStringList | {
-        /**
-         * Allow only some of your pages to be pre-rendered.
-         *
-         * This setting doesn't affect the pre-rendering process: it merely suppresses the warnings when some of your pages cannot be pre-rendered.
-         *
-         * https://vike.dev/prerender#partial
-         *
-         * @default false
-         */
-        partial?: boolean;
-        /**
-         * Whether +redirects should be pre-rendered to HTML documents that redirect the user.
-         *
-         * https://vike.dev/prerender#redirects
-         */
-        redirects?: boolean;
-        /**
-         * Don't create a new directory for each HTML file.
-         *
-         * For example, generate `dist/client/about.html` instead of `dist/client/about/index.html`.
-         *
-         * https://vike.dev/prerender#noextradir
-         *
-         * @default false
-         */
-        noExtraDir?: boolean;
-        /**
-         * Number of concurrent pre-render jobs.
-         *
-         * Set to `false` to disable concurrency.
-         *
-         * https://vike.dev/prerender#parallel
-         *
-         * @default os.cpus().length
-         */
-        parallel?: boolean | number;
-        /**
-         * Disable the automatic initiation of the pre-rendering process when running `$ vike build`.
-         *
-         * Use this if you want to programmatically initiate the pre-rendering process instead.
-         *
-         * https://vike.dev/prerender#disableautorun
-         *
-         * @default false
-         */
-        disableAutoRun?: boolean;
-        /**
-         * Whether to enable pre-rendering.
-         *
-         * Setting `enable: null` enables you to set prerender settings without enabling pre-rendering by default.
-         *
-         * This is useful, for example, if you want pre-rendering to stay opt-in instead of opt-out while setting pre-render settings globally.
-         *
-         * https://vike.dev/prerender#enable
-         *
-         * @default true
-         */
-        enable?: boolean | null;
-        /**
-         * If you pre-render all your pages then Vike removes the `dist/server/` directory after pre-rendering has finished.
-         *
-         * If you set this setting to `true` then Vike won't remove the `dist/server/` directory.
-         *
-         * https://vike.dev/prerender#keepDistServer
-         *
-         * @default false
-         */
-        keepDistServer?: boolean;
-    };
+    prerender?: PrerenderSetting | (() => PrerenderSetting | Promise<PrerenderSetting>) | ImportStringList;
     /**
      * Install Vike extensions.
      *
@@ -361,6 +292,15 @@ type ConfigBuiltIn = {
      *  https://vike.dev/onCreateGlobalContext
      */
     onCreateGlobalContext?: ((globalContext: GlobalContext) => void) | ImportStringList | null;
+    /** Hook called whenever a hook is called.
+     *
+     *  https://vike.dev/onHookCall
+     */
+    onHookCall?: ((hook: {
+        name: HookName;
+        filePath: string;
+        call: () => void | Promise<void>;
+    }, pageContext: PageContextClient | PageContextServer | null) => void | Promise<void>) | ImportStringList;
     /** Hook for fetching data.
      *
      *  https://vike.dev/data
@@ -396,12 +336,12 @@ type ConfigBuiltIn = {
      * https://vike.dev/filesystemRoutingRoot
      */
     filesystemRoutingRoot?: string | ImportStringList;
-    /** Page Hook called when pre-rendering starts.
+    /** Hook called when pre-rendering starts.
      *
      * https://vike.dev/onPrerenderStart
      */
     onPrerenderStart?: OnPrerenderStartAsync | OnPrerenderStartSync | ImportStringList;
-    /** Global Hook called before the whole pre-rendering process starts.
+    /** Hook called for initializing pre-rendering.
      *
      * https://vike.dev/onBeforePrerenderStart
      */
@@ -584,8 +524,17 @@ type ConfigBuiltIn = {
     keepScrollPosition?: KeepScrollPosition;
     /** @experimental */
     middleware?: Function;
-    /** @experimental */
     cli?: {
+        /** @experimental
+         *
+         * Preview configuration.
+         *
+         * Set it to `false` if previewing isn't supported.
+         *
+         * Set it to `true` if previewing should load the `dist/server/index.js` entry.
+         *
+         * Set it to `vite` if previewing should use Vite's preview server.
+         */
         preview?: CliPreviewConfig;
     };
     /**
@@ -595,6 +544,78 @@ type ConfigBuiltIn = {
      */
     staticReplace?: StaticReplace[];
 };
+type PrerenderSetting = boolean | {
+    /**
+     * Allow only some pages to be pre-rendered.
+     *
+     * This setting doesn't affect the pre-rendering process: it merely suppresses the warnings when some of your pages cannot be pre-rendered.
+     *
+     * https://vike.dev/prerender#partial
+     *
+     * @default false
+     */
+    partial?: boolean;
+    /**
+     * Whether +redirects should be pre-rendered to redirecting HTML documents.
+     *
+     * https://vike.dev/prerender#redirects
+     */
+    redirects?: boolean;
+    /**
+     * Don't create a new directory for each HTML file.
+     *
+     * For example, generate `dist/client/about.html` instead of `dist/client/about/index.html`.
+     *
+     * https://vike.dev/prerender#noextradir
+     *
+     * @default false
+     */
+    noExtraDir?: boolean;
+    /**
+     * Number of concurrent pre-render jobs.
+     *
+     * Set to `false` to disable concurrency.
+     *
+     * https://vike.dev/prerender#parallel
+     *
+     * @default os.cpus().length
+     */
+    parallel?: boolean | number;
+    /**
+     * Don't automatically run the pre-rendering process upon `$ vike build`.
+     *
+     * Use this if you want to programmatically initiate the pre-rendering process instead.
+     *
+     * https://vike.dev/prerender#disableautorun
+     *
+     * @default false
+     */
+    disableAutoRun?: boolean;
+    /**
+     * Change settings without enabling pre-rendering.
+     *
+     * By setting `enable: null` you can define pre-render settings without enabling pre-rendering.
+     *
+     * Used by Vike extensions to set pre-render settings without enabling pre-rerendering on behalf of the user.
+     *
+     * https://vike.dev/prerender#enable
+     *
+     * @default true
+     */
+    enable?: boolean | null;
+    /**
+     * Don't remove the `dist/server/` directory.
+     *
+     * If you pre-render all your pages then Vike removes the `dist/server/` directory after pre-rendering has finished.
+     *
+     * If `keepDistServer: true` then Vike won't remove the `dist/server/` directory.
+     *
+     * https://vike.dev/prerender#keepDistServer
+     *
+     * @default false
+     */
+    keepDistServer?: boolean;
+};
 type ConfigBuiltInResolved = {
     passToClient?: string[][];
     redirects?: Record<string, string>[];

package/dist/types/PageContext.d.ts

@@ -7,6 +7,7 @@ export type { PageContextInternalServer };
 export type { PageContextInternalClient };
 export type { PageContextInternalClient_ServerRouting };
 export type { PageContextInternalClient_ClientRouting };
+export type { PageContextInit };
 export type { PageContextBuiltInServer_deprecated as PageContextBuiltInServer };
 export type { PageContextBuiltInClientWithClientRouting_deprecated as PageContextBuiltInClientWithClientRouting };
 export type { PageContextBuiltInClientWithServerRouting_deprecated as PageContextBuiltInClientWithServerRouting };
@@ -15,14 +16,14 @@ import type { From, PageContextConfig, Source, Sources } from '../shared-server-
 import type { Config } from './Config.js';
 import type { AbortStatusCode } from '../shared-server-client/route/abort.js';
 import type { GlobalContextClient, GlobalContextServer, GlobalContextClientWithServerRouting } from './GlobalContext.js';
-import type { DangerouslyUseInternals } from '../shared-server-client/getProxyForPublicUsage.js';
+import type { DangerouslyUseInternals } from '../shared-server-client/getPublicProxy.js';
 import type { PageContextInternalClientAfterRender } from '../client/runtime-client-routing/renderPageClient.js';
 import type { PageContextAfterRender } from '../server/runtime/renderPageServer/renderPageServerAfterRoute.js';
-import type { PageContextPublicProxyServer } from '../server/runtime/renderPageServer/preparePageContextForPublicUsageServer.js';
-import type { PageContextPublicProxyClient } from '../client/runtime-client-routing/preparePageContextForPublicUsageClient.js';
+import type { PageContextPublicServer } from '../server/runtime/renderPageServer/getPageContextPublicServer.js';
+import type { PageContextPublicProxyClient } from '../client/runtime-client-routing/getPageContextPublicClient.js';
 type PageContextServer<Data = unknown> = PageContextBuiltInServer<Data> & {
     /** https://vike.dev/warning/internals */
-    dangerouslyUseInternals: DangerouslyUseInternals<PageContextInternalServer & PageContextAfterRender & PageContextPublicProxyServer>;
+    dangerouslyUseInternals: DangerouslyUseInternals<PageContextInternalServer & PageContextAfterRender & PageContextPublicServer>;
 } & Vike.PageContext & Vike.PageContextServer;
 type PageContext<Data = unknown> = PageContextClient<Data> | PageContextServer<Data>;
 type PageContextClient<Data = unknown> = PageContextBuiltInClientWithClientRouting<Data> & {
@@ -56,29 +57,6 @@ type PageContextBuiltInCommon<Data> = PageContextConfig & {
      * https://vike.dev/pageContext#data
      */
     data: Data;
-    /** The URL you provided to Vike when calling `renderPage({ urlOriginal })` in your server middleware.
-     *
-     * https://vike.dev/renderPage
-     */
-    urlOriginal: string;
-    /**
-     * The HTTP request headers.
-     *
-     * As a string object normalized by Vike.
-     *
-     * https://vike.dev/headers
-     * https://vike.dev/pageContext#headers
-     */
-    headers: Record<string, string> | null;
-    /**
-     * The HTTP request headers.
-     *
-     * The original object provided by the server.
-     *
-     * https://vike.dev/headers
-     * https://vike.dev/pageContext#headersOriginal
-     */
-    headersOriginal?: unknown;
     /**
      * The HTTP response headers.
      *
@@ -128,8 +106,6 @@ type PageContextBuiltInCommon<Data> = PageContextConfig & {
     /** @experimental https://github.com/vikejs/vike/issues/1268 */
     sources: Sources;
     /** @deprecated */
-    url: string;
-    /** @deprecated */
     pageExports: Record<string, unknown>;
     /**
      * Whether the Base URL is missing in the URL of the HTTP request made to the SSR server.
@@ -139,7 +115,34 @@ type PageContextBuiltInCommon<Data> = PageContextConfig & {
      */
     isBaseMissing?: true;
 };
-type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlServer & {
+type PageContextInit = {
+    /** The URL provided when `renderPage({ urlOriginal })` is called.
+     *
+     * https://vike.dev/renderPage
+     */
+    urlOriginal: string;
+    /**
+     * The HTTP request headers.
+     *
+     * The original object provided by the server.
+     *
+     * https://vike.dev/headers
+     * https://vike.dev/pageContext#headersOriginal
+     */
+    headersOriginal?: unknown;
+    /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
+    /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
+};
+type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextInit & PageContextUrlServer & {
+    /**
+     * The HTTP request headers.
+     *
+     * As a string object normalized by Vike.
+     *
+     * https://vike.dev/headers
+     * https://vike.dev/pageContext#headers
+     */
+    headers: Record<string, string> | null;
     /**
      * Whether the environment is the client-side:
      * - In the browser, the value is `true`.
@@ -182,6 +185,10 @@ type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageConte
     previousPageContext?: undefined;
 };
 type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'routeParams' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data' | 'pageId' | 'source' | 'sources' | 'from'> & PageContextClientCommon & {
+    /**
+     * The current URL unprocessed (e.g. with the Base URL).
+     */
+    urlOriginal: string;
     /**
      * Whether the page is the first page rendered.
      *

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.250";
+export declare const PROJECT_VERSION: "0.4.251-commit-9c5fb90";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.250';
+export const PROJECT_VERSION = '0.4.251-commit-9c5fb90';

package/dist/utils/assert.d.ts

@@ -6,9 +6,9 @@ export { getProjectError };
 export { isVikeBug };
 export { setAssertOnBeforeLog };
 export { setAssertOnBeforeErr };
-export { setAlwaysShowStackTrace };
-export { setAssertAddTagsDev };
-import type { AddTagsDev } from '../node/vite/shared/loggerDev.js';
+export { setAssertAlwaysShowStackTrace };
+export { setAssertAddAssertTagsDev };
+import type { AddAssertTagsDev } from '../node/vite/shared/loggerDev.js';
 declare function assert(condition: unknown, debugInfo?: unknown): asserts condition;
 declare function assertUsage(condition: unknown, errMsg: string, { showStackTrace, exitOnError }?: {
     showStackTrace?: true;
@@ -24,6 +24,6 @@ declare function assertInfo(condition: unknown, msg: string, { onlyOnce }: {
 }): void;
 declare function setAssertOnBeforeLog(onBeforeAssertLog: () => void): void;
 declare function setAssertOnBeforeErr(onBeforeAssertErr: (err: unknown) => void): void;
-declare function setAssertAddTagsDev(addTagsDev: AddTagsDev): void;
+declare function setAssertAddAssertTagsDev(addAssertTagsDev: AddAssertTagsDev): void;
 declare function isVikeBug(err: unknown): boolean;
-declare function setAlwaysShowStackTrace(): void;
+declare function setAssertAlwaysShowStackTrace(): void;

package/dist/utils/assert.js

@@ -6,8 +6,8 @@ export { getProjectError };
 export { isVikeBug };
 export { setAssertOnBeforeLog };
 export { setAssertOnBeforeErr };
-export { setAlwaysShowStackTrace };
-export { setAssertAddTagsDev };
+export { setAssertAlwaysShowStackTrace };
+export { setAssertAddAssertTagsDev };
 import { assertSingleInstance_onAssertModuleLoad } from './assertSingleInstance.js';
 import { createErrorWithCleanStackTrace } from './createErrorWithCleanStackTrace.js';
 import { getGlobalObject } from './getGlobalObject.js';
@@ -111,15 +111,15 @@ function setAssertOnBeforeLog(onBeforeAssertLog) {
 function setAssertOnBeforeErr(onBeforeAssertErr) {
     globalObject.onBeforeErr = onBeforeAssertErr;
 }
-function setAssertAddTagsDev(addTagsDev) {
-    globalObject.addTagsDev = addTagsDev;
+function setAssertAddAssertTagsDev(addAssertTagsDev) {
+    globalObject.addAssertTagsDev = addAssertTagsDev;
 }
 function addTags(msg, tagType, showProjectVersion = false) {
     const tagVike = getTagVike(showProjectVersion);
     const tagTypeOuter = getTagType(tagType);
     const whitespace = getTagWhitespace(msg);
-    if (globalObject.addTagsDev) {
-        const tagsDev = globalObject.addTagsDev(tagVike, tagTypeOuter);
+    if (globalObject.addAssertTagsDev) {
+        const tagsDev = globalObject.addAssertTagsDev(tagVike, tagTypeOuter);
         return `${tagsDev}${whitespace}${msg}`;
     }
     else {
@@ -155,12 +155,12 @@ function isVikeBug(err) {
     return String(err).includes(`[${tagTypeBug}]`);
 }
 // Called upon `DEBUG=vike:error`
-function setAlwaysShowStackTrace() {
+function setAssertAlwaysShowStackTrace() {
     globalObject.alwaysShowStackTrace = true;
 }
 function createError(errMsg) {
     const err = createErrorWithCleanStackTrace(errMsg, 3);
-    if (globalObject.addTagsDev)
+    if (globalObject.addAssertTagsDev)
         err.stack = err.stack?.replace(/^Error:\s*/, '');
     return err;
 }

package/dist/utils/catchInfiniteLoop.d.ts

@@ -1,2 +1,2 @@
 export { catchInfiniteLoop };
-declare function catchInfiniteLoop(functionName: `${string}()`, maxNumberOfCalls?: number, withinSeconds?: number): void;
+declare function catchInfiniteLoop(functionName: `${string}()`): void;

package/dist/utils/catchInfiniteLoop.js

@@ -1,32 +1,31 @@
 export { catchInfiniteLoop };
 import { assertUsage, assertWarning } from './assert.js';
+import { humanizeTime } from './humanizeTime.js';
 const trackers = {};
-function catchInfiniteLoop(functionName, maxNumberOfCalls = 100, withinSeconds = 5) {
+const maxCalls = 99;
+const time = 5 * 1000;
+function catchInfiniteLoop(functionName) {
     // Init
-    const now = new Date();
-    let tracker = (trackers[functionName] ?? (trackers[functionName] = createTracker(now)));
-    // Reset
-    const elapsedTime = now.getTime() - tracker.start.getTime();
-    if (elapsedTime > withinSeconds * 1000)
-        tracker = trackers[functionName] = createTracker(now);
+    const now = new Date().getTime();
+    // Clean all outdated trackers
+    Object.keys(trackers).forEach((key) => {
+        const tracker = trackers[key];
+        const elapsedTime = now - tracker.startTime;
+        if (elapsedTime > time)
+            delete trackers[key];
+    });
+    const tracker = (trackers[functionName] ?? (trackers[functionName] = { count: 0, startTime: now }));
     // Count
     tracker.count++;
     // Error
-    const msg = `[Infinite Loop] Rendering ${tracker.count} times within ${withinSeconds} seconds [${functionName}]`;
-    if (tracker.count > maxNumberOfCalls) {
+    const msg = `${functionName} called ${tracker.count} times within ${humanizeTime(time)} — infinite loop?`;
+    if (tracker.count > maxCalls) {
         assertUsage(false, msg);
     }
     // Warning, at 50% threshold
-    if (!tracker.warned && tracker.count > maxNumberOfCalls * 0.5) {
+    if (!tracker.warned && tracker.count > maxCalls * 0.5) {
         // Warning is shown upon 10 calls a second, on average during 5 seconds, given the default parameters
         assertWarning(false, msg, { onlyOnce: false, showStackTrace: true });
         tracker.warned = true;
     }
 }
-function createTracker(now) {
-    const tracker = {
-        count: 0,
-        start: now,
-    };
-    return tracker;
-}

package/dist/utils/freezePartial.js

@@ -1,6 +1,6 @@
 export { freezePartial };
-import pc from '@brillout/picocolors';
 // Unit tests at ./freezePartial.spec.ts
+import pc from '@brillout/picocolors';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
 function freezePartial(obj, allowList) {

package/dist/utils/installUncaughtErrorHandlers.d.ts

@@ -0,0 +1,2 @@
+export { installUncaughtErrorHandlers };
+declare function installUncaughtErrorHandlers(): void;

package/dist/utils/installUncaughtErrorHandlers.js

@@ -0,0 +1,20 @@
+export { installUncaughtErrorHandlers };
+import { getGlobalObject } from './getGlobalObject.js';
+const globalObject = getGlobalObject('./installUncaughtErrorHandlers.ts', {
+    installed: false,
+});
+// Avoid server shutdown upon uncaught errors, e.g. `setTimeout(() => throw new Error('Uncaught error'), 10)`
+// If in the future we want to call +onError then let's use different handlers
+function installUncaughtErrorHandlers() {
+    if (globalObject.installed)
+        return;
+    globalObject.installed = true;
+    if (typeof process === 'undefined')
+        return;
+    process?.addListener?.('uncaughtException', (err) => {
+        console.error(err);
+    });
+    process?.addListener?.('unhandledRejection', (err) => {
+        console.error(err);
+    });
+}