vike 0.4.259-commit-a909f04 → 0.4.259-commit-dcc116b

package/dist/node/api/resolveViteConfigFromUser.js

@@ -5,7 +5,7 @@ export { getViteRoot };
 export { assertViteRoot };
 export { normalizeViteRoot };
 import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite';
-import { getVikeConfigInternal, getVikeConfigFromCliOrEnv, setVikeConfigContext, isVikeConfigContextSet, } from '../vite/shared/resolveVikeConfigInternal.js';
+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 { getGlobalObject } from '../../utils/getGlobalObject.js';
@@ -53,34 +53,38 @@ async function getViteRoot(viteContext) {
     assert(globalObject.root);
     return globalObject.root;
 }
+// TODO rename to resolveViteConfig
+// TODO rename_all viteConfigFromUser viteConfigFrom
+// TODO rename_all vikeConfigFromUser vikeConfigFrom
 async function getViteInfo(viteContext) {
-    const { viteConfigFromUserVikeApiOptions } = getVikeApiContext();
-    let viteConfigFromUserResolved = clone(viteConfigFromUserVikeApiOptions ?? {});
     // Precedence:
     // 1. (highest precedence)  |  viteConfigFromUserEnvVar          |  VITE_CONFIG
-    // 2.                       |  viteConfigFromUserVikeSettings    |  VIKE_CONFIG & Vike CLI options — only `+mode` & `+root`
+    // 2.                       |  viteConfigFromVikeCliOrEnv        |  VIKE_CONFIG & Vike CLI options — `+mode` & `+root`
     // 3.                       |  viteConfigFromUserViteCli         |  Vite CLI args — `[root]` & `-c/--config`
-    // 4.                       |  viteConfigFromUserVikeApiOptions  |  Vike API options
+    // 4.                       |  viteConfigFromUserVikeApiOptions  |  Vike API options — `viteConfig`, and `+mode` & `+root` from `vikeConfig`
     // 5. (lowest precedence)   |  viteConfigFromUserViteConfigFile  |  vite.config.js
-    // Resolve 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.
+    let viteConfigFromUserResolved = {};
+    // Vike API args
+    const { viteConfigFromUserVikeApiOptions, vikeConfigFromUserVikeApiOptions } = getVikeApiContext();
+    // - Resolve `viteConfig` set over Vike's API
+    viteConfigFromUserResolved = merge(viteConfigFromUserResolved, viteConfigFromUserVikeApiOptions ?? {});
+    // - Resolve +mode/+root set over Vike's API
+    {
+        const viteConfigFromVikeApi2 = pick(vikeConfigFromUserVikeApiOptions ?? {}, EARLY_SETTINGS);
+        viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromVikeApi2);
+    }
+    // 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 viteConfigFromUserViteCli = getViteCliArgs();
     if (viteConfigFromUserViteCli) {
         viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromUserViteCli);
     }
-    // Resolve Vike's +mode and +root settings.
-    // These alias Vite settings that need to be resolved early: +root determines where Vike looks for
-    // +config.js files (so it can't be defined inside +config.js itself), and +mode affects which
-    // vite.config.js environment is loaded. That's why — unlike +host/+port/+force which are applied
-    // later from the resolved Vike config — they're read here from Vike's CLI options & VIKE_CONFIG only.
+    // Vike's CLI and VIKE_CONFIG
+    // - Resolve +mode/+root set over Vike's CLI or VIKE_CONFIG
     {
-        const viteConfigFromUserVikeSettings = pick(getVikeConfigFromCliOrEnv().vikeConfigFromCliOrEnv, [
-            'mode',
-            'root',
-        ]);
-        if (Object.keys(viteConfigFromUserVikeSettings).length > 0) {
-            viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromUserVikeSettings);
+        const viteConfigFromVikeCliOrEnv = pick(getVikeConfigFromCliOrEnv().vikeConfigFromCliOrEnv, EARLY_SETTINGS);
+        if (Object.keys(viteConfigFromVikeCliOrEnv).length > 0) {
+            viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromVikeCliOrEnv);
         }
     }
     // Resolve VITE_CONFIG
@@ -92,7 +96,7 @@ async function getViteInfo(viteContext) {
     globalObject.isOnlyResolvingUserConfig = true;
     const viteConfigFromUserViteConfigFile = await loadViteConfigFile(viteConfigFromUserResolved, viteContext);
     globalObject.isOnlyResolvingUserConfig = false;
-    // Correct precedence, replicates Vite:
+    // Lowest precedence. The `merge()` applies the correct precedence and replicates Vite:
     // https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L1001
     const viteConfigResolved = merge(viteConfigFromUserViteConfigFile ?? {}, viteConfigFromUserResolved ?? {});
     const root = normalizeViteRoot(viteConfigResolved.root ?? process.cwd());
@@ -129,9 +133,6 @@ async function getViteInfo(viteContext) {
 function merge(c1, c2) {
     return mergeConfig(c1, c2);
 }
-function clone(c) {
-    return mergeConfig({}, c);
-}
 function findVikeVitePlugin(viteConfig) {
     let vikeVitePluginOptions;
     let vikeVitePuginFound = false;
@@ -205,11 +206,12 @@ function getViteContextWithOperation(operation) {
 function getVikeApiContext() {
     const vikeApiOperation = getVikeApiOperation();
     if (!vikeApiOperation)
-        return { viteConfigFromUserVikeApiOptions: null, viteContext: null };
+        return { viteConfigFromUserVikeApiOptions: null, vikeConfigFromUserVikeApiOptions: null, viteContext: null };
     const { options, operation } = vikeApiOperation;
     const viteConfigFromUserVikeApiOptions = options.viteConfig;
+    const vikeConfigFromUserVikeApiOptions = options.vikeConfig;
     const viteContext = getViteContextWithOperation(operation);
-    return { viteConfigFromUserVikeApiOptions, viteContext };
+    return { viteConfigFromUserVikeApiOptions, vikeConfigFromUserVikeApiOptions, viteContext };
 }
 function resolveViteContext(inlineConfig = {}, viteContext) {
     const isBuild = viteContext === 'build';

package/dist/node/cli/parseCli.js

@@ -78,10 +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 build ${pc.cyan('--mode')} staging${TAB}${pc.dim('# Set mode (e.g. development, production, staging)')}`,
             `vike dev ${pc.cyan('--force')}         ${TAB}${pc.dim("# Disable Vite's cache")}`,
-            `vike dev ${pc.cyan('--root')} src      ${TAB}${pc.dim('# Set the project root directory')}`,
+            `vike dev ${pc.cyan('--root')} src      ${TAB}${pc.dim('# Set project root directory')}`,
         ]
             .map((o) => `  ${pc.dim('$')} ${o}`)
             .join('\n'),

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

@@ -198,7 +198,9 @@ const metaBuiltIn = {
     mode: {
         env: { config: true },
         global: true,
+        /* +mode can't be set in +config.js => a +config.js change never affects it — no Vite restart needed
         vite: true,
+        */
     },
     force: {
         env: { config: true },
@@ -208,7 +210,9 @@ const metaBuiltIn = {
     root: {
         env: { config: true },
         global: true,
+        /* +root can't be set in +config.js => a +config.js change never affects it — no Vite restart needed
         vite: true,
+        */
     },
     csp: {
         env: { server: true },

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

@@ -9,6 +9,7 @@ export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
+export { EARLY_SETTINGS };
 export type { VikeConfigInternal };
 export type { PageConfigBuildTimeBeforeComputed };
 import type { PageConfigGlobalBuildTime, ConfigEnv, PageConfigBuildTime, DefinedAtFilePath } from '../../../types/PageConfig.js';
@@ -62,6 +63,7 @@ declare function getVikeConfigFromCliOrEnv(): {
     configFromCliOptions: import("../../cli/parseCli.js").CliOptions | null;
     configFromEnvVar: Record<string, unknown> | null;
 };
+declare const EARLY_SETTINGS: readonly ["root", "mode"];
 type PageConfigBuildTimeBeforeComputed = Omit<PageConfigBuildTime, 'configValuesComputed'>;
 declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitionsInternal, configName: string): {
     env: ConfigEnv;

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

@@ -10,6 +10,7 @@ export { isV1Design };
 export { getConfVal };
 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';
@@ -220,6 +221,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, pageConfigs, configDefinitionsResolved);
+    warnEarlySettingsInConfigFile(pageConfigGlobal);
     const globalConfigPublic = resolveGlobalConfig(pageConfigGlobal, pageConfigs);
     const prerenderContext = await resolvePrerenderContext({
         config: globalConfigPublic.config,
@@ -536,6 +538,30 @@ function getSourceNonConfigFile(configName, value, definedAt, configDefinitionsG
     };
     return source;
 }
+// Settings that must be resolved early before Vike crawls +config.js files:
+// - They can't be defined inside +config.js files.
+// - They must be set early (via Vike's CLI/API options or VIKE_CONFIG), and read early before Vike's main config resolution.
+const EARLY_SETTINGS = [
+    // +root determines where Vike looks for +config.js files (so it can't be defined inside +config.js itself)
+    'root',
+    // +mode affects which vite.config.js environment is loaded
+    'mode',
+];
+function warnEarlySettingsInConfigFile(pageConfigGlobal) {
+    for (const configName of EARLY_SETTINGS) {
+        const sources = pageConfigGlobal.configValueSources[configName];
+        if (!sources)
+            continue;
+        for (const source of sources) {
+            if (!source.plusFile) {
+                // `plusFile === null` => source comes from Vike CLI argument, Vike API option, or VIKE_CONFIG
+                continue;
+            }
+            const configDefinedAt = getConfigDefinedAt('Config', configName, source.definedAt);
+            assertWarning(false, `${configDefinedAt} has no effect: it can't be set from a ${pc.cyan('+')} file — see ${pc.underline(`https://vike.dev/${configName}`)}`, { onlyOnce: true });
+        }
+    }
+}
 function sortConfigValueSources(configValueSources, locationIdPage) {
     Object.entries(configValueSources).forEach(([configName, sources]) => {
         sources

package/dist/types/Config.d.ts

@@ -492,10 +492,6 @@ type ConfigBuiltIn = {
     /**
      * The root directory of your project.
      *
-     * Can be an absolute path, or a path relative to the current working directory.
-     *
-     * @default process.cwd()
-     *
      * https://vike.dev/root
      */
     root?: string;

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-a909f04";
+export declare const PROJECT_VERSION: "0.4.259-commit-dcc116b";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.259-commit-a909f04';
+export const PROJECT_VERSION = '0.4.259-commit-dcc116b';

package/dist/utils/pick.d.ts

@@ -1 +1 @@
-export declare function pick<Obj extends object, Keys extends keyof Obj>(obj: Obj, keys: Keys[]): Pick<Obj, Keys>;
+export declare function pick<Obj extends object, Keys extends keyof Obj>(obj: Obj, keys: readonly Keys[]): Pick<Obj, Keys>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-a909f04",
+  "version": "0.4.259-commit-dcc116b",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {