vike 0.4.224-commit-00ed9fe → 0.4.225

package/dist/cjs/node/prerender/runPrerender.js

@@ -76,7 +76,7 @@ async function runPrerenderFromAPI(options = {}) {
 }
 async function runPrerenderFromCLIPrerenderCommand() {
     try {
-        const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(undefined, 'prerender');
+        const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)({}, 'prerender');
         await runPrerender({ viteConfig: viteConfigEnhanced }, '$ vike prerender');
     }
     catch (err) {
@@ -113,7 +113,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     (0, getHook_js_1.getHook_setIsPrerenderering)();
     const logLevel = !!options.onPagePrerender ? 'warn' : 'info';
     if (logLevel === 'info') {
-        console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
+        console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.PROJECT_VERSION}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
     }
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');

package/dist/cjs/node/prerender/utils.js

@@ -18,7 +18,7 @@ const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);
-__exportStar(require("../../utils/projectInfo.js"), exports);
+__exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/isCallable.js"), exports);

package/dist/cjs/node/runtime/globalContext.js

@@ -92,9 +92,10 @@ function makePublic(globalContext) {
 async function setGlobalContext_viteDevServer(viteDevServer) {
     debug('setGlobalContext_viteDevServer()');
     setIsProduction(false);
-    if (globalObject.viteDevServer)
-        return;
-    assertIsNotInitilizedYet();
+    /* We cannot cache globalObject.viteDevServer because it's fully replaced when the user modifies vite.config.js => Vite's dev server is fully reloaded and a new viteDevServer replaces the previous one.
+    if (globalObject.viteDevServer) return
+    assertIsNotInitilizedYet()
+    */
     (0, utils_js_1.assert)(globalObject.viteConfig);
     globalObject.viteDevServer = viteDevServer;
     await updateUserFiles();
@@ -354,7 +355,7 @@ function assertBuildInfo(buildInfo) {
     (0, utils_js_1.checkType)({ ...buildInfo, viteConfigRuntime: buildInfo.viteConfigRuntime });
 }
 function assertVersionAtBuildTime(versionAtBuildTime) {
-    const versionAtRuntime = utils_js_1.projectInfo.projectVersion;
+    const versionAtRuntime = utils_js_1.PROJECT_VERSION;
     const pretty = (version) => picocolors_1.default.bold(`vike@${version}`);
     (0, utils_js_1.assertUsage)(versionAtBuildTime === versionAtRuntime, `Re-build your app (you're using ${pretty(versionAtRuntime)} but your app was built with ${pretty(versionAtBuildTime)})`);
 }
@@ -372,7 +373,7 @@ async function updateUserFiles() {
     const { promise, resolve } = (0, utils_js_1.genPromise)();
     (0, utils_js_1.assert)(!globalObject.isProduction);
     globalObject.waitForUserFilesUpdate = promise;
-    const viteDevServer = getViteDevServer();
+    const { viteDevServer } = globalObject;
     (0, utils_js_1.assert)(viteDevServer);
     let virtualFileExports;
     try {
@@ -384,6 +385,9 @@ async function updateUserFiles() {
     }
     virtualFileExports = virtualFileExports.default || virtualFileExports;
     (0, utils_js_1.debugGlob)('Glob result: ', virtualFileExports);
+    // Avoid race condition: abort if there is a new globalObject.viteDevServer (happens when vite.config.js is modified => Vite's dev server is fully reloaded).
+    if (viteDevServer !== globalObject.viteDevServer)
+        return;
     await setUserFiles(virtualFileExports);
     resolve();
 }

package/dist/cjs/node/runtime/utils.js

@@ -31,7 +31,6 @@ __exportStar(require("../../utils/parseUrl.js"), exports);
 __exportStar(require("../../utils/parseUrl-extras.js"), exports);
 __exportStar(require("../../utils/slice.js"), exports);
 __exportStar(require("../../utils/sorter.js"), exports);
-__exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);

package/dist/cjs/node/runtime-dev/createDevMiddleware.js

@@ -11,16 +11,18 @@ const globalContext_js_1 = require("../runtime/globalContext.js");
  */
 async function createDevMiddleware(options = {}) {
     (0, globalContext_js_1.setGlobalContext_isProduction)(false);
-    const viteConfigFromOptions = {
-        ...options.viteConfig,
-        server: {
-            ...options.viteConfig?.server,
-            middlewareMode: options.viteConfig?.server?.middlewareMode ?? true
+    const optionsMod = {
+        ...options,
+        viteConfig: {
+            ...options.viteConfig,
+            root: options.root ?? options.viteConfig?.root,
+            server: {
+                ...options.viteConfig?.server,
+                middlewareMode: options.viteConfig?.server?.middlewareMode ?? true
+            }
         }
     };
-    if (options.root)
-        viteConfigFromOptions.root = options.root;
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfigFromOptions, 'dev');
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(optionsMod, 'dev');
     const server = await (0, vite_1.createServer)(viteConfigEnhanced);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };

package/dist/cjs/node/shared/assertV1Design.js

@@ -12,7 +12,8 @@ function assertV1Design(pageConfigs, pageFilesAll) {
             (0, utils_js_1.assert)(pageConfigs.length > 0);
             const filesV1 = (0, utils_js_1.unique)(pageConfigs
                 .map((p) => Object.values(p.configValueSources).map((sources) => sources
-                .map((c) => c.definedAtFilePath.filePathAbsoluteUserRootDir)
+                .map((c) => c.definedAtFilePath)
+                .map((definedAt) => (definedAt.definedBy ? null : definedAt.filePathAbsoluteUserRootDir))
                 .filter(utils_js_1.isNotNullish)
                 .map((filePathToShowToUser) => indent + filePathToShowToUser)))
                 .flat(2));

package/dist/cjs/node/shared/utils.js

@@ -19,7 +19,6 @@ const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
-__exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);

package/dist/cjs/shared/page-configs/getConfigDefinedAt.js

@@ -33,8 +33,10 @@ function getDefinedAtString(definedAtData, configName) {
     }
     (0, utils_js_1.assert)(files.length >= 1);
     const definedAtString = files
-        .map((source) => {
-        const { filePathToShowToUser, fileExportPathToShowToUser } = source;
+        .map((definedAt) => {
+        if (definedAt.definedBy)
+            return getDefinedByString(definedAt, configName);
+        const { filePathToShowToUser, fileExportPathToShowToUser } = definedAt;
         let s = filePathToShowToUser;
         const exportPath = (0, getExportPath_js_1.getExportPath)(fileExportPathToShowToUser, configName);
         if (exportPath) {
@@ -45,3 +47,17 @@ function getDefinedAtString(definedAtData, configName) {
         .join(' / ');
     return definedAtString;
 }
+function getDefinedByString(definedAt, configName) {
+    if (definedAt.definedBy === 'api') {
+        return `API call ${picocolors_1.default.cyan(`${definedAt.operation}({${configName}})`)}`;
+    }
+    const { definedBy } = definedAt;
+    if (definedBy === 'cli') {
+        return `CLI option ${picocolors_1.default.cyan(`--${configName}`)}`;
+    }
+    if (definedBy === 'env') {
+        return `environment variable ${picocolors_1.default.cyan(`VIKE_OPTIONS="{${configName}}"`)}`;
+    }
+    (0, utils_js_1.checkType)(definedBy);
+    (0, utils_js_1.assert)(false);
+}

package/dist/cjs/shared/page-configs/getConfigValueBuildTime.js

@@ -33,7 +33,7 @@ function getConfigValue(pageConfig, configName) {
         return {
             type: 'standard',
             value: configValueSource.value,
-            definedAtData: getDefinedAtFile(configValueSource)
+            definedAtData: getDefinedAt(configValueSource)
         };
     }
     else {
@@ -53,13 +53,16 @@ function mergeCumulative(configValueSources) {
         (0, utils_js_1.assert)(configValueSource.configEnv.config === true);
         (0, utils_js_1.assert)(configValueSource.valueIsLoaded);
         value.push(configValueSource.value);
-        definedAtData.push(getDefinedAtFile(configValueSource));
+        definedAtData.push(getDefinedAt(configValueSource));
     });
     return { value, definedAtData };
 }
-function getDefinedAtFile(configValueSource) {
+function getDefinedAt(configValueSource) {
+    const { definedAtFilePath } = configValueSource;
+    if (definedAtFilePath.definedBy)
+        return definedAtFilePath;
     return {
-        filePathToShowToUser: configValueSource.definedAtFilePath.filePathToShowToUser,
-        fileExportPathToShowToUser: configValueSource.definedAtFilePath.fileExportPathToShowToUser
+        filePathToShowToUser: definedAtFilePath.filePathToShowToUser,
+        fileExportPathToShowToUser: definedAtFilePath.fileExportPathToShowToUser
     };
 }

package/dist/cjs/shared/page-configs/helpers.js

@@ -14,7 +14,7 @@ function getConfigValueFilePathToShowToUser(definedAtData) {
     // A unique file path only exists if the config value isn't cumulative nor computed:
     //  - cumulative config values have multiple file paths
     //  - computed values don't have any file path
-    if (!definedAtData || (0, utils_js_1.isArray)(definedAtData))
+    if (!definedAtData || (0, utils_js_1.isArray)(definedAtData) || definedAtData.definedBy)
         return null;
     const { filePathToShowToUser } = definedAtData;
     (0, utils_js_1.assert)(filePathToShowToUser);

package/dist/cjs/shared/page-configs/serialize/parsePageConfigs.js

@@ -6,10 +6,6 @@ const utils_js_1 = require("../../utils.js");
 const getConfigDefinedAt_js_1 = require("../getConfigDefinedAt.js");
 const parse_1 = require("@brillout/json-serializer/parse");
 const assertPlusFileExport_js_1 = require("../assertPlusFileExport.js");
-function parseConfigValuesSerialized(configValuesSerialized) {
-    const configValues = parseConfigValuesSerialized_tmp(configValuesSerialized);
-    return configValues;
-}
 function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
     // pageConfigs
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
@@ -45,7 +41,7 @@ function assertRouteConfigValue(configValues) {
    }
    */
 }
-function parseConfigValuesSerialized_tmp(configValuesSerialized) {
+function parseConfigValuesSerialized(configValuesSerialized) {
     const configValues = {};
     Object.entries(configValuesSerialized).forEach(([configName, configValueSeriliazed]) => {
         let configValue;
@@ -102,6 +98,7 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
     if (valueSerialized.type === 'plus-file') {
         const definedAtFile = getDefinedAtFile();
         const { exportValues } = valueSerialized;
+        (0, utils_js_1.assert)(!definedAtFile.definedBy);
         (0, assertPlusFileExport_js_1.assertPlusFileExport)(exportValues, definedAtFile.filePathToShowToUser, configName);
         let value;
         let valueWasFound = false;

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -104,6 +104,7 @@ function serializeConfigValue(configValueBase, valueData, configName, lines, tab
 function getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
     const { valueIsDefinedByPlusValueFile, definedAtFilePath, configEnv } = configValueSource;
+    (0, utils_js_1.assert)(!definedAtFilePath.definedBy);
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
     if (valueIsDefinedByPlusValueFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
@@ -231,9 +232,12 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
     return [...fromComputed, ...fromSources].filter((r) => r !== 'SKIP');
 }
 function getDefinedAtFileSource(source) {
+    const { definedAtFilePath } = source;
+    if (definedAtFilePath.definedBy)
+        return definedAtFilePath;
     const definedAtFile = {
-        filePathToShowToUser: source.definedAtFilePath.filePathToShowToUser,
-        fileExportPathToShowToUser: source.definedAtFilePath.fileExportPathToShowToUser
+        filePathToShowToUser: definedAtFilePath.filePathToShowToUser,
+        fileExportPathToShowToUser: definedAtFilePath.fileExportPathToShowToUser
     };
     return definedAtFile;
 }

package/dist/cjs/shared/route/loadPageRoutes.js

@@ -62,11 +62,11 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
             if (!pageRoute) {
                 const { routeFilesystem } = pageConfig;
                 (0, utils_js_1.assert)(routeFilesystem);
-                const { routeString, definedBy } = routeFilesystem;
+                const { routeString, definedAtLocation } = routeFilesystem;
                 (0, utils_js_1.assert)(routeFilesystem.routeString.startsWith('/'));
                 pageRoute = {
                     pageId,
-                    routeFilesystemDefinedBy: definedBy,
+                    routeFilesystemDefinedBy: definedAtLocation,
                     comesFromV1PageConfig,
                     routeString,
                     routeDefinedAtString: null,

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.224-commit-00ed9fe';
+exports.PROJECT_VERSION = '0.4.225';

package/dist/cjs/utils/assert.js

@@ -17,7 +17,7 @@ const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
 const createErrorWithCleanStackTrace_js_1 = require("./createErrorWithCleanStackTrace.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
 const isObject_js_1 = require("./isObject.js");
-const projectInfo_js_1 = require("./projectInfo.js");
+const PROJECT_VERSION_js_1 = require("./PROJECT_VERSION.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assert.ts', {
     alreadyLogged: new Set(),
@@ -34,7 +34,7 @@ const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assert.ts'
 });
 (0, assertSingleInstance_js_1.assertSingleInstance_onAssertModuleLoad)();
 const projectTag = `[vike]`;
-const projectTagWithVersion = `[vike@${projectInfo_js_1.projectInfo.projectVersion}]`;
+const projectTagWithVersion = `[vike@${PROJECT_VERSION_js_1.PROJECT_VERSION}]`;
 const bugTag = 'Bug';
 const numberOfStackTraceLinesToRemove = 2;
 function assert(condition, debugInfo) {

package/dist/cjs/utils/assertSingleInstance.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertSingleInstance_onClientEntryServerRouting = assertSingleInstance_onClientEntryServerRouting;
 exports.assertSingleInstance_onClientEntryClientRouting = assertSingleInstance_onClientEntryClientRouting;
 exports.assertSingleInstance_onAssertModuleLoad = assertSingleInstance_onAssertModuleLoad;
-//  - Throw error if there are two different versions of vike loaded
+//  - Show warning if there are two different Vike versions loaded
 //  - Show warning if entry of Client Routing and entry of Server Routing are both loaded
-//  - Show warning if vike is loaded twice
+//  - Show warning if Vike is loaded twice
 const unique_js_1 = require("./unique.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
-const projectInfo_js_1 = require("./projectInfo.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-/* Use original assertUsage() & assertWarning() after all CJS is removed from node_modules/vike/dist/
-import { assertUsage, assertWarning } from './assert.js'
+const PROJECT_VERSION_js_1 = require("./PROJECT_VERSION.js");
+/* Use original assertWarning() after all CJS is removed from node_modules/vike/dist/
+import { assertWarning } from './assert.js'
 */
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertSingleInstance.ts', {
     instances: [],
@@ -25,9 +25,10 @@ const clientNotSingleInstance = 'Client runtime loaded twice https://vike.dev/cl
 function assertSingleInstance() {
     {
         const versions = (0, unique_js_1.unique)(globalObject.instances);
-        assertUsage(versions.length <= 1, 
-        // DO *NOT* patch vike to remove this error: because of multiple conflicting versions, you *will* eventually encounter insidious issues that hard to debug and potentially a security hazard, see for example https://github.com/vikejs/vike/issues/1108
-        `vike@${picocolors_1.default.bold(versions[0])} and vike@${picocolors_1.default.bold(versions[1])} loaded but it's forbidden to load different versions`);
+        assertWarning(versions.length <= 1, 
+        // Do *NOT* patch Vike to remove this warning: you *will* eventually encounter the issues listed at https://vike.dev/warning/version-mismatch
+        // - This happened before: https://github.com/vikejs/vike/issues/1108#issuecomment-1719061509
+        `vike@${picocolors_1.default.bold(versions[0])} and vike@${picocolors_1.default.bold(versions[1])} loaded which is highly discouraged, see ${picocolors_1.default.underline('https://vike.dev/warning/version-mismatch')}`, { onlyOnce: true, showStackTrace: false });
     }
     if (globalObject.checkSingleInstance && globalObject.instances.length > 1) {
         /*/ Not sure whether circular dependency can cause problems? In principle not since client-side code is ESM.
@@ -67,21 +68,14 @@ function assertSingleInstance_onClientEntryClientRouting(isProduction) {
 }
 // Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
 function assertSingleInstance_onAssertModuleLoad() {
-    globalObject.instances.push(projectInfo_js_1.projectInfo.projectVersion);
+    globalObject.instances.push(PROJECT_VERSION_js_1.PROJECT_VERSION);
     assertSingleInstance();
 }
-function assertUsage(condition, errorMessage) {
-    if (condition) {
-        return;
-    }
-    const errMsg = `[vike][Wrong Usage] ${errorMessage}`;
-    throw new Error(errMsg);
-}
 function assertWarning(condition, errorMessage, { onlyOnce, showStackTrace }) {
     if (condition) {
         return;
     }
-    const msg = `[vike][Warning] ${errorMessage}`;
+    const msg = `[Vike][Warning] ${errorMessage}`;
     if (onlyOnce) {
         const { alreadyLogged } = globalObject;
         const key = onlyOnce === true ? msg : onlyOnce;

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

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

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

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

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

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

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

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

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

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

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

@@ -10,9 +10,10 @@ import { assert, assertUsage, getGlobalObject, isObject, toPosixPath } from './u
 import pc from '@brillout/picocolors';
 import { clearGlobalContext } from '../runtime/globalContext.js';
 const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
-async function prepareViteApiCall(viteConfigFromOptions, operation) {
+async function prepareViteApiCall(options, operation) {
     clear();
-    setContextApiOperation(operation);
+    setContextApiOperation(operation, options);
+    const viteConfigFromOptions = options.viteConfig;
     return enhanceViteConfig(viteConfigFromOptions, operation);
 }
 // For subsequent API calls, e.g. calling prerender() after build()

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

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

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

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

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

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

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

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

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

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

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

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

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

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