vike 0.4.224 → 0.4.225-commit-2b7971f

package/dist/esm/client/server-routing-runtime/getPageContext.js

@@ -9,13 +9,16 @@ import * as virtualFileExports from 'virtual:vike:importUserCode:client:server-r
 const { pageFilesAll, pageConfigs, pageConfigGlobal } = getPageConfigsRuntime(virtualFileExports);
 const urlFirst = getCurrentUrl({ withoutHash: true });
 async function getPageContext() {
-    const pageContext = getPageContextSerializedInHtml();
-    objectAssign(pageContext, {
+    const pageContext = {
+        _isPageContextObject: true,
+        isPrerendering: false,
+        isClientSide: true,
         isHydration: true,
         isBackwardNavigation: null,
         _hasPageContextFromServer: true,
         _hasPageContextFromClient: false
-    });
+    };
+    objectAssign(pageContext, getPageContextSerializedInHtml());
     objectAssign(pageContext, await loadPageUserFiles(pageContext.pageId));
     assertPristineUrl();
     return pageContext;

package/dist/esm/client/shared/getPageContextProxyForUser.d.ts

@@ -1,12 +1,2 @@
 export { getPageContextProxyForUser };
-export { PageContextForPassToClientWarning };
-type PageContextForPassToClientWarning = {
-    _hasPageContextFromServer: boolean;
-    _hasPageContextFromClient: boolean;
-};
-/**
- * Throw error when pageContext value isn't:
- * - serializable, or
- * - defined.
- */
-declare function getPageContextProxyForUser<PageContext extends Record<string, unknown> & PageContextForPassToClientWarning>(pageContext: PageContext): PageContext;
+declare function getPageContextProxyForUser<PageContext extends Record<string, unknown>>(pageContext: PageContext): PageContext;

package/dist/esm/client/shared/getPageContextProxyForUser.js

@@ -1,77 +1,14 @@
 export { getPageContextProxyForUser };
-import { assert, assertUsage, assertWarning, getGlobalObject, getPropAccessNotation } from '../server-routing-runtime/utils.js';
-import { notSerializable } from '../../shared/notSerializable.js';
-const globalObject = getGlobalObject('shared/getPageContextProxyForUser.ts', {});
-/**
- * Throw error when pageContext value isn't:
- * - serializable, or
- * - defined.
- */
+import { assertUsage, getPropAccessNotation } from '../server-routing-runtime/utils.js';
+import { NOT_SERIALIZABLE } from '../../shared/NOT_SERIALIZABLE.js';
+// Throw error when pageContext value isn't serializable
 function getPageContextProxyForUser(pageContext) {
-    assert([true, false].includes(pageContext._hasPageContextFromServer));
-    assert([true, false].includes(pageContext._hasPageContextFromClient));
     return new Proxy(pageContext, {
         get(_, prop) {
             const val = pageContext[prop];
             const propName = getPropAccessNotation(prop);
-            assertUsage(val !== notSerializable, `Can't access pageContext${propName} on the client side. Because it can't be serialized, see server logs.`);
-            passToClientHint(pageContext, prop, propName);
+            assertUsage(val !== NOT_SERIALIZABLE, `Can't access pageContext${propName} on the client side. Because it can't be serialized, see server logs.`);
             return val;
         }
     });
 }
-function passToClientHint(pageContext, prop, propName) {
-    if (handleVueReactivity(prop))
-        return;
-    // `prop in pageContext` is the trick we use to know the passToClient value on the client-side, as we set a value to all passToClient props, even `undefined` ones:
-    // ```html
-    // <script id="vike_pageContext" type="application/json">{"pageProps":"!undefined"}</script>
-    // ```
-    if (prop in pageContext)
-        return;
-    if (isWhitelisted(prop))
-        return;
-    // The trick described above (`prop in pageContext`) doesn't work if Vike doesn't fetch any pageContext from the server.
-    // - There would still be some value to show a warning, but it isn't worth it because of the confusion that the first recommendation (adding `prop` to `passToClient`) wouldn't actually remove the warning, and only the second recommendation (using `prop in pageContext` instead of `pageContext[prop]`) would work.
-    if (!pageContext._hasPageContextFromServer)
-        return;
-    const errMsg = `pageContext${propName} isn't defined on the client-side, see https://vike.dev/passToClient#error`;
-    if (
-    // TODO/next-major-release always make it an error.
-    // - Remove pageContext._hasPageContextFromClient logic (IIRC this is its only use case).
-    pageContext._hasPageContextFromClient) {
-        assertWarning(false, errMsg, { onlyOnce: false, showStackTrace: true });
-    }
-    else {
-        assertUsage(false, errMsg);
-    }
-}
-const WHITELIST = [
-    'then',
-    // Vue calls toJSON()
-    'toJSON'
-];
-function isWhitelisted(prop) {
-    if (WHITELIST.includes(prop))
-        return true;
-    if (typeof prop === 'symbol')
-        return true; // Vue tries to access some symbols
-    if (typeof prop !== 'string')
-        return true;
-    if (prop.startsWith('__v_'))
-        return true; // Vue internals upon `reactive(pageContext)`
-    return false;
-}
-// Handle Vue's reactivity.
-// When changing a reactive object:
-// - Vue tries to read its old value first. This triggers a `assertIsDefined()` failure if e.g. `pageContextReactive.routeParams = pageContextNew.routeParams` and `pageContextReactive` has no `routeParams`.
-// - Vue seems to read __v_raw before reading the property.
-function handleVueReactivity(prop) {
-    if (globalObject.prev === prop || globalObject.prev === '__v_raw')
-        return true;
-    globalObject.prev = prop;
-    window.setTimeout(() => {
-        globalObject.prev = undefined;
-    }, 0);
-    return false;
-}

package/dist/esm/client/shared/preparePageContextForUserConsumptionClientSide.d.ts

@@ -2,9 +2,9 @@ export { preparePageContextForUserConsumptionClientSide };
 export type { PageContextForUserConsumptionClientSide };
 import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-import { PageContextForPassToClientWarning } from './getPageContextProxyForUser.js';
-type PageContextForUserConsumptionClientSide = PageConfigUserFriendlyOld & PageContextForPassToClientWarning & {
+type PageContextForUserConsumptionClientSide = PageConfigUserFriendlyOld & {
     pageId: string;
+    _hasPageContextFromServer: boolean;
     _pageConfigs: PageConfigRuntime[];
 };
 declare function preparePageContextForUserConsumptionClientSide<T extends PageContextForUserConsumptionClientSide>(pageContext: T, isClientRouting: boolean): T & {

package/dist/esm/node/api/build.js

@@ -11,7 +11,7 @@ import { assertVersion } from './utils.js';
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigEnhanced, vikeConfig } = await prepareViteApiCall(options.viteConfig, 'build');
+    const { viteConfigEnhanced, vikeConfig } = await prepareViteApiCall(options, 'build');
     // Pass it to pluginAutoFullBuild()
     if (viteConfigEnhanced)
         viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;

package/dist/esm/node/api/context.d.ts

@@ -1,7 +1,13 @@
 export { isVikeCliOrApi };
 export { setContextApiOperation };
 export { clearContextApiOperation };
-import type { Operation } from './types.js';
+export { getApiOperation };
+import type { APIOptions, Operation } from './types.js';
+type ApiOperation = {
+    operation: Operation;
+    options: APIOptions;
+};
+declare function getApiOperation(): ApiOperation | null;
 declare function isVikeCliOrApi(): boolean;
-declare function setContextApiOperation(operation: Operation): void;
+declare function setContextApiOperation(operation: Operation, options: APIOptions): void;
 declare function clearContextApiOperation(): void;

package/dist/esm/node/api/context.js

@@ -1,19 +1,19 @@
 export { isVikeCliOrApi };
 export { setContextApiOperation };
 export { clearContextApiOperation };
+export { getApiOperation };
 import { assert, getGlobalObject } from './utils.js';
 const globalObject = getGlobalObject('api/context.ts', {});
 function getApiOperation() {
-    assert(globalObject.apiOperation);
-    return globalObject.apiOperation;
+    return globalObject.apiOperation ?? null;
 }
 function isVikeCliOrApi() {
     // The CLI uses the API
     return !!globalObject.apiOperation;
 }
-function setContextApiOperation(operation) {
+function setContextApiOperation(operation, options) {
     assert(!globalObject.apiOperation);
-    globalObject.apiOperation = operation;
+    globalObject.apiOperation = { operation, options };
 }
 function clearContextApiOperation() {
     globalObject.apiOperation = undefined;

package/dist/esm/node/api/dev.js

@@ -7,7 +7,7 @@ import { createServer } from 'vite';
  * https://vike.dev/api#dev
  */
 async function dev(options = {}) {
-    const { viteConfigEnhanced } = await prepareViteApiCall(options.viteConfig, 'dev');
+    const { viteConfigEnhanced } = await prepareViteApiCall(options, 'dev');
     const server = await createServer(viteConfigEnhanced);
     return {
         viteServer: server,

package/dist/esm/node/api/prepareViteApiCall.d.ts

@@ -3,9 +3,9 @@ export { getViteRoot };
 export { assertViteRoot };
 export { normalizeViteRoot };
 import type { InlineConfig, ResolvedConfig } from 'vite';
-import type { Operation } from './types.js';
+import type { APIOptions, Operation } from './types.js';
 import { type VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
-declare function prepareViteApiCall(viteConfigFromOptions: InlineConfig | undefined, operation: Operation): Promise<{
+declare function prepareViteApiCall(options: APIOptions, operation: Operation): Promise<{
     vikeConfig: VikeConfigObject;
     viteConfigEnhanced: InlineConfig | undefined;
 }>;

package/dist/esm/node/api/prepareViteApiCall.js

@@ -9,10 +9,12 @@ import path from 'path';
 import { assert, assertUsage, getGlobalObject, isObject, toPosixPath } from './utils.js';
 import pc from '@brillout/picocolors';
 import { clearGlobalContext } from '../runtime/globalContext.js';
+import { getEnvVarObject } from '../plugin/shared/getEnvVarObject.js';
 const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
-async function prepareViteApiCall(viteConfigFromOptions, operation) {
+async function prepareViteApiCall(options, operation) {
     clear();
-    setContextApiOperation(operation);
+    setContextApiOperation(operation, options);
+    const viteConfigFromOptions = options.viteConfig;
     return enhanceViteConfig(viteConfigFromOptions, operation);
 }
 // For subsequent API calls, e.g. calling prerender() after build()
@@ -21,7 +23,7 @@ function clear() {
     clearGlobalContext();
 }
 async function enhanceViteConfig(viteConfigFromOptions, operation) {
-    const viteInfo = await getInfoFromVite(viteConfigFromOptions, operation);
+    const viteInfo = await getViteInfo(viteConfigFromOptions, operation);
     await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
     const vikeConfig = await getVikeConfig2(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
     const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
@@ -43,21 +45,30 @@ function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
 }
 async function getViteRoot(operation) {
     if (!globalObject.root)
-        await getInfoFromVite(undefined, operation);
+        await getViteInfo(undefined, operation);
     assert(globalObject.root);
     return globalObject.root;
 }
-async function getInfoFromVite(viteConfigFromOptions, operation) {
-    const viteConfigFromUserViteFile = await loadViteConfigFile(viteConfigFromOptions, operation);
-    const root = normalizeViteRoot(
-    // `viteConfigFromOptions.root` before `viteConfigFromUserViteFile.root` replicates Vite's precedence:
+async function getViteInfo(viteConfigFromOptions, operation) {
+    let viteConfigEnhanced = viteConfigFromOptions;
+    // Precedence:
+    //  - viteConfigFromUserEnvVar (highest precendence)
+    //  - viteConfigFromOptions
+    //  - viteConfigFromUserViteFile (lowest precendence)
+    const viteConfigFromUserEnvVar = getEnvVarObject('VITE_CONFIG');
+    if (viteConfigFromUserEnvVar)
+        viteConfigEnhanced = mergeConfig(viteConfigEnhanced ?? {}, viteConfigFromUserEnvVar);
+    const viteConfigFromUserViteFile = await loadViteConfigFile(viteConfigEnhanced, operation);
+    // Correct precedence, replicates Vite:
     // https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L1001
-    viteConfigFromOptions?.root ?? viteConfigFromUserViteFile?.root ?? process.cwd());
+    const viteConfigResolved = mergeConfig(viteConfigFromUserViteFile ?? {}, viteConfigEnhanced ?? {});
+    const root = normalizeViteRoot(viteConfigResolved.root ?? process.cwd());
     globalObject.root = root;
+    // - Find options `vike(options)` set in vite.config.js
+    //   - TODO/next-major: remove
+    // - Add Vike's Vite plugin if missing
     let vikeVitePluginOptions;
-    let viteConfigEnhanced = viteConfigFromOptions;
-    // If Vike's Vite plugin is found in both viteConfigFromOptions and viteConfigFromUserViteFile then Vike will later throw an error
-    const found = findVikeVitePlugin(viteConfigFromOptions) || findVikeVitePlugin(viteConfigFromUserViteFile);
+    const found = findVikeVitePlugin(viteConfigResolved);
     if (found) {
         vikeVitePluginOptions = found.vikeVitePluginOptions;
     }
@@ -66,8 +77,8 @@ async function getInfoFromVite(viteConfigFromOptions, operation) {
         // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus vike/plugin may resolved to two different node_modules/vike directories.
         const { plugin: vikePlugin } = await import('../plugin/index.js');
         viteConfigEnhanced = {
-            ...viteConfigFromOptions,
-            plugins: [...(viteConfigFromOptions?.plugins ?? []), vikePlugin()]
+            ...viteConfigEnhanced,
+            plugins: [...(viteConfigEnhanced?.plugins ?? []), vikePlugin()]
         };
         const res = findVikeVitePlugin(viteConfigEnhanced);
         assert(res);

package/dist/esm/node/api/prerender.js

@@ -8,7 +8,7 @@ import { prepareViteApiCall } from './prepareViteApiCall.js';
  * https://vike.dev/api#prerender
  */
 async function prerender(options = {}) {
-    const { viteConfigEnhanced } = await prepareViteApiCall(options.viteConfig, 'prerender');
+    const { viteConfigEnhanced } = await prepareViteApiCall(options, 'prerender');
     options.viteConfig = viteConfigEnhanced;
     const { viteConfig } = await runPrerenderFromAPI(options);
     return {

package/dist/esm/node/api/preview.js

@@ -7,7 +7,7 @@ import { preview as previewVite } from 'vite';
  * https://vike.dev/api#preview
  */
 async function preview(options = {}) {
-    const { viteConfigEnhanced } = await prepareViteApiCall(options.viteConfig, 'preview');
+    const { viteConfigEnhanced } = await prepareViteApiCall(options, 'preview');
     const server = await previewVite(viteConfigEnhanced);
     return {
         viteServer: server,

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

@@ -1,6 +1,7 @@
 export type { APIOptions };
 export type { Operation };
 import type { InlineConfig } from 'vite';
+import type { Config } from '../../shared/page-configs/Config.js';
 type APIOptions = {
     /**
      * Vite config.
@@ -8,5 +9,11 @@ type APIOptions = {
      * https://vike.dev/api
      */
     viteConfig?: InlineConfig;
+    /**
+     * Vike config.
+     *
+     * https://vike.dev/api
+     */
+    vikeConfig?: Config;
 };
 type Operation = 'build' | 'dev' | 'preview' | 'prerender';

package/dist/esm/node/cli/context.d.ts

@@ -1,5 +1,7 @@
 export { isVikeCli };
 export { setContextCliCommand };
-import type { Command } from './parseCli.js';
+export { getCliOptions };
+import type { CliOptions, Command } from './parseCli.js';
+declare function getCliOptions(): CliOptions | null;
 declare function isVikeCli(): boolean;
-declare function setContextCliCommand(command: Command): void;
+declare function setContextCliCommand(command: Command, cliOptions: CliOptions): void;

package/dist/esm/node/cli/context.js

@@ -1,14 +1,15 @@
 export { isVikeCli };
 export { setContextCliCommand };
+export { getCliOptions };
 import { assert, getGlobalObject } from './utils.js';
 const globalObject = getGlobalObject('cli/context.ts', {});
-function getCliCommand() {
-    return globalObject.cliCommand;
+function getCliOptions() {
+    return globalObject.cliCommand?.cliOptions ?? null;
 }
 function isVikeCli() {
     return !!globalObject.cliCommand;
 }
-function setContextCliCommand(command) {
+function setContextCliCommand(command, cliOptions) {
     assert(!globalObject.cliCommand);
-    globalObject.cliCommand = command;
+    globalObject.cliCommand = { command, cliOptions };
 }

package/dist/esm/node/cli/entry.js

@@ -1,12 +1,12 @@
-import { projectInfo } from './utils.js';
+import { PROJECT_VERSION } from './utils.js';
 import { dev, build, preview } from '../api/index.js';
 import pc from '@brillout/picocolors';
 import { parseCli } from './parseCli.js';
 import { setContextCliCommand } from './context.js';
 cli();
 async function cli() {
-    const { command } = parseCli();
-    setContextCliCommand(command);
+    const { command, cliOptions } = parseCli();
+    setContextCliCommand(command, cliOptions);
     if (command === 'dev') {
         await cmdDev();
     }
@@ -28,7 +28,7 @@ async function cmdDev() {
         const info = viteServer.config.logger.info;
         const startupDurationString = pc.dim(`ready in ${pc.reset(pc.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
         const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
-        info(`  ${pc.yellow(`${pc.bold(projectInfo.projectName)} v${projectInfo.projectVersion}`)}  ${startupDurationString}\n`, {
+        info(`  ${pc.yellow(`${pc.bold('Vike')} v${PROJECT_VERSION}`)}  ${startupDurationString}\n`, {
             clear: !hasExistingLogs
         });
         viteServer.printUrls();

package/dist/esm/node/cli/parseCli.d.ts

@@ -1,6 +1,9 @@
 export { parseCli };
 export type { Command };
+export type { CliOptions };
+type CliOptions = Record<string, unknown>;
 type Command = 'dev' | 'build' | 'preview' | 'prerender';
 declare function parseCli(): {
     command: Command;
+    cliOptions: CliOptions;
 };

package/dist/esm/node/cli/parseCli.js

@@ -1,6 +1,7 @@
 export { parseCli };
 import pc from '@brillout/picocolors';
-import { projectInfo, includes } from './utils.js';
+import { assert, includes, PROJECT_VERSION } from './utils.js';
+import { parseJson5 } from '../plugin/shared/getEnvVarObject.js';
 const commands = [
     { name: 'dev', desc: 'Start development server' },
     { name: 'build', desc: 'Build for production' },
@@ -8,32 +9,59 @@ const commands = [
     { name: 'prerender', desc: 'Pre-render pages (only needed when partial.disableAutoRun is true)' }
 ];
 function parseCli() {
-    const command = (() => {
-        const firstArg = process.argv[2];
-        if (!firstArg) {
-            showHelp();
-        }
-        showHelpOrVersion(firstArg);
-        if (includes(commands.map((c) => c.name), firstArg))
-            return firstArg;
-        wrongUsage(`Unknown command ${pc.bold(firstArg)}`);
-    })();
+    const command = getCommand();
+    const cliOptions = getCliOptions();
+    return { command, cliOptions };
+}
+function getCommand() {
+    const firstArg = process.argv[2];
+    if (includes(commands.map((c) => c.name), firstArg)) {
+        return firstArg;
+    }
+    if (!firstArg)
+        showHelp();
+    showHelpOrVersion(firstArg);
+    wrongUsage(`Unknown command ${pc.bold(firstArg)}`);
+}
+function getCliOptions() {
+    let cliOptions = {};
+    let configNameCurrent;
+    const commitIfDefinedWithoutValue = () => {
+        if (configNameCurrent)
+            commit(true);
+    };
+    const commit = (val) => {
+        assert(configNameCurrent);
+        cliOptions[configNameCurrent] = val;
+        configNameCurrent = undefined;
+    };
     for (const arg of process.argv.slice(3)) {
         showHelpOrVersion(arg);
-        wrongUsage(`Unknown option ${pc.bold(arg)}`);
+        if (arg.startsWith('--')) {
+            commitIfDefinedWithoutValue();
+            configNameCurrent = arg.slice('--'.length);
+        }
+        else {
+            if (!configNameCurrent)
+                wrongUsage(`Unknown option ${pc.bold(arg)}`);
+            commit(parseJson5(arg, `CLI option --${configNameCurrent}`));
+        }
     }
-    return { command };
+    commitIfDefinedWithoutValue();
+    return cliOptions;
 }
 function showHelp() {
     const TAB = ' '.repeat(3);
     const nameMaxLength = Math.max(...commands.map((c) => c.name.length));
     console.log([
-        `vike@${projectInfo.projectVersion}`,
+        `vike@${PROJECT_VERSION}`,
         '',
         'Usage:',
         ...[...commands, { name: '-v', desc: "Print Vike's installed version" }].map((c) => `  ${pc.dim('$')} ${pc.bold(`vike ${c.name}`)}${' '.repeat(nameMaxLength - c.name.length)}${TAB}${pc.dim(`# ${c.desc}`)}`),
         '',
-        `More infos at ${pc.underline('https://vike.dev/cli')}`
+        `Vike settings can be passed over the ${pc.cyan('VIKE_CONFIG')} environment variable or as ${pc.cyan('CLI options')} such as --host.`,
+        `Vite settings can be passed over the ${pc.cyan('VITE_CONFIG')} environment variable.`,
+        `See ${pc.underline('https://vike.dev/cli')} for more information.`
     ].join('\n'));
     process.exit(1);
 }
@@ -46,7 +74,7 @@ function showHelpOrVersion(arg) {
     }
 }
 function showVersion() {
-    console.log(projectInfo.projectVersion);
+    console.log(PROJECT_VERSION);
     process.exit(1);
 }
 function wrongUsage(msg) {

package/dist/esm/node/cli/utils.d.ts

@@ -1,4 +1,4 @@
 export * from '../../utils/assert.js';
-export * from '../../utils/projectInfo.js';
+export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/includes.js';
 export * from '../../utils/getGlobalObject.js';

package/dist/esm/node/cli/utils.js

@@ -3,6 +3,6 @@
 import { onLoad } from './onLoad.js';
 onLoad();
 export * from '../../utils/assert.js';
-export * from '../../utils/projectInfo.js';
+export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/includes.js';
 export * from '../../utils/getGlobalObject.js';

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.js

@@ -2,7 +2,7 @@ export { pluginBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-import { assert, projectInfo, toPosixPath } from '../../utils.js';
+import { assert, PROJECT_VERSION, toPosixPath } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
 import { createRequire } from 'module';
@@ -35,7 +35,7 @@ function pluginBuildEntry() {
 function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
     const buildInfo = {
-        versionAtBuildTime: projectInfo.projectVersion,
+        versionAtBuildTime: PROJECT_VERSION,
         usesClientRouter: isUsingClientRouter(), // TODO/v1-release: remove
         viteConfigRuntime: getViteConfigRuntime(config)
     };

package/dist/esm/node/plugin/plugins/commonConfig.d.ts

@@ -1,5 +1,6 @@
 export { commonConfig };
 export { getVikeConfigPublic };
+export type { VikeConfigPublic };
 import { type InlineConfig, type Plugin, type ResolvedConfig, type UserConfig } from 'vite';
 import { type VikeConfigObject } from './importUserCode/v1-design/getVikeConfig.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';

package/dist/esm/node/plugin/plugins/commonConfig.js

@@ -1,13 +1,11 @@
 export { commonConfig };
 export { getVikeConfigPublic };
-import { mergeConfig } from 'vite';
 import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject } from '../utils.js';
 import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import path from 'path';
 import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
-import { getEnvVarObject } from '../shared/getEnvVarObject.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
 import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
@@ -39,7 +37,7 @@ function commonConfig(vikeVitePluginOptions) {
                         },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: resolvePrerenderConfigGlobal(vikeConfig).isEnabled
+                            prerender: resolvePrerenderConfigGlobal(vikeConfig).isPrerenderingEnabled
                         })
                     };
                 }
@@ -73,17 +71,24 @@ function commonConfig(vikeVitePluginOptions) {
             config: {
                 order: 'post',
                 handler(configFromUser) {
-                    // Change default port
                     let configFromVike = { server: {}, preview: {} };
-                    setDefault('port', 3000, configFromUser, configFromVike);
-                    // Set `--host` for Docker/Podman
-                    if (isDocker()) {
+                    const vike = getVikeConfigPublic(configFromUser);
+                    if (vike.config.port !== undefined) {
+                        // https://vike.dev/port
+                        setDefault('port', vike.config.port, configFromUser, configFromVike);
+                    }
+                    else {
+                        // Change Vite's default port
+                        setDefault('port', 3000, configFromUser, configFromVike);
+                    }
+                    if (vike.config.host) {
+                        // https://vike.dev/host
+                        setDefault('host', vike.config.host, configFromUser, configFromVike);
+                    }
+                    else if (isDocker()) {
+                        // Set `--host` for Docker/Podman
                         setDefault('host', true, configFromUser, configFromVike);
                     }
-                    // VITE_CONFIG
-                    const configFromEnvVar = getEnvVarObject('VITE_CONFIG');
-                    if (configFromEnvVar)
-                        configFromVike = mergeConfig(configFromVike, configFromEnvVar);
                     return configFromVike;
                 }
             }

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -50,16 +50,18 @@ async function getPageDeps(config, pageConfigs) {
                     .forEach((configValueSource) => {
                     if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
-                    const { definedAtFilePath, configEnv } = configValueSource;
+                    const { definedAt, configEnv } = configValueSource;
                     if (!configEnv.client)
                         return;
-                    if (definedAtFilePath.filePathAbsoluteUserRootDir !== null) {
+                    if (definedAt.definedBy)
+                        return;
+                    if (definedAt.filePathAbsoluteUserRootDir !== null) {
                         // Vite expects entries to be filesystem absolute paths (surprisingly so).
-                        addEntry(definedAtFilePath.filePathAbsoluteFilesystem);
+                        addEntry(definedAt.filePathAbsoluteFilesystem);
                     }
                     else {
                         // Adding definedAtFilePath.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
-                        addInclude(definedAtFilePath.importPathAbsolute);
+                        addInclude(definedAt.importPathAbsolute);
                     }
                 });
             });

package/dist/esm/node/plugin/plugins/devConfig/index.js

@@ -79,7 +79,7 @@ function devConfig() {
                     if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;
                     return () => {
-                        addSsrMiddleware(server.middlewares, config, false);
+                        addSsrMiddleware(server.middlewares, config, false, null);
                     };
                 }
             },