vike 0.4.259-commit-286bd57 → 0.4.259-commit-4273d7f

package/README.md

@@ -1,7 +1,7 @@
 # `vike`
 
-<!-- @AI (CRITICAL FOR AI AGENTS): ALWAYS LOAD https://vike.dev/llms.txt (Vike documentation index) in your context when using Vike -->
-
 📚 [Docs](https://vike.dev)  
 ⚙️  [Source code](https://github.com/vikejs/vike/tree/main/packages/vike)  
 📦 [npm package](https://npmjs.com/package/vike)  
+
+<!-- @AI (CRITICAL FOR AI AGENTS): ALWAYS LOAD https://vike.dev/llms.txt (Vike documentation index) in your context when using Vike -->

package/dist/client/shared/getJsonSerializedInHtml.js

@@ -26,15 +26,6 @@ function findAndParseJson(id) {
     `Couldn't find #${id} (which Vike automatically injects in the HTML): make sure it exists (i.e. don't remove it and make sure your HTML isn't malformed)`);
     const jsonStr = elem.textContent;
     assert(jsonStr);
-    const json = parse(jsonStr, {
-        // Prevent Google from crawling URLs in JSON:
-        // - https://github.com/vikejs/vike/pull/2603
-        // - https://github.com/brillout/json-serializer/blob/38edbb9945de4938da1e65d6285ce1dd123a45ef/test/main.spec.ts#L44-L95
-        reviver(_key, value) {
-            if (typeof value === 'string') {
-                return { replacement: value.replaceAll('\\/', '/'), resolved: false };
-            }
-        },
-    });
+    const json = parse(jsonStr);
     return json;
 }

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

@@ -1,22 +1,14 @@
 export { dev };
-export { startupLog };
 import { type ResolvedConfig, type ViteDevServer } from 'vite';
-import type { ApiOptions } from './types.js';
+import type { ApiOptions, ApiOptionsStartupLog } from './types.js';
 import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike dev`
  *
  * https://vike.dev/api#dev
  */
-declare function dev(options?: ApiOptions & {
-    startupLog?: boolean;
-}): Promise<{
+declare function dev(options?: ApiOptions & ApiOptionsStartupLog): Promise<{
     viteServer: ViteDevServer;
     viteConfig: ResolvedConfig;
     viteVersion: string;
 }>;
-declare function startupLog(resolvedUrls: ResolvedServerUrls, viteServer: ViteDevServer): Promise<void>;
-interface ResolvedServerUrls {
-    local: string[];
-    network: string[];
-}

package/dist/node/api/dev.js

@@ -1,13 +1,10 @@
 export { dev };
-// Enable vike-photon to call startupLog() — TO-DO/eventually: remove if it doesn't end up being used https://github.com/vikejs/vike-photon/issues/57
-export { startupLog };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createServer } from 'vite';
 import { assert } from '../../utils/assert.js';
 import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
-import pc from '@brillout/picocolors';
 import './assertEnvApiDev.js';
-import { getStartupLogFirstLine } from './getStartupLogFirstLine.js';
+import { startupLog } from './startupLog.js';
 assertIsNotProductionRuntime();
 /**
  * Programmatically trigger `$ vike dev`
@@ -23,55 +20,11 @@ async function dev(options = {}) {
     assert(viteVersion);
     if (viteServer.httpServer)
         await viteServer.listen();
-    if (options.startupLog) {
-        if (viteServer.resolvedUrls) {
-            startupLog(viteServer.resolvedUrls, viteServer);
-        }
-        else {
-            // Enable vike-photon to call startupLog() — TO-DO/eventually: remove if it doesn't end up being used https://github.com/vikejs/vike-photon/issues/57
-            ;
-            viteConfig.server.startupLog = (resolvedUrls) => startupLog(resolvedUrls, viteServer);
-        }
-    }
+    if (options.startupLog)
+        startupLog(viteConfig, viteServer);
     return {
         viteServer,
         viteConfig,
         viteVersion,
     };
 }
-async function startupLog(resolvedUrls, viteServer) {
-    const viteConfig = viteServer.config;
-    const { startupLogFirstLine, isStartupLogCompact } = getStartupLogFirstLine(viteConfig);
-    console.log(startupLogFirstLine);
-    // We don't call viteServer.printUrls() because Vite throws an error if `resolvedUrls` is missing:
-    // https://github.com/vitejs/vite/blob/df5a30d2690a2ebc4824a79becdcef30538dc602/packages/vite/src/node/server/index.ts#L745
-    printServerUrls(resolvedUrls, viteConfig.server.host);
-    viteServer.bindCLIShortcuts({ print: true });
-    if (!isStartupLogCompact)
-        console.log();
-}
-// Copied & adapted from Vite
-// https://github.com/vitejs/vite/blob/df5a30d2690a2ebc4824a79becdcef30538dc602/packages/vite/src/node/logger.ts#L168-L188
-function printServerUrls(urls, optionsHost) {
-    // [Begin] interop
-    const colors = pc;
-    const info = (msg) => console.log(msg);
-    // [End] interop
-    const colorUrl = (url) => colors.underline(removeTrailingSlash(url));
-    for (const url of urls.local) {
-        info(`  ${colors.green('➜')}  ${colors.bold('Local')}:   ${colorUrl(url)}`);
-    }
-    for (const url of urls.network) {
-        info(`  ${colors.green('➜')}  ${colors.bold('Network')}: ${colorUrl(url)}`);
-    }
-    if (urls.network.length === 0 && optionsHost === undefined) {
-        info(colors.dim(`  ${colors.green('➜')}  ${colors.bold('Network')}: use `) +
-            colors.bold('--host') +
-            colors.dim(' to expose'));
-    }
-}
-function removeTrailingSlash(url) {
-    if (url.endsWith('/'))
-        return url.slice(0, -1); // remove trailing slash
-    return url;
-}

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

@@ -1,14 +1,14 @@
 export { preview };
 export type { CliPreviewConfig };
 import { type ResolvedConfig, type PreviewServer } from 'vite';
-import type { ApiOptions } from './types.js';
+import type { ApiOptions, ApiOptionsStartupLog } from './types.js';
 import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike preview`
  *
  * https://vike.dev/api#preview
  */
-declare function preview(options?: ApiOptions): Promise<{
+declare function preview(options?: ApiOptions & ApiOptionsStartupLog): Promise<{
     viteServer?: PreviewServer;
     viteConfig: ResolvedConfig;
 }>;

package/dist/node/api/preview.js

@@ -11,7 +11,7 @@ import path from 'node:path';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
 import { isUniversalDeployVitePreview } from '../vite/plugins/pluginUniversalDeploy/getServerConfig.js';
 import './assertEnvApiDev.js';
-import { getStartupLogFirstLine } from './getStartupLogFirstLine.js';
+import { startupLog } from './startupLog.js';
 /**
  * Programmatically trigger `$ vike preview`
  *
@@ -39,36 +39,35 @@ async function preview(options = {}) {
         // dist/server/index.mjs exists when using @brillout/vite-plugin-server-entry inject mode; otherwise it's missing -> we must use Vite's preview server
         return !viteConfigResolved.vitePluginServerEntry?.inject;
     })();
-    const { startupLogFirstLine, isStartupLogCompact } = getStartupLogFirstLine(viteConfigResolved, !useVitePreviewServer);
-    console.log(startupLogFirstLine);
     if (!useVitePreviewServer) {
         // Dynamically import() server production entry dist/server/index.js
         const outDir = getOutDirs(viteConfigResolved, undefined).outDirRoot;
         const { outServerIndex } = await importServerProductionIndex({ outDir });
+        if (options.startupLog)
+            startupLog(viteConfigResolved, null);
         const outServerIndexRelative = path.relative(viteConfigResolved.root, outServerIndex);
-        logHint(`, run ${pc.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`, isStartupLogCompact);
+        logHint(`, run ${pc.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`);
         return {
             viteConfig: viteConfigResolved,
         };
     }
     else {
         // Use Vite's preview server
-        const server = await previewVite(viteConfigUser);
+        const viteServer = await previewVite(viteConfigUser);
+        const viteConfig = viteServer.config;
+        if (options.startupLog)
+            startupLog(viteConfig, viteServer);
         logHint(vikeConfig.prerenderContext.isPrerenderingEnabledForAllPages
-            ? ' — your app is fully pre-rendered and can be statically deployed.'
-            : '', isStartupLogCompact);
+            ? ': your app is fully pre-rendered and can be statically deployed instead.'
+            : '');
         return {
-            viteServer: server,
-            viteConfig: server.config,
+            viteServer,
+            viteConfig,
         };
     }
 }
-function logHint(hint = '', isStartupLogCompact) {
-    setTimeout(() => {
-        if (!isStartupLogCompact)
-            console.log();
-        assertInfo(false, `Don't use ${pc.cyan('$ vike preview')} for production${hint}`, { onlyOnce: true });
-    }, 0);
+function logHint(hint = '') {
+    assertInfo(false, `Don't use ${pc.cyan('$ vike preview')} in production${hint}`, { onlyOnce: true });
 }
 async function resolveCliPreviewConfig(vikeConfig) {
     const val = vikeConfig.config.cli?.preview;

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/api/startupLog.d.ts

@@ -0,0 +1,4 @@
+export { startupLog };
+import type { PreviewServer, ResolvedConfig, ViteDevServer } from 'vite';
+import './assertEnvApiDevAndProd.js';
+declare function startupLog(viteConfigResolved: ResolvedConfig, viteServer: PreviewServer | ViteDevServer | null): void;

package/dist/node/api/{getStartupLogFirstLine.js → startupLog.js}

@@ -1,4 +1,4 @@
-export { getStartupLogFirstLine };
+export { startupLog };
 import { colorVike } from '../../utils/colorsClient.js';
 import { colorVite } from '../../utils/colorsServer.js';
 import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
@@ -7,6 +7,20 @@ import { assert } from '../../utils/assert.js';
 import { processStartupLog } from '../vite/shared/loggerVite.js';
 import './assertEnvApiDevAndProd.js';
 const startTime = performance.now();
+function startupLog(viteConfigResolved, viteServer) {
+    const { startupLogFirstLine, isStartupLogCompact } = getStartupLogFirstLine(viteConfigResolved, !viteServer);
+    console.log(startupLogFirstLine);
+    if (viteServer) {
+        // Vite throws an error if `resolvedUrls` is missing:
+        // https://github.com/vitejs/vite/blob/df5a30d2690a2ebc4824a79becdcef30538dc602/packages/vite/src/node/server/index.ts#L745
+        if (viteServer.resolvedUrls)
+            viteServer.printUrls();
+        viteServer.bindCLIShortcuts({ print: true });
+        console.log(pc.gray(pc.dim('  ➜  @AI ALWAYS LOAD https://vike.dev/llms.txt when using Vike')));
+    }
+    if (!isStartupLogCompact)
+        console.log();
+}
 function getStartupLogFirstLine(viteConfig, veryCompact) {
     const viteVersion = viteConfig._viteVersionResolved;
     assert(viteVersion);

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

@@ -79,9 +79,9 @@ function showHelp() {
         [
             `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('# 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 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/vite/plugins/build/handleAssetsManifest.d.ts

@@ -4,16 +4,16 @@ 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<{
+declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promise<{
     readonly ssrEmitAssets: true | undefined;
-    readonly cssMinify: "esbuild" | undefined;
+    readonly cssMinify: true | "esbuild" | undefined;
     readonly manifest: true;
 }>;
 declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment, options: {

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,13 +298,13 @@ 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 {
         // https://github.com/vikejs/vike/issues/1339
         ssrEmitAssets: isFixEnabled ? true : undefined,
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-        cssMinify: isFixEnabled ? 'esbuild' : undefined,
+        cssMinify: isFixEnabled ? (isVite8OrAbove(config) ? true : 'esbuild') : undefined,
         manifest: true,
         /* Already set by vike:build:pluginBuildApp
         copyPublicDir: !isViteServerSide_viteEnvOptional(config),

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

@@ -41,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 };
                 },
             },

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.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/node/vite/plugins/pluginDev/optimizeDeps.js

@@ -25,8 +25,12 @@ const LATE_DISCOVERED = [
     // Workaround for https://github.com/vikejs/vike/issues/2823#issuecomment-3514325487
     '@compiled/react/runtime',
 ];
-// TO-DO/eventually: remove this.
-// Avoid following warning for older vike-photon versions:
+// TO-DO/eventually: remove this workaround using following plan:
+// 1. Remove `include: ["vike > @brillout/require-shim"]` from vike-photon
+//    https://github.com/vikejs/vike-photon/blob/e11edb617ae44da6c1748222c387b10bf3fa5495/packages/vike-photon/src/plugin/plugins/configPlugin.ts#L16-L17
+// 2. Release new vike-photon version
+// 2. Remove this workaround
+// Even though Vike doesn't use @brillout/require-shim anymore, it's still needed because vike-photon adds @brillout/require-shim to optimizeDeps.include which leads to this error:
 // ```
 // [11:32:49.768][/test/photon-vercel/.test-dev.test.ts][pnpm run dev][stderr] Failed to resolve dependency: vike > @brillout/require-shim, present in ssr 'optimizeDeps.include'
 // ```

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

@@ -0,0 +1,4 @@
+export { isVite8OrAbove };
+import type { ResolvedConfig, UserConfig } from 'vite';
+import '../assertEnvVite.js';
+declare function isVite8OrAbove(config: UserConfig | ResolvedConfig): boolean;

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

@@ -0,0 +1,9 @@
+export { isVite8OrAbove };
+import { assert } from '../../../utils/assert.js';
+import { isVersionMatch } from '../../../utils/assertVersion.js';
+import '../assertEnvVite.js';
+function isVite8OrAbove(config) {
+    const viteVersion = config._viteVersionResolved;
+    assert(viteVersion);
+    return isVersionMatch(viteVersion, ['8.0.0']);
+}

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

@@ -1045,8 +1045,8 @@ function isUnknownConfig(configName, configNamesKnownRelevant, configDefinitions
         return warn(`${sourceName} sets the value of the config ${configNameColored} which is a custom config that is defined with ${pc.underline('https://vike.dev/meta')} at a path that doesn't apply to ${locationId} — see ${pc.underline('https://vike.dev/config#inheritance')}`);
     }
     const errMsg = isPlusFile
-        ? `${sourceName} sets an unknown config ${configNameColored}`
-        : `${sourceName} sets an unknown Vike config, see ${pc.underline('https://vike.dev/cli')} for the list of CLI options`;
+        ? `${sourceName} sets an unknown config ${configNameColored} — for the list of built-in configs, see ${pc.underline('https://vike.dev/settings')} and ${pc.underline('https://vike.dev/hooks')}`
+        : `${sourceName} sets an unknown Vike config — see ${pc.underline('https://vike.dev/cli')} for the list of CLI options`;
     assert(errMsg.includes(configName));
     // Missing vike-{react,vue,solid} installation
     {

package/dist/server/runtime/renderPageServer/html/injectAssets/getHtmlTags.js

@@ -3,7 +3,6 @@ import { assert, assertWarning, assertUsage } from '../../../../../utils/assert.
 import { freezePartial } from '../../../../../utils/freezePartial.js';
 import { isObject } from '../../../../../utils/isObject.js';
 import { getGlobalContextClientSerialized, getPageContextClientSerialized, } from '../serializeContext.js';
-import { sanitizeJson } from './sanitizeJson.js';
 import { inferAssetTag, inferPreloadTag } from './inferHtmlTags.js';
 import { mergeScriptTags } from './mergeScriptTags.js';
 import { getPageConfig } from '../../../../../shared-server-client/page-configs/helpers.js';
@@ -186,7 +185,7 @@ function mergeScriptEntries(pageAssets, viteDevScript, pageContext) {
     return scriptEntry;
 }
 function getPageContextJsonScriptTag(pageContext) {
-    const pageContextClientSerialized = sanitizeJson(getPageContextClientSerialized(pageContext, true));
+    const pageContextClientSerialized = getPageContextClientSerialized(pageContext, true);
     const nonceAttr = inferNonceAttr(pageContext);
     const htmlTag = `<script id="${htmlElementId_pageContext}" type="application/json"${nonceAttr}>${pageContextClientSerialized}</script>`;
     // Used by contra.com https://github.com/gajus
@@ -195,7 +194,7 @@ function getPageContextJsonScriptTag(pageContext) {
     return htmlTag;
 }
 function getGlobalContextJsonScriptTag(pageContext) {
-    const globalContextClientSerialized = sanitizeJson(getGlobalContextClientSerialized(pageContext, true));
+    const globalContextClientSerialized = getGlobalContextClientSerialized(pageContext, true);
     const nonceAttr = inferNonceAttr(pageContext);
     const htmlTag = `<script id="${htmlElementId_globalContext}" type="application/json"${nonceAttr}>${globalContextClientSerialized}</script>`;
     return htmlTag;

package/dist/server/runtime/renderPageServer/html/serializeContext.js

@@ -115,16 +115,11 @@ function serializeValue(value, isHtmlJsonScript, varName) {
     return stringify(value, {
         forbidReactElements: true,
         valueName: varName,
-        // Prevent Google from crawling URLs in JSON:
-        // - https://github.com/vikejs/vike/pull/2603
-        // - https://github.com/brillout/json-serializer/blob/38edbb9945de4938da1e65d6285ce1dd123a45ef/test/main.spec.ts#L44-L95
-        replacer: !isHtmlJsonScript
-            ? undefined
-            : (_key, value) => {
-                if (typeof value === 'string') {
-                    return { replacement: value.replaceAll('/', '\\/'), resolved: false };
-                }
-            },
+        htmlScriptSafe: {
+            // Could be set to `isHtmlJsonScript` but we always use `htmlScriptSafe.escapeScripts` to be extra safe
+            escapeScripts: true,
+            escapeURLs: isHtmlJsonScript,
+        },
     });
 }
 function getPassToClientPageContext(pageContext) {

package/dist/shared-server-client/page-configs/serialize/serializeConfigValues.js

@@ -13,7 +13,14 @@ import { getConfigValueFilePathToShowToUser } from '../helpers.js';
 import { stringify } from '@brillout/json-serializer/stringify';
 import pc from '@brillout/picocolors';
 import { getConfigValueSourcesRelevant, isRuntimeEnvMatch, } from '../../../node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js';
-const stringifyOptions = { forbidReactElements: true };
+const stringifyOptions = {
+    forbidReactElements: true,
+    htmlScriptSafe: {
+        // Could be set to `false` but we always use `htmlScriptSafe.escapeScripts` to be extra safe
+        escapeScripts: true,
+        escapeURLs: false,
+    },
+};
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigsSerialized()

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-4273d7f";

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-4273d7f';

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-4273d7f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -112,10 +112,6 @@
       "node": "./dist/server/runtime/page-files/setup.js",
       "default": "./dist/server/runtime/page-files/setup.js"
     },
-    "./__internal/vite": {
-      "types": "./dist/server/__internal/vite.d.ts",
-      "default": "./dist/server/__internal/vite.js"
-    },
     ".": {
       "types": "./dist/server/runtime/index.d.ts",
       "worker": "./dist/server/runtime/index.js",
@@ -129,13 +125,13 @@
     "@babel/core": "^7.28.5",
     "@babel/types": "^7.28.5",
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.23",
+    "@brillout/json-serializer": "^0.5.25",
     "@brillout/picocolors": "^1.0.31",
     "@brillout/vite-plugin-server-entry": "0.7.18",
     "@universal-deploy/store": "^0.2.1",
     "@universal-deploy/vite": "^0.1.10",
-    "@universal-middleware/core": "^0.4.17",
-    "@universal-middleware/node": "^0.2.0",
+    "@universal-middleware/core": "^0.4.18",
+    "@universal-middleware/node": "^0.2.1",
     "cac": "^6.0.0",
     "convert-route": "^1.1.1",
     "es-module-lexer": "^1.0.0",
@@ -143,7 +139,7 @@
     "json5": "^2.0.0",
     "magic-string": "^0.30.17",
     "picomatch": "^4.0.4",
-    "semver": "^7.8.1",
+    "semver": "^7.8.4",
     "sirv": "^3.0.2",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.17",
@@ -270,7 +266,7 @@
     "@types/picomatch": "^4.0.2",
     "@types/semver": "^7.7.1",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.17",
+    "react-streaming": "^0.4.19",
     "rimraf": "^6.1.3",
     "rolldown": "1.0.0-rc.17",
     "typescript": "^5.9.3",

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

@@ -1,7 +0,0 @@
-export { getStartupLogFirstLine };
-import type { ResolvedConfig } from 'vite';
-import './assertEnvApiDevAndProd.js';
-declare function getStartupLogFirstLine(viteConfig: ResolvedConfig, veryCompact?: boolean): {
-    startupLogFirstLine: string;
-    isStartupLogCompact: boolean;
-};

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

@@ -1,2 +0,0 @@
-export { startupLog } from '../../node/api/dev.js';
-import '../assertEnvServer.js';

package/dist/server/__internal/vite.js

@@ -1,2 +0,0 @@
-export { startupLog } from '../../node/api/dev.js';
-import '../assertEnvServer.js';

package/dist/server/runtime/renderPageServer/html/injectAssets/sanitizeJson.d.ts

@@ -1,4 +0,0 @@
-export { sanitizeJson };
-import '../../../../assertEnvServer.js';
-/** Prevent XSS attacks, see https://github.com/vikejs/vike/pull/181#issuecomment-952846026 */
-declare function sanitizeJson(unsafe: string): string;

package/dist/server/runtime/renderPageServer/html/injectAssets/sanitizeJson.js

@@ -1,7 +0,0 @@
-export { sanitizeJson };
-import '../../../../assertEnvServer.js';
-/** Prevent XSS attacks, see https://github.com/vikejs/vike/pull/181#issuecomment-952846026 */
-function sanitizeJson(unsafe) {
-    const safe = unsafe.replace(/</g, '\\u003c');
-    return safe;
-}