vike 0.4.267 → 0.4.268-commit-ca58695

package/dist/node/vite/shared/isViteCli.js

@@ -1,7 +1,8 @@
 export { isViteCli };
 export { getViteCliArgs };
-export { getViteBuildCliArgs };
+export { getViteCliArgsMinimal };
 export { getViteCliCommand };
+// Copied from Vite's CLI
 import { assert } from '../../../utils/assert.js';
 import { isObject } from '../../../utils/isObject.js';
 import { isToolCli } from '../../../utils/isToolCli.js';
@@ -11,48 +12,23 @@ const desc = 'vike:vite-cli-simulation';
 function isViteCli() {
     return isToolCli('vite');
 }
-function getViteCliCommand() {
-    if (!isViteCli())
-        return null;
-    let command;
-    const setCommand = (cmd) => {
-        assert(command === undefined);
-        command = cmd;
+function parseViteCli() {
+    let viteCli;
+    const onCommand = (command) => (root, options) => {
+        assert(viteCli === undefined);
+        assert(root === undefined || typeof root === 'string');
+        assert(isObject(options));
+        // Same as Vite: duplicated options => the last value wins
+        for (const [key, value] of Object.entries(options)) {
+            if (Array.isArray(value))
+                options[key] = value[value.length - 1];
+        }
+        assert(options.config === undefined || typeof options.config === 'string');
+        viteCli = { command, root, options };
     };
-    // Copied & adapted from Vite
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L186-L188
-    const cli = cac(desc);
-    // dev
-    cli
-        .command('[root]', desc)
-        .alias('serve')
-        .alias('dev')
-        .action(() => {
-        setCommand('dev');
-    });
-    // build
-    cli.command('build [root]', desc).action(() => {
-        setCommand('build');
-    });
-    // optimize
-    cli.command('optimize [root]', desc).action(() => {
-        setCommand('optimize');
-    });
-    // preview
-    cli.command('preview [root]', desc).action(() => {
-        setCommand('preview');
-    });
-    cli.parse();
-    assert(command);
-    return command;
-}
-function getViteBuildCliArgs() {
-    if (!isViteCli())
-        return null;
-    // Copied & adapted from Vite
+    // We need to declare all Vite's options, otherwise cac consumes the next argument as the value of boolean options (e.g. `vite build --emptyOutDir some-root`).
     const cli = cac(desc);
     // Common configs
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L169-L182
     cli
         .option('-c, --config <file>', desc)
         .option('--base <path>', desc)
@@ -62,8 +38,22 @@ function getViteBuildCliArgs() {
         .option('-d, --debug [feat]', desc)
         .option('-f, --filter <filter>', desc)
         .option('-m, --mode <mode>', desc);
-    // Build configs
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L286-L322
+    // dev
+    cli
+        .command('[root]', desc)
+        .alias('serve')
+        .alias('dev')
+        .option('--host [host]', desc)
+        .option('--port <port>', desc)
+        .option('--open [path]', desc)
+        .option('--cors', desc)
+        .option('--strictPort', desc)
+        .option('--force', desc)
+        .option('--experimentalBundle', desc)
+        // Options that this copy doesn't declare (e.g. added by newer Vite versions) are still validated by Vite's own CLI, which throws `Unknown option` for options Vite doesn't know
+        .allowUnknownOptions()
+        .action(onCommand('dev'));
+    // build
     cli
         .command('build [root]', desc)
         .option('--target <target>', desc)
@@ -71,35 +61,61 @@ function getViteBuildCliArgs() {
         .option('--assetsDir <dir>', desc)
         .option('--assetsInlineLimit <number>', desc)
         .option('--ssr [entry]', desc)
-        .option('--sourcemap', desc)
+        .option('--sourcemap [output]', desc)
         .option('--minify [minifier]', desc)
         .option('--manifest [name]', desc)
         .option('--ssrManifest [name]', desc)
         .option('--emptyOutDir', desc)
         .option('-w, --watch', desc)
         .option('--app', desc)
-        .action((root, options) => {
-        assert(isObject(options));
-        assert(root === undefined || typeof root === 'string');
-        assert(options.config === undefined || typeof options.config === 'string');
-        // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L331-L346
-        const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
-        configFromCli = {
-            root,
-            base: options.base,
-            mode: options.mode,
-            configFile: options.config,
-            configLoader: options.configLoader,
-            logLevel: options.logLevel,
-            clearScreen: options.clearScreen,
-            build: buildOptions,
-            ...(options.app ? { builder: {} } : {}),
-        };
-    });
-    let configFromCli = null;
+        .allowUnknownOptions()
+        .action(onCommand('build'));
+    // optimize
+    cli.command('optimize [root]', desc).option('--force', desc).allowUnknownOptions().action(onCommand('optimize'));
+    // preview
+    cli
+        .command('preview [root]', desc)
+        .option('--host [host]', desc)
+        .option('--port <port>', desc)
+        .option('--strictPort', desc)
+        .option('--open [path]', desc)
+        .option('--outDir <dir>', desc)
+        .allowUnknownOptions()
+        .action(onCommand('preview'));
     cli.parse();
-    return configFromCli;
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L99
+    assert(viteCli);
+    return viteCli;
+}
+function getViteCliCommand() {
+    if (!isViteCli())
+        return null;
+    return parseViteCli().command;
+}
+function getViteCliArgsMinimal() {
+    if (!isViteCli())
+        return null;
+    const { root, options } = parseViteCli();
+    return { root, configFile: options.config };
+}
+function getViteCliArgs() {
+    if (!isViteCli())
+        return null;
+    const { command, root, options } = parseViteCli();
+    if (command !== 'build')
+        return null;
+    // Like Vite: all options except the global ones go to `build`
+    const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
+    return {
+        root,
+        base: options.base,
+        mode: options.mode,
+        configFile: options.config,
+        configLoader: options.configLoader,
+        logLevel: options.logLevel,
+        clearScreen: options.clearScreen,
+        build: buildOptions,
+        ...(options.app ? { builder: {} } : {}),
+    };
     function cleanGlobalCLIOptions(options) {
         const ret = { ...options };
         delete ret['--'];
@@ -129,29 +145,9 @@ function getViteBuildCliArgs() {
         }
         return ret;
     }
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L141
     function cleanBuilderCLIOptions(options) {
         const ret = { ...options };
         delete ret.app;
         return ret;
     }
 }
-function getViteCliArgs() {
-    if (!isViteCli())
-        return null;
-    const cli = cac(desc);
-    cli.option('-c, --config <file>', desc);
-    let result = null;
-    const setResult = (root, options) => {
-        assert(root === undefined || typeof root === 'string');
-        assert(isObject(options));
-        assert(options.config === undefined || typeof options.config === 'string');
-        result = { root, configFile: options.config };
-    };
-    cli.command('[root]', desc).alias('serve').alias('dev').action(setResult);
-    cli.command('build [root]', desc).action(setResult);
-    cli.command('optimize [root]', desc).action(setResult);
-    cli.command('preview [root]', desc).action(setResult);
-    cli.parse();
-    return result;
-}

package/dist/node/vite/shared/isViteServerSide.js

@@ -4,8 +4,7 @@ export { isViteServerSide_onlySsrEnv };
 export { isViteServerSide_extraSafe };
 export { isViteServerSide_applyToEnvironment };
 export { isViteServerSide_configEnvironment };
-import { viteVersionMin } from '../../../utils/assertViteVersion.js';
-import { assert, assertUsage } from '../../../utils/assert.js';
+import { assert } from '../../../utils/assert.js';
 import '../assertEnvVite.js';
 function isViteServerSide_impl(configGlobal, viteEnv) {
     assert(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
@@ -60,11 +59,7 @@ function isViteServerSide_extraSafe(config, viteEnv, options) {
         optionsSsr: options?.ssr ?? null,
     };
     assert(options, debug);
-    /* TO-DO/eventually: use internal assert() instead of assertUsage() once we can use this.meta.viteVersion — see utils/assertViteVersion.ts
-    assert(typeof options.ssr === 'boolean', debug)
-    /*/
-    assertUsage(typeof options.ssr === 'boolean', `You're using an old Vite version — update Vite to ${viteVersionMin} or above.`);
-    //*/
+    assert(typeof options.ssr === 'boolean', debug);
     assert(options.ssr === isServerSide, debug);
     return isServerSide;
 }

package/dist/node/vite/shared/resolveVikeConfigInternal/metaBuiltIn.d.ts

@@ -56,11 +56,13 @@ type ConfigDefinition = {
     }) => boolean);
     /** Whether changes to the configuration should trigger a Vite restart. */
     vite?: boolean;
-    /** @experimental */
-    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed) => unknown;
-    /** @experimental */
+    /** @internal */
+    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed, isDev: boolean) => unknown;
+    /** @internal */
     _valueIsFilePath?: true;
-    /** @experimental */
+    /** @internal */
+    _valueNotLoadedAtRuntime?: true;
+    /** @internal */
     _userEffectDefinedAtFilePath?: DefinedAtFilePath;
     isDefinedByPeerDependency?: undefined;
 } | ConfigDefinitionDefinedByPeerDependency;

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

@@ -53,14 +53,15 @@ const metaBuiltIn = {
     route: {
         env: {
             server: true,
-            client: 'if-client-routing',
+            client: true,
+            clientRoutingOnly: true,
             // For vite-plugin-vercel
             config: true,
         },
         eager: true,
     },
     guard: {
-        env: { server: true, client: 'if-client-routing' },
+        env: { server: true, client: true, clientRoutingOnly: true },
     },
     data: {
         env: { server: true },
@@ -70,7 +71,7 @@ const metaBuiltIn = {
         cumulative: true,
     },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
-        env: { server: true, client: 'if-client-routing' },
+        env: { server: true, client: true, clientRoutingOnly: true },
         eager: true,
     },
     filesystemRoutingRoot: {
@@ -114,12 +115,13 @@ const metaBuiltIn = {
     hasServerOnlyHook: {
         env: { client: true },
         eager: true,
-        _computed: (pageConfig) => {
+        _computed: (pageConfig, isDev) => {
             const sources = ['data', 'onBeforeRender', 'onCreatePageContext', 'guard']
                 .map((hookName) => getConfigValueSourcesRelevant(hookName, {
-                isForClientSide: false,
+                environmentName: 'server',
                 // TO-DO/eventually/remove-server-router: let's eventually remove support for Server Routing
                 isClientRouting: true,
+                isDev,
             }, pageConfig))
                 .flat(1)
                 // Server-only
@@ -243,6 +245,15 @@ const metaBuiltIn = {
     server: {
         env: { server: true },
         global: true,
+        // virtual:vike:global-entry:server shouldn't import +server.js
+        // - Otherwise a +server.js calling `await getGlobalContext()` would wait for itself and hang indefinitely
+        _valueNotLoadedAtRuntime: true,
+    },
+    serverEntry: {
+        // The value is merely the file path of the server entry, which becomes dist/server/index.mjs — Vike never loads it as a config value
+        env: { config: true },
+        global: true,
+        _valueIsFilePath: true,
     },
     precompress: {
         env: { config: true },
@@ -253,7 +264,7 @@ const metaBuiltIn = {
         global: true,
     },
     onBeforeRoute: {
-        env: { server: true, client: 'if-client-routing' },
+        env: { server: true, client: true, clientRoutingOnly: true },
         eager: true,
         global: true,
     },

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

@@ -505,12 +505,19 @@ function getConfigExecutionErrorIntroMsg(err) {
     const errIntroMsg = execErrIntroMsg.get(err);
     return errIntroMsg ?? null;
 }
+const processId = crypto.randomUUID();
 function getTemporaryBuildFilePath(filePathAbsoluteFilesystem, code) {
     assertPosixPath(filePathAbsoluteFilesystem);
     const fileDir = path.posix.dirname(filePathAbsoluteFilesystem);
     const filename = path.posix.basename(filePathAbsoluteFilesystem);
-    // Using content hash in file path, so that the cache of dynamic `import()` behaves as we want.
-    const fileHash = crypto.createHash('md5').update(code).digest('hex').slice(0, 12);
+    const fileHash = crypto
+        .createHash('md5')
+        // Using content hash in file path, so that the cache of dynamic `import()` behaves as we want.
+        .update(code)
+        // Parallel processes shouldn't overwrite each other's temporary file
+        .update(processId)
+        .digest('hex')
+        .slice(0, 12);
     // Syntax with semicolon `build:${/*...*/}` doesn't work on Windows: https://github.com/vikejs/vike/issues/800#issuecomment-1517329455
     const filePathTmp = path.posix.join(fileDir, `${filename}.build-${fileHash}.mjs`);
     assert(isTemporaryBuildFile(filePathTmp));

package/dist/node/vite/shared/resolveVikeConfigInternal.d.ts

@@ -3,6 +3,7 @@ export type { VikeConfig };
 export { getVikeConfigInternal };
 export { getVikeConfigInternalOptional };
 export { setVikeConfigContext };
+export { setViteEnvironmentNames };
 export { isVikeConfigContextSet };
 export { reloadVikeConfig };
 export { isV1Design };
@@ -36,6 +37,7 @@ type VikeConfigInternal = GlobalConfigPublic & {
     _pageConfigGlobal: PageConfigGlobalBuildTime;
     _vikeConfigDependencies: Set<string>;
     _extensions: PlusFile[];
+    _additionalEnvironmentNames: string[];
     prerenderContext: PrerenderContext;
 };
 declare function reloadVikeConfig(): void;
@@ -53,6 +55,7 @@ type VikeConfig = Pick<VikeConfigInternal, 'config' | 'pages' | 'prerenderContex
     dangerouslyUseInternals: DangerouslyUseInternals<VikeConfigInternal>;
 };
 declare function setVikeConfigContext(vikeConfigCtx_: VikeConfigContext): void;
+declare function setViteEnvironmentNames(viteEnvironmentNames: string[]): Promise<void>;
 declare function isVikeConfigContextSet(): boolean;
 declare function getVikeConfigInternalOptional(): Promise<null | VikeConfigInternal>;
 declare function isV1Design(): boolean;
@@ -74,8 +77,9 @@ declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinition
         isGlobalLocation: boolean;
     }) => boolean);
     vite?: boolean;
-    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed) => unknown;
+    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed, isDev: boolean) => unknown;
     _valueIsFilePath?: true;
+    _valueNotLoadedAtRuntime?: true;
     _userEffectDefinedAtFilePath?: DefinedAtFilePath;
     isDefinedByPeerDependency?: undefined;
 } | null;

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

@@ -4,6 +4,7 @@ export { getVikeConfig };
 export { getVikeConfigInternal };
 export { getVikeConfigInternalOptional };
 export { setVikeConfigContext };
+export { setViteEnvironmentNames };
 export { isVikeConfigContextSet };
 export { reloadVikeConfig };
 export { isV1Design };
@@ -12,7 +13,6 @@ export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
 export { EARLY_SETTINGS };
 import { deepEqual } from '../../../utils/deepEqual.js';
-import { assertKeys } from '../../../utils/assertKeys.js';
 import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
 import { getMostSimilar } from '../../../utils/getMostSimilar.js';
 import { objectEntries } from '../../../utils/objectEntries.js';
@@ -23,6 +23,7 @@ import { checkType } from '../../../utils/checkType.js';
 import { genPromise } from '../../../utils/genPromise.js';
 import { getGlobalObject } from '../../../utils/getGlobalObject.js';
 import { hasProp } from '../../../utils/hasProp.js';
+import { includes } from '../../../utils/includes.js';
 import { isCallable } from '../../../utils/isCallable.js';
 import { isObject } from '../../../utils/isObject.js';
 import { joinEnglish } from '../../../utils/joinEnglish.js';
@@ -42,6 +43,7 @@ import { loadPointerImport, loadValueFile } from './resolveVikeConfigInternal/lo
 import { resolvePointerImport } from './resolveVikeConfigInternal/resolvePointerImport.js';
 import { parsePointerImportData } from './resolveVikeConfigInternal/pointerImports.js';
 import { getFilePathResolved } from './getFilePath.js';
+import { isEnvironmentBuiltIn, isEnvironmentNameValid } from '../../../shared-server-node/vike-environments.js';
 import { getConfigValueBuildTime } from '../../../shared-server-client/page-configs/getConfigValueBuildTime.js';
 import { resolveGlobalConfigPublic, } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import { getConfigValuesBase, isJsonValue, } from '../../../shared-server-client/page-configs/serialize/serializeConfigValues.js';
@@ -65,12 +67,13 @@ const globalObject = getGlobalObject('vite/shared/resolveVikeConfigInternal.ts',
     vikeConfigSync: null,
     vikeConfigCtx: null, // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
     prerenderContext: null,
+    viteEnvironmentNames: null,
 });
 function reloadVikeConfig() {
     assert(globalObject.vikeConfigCtx);
-    const { userRootDir, vikeVitePluginOptions } = globalObject.vikeConfigCtx;
+    const { userRootDir, isDev, vikeVitePluginOptions } = globalObject.vikeConfigCtx;
     assert(vikeVitePluginOptions);
-    resolveVikeConfigInternal_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
+    resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions);
 }
 async function getVikeConfigInternal(
 // I don't remember the logic behind it — neither why we restart Vite's dev server, nor why we sometimes don't.
@@ -110,6 +113,32 @@ function setVikeConfigContext(vikeConfigCtx_) {
     // If the user changes Vite's `config.root` => Vite completely reloads itself => setVikeConfigContext() is called again
     globalObject.vikeConfigCtx = vikeConfigCtx_;
 }
+// Vike's config is resolved before Vite's environments are known (Vike's config can modify Vite's config)
+async function setViteEnvironmentNames(viteEnvironmentNames) {
+    globalObject.viteEnvironmentNames = viteEnvironmentNames;
+    if (!globalObject.vikeConfigPromise)
+        return;
+    const vikeConfig = await globalObject.vikeConfigPromise;
+    // Resolve again: to report a missing environment like any other config error, or to recover from one (e.g. the user added the environment to Vite's config)
+    const isMissing = getAdditionalEnvironmentsMissing(vikeConfig._additionalEnvironmentNames).length > 0;
+    if (!isMissing && !globalObject.vikeConfigHasBuildError)
+        return;
+    reloadVikeConfig();
+    await globalObject.vikeConfigPromise;
+}
+function getAdditionalEnvironmentsMissing(additionalEnvironmentNames) {
+    const { viteEnvironmentNames } = globalObject;
+    if (!viteEnvironmentNames)
+        return [];
+    return additionalEnvironmentNames.filter((name) => !viteEnvironmentNames.includes(name));
+}
+function assertAdditionalEnvironmentsExist(additionalEnvironmentNames) {
+    const [name] = getAdditionalEnvironmentsMissing(additionalEnvironmentNames);
+    if (name === undefined)
+        return;
+    assert(globalObject.viteEnvironmentNames);
+    assertUsage(false, `The environment ${pc.cyan(JSON.stringify(name))} is used by ${pc.cyan('meta.env')} but it doesn't exist in Vite's ${pc.cyan('config.environments')} (${joinEnglish(globalObject.viteEnvironmentNames.map((n) => pc.cyan(n)), 'and')})`);
+}
 function isVikeConfigContextSet() {
     return !!globalObject.vikeConfigCtx;
 }
@@ -219,6 +248,8 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, vik
     const plusFilesByLocationId = await getPlusFiles(userRootDir, vikeTranspileCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesByLocationId, userRootDir, vikeTranspileCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesByLocationId, userRootDir);
+    const additionalEnvironmentNames = getAdditionalEnvironmentNames(getMetaEnvAll(configDefinitionsResolved, [pageConfigGlobal, ...pageConfigs]));
+    assertAdditionalEnvironmentsExist(additionalEnvironmentNames);
     if (!globalObject.isV1Design_)
         globalObject.isV1Design_ = pageConfigs.length > 0;
     // Backwards compatibility for vike(options) in vite.config.js
@@ -241,6 +272,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, vik
         _pageConfigGlobal: pageConfigGlobal,
         _vikeConfigDependencies: vikeTranspileCache.vikeConfigDependencies,
         _extensions,
+        _additionalEnvironmentNames: additionalEnvironmentNames,
     };
     globalObject.vikeConfigSync = vikeConfig;
     return vikeConfig;
@@ -330,6 +362,23 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesByLocationI
     assertPageConfigs(pageConfigs);
     return { pageConfigs, pageConfigGlobal };
 }
+// Get all the `meta.env` of all configs
+function getMetaEnvAll(configDefinitionsResolved, pageConfigs) {
+    const configDefinitionsAll = [
+        configDefinitionsResolved.configDefinitionsGlobal,
+        ...Object.values(configDefinitionsResolved.configDefinitionsLocal).map(({ configDefinitions }) => configDefinitions),
+    ];
+    return [
+        ...configDefinitionsAll.flatMap((configDefinitions) => Object.values(configDefinitions).map(({ env }) => env)),
+        ...pageConfigs.flatMap(({ configValueSources }) => Object.values(configValueSources).flatMap((sources) => sources.map(({ configEnv }) => configEnv))),
+    ];
+}
+function getAdditionalEnvironmentNames(configEnvs) {
+    const names = configEnvs.flatMap((configEnv) => Object.entries(configEnv)
+        .filter(([, value]) => value)
+        .map(([name]) => name));
+    return unique(names.filter(isAdditionalEnvironmentName));
+}
 function resolvePageConfigBuildTime(pageId, locationId, plusFilesRelevant, configDefinitionsLocal, plusFilesByLocationId, userRootDir) {
     const configValueSources = {};
     objectEntries(configDefinitionsLocal)
@@ -482,7 +531,7 @@ function assertOnBeforeRenderEnv(pageConfig) {
 function getConfigValues(pageConfig, isGlobalConfig) {
     const tolerateMissingValue = !isGlobalConfig;
     const configValues = {};
-    getConfigValuesBase(pageConfig, { isForConfig: true }, null).forEach((entry) => {
+    getConfigValuesBase(pageConfig, { isConfigEnvironment: true }, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
             assert('value' in entry); // Help TS
             const { configValueBase, value, configName } = entry;
@@ -1091,11 +1140,13 @@ function applyEffectMetaEnv(configModFromEffect, configValueSources, configDefEf
     });
 }
 function getComputed(pageConfig) {
+    assert(globalObject.vikeConfigCtx);
+    const { isDev } = globalObject.vikeConfigCtx;
     const configValuesComputed = {};
     objectEntries(pageConfig.configDefinitions).forEach(([configName, configDef]) => {
         if (!configDef._computed)
             return;
-        const value = configDef._computed(pageConfig);
+        const value = configDef._computed(pageConfig, isDev);
         if (value === undefined)
             return;
         configValuesComputed[configName] = {
@@ -1220,6 +1271,14 @@ function determineIsErrorPage(routeFilesystem) {
     assertPosixPath(routeFilesystem);
     return routeFilesystem.split('/').includes('_error');
 }
+// Keys of `meta.env` that only Vike sets
+const configEnvKeysInternal = ['clientRoutingOnly', 'eager'];
+// Keys of `meta.env` that can't be environment names
+// - Including file suffixes such as `.ssr.js`, `.shared.js`, `.clear.js`, `.default.js`
+const configEnvKeysReserved = ['ssr', 'shared', 'clear', 'default', ...configEnvKeysInternal];
+function isAdditionalEnvironmentName(configEnvKey) {
+    return (!isEnvironmentBuiltIn(configEnvKey) && !['config', 'production', ...configEnvKeysInternal].includes(configEnvKey));
+}
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${pc.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
@@ -1235,22 +1294,23 @@ function getConfigEnvValue(val, errMsgIntro) {
             if (val === 'config-only')
                 return { config: true };
             if (val === '_routing-lazy')
-                return { server: true, client: 'if-client-routing' };
+                return { server: true, client: true, clientRoutingOnly: true };
             if (val === '_routing-eager')
-                return { server: true, client: 'if-client-routing', eager: true };
+                return { server: true, client: true, clientRoutingOnly: true, eager: true };
             assertUsage(false, errInvalidValue);
         })();
         assertWarning(false, `${errMsgIntro} ${pc.cyan(val)} which is deprecated and will be removed in the next major release`, { onlyOnce: true });
         return valConverted;
     }
     assertUsage(isObject(val), `${errMsgIntro} an invalid type ${pc.cyan(typeof val)}`);
-    assertKeys(val, ['config', 'server', 'client'], `${errInvalidValue}:`);
-    assertUsage(hasProp(val, 'config', 'undefined') || hasProp(val, 'config', 'boolean'), errInvalidValue);
-    assertUsage(hasProp(val, 'server', 'undefined') || hasProp(val, 'server', 'boolean'), errInvalidValue);
-    assertUsage(hasProp(val, 'client', 'undefined') || hasProp(val, 'client', 'boolean'), errInvalidValue);
+    Object.entries(val).forEach(([key, value]) => {
+        assertUsage(!includes(configEnvKeysReserved, key), `${errInvalidValue}: ${pc.cyan(key)} can't be an environment name, because ${includes(configEnvKeysInternal, key) ? 'Vike uses it internally' : `it's a file suffix (${pc.cyan(`+Page.${key}.js`)})`}`);
+        assertUsage(isEnvironmentNameValid(key), `${errInvalidValue}: ${pc.cyan(key)} isn't a valid environment name`);
+        assertUsage(value === undefined || typeof value === 'boolean', errInvalidValue);
+    });
     /* To allow users to set an eager config:
      * - Uncomment line below.
-     * - Add 'eager' to assertKeys() call above.
+     * - Move 'eager' from configEnvKeysInternal to the keys that isAdditionalEnvironmentName() excludes.
      * - Add `eager: boolean` to ConfigEnv type.
     assertUsage(hasProp(val, 'eager', 'undefined') || hasProp(val, 'eager', 'boolean'), errInvalidValue)
     */
@@ -1279,11 +1339,21 @@ function resolveConfigEnv(configEnv, filePath) {
         else if (suffixes.includes('client')) {
             configEnvResolved.client = true;
             configEnvResolved.server = false;
+            // Additional environments (e.g. `rsc`) are server-side
+            Object.keys(configEnvResolved).forEach((key) => {
+                if (isAdditionalEnvironmentName(key))
+                    delete configEnvResolved[key];
+            });
         }
         else if (suffixes.includes('shared')) {
             configEnvResolved.server = true;
             configEnvResolved.client = true;
         }
+        else {
+            return configEnvResolved;
+        }
+        // The file suffix decides, regardless of Client Routing
+        delete configEnvResolved.clientRoutingOnly;
     }
     return configEnvResolved;
 }
@@ -1312,7 +1382,9 @@ async function resolvePrerenderContext(vikeConfig) {
 }
 function restartViteDevServer() {
     const viteDevServer = getViteDevServer();
-    assert(viteDevServer);
+    // setViteEnvironmentNames() can reload Vike's config while Vite resolves its config, before the dev server exists
+    if (!viteDevServer)
+        return;
     swallowViteLogForceOptimization_enable();
     (async () => {
         try {
@@ -1347,6 +1419,7 @@ async function getVikeConfigDummy(vikeTranspileCache) {
         prerenderContext: prerenderContextDummy,
         _vikeConfigDependencies: vikeTranspileCache.vikeConfigDependencies,
         _extensions: [],
+        _additionalEnvironmentNames: [],
     };
     globalObject.vikeConfigSync = vikeConfigDummy;
     globalObject.isV1Design_ = true;

package/dist/server/__internal/fetch-deprecated.d.ts

@@ -0,0 +1,2 @@
+export { default } from './fetch.js';
+import '../assertEnvServer.js';

package/dist/server/__internal/fetch-deprecated.js

@@ -0,0 +1,6 @@
+export { default } from './fetch.js';
+// TO-DO/next-major-release: remove this export (the entire file)
+import { assertWarning } from '../../utils/assert.js';
+import pc from '@brillout/picocolors';
+import '../assertEnvServer.js';
+assertWarning(false, `${pc.cyan("import vike from 'vike/fetch'")} is deprecated, see ${pc.underline('https://vike.dev/migration/vike-fetch')}`, { onlyOnce: true });

package/dist/server/__internal/fetch.d.ts

@@ -0,0 +1,9 @@
+import '../assertEnvServer.js';
+declare const _default: {
+    fetch: ((request: Request, context?: Universal.Context, runtime?: import("@universal-middleware/core").RuntimeAdapterTarget<unknown>) => Promise<Response>) & import("@universal-middleware/core").WithUniversalSymbols<{
+        readonly name: 'vike';
+        readonly method: ["GET", "POST", "PUT", "PATCH", "HEAD", "OPTIONS"];
+        readonly path: '/**';
+    }>;
+};
+export default _default;

package/dist/server/__internal/fetch.js

@@ -0,0 +1,5 @@
+import '../assertEnvServer.js';
+import { vikeUniversalMiddleware } from '../runtime/universal-middleware/vikeUniversalMiddleware.js';
+export default {
+    fetch: vikeUniversalMiddleware,
+};

package/dist/server/__internal/index.d.ts

@@ -1,9 +1,12 @@
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
+export { getMiddlewaresPipe_nonHandlers, getMiddlewaresPipe_handlers, } from '../runtime/universal-middleware/getMiddlewaresPipe.js';
+export { getPageContextJson };
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
 import { route as routeInternal, type PageRoutes } from '../../shared-server-client/route/index.js';
 import type { PageFile } from '../../shared-server-client/getPageFiles/getPageFileObject.js';
 import { PageConfigRuntime } from '../../types/PageConfig.js';
+import type { PageContextServer } from '../../types/PageContext.js';
 import '../assertEnvServer.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
@@ -19,3 +22,4 @@ declare function getPagesAndRoutes(): Promise<{
 declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
     pageContextAddendum: import("../../shared-server-client/route/index.js").PageContextAfterRoute;
 }>;
+declare function getPageContextJson(pageContext: PageContextServer): string | ReadableStream<Uint8Array<ArrayBufferLike>>;