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

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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHtmlTags = getHtmlTags;
-const isFontFallback_js_1 = require("../../renderPage/isFontFallback.js");
 const utils_js_1 = require("../../utils.js");
 const serializeContext_js_1 = require("../serializeContext.js");
 const sanitizeJson_js_1 = require("./sanitizeJson.js");
@@ -15,6 +14,7 @@ const getConfigValueRuntime_js_1 = require("../../../../shared/page-configs/getC
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
 const htmlElementIds_js_1 = require("../../../../shared/htmlElementIds.js");
+const isFontFallback_js_1 = require("../../renderPage/isFontFallback.js");
 const stamp = '__injectFilterEntry';
 async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript, isStream) {
     (0, utils_js_1.assert)([true, false].includes(pageContext._isHtmlOnly));

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

@@ -24,7 +24,10 @@ const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithou
 const loadPageConfigsLazyServerSide_js_1 = require("./renderPage/loadPageConfigsLazyServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
 const getVikeConfigError_js_1 = require("../shared/getVikeConfigError.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', { httpRequestsCount: 0 });
+const globalObject = (0, utils_js_1.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) {
     (0, assertArguments_js_1.assertArguments)(...arguments);
@@ -37,19 +40,21 @@ async function renderPage(pageContextInit) {
     const httpRequestId = getRequestId();
     const urlOriginalPretty = (0, utils_js_1.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);
     (0, utils_js_1.checkType)(pageContextReturn);
     (0, utils_js_1.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/cjs/node/runtime/utils.js

@@ -64,7 +64,7 @@ __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/virtualFileId.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
-__exportStar(require("../../utils/getTerminWidth.js"), exports);
+__exportStar(require("../../utils/getTerminalWidth.js"), exports);
 __exportStar(require("../../utils/truncateString.js"), exports);
 __exportStar(require("../../utils/formatHintLog.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);

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

@@ -18,11 +18,12 @@ const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 const pluginBuildEntry_js_1 = require("./pluginBuildEntry.js");
 const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
-(0, utils_js_1.assertIsSingleModuleInstance)('build/handleAssetsManifest.ts');
-let assetsJsonFilePath;
+const globalObject = (0, utils_js_1.getGlobalObject)('build/handleAssetsManifest.ts', {
+    assetsJsonFilePath: undefined,
+});
 // true  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
 function handleAssetsManifest_isFixEnabled(config) {
@@ -224,7 +225,7 @@ const targets = [];
 function handleAssetsManifest_assertUsageCssTarget(config, env) {
     if (!handleAssetsManifest_isFixEnabled(config))
         return;
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config, env);
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide)(config, env);
     (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
     (0, utils_js_1.assert)(config.build.target !== undefined);
     targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
@@ -295,25 +296,25 @@ async function handleAssetsManifest_getBuildConfig(config) {
         copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
-            : !(0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(config),
+            : !(0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(config),
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsrEnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    const isSsrEnv = (0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv);
     if (isSsrEnv) {
-        (0, utils_js_1.assert)(!assetsJsonFilePath);
+        (0, utils_js_1.assert)(!globalObject.assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
-        assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-        await writeAssetsManifestFile(assetsJsonFilePath, config);
+        globalObject.assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+        await writeAssetsManifestFile(globalObject.assetsJsonFilePath, config);
     }
-    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
+    if ((0, isViteServerSide_js_1.isViteServerSide)(config, viteEnv)) {
         const outDir = options.dir;
         (0, utils_js_1.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 (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(assetsJsonFilePath, bundle, outDir);
+        const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(globalObject.assetsJsonFilePath, bundle, outDir);
         if (isSsrEnv)
             (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }

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

@@ -14,11 +14,12 @@ const logErrorHint_js_1 = require("../../../runtime/renderPage/logErrorHint.js")
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const context_js_2 = require("../../../api/context.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 const runPrerenderEntry_js_1 = require("../../../prerender/runPrerenderEntry.js");
 const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
-(0, utils_js_1.assertIsSingleModuleInstance)('build/pluginAutoFullBuild.ts');
-let forceExit = false;
+const globalObject = (0, utils_js_1.getGlobalObject)('build/pluginAutoFullBuild.ts', {
+    forceExit: false,
+});
 function pluginAutoFullBuild() {
     let config;
     return [
@@ -62,7 +63,7 @@ function pluginAutoFullBuild() {
                     (0, utils_js_1.onSetupBuild)();
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config, this.environment);
                     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                    if (forceExit &&
+                    if (globalObject.forceExit &&
                         // Let vike:build:pluginBuildApp force exit
                         !vikeConfig.config.vite6BuilderApp) {
                         (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
@@ -79,7 +80,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 ? !(0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv) : !(0, isViteServerBuild_js_1.isViteClientBuild)(config, viteEnv))
+    if (isBuilderApp ? !(0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv) : !(0, isViteServerSide_js_1.isViteClientSide)(config, viteEnv))
         return;
     if (isEntirelyDisabled(vikeConfig))
         return;
@@ -98,7 +99,7 @@ async function triggerFullBuild(config, viteEnv, bundle) {
     }
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
         const res = await (0, runPrerenderEntry_js_1.runPrerenderFromAutoRun)(configInline);
-        forceExit = res.forceExit;
+        globalObject.forceExit = res.forceExit;
         (0, utils_js_1.assert)((0, context_js_1.wasPrerenderRun)());
     }
 }
@@ -129,7 +130,7 @@ function isEntirelyDisabled(vikeConfig) {
     }
 }
 function isPrerenderForceExit() {
-    return forceExit;
+    return globalObject.forceExit;
 }
 function getFullBuildInlineConfig(config) {
     const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();

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

@@ -11,7 +11,7 @@ const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js")
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
@@ -68,7 +68,7 @@ async function getEntries(config) {
     // TO-DO/next-major-release: remove
     const pageFileEntries = await getPageFileEntries(config, (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if ((0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(config)) {
+    if ((0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
@@ -87,8 +87,8 @@ async function getEntries(config) {
             ...clientEntries,
             ...pageFileEntries,
         };
-        const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-client-routing/entry.js');
-        const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-server-routing/entry.js');
+        const clientRoutingEntry = (0, utils_js_1.requireResolveDistFile)('dist/esm/client/runtime-client-routing/entry.js');
+        const serverRoutingEntry = (0, utils_js_1.requireResolveDistFile)('dist/esm/client/runtime-server-routing/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -141,7 +141,7 @@ function analyzeClientEntries(pageConfigs, config) {
 // Ensure Rollup creates entries for each page file, see https://github.com/vikejs/vike/issues/350
 // (Otherwise the page files may be missing in the client manifest.json)
 async function getPageFileEntries(config, includeAssetsImportedByServer) {
-    const isForClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(config);
+    const isForClientSide = !(0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');

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

@@ -95,7 +95,7 @@ function find_ASSETS_MANIFEST(bundle) {
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
-    const filePathAbsolute = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/__internal/index.js');
+    const filePathAbsolute = (0, utils_js_1.requireResolveDistFile)('dist/esm/__internal/index.js');
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
     true) {

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

@@ -10,7 +10,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginDistPackageJsonFile = pluginDistPackageJsonFile;
 const rollupIsEsm_js_1 = require("../../shared/rollupIsEsm.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 function pluginDistPackageJsonFile() {
     let config;
     return {
@@ -20,7 +20,7 @@ function pluginDistPackageJsonFile() {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!(0, isViteServerBuild_js_1.isViteServerBuild)(config, this.environment))
+            if (!(0, isViteServerSide_js_1.isViteServerSide)(config, this.environment))
                 return;
             const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
             const fileName = 'package.json';

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
 const utils_js_1 = require("../../utils.js");
 const getMagicString_js_1 = require("../../shared/getMagicString.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 function pluginModuleBanner() {
@@ -18,7 +18,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (!(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment) &&
+                if (!(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment) &&
                     // Inject module banners if user sets `build.minify` to `false` for inspecting dist/client/
                     config.build.minify) {
                     return;

package/dist/cjs/node/vite/plugins/pluginDev/determineFsAllowList.js

@@ -23,6 +23,6 @@ async function determineFsAllowList(config) {
     // We add it again just to be sure.
     fsAllow.push((0, vite_1.searchForWorkspaceRoot)(process.cwd()));
     // Add node_modules/vike/
-    const vikeNodeModulesRoot = (0, utils_js_1.getVikeNodeModulesRoot)();
-    fsAllow.push(vikeNodeModulesRoot);
+    const packageNodeModulesDirectory = (0, utils_js_1.getPackageNodeModulesDirectory)();
+    fsAllow.push(packageNodeModulesDirectory);
 }

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

@@ -5,7 +5,7 @@ const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 const getMagicString_js_1 = require("../shared/getMagicString.js");
 // TO-DO/eventually:
 // - Make ({}) work inside +config.js
@@ -38,7 +38,7 @@ function pluginEnvVars() {
             if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment);
+            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment);
             const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
             // Find & check
             const replacements = Object.entries(envsAll)

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

@@ -16,7 +16,7 @@ const handleAssetsManifest_js_1 = require("./pluginBuild/handleAssetsManifest.js
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 const retrievePageAssetsProd_js_1 = require("../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
@@ -47,7 +47,7 @@ function pluginExtractAssets() {
                 }
                 const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
                 (0, utils_js_1.assert)(includeAssetsImportedByServer);
-                (0, utils_js_1.assert)(!(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment));
+                (0, utils_js_1.assert)(!(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -64,7 +64,7 @@ function pluginExtractAssets() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if ((0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment)) {
+                if ((0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
                     (0, utils_js_1.assert)(importer === undefined || !extractAssetsRE.test(importer));

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

@@ -6,7 +6,7 @@ exports.isUsingClientRouter = isUsingClientRouter;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:pluginExtractExportNames');
@@ -19,7 +19,7 @@ function pluginExtractExportNames() {
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);
-            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment);
+            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
                 debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);

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

@@ -20,7 +20,7 @@ function getViteRpcFunctions(viteDevServer) {
     };
 }
 function pluginNonRunnableDev() {
-    const runtimeGlobalContextFilePath = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/node/runtime/globalContext.js');
+    const runtimeGlobalContextFilePath = (0, utils_js_1.requireResolveDistFile)('dist/esm/node/runtime/globalContext.js');
     let config;
     return {
         name: 'vike:pluginNonRunnableDev',

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginReplaceConstants = pluginReplaceConstants;
 const utils_js_1 = require("../utils.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 const getMagicString_js_1 = require("../shared/getMagicString.js");
 function pluginReplaceConstants() {
     let config;
@@ -35,7 +35,7 @@ function pluginReplaceConstants() {
             const constantsMap = [];
             constantsMap.push({
                 constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment),
+                replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment),
             });
             constantsMap.forEach(({ constants, replacement }) => {
                 if (!constants.some((c) => code.includes(c)))

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

@@ -12,13 +12,13 @@ const node_path_1 = __importDefault(require("node:path"));
 const generateVirtualFileGlobalEntry_js_1 = require("./generateVirtualFileGlobalEntry.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
 async function generateVirtualFileGlobalEntryWithOldDesign(id, options, config, env, isDev) {
     const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
     (0, utils_js_1.assert)(idParsed && idParsed.type === 'global-entry');
     const { isForClientSide, isClientRouting } = idParsed;
-    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, env));
+    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, env));
     const code = await getCode(config, isForClientSide, isClientRouting, isDev, id);
     return code;
 }

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

@@ -25,7 +25,7 @@ function getClientEntrySrcDev(clientEntry, viteDevServer) {
     else {
         if (clientEntry.startsWith('@@vike/')) {
             (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
-            filePath = (0, utils_js_1.requireResolveVikeDistFile)(`dist/esm/${clientEntry.replace('@@vike/dist/esm/', '')}`);
+            filePath = (0, utils_js_1.requireResolveDistFile)(`dist/esm/${clientEntry.replace('@@vike/dist/esm/', '')}`);
         }
         else {
             (0, utils_js_1.assertIsImportPathNpmPackage)(clientEntry);

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

@@ -45,7 +45,9 @@ const loggerNotProd_js_1 = require("./loggerNotProd.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
 const node_util_1 = require("node:util");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-let asyncLocalStorage = null;
+const globalObject = (0, utils_js_1.getGlobalObject)('getHttpRequestAsyncStore.ts', {
+    asyncLocalStorage: null,
+});
 async function installHttpRequestAsyncStore() {
     let mod;
     try {
@@ -54,9 +56,9 @@ async function installHttpRequestAsyncStore() {
     catch {
         return;
     }
-    asyncLocalStorage = new mod.AsyncLocalStorage();
+    globalObject.asyncLocalStorage = new mod.AsyncLocalStorage();
     (0, renderPage_js_1.renderPage_addAsyncHookwrapper)(async (httpRequestId, renderPage) => {
-        (0, utils_js_1.assert)(asyncLocalStorage);
+        (0, utils_js_1.assert)(globalObject.asyncLocalStorage);
         const loggedErrors = new Set();
         const markErrorAsLogged = (err) => {
             loggedErrors.add(err);
@@ -79,15 +81,15 @@ async function installHttpRequestAsyncStore() {
             shouldErrorBeSwallowed,
             errorDebugNoteAlreadyShown: false,
         };
-        const pageContextReturn = await asyncLocalStorage.run(store, renderPage);
+        const pageContextReturn = await globalObject.asyncLocalStorage.run(store, renderPage);
         return { pageContextReturn };
     });
     return;
 }
 function getHttpRequestAsyncStore() {
-    if (asyncLocalStorage === null)
+    if (globalObject.asyncLocalStorage === null)
         return null;
-    const store = asyncLocalStorage.getStore();
+    const store = globalObject.asyncLocalStorage.getStore();
     (0, utils_js_1.assert)(store === undefined || (0, utils_js_1.isObject)(store));
     return store;
 }

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

@@ -8,19 +8,22 @@ exports.resolveOutDir = resolveOutDir;
 exports.resolveOutDir_configEnvironment = resolveOutDir_configEnvironment;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
-const isViteServerBuild_js_1 = require("./isViteServerBuild.js");
+const isViteServerSide_js_1 = require("./isViteServerSide.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
     debug('getOutDirs()', new Error().stack);
     const outDir = getOutDirFromResolvedConfig(configGlobal);
     assertOutDirResolved(outDir, configGlobal, viteEnv);
     const outDirs = getOutDirsAll(outDir, configGlobal.root);
+    assertNormalization(outDirs.outDirRoot);
+    assertNormalization(outDirs.outDirClient);
+    assertNormalization(outDirs.outDirServer);
     return outDirs;
 }
 function resolveOutDir_configEnvironment(configGlobal, envName, configEnv) {
     (0, utils_js_1.assert)(configGlobal && envName && configEnv);
     const viteEnv = { name: envName, config: configEnv };
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(configGlobal, viteEnv);
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide)(configGlobal, viteEnv);
     return resolveOutDir(configEnv, isServerSide);
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
@@ -95,9 +98,9 @@ function getOutDirsAllFromRootNormalized(outDirRoot, root) {
 }
 function assertNormalization(outDirAny) {
     (0, utils_js_1.assertPosixPath)(outDirAny);
-    (0, utils_js_1.assert)(outDirIsAbsolutePath(outDirAny));
-    (0, utils_js_1.assert)(outDirAny.endsWith('/'));
-    (0, utils_js_1.assert)(!outDirAny.endsWith('//'));
+    (0, utils_js_1.assert)(outDirIsAbsolutePath(outDirAny), outDirAny);
+    (0, utils_js_1.assert)(outDirAny.endsWith('/'), outDirAny);
+    (0, utils_js_1.assert)(!outDirAny.endsWith('//'), outDirAny);
 }
 function isOutDirRoot(outDirRot) {
     const p = outDirRot.split('/').filter(Boolean);
@@ -116,7 +119,7 @@ function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
-    if ((0, isViteServerBuild_js_1.isViteServerBuild_withoutEnv)(configGlobal, viteEnv)) {
+    if ((0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv)) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {

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/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;