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

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();

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

@@ -1,14 +1,6 @@
-/*
- * We create a file `dist/server/package.json` to support ESM users.
- * Otherwise, following error is thrown:
- *   Must use import to load ES Module: dist/server/pageFiles.js
- *   require() of ES modules is not supported.
- *   require() of dist/server/pageFiles.js from node_modules/vike/dist/esm/node/runtime/page-files/setup.js is an ES module file as it is a .js file whose nearest parent package.json contains "type": "module" which defines all .js files in that package scope as ES modules.
- * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
- */
 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 +10,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/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.d.ts

@@ -1,5 +1,7 @@
 export { getConfigValueSourcesRelevant };
+export { getConfigValueSourceRelevantAnyEnv };
 export { isRuntimeEnvMatch };
+export { isConfigSourceValueNull };
 export type { RuntimeEnv };
 import type { ConfigEnvInternal, ConfigValueSource, PageConfigBuildTime, PageConfigGlobalBuildTime } from '../../../../types/PageConfig.js';
 type RuntimeEnv = {
@@ -9,6 +11,8 @@ type RuntimeEnv = {
 } | {
     isForConfig: true;
 };
+type PageConfigPartial = Pick<PageConfigBuildTime | PageConfigGlobalBuildTime, 'configValueSources' | 'configDefinitions'>;
 declare function getConfigValueSourcesRelevant(configName: string, runtimeEnv: RuntimeEnv, pageConfig: PageConfigPartial): ConfigValueSource[];
+declare function getConfigValueSourceRelevantAnyEnv(configName: string, pageConfig: PageConfigPartial): null | ConfigValueSource;
 declare function isRuntimeEnvMatch(configEnv: ConfigEnvInternal, runtimeEnv: RuntimeEnv): boolean;
-type PageConfigPartial = Pick<PageConfigBuildTime | PageConfigGlobalBuildTime, 'configValueSources' | 'configDefinitions'>;
+declare function isConfigSourceValueNull(source: ConfigValueSource): boolean | null;

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

@@ -1,28 +1,47 @@
 export { getConfigValueSourcesRelevant };
+export { getConfigValueSourceRelevantAnyEnv };
 export { isRuntimeEnvMatch };
-import { assert } from '../../utils.js';
+export { isConfigSourceValueNull };
+import { assert, assertIsNotBrowser } from '../../utils.js';
+assertIsNotBrowser();
 function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
     const configDef = pageConfig.configDefinitions[configName];
     assert(configDef);
     let sourcesRelevant = pageConfig.configValueSources[configName];
     if (!sourcesRelevant)
         return [];
-    if (!configDef.cumulative) {
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    // Environment filtering
+    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
+    // Overriding - non-cumulative configs
+    if (!configDef.cumulative && sourcesRelevant.length > 1) {
         const source = sourcesRelevant[0];
-        if (source) {
-            sourcesRelevant = [source];
-        }
-        else {
-            assert(sourcesRelevant.length === 0);
-        }
+        assert(source);
+        sourcesRelevant = [source];
     }
-    else {
-        // isOverridden() must be called before isRuntimeEnvMatch() is called (otherwise isOverridden() will return a wrong value)
-        sourcesRelevant = sourcesRelevant.filter((source) => !isOverridden(source, configName, pageConfig));
+    // Overriding - cumulative configs
+    if (configDef.cumulative && sourcesRelevant.length > 0) {
+        sourcesRelevant = applyFilenameSuffix(sourcesRelevant);
     }
-    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
     return sourcesRelevant;
 }
+function getConfigValueSourceRelevantAnyEnv(configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    assert(configDef);
+    assert(!configDef.cumulative); // So far, this function is only used by non-cumulative configs
+    let sourcesRelevant = pageConfig.configValueSources[configName];
+    if (!sourcesRelevant)
+        return null;
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    const source = sourcesRelevant[0];
+    if (!source)
+        return null;
+    if (isConfigSourceValueNull(source))
+        return null;
+    return source;
+}
 function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     if ('isForConfig' in runtimeEnv)
         return !!configEnv.config;
@@ -52,14 +71,25 @@ function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     }
     return true;
 }
-function isOverridden(source, configName, pageConfig) {
-    const configDef = pageConfig.configDefinitions[configName];
-    assert(configDef);
-    if (configDef.cumulative)
-        return false;
-    const sources = pageConfig.configValueSources[configName];
-    assert(sources);
-    const idx = sources.indexOf(source);
-    assert(idx >= 0);
-    return idx > 0;
+// Setting a config to `undefined` should be equivalent to not setting it at all
+function isConfigSourceValueUndefined(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === undefined;
+}
+// Setting a config to `null` enables the user to suppress inherited config by overriding it with `null` (this only works when setting the config value to `null` inside a +config.js file — it doesn't work when setting the config value to `null` with a +{configName}.js file).
+function isConfigSourceValueNull(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === null;
+}
+function applyFilenameSuffix(sourcesRelevant) {
+    const getFileName = (source) => source.plusFile?.filePath.fileName ?? '';
+    // Apply `clear`: truncate at first clear file
+    const clearIndex = sourcesRelevant.findIndex((source) => getFileName(source).includes('.clear.'));
+    if (clearIndex !== -1)
+        sourcesRelevant = sourcesRelevant.slice(0, clearIndex + 1);
+    // Apply `default`: exclude defaults if any non-defaults exist, otherwise keep only first default
+    const nonDefaults = sourcesRelevant.filter((source) => !getFileName(source).includes('.default.'));
+    return nonDefaults.length > 0 ? nonDefaults : sourcesRelevant.slice(0, 1);
 }

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;