vike 0.4.247-commit-e331796 → 0.4.247-commit-1250e38

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

@@ -2,6 +2,7 @@ export { getPageContext };
 export { providePageContext };
 // TO-DO/eventually: create new setting `+asyncHook: true` that sets the default value of the `asyncHook` parameter below to `true`
 // TODO/next-release: update vike-{react,vue,solid} usage
+// TODO/next-release: contact Da-Jin about `window.history.state?.vike` https://vike.dev/navigate#history-pushstate
 import { getPageContext_sync, providePageContext } from '../../shared-server-client/hooks/execHook.js';
 import { getPageContextClient } from './renderPageClient.js';
 function getPageContext({ asyncHook } = {}) {

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

@@ -1,4 +1,5 @@
 export { dev };
+export { startupLog };
 import { type ResolvedConfig, type ViteDevServer } from 'vite';
 import type { ApiOptions } from './types.js';
 /**
@@ -13,3 +14,8 @@ declare function dev(options?: ApiOptions & {
     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,33 +1,47 @@
 export { dev };
+// TO-DO/eventually: remove if it doesn't end up being used
+export { startupLog };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
-import { createServer, version as viteVersionVike } from 'vite';
-import { viteVersionUser } from '../vite/plugins/pluginCommon.js';
-import { colorVike, colorVite, PROJECT_VERSION } from './utils.js';
+import { createServer } from 'vite';
+import { assert, assertIsNotProductionRuntime, colorVike, colorVite, PROJECT_VERSION } from './utils.js';
 import pc from '@brillout/picocolors';
 import { processStartupLog } from '../vite/shared/loggerVite.js';
+assertIsNotProductionRuntime();
 /**
  * Programmatically trigger `$ vike dev`
  *
  * https://vike.dev/api#dev
  */
 async function dev(options = {}) {
-    const startTime = performance.now();
     const { viteConfigFromUserResolved } = await prepareViteApiCall(options, 'dev');
     const server = await createServer(viteConfigFromUserResolved);
-    const viteVersion = viteVersionUser ?? viteVersionVike;
     const viteServer = server;
     const viteConfig = server.config;
+    const viteVersion = viteConfig._viteVersionResolved;
+    assert(viteVersion);
     if (viteServer.httpServer)
         await viteServer.listen();
-    if (options.startupLog)
-        printStartupLog(viteServer, viteConfig, viteVersion, startTime);
+    if (options.startupLog) {
+        if (viteServer.resolvedUrls) {
+            startupLog(viteServer.resolvedUrls, viteServer);
+        }
+        else {
+            // TO-DO/eventually: remove if it doesn't end up being used
+            ;
+            viteConfig.server.startupLog = (resolvedUrls) => startupLog(resolvedUrls, viteServer);
+        }
+    }
     return {
         viteServer,
         viteConfig,
         viteVersion,
     };
 }
-async function printStartupLog(viteServer, viteConfig, viteVersion, startTime) {
+const startTime = performance.now();
+async function startupLog(resolvedUrls, viteServer) {
+    const viteConfig = viteServer.config;
+    const viteVersion = viteConfig._viteVersionResolved;
+    assert(viteVersion);
     const startupDurationString = pc.dim(`ready in ${pc.reset(pc.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
     const sep = pc.dim('·');
     const firstLine = `\n  ${colorVike('Vike')} ${pc.yellow(`v${PROJECT_VERSION}`)} ${sep} ${colorVite('Vite')} ${pc.cyan(`v${viteVersion}`)} ${sep} ${startupDurationString}\n`;
@@ -36,7 +50,7 @@ async function printStartupLog(viteServer, viteConfig, viteVersion, startTime) {
     const { isCompact } = ret;
     // 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(viteServer.resolvedUrls || { local: ['http://localhost:3000'], network: [] }, viteConfig.server.host);
+    printServerUrls(resolvedUrls, viteConfig.server.host);
     viteServer.bindCLIShortcuts({ print: true });
     if (!isCompact)
         console.log();

package/dist/node/vite/index.js

@@ -17,7 +17,7 @@ import { pluginSetGlobalContext } from './plugins/pluginSetGlobalContext.js';
 import { pluginCommon } from './plugins/pluginCommon.js';
 import { pluginBaseUrls } from './plugins/pluginBaseUrls.js';
 import { pluginReplaceConstantsEnvVars } from './plugins/pluginReplaceConstantsEnvVars.js';
-import { pluginFileEnv } from './plugins/pluginFileEnv.js';
+import { pluginAssertFileEnv } from './plugins/pluginAssertFileEnv.js';
 import { pluginWorkaroundCssModuleHmr } from './plugins/pluginWorkaroundCssModuleHmr.js';
 import { pluginWorkaroundVite6HmrRegression } from './plugins/pluginWorkaroundVite6HmrRegression.js';
 import { pluginReplaceConstantsPageContext } from './plugins/pluginReplaceConstantsPageContext.js';
@@ -53,7 +53,7 @@ function plugin(vikeVitePluginOptions = {}) {
             ...pluginSetGlobalContext(),
             ...pluginBaseUrls(),
             ...pluginReplaceConstantsEnvVars(),
-            ...pluginFileEnv(),
+            ...pluginAssertFileEnv(),
             ...pluginWorkaroundCssModuleHmr(),
             ...pluginWorkaroundVite6HmrRegression(),
             ...pluginReplaceConstantsPageContext(),

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

@@ -1,8 +1,12 @@
 export { pluginModuleBanner };
 import { assert, removeVirtualFileIdPrefix } from '../../utils.js';
 import { getMagicString } from '../../shared/getMagicString.js';
-// Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
-// But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
+// Misusing legal comments so that esbuild doesn't remove them.
+// - Legal comments: https://esbuild.github.io/api/#legal-comments
+// - Terser removes legal comments, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
+// - Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
+//   - But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
+// - Potential alternative: https://github.com/vitejs/vite/issues/21228#issuecomment-3627899741
 function pluginModuleBanner() {
     let config;
     let isEnabled = false;
@@ -39,9 +43,6 @@ function pluginModuleBanner() {
                         id = id.slice(config.root.length + 1);
                     id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
                     const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    // Use legal comment so that esbuild doesn't remove it.
-                    // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
-                    // - https://esbuild.github.io/api/#legal-comments
                     magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                     return getMagicStringResult();
                 },

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

@@ -0,0 +1,3 @@
+export { pluginAssertFileEnv };
+import type { Plugin } from 'vite';
+declare function pluginAssertFileEnv(): Plugin[];

package/dist/node/vite/plugins/{pluginFileEnv.js → pluginAssertFileEnv.js}

@@ -1,4 +1,4 @@
-export { pluginFileEnv };
+export { pluginAssertFileEnv };
 import { assert, assertUsage, assertWarning, capitalizeFirstLetter, isFilePathAbsolute, joinEnglish, rollupSourceMapRemove, } from '../utils.js';
 import { extractAssetsRE } from './pluginExtractAssets.js';
 import { extractExportNamesRE } from './pluginExtractExportNames.js';
@@ -8,26 +8,26 @@ import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from '../shared/resolveVikeConfigInternal.js';
 import { isViteServerSide, isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
-const skipNodeModules = '/node_modules/'; // Only apply `.server.js` and `.client.js` to user files
+import { suffixesAssertFileEnv } from '../../../shared-server-node/getFileSuffixes.js';
+const envS = suffixesAssertFileEnv;
+const skipNodeModules = '/node_modules/'; // Only assert `.server.js`, `.client.js` and `.ssr.js` for user files
 const filterRolldown = {
     id: {
-        include: ['client', 'server'].map((env) => `**/*${getSuffix(env)}*`),
+        include: envS.map((env) => `**/*${getSuffix(env)}*`),
         exclude: [`**${skipNodeModules}**`],
     },
 };
 const filterFunction = (id) => {
     if (id.includes(skipNodeModules))
         return false;
-    if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
-        return false;
-    return true;
+    return envS.some((suffix) => id.includes(getSuffix(suffix)));
 };
-function pluginFileEnv() {
+function pluginAssertFileEnv() {
     let config;
     let viteDevServer;
     return [
         {
-            name: 'vike:pluginFileEnv',
+            name: 'vike:pluginAssertFileEnv',
             load: {
                 filter: filterRolldown,
                 handler(id, options) {
@@ -68,7 +68,7 @@ function pluginFileEnv() {
                         return;
                     const { importers } = this.getModuleInfo(id);
                     // Throwing a verbose error doesn't waste client-side KBs as dynamic imports are code split.
-                    const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
+                    const errMsg = getErrMsg(id, isServerSide, importers, false, config, true);
                     // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
                     const { exportNames } = await getExportNames(code);
                     return rollupSourceMapRemove([
@@ -111,7 +111,7 @@ function pluginFileEnv() {
     function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
         if (!isWrongEnv(moduleId, isServerSide))
             return;
-        const errMsg = getErrorMessage(moduleId, isServerSide, importers, onlyWarn, false);
+        const errMsg = getErrMsg(moduleId, isServerSide, importers, onlyWarn, config, false);
         if (onlyWarn) {
             assertWarning(false, errMsg, { onlyOnce: true });
         }
@@ -119,38 +119,43 @@ function pluginFileEnv() {
             assertUsage(false, errMsg);
         }
     }
-    function getErrorMessage(moduleId, isServerSide, importers, onlyWarn, noColor) {
-        const modulePath = getModulePath(moduleId);
-        const envActual = isServerSide ? 'server' : 'client';
-        const envExpect = isServerSide ? 'client' : 'server';
-        let errMsg;
-        let modulePathPretty = getFilePathToShowToUserModule(modulePath, config);
-        if (!noColor) {
-            const suffix = getSuffix(envExpect);
-            modulePathPretty = modulePathPretty.replaceAll(suffix, pc.bold(suffix));
-        }
-        errMsg = `${capitalizeFirstLetter(envExpect)}-only file ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
-        {
-            const importPaths = importers
-                .filter((importer) => 
-            // Can be Vike's virtual module: https://github.com/vikejs/vike/issues/2483
-            isFilePathAbsolute(importer))
-                .map((importer) => getFilePathToShowToUserModule(importer, config))
-                .map((importPath) => pc.cyan(importPath));
-            if (importPaths.length > 0) {
-                errMsg += ` by ${joinEnglish(importPaths, 'and')}`;
-            }
-        }
-        if (onlyWarn) {
-            errMsg += ". This is potentially a security issue and Vike won't allow you to build your app for production.";
-        }
-        return errMsg;
-    }
 }
 function isWrongEnv(moduleId, isServerSide) {
     const modulePath = getModulePath(moduleId);
-    const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
-    return modulePath.includes(suffixWrong);
+    if (isServerSide) {
+        // On server-side, .client. is wrong
+        return modulePath.includes(getSuffix('client'));
+    }
+    else {
+        // On client-side, both .server. and .ssr. are wrong
+        return modulePath.includes(getSuffix('server')) || modulePath.includes(getSuffix('ssr'));
+    }
+}
+function getErrMsg(moduleId, isServerSide, importers, onlyWarn, config, noColor) {
+    const envActual = isServerSide ? 'server' : 'client';
+    const envExpect = isServerSide ? 'client' : 'server';
+    const modulePath = getModulePath(moduleId);
+    let modulePathPretty = getFilePathToShowToUserModule(modulePath, config);
+    if (!noColor) {
+        const suffix = modulePath.includes(getSuffix('ssr')) ? getSuffix('ssr') : getSuffix(envExpect);
+        modulePathPretty = modulePathPretty.replaceAll(suffix, pc.bold(suffix));
+    }
+    let errMsg = `${capitalizeFirstLetter(envExpect)}-only file ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
+    {
+        const importPaths = importers
+            .filter((importer) => 
+        // Can be Vike's virtual module: https://github.com/vikejs/vike/issues/2483
+        isFilePathAbsolute(importer))
+            .map((importer) => getFilePathToShowToUserModule(importer, config))
+            .map((importPath) => pc.cyan(importPath));
+        if (importPaths.length > 0) {
+            errMsg += ` by ${joinEnglish(importPaths, 'and')}`;
+        }
+    }
+    if (onlyWarn) {
+        errMsg += ". This is potentially a security issue and Vike won't allow you to build your app for production.";
+    }
+    return errMsg;
 }
 function skip(id, userRootDir) {
     assert(filterFunction(id));

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

@@ -56,7 +56,7 @@ function assertResolveAlias(config) {
                 assertUsage(find !== '', msg);
             }
             // Ensure path alias are distinguishable from npm package names, which is needed by:
-            //  - determineOptimizeDeps()
+            //  - resolveOptimizeDeps()
             //  - extractAssets
             //  - in general: using un-distinguishable path aliases is asking for trouble
             if (!isPathAliasRecommended(find)) {

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

@@ -1,5 +1,4 @@
 export { pluginCommon };
-export declare let viteVersionUser: string | null | undefined;
 import { type InlineConfig, type Plugin } from 'vite';
 import type { VitePluginServerEntryOptions } from '@brillout/vite-plugin-server-entry/plugin';
 declare module 'vite' {
@@ -9,6 +8,7 @@ declare module 'vite' {
         _rootResolvedEarly?: string;
         _baseViteOriginal?: string;
         _viteConfigFromUserResolved?: InlineConfig;
+        _viteVersionResolved?: string;
     }
 }
 declare global {

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

@@ -1,5 +1,4 @@
 export { pluginCommon };
-export let viteVersionUser = null;
 import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isExactlyOneTruthy, isObject, isVitest, } from '../utils.js';
 import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
@@ -10,6 +9,7 @@ import { isVikeCliOrApi } from '../../../shared-server-node/api-context.js';
 import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVikeConfigInternal.js';
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/resolveViteConfigFromUser.js';
 import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
+import { version as viteVersionVike } from 'vite';
 const pluginName = 'vike:pluginCommon';
 globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
 function pluginCommon(vikeVitePluginOptions) {
@@ -20,7 +20,7 @@ function pluginCommon(vikeVitePluginOptions) {
             config: {
                 order: 'pre',
                 async handler(configFromUser, env) {
-                    viteVersionUser = this?.meta?.viteVersion; // is `undefined` on old Vite versions
+                    const viteVersionUser = this?.meta?.viteVersion; // is `undefined` on old Vite versions
                     const isDev = isDevCheck(env);
                     const isBuild = env.command === 'build';
                     const isPreview = env.isPreview;
@@ -34,6 +34,7 @@ function pluginCommon(vikeVitePluginOptions) {
                     const vikeConfig = await getVikeConfigInternal();
                     return {
                         _isDev: isDev,
+                        _viteVersionResolved: viteVersionUser || viteVersionVike,
                         _rootResolvedEarly: rootResolvedEarly,
                         // TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({

package/dist/node/vite/plugins/pluginDev/optimizeDeps.d.ts

@@ -0,0 +1,15 @@
+export { optimizeDeps };
+export { resolveOptimizeDeps };
+import type { ResolvedConfig } from 'vite';
+declare const optimizeDeps: {
+    readonly optimizeDeps: {
+        readonly exclude: ["vike/client", "vike/client/router"];
+        readonly include: ["vike > @brillout/json-serializer/parse", "vike > @brillout/json-serializer/stringify", "vike > @brillout/picocolors"];
+    };
+    readonly ssr: {
+        readonly optimizeDeps: {
+            readonly exclude: ["@brillout/import", "@brillout/json-serializer", "@brillout/picocolors", "@brillout/vite-plugin-server-entry", "vike"];
+        };
+    };
+};
+declare function resolveOptimizeDeps(config: ResolvedConfig): Promise<void>;

package/dist/node/vite/plugins/pluginDev/{determineOptimizeDeps.js → optimizeDeps.js}

@@ -1,4 +1,5 @@
-export { determineOptimizeDeps };
+export { optimizeDeps };
+export { resolveOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { assert, assertIsImportPathNpmPackage, createDebug, getNpmPackageName, isArray, isFilePathAbsoluteFilesystem, isVirtualFileId, requireResolveOptional, } from '../../utils.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
@@ -7,7 +8,8 @@ import { virtualFileIdGlobalEntryClientCR, virtualFileIdGlobalEntryClientSR, } f
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueSourcesRelevant } from '../pluginVirtualFiles/getConfigValueSourcesRelevant.js';
 const debug = createDebug('vike:optimizeDeps');
-const WORKAROUND_LATE_DISCOVERY = [
+// Add dependencies that cannot be discovered by Vite during the scanning phase
+const LATE_DISCOVERED = [
     // Workaround for https://github.com/vitejs/vite-plugin-react/issues/650
     // - The issue was closed as completed with https://github.com/vitejs/vite/pull/20495 but it doesn't fix the issue and the workaround is still needed.
     // - TO-DO/eventually: try removing the workaround and see if the CI fails (at test/@cloudflare_vite-plugin/) — maybe the issue will get fixed at some point.
@@ -15,11 +17,47 @@ const WORKAROUND_LATE_DISCOVERY = [
     // Workaround for https://github.com/vikejs/vike/issues/2823#issuecomment-3514325487
     '@compiled/react/runtime',
 ];
-async function determineOptimizeDeps(config) {
+const optimizeDeps = {
+    optimizeDeps: {
+        exclude: [
+            // We must exclude Vike's client runtime so it can import virtual modules
+            'vike/client',
+            'vike/client/router',
+        ],
+        include: [
+            // Avoid:
+            // ```
+            // 9:28:58 AM [vite] ✨ new dependencies optimized: @brillout/json-serializer/parse
+            // 9:28:58 AM [vite] ✨ optimized dependencies changed. reloading
+            // ```
+            'vike > @brillout/json-serializer/parse',
+            'vike > @brillout/json-serializer/stringify',
+            'vike > @brillout/picocolors',
+        ],
+    },
+    ssr: {
+        optimizeDeps: {
+            exclude: [
+                '@brillout/import',
+                '@brillout/json-serializer',
+                '@brillout/picocolors',
+                '@brillout/vite-plugin-server-entry',
+                'vike',
+            ],
+        },
+    },
+};
+// Populate optimizeDeps with dynamic entries:
+// - User's + files (i.e. Vike entries)
+// - Late discovered dependencies (if they exist)
+// - Make server environments inherit from ssr.optimizeDeps (it isn't the case by default)
+async function resolveOptimizeDeps(config) {
     const vikeConfig = await getVikeConfigInternal();
     const { _pageConfigs: pageConfigs } = vikeConfig;
+    // Retrieve user's + files (i.e. Vike entries)
     const { entriesClient, entriesServer, includeClient, includeServer } = await getPageDeps(config, pageConfigs);
-    WORKAROUND_LATE_DISCOVERY.forEach((dep) => {
+    // Add late discovered dependencies, if they exist
+    LATE_DISCOVERED.forEach((dep) => {
         const userRootDir = config.root;
         const resolved = requireResolveOptional({ importPath: dep, userRootDir, importerFilePath: null });
         const resolvedInsideRepo = resolved && resolved.startsWith(userRootDir);
@@ -39,8 +77,10 @@ async function determineOptimizeDeps(config) {
             includeServer.push(dep);
         }
     });
+    // Set optimizeDeps (client-side)
     config.optimizeDeps.include = add(config.optimizeDeps.include, includeClient);
     config.optimizeDeps.entries = add(config.optimizeDeps.entries, entriesClient);
+    // Set optimizeDeps (server-side)
     for (const envName in config.environments) {
         const env = config.environments[envName];
         if (env.consumer === 'server' && env.optimizeDeps.noDiscovery === false) {
@@ -48,6 +88,7 @@ async function determineOptimizeDeps(config) {
             env.optimizeDeps.entries = add(env.optimizeDeps.entries, entriesServer);
         }
     }
+    // Debug
     if (debug.isActivated)
         debug('optimizeDeps', {
             'config.optimizeDeps.entries': config.optimizeDeps.entries,

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

@@ -1,5 +1,5 @@
 export { pluginDev };
 export { logDockerHint };
-import type { Plugin, ResolvedConfig } from 'vite';
+import { type Plugin, type ResolvedConfig } from 'vite';
 declare function pluginDev(): Plugin[];
 declare function logDockerHint(configHost: ResolvedConfig['server']['host']): void;

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

@@ -1,6 +1,6 @@
 export { pluginDev };
 export { logDockerHint };
-import { determineOptimizeDeps } from './pluginDev/determineOptimizeDeps.js';
+import { optimizeDeps, resolveOptimizeDeps } from './pluginDev/optimizeDeps.js';
 import { determineFsAllowList } from './pluginDev/determineFsAllowList.js';
 import { addSsrMiddleware } from '../shared/addSsrMiddleware.js';
 import { applyDev, assertWarning, isDocker, isDebugError } from '../utils.js';
@@ -17,30 +17,14 @@ function pluginDev() {
                 handler() {
                     return {
                         appType: 'custom',
-                        optimizeDeps: {
-                            exclude: [
-                                // We must exclude Vike's client runtime so it can import virtual modules
-                                'vike/client',
-                                'vike/client/router',
-                            ],
-                            include: [
-                                // Avoid:
-                                // ```
-                                // 9:28:58 AM [vite] ✨ new dependencies optimized: @brillout/json-serializer/parse
-                                // 9:28:58 AM [vite] ✨ optimized dependencies changed. reloading
-                                // ```
-                                'vike > @brillout/json-serializer/parse',
-                                'vike > @brillout/json-serializer/stringify',
-                                'vike > @brillout/picocolors',
-                            ],
-                        },
+                        ...optimizeDeps,
                     };
                 },
             },
             configResolved: {
                 async handler(config_) {
                     config = config_;
-                    await determineOptimizeDeps(config);
+                    await resolveOptimizeDeps(config);
                     await determineFsAllowList(config);
                     interceptViteLogs(config);
                     logDockerHint(config.server.host);

package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.js

@@ -25,7 +25,7 @@ async function generateVirtualFilePageEntry(id, isDev) {
         assert(pageConfig);
     }
     else {
-        /* This assertion sometimes fail. It happens very seldom and I couldn't reproduce it (https://gist.github.com/brillout/9e212ce829f4d62a912ca163ffa8881a). I suspect some kind of HMR race condition.
+        /* This assertion sometimes fail. It happens very seldom and I couldn't reproduce it (https://gist.github.com/brillout/9e212ce829f4d62a912ca163ffa8881a). I suspect some kind of HMR race condition. UPDATE: [December 2024] This just happened at test/@cloudflare_vite-plugin/ — it isn't blocking, reloading the page fixes the issue.
         assert(pageConfig, { id, pageId })
         /*/
         if (!pageConfig)

package/dist/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js

@@ -3,6 +3,7 @@ export { getConfigValueSourceRelevantAnyEnv };
 export { isRuntimeEnvMatch };
 export { isConfigSourceValueNull };
 import { assert, assertIsNotBrowser } from '../../utils.js';
+import { getFileSuffixes } from '../../../../shared-server-node/getFileSuffixes.js';
 assertIsNotBrowser();
 function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
     const configDef = pageConfig.configDefinitions[configName];
@@ -86,10 +87,10 @@ function isConfigSourceValueNull(source) {
 function applyFilenameSuffix(sourcesRelevant) {
     const getFileName = (source) => source.plusFile?.filePath.fileName ?? '';
     // Apply `clear`: truncate at first clear file
-    const clearIndex = sourcesRelevant.findIndex((source) => getFileName(source).includes('.clear.'));
+    const clearIndex = sourcesRelevant.findIndex((source) => getFileSuffixes(getFileName(source)).includes('clear'));
     if (clearIndex !== -1)
         sourcesRelevant = sourcesRelevant.slice(0, clearIndex + 1);
     // Apply `default`: exclude defaults if any non-defaults exist, otherwise keep only first default
-    const nonDefaults = sourcesRelevant.filter((source) => !getFileName(source).includes('.default.'));
+    const nonDefaults = sourcesRelevant.filter((source) => !getFileSuffixes(getFileName(source)).includes('default'));
     return nonDefaults.length > 0 ? nonDefaults : sourcesRelevant.slice(0, 1);
 }

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

@@ -8,10 +8,10 @@ import { reloadVikeConfig, isV1Design, getVikeConfigInternalOptional } from '../
 import pc from '@brillout/picocolors';
 import { logConfigInfo } from '../shared/loggerDev.js';
 import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
-import { isRunnable, updateUserFiles } from '../../../server/runtime/globalContext.js';
+import { updateUserFiles } from '../../../server/runtime/globalContext.js';
 import { isPlusFile } from '../shared/resolveVikeConfigInternal/crawlPlusFiles.js';
 import { isTemporaryBuildFile } from '../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js';
-import { getVikeConfigError } from '../../../shared-server-node/getVikeConfigError.js';
+import { debugFileChange, getVikeConfigError } from '../../../shared-server-node/getVikeConfigError.js';
 const filterRolldown = {
     id: {
         include: new RegExp(`^(${escapeRegex(virtualFileIdPrefix1)}|${escapeRegex(virtualFileIdPrefix2)})`),
@@ -40,6 +40,7 @@ function pluginVirtualFiles() {
             },
             handleHotUpdate: {
                 async handler(ctx) {
+                    debugFileChange('handleHotUpdate()', ctx.file);
                     try {
                         return await handleHotUpdate(ctx, config);
                     }
@@ -86,9 +87,11 @@ function handleFileAddRemove(server, config) {
         file = normalizePath(file);
         if (isTemporaryBuildFile(file))
             return;
+        const operation = isRemove ? 'removed' : 'created';
+        debugFileChange('server.watcher', file, operation);
         const { moduleGraph } = server;
         const isVikeConfigDep = await isVikeConfigDependency(file, moduleGraph);
-        const reload = () => reloadConfig(file, config, isRemove ? 'removed' : 'created', server);
+        const reload = () => reloadConfig(file, config, operation, server);
         // Config code
         if (isVikeConfigDep && !isVikeConfigDep.isProcessedByVite) {
             reload();
@@ -127,6 +130,7 @@ function invalidateVikeVirtualFiles(server) {
 async function handleHotUpdate(ctx, config) {
     const { file, server } = ctx;
     const isVikeConfigDep = await isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
+    debugFileChange(isVikeConfigDep);
     if (isVikeConfigDep) {
         if (!isVikeConfigDep.isProcessedByVite) {
             /* Tailwind breaks this assertion, see https://github.com/vikejs/vike/discussions/1330#discussioncomment-7787238
@@ -141,11 +145,9 @@ async function handleHotUpdate(ctx, config) {
         }
         else {
             // Ensure we invalidate `file` *before* server.ssrLoadModule() in updateUserFiles()
-            // Vite already invalidates it, but *after* handleHotUpdate() and thus after server.ssrLoadModule()
+            // Vite also invalidates it, but *after* handleHotUpdate() and thus after server.ssrLoadModule()
             ctx.modules.forEach((mod) => server.moduleGraph.invalidateModule(mod));
-            if (isRunnable(server)) {
-                await updateUserFiles();
-            }
+            await updateUserFiles();
         }
     }
 }
@@ -172,12 +174,12 @@ async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
         return { isProcessedByVite: true };
     return null;
 }
-function reloadConfig(filePath, config, op, server) {
+function reloadConfig(filePath, config, operation, server) {
     // Ensure server.ssrLoadModule() loads fresh Vike virtual files (`reloadConfig()` > `updateUserFiles()` > `server.ssrLoadModule()`)
     invalidateVikeVirtualFiles(server);
     {
         const filePathToShowToUserResolved = getFilePathToShowToUserModule(filePath, config);
-        const msg = `${op} ${pc.dim(filePathToShowToUserResolved)}`;
+        const msg = `${operation} ${pc.dim(filePathToShowToUserResolved)}`;
         logConfigInfo(msg, 'info');
     }
     reloadVikeConfig();

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

@@ -114,6 +114,14 @@ const configDefinitionsBuiltIn = {
                 .flat(1)
                 // Server-only
                 .filter((source) => !source.configEnv.client)
+                // Exclude `.ssr.js` hooks (they don't require pageContext.json requests)
+                .filter((source) => {
+                const { definedAt } = source;
+                if ('filePathAbsoluteVite' in definedAt && definedAt.filePathAbsoluteVite.includes('.ssr.')) {
+                    return false;
+                }
+                return true;
+            })
                 // Config value isn't `null`
                 .filter((source) => !isConfigSourceValueNull(source));
             return sources.length > 0;

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

@@ -12,6 +12,7 @@ export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast, genPromise, checkType, objectAssign, getGlobalObject, } from '../utils.js';
 import { configDefinitionsBuiltIn, } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import { getFileSuffixes } from '../../../shared-server-node/getFileSuffixes.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect, } from './resolveVikeConfigInternal/filesystemRouting.js';
 import { getViteDevServer, vikeConfigErrorRecoverMsg } from '../../../server/runtime/globalContext.js';
 import { logConfigInfo, logErrorServerDev } from './loggerDev.js';
@@ -1066,16 +1067,16 @@ function getConfVal(plusFile, configName) {
 function resolveConfigEnv(configEnv, filePath) {
     const configEnvResolved = { ...configEnv };
     if (filePath.filePathAbsoluteFilesystem) {
-        const { fileName } = filePath;
-        if (fileName.includes('.server.')) {
+        const suffixes = getFileSuffixes(filePath.fileName);
+        if (suffixes.includes('ssr') || suffixes.includes('server')) {
             configEnvResolved.server = true;
             configEnvResolved.client = false;
         }
-        else if (fileName.includes('.client.')) {
+        else if (suffixes.includes('client')) {
             configEnvResolved.client = true;
             configEnvResolved.server = false;
         }
-        else if (fileName.includes('.shared.')) {
+        else if (suffixes.includes('shared')) {
             configEnvResolved.server = true;
             configEnvResolved.client = true;
         }

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

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

package/dist/server/__internal/vite.js

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