vike 0.4.259 → 0.4.260

package/dist/node/api/types.d.ts

@@ -1,4 +1,5 @@
 export type { ApiOptions };
+export type { ApiOptionsStartupLog };
 export type { ApiOperation };
 import type { InlineConfig } from 'vite';
 import type { Config } from '../../types/Config.js';
@@ -16,4 +17,12 @@ type ApiOptions = {
      */
     vikeConfig?: Config;
 };
+type ApiOptionsStartupLog = {
+    /**
+     * Whether to print Vike's startup log.
+     *
+     * https://vike.dev/api
+     */
+    startupLog?: boolean;
+};
 type ApiOperation = 'build' | 'dev' | 'preview' | 'prerender';

package/dist/node/cli/entry.js

@@ -46,11 +46,7 @@ async function cmdBuild() {
 }
 async function cmdPreview() {
     try {
-        const { viteServer } = await preview();
-        if (viteServer) {
-            viteServer.printUrls();
-            viteServer.bindCLIShortcuts({ print: true });
-        }
+        await preview({ startupLog: true });
     }
     catch (err) {
         console.error(pc.red(`Error while starting preview server:`));

package/dist/node/cli/parseCli.js

@@ -29,28 +29,41 @@ function getCommand() {
 function getCliOptions() {
     let cliOptions = {};
     let configNameCurrent;
-    const commitIfDefinedWithoutValue = () => {
+    const addConfig = (configValue) => {
+        assert(configNameCurrent);
+        cliOptions[configNameCurrent] = configValue;
+        configNameCurrent = undefined;
+    };
+    const addConfigWithoutValue = () => {
         if (configNameCurrent)
-            commit(true);
+            addConfig(true);
     };
-    const commit = (val) => {
+    const addConfigWithValue = (configValueStr) => {
         assert(configNameCurrent);
-        cliOptions[configNameCurrent] = val;
-        configNameCurrent = undefined;
+        addConfig(parseJson5(configValueStr, `CLI option --${configNameCurrent}`));
     };
     for (const arg of process.argv.slice(3)) {
         showHelpOrVersion(arg);
         if (arg.startsWith('--')) {
-            commitIfDefinedWithoutValue();
-            configNameCurrent = arg.slice('--'.length);
+            addConfigWithoutValue();
+            const str = arg.slice('--'.length);
+            const eqIdx = str.indexOf('=');
+            if (eqIdx === -1) {
+                configNameCurrent = str;
+            }
+            else {
+                configNameCurrent = str.slice(0, eqIdx);
+                const configValueStr = str.slice(eqIdx + 1);
+                addConfigWithValue(configValueStr);
+            }
         }
         else {
             if (!configNameCurrent)
                 wrongUsage(`Unknown option ${pc.bold(arg)}`);
-            commit(parseJson5(arg, `CLI option --${configNameCurrent}`));
+            addConfigWithValue(arg);
         }
     }
-    commitIfDefinedWithoutValue();
+    addConfigWithoutValue();
     return cliOptions;
 }
 function showHelp() {
@@ -65,9 +78,10 @@ function showHelp() {
         'Common CLI options:',
         [
             `vike dev ${pc.cyan('--host')}          ${TAB}${pc.dim('# Make server available over LAN and public addresses')}`,
-            `vike dev ${pc.cyan('--port')} 80       ${TAB}${pc.dim('# Change the server port')}`,
-            `vike build ${pc.cyan('--mode')} staging${TAB}${pc.dim('# Set the mode to run in')}`,
+            `vike dev ${pc.cyan('--port')} 80       ${TAB}${pc.dim('# Set server port')}`,
+            `vike dev ${pc.cyan('--root')} src      ${TAB}${pc.dim('# Set project root directory')}`,
             `vike dev ${pc.cyan('--force')}         ${TAB}${pc.dim("# Disable Vite's cache")}`,
+            `vike build ${pc.cyan('--mode')} staging${TAB}${pc.dim('# Set mode (e.g. development, production, staging)')}`,
         ]
             .map((o) => `  ${pc.dim('$')} ${o}`)
             .join('\n'),

package/dist/node/createDevMiddleware.js

@@ -18,8 +18,8 @@ async function createDevMiddleware(options = {}) {
             },
         },
     };
-    const { viteConfigFromUserResolved } = await prepareViteApiCall(optionsMod, 'dev');
-    const server = await createServer(viteConfigFromUserResolved);
+    const { viteConfigUser } = await prepareViteApiCall(optionsMod, 'dev');
+    const server = await createServer(viteConfigUser);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };
 }

package/dist/node/prerender/runPrerender.d.ts

@@ -72,7 +72,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     isPrerendering: boolean;
     _requestId: number;
 } & import("../../types/PageContext.js").PageContextInit & {
-    _reqDev?: import("http").IncomingMessage;
+    _nodeDev?: {
+        req: import("http").IncomingMessage;
+        res: import("http").ServerResponse;
+    };
     _reqWeb?: Request;
 } & {
     _globalContext: ({
@@ -148,7 +151,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: import("../../types/PageContext.js").PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         headers?: Record<string, unknown>;

package/dist/node/prerender/runPrerender.js

@@ -20,6 +20,7 @@ import { pLimit } from '../../utils/pLimit.js';
 import { preservePropertyGetters } from '../../utils/preservePropertyGetters.js';
 import { assertPosixPath } from '../../utils/path.js';
 import { urlToFile } from '../../utils/urlToFile.js';
+import { prependBase } from '../../utils/parseUrl-extras.js';
 import { prerenderPage } from '../../server/runtime/renderPageServer/renderPageServerAfterRoute.js';
 import { createPageContextServer } from '../../server/runtime/renderPageServer/createPageContextServer.js';
 import pc from '@brillout/picocolors';
@@ -731,7 +732,8 @@ async function prerenderRedirects(globalContext, onComplete, showWarningUponDyna
     const redirectsStatic = getStaticRedirectsForPrerender(redirects, showWarningUponDynamicRedirects);
     for (const [urlSource, urlTarget] of Object.entries(redirectsStatic)) {
         const urlOriginal = urlSource;
-        const htmlString = getRedirectHtml(urlTarget);
+        const urlTargetWithBase = urlTarget.startsWith('/') ? prependBase(urlTarget, globalContext.baseServer) : urlTarget;
+        const htmlString = getRedirectHtml(urlTargetWithBase);
         await onComplete({
             pageContext: { urlOriginal, pageId: null, is404: false, isRedirect: true },
             htmlString,

package/dist/node/prerender/runPrerenderEntry.js

@@ -19,8 +19,8 @@ async function runPrerenderFromAPI(options = {}) {
 }
 async function runPrerenderFromCLIPrerenderCommand() {
     try {
-        const { viteConfigFromUserResolved } = await prepareViteApiCall({}, 'prerender');
-        await runPrerender({ viteConfig: viteConfigFromUserResolved }, '$ vike prerender');
+        const { viteConfigUser } = await prepareViteApiCall({}, 'prerender');
+        await runPrerender({ viteConfig: viteConfigUser }, '$ vike prerender');
     }
     catch (err) {
         // Error may come from user-land

package/dist/node/vite/index.js

@@ -37,7 +37,7 @@ import { pluginReplaceConstantsNonRunnableDev } from './plugins/non-runnable-dev
 import { isVikeCliOrApi } from '../../shared-server-node/api-context.js';
 import { pluginViteConfigVikeExtensions } from './plugins/pluginViteConfigVikeExtensions.js';
 import { pluginStripPointerImportAttribute } from './plugins/pluginStripPointerImportAttribute.js';
-import { getVikeConfigInternalEarly, isOnlyResolvingUserConfig } from '../api/resolveViteConfigFromUser.js';
+import { getVikeConfigInternalEarly, isResolvingViteConfigUser } from '../api/resolveViteConfigUser.js';
 import './assertEnvVite.js';
 import { isStorybook } from '../../utils/isStorybook.js';
 import { pluginUniversalDeploy } from './plugins/pluginUniversalDeploy.js';
@@ -96,7 +96,7 @@ function pluginNonRunnabeDev() {
 }
 function removeVitePlugin() {
     // Early resolving of user Vite configs
-    if (isOnlyResolvingUserConfig()) {
+    if (isResolvingViteConfigUser()) {
         return true;
     }
     // *****************/

package/dist/node/vite/plugins/build/handleAssetsManifest.d.ts

@@ -4,18 +4,14 @@ export { handleAssetsManifest_isFixEnabled };
 export { handleAssetsManifest_assertUsageCssCodeSplit };
 export { handleAssetsManifest_assertUsageCssTarget };
 export { handleAssetsManifest_alignCssTarget };
-import type { Environment, ResolvedConfig, Rollup } from 'vite';
+import type { Environment, ResolvedConfig, Rollup, UserConfig } from 'vite';
 import '../../assertEnvVite.js';
 type Bundle = Rollup.OutputBundle;
 declare function handleAssetsManifest_isFixEnabled(): boolean;
 declare function handleAssetsManifest_assertUsageCssCodeSplit(config: ResolvedConfig): void;
 declare function handleAssetsManifest_alignCssTarget(config: ResolvedConfig): void;
 declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfig, env: Environment): void;
-declare function handleAssetsManifest_getBuildConfig(): Promise<{
-    readonly ssrEmitAssets: true | undefined;
-    readonly cssMinify: "esbuild" | undefined;
-    readonly manifest: true;
-}>;
+declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promise<import("vite").BuildEnvironmentOptions>;
 declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment, options: {
     dir: string | undefined;
 }, bundle: Bundle): Promise<void>;

package/dist/node/vite/plugins/build/handleAssetsManifest.js

@@ -16,6 +16,7 @@ import { pLimit } from '../../../../utils/pLimit.js';
 import { unique } from '../../../../utils/unique.js';
 import { parseVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
+import { isVite8OrAbove } from '../../shared/isVite8OrAbove.js';
 import pc from '@brillout/picocolors';
 import { isV1Design } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
@@ -297,18 +298,24 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await fs.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
-async function handleAssetsManifest_getBuildConfig() {
+async function handleAssetsManifest_getBuildConfig(config) {
     const isFixEnabled = handleAssetsManifest_isFixEnabled();
-    return {
+    // Set default values (i.e. allow user to override these values)
+    const build = {};
+    if (isFixEnabled) {
         // https://github.com/vikejs/vike/issues/1339
-        ssrEmitAssets: isFixEnabled ? true : undefined,
+        if (config.build?.ssrEmitAssets === undefined)
+            build.ssrEmitAssets = true;
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-        cssMinify: isFixEnabled ? 'esbuild' : undefined,
-        manifest: true,
-        /* Already set by vike:build:pluginBuildApp
-        copyPublicDir: !isViteServerSide_viteEnvOptional(config),
-        */
-    };
+        if (config.build?.cssMinify === undefined)
+            build.cssMinify = isVite8OrAbove(config) ? true : 'esbuild';
+    }
+    if (config.build?.manifest === undefined)
+        build.manifest = true;
+    /* Already set by vike:build:pluginBuildApp
+    if (config.build?.copyPublicDir === undefined) build.copyPublicDir = !isViteServerSide_viteEnvOptional(config)
+    */
+    return build;
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
     const isSsrEnv = isViteServerSide_onlySsrEnv(config, viteEnv);

package/dist/node/vite/plugins/build/pluginBuildApp.js

@@ -5,7 +5,7 @@ import { assert, assertWarning } from '../../../../utils/assert.js';
 import { onSetupBuild } from '../../../../utils/assertSetup.js';
 import { getGlobalObject } from '../../../../utils/getGlobalObject.js';
 import { isPrerenderAutoRunEnabled, wasPrerenderRun } from '../../../prerender/context.js';
-import { isViteCli, getViteConfigForBuildFromCli } from '../../shared/isViteCli.js';
+import { isViteCli, getViteBuildCliArgs } from '../../shared/isViteCli.js';
 import pc from '@brillout/picocolors';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { isVikeCliOrApi } from '../../../../shared-server-node/api-context.js';
@@ -20,6 +20,7 @@ const globalObject = getGlobalObject('build/pluginBuildApp.ts', {
 });
 function pluginBuildApp() {
     let config;
+    let alreadyBuilt = false;
     return [
         {
             name: 'vike:build:pluginBuildApp:pre',
@@ -32,11 +33,15 @@ function pluginBuildApp() {
                         builder: {
                             // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
                             async buildApp(builder) {
+                                if (alreadyBuilt)
+                                    return;
+                                alreadyBuilt = true;
                                 assert(builder.environments.client);
                                 assert(builder.environments.ssr);
                                 await builder.build(builder.environments.client);
                                 await builder.build(builder.environments.ssr);
                                 if (isPrerenderForceExit()) {
+                                    await builder.buildApp();
                                     runPrerender_forceExit();
                                     assert(false);
                                 }
@@ -141,7 +146,7 @@ async function triggerPrerendering(config, viteEnv, bundle) {
 }
 async function abortViteBuildSsr() {
     const vikeConfig = await getVikeConfigInternal();
-    if (vikeConfig.config.disableAutoFullBuild !== true && isViteCli() && getViteConfigForBuildFromCli()?.build.ssr) {
+    if (vikeConfig.config.disableAutoFullBuild !== true && isViteCli() && getViteBuildCliArgs()?.build.ssr) {
         assertWarning(false, `The CLI call ${pc.cyan('$ vite build --ssr')} is superfluous since ${pc.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${pc.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
@@ -160,9 +165,9 @@ function isPrerenderForceExit() {
     return globalObject.forceExit;
 }
 function getFullBuildInlineConfig(config) {
-    const configFromCli = !isViteCli() ? null : getViteConfigForBuildFromCli();
-    if (config._viteConfigFromUserResolved) {
-        return config._viteConfigFromUserResolved;
+    const configFromCli = !isViteCli() ? null : getViteBuildCliArgs();
+    if (config._viteConfigUser) {
+        return config._viteConfigUser;
     }
     else {
         return {

package/dist/node/vite/plugins/build/pluginBuildConfig.d.ts

@@ -3,11 +3,16 @@ export { assertRollupInput };
 export { analyzeClientEntries };
 import type { ResolvedConfig, Plugin } from 'vite';
 import type { PageConfigBuildTime } from '../../../../types/PageConfig.js';
+import type { FilePath } from '../../../../types/FilePath.js';
 import '../../assertEnvVite.js';
 declare function pluginBuildConfig(): Plugin[];
+type ClientEntry = {
+    entryTarget: string;
+    entryFilePath: null | FilePath;
+};
 declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
     hasClientRouting: boolean;
     hasServerRouting: boolean;
-    clientEntries: Record<string, string>;
+    clientEntries: Record<string, ClientEntry>;
 };
 declare function assertRollupInput(config: ResolvedConfig): void;

package/dist/node/vite/plugins/build/pluginBuildConfig.js

@@ -8,12 +8,13 @@ import { assertImportIsNpmPackage } from '../../../../utils/parseNpmPackage.js';
 import { removeFileExtension } from '../../../../utils/removeFileExtension.js';
 import { requireResolveDistFile } from '../../../../utils/requireResolve.js';
 import { unique } from '../../../../utils/unique.js';
+import { objectMap } from '../../../../utils/objectMap.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { generateVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 import { extractAssetsAddQuery } from '../../../../shared-server-node/extractAssetsQuery.js';
 import { prependEntriesDir } from '../../../../shared-server-node/prependEntriesDir.js';
-import { getFilePathResolved } from '../../shared/getFilePath.js';
+import { getFilePathResolved, getFilePathUnresolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared-server-client/page-configs/getConfigValueBuildTime.js';
 import { isViteServerSide_viteEnvOptional } from '../../shared/isViteServerSide.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, handleAssetsManifest_alignCssTarget, } from './handleAssetsManifest.js';
@@ -40,9 +41,9 @@ function pluginBuildConfig() {
             },
             config: {
                 order: 'post',
-                async handler() {
+                async handler(config) {
                     onSetupBuild();
-                    const build = await handleAssetsManifest_getBuildConfig();
+                    const build = await handleAssetsManifest_getBuildConfig(config);
                     return { build };
                 },
             },
@@ -76,7 +77,7 @@ async function getEntries(config) {
             hasServerRouting = true;
         }
         const entries = {
-            ...clientEntries,
+            ...objectMap(clientEntries, (clientEntry) => clientEntry.entryTarget),
             ...pageFileEntries,
         };
         const clientRoutingEntry = requireResolveDistFile('dist/client/runtime-client-routing/entry.js');
@@ -113,8 +114,8 @@ function analyzeClientEntries(pageConfigs, config) {
         }
         {
             // Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
-            const { entryName, entryTarget } = getEntryFromPageConfig(pageConfig, true);
-            clientEntries[entryName] = entryTarget;
+            const { entryName, entryTarget, entryFilePath } = getEntryFromPageConfig(pageConfig, true);
+            clientEntries[entryName] = { entryTarget, entryFilePath };
         }
         {
             const clientEntry = getConfigValueBuildTime(pageConfig, 'client', 'string')?.value ?? null;
@@ -125,8 +126,8 @@ function analyzeClientEntries(pageConfigs, config) {
     });
     clientEntryList = unique(clientEntryList);
     clientEntryList.forEach((clientEntry) => {
-        const { entryName, entryTarget } = getEntryFromClientEntry(clientEntry, config);
-        clientEntries[entryName] = entryTarget;
+        const { entryName, entryTarget, entryFilePath } = getEntryFromClientEntry(clientEntry, config);
+        clientEntries[entryName] = { entryTarget, entryFilePath };
     });
     return { hasClientRouting, hasServerRouting, clientEntries };
 }
@@ -157,7 +158,8 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
         assertImportIsNpmPackage(clientEntry);
         const entryTarget = clientEntry;
         const entryName = prependEntriesDir(clientEntry);
-        return { entryName, entryTarget };
+        const entryFilePath = getFilePathUnresolved({ importPathAbsolute: clientEntry });
+        return { entryName, entryTarget, entryFilePath };
     }
     const filePathAbsoluteUserRootDir = clientEntry;
     assert(filePathAbsoluteUserRootDir.startsWith('/'));
@@ -173,7 +175,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
         entryName = extractAssetsAddQuery(entryName);
     entryName = removeFileExtension(entryName);
     entryName = prependEntriesDir(entryName);
-    return { entryName, entryTarget };
+    return { entryName, entryTarget, entryFilePath: filePath };
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
@@ -188,7 +190,7 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
         entryName = 'root';
     entryName = prependEntriesDir(entryName);
     assert(!entryName.endsWith('/'));
-    return { entryName, entryTarget };
+    return { entryName, entryTarget, entryFilePath: null };
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

package/dist/node/vite/plugins/build/pluginDistFileNames.js

@@ -11,7 +11,7 @@ import crypto from 'node:crypto';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import { assertModuleId, getFilePathToShowToUserModule } from '../../shared/getFilePath.js';
 import '../../assertEnvVite.js';
-import { isVersionMatch } from '../../../../utils/assertVersion.js';
+import { isVite8OrAbove } from '../../shared/isVite8OrAbove.js';
 function pluginDistFileNames() {
     return [
         {
@@ -291,11 +291,6 @@ function getCssChunkName(id, config) {
         return `${name}-${hash}`;
     }
 }
-function isVite8OrAbove(config) {
-    const viteVersion = config._viteVersionResolved;
-    assert(viteVersion);
-    return isVersionMatch(viteVersion, ['8.0.0']);
-}
 function getRollupOutputs(config) {
     var _a, _b;
     // @ts-expect-error is read-only

package/dist/node/vite/plugins/build/pluginModuleBanner.js

@@ -1,8 +1,8 @@
 export { pluginModuleBanner };
 import { assert } from '../../../../utils/assert.js';
-import { isVersionMatch } from '../../../../utils/assertVersion.js';
 import { removeVirtualFileIdPrefix } from '../../../../utils/virtualFileId.js';
 import { getMagicString } from '../../shared/getMagicString.js';
+import { isVite8OrAbove } from '../../shared/isVite8OrAbove.js';
 import '../../assertEnvVite.js';
 // Misusing legal comments so that esbuild doesn't remove them.
 // - Legal comments: https://esbuild.github.io/api/#legal-comments
@@ -68,7 +68,5 @@ function checkIsEnabled(config) {
 // - https://github.com/vitejs/vite/issues/21228#issuecomment-3627899741
 // - TO-DO/eventually: remove this file once Vike requires Vite 8 or above
 function hasNativeModuleRegions(config) {
-    const viteVersion = config._viteVersionResolved;
-    assert(viteVersion);
-    return isVersionMatch(viteVersion, ['8.0.0']);
+    return isVite8OrAbove(config);
 }

package/dist/node/vite/plugins/pluginCommon.d.ts

@@ -8,7 +8,7 @@ declare module 'vite' {
         _isDev?: boolean;
         _rootResolvedEarly?: string;
         _baseViteOriginal?: string;
-        _viteConfigFromUserResolved?: InlineConfig;
+        _viteConfigUser?: InlineConfig;
         _viteVersionResolved?: string;
     }
 }

package/dist/node/vite/plugins/pluginCommon.js

@@ -9,7 +9,7 @@ import { assertRollupInput } from './build/pluginBuildConfig.js';
 import pc from '@brillout/picocolors';
 import { assertResolveAlias } from './pluginCommon/assertResolveAlias.js';
 import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVikeConfigInternal.js';
-import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/resolveViteConfigFromUser.js';
+import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/resolveViteConfigUser.js';
 import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
 import { version as viteVersionVike } from 'vite';
 import '../assertEnvVite.js';
@@ -79,26 +79,29 @@ function pluginCommon(vikeVitePluginOptions) {
             config: {
                 order: 'post',
                 async handler(configFromUser) {
-                    let configFromVike = { server: {}, preview: {} };
+                    const configFromVike = { server: {}, preview: {} };
                     const vikeConfig = await getVikeConfigInternal();
+                    // A value the user set through Vike (+config.js, CLI option, or VIKE_CONFIG) overrides vite.config.js:
+                    // Vike's config has higher precedence than vite.config.js (see precedence list at resolveViteConfigUser.ts).
+                    // Vike's own fallbacks (default port, Docker `--host`) use setDefault() so they don't override vite.config.js.
                     if (vikeConfig.config.port !== undefined) {
                         // https://vike.dev/port
-                        setDefault('port', vikeConfig.config.port, configFromUser, configFromVike);
+                        setOverride('port', vikeConfig.config.port, configFromVike);
                     }
                     else {
                         // Change Vite's default port
                         setDefault('port', 3000, configFromUser, configFromVike);
                     }
-                    if (vikeConfig.config.host) {
+                    if (vikeConfig.config.host !== undefined) {
                         // https://vike.dev/host
-                        setDefault('host', vikeConfig.config.host, configFromUser, configFromVike);
+                        setOverride('host', vikeConfig.config.host, configFromVike);
                     }
                     else if (isDocker()) {
                         // Set `--host` for Docker/Podman
                         setDefault('host', true, configFromUser, configFromVike);
                     }
                     // https://vike.dev/force
-                    if (vikeConfig.config.force !== undefined && configFromUser.optimizeDeps?.force === undefined) {
+                    if (vikeConfig.config.force !== undefined) {
                         configFromVike.optimizeDeps ?? (configFromVike.optimizeDeps = {});
                         configFromVike.optimizeDeps.force = vikeConfig.config.force;
                     }
@@ -108,7 +111,12 @@ function pluginCommon(vikeVitePluginOptions) {
         },
     ];
 }
-// Override Vite's default value without overriding user settings
+// Apply a Vike-provided value, overriding vite.config.js (Vike's config has higher precedence than vite.config.js)
+function setOverride(setting, value, configFromVike) {
+    configFromVike.server[setting] = value;
+    configFromVike.preview[setting] = value;
+}
+// Apply a Vike fallback without overriding the user's vite.config.js
 function setDefault(setting, value, configFromUser, configFromVike) {
     if (configFromUser.server?.[setting] === undefined)
         configFromVike.server[setting] = value;