vike 0.4.259-commit-f2bab48 → 0.4.259-commit-85c5e84

package/dist/node/cli/parseCli.js

@@ -29,41 +29,28 @@ function getCommand() {
 function getCliOptions() {
     let cliOptions = {};
     let configNameCurrent;
-    const addConfig = (configValue) => {
-        assert(configNameCurrent);
-        cliOptions[configNameCurrent] = configValue;
-        configNameCurrent = undefined;
-    };
-    const addConfigWithoutValue = () => {
+    const commitIfDefinedWithoutValue = () => {
         if (configNameCurrent)
-            addConfig(true);
+            commit(true);
     };
-    const addConfigWithValue = (configValueStr) => {
+    const commit = (val) => {
         assert(configNameCurrent);
-        addConfig(parseJson5(configValueStr, `CLI option --${configNameCurrent}`));
+        cliOptions[configNameCurrent] = val;
+        configNameCurrent = undefined;
     };
     for (const arg of process.argv.slice(3)) {
         showHelpOrVersion(arg);
         if (arg.startsWith('--')) {
-            addConfigWithoutValue();
-            const str = arg.slice('--'.length);
-            const eqIdx = str.indexOf('=');
-            if (eqIdx === -1) {
-                configNameCurrent = str;
-            }
-            else {
-                configNameCurrent = str.slice(0, eqIdx);
-                const configValueStr = str.slice(eqIdx + 1);
-                addConfigWithValue(configValueStr);
-            }
+            commitIfDefinedWithoutValue();
+            configNameCurrent = arg.slice('--'.length);
         }
         else {
             if (!configNameCurrent)
                 wrongUsage(`Unknown option ${pc.bold(arg)}`);
-            addConfigWithValue(arg);
+            commit(parseJson5(arg, `CLI option --${configNameCurrent}`));
         }
     }
-    addConfigWithoutValue();
+    commitIfDefinedWithoutValue();
     return cliOptions;
 }
 function showHelp() {

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

@@ -7,5 +7,6 @@ declare function getServerConfig(vikeConfig: VikeConfigInternal): {
     serverEntryId: string;
     serverEntryVike: string;
     serverFilePath: string | null;
+    isServerEntry: boolean;
 } | undefined;
 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 };
+import { dirname, resolve } from 'node:path';
 import { catchAllEntry } from '@universal-deploy/store';
 import { assert } from '../../../../utils/assert.js';
 import '../../assertEnvVite.js';
@@ -7,6 +8,7 @@ function getServerConfig(vikeConfig) {
     let serverEntryId;
     let serverFilePath = null;
     let serverEntryVike;
+    let isServerEntry = false;
     // universal-deploy support must be manually enabled
     const serverConfig = 
     // +config.js > `export default { server: true }`
@@ -21,8 +23,13 @@ function getServerConfig(vikeConfig) {
         assert('filePathAbsoluteFilesystem' in serverPlusFile.definedAt);
         serverFilePath = serverPlusFile.definedAt.filePathAbsoluteFilesystem;
         assert(serverFilePath);
-        serverEntryId = serverFilePath;
-        serverEntryVike = serverFilePath;
+        assert(serverPlusFile.valueIsLoaded);
+        assert(typeof serverPlusFile.value === 'object');
+        // +server.js > `export default { entry: './server/entrypoint.ts' }`
+        const entry = serverPlusFile.value.entry;
+        isServerEntry = typeof entry === 'string';
+        assert(entry === undefined || isServerEntry);
+        serverEntryVike = serverEntryId = isServerEntry ? resolve(dirname(serverFilePath), entry) : serverFilePath;
     }
     else {
         serverEntryId = catchAllEntry;
@@ -36,6 +43,7 @@ function getServerConfig(vikeConfig) {
         // It either points to the default fetchable endpoint (vike/fetch), or one defined by the user through +server.
         serverEntryVike,
         serverFilePath,
+        isServerEntry,
     };
 }
 function isUniversalDeployVitePreview(vikeConfig, viteConfigResolved) {

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

@@ -24,9 +24,9 @@ function pluginUniversalDeploy(vikeConfig) {
                 assertUsage(target === undefined, `${target} requires +server — see https://vike.dev/server`);
             }),
         ];
-    const { serverEntryVike, serverEntryId, serverFilePath } = serverConfig;
+    const { serverEntryVike, serverEntryId, serverFilePath, isServerEntry } = serverConfig;
     return [
-        ...universalDeploy(),
+        ...universalDeploy({ entry: isServerEntry ? serverEntryVike : undefined }),
         {
             name: 'vike:pluginUniversalDeploy:entries',
             config() {

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

@@ -1,5 +1,5 @@
 export { generateVirtualFilePageEntry };
-import { assert, getDebugInfoStr, getProjectError } from '../../../../utils/assert.js';
+import { assert, getProjectError } from '../../../../utils/assert.js';
 import { parseVirtualFileId, generateVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { extractAssetsAddQuery } from '../../../../shared-server-node/extractAssetsQuery.js';
@@ -26,10 +26,12 @@ async function generateVirtualFilePageEntry(id, isDev) {
         assert(pageConfig);
     }
     else {
-        if (!pageConfig) {
-            // Happens very seldomly and can't reproduce reliably. Some kind of HMR race condition? It still happens as of June 2026 with Cloudflare Workers in developement — but it isn't blocking, reloading the page fixes the issue.
-            throw getProjectError(`Outdated request. Try again. ${getDebugInfoStr({ id, pageId })}`);
-        }
+        /* 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)
+            throw getProjectError('Outdated request');
+        //*/
     }
     const code = getCode(pageConfig, isForClientSide, pageId, resolveIncludeAssetsImportedByServer(vikeConfig.config), isDev);
     debug(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);

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

@@ -227,7 +227,7 @@ const metaBuiltIn = {
         global: true,
     },
     server: {
-        env: { server: true },
+        env: { server: true, config: true },
         global: true,
     },
     cli: {

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

@@ -219,7 +219,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
         globalObject.isV1Design_ = pageConfigs.length > 0;
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
-    setCliAndApiOptions(pageConfigGlobal, pageConfigs, configDefinitionsResolved);
+    setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     const globalConfigPublic = resolveGlobalConfig(pageConfigGlobal, pageConfigs);
     const prerenderContext = await resolvePrerenderContext({
         config: globalConfigPublic.config,
@@ -283,7 +283,7 @@ async function resolveConfigDefinitions(plusFilesByLocationId, userRootDir, esbu
         configNamesKnownAll,
         configNamesKnownGlobal,
     };
-    warnUnknownConfigs(configDefinitionsResolved);
+    assertKnownConfigs(configDefinitionsResolved);
     return configDefinitionsResolved;
 }
 // Load value files (with `env.config===true`) of *custom* configs.
@@ -464,47 +464,29 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
         }, pageConfigGlobal.configDefinitions));
     });
 }
-function setCliAndApiOptions(pageConfigGlobal, pageConfigs, configDefinitionsResolved) {
+function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
     // Vike API — passed options [lowest precedence]
     const vikeApiOperation = getVikeApiOperation();
     if (vikeApiOperation?.options.vikeConfig) {
-        addSources(vikeApiOperation.options.vikeConfig, {
-            definedBy: 'api',
-            operation: vikeApiOperation.operation,
-        });
+        addSources(vikeApiOperation.options.vikeConfig, { definedBy: 'api', operation: vikeApiOperation.operation }, false);
     }
     const { configFromCliOptions, configFromEnvVar } = getVikeConfigFromCliOrEnv();
     // Vike CLI options
     if (configFromCliOptions) {
-        addSources(configFromCliOptions, { definedBy: 'cli' });
+        addSources(configFromCliOptions, { definedBy: 'cli' }, true);
     }
     // VIKE_CONFIG [highest precedence]
     if (configFromEnvVar) {
-        addSources(configFromEnvVar, { definedBy: 'env' });
+        addSources(configFromEnvVar, { definedBy: 'env' }, false);
     }
     return;
-    function addSources(configValues, definedBy) {
+    function addSources(configValues, definedBy, exitOnError) {
         Object.entries(configValues).forEach(([configName, value]) => {
             var _a;
             const sourceName = `The ${getDefinedByString(definedBy, configName)}`;
-            const isUnknown = isUnknownConfig(configName, configDefinitionsResolved.configNamesKnownAll, configDefinitionsResolved, '/', false, sourceName);
-            if (isUnknown)
-                return;
-            if (configName in pageConfigGlobal.configDefinitions) {
-                const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
-                const source = getSourceNonConfigFile(configName, value, definedBy, pageConfigGlobal.configDefinitions);
-                sources.unshift(source);
-                return;
-            }
-            // Non-global config: inject into every page config that knows about it (highest precedence)
-            pageConfigs.forEach((pageConfig) => {
-                var _a;
-                if (!(configName in pageConfig.configDefinitions))
-                    return;
-                const sources = ((_a = pageConfig.configValueSources)[configName] ?? (_a[configName] = []));
-                const source = getSourceNonConfigFile(configName, value, definedBy, pageConfig.configDefinitions);
-                sources.unshift(source);
-            });
+            assertKnownConfig(configName, configDefinitionsResolved.configNamesKnownGlobal, configDefinitionsResolved, '/', false, sourceName, exitOnError);
+            const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
+            sources.unshift(getSourceNonConfigFile(configName, value, definedBy, pageConfigGlobal.configDefinitions));
         });
     }
 }
@@ -991,32 +973,29 @@ function getComputed(pageConfig) {
     });
     return configValuesComputed;
 }
-function warnUnknownConfigs(configDefinitionsResolved) {
+// Show error message upon unknown config
+function assertKnownConfigs(configDefinitionsResolved) {
     objectEntries(configDefinitionsResolved.configDefinitionsLocal).forEach(([_locationId, { configNamesKnownLocal, plusFiles }]) => {
         plusFiles.forEach((plusFile) => {
             const configNames = getConfigNamesSetByPlusFile(plusFile);
             configNames.forEach((configName) => {
                 const { locationId } = plusFile;
                 const sourceName = plusFile.filePath.filePathToShowToUser;
-                isUnknownConfig(configName, configNamesKnownLocal, configDefinitionsResolved, locationId, true, sourceName);
+                assertKnownConfig(configName, configNamesKnownLocal, configDefinitionsResolved, locationId, true, sourceName, false);
             });
         });
     });
 }
-function isUnknownConfig(configName, configNamesKnownRelevant, configDefinitionsResolved, locationId, isPlusFile, sourceName) {
+function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitionsResolved, locationId, isPlusFile, sourceName, exitOnError) {
     const { configNamesKnownAll } = configDefinitionsResolved;
     if (configNamesKnownRelevant.includes(configName)) {
         assert(configNamesKnownAll.includes(configName));
-        return false;
+        return;
     }
     const configNameColored = pc.cyan(configName);
-    const warn = (msg) => {
-        assertWarning(false, msg, { onlyOnce: true });
-        return true;
-    };
     // Inheritance issue: config is known but isn't defined at `locationId`
     if (configNamesKnownAll.includes(configName)) {
-        return warn(`${sourceName} sets the value of the config ${configNameColored} which is a custom config that is defined with ${pc.underline('https://vike.dev/meta')} at a path that doesn't apply to ${locationId} — see ${pc.underline('https://vike.dev/config#inheritance')}`);
+        assertUsage(false, `${sourceName} sets the value of the config ${configNameColored} which is a custom config that is defined with ${pc.underline('https://vike.dev/meta')} at a path that doesn't apply to ${locationId} — see ${pc.underline('https://vike.dev/config#inheritance')}`, { exitOnError });
     }
     const errMsg = isPlusFile
         ? `${sourceName} sets an unknown config ${configNameColored}`
@@ -1039,7 +1018,7 @@ function isUnknownConfig(configName, configNamesKnownRelevant, configDefinitions
         if (configName in knownVikeExntensionConfigs) {
             const requiredVikeExtension = joinEnglish(knownVikeExntensionConfigs[configName].map((e) => pc.bold(e)), 'or');
             const errMsgEnhanced = `${errMsg}. If you want to use the configuration ${configNameColored} documented at ${pc.underline(`https://vike.dev/${configName}`)} then make sure to install ${requiredVikeExtension}. (Alternatively, you can define ${configNameColored} yourself by using ${pc.cyan('meta')}, see ${pc.underline('https://vike.dev/meta')} for more information.)`;
-            return warn(errMsgEnhanced);
+            assertUsage(false, errMsgEnhanced, { exitOnError });
         }
     }
     // Similarity hint
@@ -1056,9 +1035,9 @@ function isUnknownConfig(configName, configNamesKnownRelevant, configDefinitions
         if (configName === 'page') {
             errMsgEnhanced += ` (The name of the config ${pc.cyan('Page')} starts with a capital letter ${pc.cyan('P')} because it defines a UI component: a ubiquitous JavaScript convention is that the name of UI components start with a capital letter.)`;
         }
-        return warn(errMsgEnhanced);
+        assertUsage(false, errMsgEnhanced, { exitOnError });
     }
-    return warn(errMsg);
+    assertUsage(false, errMsg, { exitOnError });
 }
 function determineRouteFilesystem(locationId, configValueSources) {
     const configName = 'filesystemRoutingRoot';

package/dist/types/Server.d.ts

@@ -8,5 +8,6 @@ import type { Fetchable, ServerOptions } from '@universal-deploy/store';
 interface Server extends Fetchable {
     prod?: Omit<ServerOptions, 'fetch'> & {
         static?: boolean | string;
+        entry?: string;
     };
 }

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-f2bab48";
+export declare const PROJECT_VERSION: "0.4.259-commit-85c5e84";

package/dist/utils/PROJECT_VERSION.js

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

package/dist/utils/assert.d.ts

@@ -3,7 +3,6 @@ export { assertUsage };
 export { assertWarning };
 export { assertInfo };
 export { getProjectError };
-export { getDebugInfoStr };
 export { isVikeBug };
 export { setAssertOnBeforeLog };
 export { setAssertOnBeforeErr };
@@ -11,7 +10,6 @@ export { setAssertAlwaysShowStackTrace };
 export { setAssertAddAssertTagsDev };
 import type { AddAssertTagsDev } from '../node/vite/shared/loggerDev.js';
 declare function assert(condition: unknown, debugInfo?: unknown): asserts condition;
-declare function getDebugInfoStr(debugInfo: unknown): string | null;
 declare function assertUsage(condition: unknown, errMsg: string, { showStackTrace, exitOnError }?: {
     showStackTrace?: true;
     exitOnError?: boolean;

package/dist/utils/assert.js

@@ -3,7 +3,6 @@ export { assertUsage };
 export { assertWarning };
 export { assertInfo };
 export { getProjectError };
-export { getDebugInfoStr };
 export { isVikeBug };
 export { setAssertOnBeforeLog };
 export { setAssertOnBeforeErr };
@@ -25,10 +24,17 @@ const tagTypeBug = 'Bug';
 function assert(condition, debugInfo) {
     if (condition)
         return;
+    const debugStr = (() => {
+        if (!debugInfo) {
+            return null;
+        }
+        const debugInfoSerialized = typeof debugInfo === 'string' ? debugInfo : JSON.stringify(debugInfo);
+        return pc.dim(`Debug for maintainers (you can ignore this): ${debugInfoSerialized}`);
+    })();
     const link = pc.underline('https://github.com/vikejs/vike/issues/new?template=bug.yml');
     let errMsg = [
         `You stumbled upon a Vike bug. Go to ${link} and copy-paste this error. A maintainer will fix the bug (usually within 24 hours).`,
-        getDebugInfoStr(debugInfo),
+        debugStr,
     ]
         .filter(Boolean)
         .join(' ');
@@ -38,12 +44,6 @@ function assert(condition, debugInfo) {
     globalObject.onBeforeErr?.(internalError);
     throw internalError;
 }
-function getDebugInfoStr(debugInfo) {
-    if (!debugInfo)
-        return null;
-    const debugInfoSerialized = typeof debugInfo === 'string' ? debugInfo : JSON.stringify(debugInfo);
-    return pc.dim(`Debug for maintainers (you can ignore this): ${debugInfoSerialized}`);
-}
 function assertUsage(condition, errMsg, { showStackTrace, exitOnError } = {}) {
     if (condition)
         return;

package/dist/utils/getViteRPC.js

@@ -36,7 +36,7 @@ function createRpcClient() {
                 const hot = import.meta.hot;
                 assert(hot);
                 const callId = getRandomId();
-                const { promise, resolve } = genPromise({ timeout: 10 * 1000 });
+                const { promise, resolve } = genPromise({ timeout: 3 * 1000 });
                 listeners.push({
                     callId,
                     cb: (functionReturn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-f2bab48",
+  "version": "0.4.259-commit-85c5e84",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {