vike 0.4.236-commit-64431e7 → 0.4.236-commit-e752d12

package/dist/cjs/client/shared/createGetGlobalContextClient.js

@@ -32,7 +32,7 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
                 /**
                  * Whether the environment is client-side or server-side / pre-rendering.
                  *
-                 * We recommend using `({}).SSR` instead, see https://vike.dev/globalContext
+                 * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
                  */
                 isClientSide: true,
             };

package/dist/cjs/node/runtime/globalContext.js

@@ -155,9 +155,6 @@ function setGlobalContext_isPrerendering() {
     setIsProduction(true);
 }
 function setGlobalContext_isProduction(isProduction, tolerateContraditction = false) {
-    // TODO/now: try to remove globalObject.isProduction ?
-    // TODO/now: `rename tolerateContraditction tolerateContradiction`
-    tolerateContraditction = true;
     if (debug.isActivated)
         debug('setGlobalContext_isProduction()', { isProduction, tolerateContraditction });
     if (globalObject.isProduction === undefined) {
@@ -208,12 +205,7 @@ async function initGlobalContext() {
     const { isProduction } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     if (!isProduction) {
-        if (isProcessSharedWithVite()) {
-            await globalObject.viteDevServerPromise;
-        }
-        else {
-            await updateUserFiles();
-        }
+        await globalObject.viteDevServerPromise;
         (0, utils_js_1.assert)(globalObject.waitForUserFilesUpdate);
         await globalObject.waitForUserFilesUpdate;
     }
@@ -347,27 +339,16 @@ async function updateUserFiles() {
         // Avoid race condition: abort if there is a new globalObject.viteDevServer (happens when vite.config.js is modified => Vite's dev server is fully reloaded).
         viteDevServer !== globalObject.viteDevServer;
     const { viteDevServer } = globalObject;
+    (0, utils_js_1.assert)(viteDevServer);
     let hasError = false;
     let virtualFileExports;
     let err;
-    if (viteDevServer) {
-        try {
-            virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileEntry_js_1.virtualFileIdEntryServer);
-        }
-        catch (err_) {
-            hasError = true;
-            err = err_;
-        }
+    try {
+        virtualFileExports = await viteDevServer.ssrLoadModule(virtualFileEntry_js_1.virtualFileIdEntryServer);
     }
-    else {
-        try {
-            // We don't directly use import() to workaround what seems to be a Vite HMR bug: using import() breaks the HMR of normal non-worker apps.
-            virtualFileExports = await __VIKE__DYNAMIC_IMPORT('virtual:vike:entry:server');
-        }
-        catch (err_) {
-            hasError = true;
-            err = err_;
-        }
+    catch (err_) {
+        hasError = true;
+        err = err_;
     }
     if (isOutdated())
         return { success: false };
@@ -393,7 +374,7 @@ async function updateUserFiles() {
 async function setGlobalContext(virtualFileExports) {
     debug('setGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp);
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
@@ -419,18 +400,23 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook,
     };
-    const { viteDevServer, viteConfig, isPrerendering, isProduction } = globalObject;
+    const { viteDevServer, viteConfig, viteConfigRuntime, isPrerendering, isProduction } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     if (!isProduction) {
+        (0, utils_js_1.assert)(viteDevServer);
         (0, utils_js_1.assert)(globalContext); // main common requirement
+        (0, utils_js_1.assert)(viteConfig);
+        (0, utils_js_1.assert)(viteConfigRuntime);
         (0, utils_js_1.assert)(!isPrerendering);
         return {
             ...globalContextBase,
+            ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
             _isProduction: false,
             _isPrerendering: false,
             assetsManifest: null,
             _viteDevServer: viteDevServer,
             viteConfig,
+            viteConfigRuntime,
         };
     }
     else {
@@ -441,9 +427,11 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         (0, utils_js_1.assert)(assetsManifest);
         const globalContextBase2 = {
             ...globalContextBase,
+            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, globalContext.config),
             _isProduction: true,
             assetsManifest,
             _viteDevServer: null,
+            viteConfigRuntime: buildInfo.viteConfigRuntime,
             _usesClientRouter: buildInfo.usesClientRouter,
         };
         if (isPrerendering) {
@@ -463,45 +451,14 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         }
     }
 }
-async function addGlobalContextAsync(globalContext) {
-    debug('addGlobalContextAsync()');
-    let { viteConfigRuntime, buildInfo } = globalObject;
-    if (!viteConfigRuntime) {
-        if (buildInfo) {
-            viteConfigRuntime = buildInfo.viteConfigRuntime;
-        }
-        else {
-            if (!isProcessSharedWithVite()) {
-                if (!globalObject.isProduction) {
-                    const rpc = (0, utils_js_1.getViteRPC)();
-                    viteConfigRuntime = await rpc.getViteConfigRuntimeRPC();
-                }
-                else {
-                    (0, utils_js_1.assert)(false); // production => globalObject.buildInfo should be set
-                }
-            }
-            else {
-                (0, utils_js_1.assert)(false); // process shared with Vite => globalObject.viteConfigRuntime should be set
-            }
-        }
-    }
-    (0, utils_js_1.assert)(viteConfigRuntime);
-    return {
-        viteConfigRuntime,
-        ...resolveBaseRuntime(viteConfigRuntime, globalContext.config),
-    };
-}
 function clearGlobalContext() {
     debug('clearGlobalContext()');
     (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
 }
 function getInitialGlobalObject() {
-    const isProduction = getIsProductionStatic();
-    if (debug.isActivated)
-        debug('getInitialGlobalObject()', { isProduction });
+    debug('getInitialGlobalObject()');
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
     return {
-        isProduction,
         viteDevServerPromise,
         viteDevServerPromiseResolve,
     };
@@ -512,22 +469,3 @@ function resolveBaseRuntime(viteConfigRuntime, config) {
     const baseAssetsUnresolved = config.baseAssets ?? null;
     return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
 }
-function getIsProductionStatic() {
-    // TODO/now add @ts-ignore comments
-    // @ts-ignore
-    if (!({}))
-        return undefined;
-    // @ts-ignore
-    const PROD = ({}).PROD;
-    return PROD;
-}
-function isProcessSharedWithVite() {
-    const ret = globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE;
-    if (globalObject.isProcessSharedWithVite !== undefined) {
-        (0, utils_js_1.assert)(globalObject.isProcessSharedWithVite === ret);
-    }
-    else {
-        globalObject.isProcessSharedWithVite = ret;
-    }
-    return ret;
-}

package/dist/cjs/node/runtime/html/injectAssets/getViteDevScript.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getViteDevScript = getViteDevScript;
-const getViteRPC_js_1 = require("../../../../utils/getViteRPC.js");
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const reachOutCTA = 'Create a new GitHub issue to discuss a solution.';
@@ -17,13 +16,7 @@ async function getViteDevScript(pageContext) {
     const fakeHtmlBegin = '<html> <head>'; // White space to test whether user is using a minifier
     const fakeHtmlEnd = '</head><body></body></html>';
     let fakeHtml = fakeHtmlBegin + fakeHtmlEnd;
-    if (viteDevServer) {
-        fakeHtml = await viteDevServer.transformIndexHtml('/', fakeHtml);
-    }
-    else {
-        const rpc = (0, getViteRPC_js_1.getViteRPC)();
-        fakeHtml = await rpc.transformIndexHtmlRPC(fakeHtml);
-    }
+    fakeHtml = await viteDevServer.transformIndexHtml('/', fakeHtml);
     (0, utils_js_1.assertUsage)(!fakeHtml.includes('vite-plugin-pwa'), `The HTML transformer of ${picocolors_1.default.cyan('vite-plugin-pwa')} cannot be applied, see workaround at https://github.com/vikejs/vike/issues/388#issuecomment-1199280084`);
     (0, utils_js_1.assertUsage)(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), `Vite plugins that minify the HTML cannot be applied, see https://github.com/vikejs/vike/issues/224`);
     (0, utils_js_1.assertUsage)(fakeHtml.startsWith(fakeHtmlBegin) && fakeHtml.endsWith(fakeHtmlEnd), `You are using a Vite Plugin that transforms the HTML in a way that conflicts with Vike. ${reachOutCTA}`);

package/dist/cjs/node/runtime/renderPage/getPageAssets.js

@@ -17,9 +17,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
     const { assetUrls, clientEntriesSrc } = isDev
-        ? !globalContext._viteDevServer
-            ? await (0, utils_js_1.getViteRPC)().retrievePageAssetsDevRPC(clientDependencies, clientEntries)
-            : await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
+        ? await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
         : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {

package/dist/cjs/node/runtime/utils.js

@@ -76,4 +76,3 @@ __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/genPromise.js"), exports);
 __exportStar(require("../../utils/augmentType.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
-__exportStar(require("../../utils/getViteRPC.js"), exports);

package/dist/cjs/node/vite/index.js

@@ -29,7 +29,6 @@ const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.j
 const pluginWorkaroundCssModuleHmr_js_1 = require("./plugins/pluginWorkaroundCssModuleHmr.js");
 const pluginWorkaroundVite6HmrRegression_js_1 = require("./plugins/pluginWorkaroundVite6HmrRegression.js");
 const pluginReplaceConstants_js_1 = require("./plugins/pluginReplaceConstants.js");
-const pluginViteRPC_js_1 = require("./plugins/pluginViteRPC.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -49,7 +48,6 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, pluginWorkaroundCssModuleHmr_js_1.pluginWorkaroundCssModuleHmr)(),
         (0, pluginWorkaroundVite6HmrRegression_js_1.pluginWorkaroundVite6HmrRegression)(),
         (0, pluginReplaceConstants_js_1.pluginReplaceConstants)(),
-        (0, pluginViteRPC_js_1.pluginViteRPC)(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js

@@ -16,8 +16,7 @@ const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
-// TODO/now: stop setting `manifest` altogether and use the resolved value instead? So that other tools can easily read the manifest (e.g. @cloudflare/plugin-vite reads the manifest).
-const manifestTempFile = '.vite/manifest.json';
+const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
     let config;

package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistFileNames.js

@@ -18,8 +18,6 @@ function pluginDistFileNames() {
         apply: 'build',
         enforce: 'post',
         configResolved(config) {
-            // TODO/now remove
-            // if (true as boolean) return
             const rollupOutputs = getRollupOutputs(config);
             // We need to support multiple outputs: @vite/plugin-legacy adds an output, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
             rollupOutputs.forEach((rollupOutput) => {

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

@@ -16,7 +16,6 @@ const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInter
 const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
 const context_js_2 = require("../../prerender/context.js");
 const pluginName = 'vike:pluginCommon';
-globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
 function pluginCommon(vikeVitePluginOptions) {
     return [
         {

package/dist/cjs/node/vite/plugins/pluginEnvVars.js

@@ -12,7 +12,7 @@ const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
 // TO-DO/eventually:
-// - Make ({}) work inside +config.js
+// - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
@@ -39,7 +39,7 @@ function pluginEnvVars() {
             (0, utils_js_1.assertPosixPath)(config.root);
             if (!id.startsWith(config.root))
                 return;
-            if (!code.includes('({}).'))
+            if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
@@ -52,7 +52,7 @@ function pluginEnvVars() {
                 return !envPrefix.some((prefix) => key.startsWith(prefix));
             })
                 .map(([envName, envVal]) => {
-                const envStatement = `({}).${envName}`;
+                const envStatement = `import.meta.env.${envName}`;
                 const envStatementRegExpStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {

package/dist/cjs/node/vite/plugins/pluginExtractExportNames.js

@@ -81,12 +81,12 @@ function injectHmr(code, isClientSide, isProduction) {
     }
     if (isClientSide) {
         code += '\n';
-        code += `if ((undefined)) (undefined).accept((mod) => { exportNames.length=0; exportNames.push(...mod.exportNames); });`;
+        code += `if (import.meta.hot) import.meta.hot.accept((mod) => { exportNames.length=0; exportNames.push(...mod.exportNames); });`;
     }
     else {
         // Ensure Vite considers the module as `isSelfAccepting`. (Needed because Vite's module graph erroneously conflates the Vite server-side modules with their client-side counterparts.)
         code += '\n';
-        code += 'if(false){(undefined).accept(()=>{})};';
+        code += 'if(false){import.meta.hot.accept(()=>{})};';
     }
     return code;
 }

package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js

@@ -26,7 +26,7 @@ function pluginReplaceConstants() {
             (0, utils_js_1.assertPosixPath)(config.root);
             if (!id.startsWith(config.root))
                 return;
-            if (!code.includes('({}).'))
+            if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
             (0, utils_js_1.assert)(isBuild);

package/dist/cjs/node/vite/shared/applyRegExWithMagicString.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyRegExpWithMagicString = applyRegExpWithMagicString;
-// TODO/now: replace with .replaceAll() ?
 function applyRegExpWithMagicString(magicString, regExp, replacement) {
     const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
     let match;

package/dist/cjs/shared/createGlobalContextShared.js

@@ -12,7 +12,7 @@ const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGl
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
 async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
 // TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
-addGlobalContextTmp, addGlobalContextAsync) {
+addGlobalContextTmp) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
@@ -34,10 +34,6 @@ addGlobalContextTmp, addGlobalContextAsync) {
         const globalContextAdded = await addGlobalContextTmp?.(globalContext);
         (0, utils_js_1.objectAssign)(globalContext, globalContextAdded);
     }
-    {
-        const globalContextAddedAsync = await addGlobalContextAsync?.(globalContext);
-        (0, utils_js_1.objectAssign)(globalContext, globalContextAddedAsync);
-    }
     const onCreateGlobalContextHooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
     let hooksCalled = false;
     if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -43,8 +43,8 @@ function onInternalProp(propStr, objName) {
     // - We must skip it in the client-side because of the reactivity mechanism of UI frameworks like Solid.
     // - TO-DO/eventually: use import.meta.CLIENT instead of isBrowser()
     //   - Where import.meta.CLIENT is defined by Vike
-    //   - Using ({}).CLIENT (note `.env.`) doesn't seem possible: https://github.com/brillout/playground_node_({})
-    //     - If Rolldown Vite + Rolldowns always transpiles node_modules/ then we can simply use ({}).SSR
+    //   - Using import.meta.env.CLIENT (note `.env.`) doesn't seem possible: https://github.com/brillout/playground_node_import.meta.env
+    //     - If Rolldown Vite + Rolldowns always transpiles node_modules/ then we can simply use import.meta.env.SSR
     if ((0, utils_js_1.isBrowser)())
         return;
     // TO-DO/soon/proxy: remove this and only warn on built-in access instead

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.236-commit-64431e7';
+exports.PROJECT_VERSION = '0.4.236-commit-e752d12';

package/dist/cjs/utils/assertSetup.js

@@ -29,9 +29,6 @@ function assertIsNotProductionRuntime() {
     setup.shouldNotBeProduction = true;
 }
 function onSetupRuntime() {
-    // TODO/now
-    if (true)
-        return;
     if (debug.isActivated)
         debug('assertSetup()', new Error().stack);
     if (isTest())

package/dist/cjs/utils/debug.js

@@ -35,7 +35,6 @@ const flags = [
     'vike:setup',
     'vike:stream',
     'vike:virtualFiles',
-    'vike:vite-rpc',
 ];
 const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;

package/dist/esm/client/runtime-client-routing/createPageContextClientSide.d.ts

@@ -30,7 +30,7 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     } & {
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;

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

@@ -50,7 +50,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     } & {
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;
@@ -264,7 +264,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     } & {
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;

package/dist/esm/client/runtime-client-routing/globalContext.d.ts

@@ -27,4 +27,4 @@ declare const getGlobalContextClientInternal: () => Promise<{
 } & {
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-} & Record<string, any>>;
+}>;

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

@@ -2,8 +2,7 @@ export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
 export { saveScrollPosition };
-export { initHistoryState };
-export { monkeyPatchHistoryAPI };
+export { initHistory };
 export type { HistoryInfo };
 export type { ScrollPosition };
 type StateEnhanced = {
@@ -19,7 +18,6 @@ type ScrollPosition = {
 declare function saveScrollPosition(): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
 declare function replaceHistoryStateOriginal(state: unknown, url: string): void;
-declare function monkeyPatchHistoryAPI(): void;
 type HistoryInfo = {
     url: `/${string}`;
     state: StateEnhanced;
@@ -29,4 +27,4 @@ declare function onPopStateBegin(): {
     previous: HistoryInfo;
     current: HistoryInfo;
 };
-declare function initHistoryState(): void;
+declare function initHistory(): void;

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

@@ -2,12 +2,15 @@ export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
 export { saveScrollPosition };
-export { initHistoryState };
-export { monkeyPatchHistoryAPI };
+export { initHistory };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { assert, assertUsage, getGlobalObject, isObject } from './utils.js';
-initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
-const globalObject = getGlobalObject('runtime-client-routing/history.ts', { previous: getHistoryInfo() });
+const globalObject = getGlobalObject('history.ts', {
+    monkeyPatched: false,
+    previous: undefined,
+});
+initHistory(); // we redundantly call initHistory() to ensure it's called early
+globalObject.previous = getHistoryInfo();
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`
@@ -41,7 +44,7 @@ function enhance(stateNotEnhanced) {
             _isVikeEnhanced: true,
         };
     }
-    assert(isVikeEnhanced(stateVikeEnhanced));
+    assertIsVikeEnhanced(stateVikeEnhanced);
     return stateVikeEnhanced;
 }
 function getState() {
@@ -51,7 +54,7 @@ function getState() {
     // - Therefore, we have to monkey patch history.pushState() and history.replaceState()
     // - Therefore, we need the assert() below to ensure history.state has been enhanced by Vike
     //   - If users stumble upon this assert() then let's make it a assertUsage()
-    assert(isVikeEnhanced(state), { state });
+    assertIsVikeEnhanced(state);
     return state;
 }
 function getStateNotEnhanced() {
@@ -90,6 +93,7 @@ function pushHistoryState(url, overwriteLastHistoryEntry) {
 function replaceHistoryState(state, url) {
     const url_ = url ?? null; // Passing `undefined` chokes older Edge versions.
     window.history.replaceState(state, '', url_);
+    assertIsVikeEnhanced(getState());
 }
 function replaceHistoryStateOriginal(state, url) {
     // Bypass all monkey patches.
@@ -100,7 +104,11 @@ function replaceHistoryStateOriginal(state, url) {
 // - history.pushState()
 // - history.replaceState()
 function monkeyPatchHistoryAPI() {
-    ;
+    if (globalObject.monkeyPatched)
+        return;
+    globalObject.monkeyPatched = true;
+    // Ensure Vike's monkey patch is the first.
+    assert(window.history.pushState === History.prototype.pushState);
     ['pushState', 'replaceState'].forEach((funcName) => {
         const funcOriginal = window.history[funcName].bind(window.history);
         window.history[funcName] = (stateOriginal = {}, ...rest) => {
@@ -114,11 +122,14 @@ function monkeyPatchHistoryAPI() {
                     triggeredBy: 'user',
                     ...stateOriginal,
                 };
-            assert(isVikeEnhanced(stateEnhanced));
-            const ret = funcOriginal(stateEnhanced, ...rest);
+            assertIsVikeEnhanced(stateEnhanced);
+            funcOriginal(stateEnhanced, ...rest);
+            assertIsVikeEnhanced(getState());
             globalObject.previous = getHistoryInfo();
-            return ret;
         };
+        window.history[funcName]._isVikeMonkeyPatch = true;
+        // Ensure assert() above isn't a false positive
+        assert(window.history.pushState !== History.prototype.pushState);
     });
 }
 function isVikeEnhanced(state) {
@@ -136,6 +147,16 @@ function isVikeEnhanced(state) {
     }
     return false;
 }
+function assertIsVikeEnhanced(state) {
+    if (isVikeEnhanced(state))
+        return;
+    assert(false, {
+        state,
+        // TO-DO/eventually: remove _isVikeMonkeyPatch debug info to save KBs
+        pushStateIsVikeMonkeyPatch: window.history.pushState._isVikeMonkeyPatch,
+        replaceStateIsVikeMonkeyPatch: window.history.replaceState._isVikeMonkeyPatch,
+    });
+}
 function getHistoryInfo() {
     return {
         url: getCurrentUrl(),
@@ -147,11 +168,12 @@ function onPopStateBegin() {
     const isHistoryStateEnhanced = window.history.state !== null;
     if (!isHistoryStateEnhanced)
         enhanceHistoryState();
-    assert(isVikeEnhanced(window.history.state));
+    assertIsVikeEnhanced(window.history.state);
     const current = getHistoryInfo();
     globalObject.previous = current;
     return { isHistoryStateEnhanced, previous, current };
 }
-function initHistoryState() {
-    enhanceHistoryState();
+function initHistory() {
+    monkeyPatchHistoryAPI(); // the earlier we call it the better (Vike can workaround erroneous library monkey patches if Vike is the last one in the monkey patch chain)
+    enhanceHistoryState(); // enhance very first window.history.state which is `null`
 }

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

@@ -6,7 +6,7 @@ import { initOnLinkClick } from './initOnLinkClick.js';
 import { scrollRestoration_init } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 import { initLinkPrefetchHandlers } from './prefetch.js';
-import { initHistoryState, monkeyPatchHistoryAPI } from './history.js';
+import { initHistory } from './history.js';
 async function initClientRouter() {
     // Init navigation history and scroll restoration
     initHistoryAndScroll();
@@ -29,8 +29,7 @@ async function renderFirstPage() {
 }
 function initHistoryAndScroll() {
     scrollRestoration_init();
-    monkeyPatchHistoryAPI();
-    initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
+    initHistory(); // we redundantly call initHistory() to ensure it's called early
     autoSaveScrollPosition();
     // Handle back-/forward navigation
     initOnPopState();

package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts

@@ -63,7 +63,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     } & {
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-    } & Record<string, any>;
+    };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _urlHandler: null;
     _urlRewrite: null | string;

package/dist/esm/client/runtime-server-routing/createPageContextClientSide.d.ts

@@ -26,7 +26,7 @@ declare function createPageContextClientSide(): Promise<{
         };
     } & {
         isClientSide: true;
-    } & object & Record<string, any>;
+    } & object;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     isBackwardNavigation: null;
     _hasPageContextFromServer: true;

package/dist/esm/client/runtime-server-routing/globalContext.d.ts

@@ -24,4 +24,4 @@ declare const getGlobalContextClientInternal: () => Promise<{
     };
 } & {
     isClientSide: true;
-} & object & Record<string, any>>;
+} & object>;

package/dist/esm/client/shared/createGetGlobalContextClient.d.ts

@@ -30,7 +30,7 @@ declare function createGetGlobalContextClient<GlobalContextAddendum extends obje
      * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
      */
     isClientSide: true;
-} & Awaited<GlobalContextAddendum> & Record<string, any>>;
+} & Awaited<GlobalContextAddendum>>;
 type NeverExported = never;
 declare function getGlobalContext(): Promise<NeverExported>;
 declare function getGlobalContextSync(): NeverExported;