vike 0.4.237-commit-8749e81 → 0.4.237-commit-92dc549

package/dist/cjs/node/vite/shared/{isViteServerBuild.js → isViteServerSide.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isViteServerBuild = isViteServerBuild;
-exports.isViteClientBuild = isViteClientBuild;
-exports.isViteServerBuild_withoutEnv = isViteServerBuild_withoutEnv;
-exports.isViteServerBuild_onlySsrEnv = isViteServerBuild_onlySsrEnv;
-exports.isViteServerBuild_extraSafe = isViteServerBuild_extraSafe;
+exports.isViteServerSide = isViteServerSide;
+exports.isViteClientSide = isViteClientSide;
+exports.isViteServerSide_withoutEnv = isViteServerSide_withoutEnv;
+exports.isViteServerSide_onlySsrEnv = isViteServerSide_onlySsrEnv;
+exports.isViteServerSide_extraSafe = isViteServerSide_extraSafe;
 const assert_js_1 = require("../../../utils/assert.js");
-function isViteServerBuild_withoutEnv(configGlobal, viteEnv) {
+function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
     (0, assert_js_1.assert)(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
     const isServerSide1 = !viteEnv?.config.consumer ? null : viteEnv.config.consumer !== 'client';
     const isServerSide2 = !viteEnv?.name ? null : viteEnv.name !== 'client'; // I can't think of a use case for creating another client-side environment
@@ -41,23 +41,23 @@ function isViteServerBuild_withoutEnv(configGlobal, viteEnv) {
     }
     return isServerSide4;
 }
-function isViteServerBuild(configGlobal, viteEnv) {
-    return isViteServerBuild_withoutEnv(configGlobal, viteEnv);
+function isViteServerSide(configGlobal, viteEnv) {
+    return isViteServerSide_withoutEnv(configGlobal, viteEnv);
 }
-function isViteClientBuild(configGlobal, viteEnv) {
-    return !isViteServerBuild(configGlobal, viteEnv);
+function isViteClientSide(configGlobal, viteEnv) {
+    return !isViteServerSide(configGlobal, viteEnv);
 }
 // Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
-function isViteServerBuild_onlySsrEnv(configGlobal, viteEnv) {
-    return viteEnv ? viteEnv.name === 'ssr' : isViteServerBuild(configGlobal, viteEnv);
+function isViteServerSide_onlySsrEnv(configGlobal, viteEnv) {
+    return viteEnv.name ? viteEnv.name === 'ssr' : isViteServerSide(configGlobal, viteEnv);
 }
 // Vite is quite messy about setting config.build.ssr — for security purposes, we use an extra safe implementation with lots of assertions, which is needed for the .client.js and .server.js guarantee.
-function isViteServerBuild_extraSafe(config, options, viteEnv) {
+function isViteServerSide_extraSafe(config, options, viteEnv) {
     if (config.command === 'build') {
         const res = config.build.ssr;
         (0, assert_js_1.assert)(typeof res === 'boolean');
         (0, assert_js_1.assert)(res === options?.ssr || options?.ssr === undefined);
-        (0, assert_js_1.assert)(res === isViteServerBuild(config, viteEnv));
+        (0, assert_js_1.assert)(res === isViteServerSide(config, viteEnv));
         return res;
     }
     else {
@@ -66,7 +66,7 @@ function isViteServerBuild_extraSafe(config, options, viteEnv) {
         /* This assertion can fail, seems to be a Vite bug? It's very unexpected.
         if (typeof config.build.ssr === 'boolean') assert(res === config.build.ssr)
         */
-        (0, assert_js_1.assert)(res === isViteServerBuild(config, viteEnv));
+        (0, assert_js_1.assert)(res === isViteServerSide(config, viteEnv));
         return res;
     }
 }

package/dist/cjs/node/vite/shared/loggerVite/removeSuperfluousViteLog.js

@@ -4,10 +4,12 @@ exports.removeSuperfluousViteLog = removeSuperfluousViteLog;
 exports.removeSuperfluousViteLog_enable = removeSuperfluousViteLog_enable;
 exports.removeSuperfluousViteLog_disable = removeSuperfluousViteLog_disable;
 const utils_js_1 = require("../../utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('removeSuperfluousViteLog.ts', {
+    enabled: false,
+});
 const superfluousLog = 'Forced re-optimization of dependencies';
-let enabled = false;
 function removeSuperfluousViteLog(msg) {
-    if (!enabled) {
+    if (!globalObject.enabled) {
         return false;
     }
     if (msg.toLowerCase().includes('forced') && msg.toLowerCase().includes('optimization')) {
@@ -17,8 +19,8 @@ function removeSuperfluousViteLog(msg) {
     return false;
 }
 function removeSuperfluousViteLog_enable() {
-    enabled = true;
+    globalObject.enabled = true;
 }
 function removeSuperfluousViteLog_disable() {
-    enabled = false;
+    globalObject.enabled = false;
 }

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

@@ -110,7 +110,9 @@ const configDefinitionsBuiltIn = {
             }, pageConfig))
                 .flat(1)
                 // Server-only
-                .filter((source) => !source.configEnv.client);
+                .filter((source) => !source.configEnv.client)
+                // Config value isn't `null`
+                .filter((source) => !(0, getConfigValueSourcesRelevant_js_1.isConfigSourceValueNull)(source));
             return sources.length > 0;
         },
     },
@@ -122,22 +124,19 @@ const configDefinitionsBuiltIn = {
         env: { server: true, client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
             {
-                const source = getConfigValueSource(configValueSources, 'clientHooks');
+                const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)('clientHooks', pageConfig);
                 if (source) {
                     (0, utils_js_1.assert)(source.valueIsLoaded);
-                    if (source.value !== null) {
-                        const { value } = source;
-                        const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAt);
-                        (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${definedAt} should be a boolean`);
-                        return value;
-                    }
+                    const { value, definedAt } = source;
+                    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', definedAt);
+                    (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${configDefinedAt} should be a boolean`);
+                    return value;
                 }
             }
-            return (isConfigSet(configValueSources, 'onRenderClient') &&
-                isConfigSet(configValueSources, 'Page') &&
-                !!getConfigEnv(configValueSources, 'Page')?.client);
+            return (isConfigSet(pageConfig, 'onRenderClient') &&
+                isConfigSet(pageConfig, 'Page') &&
+                !!getConfigEnv(pageConfig, 'Page')?.client);
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -145,10 +144,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'onBeforeRender')
-                ? null
-                : getConfigEnv(configValueSources, 'onBeforeRender');
+            return !isConfigSet(pageConfig, 'onBeforeRender') ? null : getConfigEnv(pageConfig, 'onBeforeRender');
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -156,8 +152,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data');
+            return !isConfigSet(pageConfig, 'data') ? null : getConfigEnv(pageConfig, 'data');
         },
     },
     hooksTimeout: {
@@ -246,11 +241,11 @@ const configDefinitionsBuiltIn = {
     },
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
-function getConfigEnv(configValueSources, configName) {
-    const configValueSource = getConfigValueSource(configValueSources, configName);
-    if (!configValueSource)
+function getConfigEnv(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    if (!source)
         return null;
-    const { configEnv } = configValueSource;
+    const { configEnv } = source;
     const env = {};
     if (configEnv.client)
         env.client = true;
@@ -258,18 +253,7 @@ function getConfigEnv(configValueSources, configName) {
         env.server = true;
     return env;
 }
-function isConfigSet(configValueSources, configName) {
-    const source = getConfigValueSource(configValueSources, configName);
-    return (!!source &&
-        !(source.valueIsLoaded &&
-            // Enable users to suppress inherited config by overriding it with `null`
-            source.value === null));
-}
-function getConfigValueSource(configValueSources, configName) {
-    const sources = configValueSources[configName];
-    if (!sources)
-        return null;
-    const configValueSource = sources[0];
-    (0, utils_js_1.assert)(configValueSource);
-    return configValueSource;
+function isConfigSet(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    return !!source;
 }

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

@@ -19,8 +19,9 @@ const ignorePatternsBuiltIn_js_1 = require("./crawlPlusFiles/ignorePatternsBuilt
 const execA = (0, node_util_1.promisify)(node_child_process_1.exec);
 const debug = (0, utils_js_1.createDebugger)('vike:crawl');
 (0, utils_js_1.assertIsNotProductionRuntime)();
-(0, utils_js_1.assertIsSingleModuleInstance)('getVikeConfig/crawlPlusFiles.ts');
-let gitIsNotUsable = false;
+const globalObject = (0, utils_js_1.getGlobalObject)('getVikeConfig/crawlPlusFiles.ts', {
+    gitIsNotUsable: false,
+});
 async function crawlPlusFiles(userRootDir) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(userRootDir);
@@ -53,7 +54,7 @@ async function crawlPlusFiles(userRootDir) {
 }
 // Same as tinyglobby() but using `$ git ls-files`
 async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
-    if (gitIsNotUsable)
+    if (globalObject.gitIsNotUsable)
         return null;
     // Preserve UTF-8 file paths.
     // https://github.com/vikejs/vike/issues/1658
@@ -87,7 +88,7 @@ async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
     }
     catch (err) {
         if (await isGitNotUsable(userRootDir)) {
-            gitIsNotUsable = true;
+            globalObject.gitIsNotUsable = true;
             return null;
         }
         throw err;

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

@@ -35,21 +35,19 @@ const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderCon
 const getProxyForPublicUsage_js_1 = require("../../../shared/getProxyForPublicUsage.js");
 const getVikeConfigError_js_1 = require("../../shared/getVikeConfigError.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-// We can simply use global variables since Vike's config is:
-//  - global
-//  - independent of Vite (therefore we don't need to tie Vike's config with Vite's `config` object)
-(0, utils_js_1.assertIsSingleModuleInstance)('v1-design/getVikeConfig.ts');
-let restartVite = false;
-let vikeConfigHasBuildError = null;
-let isV1Design_ = null;
-let vikeConfigPromise = null;
-// TO-DO/next-major-release: remove
-let vikeConfigSync = null;
-let vikeConfigCtx = null; // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
-let prerenderContext;
+const globalObject = (0, utils_js_1.getGlobalObject)('vite/shared/resolveVikeConfigInternal.ts', {
+    restartVite: false,
+    vikeConfigHasBuildError: null,
+    isV1Design_: null,
+    vikeConfigPromise: null,
+    // TO-DO/next-major-release: remove
+    vikeConfigSync: null,
+    vikeConfigCtx: null, // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
+    prerenderContext: null,
+});
 function reloadVikeConfig() {
-    (0, utils_js_1.assert)(vikeConfigCtx);
-    const { userRootDir, vikeVitePluginOptions } = vikeConfigCtx;
+    (0, utils_js_1.assert)(globalObject.vikeConfigCtx);
+    const { userRootDir, vikeVitePluginOptions } = globalObject.vikeConfigCtx;
     (0, utils_js_1.assert)(vikeVitePluginOptions);
     resolveVikeConfigInternal_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
 }
@@ -57,15 +55,15 @@ async function getVikeConfigInternal(
 // I don't remember the logic behind it — neither why we restart Vite's dev server, nor why we sometimes don't.
 // TO-DO/eventually: re-think all that. Some + settings are expected to influence Vite's config (restarting Vite's dev server is needed) while some don't.
 doNotRestartViteOnError = false) {
-    (0, utils_js_1.assert)(vikeConfigCtx);
-    const { userRootDir, isDev, vikeVitePluginOptions } = vikeConfigCtx;
+    (0, utils_js_1.assert)(globalObject.vikeConfigCtx);
+    const { userRootDir, isDev, vikeVitePluginOptions } = globalObject.vikeConfigCtx;
     const vikeConfig = await getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     return vikeConfig;
 }
 // TO-DO/next-major-release: remove
 function getVikeConfigInternalSync() {
-    (0, utils_js_1.assert)(vikeConfigSync);
-    return vikeConfigSync;
+    (0, utils_js_1.assert)(globalObject.vikeConfigSync);
+    return globalObject.vikeConfigSync;
 }
 // TO-DO/eventually: this maybe(/probably?) isn't safe against race conditions upon file changes in development, thus:
 // - Like getGlobalContext() and getGlobalContextSync() — make getVikeConfig() async and provide a getVikeConfigSync() while discourage using it
@@ -86,29 +84,29 @@ config) {
 }
 function setVikeConfigContext(vikeConfigCtx_) {
     // If the user changes Vite's `config.root` => Vite completely reloads itself => setVikeConfigContext() is called again
-    vikeConfigCtx = vikeConfigCtx_;
+    globalObject.vikeConfigCtx = vikeConfigCtx_;
 }
 async function getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
-    if (!vikeConfigPromise) {
+    if (!globalObject.vikeConfigPromise) {
         resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     }
-    (0, utils_js_1.assert)(vikeConfigPromise);
-    const vikeConfig = await vikeConfigPromise;
+    (0, utils_js_1.assert)(globalObject.vikeConfigPromise);
+    const vikeConfig = await globalObject.vikeConfigPromise;
     return vikeConfig;
 }
 async function getVikeConfigInternalOptional() {
-    if (!vikeConfigPromise)
+    if (!globalObject.vikeConfigPromise)
         return null;
-    const vikeConfig = await vikeConfigPromise;
+    const vikeConfig = await globalObject.vikeConfigPromise;
     return vikeConfig;
 }
 function isV1Design() {
-    (0, utils_js_1.assert)(typeof isV1Design_ === 'boolean');
-    return isV1Design_;
+    (0, utils_js_1.assert)(typeof globalObject.isV1Design_ === 'boolean');
+    return globalObject.isV1Design_;
 }
 async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     const { promise, resolve, reject } = (0, utils_js_1.genPromise)();
-    vikeConfigPromise = promise;
+    globalObject.vikeConfigPromise = promise;
     const esbuildCache = {
         transpileCache: {},
         vikeConfigDependencies: new Set(),
@@ -125,10 +123,10 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
     }
     // There is a newer call — let the new call supersede the old one.
     // We deliberately swallow the intermetidate state (including any potential error) — it's now outdated and has existed only for a very short period of time.
-    if (vikeConfigPromise !== promise) {
+    if (globalObject.vikeConfigPromise !== promise) {
         // vikeConfigPromise.then(resolve).catch(reject)
         try {
-            resolve(await vikeConfigPromise);
+            resolve(await globalObject.vikeConfigPromise);
         }
         catch (err) {
             reject(err);
@@ -138,13 +136,13 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
     if (!hasError) {
         (0, utils_js_1.assert)(ret);
         (0, utils_js_1.assert)(err === undefined);
-        const hadError = vikeConfigHasBuildError;
-        vikeConfigHasBuildError = false;
+        const hadError = globalObject.vikeConfigHasBuildError;
+        globalObject.vikeConfigHasBuildError = false;
         (0, getVikeConfigError_js_1.setVikeConfigError)({ errorBuild: false });
         if (hadError) {
             (0, loggerNotProd_js_1.logConfigErrorRecover)();
-            if (restartVite) {
-                restartVite = false;
+            if (globalObject.restartVite) {
+                globalObject.restartVite = false;
                 restartViteDevServer();
             }
         }
@@ -153,10 +151,10 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
     else {
         (0, utils_js_1.assert)(ret === undefined);
         (0, utils_js_1.assert)(err);
-        vikeConfigHasBuildError = true;
+        globalObject.vikeConfigHasBuildError = true;
         (0, getVikeConfigError_js_1.setVikeConfigError)({ errorBuild: { err } });
         if (!doNotRestartViteOnError)
-            restartVite = true;
+            globalObject.restartVite = true;
         if (!isDev) {
             reject(err);
         }
@@ -170,8 +168,8 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     const plusFilesAll = await (0, getPlusFilesAll_js_1.getPlusFilesAll)(userRootDir, esbuildCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
-    if (!isV1Design_)
-        isV1Design_ = pageConfigs.length > 0;
+    if (!globalObject.isV1Design_)
+        globalObject.isV1Design_ = pageConfigs.length > 0;
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
@@ -197,7 +195,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
         prerenderContext,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
     };
-    vikeConfigSync = vikeConfig;
+    globalObject.vikeConfigSync = vikeConfig;
     return vikeConfig;
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
@@ -1102,7 +1100,7 @@ function isGlobalLocation(locationId, plusFilesAll) {
 }
 function resolvePrerenderContext(vikeConfig) {
     const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
-    prerenderContext ?? (prerenderContext = {
+    globalObject.prerenderContext ?? (globalObject.prerenderContext = {
         isPrerenderingEnabled: false,
         isPrerenderingEnabledForAllPages: false,
         // Set at runPrerender()
@@ -1110,9 +1108,9 @@ function resolvePrerenderContext(vikeConfig) {
         // Set at runPrerender()
         pageContexts: null,
     });
-    prerenderContext.isPrerenderingEnabled = isPrerenderingEnabled;
-    prerenderContext.isPrerenderingEnabledForAllPages = isPrerenderingEnabledForAllPages;
-    return prerenderContext;
+    globalObject.prerenderContext.isPrerenderingEnabled = isPrerenderingEnabled;
+    globalObject.prerenderContext.isPrerenderingEnabledForAllPages = isPrerenderingEnabledForAllPages;
+    return globalObject.prerenderContext;
 }
 function restartViteDevServer() {
     const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
@@ -1149,7 +1147,7 @@ function getVikeConfigDummy(esbuildCache) {
         prerenderContext: prerenderContextDummy,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
     };
-    vikeConfigSync = vikeConfigDummy;
-    isV1Design_ = true;
+    globalObject.vikeConfigSync = vikeConfigDummy;
+    globalObject.isV1Design_ = true;
     return vikeConfigDummy;
 }

package/dist/cjs/types/VikeGlobalInternal.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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.237-commit-8749e81';
+exports.PROJECT_VERSION = '0.4.237-commit-92dc549';

package/dist/cjs/utils/assertVersion.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertVersion = assertVersion;
 exports.isVersionOrAbove = isVersionOrAbove;
 const assert_js_1 = require("./assert.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 function assertVersion(dependencyName, versionActual, versionExpected) {
     (0, assert_js_1.assert)(versionActual);
     (0, assert_js_1.assert)(versionExpected);

package/dist/cjs/utils/debug.js

@@ -5,17 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDebugger = createDebugger;
 exports.isDebugActivated = isDebugActivated;
-const isBrowser_js_1 = require("./isBrowser.js");
 const isCallable_js_1 = require("./isCallable.js");
 const objectAssign_js_1 = require("./objectAssign.js");
 const assert_js_1 = require("./assert.js");
 const checkType_js_1 = require("./checkType.js");
-const getTerminWidth_js_1 = require("./getTerminWidth.js");
+const getTerminalWidth_js_1 = require("./getTerminalWidth.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isArray_js_1 = require("./isArray.js");
 const isObject_js_1 = require("./isObject.js");
 const debug_js_1 = require("../shared/route/debug.js");
-(0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 (0, debug_js_1.setCreateDebugger)(createDebugger); // for isomorphic code
 const flags = [
     'vike:crawl',
@@ -117,7 +117,7 @@ function formatMsg(info, options, padding, position) {
     return str;
 }
 function pad(str, padding) {
-    const terminalWidth = (0, getTerminWidth_js_1.getTerminalWidth)();
+    const terminalWidth = (0, getTerminalWidth_js_1.getTerminalWidth)();
     const lines = [];
     str.split('\n').forEach((line) => {
         if (!terminalWidth) {

package/dist/cjs/utils/getGlobalObject.js

@@ -1,22 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalObject = getGlobalObject;
-exports.assertIsSingleModuleInstance = assertIsSingleModuleInstance;
-const assert_js_1 = require("./assert.js");
 /** Share information across module instances. */
-function getGlobalObject(key, defaultValue) {
-    const globalObjects = getGlobalObjects();
-    const globalObject = (globalObjects[key] = globalObjects[key] || defaultValue);
+function getGlobalObject(moduleId, defaultValue) {
+    const globals = getGlobals();
+    const globalObject = (globals[moduleId] ?? (globals[moduleId] = defaultValue));
     return globalObject;
 }
-/** Assert that the module is instantiated only once. */
-function assertIsSingleModuleInstance(key) {
-    const globalObjects = getGlobalObjects();
-    (0, assert_js_1.assert)(!(key in globalObjects));
-}
-function getGlobalObjects() {
-    const projectKey = '_vike';
-    // @ts-ignore
-    const globalObjects = (globalThis[projectKey] = globalThis[projectKey] || {});
-    return globalObjects;
+function getGlobals() {
+    var _a;
+    globalThis._vike ?? (globalThis._vike = {});
+    (_a = globalThis._vike).globals ?? (_a.globals = {});
+    return globalThis._vike.globals;
 }

package/dist/cjs/utils/isScriptFile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scriptFileExtensionList = exports.scriptFileExtensionPattern = void 0;
+exports.scriptFileExtensionPattern = exports.scriptFileExtensionList = void 0;
 exports.isScriptFile = isScriptFile;
 exports.isPlainScriptFile = isPlainScriptFile;
 exports.isTemplateFile = isTemplateFile;

package/dist/cjs/utils/path.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pathJoin = pathJoin;
 exports.pathIsRelative = pathIsRelative;
+exports.pathIsAbsolute = pathIsAbsolute;
 exports.toPosixPath = toPosixPath;
 exports.assertPosixPath = assertPosixPath;
 // Utilities for handling file paths.
@@ -22,12 +23,11 @@ function pathJoin(path1, path2) {
         joined = '/' + joined;
     return joined;
 }
-/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
-const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/
-function pathIsAbsolute(filePath: string) {
-  return IS_ABSOLUTE_RE.test(filePath)
+// https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+function pathIsAbsolute(filePath) {
+    return IS_ABSOLUTE_RE.test(filePath);
 }
-//*/
 /**********************/
 /****** UTILS *********/
 /**********************/

package/dist/cjs/utils/requireResolve.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireResolveOptional = requireResolveOptional;
 exports.requireResolveOptionalDir = requireResolveOptionalDir;
 exports.requireResolveNpmPackage = requireResolveNpmPackage;
-exports.requireResolveVikeDistFile = requireResolveVikeDistFile;
-exports.getVikeNodeModulesRoot = getVikeNodeModulesRoot;
+exports.requireResolveDistFile = requireResolveDistFile;
+exports.getPackageNodeModulesDirectory = getPackageNodeModulesDirectory;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const assertSetup_js_1 = require("./assertSetup.js");
@@ -109,11 +109,11 @@ function requireResolveNpmPackage({ importPathNpmPackage, userRootDir, }) {
         throw res.err;
     return res.importPathResolvedFilePath;
 }
-function requireResolveVikeDistFile(vikeDistFile) {
-    const vikeNodeModulesRoot = getVikeNodeModulesRoot();
-    (0, path_js_1.assertPosixPath)(vikeNodeModulesRoot);
-    (0, path_js_1.assertPosixPath)(vikeDistFile);
-    const importPathResolvedFilePath = makeNodeFriendly(node_path_1.default.posix.join(vikeNodeModulesRoot, vikeDistFile));
+function requireResolveDistFile(distFile) {
+    const packageNodeModulesDirectory = getPackageNodeModulesDirectory();
+    (0, path_js_1.assertPosixPath)(packageNodeModulesDirectory);
+    (0, path_js_1.assertPosixPath)(distFile);
+    const importPathResolvedFilePath = makeNodeFriendly(node_path_1.default.posix.join(packageNodeModulesDirectory, distFile));
     // Double check
     {
         const res = requireResolve_(importPathResolvedFilePath, 
@@ -171,11 +171,12 @@ function addFileExtensionsToRequireResolve(require_) {
         }
     });
 }
-function getVikeNodeModulesRoot() {
-    // [RELATIVE_PATH_FROM_DIST] Current file: vike/dist/esm/utils/requireResolve.js
-    (0, assert_js_1.assert)(importMetaUrl.includes('/dist/esm/') || importMetaUrl.includes('/dist/cjs/'));
-    const vikeNodeModulesRoot = node_path_1.default.posix.join(removeFilePrefix(importMetaUrl), '../../../../');
-    return vikeNodeModulesRoot;
+function getPackageNodeModulesDirectory() {
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/${packageName}/dist/esm/utils/requireResolve.js
+    (0, assert_js_1.assert)(importMetaUrl.includes('/dist/esm/utils/') || importMetaUrl.includes('/dist/cjs/utils/'));
+    const packageNodeModulesDirectory = node_path_1.default.posix.join(removeFilePrefix(node_path_1.default.dirname(importMetaUrl)), '../../../');
+    // Return `node_modules/${packageName}/`
+    return packageNodeModulesDirectory;
 }
 function getFakeImporterFile(dirPath) {
     (0, path_js_1.assertPosixPath)(dirPath);

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

@@ -8,6 +8,7 @@ import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
 import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
 import type { PageContextClient } from '../../types/PageContext.js';
+import type { VikeGlobalInternal } from '../../types/VikeGlobalInternal.js';
 declare const firstRenderStartPromise: Promise<void>;
 type PageContextRouted = {
     pageId: string;
@@ -156,9 +157,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     }) | null;
 }>;
 declare global {
-    var _vike: {
-        fullyRenderedUrl?: string;
-    } | undefined;
+    var _vike: VikeGlobalInternal;
 }
 declare function disableClientRouting(err: unknown, log: boolean): void;
 declare function getRenderCount(): number;

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -1,4 +1,3 @@
-import { isFontFallback } from '../../renderPage/isFontFallback.js';
 export { getHtmlTags };
 import { assert, assertWarning, assertUsage, isObject, freezePartial } from '../../utils.js';
 import { getGlobalContextClientSerialized, getPageContextClientSerialized, } from '../serializeContext.js';
@@ -10,6 +9,7 @@ import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfig
 import pc from '@brillout/picocolors';
 import { getConfigDefinedAt } from '../../../../shared/page-configs/getConfigDefinedAt.js';
 import { htmlElementId_globalContext, htmlElementId_pageContext } from '../../../../shared/htmlElementIds.js';
+import { isFontFallback } from '../../renderPage/isFontFallback.js';
 const stamp = '__injectFilterEntry';
 async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript, isStream) {
     assert([true, false].includes(pageContext._isHtmlOnly));

package/dist/esm/node/runtime/renderPage.d.ts

@@ -6,6 +6,12 @@ import { type GlobalContextServerInternal } from './globalContext.js';
 import { type HttpResponse } from './renderPage/createHttpResponse.js';
 import type { PageContextServer } from '../../types/index.js';
 import type { PageContextInternalServer } from '../../types/PageContext.js';
+declare const globalObject: {
+    httpRequestsCount: number;
+    asyncHookWrapper: <PageContext>(_httpRequestId: number, ret: () => Promise<PageContext>) => Promise<{
+        pageContextReturn: Awaited<PageContext>;
+    }>;
+};
 type PageContextInit = Pick<PageContextInternalServer, 'urlOriginal' | 'headersOriginal'> & {
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
@@ -14,10 +20,7 @@ type PageContextBegin = ReturnType<typeof getPageContextBegin>;
 declare function renderPage<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
 } & Partial<PageContextServer & PageContextUserAdded>>;
-declare let asyncHookWrapper: <PageContext>(_httpRequestId: number, ret: () => Promise<PageContext>) => Promise<{
-    pageContextReturn: Awaited<PageContext>;
-}>;
-declare function renderPage_addAsyncHookwrapper(wrapper: typeof asyncHookWrapper): void;
+declare function renderPage_addAsyncHookwrapper(wrapper: typeof globalObject.asyncHookWrapper): void;
 declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, httpRequestId: number): {
     _isOriginalObject: true;
     isPageContext: true;