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

package/dist/cjs/node/plugin/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = void 0;
+exports.version = exports.getVikeConfig = void 0;
 exports.plugin = plugin;
 exports.ssr = plugin;
 exports.default = plugin;
+var commonConfig_js_1 = require("./plugins/commonConfig.js");
+Object.defineProperty(exports, "getVikeConfig", { enumerable: true, get: function () { return commonConfig_js_1.getVikeConfigPublic; } });
 var utils_js_1 = require("./utils.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
 const utils_js_2 = require("./utils.js");
@@ -23,7 +25,7 @@ const extractExportNamesPlugin_js_1 = require("./plugins/extractExportNamesPlugi
 const suppressRollupWarning_js_1 = require("./plugins/suppressRollupWarning.js");
 const setGlobalContext_js_1 = require("./plugins/setGlobalContext.js");
 const index_js_3 = require("./plugins/buildEntry/index.js");
-const commonConfig_js_1 = require("./plugins/commonConfig.js");
+const commonConfig_js_2 = require("./plugins/commonConfig.js");
 const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -38,7 +40,7 @@ const buildApp_js_1 = require("./plugins/buildApp.js");
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
-        ...(0, commonConfig_js_1.commonConfig)(vikeVitePluginOptions),
+        ...(0, commonConfig_js_2.commonConfig)(vikeVitePluginOptions),
         (0, index_js_2.importUserCode)(),
         ...(0, index_js_1.devConfig)(),
         ...(0, buildConfig_js_1.buildConfig)(),

package/dist/cjs/node/plugin/plugins/baseUrls.js

@@ -4,6 +4,7 @@ exports.baseUrls = baseUrls;
 const resolveBase_js_1 = require("../../shared/resolveBase.js");
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const commonConfig_js_1 = require("./commonConfig.js");
 function baseUrls() {
     let basesResolved;
     return {
@@ -13,7 +14,8 @@ function baseUrls() {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vike.config.baseServer ?? null, config.vike.config.baseAssets ?? null);
+            const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vike.config.baseServer ?? null, vike.config.baseAssets ?? null);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;

package/dist/cjs/node/plugin/plugins/buildApp.js

@@ -7,6 +7,7 @@ const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const getFullBuildInlineConfig_js_1 = require("../shared/getFullBuildInlineConfig.js");
+const commonConfig_js_1 = require("./commonConfig.js");
 function buildApp() {
     let config;
     // `builder.buildApp` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
@@ -17,7 +18,8 @@ function buildApp() {
             name: 'vike:buildApp',
             apply: 'build',
             config(config) {
-                if (!config.vike.config.viteEnvironmentAPI)
+                const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+                if (!vike.config.viteEnvironmentAPI)
                     return;
                 return {
                     builder: {
@@ -62,7 +64,8 @@ function buildApp() {
                 config = _config;
             },
             async writeBundle() {
-                if (!config.vike.config.viteEnvironmentAPI)
+                const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+                if (!vike.config.viteEnvironmentAPI)
                     return;
                 const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
                 if (!(0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig))

package/dist/cjs/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -35,8 +35,8 @@ async function fixServerAssets(config) {
     const outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
-    const { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove } = addServerAssets(clientManifest, serverManifest);
-    await copyAssets(filesToCopy, filesToRemove, config);
+    const { clientManifestMod, serverManifestMod, filesToMove, filesToRemove } = addServerAssets(clientManifest, serverManifest);
+    await copyAssets(filesToMove, filesToRemove, config);
     return { clientManifestMod, serverManifestMod };
 }
 async function loadManifest(outDir) {
@@ -47,15 +47,15 @@ async function loadManifest(outDir) {
     (0, utils_js_1.assert)(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, filesToRemove, config) {
+async function copyAssets(filesToMove, filesToRemove, config) {
     const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const assetsDirServer = path_1.default.posix.join(outDirServer, assetsDir);
-    if (!filesToCopy.length && !filesToRemove.length && !(0, fs_2.existsSync)(assetsDirServer))
+    if (!filesToMove.length && !filesToRemove.length && !(0, fs_2.existsSync)(assetsDirServer))
         return;
     (0, utils_js_1.assert)((0, fs_2.existsSync)(assetsDirServer));
     const concurrencyLimit = (0, utils_js_1.pLimit)(10);
-    await Promise.all(filesToCopy.map((file) => concurrencyLimit(async () => {
+    await Promise.all(filesToMove.map((file) => concurrencyLimit(async () => {
         const source = path_1.default.posix.join(outDirServer, file);
         const target = path_1.default.posix.join(outDirClient, file);
         await promises_1.default.mkdir(path_1.default.posix.dirname(target), { recursive: true });
@@ -91,19 +91,20 @@ function addServerAssets(clientManifest, serverManifest) {
         (0, utils_js_1.assert)(!entriesServer.has(pageId));
         entriesServer.set(pageId, { key, ...resources });
     }
-    let filesToCopy = [];
+    let filesToMove = [];
     let filesToRemove = [];
+    // Copy page assets
     for (const [pageId, entryClient] of entriesClient.entries()) {
         const entryServer = entriesServer.get(pageId);
         if (!entryServer)
             continue;
-        const cssToAdd = [];
+        const cssToMove = [];
         const cssToRemove = [];
-        const assetsToAdd = [];
+        const assetsToMove = [];
         const assetsToRemove = [];
         entryServer.css.forEach((cssServer) => {
             if (!entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash)) {
-                cssToAdd.push(cssServer.src);
+                cssToMove.push(cssServer.src);
             }
             else {
                 cssToRemove.push(cssServer.src);
@@ -111,17 +112,17 @@ function addServerAssets(clientManifest, serverManifest) {
         });
         entryServer.assets.forEach((assetServer) => {
             if (!entryClient.assets.some((assetClient) => assetServer.hash === assetClient.hash)) {
-                assetsToAdd.push(assetServer.src);
+                assetsToMove.push(assetServer.src);
             }
             else {
                 assetsToRemove.push(assetServer.src);
             }
         });
-        if (cssToAdd.length) {
+        if (cssToMove.length) {
             const { key } = entryClient;
-            filesToCopy.push(...cssToAdd);
+            filesToMove.push(...cssToMove);
             (_a = clientManifest[key]).css ?? (_a.css = []);
-            clientManifest[key].css?.push(...cssToAdd);
+            clientManifest[key].css?.push(...cssToMove);
         }
         if (cssToRemove.length) {
             const { key } = entryServer;
@@ -129,11 +130,11 @@ function addServerAssets(clientManifest, serverManifest) {
             (_b = serverManifest[key]).css ?? (_b.css = []);
             serverManifest[key].css = serverManifest[key].css.filter((entry) => !cssToRemove.includes(entry));
         }
-        if (assetsToAdd.length) {
+        if (assetsToMove.length) {
             const { key } = entryClient;
-            filesToCopy.push(...assetsToAdd);
+            filesToMove.push(...assetsToMove);
             (_c = clientManifest[key]).assets ?? (_c.assets = []);
-            clientManifest[key].assets?.push(...assetsToAdd);
+            clientManifest[key].assets?.push(...assetsToMove);
         }
         if (assetsToRemove.length) {
             const { key } = entryServer;
@@ -142,11 +143,40 @@ function addServerAssets(clientManifest, serverManifest) {
             serverManifest[key].assets = serverManifest[key].assets.filter((entry) => !assetsToRemove.includes(entry));
         }
     }
+    // Also copy assets of virtual:@brillout/vite-plugin-server-entry:serverEntry
+    {
+        const filesClientAll = [];
+        for (const key in clientManifest) {
+            const entry = clientManifest[key];
+            filesClientAll.push(entry.file);
+            filesClientAll.push(...(entry.assets ?? []));
+            filesClientAll.push(...(entry.css ?? []));
+        }
+        for (const key in serverManifest) {
+            const entry = serverManifest[key];
+            if (!entry.isEntry)
+                continue;
+            const resources = collectResources(entry, serverManifest);
+            const css = resources.css.map((css) => css.src).filter((file) => !filesClientAll.includes(file));
+            const assets = resources.assets.map((asset) => asset.src).filter((file) => !filesClientAll.includes(file));
+            filesToMove.push(...css, ...assets);
+            if (css.length > 0 || assets.length > 0) {
+                (0, utils_js_1.assert)(!clientManifest[key]);
+                clientManifest[key] = {
+                    ...entry,
+                    css,
+                    assets,
+                    dynamicImports: undefined,
+                    imports: undefined
+                };
+            }
+        }
+    }
     const clientManifestMod = clientManifest;
     const serverManifestMod = serverManifest;
-    filesToCopy = (0, utils_js_1.unique)(filesToCopy);
-    filesToRemove = (0, utils_js_1.unique)(filesToRemove).filter((file) => !filesToCopy.includes(file));
-    return { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove };
+    filesToMove = (0, utils_js_1.unique)(filesToMove);
+    filesToRemove = (0, utils_js_1.unique)(filesToRemove).filter((file) => !filesToMove.includes(file));
+    return { clientManifestMod, serverManifestMod, filesToMove, filesToRemove };
 }
 function getPageId(key) {
     // Normalize from:

package/dist/cjs/node/plugin/plugins/buildConfig.js

@@ -22,6 +22,7 @@ const getFilePath_js_1 = require("../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../shared/page-configs/getConfigValueBuildTime.js");
 const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
+const commonConfig_js_1 = require("./commonConfig.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
@@ -63,11 +64,12 @@ function buildConfig() {
                 order: 'post',
                 handler(config) {
                     (0, utils_js_1.onSetupBuild)();
+                    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
                     return {
                         build: {
                             outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
                             manifest: manifestTempFile,
-                            copyPublicDir: config.vike.config.viteEnvironmentAPI
+                            copyPublicDir: vike.config.viteEnvironmentAPI
                                 ? // Already set by buildApp() plugin
                                     undefined
                                 : !(0, viteIsSSR_js_1.viteIsSSR)(config)

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonConfig = commonConfig;
+exports.getVikeConfigPublic = getVikeConfigPublic;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const buildConfig_js_1 = require("./buildConfig.js");
@@ -35,7 +36,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: {
+                        _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config
                         },
@@ -173,3 +174,18 @@ function temp_supportOldInterface(config) {
     }
     (0, utils_js_1.assert)(false);
 }
+// TODO/soon rename:
+// - `getVikeConfig()` => `resolveVikeConfig()` ?
+// - `getVikeConfigPublic()` => `getVikeConfig()`
+// - `VikeConfigPublic` => `VikeConfig` ?
+// - `VikeConfigObject` => `VikeConfigInternal` ?
+/**
+ * Get all the information Vike knows about the app in your Vite plugin.
+ *
+ * https://vike.dev/getVikeConfig
+ */
+function getVikeConfigPublic(config) {
+    const vikeConfig = config._vike;
+    (0, utils_js_1.assert)(vikeConfig);
+    return vikeConfig;
+}

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -50,7 +50,7 @@ async function getPageDeps(config, pageConfigs) {
                 sources
                     .filter((c) => !c.isOverriden)
                     .forEach((configValueSource) => {
-                    if (!configValueSource.valueIsImportedAtRuntime)
+                    if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
                     const { definedAtFilePath, configEnv } = configValueSource;
                     if (!configEnv.client)

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

@@ -68,8 +68,8 @@ function getConfigRequireValue(plusFile) {
     const confVal = (0, getVikeConfig_js_1.getConfVal)(plusFile, 'require');
     if (!confVal)
         return null;
-    (0, utils_js_1.assert)(confVal.configValueLoaded);
-    const require = confVal.configValue;
+    (0, utils_js_1.assert)(confVal.valueIsLoaded);
+    const require = confVal.value;
     const { filePathToShowToUserResolved } = plusFile.filePath;
     (0, utils_js_1.assert)(filePathToShowToUserResolved);
     (0, utils_js_1.assertUsage)((0, isObjectOfStrings_js_1.isObjectOfStrings)(require), `The setting ${picocolors_1.default.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${picocolors_1.default.bold('Record<string, string>')}).`);
@@ -79,8 +79,8 @@ function getNameValue(plusFile) {
     const confVal = (0, getVikeConfig_js_1.getConfVal)(plusFile, 'name');
     if (!confVal)
         return null;
-    (0, utils_js_1.assert)(confVal.configValueLoaded);
-    const name = confVal.configValue;
+    (0, utils_js_1.assert)(confVal.valueIsLoaded);
+    const name = confVal.value;
     const filePathToShowToUser = getFilePathToShowToUser(plusFile);
     (0, utils_js_1.assertUsage)(typeof name === 'string', `The setting ${picocolors_1.default.bold('name')} defined at ${filePathToShowToUser} should be a string.`);
     return name;

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

@@ -33,7 +33,12 @@ const configDefinitionsBuiltIn = {
         cumulative: true
     },
     route: {
-        env: { server: true, client: 'if-client-routing' },
+        env: {
+            server: true,
+            client: 'if-client-routing',
+            // For vite-plugin-vercel
+            config: true
+        },
         eager: true
     },
     guard: {

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

@@ -8,7 +8,7 @@ exports.isPlusFile = isPlusFile;
 exports.getPlusFileValueConfigName = getPlusFileValueConfigName;
 const utils_js_1 = require("../../../../utils.js");
 const path_1 = __importDefault(require("path"));
-const fast_glob_1 = __importDefault(require("fast-glob"));
+const tinyglobby_1 = require("tinyglobby");
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
@@ -40,10 +40,10 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     // Crawl
     const filesGit = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
     const filesGitNothingFound = !filesGit || filesGit.length === 0;
-    const filesGlob = (filesGitNothingFound || debug.isActivated) && (await fastGlob(userRootDir, outDirRelativeFromUserRootDir));
+    const filesGlob = (filesGitNothingFound || debug.isActivated) && (await tinyglobby(userRootDir, outDirRelativeFromUserRootDir));
     let files = !filesGitNothingFound
         ? filesGit
-        : // Fallback to fast-glob for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
+        : // Fallback to tinyglobby for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
             filesGlob;
     (0, utils_js_1.assert)(files);
     if (debug.isActivated)
@@ -52,7 +52,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     files = files.filter((filePath) => !(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(filePath));
     // Normalize
     const plusFiles = files.map((filePath) => {
-        // Both `$ git-ls files` and fast-glob return posix paths
+        // Both `$ git-ls files` and tinyglobby return posix paths
         (0, utils_js_1.assertPosixPath)(filePath);
         (0, utils_js_1.assert)(!filePath.startsWith(userRootDir));
         const filePathAbsoluteUserRootDir = path_1.default.posix.join('/', filePath);
@@ -61,7 +61,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     });
     return plusFiles;
 }
-// Same as fastGlob() but using `$ git ls-files`
+// Same as tinyglobby() but using `$ git ls-files`
 async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
     if (gitIsNotUsable)
         return null;
@@ -128,15 +128,16 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
     }
     return files;
 }
-// Same as gitLsFiles() but using fast-glob
-async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
+// Same as gitLsFiles() but using tinyglobby
+async function tinyglobby(userRootDir, outDirRelativeFromUserRootDir) {
     const pattern = `**/+*.${utils_js_1.scriptFileExtensions}`;
     const options = {
         ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
-        dot: false
+        dot: false,
+        expandDirectories: false
     };
-    const files = await (0, fast_glob_1.default)(pattern, options);
+    const files = await (0, tinyglobby_1.glob)(pattern, options);
     // Make build deterministic, in order to get a stable generated hash for dist/client/assets/entries/entry-client-routing.${hash}.js
     // https://github.com/vikejs/vike/pull/1750
     files.sort();

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

@@ -168,14 +168,17 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
                         //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
+                    // Externalize npm package imports
                     (0, utils_js_1.assertPosixPath)(importPathResolved);
-                    const isNodeModules = importPathResolved.includes('/node_modules/');
+                    const isNpmPkgImport = importPathResolved.includes('/node_modules/') ||
+                        // Linked npm packages
+                        !importPathResolved.startsWith(userRootDir);
                     const isExternal = isPointerImport ||
                         // Performance: npm package imports can be externalized. (We could as well let esbuild transpile /node_modules/ code but it's useless as /node_modules/ code is already built. It would unnecessarily slow down transpilation.)
-                        isNodeModules;
+                        isNpmPkgImport;
                     if (!isExternal) {
                         // User-land config code (i.e. not runtime code) => let esbuild transpile it
-                        (0, utils_js_1.assert)(!isPointerImport && !isNodeModules);
+                        (0, utils_js_1.assert)(!isPointerImport && !isNpmPkgImport);
                         if (debug.isActivated)
                             debug('onResolved()', { args, resolved, isPointerImport, isExternal });
                         return resolved;
@@ -194,7 +197,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                             userRootDir
                         });
                         // We assuming that path aliases always resolve inside `userRootDir`.
-                        if (filePathAbsoluteUserRootDir && !isNodeModules) {
+                        if (filePathAbsoluteUserRootDir && !isNpmPkgImport) {
                             // `importPathOriginal` is a path alias.
                             // - We have to use esbuild's path alias resolution, because:
                             //   - Vike doesn't resolve path aliases at all.
@@ -216,7 +219,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     // Import of runtime code => handled by Vike
                     isPointerImport ||
                         // Import of config code => loaded by Node.js at build-time
-                        isNodeModules);
+                        isNpmPkgImport);
                     pointerImports[importPathTranspiled] = isPointerImport;
                     return { external: true, path: importPathTranspiled };
                 });

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

@@ -358,8 +358,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
         });
     });
 }
@@ -423,20 +423,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) => {
-                    (0, utils_js_1.assert)(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-                    populate(plusFile);
-                });
-            }
+            [...plusFilesValue, ...plusFilesConfig].forEach((plusFile) => {
+                (0, utils_js_1.assert)(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
+                populate(plusFile);
+            });
         }
         // ==========================
         // Side-effect configs (next)
@@ -488,8 +478,8 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
         let valueFilePath;
         if (plusFile.isConfigFile) {
             // Defined over pointer import
-            (0, utils_js_1.assert)(confVal.configValueLoaded);
-            const pointerImport = (0, resolvePointerImport_js_1.resolvePointerImport)(confVal.configValue, plusFile.filePath, userRootDir, configName);
+            (0, utils_js_1.assert)(confVal.valueIsLoaded);
+            const pointerImport = (0, resolvePointerImport_js_1.resolvePointerImport)(confVal.value, plusFile.filePath, userRootDir, configName);
             const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, definedAtFilePath_);
             (0, utils_js_1.assertUsage)(pointerImport, `${configDefinedAt} should be an import`);
             valueFilePath = pointerImport.fileExportPath.filePathAbsoluteVite;
@@ -510,8 +500,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
         };
@@ -519,8 +509,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
     }
     // +config.js
     if (plusFile.isConfigFile) {
-        (0, utils_js_1.assert)(confVal.configValueLoaded);
-        const { configValue } = confVal;
+        (0, utils_js_1.assert)(confVal.valueIsLoaded);
         // Defined over pointer import
         const pointerImport = plusFile.pointerImportsByConfigName[configName];
         if (pointerImport) {
@@ -536,8 +525,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
             };
@@ -547,10 +536,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_
         };
@@ -559,22 +548,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;
-        (0, utils_js_1.assert)(valueAlreadyLoaded === !!configEnvResolved.config);
-        const value = valueAlreadyLoaded
-            ? {
-                valueIsLoaded: true,
-                value: confVal.configValue
-            }
-            : {
-                valueIsLoaded: false
-            };
+        (0, utils_js_1.assert)(confVal.valueIsLoaded === !!configEnvResolved.config);
         const configValueSource = {
             ...configValueSourceCommon,
-            ...value,
+            ...confVal,
             configEnv: configEnvResolved,
-            valueIsImportedAtRuntime: !valueAlreadyLoaded,
-            valueIsDefinedByPlusFile: true,
+            valueIsLoadedWithImport: !confVal.valueIsLoaded || !(0, serializeConfigValues_js_1.isJsonValue)(confVal.value),
+            valueIsDefinedByPlusValueFile: true,
             isOverriden,
             definedAtFilePath: {
                 ...plusFile.filePath,
@@ -588,14 +568,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
     }
     (0, utils_js_1.assert)(false);
 }
-function assertOverwrittenConfigFile(plusFileWinner, plusFilesOverriden, configName) {
-    plusFilesOverriden.forEach((plusFileLoser) => {
-        const loserFilePath = plusFileLoser.filePath.filePathToShowToUser;
-        const winnerFilePath = plusFileWinner.filePath.filePathToShowToUser;
-        const confName = picocolors_1.default.cyan(configName);
-        (0, utils_js_1.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);
@@ -629,8 +601,8 @@ function getConfigDefinitions(plusFilesRelevant, filter) {
             const confVal = getConfVal(plusFile, 'meta');
             if (!confVal)
                 return;
-            (0, utils_js_1.assert)(confVal.configValueLoaded);
-            const meta = confVal.configValue;
+            (0, utils_js_1.assert)(confVal.valueIsLoaded);
+            const meta = confVal.value;
             assertMetaUsage(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${plusFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAtFilePath
             Object.entries(meta).forEach(([configName, configDef]) => {
@@ -926,8 +898,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/cjs/node/plugin/shared/findPageFiles.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findPageFiles = findPageFiles;
-const fast_glob_1 = __importDefault(require("fast-glob"));
+const tinyglobby_1 = require("tinyglobby");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getOutDirs_js_1 = require("./getOutDirs.js");
@@ -12,11 +12,11 @@ async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
     const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
     const timeBase = new Date().getTime();
-    let pageFiles = await (0, fast_glob_1.default)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false });
+    let pageFiles = await (0, tinyglobby_1.glob)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + (0, utils_js_1.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
         (0, utils_js_1.assertWarning)(time < 1.5 * 1000, `Finding your page files ${picocolors_1.default.cyan('**/*.page.*')} took an unexpected long time (${time}ms). Reach out to the vike maintainer.`, {
             onlyOnce: 'slow-page-files-search'
         });

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

@@ -68,6 +68,7 @@ const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
 const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
 const context_js_2 = require("../cli/context.js");
 const isViteCliCall_js_1 = require("../plugin/shared/isViteCliCall.js");
+const commonConfig_js_1 = require("../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.
@@ -98,7 +99,8 @@ async function runPrerenderFromAutoRun(viteConfig, config) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    config.vike.prerenderContext = prerenderContextPublic;
+    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+    vike.prerenderContext = prerenderContextPublic;
     const forceExit = (0, context_js_2.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
     return { forceExit };
 }

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

@@ -29,13 +29,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')"