vike 0.4.236-commit-08fbc10 → 0.4.236-commit-cd565e9

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('import.meta.env.'))
+            if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
             (0, utils_js_1.assert)(isBuild);

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigsEager.js

@@ -21,6 +21,10 @@ function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isCl
     lines.push('export const pageConfigGlobalSerialized = {');
     lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv));
     lines.push('};');
+    if (!isForClientSide && isDev) {
+        // https://vite.dev/guide/api-environment-frameworks.html
+        lines.push('if ((undefined)) (undefined).accept();');
+    }
     const code = [...importStatements, ...lines].join('\n');
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;

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

@@ -1,6 +1,7 @@
 "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/node/vite/shared/getMagicString.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMagicString = getMagicString;
+const magic_string_1 = __importDefault(require("magic-string"));
+// TODO/now use everywhere
+function getMagicString(code, id) {
+    const magicString = new magic_string_1.default(code);
+    const getMagicStringResult = () => {
+        return {
+            code: magicString.toString(),
+            map: magicString.generateMap({ hires: true, source: id }),
+        };
+    };
+    return { magicString, getMagicStringResult };
+}

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getManifestFilePathRelative = getManifestFilePathRelative;
+const utils_js_1 = require("../utils.js");
+function getManifestFilePathRelative(manifestConfig) {
+    (0, utils_js_1.assert)(['string', 'boolean'].includes(typeof manifestConfig));
+    (0, utils_js_1.assert)(manifestConfig !== false);
+    const manifestFileRelative = typeof manifestConfig === 'string' ? manifestConfig : '.vite/manifest.json';
+    return manifestFileRelative;
+}

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) {
+addGlobalContextTmp, addGlobalContextAsync) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
@@ -34,6 +34,10 @@ addGlobalContextTmp) {
         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 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
+    //   - 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
     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-08fbc10';
+exports.PROJECT_VERSION = '0.4.236-commit-cd565e9';

package/dist/cjs/utils/assertSetup.js

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

package/dist/cjs/utils/debug.js

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

package/dist/cjs/utils/getViteRPC.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getViteRPC = getViteRPC;
+exports.createViteRPC = createViteRPC;
+const assert_js_1 = require("./assert.js");
+const genPromise_js_1 = require("./genPromise.js");
+const getRandomId_js_1 = require("./getRandomId.js");
+const getGlobalObject_js_1 = require("./getGlobalObject.js");
+const debug_js_1 = require("./debug.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/getViteRPC.ts', {
+    rpc: null,
+});
+const debug = (0, debug_js_1.createDebugger)('vike:vite-rpc');
+function getViteRPC() {
+    globalObject.rpc ?? (globalObject.rpc = createRpcClient());
+    return globalObject.rpc;
+}
+function createRpcClient() {
+    // @ts-ignore CJS build doesn't support import.meta — TO-DO/eventually: let's remove this ts-ignore after we removed the CJS build
+    const hot = (undefined);
+    (0, assert_js_1.assert)(hot);
+    const listeners = [];
+    hot.on(`vike:rpc:response`, (dataResponse) => {
+        if (debug.isActivated)
+            debug('Response received', dataResponse);
+        const { callId, functionReturn } = dataResponse;
+        listeners.forEach((l) => {
+            if (callId !== l.callId)
+                return;
+            l.cb(functionReturn);
+            listeners.splice(listeners.indexOf(l), 1);
+        });
+    });
+    const rpc = new Proxy({}, {
+        get(_, functionName) {
+            return async (...functionArgs) => {
+                // @ts-ignore CJS build doesn't support import.meta — TO-DO/eventually: let's remove this ts-ignore after we removed the CJS build
+                const hot = (undefined);
+                (0, assert_js_1.assert)(hot);
+                const callId = (0, getRandomId_js_1.getRandomId)();
+                const { promise, resolve } = (0, genPromise_js_1.genPromise)({ timeout: 3 * 1000 });
+                listeners.push({
+                    callId,
+                    cb: (functionReturn) => {
+                        resolve(functionReturn);
+                    },
+                });
+                const dataRequest = { callId, functionName, functionArgs };
+                if (debug.isActivated)
+                    debug('Request sent', dataRequest);
+                // Vite's type is wrong: (undefined).send() does seem to return a promise
+                await hot.send('vike:rpc:request', dataRequest);
+                const functionReturn = await promise;
+                return functionReturn;
+            };
+        },
+    });
+    return rpc;
+}
+function createViteRPC(viteDevServer, getRpcFunctions) {
+    const rpcFunctions = getRpcFunctions(viteDevServer);
+    const { environments } = viteDevServer;
+    for (const envName in environments) {
+        debug('Listening to environment', envName);
+        const env = environments[envName];
+        env.hot.on('vike:rpc:request', async (dataRequest) => {
+            if (debug.isActivated)
+                debug('Request received', dataRequest);
+            const { callId, functionName, functionArgs } = dataRequest;
+            const functionReturn = await rpcFunctions[functionName](...functionArgs);
+            const dataResponse = { callId, functionReturn };
+            if (debug.isActivated)
+                debug('Response sent', dataResponse);
+            env.hot.send('vike:rpc:response', dataResponse);
+        });
+    }
+}

package/dist/cjs/utils/isRunnableDevEnvironment.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRunnableDevEnvironment = isRunnableDevEnvironment;
+// We use this instead of `import { isRunnableDevEnvironment } from 'vite'` because:
+// - Vite's isRunnableDevEnvironment() isn't reliable in monorepos where multiple Vite instances can be used simultaneously (it uses `instanceof RunnableDevEnvironment` which fails)
+// - We can use this in Vike's server production runtime without having to load the 'vite' package
+function isRunnableDevEnvironment(environment) {
+    return !!environment && 'runner' in environment && !!environment.runner;
+}

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 = {
@@ -18,8 +17,7 @@ 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;
+declare function replaceHistoryStateOriginal(state: unknown, url: Parameters<typeof window.history.replaceState>[2]): 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() });
+import { assert, assertUsage, getGlobalObject, isObject, deepEqual } from './utils.js';
+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,9 @@ function replaceHistoryStateOriginal(state, url) {
 // - history.pushState()
 // - history.replaceState()
 function monkeyPatchHistoryAPI() {
-    ;
+    if (globalObject.monkeyPatched)
+        return;
+    globalObject.monkeyPatched = true;
     ['pushState', 'replaceState'].forEach((funcName) => {
         const funcOriginal = window.history[funcName].bind(window.history);
         window.history[funcName] = (stateOriginal = {}, ...rest) => {
@@ -114,11 +120,21 @@ 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;
+            // Workaround https://github.com/vikejs/vike/issues/2504#issuecomment-3149764736
+            assert(deepEqual(window.history.state, stateEnhanced));
+            queueMicrotask(() => {
+                if (deepEqual(window.history.state, stateEnhanced))
+                    return;
+                Object.assign(stateEnhanced, window.history.state);
+                replaceHistoryStateOriginal(stateEnhanced, rest[1]);
+                assert(deepEqual(window.history.state, stateEnhanced));
+            });
         };
+        window.history[funcName]._isVikeMonkeyPatch = true;
     });
 }
 function isVikeEnhanced(state) {
@@ -136,6 +152,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 +173,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-client-routing/renderPageClientSide.js

@@ -111,8 +111,8 @@ async function renderPageClientSide(renderArgs) {
             if (isFirstRender) {
                 // Set pageContext properties set by onBeforeRoute()
                 // - But we skip pageId and routeParams because routing may have been aborted by a server-side `throw render()`
-                const { pageId, routeParams, ...pageContextFromRouteRest } = pageContextFromRoute;
-                objectAssign(pageContext, pageContextFromRouteRest);
+                const { pageId, routeParams, ...rest } = pageContextFromRoute;
+                objectAssign(pageContext, rest);
                 assert(hasProp(pageContext, 'routeParams', 'string{}')); // Help TS
             }
             else {

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

@@ -22,3 +22,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/deepEqual.js';

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

@@ -26,3 +26,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/deepEqual.js';

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

@@ -26,7 +26,7 @@ declare function createPageContextClientSide(): Promise<{
         };
     } & {
         isClientSide: true;
-    } & object;
+    } & object & Record<string, any>;
     _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>;
+} & object & Record<string, any>>;

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>>;
+} & Awaited<GlobalContextAddendum> & Record<string, any>>;
 type NeverExported = never;
 declare function getGlobalContext(): Promise<NeverExported>;
 declare function getGlobalContextSync(): NeverExported;

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

@@ -5,12 +5,12 @@ export { getGlobalContextSync };
 export { createGetGlobalContextClient };
 import { createGlobalContextShared, getGlobalContextSyncErrMsg, } from '../../shared/createGlobalContextShared.js';
 import { getGlobalContextSerializedInHtml } from './getJsonSerializedInHtml.js';
-import { assert, assertUsage, genPromise, getGlobalObject, objectAssign } from './utils.js';
+import { assert, assertUsage, genPromise, getGlobalObject, objectAssign, checkType } from './utils.js';
 const globalObject = getGlobalObject('createGetGlobalContextClient.ts', (() => {
-    const { promise: globalContextPromise, resolve: globalContextPromiseResolve } = genPromise();
+    const { promise: globalContextInitialPromise, resolve: globalContextInitialPromiseResolve } = genPromise();
     return {
-        globalContextPromise,
-        globalContextPromiseResolve,
+        globalContextInitialPromise,
+        globalContextInitialPromiseResolve,
     };
 })());
 function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGlobalContext) {
@@ -21,13 +21,17 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
     return getGlobalContext;
     async function getGlobalContext() {
         // Cache
-        if (globalObject.globalContext &&
+        if (globalObject.virtualFileExports &&
             // Don't break HMR
-            globalObject.globalContext._virtualFileExports !== virtualFileExports) {
-            return globalObject.globalContext;
+            globalObject.virtualFileExports === virtualFileExports) {
+            const globalContext = await globalObject.globalContextPromise;
+            return globalContext;
+        }
+        else {
+            globalObject.virtualFileExports = virtualFileExports;
         }
         // Create
-        const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, undefined, async (globalContext) => {
+        const globalContextPromise = createGlobalContextShared(virtualFileExports, globalObject, undefined, async (globalContext) => {
             const globalContextAddendum = {
                 /**
                  * Whether the environment is client-side or server-side / pre-rendering.
@@ -40,18 +44,24 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
             objectAssign(globalContextAddendum, await addGlobalContext?.(globalContext));
             return globalContextAddendum;
         });
-        assert(globalObject.globalContext);
-        globalObject.globalContextPromiseResolve(globalObject.globalContext);
+        globalObject.globalContextPromise = globalContextPromise;
+        const globalContext = await globalContextPromise;
+        assert(globalObject.globalContext === globalContext);
+        globalObject.globalContextInitialPromiseResolve();
         // Return
         return globalContext;
     }
 }
 async function getGlobalContext() {
+    await globalObject.globalContextInitialPromise;
     const globalContext = await globalObject.globalContextPromise;
+    assert(globalContext);
+    checkType(globalContext);
     return globalContext;
 }
 function getGlobalContextSync() {
     const { globalContext } = globalObject;
     assertUsage(globalContext, getGlobalContextSyncErrMsg);
+    checkType(globalContext);
     return globalContext;
 }

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

@@ -4,3 +4,4 @@ export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/hasProp.js';
 export * from '../../utils/genPromise.js';
+export * from '../../utils/checkType.js';

package/dist/esm/client/shared/utils.js

@@ -4,3 +4,4 @@ export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/hasProp.js';
 export * from '../../utils/genPromise.js';
+export * from '../../utils/checkType.js';