vike 0.4.259-commit-2fe6cc7 → 0.4.259-commit-fc34c43

package/dist/node/api/resolveViteConfigFromUser.js

@@ -14,7 +14,7 @@ import { toPosixPath } from '../../utils/path.js';
 import pc from '@brillout/picocolors';
 import { getEnvVarObject } from '../vite/shared/getEnvVarObject.js';
 import { getVikeApiOperation, isVikeCliOrApi } from '../../shared-server-node/api-context.js';
-import { getViteCommandFromCli } from '../vite/shared/isViteCli.js';
+import { getViteCliCommand, getViteCliArgs } from '../vite/shared/isViteCli.js';
 import './assertEnvApiDevAndProd.js';
 const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
 async function resolveViteConfigFromUser() {
@@ -59,8 +59,16 @@ async function getViteInfo(viteContext) {
     // Precedence:
     // 1. (highest precedence)  |  viteConfigFromUserEnvVar          |  VITE_CONFIG
     // 2.                       |  viteConfigFromUserVikeMode        |  VIKE_CONFIG & Vike CLI options — only `+mode`
-    // 2.                       |  viteConfigFromUserVikeApiOptions  |  Vike API options
-    // 3. (lowest precedence)   |  viteConfigFromUserViteFile        |  vite.config.js
+    // 3.                       |  viteConfigFromUserViteCli         |  Vite CLI args — `[root]` & `-c/--config`
+    // 4.                       |  viteConfigFromUserVikeApiOptions  |  Vike API options
+    // 5. (lowest precedence)   |  viteConfigFromUserViteConfigFile  |  vite.config.js
+    // Resolve Vite CLI args (when invoked via Vite's CLI rather than Vike's API).
+    // Without this, Vike loads vite.config.js blind to `vite [root]` / `-c <file>` and
+    // ends up with the wrong root when those Vite CLI args are used.
+    const viteConfigFromUserViteCli = getViteCliArgs();
+    if (viteConfigFromUserViteCli) {
+        viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromUserViteCli);
+    }
     // Resolve Vike's +mode setting
     {
         const viteConfigFromUserVikeMode = pick(getVikeConfigFromCliOrEnv().vikeConfigFromCliOrEnv, ['mode']);
@@ -156,7 +164,7 @@ async function loadViteConfigFile(viteConfigFromUserResolved, viteContext) {
 }
 function getViteContext() {
     const vikeApiOperation = getVikeApiOperation();
-    const viteCommand = getViteCommandFromCli();
+    const viteCommand = getViteCliCommand();
     assert(!(viteCommand && vikeApiOperation));
     if (vikeApiOperation)
         return getViteContextWithOperation(vikeApiOperation.operation);
@@ -224,7 +232,12 @@ async function assertViteRoot2(root, viteConfigFromUserResolved, viteContext) {
 function assertViteRoot(rootResolvedEarly, config) {
     const rootResolved = config.root;
     const rootGlobal = globalObject.root;
-    if (rootGlobal)
-        assert(normalizeViteRoot(rootGlobal) === normalizeViteRoot(rootResolvedEarly));
+    if (rootGlobal && normalizeViteRoot(rootGlobal) !== normalizeViteRoot(rootResolvedEarly)) {
+        assert(false, {
+            rootResolved,
+            rootGlobal,
+            rootResolvedEarly,
+        });
+    }
     assertUsage(normalizeViteRoot(rootResolvedEarly) === normalizeViteRoot(rootResolved), errMsg);
 }

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

@@ -72,7 +72,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     isPrerendering: boolean;
     _requestId: number;
 } & import("../../types/PageContext.js").PageContextInit & {
-    _reqDev?: import("http").IncomingMessage;
+    _nodeDev?: {
+        req: import("http").IncomingMessage;
+        res: import("http").ServerResponse;
+    };
     _reqWeb?: Request;
 } & {
     _globalContext: ({
@@ -148,7 +151,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: import("../../types/PageContext.js").PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         headers?: Record<string, unknown>;

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

@@ -5,7 +5,7 @@ import { assert, assertWarning } from '../../../../utils/assert.js';
 import { onSetupBuild } from '../../../../utils/assertSetup.js';
 import { getGlobalObject } from '../../../../utils/getGlobalObject.js';
 import { isPrerenderAutoRunEnabled, wasPrerenderRun } from '../../../prerender/context.js';
-import { isViteCli, getViteConfigForBuildFromCli } from '../../shared/isViteCli.js';
+import { isViteCli, getViteBuildCliArgs } from '../../shared/isViteCli.js';
 import pc from '@brillout/picocolors';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { isVikeCliOrApi } from '../../../../shared-server-node/api-context.js';
@@ -141,7 +141,7 @@ async function triggerPrerendering(config, viteEnv, bundle) {
 }
 async function abortViteBuildSsr() {
     const vikeConfig = await getVikeConfigInternal();
-    if (vikeConfig.config.disableAutoFullBuild !== true && isViteCli() && getViteConfigForBuildFromCli()?.build.ssr) {
+    if (vikeConfig.config.disableAutoFullBuild !== true && isViteCli() && getViteBuildCliArgs()?.build.ssr) {
         assertWarning(false, `The CLI call ${pc.cyan('$ vite build --ssr')} is superfluous since ${pc.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${pc.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
@@ -160,7 +160,7 @@ function isPrerenderForceExit() {
     return globalObject.forceExit;
 }
 function getFullBuildInlineConfig(config) {
-    const configFromCli = !isViteCli() ? null : getViteConfigForBuildFromCli();
+    const configFromCli = !isViteCli() ? null : getViteBuildCliArgs();
     if (config._viteConfigFromUserResolved) {
         return config._viteConfigFromUserResolved;
     }

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

@@ -14,7 +14,7 @@ function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled)
         const pageContextInit = {
             urlOriginal: url,
             headersOriginal: headers,
-            _reqDev: req,
+            _nodeDev: { req, res },
         };
         Object.defineProperty(pageContextInit, 'userAgent', {
             get() {

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

@@ -1,6 +1,7 @@
 export { isViteCli };
-export { getViteConfigForBuildFromCli };
-export { getViteCommandFromCli };
+export { getViteCliArgs };
+export { getViteBuildCliArgs };
+export { getViteCliCommand };
 import '../assertEnvVite.js';
 declare function isViteCli(): boolean;
 type ConfigFromCli = {
@@ -10,5 +11,9 @@ type ConfigFromCli = {
     build: Record<string, unknown>;
 };
 type ViteCommand = 'dev' | 'build' | 'optimize' | 'preview';
-declare function getViteCommandFromCli(): ViteCommand | null;
-declare function getViteConfigForBuildFromCli(): null | ConfigFromCli;
+declare function getViteCliCommand(): ViteCommand | null;
+declare function getViteBuildCliArgs(): null | ConfigFromCli;
+declare function getViteCliArgs(): null | {
+    root: string | undefined;
+    configFile: string | undefined;
+};

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

@@ -1,6 +1,7 @@
 export { isViteCli };
-export { getViteConfigForBuildFromCli };
-export { getViteCommandFromCli };
+export { getViteCliArgs };
+export { getViteBuildCliArgs };
+export { getViteCliCommand };
 import { assert } from '../../../utils/assert.js';
 import { isObject } from '../../../utils/isObject.js';
 import { isToolCli } from '../../../utils/isToolCli.js';
@@ -10,7 +11,7 @@ const desc = 'vike:vite-cli-simulation';
 function isViteCli() {
     return isToolCli('vite');
 }
-function getViteCommandFromCli() {
+function getViteCliCommand() {
     if (!isViteCli())
         return null;
     let command;
@@ -45,7 +46,7 @@ function getViteCommandFromCli() {
     assert(command);
     return command;
 }
-function getViteConfigForBuildFromCli() {
+function getViteBuildCliArgs() {
     if (!isViteCli())
         return null;
     // Copied & adapted from Vite
@@ -135,3 +136,22 @@ function getViteConfigForBuildFromCli() {
         return ret;
     }
 }
+function getViteCliArgs() {
+    if (!isViteCli())
+        return null;
+    const cli = cac(desc);
+    cli.option('-c, --config <file>', desc);
+    let result = null;
+    const setResult = (root, options) => {
+        assert(root === undefined || typeof root === 'string');
+        assert(isObject(options));
+        assert(options.config === undefined || typeof options.config === 'string');
+        result = { root, configFile: options.config };
+    };
+    cli.command('[root]', desc).alias('serve').alias('dev').action(setResult);
+    cli.command('build [root]', desc).action(setResult);
+    cli.command('optimize [root]', desc).action(setResult);
+    cli.command('preview [root]', desc).action(setResult);
+    cli.parse();
+    return result;
+}

package/dist/server/runtime/globalContext.js

@@ -454,9 +454,12 @@ async function createGlobalContext(virtualFileExportsGlobalEntry) {
     debug('createGlobalContext() - done [sync]');
     // We define an early globalContext version synchronously, so that getGlobalContextSync() can be called early.
     // - Required by vike-vercel
-    assert(globalObject.globalContext);
+    const globalContextIsSetEarly = !!globalObject.globalContext;
+    assertWarning(globalContextIsSetEarly, "globalContext isn't set early", { onlyOnce: false });
     const globalContext = await globalContextPromise;
     debug('createGlobalContext() - done [async]');
+    assert(globalContextIsSetEarly); // We deliberately assert after the `await` (otherwise it swallows promise rejections such as an assert() failing synchronously inside `async createGlobalContextShared()`).
+    assert(globalObject.globalContext);
     assertV1Design(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);

package/dist/server/runtime/renderPageServer/createPageContextServer.d.ts

@@ -24,7 +24,10 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
     isPrerendering: boolean;
     _requestId: number;
 } & PageContextInit & {
-    _reqDev?: import("http").IncomingMessage;
+    _nodeDev?: {
+        req: import("http").IncomingMessage;
+        res: import("http").ServerResponse;
+    };
     _reqWeb?: Request;
 } & {
     _globalContext: ({
@@ -100,7 +103,10 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         headers?: Record<string, unknown>;
@@ -132,6 +138,9 @@ declare function createPageContextServerWithoutGlobalContext(pageContextInit: Pa
     isPrerendering: boolean;
     _requestId: number;
 } & PageContextInit & {
-    _reqDev?: import("http").IncomingMessage;
+    _nodeDev?: {
+        req: import("http").IncomingMessage;
+        res: import("http").ServerResponse;
+    };
     _reqWeb?: Request;
 };

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts

@@ -23,7 +23,10 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     isPrerendering: boolean;
     _requestId: number;
 } & import("../renderPageServer.js").PageContextInit & {
-    _reqDev?: import("http").IncomingMessage;
+    _nodeDev?: {
+        req: import("http").IncomingMessage;
+        res: import("http").ServerResponse;
+    };
     _reqWeb?: Request;
 } & {
     _globalContext: ({
@@ -99,7 +102,10 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         headers?: Record<string, unknown>;

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts

@@ -31,7 +31,10 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         _globalContext: ({
@@ -107,7 +110,10 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _reqDev?: import("http").IncomingMessage;
+            _nodeDev?: {
+                req: import("http").IncomingMessage;
+                res: import("http").ServerResponse;
+            };
             _reqWeb?: Request;
         } & {
             headers?: Record<string, unknown>;
@@ -167,7 +173,10 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         _globalContext: ({
@@ -243,7 +252,10 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _reqDev?: import("http").IncomingMessage;
+            _nodeDev?: {
+                req: import("http").IncomingMessage;
+                res: import("http").ServerResponse;
+            };
             _reqWeb?: Request;
         } & {
             headers?: Record<string, unknown>;
@@ -311,7 +323,10 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         _globalContext: ({
@@ -387,7 +402,10 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _reqDev?: import("http").IncomingMessage;
+            _nodeDev?: {
+                req: import("http").IncomingMessage;
+                res: import("http").ServerResponse;
+            };
             _reqWeb?: Request;
         } & {
             headers?: Record<string, unknown>;
@@ -447,7 +465,10 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         isPrerendering: boolean;
         _requestId: number;
     } & import("../renderPageServer.js").PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         _globalContext: ({
@@ -523,7 +544,10 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _baseServer: string;
         _baseAssets: string;
         _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-            _reqDev?: import("http").IncomingMessage;
+            _nodeDev?: {
+                req: import("http").IncomingMessage;
+                res: import("http").ServerResponse;
+            };
             _reqWeb?: Request;
         } & {
             headers?: Record<string, unknown>;

package/dist/server/runtime/renderPageServer.d.ts

@@ -23,7 +23,10 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
     isPrerendering: boolean;
     _requestId: number;
 } & PageContextInit & {
-    _reqDev?: import("http").IncomingMessage;
+    _nodeDev?: {
+        req: import("http").IncomingMessage;
+        res: import("http").ServerResponse;
+    };
     _reqWeb?: Request;
 } & {
     _globalContext: ({
@@ -99,7 +102,10 @@ declare function getPageContextBegin(pageContextInit: PageContextInitInternal, g
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: PageContextInit & {
-        _reqDev?: import("http").IncomingMessage;
+        _nodeDev?: {
+            req: import("http").IncomingMessage;
+            res: import("http").ServerResponse;
+        };
         _reqWeb?: Request;
     } & {
         headers?: Record<string, unknown>;

package/dist/server/runtime/renderPageServer.js

@@ -265,8 +265,8 @@ async function renderPageServerEntryWithMiddlewares(pageContext, renderPageServe
     ]);
     const handler = router[universalSymbol];
     const request = pageContext._reqWeb ??
-        (pageContext._reqDev
-            ? requestAdapter(pageContext._reqDev)
+        (pageContext._nodeDev
+            ? requestAdapter(pageContext._nodeDev.req, pageContext._nodeDev.res)
             : new Request(new URL(pageContext.urlOriginal, 'http://localhost').toString(), {
                 headers: pageContext.headers ?? {},
             }));

package/dist/types/PageContext.d.ts

@@ -1,4 +1,4 @@
-import type { IncomingMessage } from 'node:http';
+import type { IncomingMessage, ServerResponse } from 'node:http';
 export type { PageContext };
 export type { PageContextServer };
 export type { PageContextClient };
@@ -140,7 +140,10 @@ type PageContextInit = {
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
 };
 type PageContextInitInternal = PageContextInit & {
-    _reqDev?: IncomingMessage;
+    _nodeDev?: {
+        req: IncomingMessage;
+        res: ServerResponse;
+    };
     _reqWeb?: Request;
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextInit & PageContextUrlServer & {

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-2fe6cc7";
+export declare const PROJECT_VERSION: "0.4.259-commit-fc34c43";

package/dist/utils/PROJECT_VERSION.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-2fe6cc7",
+  "version": "0.4.259-commit-fc34c43",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -130,12 +130,12 @@
     "@babel/types": "^7.28.5",
     "@brillout/import": "^0.2.6",
     "@brillout/json-serializer": "^0.5.23",
-    "@brillout/picocolors": "^1.0.30",
+    "@brillout/picocolors": "^1.0.31",
     "@brillout/vite-plugin-server-entry": "0.7.18",
     "@universal-deploy/store": "^0.2.1",
     "@universal-deploy/vite": "^0.1.9",
     "@universal-middleware/core": "^0.4.17",
-    "@universal-middleware/node": "^0.1.0",
+    "@universal-middleware/node": "^0.2.0",
     "cac": "^6.0.0",
     "convert-route": "^1.1.1",
     "es-module-lexer": "^1.0.0",
@@ -143,7 +143,7 @@
     "json5": "^2.0.0",
     "magic-string": "^0.30.17",
     "picomatch": "^4.0.4",
-    "semver": "^7.8.0",
+    "semver": "^7.8.1",
     "sirv": "^3.0.2",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.16",
@@ -166,7 +166,7 @@
     "node": ">=20.19.0"
   },
   "license": "MIT",
-  "description": "(Replaces Next.js/Nuxt) 🔨 Composable framework to build advanced applications with flexibility and stability.",
+  "description": "(Replaces Next.js/Nuxt) 🔨 Build mission-critical applications with stability and development freedom.",
   "keywords": [
     "vite-plugin",
     "ssr",