vike 0.4.259-commit-286bd57 → 0.4.259-commit-9fc8a01

package/dist/node/api/resolveViteConfigUser.js

@@ -8,6 +8,7 @@ import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite';
 import { getVikeConfigInternal, getVikeConfigFromCliOrEnv, setVikeConfigContext, isVikeConfigContextSet, EARLY_SETTINGS, } from '../vite/shared/resolveVikeConfigInternal.js';
 import path from 'node:path';
 import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
+import { createDebug } from '../../utils/debug.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { pick } from '../../utils/pick.js';
 import { toPosixPath } from '../../utils/path.js';
@@ -17,6 +18,7 @@ import { getVikeApiOperation, isVikeCliOrApi } from '../../shared-server-node/ap
 import { getViteCliCommand, getViteCliArgs } from '../vite/shared/isViteCli.js';
 import './assertEnvApiDevAndProd.js';
 const globalObject = getGlobalObject('resolveViteConfigUser.ts', {});
+const debug = createDebug('vike:vite-config-user');
 async function resolveViteConfigUser() {
     const { viteContext } = getVikeApiContext();
     assert(viteContext);
@@ -73,22 +75,32 @@ async function resolve(viteContext) {
         const { viteConfigFromVikeApi, vikeConfigFromApi } = getVikeApiContext();
         addConfig(viteConfigFromVikeApi); // `viteConfig`
         addConfig(pick(vikeConfigFromApi ?? {}, EARLY_SETTINGS)); // `+mode` & `+root`
+        if (debug.isActivated)
+            debug('viteConfigFromVikeApi', viteConfigFromVikeApi);
+        if (debug.isActivated)
+            debug('vikeConfigFromApi', vikeConfigFromApi);
     }
     // Vite CLI args (when invoked via Vite's CLI rather than Vike's API).
     // - Without this, Vike loads vite.config.js blind to `vite [root]` / `-c <file>` and ends up with the wrong root when those Vite CLI args are used.
     {
         const viteConfigFromViteCli = getViteCliArgs();
         addConfig(viteConfigFromViteCli);
+        if (debug.isActivated)
+            debug('viteConfigFromViteCli', viteConfigFromViteCli);
     }
     // Vike's CLI and VIKE_CONFIG — `+mode` & `+root`
     {
         const viteConfigFromVikeCliOrEnv = pick(getVikeConfigFromCliOrEnv().vikeConfigFromCliOrEnv, EARLY_SETTINGS);
         addConfig(viteConfigFromVikeCliOrEnv);
+        if (debug.isActivated)
+            debug('viteConfigFromVikeCliOrEnv', viteConfigFromVikeCliOrEnv);
     }
     // VITE_CONFIG
     {
         const viteConfigFromViteEnv = getEnvVarObject('VITE_CONFIG');
         addConfig(viteConfigFromViteEnv);
+        if (debug.isActivated)
+            debug('viteConfigFromViteEnv', viteConfigFromViteEnv);
     }
     // vite.config.js — lowest precedence. Merged into a *separate* result (used only to compute `root` and to
     // find the Vike plugin): it must not flow back into `viteConfigUser`, which is handed to Vite —
@@ -126,6 +138,8 @@ async function resolve(viteContext) {
         vikeVitePluginOptions = res.vikeVitePluginOptions;
     }
     assert(vikeVitePluginOptions);
+    if (debug.isActivated)
+        debug('viteConfigUser', viteConfigUser);
     return { viteConfigUser, root, vikeVitePluginOptions };
 }
 function findVikeVitePlugin(viteConfig) {

package/dist/node/vite/plugins/pluginCommon.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;

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-286bd57";
+export declare const PROJECT_VERSION: "0.4.259-commit-9fc8a01";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.259-commit-286bd57';
+export const PROJECT_VERSION = '0.4.259-commit-9fc8a01';

package/dist/utils/debug.d.ts

@@ -2,7 +2,7 @@ export { createDebug };
 export { isDebug };
 export { isDebugError };
 export { debug };
-declare const flags: ["vike", "vike:config", "vike:crawl", "vike:file-change", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:requireResolve", "vike:routing", "vike:setup", "vike:staticReplace", "vike:stream", "vike:virtualFiles", "vike:vite-rpc"];
+declare const flags: ["vike", "vike:config", "vike:crawl", "vike:file-change", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:requireResolve", "vike:routing", "vike:setup", "vike:staticReplace", "vike:stream", "vike:virtualFiles", "vike:vite-config-user", "vike:vite-rpc"];
 type Flag = (typeof flags)[number];
 type Options = {
     serialization?: {

package/dist/utils/debug.js

@@ -31,6 +31,7 @@ const flags = [
     'vike:staticReplace',
     'vike:stream',
     'vike:virtualFiles',
+    'vike:vite-config-user',
     'vike:vite-rpc',
 ];
 const flagsSkipWildcard = ['vike:log'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-286bd57",
+  "version": "0.4.259-commit-9fc8a01",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {