vike 0.4.237-commit-85e89b1 → 0.4.237-commit-e549c30

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

@@ -1,7 +1,7 @@
 export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
-import { assert, addOnBeforeLogHook, removeFileExtension, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsImportPathNpmPackage, requireResolveVikeDistFile, } from '../../utils.js';
+import { assert, addOnBeforeLogHook, removeFileExtension, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsImportPathNpmPackage, requireResolveDistFile, } from '../../utils.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { generateVirtualFileId } from '../../../shared/virtualFileId.js';
@@ -9,7 +9,7 @@ import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
-import { isViteServerBuild_withoutEnv } from '../../shared/isViteServerBuild.js';
+import { isViteServerSide_withoutEnv } from '../../shared/isViteServerSide.js';
 import { resolveOutDir_configEnvironment } from '../../shared/getOutDirs.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, } from './handleAssetsManifest.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
@@ -66,7 +66,7 @@ async function getEntries(config) {
     // TO-DO/next-major-release: remove
     const pageFileEntries = await getPageFileEntries(config, resolveIncludeAssetsImportedByServer(vikeConfig.config));
     assertUsage(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if (isViteServerBuild_withoutEnv(config)) {
+    if (isViteServerSide_withoutEnv(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
@@ -85,8 +85,8 @@ async function getEntries(config) {
             ...clientEntries,
             ...pageFileEntries,
         };
-        const clientRoutingEntry = requireResolveVikeDistFile('dist/esm/client/runtime-client-routing/entry.js');
-        const serverRoutingEntry = requireResolveVikeDistFile('dist/esm/client/runtime-server-routing/entry.js');
+        const clientRoutingEntry = requireResolveDistFile('dist/esm/client/runtime-client-routing/entry.js');
+        const serverRoutingEntry = requireResolveDistFile('dist/esm/client/runtime-server-routing/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -139,7 +139,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 = !isViteServerBuild_withoutEnv(config);
+    const isForClientSide = !isViteServerSide_withoutEnv(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');

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

@@ -2,7 +2,7 @@ export { pluginBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdGlobalEntryServer } from '../../../shared/virtualFileId.js';
-import { assert, PROJECT_VERSION, requireResolveVikeDistFile } from '../../utils.js';
+import { assert, PROJECT_VERSION, requireResolveDistFile } from '../../utils.js';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { isUsingClientRouter } from '../pluginExtractExportNames.js';
@@ -90,7 +90,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 = requireResolveVikeDistFile('dist/esm/__internal/index.js');
+    const filePathAbsolute = 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/esm/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js

@@ -8,7 +8,7 @@
  */
 export { pluginDistPackageJsonFile };
 import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
-import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
+import { isViteServerSide } from '../../shared/isViteServerSide.js';
 function pluginDistPackageJsonFile() {
     let config;
     return {
@@ -18,7 +18,7 @@ function pluginDistPackageJsonFile() {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!isViteServerBuild(config, this.environment))
+            if (!isViteServerSide(config, this.environment))
                 return;
             const isEsm = rollupIsEsm(options);
             const fileName = 'package.json';

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

@@ -1,7 +1,7 @@
 export { pluginModuleBanner };
 import { removeVirtualFileIdPrefix } from '../../utils.js';
 import { getMagicString } from '../../shared/getMagicString.js';
-import { isViteServerBuild_extraSafe } from '../../shared/isViteServerBuild.js';
+import { isViteServerSide_extraSafe } from '../../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() {
@@ -16,7 +16,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (!isViteServerBuild_extraSafe(config, options, this.environment) &&
+                if (!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/esm/node/vite/plugins/pluginDev/determineFsAllowList.js

@@ -1,7 +1,7 @@
 export { determineFsAllowList };
 import { searchForWorkspaceRoot } from 'vite';
 import path from 'node:path';
-import { assert, assertPosixPath, getVikeNodeModulesRoot } from '../../utils.js';
+import { assert, assertPosixPath, getPackageNodeModulesDirectory } from '../../utils.js';
 import { fileURLToPath } from 'node:url';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
@@ -18,6 +18,6 @@ async function determineFsAllowList(config) {
     // We add it again just to be sure.
     fsAllow.push(searchForWorkspaceRoot(process.cwd()));
     // Add node_modules/vike/
-    const vikeNodeModulesRoot = getVikeNodeModulesRoot();
-    fsAllow.push(vikeNodeModulesRoot);
+    const packageNodeModulesDirectory = getPackageNodeModulesDirectory();
+    fsAllow.push(packageNodeModulesDirectory);
 }

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

@@ -3,7 +3,7 @@ import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, isNotNullish, lowerFirst, } from '../utils.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { isViteServerBuild_extraSafe } from '../shared/isViteServerBuild.js';
+import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
 // TO-DO/eventually:
 // - Make import.meta.env work inside +config.js
@@ -36,7 +36,7 @@ function pluginEnvVars() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !isViteServerBuild_extraSafe(config, options, this.environment);
+            const isClientSide = !isViteServerSide_extraSafe(config, options, this.environment);
             const { magicString, getMagicStringResult } = getMagicString(code, id);
             // Find & check
             const replacements = Object.entries(envsAll)

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

@@ -15,7 +15,7 @@ import { handleAssetsManifest_isFixEnabled } from './pluginBuild/handleAssetsMan
 import { getVikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { isViteServerBuild_extraSafe } from '../shared/isViteServerBuild.js';
+import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { resolveIncludeAssetsImportedByServer } from '../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -45,7 +45,7 @@ function pluginExtractAssets() {
                 }
                 const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
                 assert(includeAssetsImportedByServer);
-                assert(!isViteServerBuild_extraSafe(config, options, this.environment));
+                assert(!isViteServerSide_extraSafe(config, options, this.environment));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -62,7 +62,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 (isViteServerBuild_extraSafe(config, options, this.environment)) {
+                if (isViteServerSide_extraSafe(config, options, this.environment)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     assert(!extractAssetsRE.test(source));
                     assert(importer === undefined || !extractAssetsRE.test(importer));

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

@@ -4,7 +4,7 @@ export { extractExportNamesRE };
 import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage, rollupSourceMapRemove, } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { isViteServerBuild_extraSafe } from '../shared/isViteServerBuild.js';
+import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:pluginExtractExportNames');
 const globalObject = getGlobalObject('plugins/pluginExtractExportNames.ts', {});
@@ -16,7 +16,7 @@ function pluginExtractExportNames() {
         enforce: 'post',
         async transform(src, id, options) {
             id = normalizeId(id);
-            const isClientSide = !isViteServerBuild_extraSafe(config, options, this.environment);
+            const isClientSide = !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/esm/node/vite/plugins/pluginNonRunnableDev.js

@@ -1,5 +1,5 @@
 export { pluginNonRunnableDev };
-import { createViteRPC, assertIsNotProductionRuntime, requireResolveVikeDistFile, isRunnableDevEnvironment, } from '../utils.js';
+import { createViteRPC, assertIsNotProductionRuntime, requireResolveDistFile, isRunnableDevEnvironment, } from '../utils.js';
 import { retrievePageAssetsDev } from '../../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
 import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
 import { getMagicString } from '../shared/getMagicString.js';
@@ -18,7 +18,7 @@ function getViteRpcFunctions(viteDevServer) {
     };
 }
 function pluginNonRunnableDev() {
-    const runtimeGlobalContextFilePath = requireResolveVikeDistFile('dist/esm/node/runtime/globalContext.js');
+    const runtimeGlobalContextFilePath = requireResolveDistFile('dist/esm/node/runtime/globalContext.js');
     let config;
     return {
         name: 'vike:pluginNonRunnableDev',

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

@@ -1,7 +1,7 @@
 export { pluginReplaceConstants };
 import { assert, assertPosixPath } from '../utils.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { isViteServerBuild_extraSafe } from '../shared/isViteServerBuild.js';
+import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
 function pluginReplaceConstants() {
     let config;
@@ -33,7 +33,7 @@ function pluginReplaceConstants() {
             const constantsMap = [];
             constantsMap.push({
                 constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !isViteServerBuild_extraSafe(config, options, this.environment),
+                replacement: !isViteServerSide_extraSafe(config, options, this.environment),
             });
             constantsMap.forEach(({ constants, replacement }) => {
                 if (!constants.some((c) => code.includes(c)))

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

@@ -7,13 +7,13 @@ import path from 'node:path';
 import { generateVirtualFileGlobalEntry } from './generateVirtualFileGlobalEntry.js';
 import { getVikeConfigInternal, isV1Design as isV1Design_ } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
-import { isViteServerBuild_extraSafe } from '../../shared/isViteServerBuild.js';
+import { isViteServerSide_extraSafe } from '../../shared/isViteServerSide.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
 async function generateVirtualFileGlobalEntryWithOldDesign(id, options, config, env, isDev) {
     const idParsed = parseVirtualFileId(id);
     assert(idParsed && idParsed.type === 'global-entry');
     const { isForClientSide, isClientRouting } = idParsed;
-    assert(isForClientSide === !isViteServerBuild_extraSafe(config, options, env));
+    assert(isForClientSide === !isViteServerSide_extraSafe(config, options, env));
     const code = await getCode(config, isForClientSide, isClientRouting, isDev, id);
     return code;
 }

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

@@ -1,5 +1,5 @@
 export { getClientEntrySrcDev };
-import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsImportPathNpmPackage, assertIsNotProductionRuntime, requireResolveNpmPackage, requireResolveVikeDistFile, } from '../utils.js';
+import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsImportPathNpmPackage, assertIsNotProductionRuntime, requireResolveNpmPackage, requireResolveDistFile, } from '../utils.js';
 assertIsNotProductionRuntime();
 function getClientEntrySrcDev(clientEntry, viteDevServer) {
     let userRootDir = viteDevServer.config.root;
@@ -23,7 +23,7 @@ function getClientEntrySrcDev(clientEntry, viteDevServer) {
     else {
         if (clientEntry.startsWith('@@vike/')) {
             assert(clientEntry.endsWith('.js'));
-            filePath = requireResolveVikeDistFile(`dist/esm/${clientEntry.replace('@@vike/dist/esm/', '')}`);
+            filePath = requireResolveDistFile(`dist/esm/${clientEntry.replace('@@vike/dist/esm/', '')}`);
         }
         else {
             assertIsImportPathNpmPackage(clientEntry);

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

@@ -9,13 +9,15 @@
 export { getHttpRequestAsyncStore };
 export { installHttpRequestAsyncStore };
 import { renderPage_addAsyncHookwrapper } from '../../runtime/renderPage.js';
-import { assert, assertIsNotProductionRuntime, isObject, unique } from '../utils.js';
+import { assert, assertIsNotProductionRuntime, getGlobalObject, isObject, unique } from '../utils.js';
 import { getConfigBuildErrorFormatted } from './resolveVikeConfigInternal/transpileAndExecuteFile.js';
 import { logErrorDebugNote } from './loggerNotProd.js';
 import { isEquivalentErrorWithCodeSnippet } from './loggerNotProd/errorWithCodeSnippet.js';
 import { isDeepStrictEqual } from 'node:util';
 assertIsNotProductionRuntime();
-let asyncLocalStorage = null;
+const globalObject = getGlobalObject('getHttpRequestAsyncStore.ts', {
+    asyncLocalStorage: null,
+});
 async function installHttpRequestAsyncStore() {
     let mod;
     try {
@@ -24,9 +26,9 @@ async function installHttpRequestAsyncStore() {
     catch {
         return;
     }
-    asyncLocalStorage = new mod.AsyncLocalStorage();
+    globalObject.asyncLocalStorage = new mod.AsyncLocalStorage();
     renderPage_addAsyncHookwrapper(async (httpRequestId, renderPage) => {
-        assert(asyncLocalStorage);
+        assert(globalObject.asyncLocalStorage);
         const loggedErrors = new Set();
         const markErrorAsLogged = (err) => {
             loggedErrors.add(err);
@@ -49,15 +51,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();
     assert(store === undefined || isObject(store));
     return store;
 }

package/dist/esm/node/vite/shared/getOutDirs.d.ts

@@ -3,7 +3,7 @@ export { resolveOutDir };
 export { resolveOutDir_configEnvironment };
 export type { OutDirs };
 import type { UserConfig, ResolvedConfig, EnvironmentOptions } from 'vite';
-import { ViteEnv } from './isViteServerBuild.js';
+import { ViteEnv } from './isViteServerSide.js';
 type OutDirs = {
     /** Absolute path to `outDir` */
     outDirRoot: string;

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

@@ -3,19 +3,22 @@ export { resolveOutDir };
 export { resolveOutDir_configEnvironment };
 import pc from '@brillout/picocolors';
 import { assert, assertPosixPath, assertUsage, createDebugger, pathJoin, toPosixPath } from '../utils.js';
-import { isViteServerBuild, isViteServerBuild_withoutEnv } from './isViteServerBuild.js';
+import { isViteServerSide, isViteServerSide_withoutEnv } from './isViteServerSide.js';
 const debug = 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) {
     assert(configGlobal && envName && configEnv);
     const viteEnv = { name: envName, config: configEnv };
-    const isServerSide = isViteServerBuild(configGlobal, viteEnv);
+    const isServerSide = isViteServerSide(configGlobal, viteEnv);
     return resolveOutDir(configEnv, isServerSide);
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
@@ -90,9 +93,9 @@ function getOutDirsAllFromRootNormalized(outDirRoot, root) {
 }
 function assertNormalization(outDirAny) {
     assertPosixPath(outDirAny);
-    assert(outDirIsAbsolutePath(outDirAny));
-    assert(outDirAny.endsWith('/'));
-    assert(!outDirAny.endsWith('//'));
+    assert(outDirIsAbsolutePath(outDirAny), outDirAny);
+    assert(outDirAny.endsWith('/'), outDirAny);
+    assert(!outDirAny.endsWith('//'), outDirAny);
 }
 function isOutDirRoot(outDirRot) {
     const p = outDirRot.split('/').filter(Boolean);
@@ -111,7 +114,7 @@ function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     assert('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${pc.cyan(outDir)} but you should set it to ${pc.cyan(outDirCorrected)} instead.`;
-    if (isViteServerBuild_withoutEnv(configGlobal, viteEnv)) {
+    if (isViteServerSide_withoutEnv(configGlobal, viteEnv)) {
         assertUsage(outDir.endsWith('/server'), wrongUsage);
     }
     else {

package/dist/esm/node/vite/shared/isViteServerSide.d.ts

@@ -0,0 +1,18 @@
+export { isViteServerSide };
+export { isViteClientSide };
+export { isViteServerSide_withoutEnv };
+export { isViteServerSide_onlySsrEnv };
+export { isViteServerSide_extraSafe };
+export type { ViteEnv };
+import type { Environment, EnvironmentOptions, ResolvedConfig, UserConfig } from 'vite';
+type ViteEnv = {
+    name?: string;
+    config: EnvironmentOptions | Environment['config'];
+};
+declare function isViteServerSide_withoutEnv(configGlobal: ResolvedConfig | UserConfig, viteEnv?: ViteEnv): boolean;
+declare function isViteServerSide(configGlobal: ResolvedConfig | UserConfig, viteEnv: ViteEnv): boolean;
+declare function isViteClientSide(configGlobal: ResolvedConfig, viteEnv: ViteEnv): boolean;
+declare function isViteServerSide_onlySsrEnv(configGlobal: ResolvedConfig, viteEnv: ViteEnv): boolean;
+declare function isViteServerSide_extraSafe(config: ResolvedConfig, options: {
+    ssr?: boolean;
+} | undefined, viteEnv: ViteEnv): boolean;

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

@@ -1,11 +1,10 @@
-// TODO/now: rename isViteServerSide
-export { isViteServerBuild };
-export { isViteClientBuild };
-export { isViteServerBuild_withoutEnv };
-export { isViteServerBuild_onlySsrEnv };
-export { isViteServerBuild_extraSafe };
+export { isViteServerSide };
+export { isViteClientSide };
+export { isViteServerSide_withoutEnv };
+export { isViteServerSide_onlySsrEnv };
+export { isViteServerSide_extraSafe };
 import { assert } from '../../../utils/assert.js';
-function isViteServerBuild_withoutEnv(configGlobal, viteEnv) {
+function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
     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
@@ -24,7 +23,9 @@ function isViteServerBuild_withoutEnv(configGlobal, viteEnv) {
     };
     if (isServerSide1 !== null) {
         assert(isServerSide1 === isServerSide2 || isServerSide2 === null, debug);
-        assert(isServerSide1 === isServerSide3, debug);
+        /* This assertion can fail, seems to be a Vite bug?
+        assert(isServerSide1 === isServerSide3, debug)
+        */
         return isServerSide1;
     }
     if (isServerSide2 !== null) {
@@ -38,23 +39,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;
         assert(typeof res === 'boolean');
         assert(res === options?.ssr || options?.ssr === undefined);
-        assert(res === isViteServerBuild(config, viteEnv));
+        assert(res === isViteServerSide(config, viteEnv));
         return res;
     }
     else {
@@ -63,7 +64,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)
         */
-        assert(res === isViteServerBuild(config, viteEnv));
+        assert(res === isViteServerSide(config, viteEnv));
         return res;
     }
 }

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

@@ -1,11 +1,13 @@
 export { removeSuperfluousViteLog };
 export { removeSuperfluousViteLog_enable };
 export { removeSuperfluousViteLog_disable };
-import { assert } from '../../utils.js';
+import { assert, getGlobalObject } from '../../utils.js';
+const globalObject = 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')) {
@@ -15,8 +17,8 @@ function removeSuperfluousViteLog(msg) {
     return false;
 }
 function removeSuperfluousViteLog_enable() {
-    enabled = true;
+    globalObject.enabled = true;
 }
 function removeSuperfluousViteLog_disable() {
-    enabled = false;
+    globalObject.enabled = false;
 }

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

@@ -1,7 +1,7 @@
 export { crawlPlusFiles };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
-import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, } from '../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, getGlobalObject, } from '../../utils.js';
 import path from 'node:path';
 import { glob } from 'tinyglobby';
 import { exec } from 'node:child_process';
@@ -14,8 +14,9 @@ import { ignorePatternsBuiltIn } from './crawlPlusFiles/ignorePatternsBuiltIn.js
 const execA = promisify(exec);
 const debug = createDebugger('vike:crawl');
 assertIsNotProductionRuntime();
-assertIsSingleModuleInstance('getVikeConfig/crawlPlusFiles.ts');
-let gitIsNotUsable = false;
+const globalObject = getGlobalObject('getVikeConfig/crawlPlusFiles.ts', {
+    gitIsNotUsable: false,
+});
 async function crawlPlusFiles(userRootDir) {
     assertPosixPath(userRootDir);
     assertFilePathAbsoluteFilesystem(userRootDir);
@@ -48,7 +49,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
@@ -82,7 +83,7 @@ async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
     }
     catch (err) {
         if (await isGitNotUsable(userRootDir)) {
-            gitIsNotUsable = true;
+            globalObject.gitIsNotUsable = true;
             return null;
         }
         throw err;