vike 0.4.222 → 0.4.223-commit-6f064ad

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

@@ -17,6 +17,7 @@ import { getFilePathResolved } from '../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js';
 import { getOutDirs, resolveOutDir } from '../shared/getOutDirs.js';
 import { viteIsSSR } from '../shared/viteIsSSR.js';
+import { getVikeConfigPublic } from './commonConfig.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
@@ -57,11 +58,12 @@ function buildConfig() {
                 order: 'post',
                 handler(config) {
                     onSetupBuild();
+                    const vike = getVikeConfigPublic(config);
                     return {
                         build: {
                             outDir: resolveOutDir(config),
                             manifest: manifestTempFile,
-                            copyPublicDir: config.vike.config.viteEnvironmentAPI
+                            copyPublicDir: vike.config.viteEnvironmentAPI
                                 ? // Already set by buildApp() plugin
                                     undefined
                                 : !viteIsSSR(config)
@@ -80,6 +82,9 @@ function buildConfig() {
         {
             name: 'vike:buildConfig:pre',
             apply: 'build',
+            applyToEnvironment(env) {
+                return env.name === 'ssr';
+            },
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
             //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527

package/dist/esm/node/plugin/plugins/commonConfig.d.ts

@@ -1,5 +1,6 @@
 export { commonConfig };
-import { type InlineConfig, type Plugin } from 'vite';
+export { getVikeConfigPublic };
+import { type InlineConfig, type Plugin, type ResolvedConfig, type UserConfig } from 'vite';
 import { type VikeConfigObject } from './importUserCode/v1-design/getVikeConfig.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 declare module 'vite' {
@@ -9,11 +10,18 @@ declare module 'vite' {
         _root?: string;
         _baseViteOriginal?: string;
         _viteConfigEnhanced?: InlineConfig;
-        vike?: {
-            config: VikeConfigObject['global']['config'];
-            pages: VikeConfigObject['pages'];
-            prerenderContext?: PrerenderContextPublic;
-        };
+        _vike?: VikeConfigPublic;
     }
 }
+type VikeConfigPublic = {
+    config: VikeConfigObject['global']['config'];
+    pages: VikeConfigObject['pages'];
+    prerenderContext?: PrerenderContextPublic;
+};
 declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];
+/**
+ * Get all the information Vike knows about the app in your Vite plugin.
+ *
+ * https://vike.dev/getVikeConfig
+ */
+declare function getVikeConfigPublic(config: ResolvedConfig | UserConfig): VikeConfigPublic;

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

@@ -1,4 +1,5 @@
 export { commonConfig };
+export { getVikeConfigPublic };
 import { mergeConfig } from 'vite';
 import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject } from '../utils.js';
 import { assertRollupInput } from './buildConfig.js';
@@ -30,7 +31,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: {
+                        _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config
                         },
@@ -168,3 +169,18 @@ function temp_supportOldInterface(config) {
     }
     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;
+    assert(vikeConfig);
+    return vikeConfig;
+}

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

@@ -48,7 +48,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/esm/node/plugin/plugins/envVars.js

@@ -4,6 +4,7 @@ import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArr
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
+import { viteIsSSR_safe } from '../shared/viteIsSSR.js';
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -36,7 +37,7 @@ function envVarsPlugin() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = getIsClientSide(config, options);
+            const isClientSide = !viteIsSSR_safe(config, options);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -82,20 +83,3 @@ function envVarsPlugin() {
 function applyEnvVar(envStatementRegEx, envVal, code) {
     return code.replace(envStatementRegEx, JSON.stringify(envVal));
 }
-function getIsClientSide(config, options) {
-    const isBuild = config.command === 'build';
-    if (isBuild) {
-        assert(typeof config.build.ssr === 'boolean');
-        const isServerSide = config.build.ssr;
-        if (options !== undefined) {
-            assert(options.ssr === isServerSide);
-        }
-        return !isServerSide;
-    }
-    else {
-        assert(config.build.ssr === false);
-        assert(typeof options?.ssr === 'boolean');
-        const isServerSide = options.ssr;
-        return !isServerSide;
-    }
-}

package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js

@@ -17,7 +17,7 @@ import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { viteIsSSR_options } from '../shared/viteIsSSR.js';
+import { viteIsSSR_safe } from '../shared/viteIsSSR.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -46,7 +46,7 @@ function extractAssetsPlugin() {
                 }
                 // TODO/now: add meta.default
                 assert(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
-                assert(!viteIsSSR_options(options));
+                assert(!viteIsSSR_safe(config, options));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -63,7 +63,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if (viteIsSSR_options(options)) {
+                if (viteIsSSR_safe(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     assert(!extractAssetsRE.test(source));
                     assert(importer === undefined || !extractAssetsRE.test(importer));

package/dist/esm/node/plugin/plugins/extractExportNamesPlugin.js

@@ -8,7 +8,7 @@ import { normalizeId } from '../shared/normalizeId.js';
 import { viteIsSSR_options } from '../shared/viteIsSSR.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:extractExportNames');
-const globalObject = getGlobalObject('extractExportNamesPlugin.ts', {});
+const globalObject = getGlobalObject('plugins/extractExportNamesPlugin.ts', {});
 function extractExportNamesPlugin() {
     let isDev = false;
     return {

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

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

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

@@ -31,7 +31,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/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -3,7 +3,7 @@ export { isPlusFile };
 export { getPlusFileValueConfigName };
 import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage } from '../../../../utils.js';
 import path from 'path';
-import glob from 'fast-glob';
+import { glob } from 'tinyglobby';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
@@ -11,7 +11,7 @@ import { getEnvVarObject } from '../../../../shared/getEnvVarObject.js';
 const execA = promisify(exec);
 const debug = createDebugger('vike:crawl');
 assertIsNotProductionRuntime();
-assertIsSingleModuleInstance('crawlPlusFiles.ts');
+assertIsSingleModuleInstance('getVikeConfig/crawlPlusFiles.ts');
 let gitIsNotUsable = false;
 async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     assertPosixPath(userRootDir);
@@ -35,10 +35,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;
     assert(files);
     if (debug.isActivated)
@@ -47,7 +47,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     files = files.filter((filePath) => !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
         assertPosixPath(filePath);
         assert(!filePath.startsWith(userRootDir));
         const filePathAbsoluteUserRootDir = path.posix.join('/', filePath);
@@ -56,7 +56,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;
@@ -123,13 +123,14 @@ 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 = `**/+*.${scriptFileExtensions}`;
     const options = {
         ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
-        dot: false
+        dot: false,
+        expandDirectories: false
     };
     const files = await glob(pattern, options);
     // Make build deterministic, in order to get a stable generated hash for dist/client/assets/entries/entry-client-routing.${hash}.js

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

@@ -163,14 +163,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
                     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
-                        assert(!isPointerImport && !isNodeModules);
+                        assert(!isPointerImport && !isNpmPkgImport);
                         if (debug.isActivated)
                             debug('onResolved()', { args, resolved, isPointerImport, isExternal });
                         return resolved;
@@ -189,7 +192,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.
@@ -211,7 +214,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/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -9,12 +9,12 @@ export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import type { ResolvedConfig } from 'vite';
-import { type ConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { type PlusFile } from './getVikeConfig/getPlusFilesAll.js';
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
-    global: ConfigUserFriendly;
+    global: PageConfigUserFriendly;
     pages: PageConfigsUserFriendly;
 };
 declare const vikeConfigDependencies: Set<string>;
@@ -26,8 +26,8 @@ declare function getVikeConfig2(userRootDir: string, isDev: boolean, vikeVitePlu
 declare function isV1Design(config: ResolvedConfig): Promise<boolean>;
 declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitions, configName: string): ConfigDefinitionInternal | null;
 declare function getConfVal(plusFile: PlusFile, configName: string): null | {
-    configValue: unknown;
-    configValueLoaded: true;
+    value: unknown;
+    valueIsLoaded: true;
 } | {
-    configValueLoaded: false;
+    valueIsLoaded: false;
 };

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

@@ -8,7 +8,7 @@ export { getConfigDefinitionOptional };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst } from '../../../utils.js';
 import { configDefinitionsBuiltIn } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
-import { isConfigInvalid, isConfigInvalid_set } from '../../../../runtime/renderPage/isConfigInvalid.js';
+import { isVikeConfigInvalid, isVikeConfigInvalid_set } from '../../../../runtime/renderPage/isVikeConfigInvalid.js';
 import { getViteDevServer } from '../../../../runtime/globalContext.js';
 import { logConfigError, logConfigErrorRecover } from '../../../shared/loggerNotProd.js';
 import { removeSuperfluousViteLog_enable, removeSuperfluousViteLog_disable } from '../../../shared/loggerVite/removeSuperfluousViteLog.js';
@@ -19,8 +19,8 @@ import { resolvePointerImport } from './getVikeConfig/resolvePointerImport.js';
 import { getFilePathResolved } from '../../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { assertExtensionsRequire } from './getVikeConfig/assertExtensions.js';
-import { getPageConfigUserFriendlyNew } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
-import { getConfigValuesBase } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
+import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getConfigValuesBase, isJsonValue } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll } from './getVikeConfig/getPlusFilesAll.js';
 assertIsNotProductionRuntime();
 let restartVite = false;
@@ -37,7 +37,7 @@ function reloadVikeConfig(config) {
     handleReloadSideEffects();
 }
 async function handleReloadSideEffects() {
-    wasConfigInvalid = !!isConfigInvalid;
+    wasConfigInvalid = !!isVikeConfigInvalid;
     const vikeConfigPromisePrevious = vikeConfigPromise;
     try {
         await vikeConfigPromise;
@@ -52,7 +52,7 @@ async function handleReloadSideEffects() {
         // Let the next handleReloadSideEffects() call handle side effects
         return;
     }
-    if (!isConfigInvalid) {
+    if (!isVikeConfigInvalid) {
         if (wasConfigInvalid) {
             wasConfigInvalid = false;
             logConfigErrorRecover();
@@ -105,13 +105,13 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
     if (!hasError) {
         assert(ret);
         assert(err === undefined);
-        isConfigInvalid_set(false);
+        isVikeConfigInvalid_set(false);
         return ret;
     }
     else {
         assert(ret === undefined);
         assert(err);
-        isConfigInvalid_set({ err });
+        isVikeConfigInvalid_set({ err });
         if (!isDev) {
             assert(getViteDevServer() === null);
             throw err;
@@ -127,7 +127,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: getPageConfigUserFriendlyNew({ configValues: {} }),
+                global: getPageConfigGlobalUserFriendly({ pageConfigGlobalValues: {} }),
                 pages: {}
             };
             return dummyData;
@@ -143,18 +143,12 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValuesGlobal = getConfigValues(pageConfigGlobal);
-    const global = getPageConfigUserFriendlyNew({ configValues: configValuesGlobal });
-    // TODO/now DEDUPE
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = getPageConfigGlobalUserFriendly({ pageConfigGlobalValues });
     // pages
     const pages = objectFromEntries(pageConfigs.map((pageConfig) => {
-        const configValuesLocal = getConfigValues(pageConfig, true);
-        const configValues = { ...configValuesGlobal, ...configValuesLocal };
-        const page = {
-            ...getPageConfigUserFriendlyNew({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
@@ -219,13 +213,12 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
                 return;
             configValueSources[configName] = sources;
         });
-        const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
+        const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitionsLocal);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
-            isErrorPage,
-            routeFilesystem,
+            ...pageConfigRoute,
             configDefinitions: configDefinitionsLocal,
             plusFiles: plusFilesRelevant,
             configValueSources,
@@ -359,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
         });
     });
 }
@@ -424,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)
@@ -489,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;
@@ -511,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
         };
@@ -520,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) {
@@ -537,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
             };
@@ -548,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_
         };
@@ -560,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,
@@ -589,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);
@@ -630,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]) => {
@@ -927,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'
         });