vike 0.4.221-commit-937dbfb → 0.4.221

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -49,18 +49,18 @@ const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalContext_js_1 = require("../runtime/globalContext.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('prepareViteApiCall.ts', {});
-async function prepareViteApiCall(viteConfigFromOptions, operation) {
+async function prepareViteApiCall(viteConfig, operation) {
     clear();
     (0, context_js_1.setContextApiOperation)(operation);
-    return enhanceViteConfig(viteConfigFromOptions, operation);
+    return enhanceViteConfig(viteConfig, operation);
 }
 // For subsequent API calls, e.g. calling prerender() after build()
 function clear() {
     (0, context_js_1.clearContextApiOperation)();
     (0, globalContext_js_1.clearGlobalContext)();
 }
-async function enhanceViteConfig(viteConfigFromOptions, operation) {
-    const viteInfo = await getInfoFromVite(viteConfigFromOptions, operation);
+async function enhanceViteConfig(viteConfig, operation) {
+    const viteInfo = await getInfoFromVite(viteConfig, operation);
     await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
     const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
@@ -76,7 +76,6 @@ function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
     viteConfigs.values.forEach((v) => {
         (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(v.value), `${v.definedAt} should be an object`);
         viteConfigEnhanced = (0, vite_1.mergeConfig)(viteConfigEnhanced ?? {}, v.value);
-        (0, utils_js_1.assertUsage)(!findVikeVitePlugin(v.value), "Using the +vite setting to add Vike's Vite plugin is forbidden");
     });
     return viteConfigEnhanced;
 }
@@ -86,14 +85,13 @@ async function getViteRoot(operation) {
     (0, utils_js_1.assert)(globalObject.root);
     return globalObject.root;
 }
-async function getInfoFromVite(viteConfigFromOptions, operation) {
-    const viteConfigFromUserViteFile = await loadViteConfigFile(viteConfigFromOptions, operation);
-    const root = normalizeViteRoot(viteConfigFromUserViteFile?.root ?? viteConfigFromOptions?.root ?? process.cwd());
+async function getInfoFromVite(viteConfig, operation) {
+    const viteConfigFromFile = await loadViteConfigFile(viteConfig, operation);
+    const root = normalizeViteRoot(viteConfigFromFile?.root ?? viteConfig?.root ?? process.cwd());
     globalObject.root = root;
     let vikeVitePluginOptions;
-    let viteConfigEnhanced = viteConfigFromOptions;
-    // If Vike's Vite plugin is found in both viteConfigFromOptions and viteConfigFromUserViteFile then Vike will later throw an error
-    const found = findVikeVitePlugin(viteConfigFromOptions) || findVikeVitePlugin(viteConfigFromUserViteFile);
+    let viteConfigEnhanced = viteConfig;
+    const found = findVikeVitePlugin([...(viteConfig?.plugins ?? []), ...(viteConfigFromFile?.plugins ?? [])]);
     if (found) {
         vikeVitePluginOptions = found.vikeVitePluginOptions;
     }
@@ -102,20 +100,20 @@ async function getInfoFromVite(viteConfigFromOptions, operation) {
         // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus vike/plugin may resolved to two different node_modules/vike directories.
         const { plugin: vikePlugin } = await Promise.resolve().then(() => __importStar(require('../plugin/index.js')));
         viteConfigEnhanced = {
-            ...viteConfigFromOptions,
-            plugins: [...(viteConfigFromOptions?.plugins ?? []), vikePlugin()]
+            ...viteConfig,
+            plugins: [...(viteConfig?.plugins ?? []), vikePlugin()]
         };
-        const res = findVikeVitePlugin(viteConfigEnhanced);
+        const res = findVikeVitePlugin(viteConfigEnhanced.plugins);
         (0, utils_js_1.assert)(res);
         vikeVitePluginOptions = res.vikeVitePluginOptions;
     }
     (0, utils_js_1.assert)(vikeVitePluginOptions);
     return { root, vikeVitePluginOptions, viteConfigEnhanced };
 }
-function findVikeVitePlugin(viteConfig) {
+function findVikeVitePlugin(plugins) {
     let vikeVitePluginOptions;
     let vikeVitePuginFound = false;
-    viteConfig?.plugins?.forEach((p) => {
+    plugins.forEach((p) => {
         if (p && '__vikeVitePluginOptions' in p) {
             vikeVitePuginFound = true;
             const options = p.__vikeVitePluginOptions;
@@ -128,8 +126,8 @@ function findVikeVitePlugin(viteConfig) {
     return { vikeVitePluginOptions };
 }
 // Copied from https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L961-L1005
-async function loadViteConfigFile(viteConfigFromOptions, operation) {
-    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfigFromOptions, operation);
+async function loadViteConfigFile(viteConfig, operation) {
+    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfig, operation);
     let config = inlineConfig;
     let mode = inlineConfig.mode || defaultMode;
     const configEnv = {

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

@@ -7,6 +7,7 @@ exports.fixServerAssets = fixServerAssets;
 exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
 exports.fixServerAssets_assertCssCodeSplit = fixServerAssets_assertCssCodeSplit;
 exports.fixServerAssets_assertCssTarget = fixServerAssets_assertCssTarget;
+exports.fixServerAssets_assertCssTarget_populate = fixServerAssets_assertCssTarget_populate;
 const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -199,15 +200,17 @@ function fixServerAssets_assertCssCodeSplit(config) {
     (0, utils_js_1.assertWarning)(config.build.cssCodeSplit, `${picocolors_1.default.cyan('build.cssCodeSplit')} shouldn't be set to ${picocolors_1.default.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
+function fixServerAssets_assertCssTarget_populate(config) {
+    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config);
+    (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
+    (0, utils_js_1.assert)(config.build.target !== undefined);
+    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
+}
 async function fixServerAssets_assertCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
     if (!(await (0, getVikeConfig_js_1.isV1Design)(config)))
         return;
-    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config);
-    (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
-    (0, utils_js_1.assert)(config.build.target !== undefined);
-    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
     const targetsServer = targets.filter((t) => t.isServerSide);
     const targetsClient = targets.filter((t) => !t.isServerSide);
     targetsClient.forEach((targetClient) => {
@@ -215,10 +218,9 @@ async function fixServerAssets_assertCssTarget(config) {
         targetsServer.forEach((targetServer) => {
             const targetCssResolvedServer = resolveCssTarget(targetServer);
             (0, utils_js_1.assertWarning)((0, utils_js_1.isEqualStringList)(targetCssResolvedClient, targetCssResolvedServer), [
-                'The CSS browser target should be the same for both client and server, but we got:',
-                `Client: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
-                `Server: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`,
-                `Different targets lead to CSS duplication, see ${picocolors_1.default.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`
+                'The CSS browser target should be the same for both client-side and server-side (https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979) but we got:',
+                `Client-side: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
+                `Server-side: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`
             ].join('\n'), {
                 showStackTrace: true,
                 onlyOnce: 'different-css-target'

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

@@ -54,6 +54,7 @@ function buildConfig() {
                             config.build.ssrEmitAssets = true;
                             // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
                             config.build.cssMinify = 'esbuild';
+                            (0, fixServerAssets_js_1.fixServerAssets_assertCssTarget_populate)(config);
                             (0, fixServerAssets_js_1.fixServerAssets_assertCssCodeSplit)(config);
                         }
                     }

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

@@ -12,7 +12,6 @@ const util_1 = require("util");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
 const getEnvVarObject_js_1 = require("../../../../shared/getEnvVarObject.js");
 const execA = (0, util_1.promisify)(child_process_1.exec);
-const debug = (0, utils_js_1.createDebugger)('vike:crawl');
 (0, utils_js_1.assertIsNotProductionRuntime)();
 (0, utils_js_1.assertIsSingleModuleInstance)('crawlPlusFiles.ts');
 let gitIsNotUsable = false;
@@ -36,16 +35,17 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     // Crawl
-    const filesGit = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
-    const filesGitNothingFound = !filesGit || filesGit.length === 0;
-    const filesGlob = (filesGitNothingFound || debug.isActivated) && (await fastGlob(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.)
-            filesGlob;
-    (0, utils_js_1.assert)(files);
-    if (debug.isActivated)
-        (0, utils_js_1.assert)((0, utils_js_1.deepEqual)(filesGlob, filesGit), "Git and glob results aren't matching.");
+    let files;
+    const res = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
+    if (res &&
+        // 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.)
+        res.length > 0) {
+        files = res;
+        // We cannot find files inside symlink directories with `$ git ls-files` => we use fast-glob
+    }
+    else {
+        files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
+    }
     // Filter build files
     files = files.filter((filePath) => !(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(filePath));
     // Normalize
@@ -74,7 +74,7 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         preserveUTF8,
         'ls-files',
         // Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
-        ...utils_js_1.scriptFileExtensionList.map((ext) => `"**/+*.${ext}" "+*.${ext}"`),
+        ...utils_js_1.scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
         // Performance gain is non-negligible.
         //  - https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
         //  - When node_modules/ is untracked the performance gain could be significant?
@@ -101,12 +101,6 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         }
         throw err;
     }
-    if (debug.isActivated) {
-        debug('[git] userRootDir:', userRootDir);
-        debug('[git] cmd:', cmd);
-        debug('[git] result:', filesAll);
-        debug('[git] filesDeleted:', filesDeleted);
-    }
     const files = [];
     for (const filePath of filesAll) {
         // + file?
@@ -127,21 +121,14 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
-    const pattern = `**/+*.${utils_js_1.scriptFileExtensions}`;
-    const options = {
+    const files = await (0, fast_glob_1.default)(`**/+*.${utils_js_1.scriptFileExtensions}`, {
         ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
         dot: false
-    };
-    const files = await (0, fast_glob_1.default)(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();
-    if (debug.isActivated) {
-        debug('[glob] pattern:', pattern);
-        debug('[glob] options:', options);
-        debug('[glob] result:', files);
-    }
     return files;
 }
 // Same as getIgnoreAsFilterFn() but as glob pattern

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

@@ -8,6 +8,7 @@ exports.getFilesystemRouteDefinedBy = getFilesystemRouteDefinedBy;
 exports.isInherited = isInherited;
 exports.getLocationId = getLocationId;
 exports.sortAfterInheritanceOrder = sortAfterInheritanceOrder;
+exports.isGlobalLocation = isGlobalLocation;
 exports.applyFilesystemRoutingRootEffect = applyFilesystemRoutingRootEffect;
 exports.getLogicalPath = getLogicalPath;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -44,6 +45,10 @@ function getLogicalPath(locationId, ignoredDirs, removeParenthesesDirs) {
     assertIsPath(logicalPath);
     return logicalPath;
 }
+/** Whether configs defined in `locationId` apply in every `locationIds` */
+function isGlobalLocation(locationId, locationIds) {
+    return locationIds.every((locId) => isInherited(locationId, locId) || locationIsRendererDir(locId));
+}
 function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
     assertLocationId(locationId1);
     assertLocationId(locationId2);

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

@@ -56,7 +56,7 @@ async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir,
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig, esbuildCache) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);
-    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, userRootDir, isExtensionConfig, esbuildCache);
+    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, userRootDir, isExtensionConfig ? 'is-extension-config' : true, esbuildCache);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [...visited, filePathAbsoluteFilesystem], esbuildCache);
     const configFile = {
         fileExports,

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

@@ -26,7 +26,7 @@ const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
 const debugEsbuildResolve = (0, utils_js_1.createDebugger)('vike:esbuild-resolve');
 if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', esbuild_1.version);
-async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig, esbuildCache) {
+async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
     if (esbuildCache[filePathAbsoluteFilesystem]) {
@@ -40,12 +40,12 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${picocolors_1.default.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
     }
     let fileExports;
-    if (isExtensionConfig && !isHeader && fileExtension.endsWith('js')) {
+    if (isConfigFile === 'is-extension-config' && !isHeader && fileExtension.endsWith('js')) {
         // This doesn't track dependencies => we should never use this for user land configs
         fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
     }
     else {
-        const transformImports = isHeader ? 'all' : true;
+        const transformImports = isConfigFile && (isHeader ? 'all' : true);
         const code = await transpileFile(filePath, transformImports, userRootDir);
         fileExports = await executeTranspiledFile(filePath, code);
     }
@@ -338,7 +338,6 @@ function isTemporaryBuildFile(filePath) {
     const fileName = path_1.default.posix.basename(filePath);
     return /\.build-[a-z0-9]{12}\.mjs$/.test(fileName);
 }
-// TODO/next-major: remove
 function isHeaderFile(filePath) {
     (0, utils_js_1.assertPosixPath)(filePath);
     const fileExtensions = getFileExtensions(filePath);

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

@@ -141,7 +141,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const esbuildCache = {};
     const plusFilesAll = await (0, getPlusFilesAll_js_1.getPlusFilesAll)(userRootDir, esbuildCache);
-    // assertKnownConfigs(plusFilesAll)
+    assertKnownConfigs(plusFilesAll);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // interop vike(options) in vite.config.js
@@ -235,9 +235,10 @@ function assertPageConfigGlobal(pageConfigGlobal, plusFilesAll) {
     });
 }
 function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDefinitionsGlobal) {
+    const locationIdsAll = (0, utils_js_1.objectKeys)(plusFilesAll);
     // Determine existing global +config.js files
     const configFilePathsGlobal = [];
-    const plusFilesGlobal = Object.values((0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(plusFilesAll).filter(([locationId]) => isGlobalLocation(locationId, plusFilesAll)))).flat();
+    const plusFilesGlobal = Object.values((0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(plusFilesAll).filter(([locationId]) => (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIdsAll)))).flat();
     plusFilesGlobal
         .filter((i) => i.isConfigFile)
         .forEach((plusFile) => {
@@ -256,7 +257,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
         if (!filePathAbsoluteUserRootDir)
             return;
         (0, utils_js_1.assert)(!plusFile.isExtensionConfig);
-        if (!isGlobalLocation(source.locationId, plusFilesAll)) {
+        if (!(0, filesystemRouting_js_1.isGlobalLocation)(source.locationId, locationIdsAll)) {
             const configDef = configDefinitionsGlobal[configName];
             (0, utils_js_1.assert)(configDef);
             const isConditionallyGlobal = (0, utils_js_1.isCallable)(configDef.global);
@@ -359,7 +360,7 @@ function sortForGlobal(plusFilesAll) {
     const locationIdsAll = (0, utils_js_1.objectKeys)(plusFilesAll);
     const plusFilesAllSorted = Object.fromEntries((0, utils_js_1.objectEntries)(plusFilesAll)
         .sort((0, utils_js_1.lowerFirst)(([locationId]) => locationId.split('/').length))
-        .sort((0, utils_js_1.makeFirst)(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
+        .sort((0, utils_js_1.makeFirst)(([locationId]) => (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIdsAll))));
     return plusFilesAllSorted;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
@@ -931,10 +932,3 @@ function resolveConfigEnv(configEnv, filePath) {
     }
     return configEnvResolved;
 }
-/** Whether configs defined in `locationId` apply to every page */
-function isGlobalLocation(locationId, plusFilesAll) {
-    const locationIdsPage = (0, utils_js_1.objectEntries)(plusFilesAll)
-        .filter(([_locationId, plusFiles]) => isDefiningPage(plusFiles))
-        .map(([locationId]) => locationId);
-    return locationIdsPage.every((locId) => (0, filesystemRouting_js_1.isInherited)(locationId, locId));
-}

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

@@ -14,7 +14,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
@@ -98,11 +98,11 @@ async function loadUserFilesServerSide(pageContext) {
     }
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
+async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/cjs/node/runtime-dev/createDevMiddleware.js

@@ -11,7 +11,7 @@ const globalContext_js_1 = require("../runtime/globalContext.js");
  */
 async function createDevMiddleware(options = {}) {
     (0, globalContext_js_1.setGlobalContext_isProduction)(false);
-    const viteConfigFromOptions = {
+    const viteConfig = {
         ...options.viteConfig,
         server: {
             ...options.viteConfig?.server,
@@ -19,8 +19,8 @@ async function createDevMiddleware(options = {}) {
         }
     };
     if (options.root)
-        viteConfigFromOptions.root = options.root;
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfigFromOptions, 'dev');
+        viteConfig.root = options.root;
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfig, 'dev');
     const server = await (0, vite_1.createServer)(viteConfigEnhanced);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };

package/dist/cjs/shared/page-configs/getPageConfigUserFriendly.js

@@ -19,7 +19,7 @@ function getPageConfigUserFriendlyNew(pageConfig) {
         _from: res.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
+function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -44,9 +44,7 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin({
-            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
-        });
+        const res = getPageConfigUserFriendlyV1Desin(pageConfig);
         source = res.source;
         sources = res.sources;
         from = res.from;

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.221-commit-937dbfb';
+exports.PROJECT_VERSION = '0.4.221';

package/dist/cjs/utils/debug.js

@@ -17,9 +17,7 @@ const isArray_js_1 = require("./isArray.js");
 (0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
 globalThis.__brillout_debug_createDebugger = createDebugger;
 const flags = [
-    'vike:crawl',
     'vike:error',
-    'vike:esbuild-resolve',
     'vike:extractAssets',
     'vike:extractExportNames',
     'vike:glob',
@@ -32,9 +30,9 @@ const flags = [
     'vike:routing',
     'vike:setup',
     'vike:stream',
-    'vike:virtual-files'
+    'vike:virtual-files',
+    'vike:esbuild-resolve'
 ];
-const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
 assertFlagsActivated();
 function createDebugger(flag, optionsGlobal) {
@@ -79,8 +77,8 @@ function debug_(flag, options, ...msgs) {
 function isDebugActivated(flag) {
     (0, checkType_js_1.checkType)(flag);
     (0, assert_js_1.assert)(flags.includes(flag));
-    const { flagsActivated, all } = getFlagsActivated();
-    const isActivated = flagsActivated.includes(flag) || (all && !flagsSkipWildcard.includes(flag));
+    const flagsActivated = getFlagsActivated();
+    const isActivated = flagsActivated.includes(flag);
     return isActivated;
 }
 function formatMsg(info, options, padding, position) {
@@ -144,7 +142,7 @@ function replaceFunctionSerializer(_key, value) {
     return value;
 }
 function assertFlagsActivated() {
-    const { flagsActivated } = getFlagsActivated();
+    const flagsActivated = getFlagsActivated();
     flagsActivated.forEach((flag) => {
         (0, assert_js_1.assertUsage)(flags.includes(flag), `Unknown DEBUG flag ${picocolors_1.default.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${picocolors_1.default.cyan(f)}`).join('\n')}`);
     });
@@ -152,8 +150,7 @@ function assertFlagsActivated() {
 function getFlagsActivated() {
     const DEBUG = getDEBUG() ?? '';
     const flagsActivated = DEBUG.match(flagRegex) ?? [];
-    const all = DEBUG.includes('vike:*');
-    return { flagsActivated, all };
+    return flagsActivated;
 }
 function getDEBUG() {
     let DEBUG;

package/dist/esm/client/client-routing-runtime/prefetch.js

@@ -45,7 +45,7 @@ function getPageContextPrefetched(pageContext) {
 }
 async function prefetchAssets(pageContextLink) {
     try {
-        await loadUserFilesClientSide(pageContextLink.pageId, pageContextLink._pageFilesAll, pageContextLink._pageConfigs, pageContextLink._pageConfigGlobal);
+        await loadUserFilesClientSide(pageContextLink.pageId, pageContextLink._pageFilesAll, pageContextLink._pageConfigs);
     }
     catch (err) {
         if (isErrorFetchingStaticAssets(err)) {

package/dist/esm/client/client-routing-runtime/renderPageClientSide.js

@@ -131,7 +131,7 @@ async function renderPageClientSide(renderArgs) {
             objectAssign(pageContext, pageContextFromRoute);
         }
         try {
-            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs, pageContext._pageConfigGlobal));
+            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs));
         }
         catch (err) {
             if (handleErrorFetchingStaticAssets(err, pageContext, isFirstRender)) {
@@ -336,7 +336,7 @@ async function renderPageClientSide(renderArgs) {
             return;
         }
         try {
-            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs, pageContext._pageConfigGlobal));
+            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs));
         }
         catch (err) {
             if (handleErrorFetchingStaticAssets(err, pageContext, isFirstRender)) {

package/dist/esm/client/server-routing-runtime/getPageContext.d.ts

@@ -10,7 +10,6 @@ declare function getPageContext(): Promise<{
 } & {
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
 } & import("../../shared/getPageFiles.js").PageConfigUserFriendly & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

package/dist/esm/client/server-routing-runtime/getPageContext.js

@@ -6,7 +6,7 @@ import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { getPageConfigsRuntime } from '../../shared/getPageConfigsRuntime.js';
 // @ts-ignore
 import * as virtualFileExports from 'virtual:vike:importUserCode:client:server-routing';
-const { pageFilesAll, pageConfigs, pageConfigGlobal } = getPageConfigsRuntime(virtualFileExports);
+const { pageFilesAll, pageConfigs } = getPageConfigsRuntime(virtualFileExports);
 const urlFirst = getCurrentUrl({ withoutHash: true });
 async function getPageContext() {
     const pageContext = getPageContextSerializedInHtml();
@@ -28,10 +28,9 @@ async function loadPageUserFiles(pageId) {
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, {
         _pageFilesAll: pageFilesAll,
-        _pageConfigs: pageConfigs,
-        _pageConfigGlobal: pageConfigGlobal
+        _pageConfigs: pageConfigs
     });
-    objectAssign(pageContextAddendum, await loadUserFilesClientSide(pageId, pageContextAddendum._pageFilesAll, pageContextAddendum._pageConfigs, pageContextAddendum._pageConfigGlobal));
+    objectAssign(pageContextAddendum, await loadUserFilesClientSide(pageId, pageContextAddendum._pageFilesAll, pageContextAddendum._pageConfigs));
     pageFilesAll
         .filter((p) => p.fileType !== '.page.server')
         .forEach((p) => {

package/dist/esm/client/shared/loadUserFilesClientSide.d.ts

@@ -2,14 +2,13 @@ export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
 import { type PageFile, type PageConfigUserFriendly } from '../../shared/getPageFiles.js';
-import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContextUserFilesLoaded = PageConfigUserFriendly & {
     _pageFilesLoaded: PageFile[];
 };
 type PageContextUserFiles = {
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
-    _pageConfigGlobal: PageConfigGlobalRuntime;
 };
-declare function loadUserFilesClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<PageContextUserFilesLoaded>;
+declare function loadUserFilesClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[]): Promise<PageContextUserFilesLoaded>;
 declare function isErrorFetchingStaticAssets(err: unknown): boolean;

package/dist/esm/client/shared/loadUserFilesClientSide.js

@@ -6,7 +6,7 @@ import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { objectAssign } from '../server-routing-runtime/utils.js';
 const stamp = '__whileFetchingAssets';
-async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
+async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs) {
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);
     const pageConfig = findPageConfig(pageConfigs, pageId);
     let pageConfigLoaded;
@@ -30,7 +30,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageCo
         }
         throw err;
     }
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

package/dist/esm/node/api/prepareViteApiCall.d.ts

@@ -5,10 +5,10 @@ export { normalizeViteRoot };
 import type { InlineConfig, ResolvedConfig } from 'vite';
 import type { Operation } from './types.js';
 import { type VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
-declare function prepareViteApiCall(viteConfigFromOptions: InlineConfig | undefined, operation: Operation): Promise<{
+declare function prepareViteApiCall(viteConfig: InlineConfig | undefined, operation: Operation): Promise<{
     vikeConfig: VikeConfigObject;
     viteConfigEnhanced: InlineConfig | undefined;
 }>;
-declare function getViteRoot(operation: Operation): Promise<string>;
+declare function getViteRoot(operation: 'build' | 'dev' | 'preview' | 'prerender'): Promise<string>;
 declare function normalizeViteRoot(root: string): string;
 declare function assertViteRoot(root: string, config: ResolvedConfig): void;

package/dist/esm/node/api/prepareViteApiCall.js

@@ -11,18 +11,18 @@ import { assert, assertUsage, getGlobalObject, isObject, toPosixPath } from './u
 import pc from '@brillout/picocolors';
 import { clearGlobalContext } from '../runtime/globalContext.js';
 const globalObject = getGlobalObject('prepareViteApiCall.ts', {});
-async function prepareViteApiCall(viteConfigFromOptions, operation) {
+async function prepareViteApiCall(viteConfig, operation) {
     clear();
     setContextApiOperation(operation);
-    return enhanceViteConfig(viteConfigFromOptions, operation);
+    return enhanceViteConfig(viteConfig, operation);
 }
 // For subsequent API calls, e.g. calling prerender() after build()
 function clear() {
     clearContextApiOperation();
     clearGlobalContext();
 }
-async function enhanceViteConfig(viteConfigFromOptions, operation) {
-    const viteInfo = await getInfoFromVite(viteConfigFromOptions, operation);
+async function enhanceViteConfig(viteConfig, operation) {
+    const viteInfo = await getInfoFromVite(viteConfig, operation);
     await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
     const vikeConfig = await getVikeConfig2(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
     const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
@@ -38,7 +38,6 @@ function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
     viteConfigs.values.forEach((v) => {
         assertUsage(isObject(v.value), `${v.definedAt} should be an object`);
         viteConfigEnhanced = mergeConfig(viteConfigEnhanced ?? {}, v.value);
-        assertUsage(!findVikeVitePlugin(v.value), "Using the +vite setting to add Vike's Vite plugin is forbidden");
     });
     return viteConfigEnhanced;
 }
@@ -48,14 +47,13 @@ async function getViteRoot(operation) {
     assert(globalObject.root);
     return globalObject.root;
 }
-async function getInfoFromVite(viteConfigFromOptions, operation) {
-    const viteConfigFromUserViteFile = await loadViteConfigFile(viteConfigFromOptions, operation);
-    const root = normalizeViteRoot(viteConfigFromUserViteFile?.root ?? viteConfigFromOptions?.root ?? process.cwd());
+async function getInfoFromVite(viteConfig, operation) {
+    const viteConfigFromFile = await loadViteConfigFile(viteConfig, operation);
+    const root = normalizeViteRoot(viteConfigFromFile?.root ?? viteConfig?.root ?? process.cwd());
     globalObject.root = root;
     let vikeVitePluginOptions;
-    let viteConfigEnhanced = viteConfigFromOptions;
-    // If Vike's Vite plugin is found in both viteConfigFromOptions and viteConfigFromUserViteFile then Vike will later throw an error
-    const found = findVikeVitePlugin(viteConfigFromOptions) || findVikeVitePlugin(viteConfigFromUserViteFile);
+    let viteConfigEnhanced = viteConfig;
+    const found = findVikeVitePlugin([...(viteConfig?.plugins ?? []), ...(viteConfigFromFile?.plugins ?? [])]);
     if (found) {
         vikeVitePluginOptions = found.vikeVitePluginOptions;
     }
@@ -64,20 +62,20 @@ async function getInfoFromVite(viteConfigFromOptions, operation) {
         // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus vike/plugin may resolved to two different node_modules/vike directories.
         const { plugin: vikePlugin } = await import('../plugin/index.js');
         viteConfigEnhanced = {
-            ...viteConfigFromOptions,
-            plugins: [...(viteConfigFromOptions?.plugins ?? []), vikePlugin()]
+            ...viteConfig,
+            plugins: [...(viteConfig?.plugins ?? []), vikePlugin()]
         };
-        const res = findVikeVitePlugin(viteConfigEnhanced);
+        const res = findVikeVitePlugin(viteConfigEnhanced.plugins);
         assert(res);
         vikeVitePluginOptions = res.vikeVitePluginOptions;
     }
     assert(vikeVitePluginOptions);
     return { root, vikeVitePluginOptions, viteConfigEnhanced };
 }
-function findVikeVitePlugin(viteConfig) {
+function findVikeVitePlugin(plugins) {
     let vikeVitePluginOptions;
     let vikeVitePuginFound = false;
-    viteConfig?.plugins?.forEach((p) => {
+    plugins.forEach((p) => {
         if (p && '__vikeVitePluginOptions' in p) {
             vikeVitePuginFound = true;
             const options = p.__vikeVitePluginOptions;
@@ -90,8 +88,8 @@ function findVikeVitePlugin(viteConfig) {
     return { vikeVitePluginOptions };
 }
 // Copied from https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L961-L1005
-async function loadViteConfigFile(viteConfigFromOptions, operation) {
-    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfigFromOptions, operation);
+async function loadViteConfigFile(viteConfig, operation) {
+    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfig, operation);
     let config = inlineConfig;
     let mode = inlineConfig.mode || defaultMode;
     const configEnv = {

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.d.ts

@@ -2,6 +2,7 @@ export { fixServerAssets };
 export { fixServerAssets_isEnabled };
 export { fixServerAssets_assertCssCodeSplit };
 export { fixServerAssets_assertCssTarget };
+export { fixServerAssets_assertCssTarget_populate };
 import { ViteManifest } from '../../../shared/ViteManifest.js';
 import { ResolvedConfig } from 'vite';
 /**
@@ -17,4 +18,5 @@ declare function fixServerAssets(config: ResolvedConfig): Promise<{
     serverManifestMod: ViteManifest;
 }>;
 declare function fixServerAssets_assertCssCodeSplit(config: ResolvedConfig): void;
+declare function fixServerAssets_assertCssTarget_populate(config: ResolvedConfig): void;
 declare function fixServerAssets_assertCssTarget(config: ResolvedConfig): Promise<void>;

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

@@ -2,6 +2,7 @@ export { fixServerAssets };
 export { fixServerAssets_isEnabled };
 export { fixServerAssets_assertCssCodeSplit };
 export { fixServerAssets_assertCssTarget };
+export { fixServerAssets_assertCssTarget_populate };
 import fs from 'fs/promises';
 import fs_sync from 'fs';
 import path from 'path';
@@ -194,15 +195,17 @@ function fixServerAssets_assertCssCodeSplit(config) {
     assertWarning(config.build.cssCodeSplit, `${pc.cyan('build.cssCodeSplit')} shouldn't be set to ${pc.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
+function fixServerAssets_assertCssTarget_populate(config) {
+    const isServerSide = viteIsSSR(config);
+    assert(typeof isServerSide === 'boolean');
+    assert(config.build.target !== undefined);
+    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
+}
 async function fixServerAssets_assertCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
     if (!(await isV1Design(config)))
         return;
-    const isServerSide = viteIsSSR(config);
-    assert(typeof isServerSide === 'boolean');
-    assert(config.build.target !== undefined);
-    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
     const targetsServer = targets.filter((t) => t.isServerSide);
     const targetsClient = targets.filter((t) => !t.isServerSide);
     targetsClient.forEach((targetClient) => {
@@ -210,10 +213,9 @@ async function fixServerAssets_assertCssTarget(config) {
         targetsServer.forEach((targetServer) => {
             const targetCssResolvedServer = resolveCssTarget(targetServer);
             assertWarning(isEqualStringList(targetCssResolvedClient, targetCssResolvedServer), [
-                'The CSS browser target should be the same for both client and server, but we got:',
-                `Client: ${pc.cyan(JSON.stringify(targetCssResolvedClient))}`,
-                `Server: ${pc.cyan(JSON.stringify(targetCssResolvedServer))}`,
-                `Different targets lead to CSS duplication, see ${pc.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`
+                'The CSS browser target should be the same for both client-side and server-side (https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979) but we got:',
+                `Client-side: ${pc.cyan(JSON.stringify(targetCssResolvedClient))}`,
+                `Server-side: ${pc.cyan(JSON.stringify(targetCssResolvedServer))}`
             ].join('\n'), {
                 showStackTrace: true,
                 onlyOnce: 'different-css-target'

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

@@ -10,7 +10,7 @@ import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { createRequire } from 'module';
 import fs from 'fs/promises';
 import path from 'path';
-import { fixServerAssets, fixServerAssets_assertCssCodeSplit, fixServerAssets_assertCssTarget, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
+import { fixServerAssets, fixServerAssets_assertCssCodeSplit, fixServerAssets_assertCssTarget, fixServerAssets_assertCssTarget_populate, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { set_ASSETS_MANIFEST } from './buildEntry/index.js';
 import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../shared/getFilePath.js';
@@ -48,6 +48,7 @@ function buildConfig() {
                             config.build.ssrEmitAssets = true;
                             // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
                             config.build.cssMinify = 'esbuild';
+                            fixServerAssets_assertCssTarget_populate(config);
                             fixServerAssets_assertCssCodeSplit(config);
                         }
                     }

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

@@ -1,5 +1,5 @@
 export { crawlPlusFiles };
-import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual } from '../../../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList } from '../../../../utils.js';
 import path from 'path';
 import glob from 'fast-glob';
 import { exec } from 'child_process';
@@ -7,7 +7,6 @@ import { promisify } from 'util';
 import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
 import { getEnvVarObject } from '../../../../shared/getEnvVarObject.js';
 const execA = promisify(exec);
-const debug = createDebugger('vike:crawl');
 assertIsNotProductionRuntime();
 assertIsSingleModuleInstance('crawlPlusFiles.ts');
 let gitIsNotUsable = false;
@@ -31,16 +30,17 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     // Crawl
-    const filesGit = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
-    const filesGitNothingFound = !filesGit || filesGit.length === 0;
-    const filesGlob = (filesGitNothingFound || debug.isActivated) && (await fastGlob(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.)
-            filesGlob;
-    assert(files);
-    if (debug.isActivated)
-        assert(deepEqual(filesGlob, filesGit), "Git and glob results aren't matching.");
+    let files;
+    const res = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
+    if (res &&
+        // 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.)
+        res.length > 0) {
+        files = res;
+        // We cannot find files inside symlink directories with `$ git ls-files` => we use fast-glob
+    }
+    else {
+        files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
+    }
     // Filter build files
     files = files.filter((filePath) => !isTemporaryBuildFile(filePath));
     // Normalize
@@ -69,7 +69,7 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         preserveUTF8,
         'ls-files',
         // Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
-        ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}" "+*.${ext}"`),
+        ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
         // Performance gain is non-negligible.
         //  - https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
         //  - When node_modules/ is untracked the performance gain could be significant?
@@ -96,12 +96,6 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         }
         throw err;
     }
-    if (debug.isActivated) {
-        debug('[git] userRootDir:', userRootDir);
-        debug('[git] cmd:', cmd);
-        debug('[git] result:', filesAll);
-        debug('[git] filesDeleted:', filesDeleted);
-    }
     const files = [];
     for (const filePath of filesAll) {
         // + file?
@@ -122,21 +116,14 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
-    const pattern = `**/+*.${scriptFileExtensions}`;
-    const options = {
+    const files = await glob(`**/+*.${scriptFileExtensions}`, {
         ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
         dot: 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
     // https://github.com/vikejs/vike/pull/1750
     files.sort();
-    if (debug.isActivated) {
-        debug('[glob] pattern:', pattern);
-        debug('[glob] options:', options);
-        debug('[glob] result:', files);
-    }
     return files;
 }
 // Same as getIgnoreAsFilterFn() but as glob pattern

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.d.ts

@@ -3,6 +3,7 @@ export { getFilesystemRouteDefinedBy };
 export { isInherited };
 export { getLocationId };
 export { sortAfterInheritanceOrder };
+export { isGlobalLocation };
 export { applyFilesystemRoutingRootEffect };
 export type { LocationId };
 export { getLogicalPath };
@@ -45,6 +46,8 @@ declare function getFilesystemRouteString(locationId: LocationId): string;
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
  */
 declare function getLogicalPath(locationId: LocationId, ignoredDirs: string[], removeParenthesesDirs?: true): string;
+/** Whether configs defined in `locationId` apply in every `locationIds` */
+declare function isGlobalLocation(locationId: LocationId, locationIds: LocationId[]): boolean;
 declare function sortAfterInheritanceOrder(locationId1: LocationId, locationId2: LocationId, locationIdPage: LocationId): -1 | 1 | 0;
 /** Whether configs defined at `locationId1` also apply at `locationId2` */
 declare function isInherited(locationId1: LocationId, locationId2: LocationId): boolean;

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

@@ -3,6 +3,7 @@ export { getFilesystemRouteDefinedBy };
 export { isInherited };
 export { getLocationId };
 export { sortAfterInheritanceOrder };
+export { isGlobalLocation };
 export { applyFilesystemRoutingRootEffect };
 // For ./filesystemRouting.spec.ts
 export { getLogicalPath };
@@ -40,6 +41,10 @@ function getLogicalPath(locationId, ignoredDirs, removeParenthesesDirs) {
     assertIsPath(logicalPath);
     return logicalPath;
 }
+/** Whether configs defined in `locationId` apply in every `locationIds` */
+function isGlobalLocation(locationId, locationIds) {
+    return locationIds.every((locId) => isInherited(locationId, locId) || locationIsRendererDir(locId));
+}
 function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
     assertLocationId(locationId1);
     assertLocationId(locationId2);

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

@@ -51,7 +51,7 @@ async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir,
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig, esbuildCache) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);
-    const { fileExports } = await transpileAndExecuteFile(configFilePath, userRootDir, isExtensionConfig, esbuildCache);
+    const { fileExports } = await transpileAndExecuteFile(configFilePath, userRootDir, isExtensionConfig ? 'is-extension-config' : true, esbuildCache);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [...visited, filePathAbsoluteFilesystem], esbuildCache);
     const configFile = {
         fileExports,

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

@@ -10,7 +10,7 @@ type FileExports = {
 };
 type EsbuildCache = Record<string, // filePathAbsoluteFilesystem
 Promise<FileExports>>;
-declare function transpileAndExecuteFile(filePath: FilePathResolved, userRootDir: string, isExtensionConfig: boolean, esbuildCache: EsbuildCache): Promise<FileExports>;
+declare function transpileAndExecuteFile(filePath: FilePathResolved, userRootDir: string, isConfigFile: boolean | 'is-extension-config', esbuildCache: EsbuildCache): Promise<FileExports>;
 declare function getConfigBuildErrorFormatted(err: unknown): null | string;
 declare function getConfigExecutionErrorIntroMsg(err: unknown): string | null;
 declare function isTemporaryBuildFile(filePath: string): boolean;

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

@@ -21,7 +21,7 @@ const debug = createDebugger('vike:pointer-imports');
 const debugEsbuildResolve = createDebugger('vike:esbuild-resolve');
 if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', version);
-async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig, esbuildCache) {
+async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
     if (esbuildCache[filePathAbsoluteFilesystem]) {
@@ -35,12 +35,12 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
         assertWarning(false, `${pc.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${pc.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
     }
     let fileExports;
-    if (isExtensionConfig && !isHeader && fileExtension.endsWith('js')) {
+    if (isConfigFile === 'is-extension-config' && !isHeader && fileExtension.endsWith('js')) {
         // This doesn't track dependencies => we should never use this for user land configs
         fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
     }
     else {
-        const transformImports = isHeader ? 'all' : true;
+        const transformImports = isConfigFile && (isHeader ? 'all' : true);
         const code = await transpileFile(filePath, transformImports, userRootDir);
         fileExports = await executeTranspiledFile(filePath, code);
     }
@@ -333,7 +333,6 @@ function isTemporaryBuildFile(filePath) {
     const fileName = path.posix.basename(filePath);
     return /\.build-[a-z0-9]{12}\.mjs$/.test(fileName);
 }
-// TODO/next-major: remove
 function isHeaderFile(filePath) {
     assertPosixPath(filePath);
     const fileExtensions = getFileExtensions(filePath);

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

@@ -7,7 +7,7 @@ export { getConfVal };
 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 { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, isGlobalLocation, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
 import { isConfigInvalid, isConfigInvalid_set } from '../../../../runtime/renderPage/isConfigInvalid.js';
 import { getViteDevServer } from '../../../../runtime/globalContext.js';
 import { logConfigError, logConfigErrorRecover } from '../../../shared/loggerNotProd.js';
@@ -135,7 +135,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const esbuildCache = {};
     const plusFilesAll = await getPlusFilesAll(userRootDir, esbuildCache);
-    // assertKnownConfigs(plusFilesAll)
+    assertKnownConfigs(plusFilesAll);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // interop vike(options) in vite.config.js
@@ -229,9 +229,10 @@ function assertPageConfigGlobal(pageConfigGlobal, plusFilesAll) {
     });
 }
 function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDefinitionsGlobal) {
+    const locationIdsAll = objectKeys(plusFilesAll);
     // Determine existing global +config.js files
     const configFilePathsGlobal = [];
-    const plusFilesGlobal = Object.values(objectFromEntries(objectEntries(plusFilesAll).filter(([locationId]) => isGlobalLocation(locationId, plusFilesAll)))).flat();
+    const plusFilesGlobal = Object.values(objectFromEntries(objectEntries(plusFilesAll).filter(([locationId]) => isGlobalLocation(locationId, locationIdsAll)))).flat();
     plusFilesGlobal
         .filter((i) => i.isConfigFile)
         .forEach((plusFile) => {
@@ -250,7 +251,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
         if (!filePathAbsoluteUserRootDir)
             return;
         assert(!plusFile.isExtensionConfig);
-        if (!isGlobalLocation(source.locationId, plusFilesAll)) {
+        if (!isGlobalLocation(source.locationId, locationIdsAll)) {
             const configDef = configDefinitionsGlobal[configName];
             assert(configDef);
             const isConditionallyGlobal = isCallable(configDef.global);
@@ -353,7 +354,7 @@ function sortForGlobal(plusFilesAll) {
     const locationIdsAll = objectKeys(plusFilesAll);
     const plusFilesAllSorted = Object.fromEntries(objectEntries(plusFilesAll)
         .sort(lowerFirst(([locationId]) => locationId.split('/').length))
-        .sort(makeFirst(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
+        .sort(makeFirst(([locationId]) => isGlobalLocation(locationId, locationIdsAll))));
     return plusFilesAllSorted;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
@@ -925,10 +926,3 @@ function resolveConfigEnv(configEnv, filePath) {
     }
     return configEnvResolved;
 }
-/** Whether configs defined in `locationId` apply to every page */
-function isGlobalLocation(locationId, plusFilesAll) {
-    const locationIdsPage = objectEntries(plusFilesAll)
-        .filter(([_locationId, plusFiles]) => isDefiningPage(plusFiles))
-        .map(([locationId]) => locationId);
-    return locationIdsPage.every((locId) => isInherited(locationId, locId));
-}

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

@@ -12,7 +12,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await analyzePage(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
@@ -96,11 +96,11 @@ async function loadUserFilesServerSide(pageContext) {
     }
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
+async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesServerSide, pageConfigLoaded);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/esm/node/runtime-dev/createDevMiddleware.js

@@ -9,7 +9,7 @@ import { setGlobalContext_isProduction } from '../runtime/globalContext.js';
  */
 async function createDevMiddleware(options = {}) {
     setGlobalContext_isProduction(false);
-    const viteConfigFromOptions = {
+    const viteConfig = {
         ...options.viteConfig,
         server: {
             ...options.viteConfig?.server,
@@ -17,8 +17,8 @@ async function createDevMiddleware(options = {}) {
         }
     };
     if (options.root)
-        viteConfigFromOptions.root = options.root;
-    const { viteConfigEnhanced } = await prepareViteApiCall(viteConfigFromOptions, 'dev');
+        viteConfig.root = options.root;
+    const { viteConfigEnhanced } = await prepareViteApiCall(viteConfig, 'dev');
     const server = await createServer(viteConfigEnhanced);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };

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

@@ -9,7 +9,7 @@ export type { ExportsAll };
 export type { ConfigEntries };
 import type { FileType } from '../getPageFiles/fileTypes.js';
 import type { PageFile } from '../getPageFiles/getPageFileObject.js';
-import type { ConfigValues, PageConfigGlobalRuntime, PageConfigRuntimeLoaded } from './PageConfig.js';
+import type { ConfigValues, PageConfigRuntimeLoaded } from './PageConfig.js';
 import { type ConfigDefinedAtOptional } from './getConfigDefinedAt.js';
 import type { ConfigResolved } from './Config/PageContextConfig.js';
 type ExportsAll = Record<string, {
@@ -82,4 +82,4 @@ type ConfigUserFriendly = {
 declare function getPageConfigUserFriendlyNew(pageConfig: {
     configValues: ConfigValues;
 }): ConfigUserFriendly;
-declare function getPageConfigUserFriendlyOld(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null, pageConfigGlobal: PageConfigGlobalRuntime): PageConfigUserFriendly;
+declare function getPageConfigUserFriendlyOld(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageConfigUserFriendly;

package/dist/esm/shared/page-configs/getPageConfigUserFriendly.js

@@ -14,7 +14,7 @@ function getPageConfigUserFriendlyNew(pageConfig) {
         _from: res.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
+function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -39,9 +39,7 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin({
-            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
-        });
+        const res = getPageConfigUserFriendlyV1Desin(pageConfig);
         source = res.source;
         sources = res.sources;
         from = res.from;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.221-commit-937dbfb";
+export declare const PROJECT_VERSION: "0.4.221";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.221-commit-937dbfb';
+export const PROJECT_VERSION = '0.4.221';

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

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugActivated };
 export type { Debug };
-declare const flags: readonly ["vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
+declare const flags: readonly ["vike:error", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files", "vike:esbuild-resolve"];
 type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {

package/dist/esm/utils/debug.js

@@ -12,9 +12,7 @@ import { isArray } from './isArray.js';
 assert(!isBrowser());
 globalThis.__brillout_debug_createDebugger = createDebugger;
 const flags = [
-    'vike:crawl',
     'vike:error',
-    'vike:esbuild-resolve',
     'vike:extractAssets',
     'vike:extractExportNames',
     'vike:glob',
@@ -27,9 +25,9 @@ const flags = [
     'vike:routing',
     'vike:setup',
     'vike:stream',
-    'vike:virtual-files'
+    'vike:virtual-files',
+    'vike:esbuild-resolve'
 ];
-const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
 assertFlagsActivated();
 function createDebugger(flag, optionsGlobal) {
@@ -74,8 +72,8 @@ function debug_(flag, options, ...msgs) {
 function isDebugActivated(flag) {
     checkType(flag);
     assert(flags.includes(flag));
-    const { flagsActivated, all } = getFlagsActivated();
-    const isActivated = flagsActivated.includes(flag) || (all && !flagsSkipWildcard.includes(flag));
+    const flagsActivated = getFlagsActivated();
+    const isActivated = flagsActivated.includes(flag);
     return isActivated;
 }
 function formatMsg(info, options, padding, position) {
@@ -139,7 +137,7 @@ function replaceFunctionSerializer(_key, value) {
     return value;
 }
 function assertFlagsActivated() {
-    const { flagsActivated } = getFlagsActivated();
+    const flagsActivated = getFlagsActivated();
     flagsActivated.forEach((flag) => {
         assertUsage(flags.includes(flag), `Unknown DEBUG flag ${pc.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${pc.cyan(f)}`).join('\n')}`);
     });
@@ -147,8 +145,7 @@ function assertFlagsActivated() {
 function getFlagsActivated() {
     const DEBUG = getDEBUG() ?? '';
     const flagsActivated = DEBUG.match(flagRegex) ?? [];
-    const all = DEBUG.includes('vike:*');
-    return { flagsActivated, all };
+    return flagsActivated;
 }
 function getDEBUG() {
     let DEBUG;

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.221-commit-937dbfb";
+    projectVersion: "0.4.221";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.221-commit-937dbfb",
+  "version": "0.4.221",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {