vike 0.4.250-commit-0d50da9 → 0.4.250-commit-7552006

package/dist/client/assertEnvClient.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/client/assertEnvClient.js

@@ -0,0 +1,5 @@
+import { assertIsBrowser } from '../utils/assertIsBrowser.js';
+assertEnv();
+function assertEnv() {
+    assertIsBrowser();
+}

package/dist/client/index.d.ts

@@ -1 +1,2 @@
+import './assertEnvClient.js';
 export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync, } from './shared/getGlobalContextClientInternalShared.js';

package/dist/client/index.js

@@ -1,3 +1,4 @@
+import './assertEnvClient.js';
 import { isBrowser } from '../utils/isBrowser.js';
 import { assert } from '../utils/assert.js';
 assert(isBrowser());

package/dist/client/node.d.ts

@@ -1 +1 @@
-export {};
+import './assertEnvClient.js';

package/dist/client/node.js

@@ -1,3 +1,4 @@
+import './assertEnvClient.js';
 import { assertUsage } from '../utils/assert.js';
 assertUsage(false, [
     'Server imports are forbidden on the client-side:',

package/dist/client/runtime-client-routing/createPageContextClient.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { createPageContextClient };
 export type PageContextCreatedClient = Awaited<ReturnType<typeof createPageContextClient>>;
 declare function createPageContextClient(urlOriginal: string): Promise<{

package/dist/client/runtime-client-routing/createPageContextClient.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { createPageContextClient };
 import { createPageContextObject, createPageContextShared } from '../../shared-server-client/createPageContextShared.js';
 import { getPageContextUrlComputed } from '../../shared-server-client/getPageContextUrlComputed.js';

package/dist/client/runtime-client-routing/entry.d.ts

@@ -1 +1 @@
-export {};
+import '../assertEnvClient.js';

package/dist/client/runtime-client-routing/entry.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 import { assertClientRouting } from '../../utils/assertRoutingType.js';
 assertClientRouting();
 import { initClientRouter } from './initClientRouter.js';

package/dist/client/runtime-client-routing/getBaseServer.d.ts

@@ -1,2 +1,3 @@
+import '../assertEnvClient.js';
 export { getBaseServer };
 declare function getBaseServer(): string;

package/dist/client/runtime-client-routing/getBaseServer.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getBaseServer };
 import { assert } from '../../utils/assert.js';
 function getBaseServer() {

package/dist/client/runtime-client-routing/getGlobalContextClientInternal.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 export type { GlobalContextClientInternal };
 type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;

package/dist/client/runtime-client-routing/getGlobalContextClientInternal.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
 import { loadPageRoutes } from '../../shared-server-client/route/loadPageRoutes.js';

package/dist/client/runtime-client-routing/getPageContext/removeBuiltInOverrides.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvClient.js';
 export { removeBuiltInOverrides };
 declare const BUILT_IN_CLIENT_ROUTER: readonly ["urlPathname", "urlParsed"];
 declare const BUILT_IN_CLIENT: readonly ["Page", "pageExports", "exports"];

package/dist/client/runtime-client-routing/getPageContext/removeBuiltInOverrides.js

@@ -1,3 +1,4 @@
+import '../../assertEnvClient.js';
 export { removeBuiltInOverrides };
 import { assert, assertWarning } from '../../../utils/assert.js';
 const BUILT_IN_CLIENT_ROUTER = ['urlPathname', 'urlParsed'];

package/dist/client/runtime-client-routing/getPageContext.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContext };
 export { providePageContext };
 import { providePageContext } from '../../shared-server-client/hooks/execHook.js';

package/dist/client/runtime-client-routing/getPageContext.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContext };
 export { providePageContext };
 // TO-DO/eventually: create new setting `+asyncHook: true` that sets the default value of the `asyncHook` parameter below to `true`

package/dist/client/runtime-client-routing/getPageContextCurrent.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';

package/dist/client/runtime-client-routing/getPageContextCurrent.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';

package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextFromHooksClient };
 export { getPageContextFromHooksClient_firstRender };
 export { getPageContextFromHooksServer };

package/dist/client/runtime-client-routing/getPageContextFromHooks.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextFromHooksClient };
 export { getPageContextFromHooksClient_firstRender };
 export { getPageContextFromHooksServer };

package/dist/client/runtime-client-routing/getPageContextPublicClient.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 export type { PageContextPublicClient };
 export type { PageContextPublicProxyClient };

package/dist/client/runtime-client-routing/getPageContextPublicClient.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 import { getPageContextPublicClientShared } from '../shared/getPageContextPublicClientShared.js';
 function getPageContextPublicClient(pageContext) {

package/dist/client/runtime-client-routing/history.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };

package/dist/client/runtime-client-routing/history.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };

package/dist/client/runtime-client-routing/index.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
 export { getPageContextClient } from './renderPageClient.js';

package/dist/client/runtime-client-routing/index.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 // TO-DO/next-major-release: move
 //   import { navigate, prefetch } from 'vike/client/router'
 // to:

package/dist/client/runtime-client-routing/initClientRouter.d.ts

@@ -1,2 +1,3 @@
+import '../assertEnvClient.js';
 export { initClientRouter };
 declare function initClientRouter(): Promise<void>;

package/dist/client/runtime-client-routing/initClientRouter.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { initClientRouter };
 import { assert } from '../../utils/assert.js';
 import { getRenderCount, renderPageClient } from './renderPageClient.js';

package/dist/client/runtime-client-routing/initOnLinkClick.d.ts

@@ -1,2 +1,3 @@
+import '../assertEnvClient.js';
 export { initOnLinkClick };
 declare function initOnLinkClick(): void;

package/dist/client/runtime-client-routing/initOnLinkClick.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { initOnLinkClick };
 import { isLinkIgnored, isHrefCurrentUrl, isLinkSkipped } from './isLinkSkipped.js';
 import { renderPageClient } from './renderPageClient.js';

package/dist/client/runtime-client-routing/initOnPopState.d.ts

@@ -1,2 +1,3 @@
+import '../assertEnvClient.js';
 export { initOnPopState };
 declare function initOnPopState(): void;

package/dist/client/runtime-client-routing/initOnPopState.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { initOnPopState };
 import { onPopStateBegin } from './history.js';
 import { renderPageClient } from './renderPageClient.js';

package/dist/client/runtime-client-routing/isClientSideRoutable.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { isClientSideRoutable };
 import type { GlobalContextClientInternal } from './getGlobalContextClientInternal.js';
 import type { PageFile } from '../../shared-server-client/getPageFiles.js';

package/dist/client/runtime-client-routing/isClientSideRoutable.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { isClientSideRoutable };
 import { analyzePageClientSideInit } from '../../shared-server-client/getPageFiles/analyzePageClientSide.js';
 import { findPageConfig } from '../../shared-server-client/page-configs/findPageConfig.js';

package/dist/client/runtime-client-routing/isLinkSkipped.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { isLinkSkipped };
 export { isLinkIgnored };
 export { isHrefCurrentUrl };

package/dist/client/runtime-client-routing/isLinkSkipped.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { isLinkSkipped };
 export { isLinkIgnored };
 export { isHrefCurrentUrl };

package/dist/client/runtime-client-routing/logErrorClient.d.ts

@@ -1,2 +1,3 @@
+import '../assertEnvClient.js';
 export { logErrorClient };
 declare function logErrorClient(err: unknown): void;

package/dist/client/runtime-client-routing/logErrorClient.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { logErrorClient };
 import { isObject } from '../../utils/isObject.js';
 function logErrorClient(err) {

package/dist/client/runtime-client-routing/navigate.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { navigate };
 export { reload };
 type Options = {

package/dist/client/runtime-client-routing/navigate.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { navigate };
 export { reload };
 // import { modifyUrlSameOrigin, ModifyUrlSameOriginOptions } from '../../shared/modifyUrlSameOrigin.js'

package/dist/client/runtime-client-routing/normalizeUrlArgument.d.ts

@@ -1,2 +1,3 @@
+import '../assertEnvClient.js';
 export { normalizeUrlArgument };
 declare function normalizeUrlArgument(url: string, fnName: 'prefetch' | 'navigate'): string;

package/dist/client/runtime-client-routing/normalizeUrlArgument.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { normalizeUrlArgument };
 import { assertUsage } from '../../utils/assert.js';
 import { isUrl, isUrlRelative } from '../../utils/parseUrl.js';

package/dist/client/runtime-client-routing/prefetch/getPrefetchSettings.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvClient.js';
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };

package/dist/client/runtime-client-routing/prefetch/getPrefetchSettings.js

@@ -1,3 +1,4 @@
+import '../../assertEnvClient.js';
 // TO-DO/pageContext-prefetch: rename this file to getPrefetchSettingResolved.ts
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };

package/dist/client/runtime-client-routing/prefetch.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { prefetch };
 export { getPageContextPrefetched };
 export { initLinkPrefetchHandlers };

package/dist/client/runtime-client-routing/prefetch.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { prefetch };
 export { getPageContextPrefetched };
 export { initLinkPrefetchHandlers };

package/dist/client/runtime-client-routing/renderPageClient.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };

package/dist/client/runtime-client-routing/renderPageClient.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };

package/dist/client/runtime-client-routing/scrollRestoration.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { scrollRestoration_init };
 export { scrollRestoration_initialRenderIsDone };
 declare function scrollRestoration_init(): void;

package/dist/client/runtime-client-routing/scrollRestoration.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { scrollRestoration_init };
 export { scrollRestoration_initialRenderIsDone };
 // Using `window.history.scrollRestoration` to recover scroll position when user reloads the page or Cmd-Shift-T back to it.

package/dist/client/runtime-client-routing/setScrollPosition.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };

package/dist/client/runtime-client-routing/setScrollPosition.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };

package/dist/client/runtime-server-routing/createPageContextClient.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { createPageContextClient };
 export type PageContextCreatedClient_ServerRouting = Awaited<ReturnType<typeof createPageContextClient>>;
 declare function createPageContextClient(): Promise<{

package/dist/client/runtime-server-routing/createPageContextClient.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { createPageContextClient };
 import { objectAssign } from '../../utils/objectAssign.js';
 import { updateType } from '../../utils/updateType.js';

package/dist/client/runtime-server-routing/entry.d.ts

@@ -1 +1 @@
-export {};
+import '../assertEnvClient.js';

package/dist/client/runtime-server-routing/entry.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 import { assertServerRouting } from '../../utils/assertRoutingType.js';
 assertServerRouting();
 import { createPageContextClient } from './createPageContextClient.js';

package/dist/client/runtime-server-routing/getGlobalContextClientInternal.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 export type { GlobalContextClientInternalWithServerRouting };
 type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;

package/dist/client/runtime-server-routing/getGlobalContextClientInternal.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
 async function getGlobalContextClientInternal() {

package/dist/client/runtime-server-routing/getPageContextPublicClient.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 export type { PageContextPublicClient };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';

package/dist/client/runtime-server-routing/getPageContextPublicClient.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 import { getPageContextPublicClientShared } from '../shared/getPageContextPublicClientShared.js';
 function getPageContextPublicClient(pageContext) {

package/dist/client/runtime-server-routing/index.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 import type { PageContextBuiltInClientWithServerRouting } from '../../types/PageContext.js';
 /** @deprecated
  * Replace:

package/dist/client/runtime-server-routing/index.js

@@ -1,2 +1 @@
-// TO-DO/next-major-release: remove this file
-export {};
+import '../assertEnvClient.js';

package/dist/client/shared/execHookOnRenderClient.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { execHookOnRenderClient };
 export type { PageContextBeforeRenderClient };
 import type { PageFile, PageContextConfig } from '../../shared-server-client/getPageFiles.js';

package/dist/client/shared/execHookOnRenderClient.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { execHookOnRenderClient };
 import { assert, assertUsage } from '../../utils/assert.js';
 import { getHookFromPageContext } from '../../shared-server-client/hooks/getHook.js';

package/dist/client/shared/getCurrentUrl.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getCurrentUrl };
 declare function getCurrentUrl(options?: {
     withoutHash: true;

package/dist/client/shared/getCurrentUrl.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getCurrentUrl };
 import { normalizeClientSideUrl } from './normalizeClientSideUrl.js';
 function getCurrentUrl(options) {

package/dist/client/shared/getGlobalContextClientInternalShared.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { setVirtualFileExportsGlobalEntry };

package/dist/client/shared/getGlobalContextClientInternalShared.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 // Public usage
 export { getGlobalContext };
 export { getGlobalContextSync };

package/dist/client/shared/getJsonSerializedInHtml.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextSerializedInHtml };
 export { getGlobalContextSerializedInHtml };
 declare function getPageContextSerializedInHtml(): {

package/dist/client/shared/getJsonSerializedInHtml.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextSerializedInHtml };
 export { getGlobalContextSerializedInHtml };
 import { parse } from '@brillout/json-serializer/parse';

package/dist/client/shared/getPageContextPublicClientShared.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextPublicClientShared };
 export { getPageContextPublicClientMinimal };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';

package/dist/client/shared/getPageContextPublicClientShared.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { getPageContextPublicClientShared };
 export { getPageContextPublicClientMinimal };
 import { objectAssign } from '../../utils/objectAssign.js';

package/dist/client/shared/loadPageConfigsLazyClientSide.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export type { PageContext_loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };

package/dist/client/shared/loadPageConfigsLazyClientSide.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared-server-client/getPageFiles.js';

package/dist/client/shared/normalizeClientSideUrl.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { normalizeClientSideUrl };
 /** Resolves relative URLs */
 declare function normalizeClientSideUrl(url: string, options?: {

package/dist/client/shared/normalizeClientSideUrl.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { normalizeClientSideUrl };
 import { assert } from '../../utils/assert.js';
 import { parseUrl } from '../../utils/parseUrl.js';

package/dist/client/shared/removeFoucBuster.d.ts

@@ -1,2 +1,3 @@
+import '../assertEnvClient.js';
 export { removeFoucBuster };
 declare function removeFoucBuster(): void;

package/dist/client/shared/removeFoucBuster.js

@@ -1,3 +1,4 @@
+import '../assertEnvClient.js';
 export { removeFoucBuster };
 import { assert } from '../../utils/assert.js';
 // See also:

package/dist/node/vite/plugins/pluginCommon.js

@@ -85,6 +85,7 @@ function pluginCommon(vikeVitePluginOptions) {
             config: {
                 order: 'post',
                 async handler(configFromUser) {
+                    assertViteBuildSsr(configFromUser);
                     let configFromVike = { server: {}, preview: {} };
                     const vikeConfig = await getVikeConfigInternal();
                     if (vikeConfig.config.port !== undefined) {
@@ -193,3 +194,7 @@ async function emitServerEntryOnlyIfNeeded(config) {
         config.vitePluginServerEntry.disableServerEntryEmit = true;
     }
 }
+function assertViteBuildSsr(configFromUser) {
+    // https://github.com/vikejs/vike/issues/3010
+    assertUsage(configFromUser.build?.ssr === undefined, "Don't set vite.build.ssr");
+}

package/dist/node/vite/shared/loggerDev.js

@@ -28,6 +28,7 @@ import { getViteDevServer } from '../../../server/runtime/globalContext.js';
 import { logErrorServer } from '../../../server/runtime/logErrorServer.js';
 import { getBetterError } from '../../../utils/getBetterError.js';
 import { getRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
+import { getRequestTag } from '../../../server/runtime/renderPageServer.js';
 assertIsNotProductionRuntime();
 setLogRuntimeDev(logErrorServerDev, logRuntimeInfoDev);
 setAssertOnBeforeErr((err) => {
@@ -148,7 +149,7 @@ function getTagSource(requestId = null) {
     if (requestId === null)
         return null;
     // const tagSource = requestId % 2 === 1 ? (`request-${requestId}` as const) : (`request(${requestId})` as const)
-    const tagSource = `request-${requestId}`;
+    const tagSource = getRequestTag(requestId);
     return tagSource;
 }
 function applyViteSourceMap(thing) {

package/dist/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js

@@ -6,13 +6,13 @@ export { isTemporaryBuildFile };
 import { build, formatMessages, version, } from 'esbuild';
 import fs from 'node:fs';
 import path from 'node:path';
+import crypto from 'node:crypto';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
 import { assert, assertWarning, assertUsage } from '../../../../utils/assert.js';
 import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
 import { createDebug } from '../../../../utils/debug.js';
 import { genPromise } from '../../../../utils/genPromise.js';
-import { getRandomId } from '../../../../utils/getRandomId.js';
 import { assertFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
 import { isImportPathRelative } from '../../../../utils/isImportPath.js';
 import { isObject } from '../../../../utils/isObject.js';
@@ -298,7 +298,7 @@ async function executeTranspiledFile(filePath, code) {
     const { filePathAbsoluteFilesystem } = 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 = getTemporaryBuildFilePath(filePathAbsoluteFilesystem);
+    const filePathTmp = getTemporaryBuildFilePath(filePathAbsoluteFilesystem, code);
     fs.writeFileSync(filePathTmp, code);
     const clean = () => fs.unlinkSync(filePathTmp);
     let fileExports = {};
@@ -313,6 +313,8 @@ async function executeTranspiledFile(filePath, code) {
 async function executeFile(filePathToExecuteAbsoluteFilesystem, filePathSourceFile) {
     let fileExports = {};
     try {
+        // `import(filePath)` is cached: if `filePath` doesn't change => the file isn't re-executed. The import() cache is required for the +meta.vite implementation to work correctly, see hasViteConfigChanged()
+        // https://github.com/vikejs/vike/blob/0a4f54ff3eea128cbd886c0ac88972e44a74cf99/packages/vike/src/node/vite/shared/resolveVikeConfigInternal.ts#L305
         fileExports = await import_(filePathToExecuteAbsoluteFilesystem);
     }
     catch (err) {
@@ -357,12 +359,14 @@ function getConfigExecutionErrorIntroMsg(err) {
     const errIntroMsg = execErrIntroMsg.get(err);
     return errIntroMsg ?? null;
 }
-function getTemporaryBuildFilePath(filePathAbsoluteFilesystem) {
+function getTemporaryBuildFilePath(filePathAbsoluteFilesystem, code) {
     assertPosixPath(filePathAbsoluteFilesystem);
-    const dirname = path.posix.dirname(filePathAbsoluteFilesystem);
+    const fileDir = path.posix.dirname(filePathAbsoluteFilesystem);
     const filename = path.posix.basename(filePathAbsoluteFilesystem);
+    // Using content hash in file path, so that the cache of dynamic `import()` behaves as we want.
+    const fileHash = crypto.createHash('md5').update(code).digest('hex').slice(0, 12);
     // Syntax with semicolon `build:${/*...*/}` doesn't work on Windows: https://github.com/vikejs/vike/issues/800#issuecomment-1517329455
-    const filePathTmp = path.posix.join(dirname, `${filename}.build-${getRandomId()}.mjs`);
+    const filePathTmp = path.posix.join(fileDir, `${filename}.build-${fileHash}.mjs`);
     assert(isTemporaryBuildFile(filePathTmp));
     return filePathTmp;
 }

package/dist/node/vite/shared/resolveVikeConfigInternal.js

@@ -11,6 +11,7 @@ export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
+import { deepEqual } from '../../../utils/deepEqual.js';
 import { assertKeys } from '../../../utils/assertKeys.js';
 import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
 import { getMostSimilar } from '../../../utils/getMostSimilar.js';
@@ -194,6 +195,7 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         }
     }
 }
+// `+meta.vite: true` => restart Vite if config changes
 function hasViteConfigChanged(vikeConfigOld, vikeConfigNew) {
     if (!vikeConfigOld)
         return false;
@@ -204,28 +206,13 @@ function hasViteConfigChanged(vikeConfigOld, vikeConfigNew) {
     for (const configName of viteConfigNames) {
         const valOld = configValuesOld[configName]?.value;
         const valNew = configValuesNew[configName]?.value;
-        // TO-DO/eventually: make it work for functions e.g. Vite plugins added via +vite — two solutions to make it work:
-        //  - We cache transpileWithEsbuild() but it's far from trivial
-        //  - We trigger a Vite reload by watching file changes instead of hasViteConfigChanged()
-        //    - Implementation: https://github.com/vikejs/vike/pull/3017/changes/1e55cbc1ed8bac4a72bf8c658cfbd67eecb7802a
-        if (!deepEqualPrimitive(valOld, valNew)) {
+        // Works thanks to the import() cache, see executeFile()
+        // https://github.com/vikejs/vike/blob/0a4f54ff3eea128cbd886c0ac88972e44a74cf99/packages/vike/src/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.ts#L386
+        if (!deepEqual(valOld, valNew))
             return true;
-        }
     }
     return false;
 }
-function deepEqualPrimitive(x, y) {
-    const tx = typeof x;
-    const ty = typeof y;
-    // Skip functions - treat them as always equal
-    if (tx === 'function' && ty === 'function')
-        return true;
-    // Copy of utils/deepEqual.ts for everything else
-    return x && y && tx === 'object' && tx === ty
-        ? Object.keys(x).length === Object.keys(y).length &&
-            Object.keys(x).every((key) => deepEqualPrimitive(x[key], y[key]))
-        : x === y;
-}
 async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esbuildCache) {
     const plusFilesByLocationId = await getPlusFilesByLocationId(userRootDir, esbuildCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesByLocationId, userRootDir, esbuildCache);
@@ -1177,7 +1164,7 @@ function restartViteDevServer() {
     swallowViteLogForceOptimization_enable();
     (async () => {
         try {
-            await viteDevServer.restart(true);
+            await viteDevServer.restart();
         }
         catch (err) {
             console.error('Vite restart error:');

package/dist/server/runtime/renderPageServer.d.ts

@@ -1,7 +1,9 @@
 import '../assertEnvServer.js';
 export { renderPageServer };
+export { getRequestTag };
 export type { PageContextInit };
 export type { PageContextBegin };
+export type { RequestTag };
 import { type PageContextAborted } from '../../shared-server-client/route/abort.js';
 import { type GlobalContextServerInternal } from './globalContext.js';
 import { type HttpResponse } from './renderPageServer/createHttpResponse.js';
@@ -148,3 +150,5 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _isPageContextJsonRequest: boolean;
     pageContextsAborted: PageContextAborted[];
 };
+type RequestTag = ReturnType<typeof getRequestTag>;
+declare function getRequestTag(requestId: number): `request-${number}`;

package/dist/server/runtime/renderPageServer.js

@@ -1,5 +1,6 @@
 import '../assertEnvServer.js';
 export { renderPageServer };
+export { getRequestTag };
 import { renderPageServerAfterRoute } from './renderPageServer/renderPageServerAfterRoute.js';
 import { createPageContextServer, createPageContextServerWithoutGlobalContext, } from './renderPageServer/createPageContextServer.js';
 import { route } from '../../shared-server-client/route/index.js';
@@ -112,7 +113,7 @@ async function renderPageServerEntryOnce(pageContextInit, requestId, asyncStore)
     return await renderPageServerEntryRecursive(pageContextBegin, globalContext, requestId);
 }
 async function renderPageServerEntryRecursive(pageContextBegin, globalContext, requestId) {
-    catchInfiniteLoop('renderPageServerEntryRecursive()');
+    catchInfiniteLoop(`[${getRequestTag(requestId)}] renderPageServerEntryRecursive()`);
     const pageContextNominalPageBegin = fork(pageContextBegin);
     const pageContextAddendumAbort = getPageContextAddendumAbort(pageContextBegin.pageContextsAborted);
     objectAssign(pageContextNominalPageBegin, pageContextAddendumAbort);
@@ -517,3 +518,6 @@ function assertPageContextFinish(pageContextFinish) {
         assert(contentType?.toLowerCase() === 'application/json');
     }
 }
+function getRequestTag(requestId) {
+    return `request-${requestId}`;
+}

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.250-commit-0d50da9";
+export declare const PROJECT_VERSION: "0.4.250-commit-7552006";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.250-commit-0d50da9';
+export const PROJECT_VERSION = '0.4.250-commit-7552006';

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.250-commit-0d50da9",
+  "version": "0.4.250-commit-7552006",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {