vike 0.4.216 → 0.4.217-commit-99ea561

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

@@ -6,17 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.crawlPlusFiles = crawlPlusFiles;
 const utils_js_1 = require("../../../../utils.js");
 const path_1 = __importDefault(require("path"));
-const promises_1 = __importDefault(require("fs/promises"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const child_process_1 = require("child_process");
 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 TOO_MANY_UNTRACKED_FILES = 5;
 (0, utils_js_1.assertIsNotProductionRuntime)();
 (0, utils_js_1.assertIsSingleModuleInstance)('crawlPlusFiles.ts');
 let gitIsNotUsable = false;
-async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, crawlWithGit) {
+async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
     //*/
     const outDirRelativeFromUserRootDir = null;
@@ -36,14 +35,13 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, crawlWithGi
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     // Crawl
-    let files = [];
-    const res = crawlWithGit !== false && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
+    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.files.length > 0) {
-        files = res.files;
+        res.length > 0) {
+        files = res;
         // We cannot find files inside symlink directories with `$ git ls-files` => we use fast-glob
-        files.push(...(await crawlSymlinkDirs(res.symlinkDirs, userRootDir, outDirRelativeFromUserRootDir)));
     }
     else {
         files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
@@ -85,14 +83,13 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         ...ignoreAsPatterns.map((pattern) => `--exclude="${pattern}"`),
         // --others --exclude-standard => list untracked files (--others) while using .gitignore (--exclude-standard)
         // --cached => list tracked files
-        // --stage => get file modes which we use to find symlink directories
-        '--others --exclude-standard --cached --stage'
+        '--others --exclude-standard --cached'
     ].join(' ');
-    let resultLines;
+    let filesAll;
     let filesDeleted;
     try {
         ;
-        [resultLines, filesDeleted] = await Promise.all([
+        [filesAll, filesDeleted] = await Promise.all([
             // Main command
             runCmd1(cmd, userRootDir),
             // Get tracked but deleted files
@@ -106,31 +103,14 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         }
         throw err;
     }
-    const filePaths = resultLines.map(parseGitLsResultLine);
-    // If there are too many files without mode we fallback to fast-glob
-    if (filePaths.filter((f) => !f.mode).length > TOO_MANY_UNTRACKED_FILES)
-        return null;
-    const symlinkDirs = [];
     const files = [];
-    for (const { filePath, mode } of filePaths) {
+    for (const filePath of filesAll) {
         // Deleted?
         if (filesDeleted.includes(filePath))
             continue;
         // We have to repeat the same exclusion logic here because the option --exclude of `$ git ls-files` only applies to untracked files. (We use --exclude only to speed up the `$ git ls-files` command.)
         if (!ignoreAsFilterFn(filePath))
             continue;
-        // Symlink directory?
-        {
-            const isSymlinkDir = await isSymlinkDirectory(mode, filePath, userRootDir);
-            if (isSymlinkDir) {
-                symlinkDirs.push(filePath);
-                continue;
-            }
-            // Skip deleted files and non-symlink directories
-            if (isSymlinkDir === null) {
-                continue;
-            }
-        }
         // + file?
         if (!path_1.default.posix.basename(filePath).startsWith('+'))
             continue;
@@ -139,7 +119,7 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
             continue;
         files.push(filePath);
     }
-    return { files, symlinkDirs };
+    return files;
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
@@ -209,77 +189,6 @@ async function isGitNotUsable(userRootDir) {
         return false;
     }
 }
-async function crawlSymlinkDirs(symlinkDirs, userRootDir, outDirRelativeFromUserRootDir) {
-    const filesInSymlinkDirs = (await Promise.all(symlinkDirs.map(async (symlinkDir) => (await fastGlob(path_1.default.posix.join(userRootDir, symlinkDir), outDirRelativeFromUserRootDir)).map((filePath) => path_1.default.posix.join(symlinkDir, filePath))))).flat();
-    return filesInSymlinkDirs;
-}
-// Parse:
-// ```
-// some/not/tracked/path
-// 100644 f6928073402b241b468b199893ff6f4aed0b7195 0\tpages/index/+Page.tsx
-// ```
-function parseGitLsResultLine(resultLine) {
-    const [part1, part2, ...rest] = resultLine.split('\t');
-    (0, utils_js_1.assert)(part1);
-    (0, utils_js_1.assert)(rest.length === 0);
-    // Git doesn't provide the mode for untracked paths.
-    // `resultLine` is:
-    // ```
-    // some/not/tracked/path
-    // ```
-    if (part2 === undefined) {
-        return { filePath: part1, mode: null };
-    }
-    (0, utils_js_1.assert)(part2);
-    // `resultLine` is:
-    // ```
-    // 100644 f6928073402b241b468b199893ff6f4aed0b7195 0\tpages/index/+Page.tsx
-    // ```
-    const [mode, _, __, ...rest2] = part1.split(' ');
-    (0, utils_js_1.assert)(mode && _ && __ && rest2.length === 0);
-    return { filePath: part2, mode };
-}
-async function isSymlinkDirectory(mode, filePath, userRootDir) {
-    const filePathAbsolute = path_1.default.posix.join(userRootDir, filePath);
-    let stats = null;
-    let isSymlink = false;
-    if (mode === '120000') {
-        isSymlink = true;
-    }
-    else if (mode === null) {
-        // `$ git ls-files` doesn't provide the mode when Git doesn't track the path
-        stats = await getFileStats(filePathAbsolute);
-        if (stats === null)
-            return null;
-        isSymlink = stats.isSymbolicLink();
-        if (!isSymlink && stats.isDirectory())
-            return null;
-    }
-    else {
-        (0, utils_js_1.assert)(mode);
-    }
-    if (!isSymlink)
-        return false;
-    if (!stats)
-        stats = await getFileStats(filePathAbsolute);
-    if (stats === null)
-        return null;
-    const isDirectory = stats.isDirectory();
-    return isDirectory;
-}
-async function getFileStats(filePathAbsolute) {
-    let stats;
-    try {
-        stats = await promises_1.default.lstat(filePathAbsolute);
-    }
-    catch (err) {
-        // File was deleted, usually a temporary file such as +config.js.build-j95xb988fpln.mjs
-        // ENOENT: no such file or directory
-        (0, utils_js_1.assert)(err.code === 'ENOENT');
-        return null;
-    }
-    return stats;
-}
 async function runCmd1(cmd, cwd) {
     const { stdout } = await execA(cmd, {
         cwd,
@@ -304,3 +213,7 @@ async function runCmd2(cmd, cwd) {
     stderr = stderr.toString().trim();
     return { stdout, stderr };
 }
+function isGitCrawlDisabled() {
+    const crawSettings = (0, getEnvVarObject_js_1.getEnvVarObject)('VIKE_CRAWL');
+    return crawSettings?.git === false;
+}

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

@@ -0,0 +1,128 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveVikeConfigGlobal = resolveVikeConfigGlobal;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const utils_js_1 = require("../../../../utils.js");
+function resolveVikeConfigGlobal(vikeVitePluginOptions, pageConfigGlobalValues) {
+    // TODO/v1-release: remove
+    assertVikeConfigGlobal(vikeVitePluginOptions, ({ prop, errMsg }) => `vite.config.js > vike option ${prop} ${errMsg}`);
+    const configs = [vikeVitePluginOptions];
+    assertVikeConfigGlobal(pageConfigGlobalValues, ({ prop, errMsg }) => {
+        // Can we add the config file path ?
+        return `config ${picocolors_1.default.cyan(prop)} ${errMsg}`;
+    });
+    configs.push(pageConfigGlobalValues);
+    const vikeConfigGlobal = {
+        disableAutoFullBuild: pickFirst(configs.map((c) => c.disableAutoFullBuild)) ?? null,
+        prerender: resolvePrerenderOptions(configs),
+        includeAssetsImportedByServer: pickFirst(configs.map((c) => c.includeAssetsImportedByServer)) ?? true,
+        baseServer: pickFirst(configs.map((c) => c.baseServer)) ?? null,
+        baseAssets: pickFirst(configs.map((c) => c.baseAssets)) ?? null,
+        redirects: merge(configs.map((c) => c.redirects)) ?? {},
+        disableUrlNormalization: pickFirst(configs.map((c) => c.disableUrlNormalization)) ?? false,
+        trailingSlash: pickFirst(configs.map((c) => c.trailingSlash)) ?? false,
+        crawl: {
+            git: vikeVitePluginOptions.crawl?.git ?? null
+        }
+    };
+    return vikeConfigGlobal;
+}
+function resolvePrerenderOptions(configs) {
+    if (!configs.some((c) => c.prerender)) {
+        return false;
+    }
+    const configsPrerender = configs.map((c) => c.prerender).filter(isObject2);
+    return {
+        partial: pickFirst(configsPrerender.map((c) => c.partial)) ?? false,
+        noExtraDir: pickFirst(configsPrerender.map((c) => c.noExtraDir)) ?? false,
+        parallel: pickFirst(configsPrerender.map((c) => c.parallel)) ?? true,
+        disableAutoRun: pickFirst(configsPrerender.map((c) => c.disableAutoRun)) ?? false
+    };
+}
+function isObject2(p) {
+    return typeof p === 'object';
+}
+function merge(objs) {
+    const obj = {};
+    objs.forEach((e) => {
+        Object.assign(obj, e);
+    });
+    return obj;
+}
+function pickFirst(arr) {
+    return arr.filter((v) => v !== undefined)[0];
+}
+function assertVikeConfigGlobal(vikeConfigGlobal, wrongUsageMsg) {
+    const wrongUsageError = check(vikeConfigGlobal);
+    if (wrongUsageError) {
+        (0, utils_js_1.assertUsage)(false, wrongUsageMsg(wrongUsageError));
+    }
+}
+function check(vikeConfigGlobal) {
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(vikeConfigGlobal));
+    {
+        const prop = 'disableUrlNormalization';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be a boolean' };
+    }
+    {
+        const prop = 'trailingSlash';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be a boolean' };
+    }
+    {
+        const prop = 'redirects';
+        const { redirects } = vikeConfigGlobal;
+        if (!(redirects === undefined ||
+            ((0, utils_js_1.isObject)(redirects) && Object.values(redirects).every((v) => typeof v === 'string'))))
+            return { prop, errMsg: 'should be an object of strings' };
+    }
+    {
+        const prop = 'disableAutoFullBuild';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') &&
+            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined') &&
+            !(vikeConfigGlobal[prop] === 'prerender'))
+            return { prop, errMsg: "should be a boolean or 'prerender'" };
+    }
+    {
+        const prop = 'includeAssetsImportedByServer';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be a boolean' };
+    }
+    {
+        const prop = 'prerender';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'object') &&
+            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') &&
+            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be an object or a boolean' };
+    }
+    const configVikePrerender = vikeConfigGlobal.prerender;
+    if (typeof configVikePrerender === 'object') {
+        {
+            const p = 'partial';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
+        }
+        {
+            const p = 'noExtraDir';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
+        }
+        {
+            const p = 'disableAutoRun';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
+        }
+        {
+            const p = 'parallel';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') &&
+                !(0, utils_js_1.hasProp)(configVikePrerender, p, 'number') &&
+                !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean or a number' };
+        }
+    }
+    return null;
+}

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vikeConfigDependencies = void 0;
 exports.getVikeConfig = getVikeConfig;
+exports.getVikeConfig2 = getVikeConfig2;
 exports.reloadVikeConfig = reloadVikeConfig;
 exports.isVikeConfigFile = isVikeConfigFile;
 exports.isV1Design = isV1Design;
@@ -26,18 +27,21 @@ const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.
 const resolvePointerImport_js_1 = require("./getVikeConfig/resolvePointerImport.js");
 const getFilePath_js_1 = require("../../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const assertExtensions_js_1 = require("./assertExtensions.js");
+const resolveVikeConfigGlobal_js_1 = require("./getVikeConfig/resolveVikeConfigGlobal.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-let devServerIsCorrupt = false;
+let restartVite = false;
 let wasConfigInvalid = null;
 let vikeConfigPromise = null;
 const vikeConfigDependencies = new Set();
 exports.vikeConfigDependencies = vikeConfigDependencies;
-function reloadVikeConfig(userRootDir, outDirRoot) {
+function reloadVikeConfig(config) {
+    const userRootDir = config.root;
+    const vikeVitePluginOptions = config._vikeVitePluginOptions;
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
     vikeConfigDependencies.clear();
     (0, resolvePointerImport_js_1.clearFilesEnvMap)();
-    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, true, true);
+    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
 }
 async function handleReloadSideEffects() {
@@ -61,8 +65,8 @@ async function handleReloadSideEffects() {
             wasConfigInvalid = false;
             (0, loggerNotProd_js_1.logConfigErrorRecover)();
         }
-        if (devServerIsCorrupt) {
-            devServerIsCorrupt = false;
+        if (restartVite) {
+            restartVite = false;
             const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
             (0, utils_js_1.assert)(viteDevServer);
             (0, removeSuperfluousViteLog_js_1.removeSuperfluousViteLog_enable)();
@@ -71,23 +75,32 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, { crawlWithGit, tolerateInvalidConfig } = {}) {
-    const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
+async function getVikeConfig(config, { doNotRestartViteOnError } = {}) {
     const userRootDir = config.root;
+    const vikeVitePluginOptions = config._vikeVitePluginOptions;
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
+    const isDev = config._isDev;
+    (0, utils_js_1.assert)(typeof isDev === 'boolean');
+    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError ?? false);
+}
+async function getVikeConfig2(userRootDir, isDev, vikeVitePluginOptions) {
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
+    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, false);
+}
+async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     if (!vikeConfigPromise) {
-        const crawlWithGit_ = crawlWithGit !== undefined ? crawlWithGit : (await (0, getConfigVike_js_1.getConfigVike)(config)).crawl.git;
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit_, tolerateInvalidConfig);
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     }
     return await vikeConfigPromise;
 }
-async function isV1Design(config, isDev) {
-    const vikeConfig = await getVikeConfig(config, isDev);
+async function isV1Design(config) {
+    const vikeConfig = await getVikeConfig(config);
     const { pageConfigs } = vikeConfig;
     const isV1Design = pageConfigs.length > 0;
     return isV1Design;
 }
-async function loadInterfaceFiles(userRootDir, outDirRoot, crawlWithGit) {
-    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, crawlWithGit);
+async function loadInterfaceFiles(userRootDir) {
+    const plusFiles = await findPlusFiles(userRootDir, null);
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
@@ -196,12 +209,12 @@ function assertAllConfigsAreKnown(interfaceFilesByLocationId) {
         });
     });
 }
-async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit, tolerateInvalidConfig) {
+async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     let hasError = false;
     let ret;
     let err;
     try {
-        ret = await loadVikeConfig(userRootDir, outDirRoot, crawlWithGit);
+        ret = await loadVikeConfig(userRootDir, vikeVitePluginOptions);
     }
     catch (err_) {
         hasError = true;
@@ -223,8 +236,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
         }
         else {
             (0, loggerNotProd_js_1.logConfigError)(err);
-            if (!tolerateInvalidConfig) {
-                devServerIsCorrupt = true;
+            if (!doNotRestartViteOnError) {
+                restartVite = true;
             }
             const dummyData = {
                 pageConfigs: [],
@@ -232,16 +245,17 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                globalVikeConfig: {}
+                vikeConfigGlobal: (0, resolveVikeConfigGlobal_js_1.resolveVikeConfigGlobal)({}, {})
             };
             return dummyData;
         }
     }
 }
-async function loadVikeConfig(userRootDir, outDirRoot, crawlWithGit) {
-    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, crawlWithGit);
+async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
+    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir);
     const importedFilesLoaded = {};
-    const { globalVikeConfig, pageConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
+    const { pageConfigGlobal, pageConfigGlobalValues } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
+    const vikeConfigGlobal = (0, resolveVikeConfigGlobal_js_1.resolveVikeConfigGlobal)(vikeVitePluginOptions, pageConfigGlobalValues);
     const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
         .filter(([_pageId, interfaceFiles]) => isDefiningPage(interfaceFiles))
         .map(async ([locationId]) => {
@@ -291,7 +305,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, crawlWithGit) {
         return pageConfig;
     }));
     assertPageConfigs(pageConfigs);
-    return { pageConfigs, pageConfigGlobal, globalVikeConfig };
+    return { pageConfigs, pageConfigGlobal, vikeConfigGlobal };
 }
 // TODO/soon: refactor
 //  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
@@ -401,7 +415,7 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
             });
         });
     }
-    const globalVikeConfig = {};
+    const pageConfigGlobalValues = {};
     const pageConfigGlobal = {
         configDefinitions: configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal,
         configValueSources: {}
@@ -421,10 +435,10 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
                 return;
             const { filePathToShowToUser } = configValueSource.definedAtFilePath;
             (0, utils_js_1.assertWarning)(false, `Being able to define config ${picocolors_1.default.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${picocolors_1.default.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
-            globalVikeConfig[configName] = configValueSource.value;
+            pageConfigGlobalValues[configName] = configValueSource.value;
         }
     }));
-    return { pageConfigGlobal, globalVikeConfig };
+    return { pageConfigGlobal, pageConfigGlobalValues };
 }
 async function resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded) {
     const sourcesInfo = [];
@@ -785,8 +799,8 @@ function getComputed(configValueSources, configDefinitions) {
     });
     return configValuesComputed;
 }
-async function findPlusFiles(userRootDir, outDirRoot, crawlWithGit) {
-    const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, crawlWithGit);
+async function findPlusFiles(userRootDir, outDirRoot) {
+    const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot);
     const plusFiles = files.map(({ filePathAbsoluteUserRootDir }) => (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir }));
     return plusFiles;
 }

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

@@ -8,7 +8,6 @@ const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.j
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
@@ -21,11 +20,11 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     }
     */
     const { pageId, isForClientSide } = result;
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
+    const { pageConfigs } = vikeConfig;
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig, { id, pageId });
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, configVike.includeAssetsImportedByServer, isDev);
+    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }

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

@@ -7,7 +7,7 @@ const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
-    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
+    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {

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

@@ -12,7 +12,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const index_js_1 = require("./devConfig/index.js");
 function previewConfig() {
     let config;
-    // let configVike: ConfigVikeResolved
+    // let vikeConfigGlobal: VikeConfigGlobal
     return {
         name: 'vike:previewConfig',
         apply: utils_js_1.applyPreview,
@@ -27,7 +27,8 @@ function previewConfig() {
         async configResolved(config_) {
             config = config_;
             (0, index_js_1.logDockerHint)(config.preview.host);
-            // configVike = await getConfigVike(config)
+            // const vikeConfig = await getVikeConfig(config)
+            // vikeConfigGlobal = vikeConfig.vikeConfigGlobal
         },
         configurePreviewServer(server) {
             /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
@@ -37,7 +38,7 @@ function previewConfig() {
             return () => {
                 assertDist();
                 /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.
-                if (!configVike.prerender || configVike.prerender.partial) {
+                if (!vikeConfigGlobal.prerender || vikeConfigGlobal.prerender.partial) {
                   addSsrMiddleware(server.middlewares, config, true)
                 }
                 /*/

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 function setGlobalContext() {
     return [
         {
@@ -32,10 +33,12 @@ function setGlobalContext() {
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
                     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
                     (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
+                    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                    (0, globalContext_js_1.setGlobalContext_vikeConfig)(vikeConfig);
                 }
             }
         }

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

@@ -39,7 +39,6 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const os_1 = require("os");
 const globalContext_js_1 = require("../runtime/globalContext.js");
 const vite_1 = require("vite");
-const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
@@ -99,10 +98,10 @@ async function runPrerender(options = {}, standaloneTrigger) {
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
     assertLoadedConfig(viteConfig, options);
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = configVike.prerender;
+    const prerenderConfig = vikeConfig.vikeConfigGlobal.prerender;
     if (!prerenderConfig) {
         (0, utils_js_1.assert)(standaloneTrigger);
         (0, utils_js_1.assertWarning)(prerenderConfig, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but the config ${picocolors_1.default.cyan('prerender')} isn't set to true`, {
@@ -122,7 +121,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
         pageContextInit: options.pageContextInit ?? null
     });
     const doNotPrerenderList = [];
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig, false);
     await collectDoNoPrerenderList(renderContext, vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit);
     await callOnBeforePrerenderStartHooks(prerenderContext, renderContext, concurrencyLimit, doNotPrerenderList);
     await handlePagesWithStaticRoutes(prerenderContext, renderContext, doNotPrerenderList, concurrencyLimit);