vike 0.4.222-commit-fab3841 → 0.4.223-commit-6f064ad

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -20,7 +20,7 @@ import { getFilePathResolved } from '../../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { assertExtensionsRequire } from './getVikeConfig/assertExtensions.js';
 import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
-import { getConfigValuesBase } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
+import { getConfigValuesBase, isJsonValue } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll } from './getVikeConfig/getPlusFilesAll.js';
 assertIsNotProductionRuntime();
 let restartVite = false;
@@ -352,8 +352,8 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
             locationId: '/',
             plusFile: null,
             isOverriden: configDef.cumulative ? false : sources.length > 0,
-            valueIsImportedAtRuntime: false,
-            valueIsDefinedByPlusFile: false
+            valueIsLoadedWithImport: false,
+            valueIsDefinedByPlusValueFile: false
         });
     });
 }
@@ -417,20 +417,10 @@ function getPlusFilesOrdered(configName, plusFilesRelevant) {
             const plusFilesConfig = plusFilesForConfigName.filter((plusFile) => plusFile.isConfigFile &&
                 // We consider extensions (e.g. vike-react) later (i.e. with less priority)
                 !plusFile.isExtensionConfig);
-            // Make this value:
-            //   /pages/some-page/+{configName}.js > `export default`
-            // override that value:
-            //   /pages/some-page/+config.js > `export default { someConfig }`
-            const plusFileWinner = plusFilesValue[0] ?? plusFilesConfig[0];
-            if (plusFileWinner) {
-                const plusFilesOverriden = [...plusFilesValue, ...plusFilesConfig].filter((f) => f !== plusFileWinner);
-                // A user-land conflict of plusFiles with the same `locationId` (we are iterating over `plusFilesRelevant: PlusFilesByLocationId`) means that the user has superfluously defined the config twice; the user should remove such redundancy as it makes things unnecessarily ambiguous.
-                assertOverwrittenConfigFile(plusFileWinner, plusFilesOverriden, configName);
-                [plusFileWinner, ...plusFilesOverriden].forEach((plusFile) => {
-                    assert(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-                    populate(plusFile);
-                });
-            }
+            [...plusFilesValue, ...plusFilesConfig].forEach((plusFile) => {
+                assert(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
+                populate(plusFile);
+            });
         }
         // ==========================
         // Side-effect configs (next)
@@ -482,8 +472,8 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
         let valueFilePath;
         if (plusFile.isConfigFile) {
             // Defined over pointer import
-            assert(confVal.configValueLoaded);
-            const pointerImport = resolvePointerImport(confVal.configValue, plusFile.filePath, userRootDir, configName);
+            assert(confVal.valueIsLoaded);
+            const pointerImport = resolvePointerImport(confVal.value, plusFile.filePath, userRootDir, configName);
             const configDefinedAt = getConfigDefinedAt('Config', configName, definedAtFilePath_);
             assertUsage(pointerImport, `${configDefinedAt} should be an import`);
             valueFilePath = pointerImport.fileExportPath.filePathAbsoluteVite;
@@ -504,8 +494,8 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
             value: valueFilePath,
             valueIsFilePath: true,
             configEnv: configDef.env,
-            valueIsImportedAtRuntime: true,
-            valueIsDefinedByPlusFile: false,
+            valueIsLoadedWithImport: false,
+            valueIsDefinedByPlusValueFile: false,
             isOverriden,
             definedAtFilePath
         };
@@ -513,8 +503,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
     }
     // +config.js
     if (plusFile.isConfigFile) {
-        assert(confVal.configValueLoaded);
-        const { configValue } = confVal;
+        assert(confVal.valueIsLoaded);
         // Defined over pointer import
         const pointerImport = plusFile.pointerImportsByConfigName[configName];
         if (pointerImport) {
@@ -530,8 +519,8 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
                 ...configValueSourceCommon,
                 ...value,
                 configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
-                valueIsImportedAtRuntime: true,
-                valueIsDefinedByPlusFile: false,
+                valueIsLoadedWithImport: true,
+                valueIsDefinedByPlusValueFile: false,
                 isOverriden,
                 definedAtFilePath: pointerImport.fileExportPath
             };
@@ -541,10 +530,10 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
         const configValueSource = {
             ...configValueSourceCommon,
             valueIsLoaded: true,
-            value: configValue,
+            value: confVal.value,
             configEnv: configDef.env,
-            valueIsImportedAtRuntime: false,
-            valueIsDefinedByPlusFile: false,
+            valueIsLoadedWithImport: false,
+            valueIsDefinedByPlusValueFile: false,
             isOverriden,
             definedAtFilePath: definedAtFilePath_
         };
@@ -553,22 +542,13 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
     // Defined by value file, i.e. +{configName}.js
     if (!plusFile.isConfigFile) {
         const configEnvResolved = resolveConfigEnv(configDef.env, plusFile.filePath);
-        const valueAlreadyLoaded = confVal.configValueLoaded;
-        assert(valueAlreadyLoaded === !!configEnvResolved.config);
-        const value = valueAlreadyLoaded
-            ? {
-                valueIsLoaded: true,
-                value: confVal.configValue
-            }
-            : {
-                valueIsLoaded: false
-            };
+        assert(confVal.valueIsLoaded === !!configEnvResolved.config);
         const configValueSource = {
             ...configValueSourceCommon,
-            ...value,
+            ...confVal,
             configEnv: configEnvResolved,
-            valueIsImportedAtRuntime: !valueAlreadyLoaded,
-            valueIsDefinedByPlusFile: true,
+            valueIsLoadedWithImport: !confVal.valueIsLoaded || !isJsonValue(confVal.value),
+            valueIsDefinedByPlusValueFile: true,
             isOverriden,
             definedAtFilePath: {
                 ...plusFile.filePath,
@@ -582,14 +562,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
     }
     assert(false);
 }
-function assertOverwrittenConfigFile(plusFileWinner, plusFilesOverriden, configName) {
-    plusFilesOverriden.forEach((plusFileLoser) => {
-        const loserFilePath = plusFileLoser.filePath.filePathToShowToUser;
-        const winnerFilePath = plusFileWinner.filePath.filePathToShowToUser;
-        const confName = pc.cyan(configName);
-        assertWarning(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
-    });
-}
 function isDefiningPage(plusFiles) {
     for (const plusFile of plusFiles) {
         const configNames = getDefiningConfigNames(plusFile);
@@ -623,8 +595,8 @@ function getConfigDefinitions(plusFilesRelevant, filter) {
             const confVal = getConfVal(plusFile, 'meta');
             if (!confVal)
                 return;
-            assert(confVal.configValueLoaded);
-            const meta = confVal.configValue;
+            assert(confVal.valueIsLoaded);
+            const meta = confVal.value;
             assertMetaUsage(meta, `Config ${pc.cyan('meta')} defined at ${plusFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAtFilePath
             Object.entries(meta).forEach(([configName, configDef]) => {
@@ -920,8 +892,8 @@ function getConfVal(plusFile, configName) {
     if (!configNames.includes(configName))
         return null;
     if (plusFile.isNotLoaded)
-        return { configValueLoaded: false };
-    const confVal = { configValue: plusFile.fileExportsByConfigName[configName], configValueLoaded: true };
+        return { valueIsLoaded: false };
+    const confVal = { value: plusFile.fileExportsByConfigName[configName], valueIsLoaded: true };
     return confVal;
 }
 function resolveConfigEnv(configEnv, filePath) {

package/dist/esm/node/plugin/shared/findPageFiles.js

@@ -1,5 +1,5 @@
 export { findPageFiles };
-import glob from 'fast-glob';
+import { glob } from 'tinyglobby';
 import { assertWarning, toPosixPath, scriptFileExtensions } from '../utils.js';
 import pc from '@brillout/picocolors';
 import { getOutDirs } from './getOutDirs.js';
@@ -7,11 +7,11 @@ async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
     const { outDirRoot } = getOutDirs(config);
     const timeBase = new Date().getTime();
-    let pageFiles = await glob(fileTypes.map((fileType) => `**/*${fileType}.${scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false });
+    let pageFiles = await glob(fileTypes.map((fileType) => `**/*${fileType}.${scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + toPosixPath(p));
     const time = new Date().getTime() - timeBase;
     if (isDev) {
-        // We only warn in dev, because while building it's expected to take a long time as fast-glob is competing for resources with other tasks
+        // We only warn in dev, because while building it's expected to take a long time as tinyglobby is competing for resources with other tasks
         assertWarning(time < 1.5 * 1000, `Finding your page files ${pc.cyan('**/*.page.*')} took an unexpected long time (${time}ms). Reach out to the vike maintainer.`, {
             onlyOnce: 'slow-page-files-search'
         });

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

@@ -30,6 +30,7 @@ import { resolvePrerenderConfig, resolvePrerenderConfigLocal } from './resolvePr
 import { getOutDirs } from '../plugin/shared/getOutDirs.js';
 import { isVikeCli } from '../cli/context.js';
 import { isViteCliCall } from '../plugin/shared/isViteCliCall.js';
+import { getVikeConfigPublic } from '../plugin/plugins/commonConfig.js';
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -60,7 +61,8 @@ async function runPrerenderFromAutoRun(viteConfig, config) {
         logErrorHint(err);
         process.exit(1);
     }
-    config.vike.prerenderContext = prerenderContextPublic;
+    const vike = getVikeConfigPublic(config);
+    vike.prerenderContext = prerenderContextPublic;
     const forceExit = isVikeCli() || isViteCliCall();
     return { forceExit };
 }

package/dist/esm/node/runtime/renderPage/logErrorHint.js

@@ -25,13 +25,19 @@ const errorsMisc = [
         mustMentionNodeModules: false
     }
 ];
+const reactInvalidEelement = 'https://vike.dev/broken-npm-package#react-invalid-component';
 const errorsReact = [
     {
         errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
-        link: 'https://vike.dev/broken-npm-package#react-invalid-component',
+        link: reactInvalidEelement,
         // The stack trace can be user-land while the import is coming from node_modules
         mustMentionNodeModules: false
     },
+    {
+        errMsg: 'Objects are not valid as a React child',
+        link: reactInvalidEelement,
+        mustMentionNodeModules: false
+    },
     {
         // React's "Invalid hook call.", see https://github.com/vikejs/vike/discussions/1637#discussioncomment-9424712
         errMsg: "Cannot read properties of null (reading 'useContext')"

package/dist/esm/shared/getPageContextUrlComputed.js

@@ -37,7 +37,7 @@ function getUrlParsed(pageContext) {
     //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
-    const assertUrlResolved = (src) => assert(urlResolved && typeof urlResolved === 'string', 
+    const assertUrlResolved = (src) => assert(typeof urlResolved === 'string', 
     // TODO/eventually: remove debug logs, see:
     // - https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
     // - https://github.com/vikejs/vike/commit/5c7810f3080ab62536950f26e019bb2a3a517082

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -94,10 +94,11 @@ type ConfigValueSource = {
     locationId: LocationId;
     isOverriden: boolean;
     /** Wether the config value is loaded at runtime, for example config.Page or config.onBeforeRender */
-    valueIsImportedAtRuntime: boolean;
+    valueIsLoadedWithImport: boolean;
     /** Whether the config value is a file path, for example config.client */
     valueIsFilePath?: true;
-    valueIsDefinedByPlusFile: boolean;
+    /** Whether the config value is defined by a +{configName}.js file */
+    valueIsDefinedByPlusValueFile: boolean;
 } & ({
     valueIsLoaded: false;
 } | {

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.d.ts

@@ -1,8 +1,10 @@
 export { serializeConfigValues };
 export { getConfigValuesBase };
+export { isJsonValue };
 export type { FilesEnv };
 import type { ConfigEnvInternal, ConfigValueSource, DefinedAtFile, PageConfigBuildTime, PageConfigGlobalBuildTime } from '../PageConfig.js';
 declare function serializeConfigValues(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, importStatements: string[], filesEnv: FilesEnv, isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, tabspace: string, isEager: boolean | null): string[];
+declare function isJsonValue(value: unknown): boolean;
 declare function getConfigValuesBase(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, isEager: boolean | null): ConfigValuesBase;
 type ConfigValuesBase = ({
     configValueBase: {

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

@@ -1,11 +1,13 @@
 export { serializeConfigValues };
 export { getConfigValuesBase };
+export { isJsonValue };
 import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
 import { assert, assertPosixPath, assertUsage, deepEqual, getPropAccessNotation } from '../../../node/plugin/utils.js';
 import { parsePointerImportData } from '../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformPointerImports.js';
 import { getConfigValueFilePathToShowToUser } from '../helpers.js';
 import { stringify } from '@brillout/json-serializer/stringify';
 import pc from '@brillout/picocolors';
+const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigs()
@@ -44,7 +46,7 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatc
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
     assert(configValueSource.isOverriden === false);
     let valueData;
-    if ('value' in configValueSource) {
+    if ('value' in configValueSource && !configValueSource.valueIsLoadedWithImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {
@@ -96,14 +98,13 @@ function serializeConfigValue(configValueBase, valueData, configName, lines, tab
 }
 function getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName) {
     assert(!configValueSource.valueIsFilePath);
-    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath, configEnv } = configValueSource;
-    assert(valueIsImportedAtRuntime);
+    const { valueIsDefinedByPlusValueFile, definedAtFilePath, configEnv } = configValueSource;
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
-    if (valueIsDefinedByPlusFile)
+    if (valueIsDefinedByPlusValueFile)
         assert(fileExportName === undefined);
     const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
     return {
-        type: valueIsDefinedByPlusFile ? 'plus-file' : 'pointer-import',
+        type: valueIsDefinedByPlusValueFile ? 'plus-file' : 'pointer-import',
         valueAsJsCode: importName
     };
 }
@@ -120,7 +121,7 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
     try {
         configValueSerialized = stringify(value, {
             valueName,
-            forbidReactElements: true,
+            ...stringifyOptions,
             // Replace import strings with import variables.
             // - We don't need this anymore and could remove it.
             //   - We temporarily needed it for nested document configs (`config.document.{title,description,favicon}`), but we finally decided to go for flat document configs instead (`config.{title,description,favicon}`).
@@ -147,6 +148,15 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
     assert(!configValueSerialized.includes(REPLACE_ME_AFTER));
     return configValueSerialized;
 }
+function isJsonValue(value) {
+    try {
+        stringify(value, stringifyOptions);
+    }
+    catch (err) {
+        return false;
+    }
+    return true;
+}
 function logJsonSerializeError(err, configName, definedAtData) {
     /*
     // import { isJsonSerializerError } from '@brillout/json-serializer/stringify'

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.222-commit-fab3841";
+export declare const PROJECT_VERSION: "0.4.223-commit-6f064ad";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.222-commit-fab3841';
+export const PROJECT_VERSION = '0.4.223-commit-6f064ad';

package/dist/esm/utils/findFile.js

@@ -3,7 +3,7 @@ import path from 'path';
 import fs from 'fs';
 import { isArray } from './isArray.js';
 import { assertPosixPath } from './path.js';
-// We need to be able to crawl the filesystem, regardless of Vike's `$ git ls-files` command call, because we need to fallback if the user didn't setup Git (e.g. we cannot remove the fast-glob fallback).
+// We need to be able to crawl the filesystem, regardless of Vike's `$ git ls-files` command call, because we need to fallback if the user didn't setup Git (e.g. we cannot remove the tinyglobby fallback).
 function findFile(arg, cwd) {
     assertPosixPath(cwd);
     const filenames = isArray(arg) ? arg : [arg];

package/dist/esm/utils/projectInfo.d.ts

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.222-commit-fab3841";
+    projectVersion: "0.4.223-commit-6f064ad";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.222-commit-fab3841",
+  "version": "0.4.223-commit-6f064ad",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -137,10 +137,10 @@
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
     "esbuild": "^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0",
-    "fast-glob": "^3.0.0",
     "json5": "^2.0.0",
     "semver": "^7.0.0",
     "source-map-support": "^0.5.0",
+    "tinyglobby": "^0.2.10",
     "vite": ">=5.1.0"
   },
   "peerDependencies": {