vike 0.4.259-commit-656fc24 → 0.4.259-commit-cf2a786

package/dist/node/cli/parseCli.js

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

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, configDefinitionsResolved);
+    setCliAndApiOptions(pageConfigGlobal, pageConfigs, 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,
     };
-    assertKnownConfigs(configDefinitionsResolved);
+    warnUnknownConfigs(configDefinitionsResolved);
     return configDefinitionsResolved;
 }
 // Load value files (with `env.config===true`) of *custom* configs.
@@ -464,29 +464,47 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
         }, pageConfigGlobal.configDefinitions));
     });
 }
-function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
+function setCliAndApiOptions(pageConfigGlobal, pageConfigs, configDefinitionsResolved) {
     // Vike API — passed options [lowest precedence]
     const vikeApiOperation = getVikeApiOperation();
     if (vikeApiOperation?.options.vikeConfig) {
-        addSources(vikeApiOperation.options.vikeConfig, { definedBy: 'api', operation: vikeApiOperation.operation }, false);
+        addSources(vikeApiOperation.options.vikeConfig, {
+            definedBy: 'api',
+            operation: vikeApiOperation.operation,
+        });
     }
     const { configFromCliOptions, configFromEnvVar } = getVikeConfigFromCliOrEnv();
     // Vike CLI options
     if (configFromCliOptions) {
-        addSources(configFromCliOptions, { definedBy: 'cli' }, true);
+        addSources(configFromCliOptions, { definedBy: 'cli' });
     }
     // VIKE_CONFIG [highest precedence]
     if (configFromEnvVar) {
-        addSources(configFromEnvVar, { definedBy: 'env' }, false);
+        addSources(configFromEnvVar, { definedBy: 'env' });
     }
     return;
-    function addSources(configValues, definedBy, exitOnError) {
+    function addSources(configValues, definedBy) {
         Object.entries(configValues).forEach(([configName, value]) => {
             var _a;
             const sourceName = `The ${getDefinedByString(definedBy, configName)}`;
-            assertKnownConfig(configName, configDefinitionsResolved.configNamesKnownGlobal, configDefinitionsResolved, '/', false, sourceName, exitOnError);
-            const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
-            sources.unshift(getSourceNonConfigFile(configName, value, definedBy, pageConfigGlobal.configDefinitions));
+            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);
+            });
         });
     }
 }
@@ -973,29 +991,32 @@ function getComputed(pageConfig) {
     });
     return configValuesComputed;
 }
-// Show error message upon unknown config
-function assertKnownConfigs(configDefinitionsResolved) {
+function warnUnknownConfigs(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;
-                assertKnownConfig(configName, configNamesKnownLocal, configDefinitionsResolved, locationId, true, sourceName, false);
+                isUnknownConfig(configName, configNamesKnownLocal, configDefinitionsResolved, locationId, true, sourceName);
             });
         });
     });
 }
-function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitionsResolved, locationId, isPlusFile, sourceName, exitOnError) {
+function isUnknownConfig(configName, configNamesKnownRelevant, configDefinitionsResolved, locationId, isPlusFile, sourceName) {
     const { configNamesKnownAll } = configDefinitionsResolved;
     if (configNamesKnownRelevant.includes(configName)) {
         assert(configNamesKnownAll.includes(configName));
-        return;
+        return false;
     }
     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)) {
-        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 });
+        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')}`);
     }
     const errMsg = isPlusFile
         ? `${sourceName} sets an unknown config ${configNameColored}`
@@ -1018,7 +1039,7 @@ function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitio
         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.)`;
-            assertUsage(false, errMsgEnhanced, { exitOnError });
+            return warn(errMsgEnhanced);
         }
     }
     // Similarity hint
@@ -1035,9 +1056,9 @@ function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitio
         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.)`;
         }
-        assertUsage(false, errMsgEnhanced, { exitOnError });
+        return warn(errMsgEnhanced);
     }
-    assertUsage(false, errMsg, { exitOnError });
+    return warn(errMsg);
 }
 function determineRouteFilesystem(locationId, configValueSources) {
     const configName = 'filesystemRoutingRoot';

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-656fc24";
+export declare const PROJECT_VERSION: "0.4.259-commit-cf2a786";

package/dist/utils/PROJECT_VERSION.js

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

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: 3 * 1000 });
+                const { promise, resolve } = genPromise({ timeout: 10 * 1000 });
                 listeners.push({
                     callId,
                     cb: (functionReturn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-656fc24",
+  "version": "0.4.259-commit-cf2a786",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {