vike 0.4.267-commit-5676e14 → 0.4.267-commit-e667e7c

package/dist/client/runtime-client-routing/createPageContextClient.d.ts

@@ -46,6 +46,7 @@ declare function createPageContextClient(urlOriginal: string): Promise<{
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;

package/dist/client/runtime-client-routing/getGlobalContextClientInternal.d.ts

@@ -32,6 +32,7 @@ declare function getGlobalContextClientInternal(): Promise<{
     _allPageIds: string[];
 } & {
     isClientSide: true;
+    devMiddleware: null;
 } & {
     _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;

package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts

@@ -64,6 +64,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -124,6 +125,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
             _allPageIds: string[];
         } & {
             isClientSide: true;
+            devMiddleware: null;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -316,6 +318,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -376,6 +379,7 @@ declare function getPageContextFromHooksClient(pageContext: {
             _allPageIds: string[];
         } & {
             isClientSide: true;
+            devMiddleware: null;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;

package/dist/client/runtime-client-routing/renderPageClient.d.ts

@@ -78,6 +78,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -135,6 +136,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
             _allPageIds: string[];
         } & {
             isClientSide: true;
+            devMiddleware: null;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -268,6 +270,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -325,6 +328,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
             _allPageIds: string[];
         } & {
             isClientSide: true;
+            devMiddleware: null;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -459,6 +463,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -516,6 +521,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
             _allPageIds: string[];
         } & {
             isClientSide: true;
+            devMiddleware: null;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -653,6 +659,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
@@ -710,6 +717,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
             _allPageIds: string[];
         } & {
             isClientSide: true;
+            devMiddleware: null;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
             _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;

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

@@ -311,13 +311,6 @@ async function renderPageClient(renderArgs) {
         else {
             objectAssign(pageContext, { is404: false });
         }
-        const isClientRoutable = await isClientSideRoutable(pageContext.pageId, pageContext);
-        if (isRenderOutdated())
-            return;
-        if (!isClientRoutable) {
-            redirectHard(urlOriginal);
-            return;
-        }
         if (import.meta.env.DEV || globalThis.__VIKE__IS_DEBUG) {
             assertInfo(false, `Rendering error page ${errorPageId}`, { onlyOnce: false });
         }

package/dist/client/runtime-server-routing/createPageContextClient.d.ts

@@ -42,6 +42,7 @@ declare function createPageContextClient(): Promise<{
         _allPageIds: string[];
     } & {
         isClientSide: true;
+        devMiddleware: null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;

package/dist/client/runtime-server-routing/getGlobalContextClientInternal.d.ts

@@ -32,4 +32,5 @@ declare function getGlobalContextClientInternal(): Promise<{
     _allPageIds: string[];
 } & {
     isClientSide: true;
+    devMiddleware: null;
 }>;

package/dist/client/shared/getGlobalContextClientInternalShared.d.ts

@@ -43,6 +43,7 @@ declare function getGlobalContextClientInternalShared(): Promise<{
      * https://vike.dev/globalContext#isClientSide
      */
     isClientSide: true;
+    devMiddleware: null;
 }>;
 type TypeIsNotExported = never;
 declare function getGlobalContext(): Promise<TypeIsNotExported>;

package/dist/client/shared/getGlobalContextClientInternalShared.js

@@ -36,6 +36,8 @@ async function getGlobalContextClientInternalShared() {
              * https://vike.dev/globalContext#isClientSide
              */
             isClientSide: true,
+            // https://vike.dev/globalContext#devMiddleware
+            devMiddleware: null,
         };
         objectAssign(globalContextAddendum, getGlobalContextSerializedInHtml());
         return globalContextAddendum;

package/dist/client/shared/removeFoucBuster.js

@@ -38,9 +38,20 @@ function clean() {
         const href = linkVike.getAttribute('href');
         assert(href && href.endsWith(suffix));
         let filePathAbsoluteUserRootDir = href.slice(0, -suffix.length);
-        const prefix = '/@fs/';
-        if (filePathAbsoluteUserRootDir.startsWith(prefix))
-            filePathAbsoluteUserRootDir = filePathAbsoluteUserRootDir.slice(prefix.length);
+        const prefixFs = '/@fs/';
+        if (filePathAbsoluteUserRootDir.startsWith(prefixFs))
+            filePathAbsoluteUserRootDir = filePathAbsoluteUserRootDir.slice(prefixFs.length);
+        // CSS virtual module:
+        // ```js
+        // import 'virtual:some.css'
+        // ```
+        // ID becomes:
+        // ```
+        // <link href="/@id/__x00__virtual:some.css?direct" rel="stylesheet" type="text/css">
+        // ```
+        const prefixId = '/@id/';
+        if (filePathAbsoluteUserRootDir.startsWith(prefixId))
+            filePathAbsoluteUserRootDir = filePathAbsoluteUserRootDir.slice(prefixId.length).replace('__x00__', '\0');
         if (injectedByVite.some((filePathAbsoluteFilesystem) => filePathAbsoluteFilesystem.endsWith(filePathAbsoluteUserRootDir))) {
             linkVike.remove();
         }

package/dist/node/api/dev.js

@@ -5,6 +5,7 @@ import { assert } from '../../utils/assert.js';
 import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
 import './assertEnvApiDev.js';
 import { startupLog } from './startupLog.js';
+import { startServerEntry_parent, startServerEntry_child, getServerEntryFilePath_ifDevCli, isServerChildProcess, } from './serverEntryDev.js';
 assertIsNotProductionRuntime();
 /**
  * Programmatically trigger `$ vike dev`
@@ -13,7 +14,15 @@ assertIsNotProductionRuntime();
  */
 async function dev(options = {}) {
     const { viteConfigUser } = await prepareViteApiCall(options, 'dev');
-    const server = await createServer(viteConfigUser);
+    // `$ vike dev` runs +serverEntry.js if there isn't +server.js — https://vike.dev/serverEntry
+    const serverEntryFilePath = await getServerEntryFilePath_ifDevCli();
+    const serverEntryIsChildProcess = isServerChildProcess();
+    if (serverEntryFilePath && !serverEntryIsChildProcess)
+        return await startServerEntry_parent();
+    const server = await createServer(serverEntryFilePath
+        ? // +serverEntry.js creates the server: it uses Vite's development server as middleware
+            setMiddlewareMode(viteConfigUser)
+        : viteConfigUser);
     const viteServer = server;
     const viteConfig = server.config;
     const viteVersion = viteConfig._viteVersionResolved;
@@ -22,9 +31,14 @@ async function dev(options = {}) {
         await viteServer.listen();
     if (options.startupLog)
         startupLog(viteConfig, viteServer);
+    if (serverEntryFilePath && serverEntryIsChildProcess)
+        await startServerEntry_child(viteServer, serverEntryFilePath);
     return {
         viteServer,
         viteConfig,
         viteVersion,
     };
 }
+function setMiddlewareMode(viteConfig) {
+    return { ...viteConfig, server: { ...viteConfig.server, middlewareMode: true } };
+}

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

@@ -0,0 +1,10 @@
+export { startServerEntry_parent };
+export { startServerEntry_child };
+export { getServerEntryFilePath_ifDevCli };
+export { isServerChildProcess };
+import { type ViteDevServer } from 'vite';
+import './assertEnvApiDev.js';
+declare function startServerEntry_parent(): Promise<never>;
+declare function startServerEntry_child(viteServer: ViteDevServer, serverEntryFilePath: string): Promise<void>;
+declare function getServerEntryFilePath_ifDevCli(): Promise<string | null>;
+declare function isServerChildProcess(): boolean;

package/dist/node/api/serverEntryDev.js

@@ -0,0 +1,113 @@
+export { startServerEntry_parent };
+export { startServerEntry_child };
+export { getServerEntryFilePath_ifDevCli };
+export { isServerChildProcess };
+// `$ vike dev` runs +serverEntry.js (if there isn't +server.js) — https://vike.dev/serverEntry
+// - The parent process (`$ vike dev`) runs +serverEntry.js in a child process, and restarts the child process whenever a file imported by +serverEntry.js changes
+// - The child process creates Vite's development server (in middleware mode) and runs +serverEntry.js using Vite's module runner
+import { fork } from 'node:child_process';
+import path from 'node:path';
+import { normalizePath } from 'vite';
+import pc from '@brillout/picocolors';
+import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
+import { getServerEntryFilePath_ifDev } from '../vite/plugins/pluginUniversalDeploy/getServerConfig.js';
+import { isVikeCli } from '../cli/context.js';
+import { assert, assertInfo, assertUsage } from '../../utils/assert.js';
+import { isRunnableDevEnvironment } from '../../utils/isRunnableDevEnvironment.js';
+import './assertEnvApiDev.js';
+const IS_SERVER_CHILD_PROCESS = '__VIKE_IS_SERVER_CHILD_PROCESS';
+// The child process exits with this code to tell the parent process to restart it
+const EXIT_CODE_RESTART = 33;
+// Parent process — child_process.fork()
+function startServerEntry_parent() {
+    const [scriptPath, ...args] = process.argv.slice(1);
+    assert(scriptPath);
+    let child;
+    let signalReceived;
+    const forkChild = () => {
+        child = fork(scriptPath, args, { stdio: 'inherit', env: { ...process.env, [IS_SERVER_CHILD_PROCESS]: '1' } });
+        child.on('exit', (code, signal) => {
+            if (code === EXIT_CODE_RESTART && !signalReceived)
+                forkChild();
+            else
+                exitLikeChild(code, signal ?? signalReceived ?? null);
+        });
+    };
+    const onSignal = (signal) => {
+        signalReceived = signal;
+        child.kill(signal);
+    };
+    process.on('SIGINT', onSignal);
+    process.on('SIGTERM', onSignal);
+    forkChild();
+    // The parent process exits when the child process exits
+    return new Promise(() => { });
+}
+// Exit with the same exit code or signal as the child process
+function exitLikeChild(code, signal) {
+    if (signal) {
+        process.removeAllListeners(signal);
+        process.kill(process.pid, signal);
+    }
+    else {
+        process.exit(code ?? 1);
+    }
+}
+// Child process — viteServer.ssrLoadModule()
+async function startServerEntry_child(viteServer, serverEntryFilePath) {
+    const { ssr } = viteServer.environments;
+    assertUsage(isRunnableDevEnvironment(ssr), `${pc.cyan('$ vike dev')} cannot run +serverEntry.js because Vite's ${pc.cyan('ssr')} environment isn't runnable`);
+    // Restart when +serverEntry.js or a file it imports changes
+    restartOnFileChange(viteServer, (filePath) => isImportedBy(ssr.moduleGraph.getModulesByFile(filePath), serverEntryFilePath));
+    // The user's server uses the current Vite development server (e.g. `app.use(devMiddleware)`) => we restart the process instead of letting Vite restart itself (e.g. upon vite.config.js changes)
+    viteServer.restart = async () => restart('Vite needs to restart');
+    try {
+        // Same module runner as the one Vike uses to load pages (`ssrLoadModule()`) => a module imported by both +serverEntry.js and a page is instantiated only once (like in production)
+        await viteServer.ssrLoadModule(serverEntryFilePath);
+    }
+    catch (err) {
+        console.error(err);
+        assertInfo(false, 'Waiting for file changes before restarting server...', { onlyOnce: false });
+        restartOnFileChange(viteServer, () => true);
+    }
+}
+function restartOnFileChange(viteServer, isRestartNeeded) {
+    const onFileChange = (filePath) => {
+        filePath = normalizePath(filePath);
+        if (isRestartNeeded(filePath))
+            restart(`${pc.cyan(path.relative(viteServer.config.root, filePath))} changed`);
+    };
+    viteServer.watcher.on('change', onFileChange);
+    viteServer.watcher.on('unlink', onFileChange);
+}
+function restart(reason) {
+    assertInfo(false, `${reason}, restarting server...`, { onlyOnce: false });
+    process.exit(EXIT_CODE_RESTART);
+}
+// Only `$ vike dev` runs +serverEntry.js, not the programmatic API `dev()`: the parent process re-runs the command (process.argv) in the child process
+async function getServerEntryFilePath_ifDevCli() {
+    if (!isVikeCli())
+        return null;
+    const vikeConfig = await getVikeConfigInternal();
+    const serverEntryFilePath = getServerEntryFilePath_ifDev(vikeConfig);
+    return serverEntryFilePath;
+}
+// Whether one of the modules is +serverEntry.js or (transitively) imported by +serverEntry.js
+// - Pages aren't imported by +serverEntry.js: Vike loads them over its own virtual entries => changing a page doesn't restart the server (Vite's HMR handles it)
+function isImportedBy(modules, serverEntryFilePath) {
+    const visited = new Set();
+    const stack = [...(modules ?? [])];
+    while (stack.length > 0) {
+        const mod = stack.pop();
+        if (visited.has(mod))
+            continue;
+        visited.add(mod);
+        if (mod.file === serverEntryFilePath)
+            return true;
+        stack.push(...mod.importers);
+    }
+    return false;
+}
+function isServerChildProcess() {
+    return process.env[IS_SERVER_CHILD_PROCESS] === '1';
+}

package/dist/node/createDevMiddleware.js

@@ -1,12 +1,24 @@
 export { createDevMiddleware };
 import { createServer } from 'vite';
 import { prepareViteApiCall } from './api/prepareViteApiCall.js';
+import { getViteDevServer } from '../server/runtime/globalContext.js';
+import { assertWarning } from '../utils/assert.js';
+import pc from '@brillout/picocolors';
 /*
  * Create server middleware for development with HMR and lazy-transpiling.
  *
  * https://vike.dev/createDevMiddleware
  */
 async function createDevMiddleware(options = {}) {
+    {
+        const viteServer = getViteDevServer();
+        if (viteServer) {
+            assertWarning(false, 
+            // E.g. `$ vike dev` already created it (+serverEntry.js, +server.js), or createDevMiddleware() was already called
+            `Development middleware already created: use ${pc.cyan('globalContext.devMiddleware')} to access it instead of calling ${pc.cyan('createDevMiddleware()')}`, { onlyOnce: true });
+            return { devMiddleware: viteServer.middlewares, viteServer, viteConfig: viteServer.config };
+        }
+    }
     const optionsMod = {
         ...options,
         viteConfig: {

package/dist/node/prerender/resolvePrerenderConfig.d.ts

@@ -21,4 +21,4 @@ declare function resolvePrerenderConfigLocal(pageConfig: PageConfigBuildTime): P
 declare function isDistServerRemoved(prerenderConfigGlobal: {
     isPrerenderingEnabledForAllPages: boolean;
     keepDistServer: boolean;
-}): boolean;
+}, vikeConfig: Pick<VikeConfigInternal, '_pageConfigGlobal'>): boolean;

package/dist/node/prerender/resolvePrerenderConfig.js

@@ -70,9 +70,12 @@ async function resolvePrerenderConfigLocal(pageConfig) {
 }
 // Whether pre-rendering removes dist/server/ once it's done
 // https://vike.dev/prerender#keepDistServer
-function isDistServerRemoved(prerenderConfigGlobal) {
+function isDistServerRemoved(prerenderConfigGlobal, vikeConfig) {
     if (!prerenderConfigGlobal.isPrerenderingEnabledForAllPages)
         return false;
+    // +serverEntry.js => dist/server/index.mjs is the user's server entry
+    if (vikeConfig._pageConfigGlobal.configValueSources.serverEntry)
+        return false;
     return !prerenderConfigGlobal.keepDistServer;
 }
 function isObject2(value) {

package/dist/node/prerender/runPrerender.d.ts

@@ -76,12 +76,6 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     isPrerendering: boolean;
     _requestId: number;
 } & import("../../types/PageContext.js").PageContextInit & {
-    _nodeDev?: {
-        req: import("http").IncomingMessage;
-        res: import("http").ServerResponse;
-    };
-    _reqWeb?: Request;
-} & {
     _globalContext: ({
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -118,6 +112,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
+        devMiddleware: import("vite").Connect.Server | null;
         viteConfig: import("vite").ResolvedConfig | undefined;
     } | {
         isClientSide: false;
@@ -126,6 +121,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -136,12 +132,11 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: false;
         viteConfig: null;
     }) & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -152,6 +147,9 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        middlewares: import("../../server/runtime/universal-middleware/core.js").Middleware[];
     })) & {
         prerenderContext: PrerenderContextPublic | undefined;
     };
@@ -159,12 +157,6 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: import("../../types/PageContext.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         headers?: Record<string, unknown>;
     };
     _urlHandler: ((url: string) => string) | null;

package/dist/node/prerender/runPrerender.js

@@ -142,7 +142,7 @@ async function runPrerender(options = {}, trigger) {
     const prerenderContextPublic = getPrerenderContextPublic(prerenderContext);
     objectAssign(vikeConfig.prerenderContext, prerenderContextPublic, true);
     setGlobalContext_prerenderContext(prerenderContextPublic);
-    if (isDistServerRemoved(prerenderConfigGlobal)) {
+    if (isDistServerRemoved(prerenderConfigGlobal, vikeConfig)) {
         fs.rmSync(outDirServer, { recursive: true });
     }
 }

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

@@ -147,7 +147,7 @@ async function getPageFileEntries(config, includeAssetsImportedByServer, isServe
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');
     }
-    let pageFiles = await findPageFiles(config, fileTypes, false);
+    let pageFiles = await findPageFiles(config, fileTypes);
     const pageFileEntries = {};
     pageFiles = unique(pageFiles);
     pageFiles.forEach((pageFile) => {

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

@@ -184,7 +184,7 @@ async function disableAutoImportIfPrerendering(isBuild) {
         return;
     const vikeConfig = await getVikeConfigInternal();
     const prerenderConfigGlobal = await resolvePrerenderConfigGlobal(vikeConfig);
-    if (isDistServerRemoved(prerenderConfigGlobal)) {
+    if (isDistServerRemoved(prerenderConfigGlobal, vikeConfig)) {
         return { vitePluginServerEntry: { disableAutoImport: true } };
     }
 }

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

@@ -9,7 +9,7 @@ declare const optimizeDeps: {
     };
     readonly ssr: {
         readonly optimizeDeps: {
-            readonly exclude: ["@brillout/import", "@brillout/json-serializer", "@brillout/vite-plugin-server-entry", "vike"];
+            readonly exclude: ["@brillout/import", "@brillout/json-serializer", "@brillout/vite-plugin-server-entry", "vike", "@universal-middleware/core"];
         };
     };
 };

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

@@ -65,6 +65,8 @@ const optimizeDeps = {
                 */
                 '@brillout/vite-plugin-server-entry',
                 'vike',
+                // Needed so that Vike doesn't get the user's @universal-middleware/core version (that might differ from Vike's @universal-middleware/core version). (Vite pre-bundles one copy per package name for every importer: https://github.com/vitejs/vite/issues/9948)
+                '@universal-middleware/core',
             ],
         },
     },
@@ -211,7 +213,7 @@ async function getPageDeps(config, pageConfigs, pageConfigGlobal) {
     }
     // V0.4 design
     {
-        const pageFiles = await findPageFiles(config, ['.page', '.page.client'], true);
+        const pageFiles = await findPageFiles(config, ['.page', '.page.client']);
         const userRootDir = config.root;
         pageFiles.forEach((filePathAbsoluteUserRootDir) => {
             const entry = getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir });

package/dist/node/vite/plugins/pluginUniversalDeploy/getServerConfig.d.ts

@@ -1,5 +1,6 @@
 export { getServerConfig };
 export { isUniversalDeployVitePreview };
+export { getServerEntryFilePath_ifDev };
 import type { ResolvedConfig } from 'vite';
 import type { VikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import '../../assertEnvVite.js';
@@ -7,5 +8,7 @@ declare function getServerConfig(vikeConfig: VikeConfigInternal): {
     serverEntryId: string;
     serverEntryVike: string;
     serverFilePath: string | null;
+    serverEntryFilePath: string | null;
 } | undefined;
+declare function getServerEntryFilePath_ifDev(vikeConfig: VikeConfigInternal): string | null;
 declare function isUniversalDeployVitePreview(vikeConfig: VikeConfigInternal, viteConfigResolved: ResolvedConfig): boolean | null;

package/dist/node/vite/plugins/pluginUniversalDeploy/getServerConfig.js

@@ -1,5 +1,6 @@
 export { getServerConfig };
 export { isUniversalDeployVitePreview };
+export { getServerEntryFilePath_ifDev };
 import { catchAllEntry } from '@universal-deploy/store';
 import { assert } from '../../../../utils/assert.js';
 import '../../assertEnvVite.js';
@@ -7,12 +8,15 @@ function getServerConfig(vikeConfig) {
     let serverEntryId;
     let serverFilePath = null;
     let serverEntryVike;
+    const serverEntryFilePath = getServerEntryFilePath(vikeConfig);
     // universal-deploy support must be manually enabled
     const serverConfig = 
     // +config.js > `export default { server: true }`
     vikeConfig.config.server ||
         // +server.js exists
         !!vikeConfig._pageConfigGlobal.configValueSources.server ||
+        // +serverEntry.js exists
+        !!serverEntryFilePath ||
         false;
     if (serverConfig === false)
         return;
@@ -36,12 +40,34 @@ function getServerConfig(vikeConfig) {
         // It either points to the default fetchable endpoint (vike/fetch), or one defined by the user through +server.
         serverEntryVike,
         serverFilePath,
+        // +serverEntry.js => it's the production server entry dist/server/index.mjs (instead of @universal-deploy/node's)
+        serverEntryFilePath,
     };
 }
+// https://vike.dev/serverEntry
+function getServerEntryFilePath(vikeConfig) {
+    const source = vikeConfig._pageConfigGlobal.configValueSources.serverEntry?.[0];
+    if (!source)
+        return null;
+    assert(source.valueIsLoaded && source.valueIsFilePath && typeof source.value === 'string');
+    assert('filePathAbsoluteFilesystem' in source.definedAt);
+    // `source.value` is the import path, e.g. `some-npm-package/serverEntry` if the file cannot be resolved
+    return source.definedAt.filePathAbsoluteFilesystem ?? source.value;
+}
+// The +serverEntry.js that `$ vike dev` runs: only if there isn't +server.js (otherwise +serverEntry.js is production-only)
+// https://vike.dev/serverEntry
+function getServerEntryFilePath_ifDev(vikeConfig) {
+    if (vikeConfig._pageConfigGlobal.configValueSources.server)
+        return null;
+    return getServerEntryFilePath(vikeConfig);
+}
 function isUniversalDeployVitePreview(vikeConfig, viteConfigResolved) {
     const isServerConfig = getServerConfig(vikeConfig);
     if (!isServerConfig)
         return null; // not UD
+    // +serverEntry.js => dist/server/index.mjs is the user's server entry => real preview
+    if (isServerConfig.serverEntryFilePath)
+        return false;
     // @universal-deploy/node -> real preview
     // else -> vite preview
     const udNodePlugin = viteConfigResolved.plugins.find((p) => p.name.match(/^ud:node:(?!.*:disabled$)/));

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginServerEntryAlias.d.ts

@@ -1,5 +1,5 @@
 export { pluginServerEntryAlias };
 import type { Plugin } from 'vite';
 import '../../assertEnvVite.js';
-/** Alias for virtual:ud:catch if no userland server entry */
+/** `vike:server` => alias for virtual:ud:catch-all, also re-exporting the non-default exports of +server.js (if any) */
 declare function pluginServerEntryAlias(serverFilePath?: string | null): Plugin;