vike 0.4.237-commit-8749e81 → 0.4.237-commit-e549c30

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-e549c30';

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;

package/dist/esm/node/runtime/renderPage.js

@@ -19,7 +19,10 @@ import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErro
 import { loadPageConfigsLazyServerSideAndExecHook } from './renderPage/loadPageConfigsLazyServerSide.js';
 import { resolveRedirects } from './renderPage/resolveRedirects.js';
 import { getVikeConfigError } from '../shared/getVikeConfigError.js';
-const globalObject = getGlobalObject('runtime/renderPage.ts', { httpRequestsCount: 0 });
+const globalObject = getGlobalObject('runtime/renderPage.ts', {
+    httpRequestsCount: 0,
+    asyncHookWrapper: getFallbackAsyncHookWrapper(),
+});
 // `renderPage()` calls `renderPageNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
 async function renderPage(pageContextInit) {
     assertArguments(...arguments);
@@ -32,19 +35,21 @@ async function renderPage(pageContextInit) {
     const httpRequestId = getRequestId();
     const urlOriginalPretty = getUrlPretty(pageContextInit.urlOriginal);
     logHttpRequest(urlOriginalPretty, httpRequestId);
-    const { pageContextReturn } = await asyncHookWrapper(httpRequestId, () => renderPagePrepare(pageContextInit, httpRequestId));
+    const { pageContextReturn } = await globalObject.asyncHookWrapper(httpRequestId, () => renderPagePrepare(pageContextInit, httpRequestId));
     logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn);
     checkType(pageContextReturn);
     assert(pageContextReturn.httpResponse);
     return pageContextReturn;
 }
-// Fallback wrapper if node:async_hooks isn't available
-let asyncHookWrapper = async (_httpRequestId, ret) => ({
-    pageContextReturn: await ret(),
-});
 // Add node:async_hooks wrapper
 function renderPage_addAsyncHookwrapper(wrapper) {
-    asyncHookWrapper = wrapper;
+    globalObject.asyncHookWrapper = wrapper;
+}
+// Fallback wrapper if node:async_hooks isn't available
+function getFallbackAsyncHookWrapper() {
+    return async (_httpRequestId, ret) => ({
+        pageContextReturn: await ret(),
+    });
 }
 async function renderPagePrepare(pageContextInit, httpRequestId) {
     // Invalid config

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

@@ -44,7 +44,7 @@ export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
 export * from '../../utils/virtualFileId.js';
 export * from '../../utils/stripAnsi.js';
-export * from '../../utils/getTerminWidth.js';
+export * from '../../utils/getTerminalWidth.js';
 export * from '../../utils/truncateString.js';
 export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';

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

@@ -48,7 +48,7 @@ export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
 export * from '../../utils/virtualFileId.js';
 export * from '../../utils/stripAnsi.js';
-export * from '../../utils/getTerminWidth.js';
+export * from '../../utils/getTerminalWidth.js';
 export * from '../../utils/truncateString.js';
 export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';

package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js

@@ -7,17 +7,18 @@ import fs from 'node:fs/promises';
 import fs_sync from 'node:fs';
 import path from 'node:path';
 import { existsSync } from 'node:fs';
-import { assert, assertIsSingleModuleInstance, assertWarning, isEqualStringList, isObject, pLimit, unique, } from '../../utils.js';
+import { assert, assertWarning, getGlobalObject, isEqualStringList, isObject, pLimit, unique } from '../../utils.js';
 import { parseVirtualFileId } from '../../../shared/virtualFileId.js';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
 import { getVikeConfigInternal, isV1Design } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
-import { isViteServerBuild_onlySsrEnv, isViteServerBuild, isViteServerBuild_withoutEnv, } from '../../shared/isViteServerBuild.js';
+import { isViteServerSide_onlySsrEnv, isViteServerSide, isViteServerSide_withoutEnv, } from '../../shared/isViteServerSide.js';
 import { set_macro_ASSETS_MANIFEST } from './pluginBuildEntry.js';
 import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
-assertIsSingleModuleInstance('build/handleAssetsManifest.ts');
-let assetsJsonFilePath;
+const globalObject = getGlobalObject('build/handleAssetsManifest.ts', {
+    assetsJsonFilePath: undefined,
+});
 // true  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
 function handleAssetsManifest_isFixEnabled(config) {
@@ -219,7 +220,7 @@ const targets = [];
 function handleAssetsManifest_assertUsageCssTarget(config, env) {
     if (!handleAssetsManifest_isFixEnabled(config))
         return;
-    const isServerSide = isViteServerBuild(config, env);
+    const isServerSide = isViteServerSide(config, env);
     assert(typeof isServerSide === 'boolean');
     assert(config.build.target !== undefined);
     targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
@@ -290,25 +291,25 @@ async function handleAssetsManifest_getBuildConfig(config) {
         copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
-            : !isViteServerBuild_withoutEnv(config),
+            : !isViteServerSide_withoutEnv(config),
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsrEnv = isViteServerBuild_onlySsrEnv(config, viteEnv);
+    const isSsrEnv = isViteServerSide_onlySsrEnv(config, viteEnv);
     if (isSsrEnv) {
-        assert(!assetsJsonFilePath);
+        assert(!globalObject.assetsJsonFilePath);
         const outDirs = getOutDirs(config, viteEnv);
-        assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
-        await writeAssetsManifestFile(assetsJsonFilePath, config);
+        globalObject.assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
+        await writeAssetsManifestFile(globalObject.assetsJsonFilePath, config);
     }
-    if (isViteServerBuild(config, viteEnv)) {
+    if (isViteServerSide(config, viteEnv)) {
         const outDir = options.dir;
         assert(outDir);
         // Replace __VITE_ASSETS_MANIFEST__ in server builds
         // - Always replace it in dist/server/
         // - Also in some other server builds such as dist/vercel/ from vike-vercel
         // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
-        const noop = await set_macro_ASSETS_MANIFEST(assetsJsonFilePath, bundle, outDir);
+        const noop = await set_macro_ASSETS_MANIFEST(globalObject.assetsJsonFilePath, bundle, outDir);
         if (isSsrEnv)
             assert(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }

package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js

@@ -1,7 +1,7 @@
 export { pluginAutoFullBuild };
 export { isPrerenderForceExit };
 import { build } from 'vite';
-import { assert, assertIsSingleModuleInstance, assertWarning, onSetupBuild } from '../../utils.js';
+import { assert, assertWarning, getGlobalObject, onSetupBuild } from '../../utils.js';
 import { isPrerenderAutoRunEnabled, wasPrerenderRun } from '../../../prerender/context.js';
 import { isViteCliCall, getViteConfigFromCli } from '../../shared/isViteCliCall.js';
 import pc from '@brillout/picocolors';
@@ -9,11 +9,12 @@ import { logErrorHint } from '../../../runtime/renderPage/logErrorHint.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { isVikeCliOrApi } from '../../../api/context.js';
 import { handleAssetsManifest, handleAssetsManifest_assertUsageCssTarget } from './handleAssetsManifest.js';
-import { isViteClientBuild, isViteServerBuild_onlySsrEnv } from '../../shared/isViteServerBuild.js';
+import { isViteClientSide, isViteServerSide_onlySsrEnv } from '../../shared/isViteServerSide.js';
 import { runPrerender_forceExit, runPrerenderFromAutoRun } from '../../../prerender/runPrerenderEntry.js';
 import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
-assertIsSingleModuleInstance('build/pluginAutoFullBuild.ts');
-let forceExit = false;
+const globalObject = getGlobalObject('build/pluginAutoFullBuild.ts', {
+    forceExit: false,
+});
 function pluginAutoFullBuild() {
     let config;
     return [
@@ -57,7 +58,7 @@ function pluginAutoFullBuild() {
                     onSetupBuild();
                     handleAssetsManifest_assertUsageCssTarget(config, this.environment);
                     const vikeConfig = await getVikeConfigInternal();
-                    if (forceExit &&
+                    if (globalObject.forceExit &&
                         // Let vike:build:pluginBuildApp force exit
                         !vikeConfig.config.vite6BuilderApp) {
                         runPrerender_forceExit();
@@ -74,7 +75,7 @@ async function triggerFullBuild(config, viteEnv, bundle) {
     const isBuilderApp = vikeConfig.config.vite6BuilderApp;
     // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
     // Else => trigger at end of client-side build.
-    if (isBuilderApp ? !isViteServerBuild_onlySsrEnv(config, viteEnv) : !isViteClientBuild(config, viteEnv))
+    if (isBuilderApp ? !isViteServerSide_onlySsrEnv(config, viteEnv) : !isViteClientSide(config, viteEnv))
         return;
     if (isEntirelyDisabled(vikeConfig))
         return;
@@ -93,7 +94,7 @@ async function triggerFullBuild(config, viteEnv, bundle) {
     }
     if (isPrerenderAutoRunEnabled(vikeConfig)) {
         const res = await runPrerenderFromAutoRun(configInline);
-        forceExit = res.forceExit;
+        globalObject.forceExit = res.forceExit;
         assert(wasPrerenderRun());
     }
 }
@@ -124,7 +125,7 @@ function isEntirelyDisabled(vikeConfig) {
     }
 }
 function isPrerenderForceExit() {
-    return forceExit;
+    return globalObject.forceExit;
 }
 function getFullBuildInlineConfig(config) {
     const configFromCli = !isViteCliCall() ? null : getViteConfigFromCli();