vike 0.4.217-commit-99ea561 → 0.4.218

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

@@ -56,7 +56,7 @@ function setSSR(viteConfig) {
     return {
         ...viteConfig,
         build: {
-            ...viteConfig.build,
+            ...viteConfig?.build,
             ssr: true
         }
     };

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

@@ -22,42 +22,100 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareViteApiCall = prepareViteApiCall;
+exports.getViteRoot = getViteRoot;
+exports.assertViteRoot = assertViteRoot;
+exports.normalizeViteRoot = normalizeViteRoot;
+// TODO: enable Vike extensions to add Vite plugins
 const vite_1 = require("vite");
-const pluginName_js_1 = require("../plugin/plugins/commonConfig/pluginName.js");
 const context_js_1 = require("./context.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
-async function prepareViteApiCall(viteConfig = {}, operation) {
+const path_1 = __importDefault(require("path"));
+const utils_js_1 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const globalObject = (0, utils_js_1.getGlobalObject)('prepareViteApiCall.ts', {});
+async function prepareViteApiCall(viteConfig, operation) {
     (0, context_js_1.setOperation)(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
-async function enhanceViteConfig(viteConfig = {}, operation) {
-    let viteConfigResolved = await resolveViteConfig(viteConfig, operation);
+async function enhanceViteConfig(viteConfig, operation) {
+    const { root, vikeVitePluginOptions, viteConfigEnhanced } = await getInfoFromVite(viteConfig, operation);
+    await assertViteRoot2(root, viteConfigEnhanced, operation);
+    const { vikeConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig2)(root, operation === 'dev', vikeVitePluginOptions);
+    return {
+        viteConfigEnhanced,
+        vikeConfigGlobal
+    };
+}
+async function getViteRoot(operation) {
+    if (!globalObject.root)
+        await getInfoFromVite(undefined, operation);
+    (0, utils_js_1.assert)(globalObject.root);
+    return globalObject.root;
+}
+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 = viteConfig;
-    // Add vike to plugins if not present
-    if (!viteConfigResolved.plugins.some((p) => p.name === pluginName_js_1.pluginName)) {
-        // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus have vike/plugin may resolved to two different node_modules/vike directories
+    const found = findVikeVitePlugin([...(viteConfig?.plugins ?? []), ...(viteConfigFromFile?.plugins ?? [])]);
+    if (found) {
+        vikeVitePluginOptions = found.vikeVitePluginOptions;
+    }
+    else {
+        // Add Vike to plugins if not present.
+        // 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 = {
             ...viteConfig,
-            plugins: [...(viteConfig.plugins ?? []), vikePlugin()]
+            plugins: [...(viteConfig?.plugins ?? []), vikePlugin()]
         };
-        viteConfigResolved = await resolveViteConfig(viteConfigEnhanced, operation);
+        const res = findVikeVitePlugin(viteConfigEnhanced.plugins);
+        (0, utils_js_1.assert)(res);
+        vikeVitePluginOptions = res.vikeVitePluginOptions;
     }
-    // TODO: use loadConfigFromFile() instead of viteConfigResolved
-    const { vikeConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig2)(viteConfigResolved.root, operation === 'dev', viteConfigResolved._vikeVitePluginOptions);
-    // TODO: enable Vike extensions to add Vite plugins
-    return {
-        viteConfigEnhanced,
-        vikeConfigGlobal
-    };
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
+    return { root, vikeVitePluginOptions, viteConfigEnhanced };
 }
-async function resolveViteConfig(viteConfig, operation) {
-    const args = getResolveConfigArgs(viteConfig, operation);
-    return await (0, vite_1.resolveConfig)(...args);
+function findVikeVitePlugin(plugins) {
+    let vikeVitePluginOptions;
+    let vikeVitePuginFound = false;
+    plugins.forEach((p) => {
+        if (p && '__vikeVitePluginOptions' in p) {
+            vikeVitePuginFound = true;
+            const options = p.__vikeVitePluginOptions;
+            vikeVitePluginOptions ?? (vikeVitePluginOptions = {});
+            Object.assign(vikeVitePluginOptions, options);
+        }
+    });
+    if (!vikeVitePuginFound)
+        return null;
+    return { vikeVitePluginOptions };
 }
-function getResolveConfigArgs(viteConfig, operation) {
+// Copied from https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L961-L1005
+async function loadViteConfigFile(viteConfig, operation) {
+    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfig, operation);
+    let config = inlineConfig;
+    let mode = inlineConfig.mode || defaultMode;
+    const configEnv = {
+        mode,
+        command,
+        isSsrBuild: command === 'build' && !!config.build?.ssr,
+        isPreview
+    };
+    let { configFile } = config;
+    if (configFile !== false) {
+        const loadResult = await (0, vite_1.loadConfigFromFile)(configEnv, configFile, config.root, config.logLevel, config.customLogger);
+        return loadResult?.config;
+    }
+    return null;
+}
+function getResolveConfigArgs(viteConfig = {}, operation) {
     const inlineConfig = viteConfig;
     const command = operation === 'build' || operation === 'prerender' ? 'build' : 'serve';
     const defaultMode = operation === 'dev' ? 'development' : 'production';
@@ -65,3 +123,18 @@ function getResolveConfigArgs(viteConfig, operation) {
     const isPreview = operation === 'preview';
     return [inlineConfig, command, defaultMode, defaultNodeEnv, isPreview];
 }
+function normalizeViteRoot(root) {
+    return (0, utils_js_1.toPosixPath)(path_1.default.resolve(root));
+}
+const errMsg = `A Vite plugin is modifying Vite's setting ${picocolors_1.default.cyan('root')} which is forbidden`;
+async function assertViteRoot2(root, viteConfigEnhanced, operation) {
+    const args = getResolveConfigArgs(viteConfigEnhanced, operation);
+    // We can eventually this resolveConfig() call (along with removing the whole assertViteRoot2() function which is redundant with the assertViteRoot() function) so that Vike doesn't make any resolveConfig() (except for pre-rendering which is required). But let's keep it for now, just to see whether calling resolveConfig() can be problematic.
+    const viteConfigResolved = await (0, vite_1.resolveConfig)(...args);
+    (0, utils_js_1.assertUsage)(normalizeViteRoot(viteConfigResolved.root) === normalizeViteRoot(root), errMsg);
+}
+function assertViteRoot(root, config) {
+    if (globalObject.root)
+        (0, utils_js_1.assert)(normalizeViteRoot(globalObject.root) === normalizeViteRoot(root));
+    (0, utils_js_1.assertUsage)(normalizeViteRoot(root) === normalizeViteRoot(config.root), errMsg);
+}

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

@@ -20,3 +20,5 @@ const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
+__exportStar(require("../../utils/filesystemPathHandling.js"), exports);
+__exportStar(require("../../utils/isObject.js"), exports);

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

@@ -37,7 +37,7 @@ const vite6HmrRegressionWorkaround_js_1 = require("./plugins/vite6HmrRegressionW
 assertViteVersion();
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
-function plugin(vikeVitePluginOptions) {
+function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...(0, commonConfig_js_1.commonConfig)(vikeVitePluginOptions),
         (0, index_js_2.importUserCode)(),
@@ -59,6 +59,7 @@ function plugin(vikeVitePluginOptions) {
         (0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)(),
         (0, vite6HmrRegressionWorkaround_js_1.vite6HmrRegressionWorkaround)()
     ];
+    Object.assign(plugins, { __vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;
 }
 // Error upon wrong usage

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

@@ -4,35 +4,41 @@ exports.baseUrls = baseUrls;
 const resolveBase_js_1 = require("../../shared/resolveBase.js");
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
 function baseUrls(vikeVitePluginOptions) {
-    let bases;
+    let basesResolved;
+    let root;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        async config(config) {
-            // TODO: fix bug: use getVikeConfig2() and udpate check below
-            bases = resolveBaseFromUserConfig(config, vikeVitePluginOptions);
-            const { baseServer, baseAssets } = bases;
+        async config(config, env) {
+            const isDev = config._isDev;
+            (0, utils_js_1.assert)(typeof isDev === 'boolean');
+            const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
+            root = config.root ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(config.root) : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
+            (0, utils_js_1.assert)(root);
+            const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
+            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(root, isDev, vikeVitePluginOptions);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
-            process.env.BASE_SERVER = baseServer;
-            process.env.BASE_ASSETS = baseAssets;
+            process.env.BASE_SERVER = basesResolved.baseServer;
+            process.env.BASE_ASSETS = basesResolved.baseAssets;
             return {
                 envPrefix: [
                     'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
                     'BASE_SERVER',
                     'BASE_ASSETS'
                 ],
-                base: baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseViteOriginal: config.base ?? '/__UNSET__' // Vite resolves `_baseViteOriginal: null` to `undefined`
+                base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
+                _baseViteOriginal: baseViteOriginal
             };
         },
         async configResolved(config) {
+            (0, prepareViteApiCall_js_1.assertViteRoot)(root, config);
             const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-            const { baseServer, baseAssets } = vikeConfig.vikeConfigGlobal;
-            const basesResolved = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(baseServer, baseAssets, config);
-            // Ensure that the premature base URL resolving we did in config() isn't erroneous
-            (0, utils_js_1.assert)(basesResolved.baseServer === bases.baseServer);
-            (0, utils_js_1.assert)(basesResolved.baseAssets === bases.baseAssets);
+            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
+            (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
+            (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
              *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
              *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
@@ -41,7 +47,3 @@ function baseUrls(vikeVitePluginOptions) {
         }
     };
 }
-function resolveBaseFromUserConfig(config, vikeVitePluginOptions) {
-    const baseViteOriginal = config.base ?? null;
-    return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeVitePluginOptions?.baseServer ?? null, vikeVitePluginOptions?.baseAssets ?? null);
-}

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

@@ -11,14 +11,14 @@ const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const path_1 = __importDefault(require("path"));
 const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
-const pluginName_js_1 = require("./commonConfig/pluginName.js");
 const getEnvVarObject_js_1 = require("../shared/getEnvVarObject.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const context_js_1 = require("../../api/context.js");
-function commonConfig(vikeVitePluginOptions = {}) {
+const pluginName = 'vike:commonConfig';
+function commonConfig(vikeVitePluginOptions) {
     return [
         {
-            name: `${pluginName_js_1.pluginName}:pre`,
+            name: `${pluginName}:pre`,
             enforce: 'pre',
             config: {
                 order: 'pre',
@@ -31,14 +31,14 @@ function commonConfig(vikeVitePluginOptions = {}) {
             }
         },
         {
-            name: pluginName_js_1.pluginName,
+            name: pluginName,
             configResolved(config) {
                 assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }
         },
         {
-            name: `${pluginName_js_1.pluginName}:post`,
+            name: `${pluginName}:post`,
             enforce: 'post',
             configResolved: {
                 order: 'post',
@@ -111,7 +111,7 @@ function assertEsm(userViteRoot) {
     (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }
 function assertSingleInstance(config) {
-    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName_js_1.pluginName).length;
+    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
     (0, utils_js_1.assertUsage)(numberOfInstances === 1, `Vike's Vite plugin (${picocolors_1.default.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
 }
 function assertVikeCliOrApi(config) {

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

@@ -73,10 +73,8 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         'git',
         preserveUTF8,
         'ls-files',
-        // We don't filter because:
-        //  - It would skip symlink directories
-        //  - Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
-        // ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
+        // Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
+        ...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?
@@ -105,18 +103,18 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
     }
     const files = [];
     for (const filePath of filesAll) {
-        // Deleted?
-        if (filesDeleted.includes(filePath))
+        // + file?
+        if (!path_1.default.posix.basename(filePath).startsWith('+'))
             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;
-        // + file?
-        if (!path_1.default.posix.basename(filePath).startsWith('+'))
-            continue;
         // JavaScript file?
         if (!(0, utils_js_1.isScriptFile)(filePath))
             continue;
+        // Deleted?
+        if (filesDeleted.includes(filePath))
+            continue;
         files.push(filePath);
     }
     return files;

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

@@ -96,7 +96,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
         console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
     }
     await disableReactStreaming();
-    const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
+    const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
     assertLoadedConfig(viteConfig, options);
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);

package/dist/cjs/node/shared/resolveBase.js

@@ -9,12 +9,12 @@ const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
     let baseViteOriginal = config._baseViteOriginal;
-    if (baseViteOriginal === '/__UNSET__')
-        baseViteOriginal = null;
     (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
     return resolveBase(baseViteOriginal, baseServer, baseAssets);
 }
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
+    if (baseViteOriginal === '/__UNSET__')
+        baseViteOriginal = null;
     {
         const wrongBase = (val) => `should start with ${picocolors_1.default.cyan('/')}, ${picocolors_1.default.cyan('http://')}, or ${picocolors_1.default.cyan('https://')} (it's ${picocolors_1.default.cyan(val)} instead)`;
         (0, utils_js_1.assertUsage)(baseViteOriginal === null || (0, utils_js_1.isBaseAssets)(baseViteOriginal), `vite.config.js#base ${wrongBase(baseViteOriginal)}`);

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.217-commit-99ea561';
+exports.PROJECT_VERSION = '0.4.218';

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

@@ -31,7 +31,7 @@ function setSSR(viteConfig) {
     return {
         ...viteConfig,
         build: {
-            ...viteConfig.build,
+            ...viteConfig?.build,
             ssr: true
         }
     };

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

@@ -1,7 +1,13 @@
 export { prepareViteApiCall };
-import type { InlineConfig } from 'vite';
+export { getViteRoot };
+export { assertViteRoot };
+export { normalizeViteRoot };
+import type { InlineConfig, ResolvedConfig } from 'vite';
 import type { Operation } from './types.js';
 declare function prepareViteApiCall(viteConfig: InlineConfig | undefined, operation: Operation): Promise<{
-    viteConfigEnhanced: InlineConfig;
+    viteConfigEnhanced: InlineConfig | undefined;
     vikeConfigGlobal: import("../plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js").VikeConfigGlobal;
 }>;
+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

@@ -1,38 +1,93 @@
 export { prepareViteApiCall };
-import { resolveConfig } from 'vite';
-import { pluginName } from '../plugin/plugins/commonConfig/pluginName.js';
+export { getViteRoot };
+export { assertViteRoot };
+export { normalizeViteRoot };
+// TODO: enable Vike extensions to add Vite plugins
+import { loadConfigFromFile, resolveConfig } from 'vite';
 import { setOperation } from './context.js';
 import { getVikeConfig2 } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
-async function prepareViteApiCall(viteConfig = {}, operation) {
+import path from 'path';
+import { assert, assertUsage, getGlobalObject, toPosixPath } from './utils.js';
+import pc from '@brillout/picocolors';
+const globalObject = getGlobalObject('prepareViteApiCall.ts', {});
+async function prepareViteApiCall(viteConfig, operation) {
     setOperation(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
-async function enhanceViteConfig(viteConfig = {}, operation) {
-    let viteConfigResolved = await resolveViteConfig(viteConfig, operation);
+async function enhanceViteConfig(viteConfig, operation) {
+    const { root, vikeVitePluginOptions, viteConfigEnhanced } = await getInfoFromVite(viteConfig, operation);
+    await assertViteRoot2(root, viteConfigEnhanced, operation);
+    const { vikeConfigGlobal } = await getVikeConfig2(root, operation === 'dev', vikeVitePluginOptions);
+    return {
+        viteConfigEnhanced,
+        vikeConfigGlobal
+    };
+}
+async function getViteRoot(operation) {
+    if (!globalObject.root)
+        await getInfoFromVite(undefined, operation);
+    assert(globalObject.root);
+    return globalObject.root;
+}
+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 = viteConfig;
-    // Add vike to plugins if not present
-    if (!viteConfigResolved.plugins.some((p) => p.name === pluginName)) {
-        // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus have vike/plugin may resolved to two different node_modules/vike directories
+    const found = findVikeVitePlugin([...(viteConfig?.plugins ?? []), ...(viteConfigFromFile?.plugins ?? [])]);
+    if (found) {
+        vikeVitePluginOptions = found.vikeVitePluginOptions;
+    }
+    else {
+        // Add Vike to plugins if not present.
+        // 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 = {
             ...viteConfig,
-            plugins: [...(viteConfig.plugins ?? []), vikePlugin()]
+            plugins: [...(viteConfig?.plugins ?? []), vikePlugin()]
         };
-        viteConfigResolved = await resolveViteConfig(viteConfigEnhanced, operation);
+        const res = findVikeVitePlugin(viteConfigEnhanced.plugins);
+        assert(res);
+        vikeVitePluginOptions = res.vikeVitePluginOptions;
     }
-    // TODO: use loadConfigFromFile() instead of viteConfigResolved
-    const { vikeConfigGlobal } = await getVikeConfig2(viteConfigResolved.root, operation === 'dev', viteConfigResolved._vikeVitePluginOptions);
-    // TODO: enable Vike extensions to add Vite plugins
-    return {
-        viteConfigEnhanced,
-        vikeConfigGlobal
-    };
+    assert(vikeVitePluginOptions);
+    return { root, vikeVitePluginOptions, viteConfigEnhanced };
 }
-async function resolveViteConfig(viteConfig, operation) {
-    const args = getResolveConfigArgs(viteConfig, operation);
-    return await resolveConfig(...args);
+function findVikeVitePlugin(plugins) {
+    let vikeVitePluginOptions;
+    let vikeVitePuginFound = false;
+    plugins.forEach((p) => {
+        if (p && '__vikeVitePluginOptions' in p) {
+            vikeVitePuginFound = true;
+            const options = p.__vikeVitePluginOptions;
+            vikeVitePluginOptions ?? (vikeVitePluginOptions = {});
+            Object.assign(vikeVitePluginOptions, options);
+        }
+    });
+    if (!vikeVitePuginFound)
+        return null;
+    return { vikeVitePluginOptions };
+}
+// Copied from https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L961-L1005
+async function loadViteConfigFile(viteConfig, operation) {
+    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfig, operation);
+    let config = inlineConfig;
+    let mode = inlineConfig.mode || defaultMode;
+    const configEnv = {
+        mode,
+        command,
+        isSsrBuild: command === 'build' && !!config.build?.ssr,
+        isPreview
+    };
+    let { configFile } = config;
+    if (configFile !== false) {
+        const loadResult = await loadConfigFromFile(configEnv, configFile, config.root, config.logLevel, config.customLogger);
+        return loadResult?.config;
+    }
+    return null;
 }
-function getResolveConfigArgs(viteConfig, operation) {
+function getResolveConfigArgs(viteConfig = {}, operation) {
     const inlineConfig = viteConfig;
     const command = operation === 'build' || operation === 'prerender' ? 'build' : 'serve';
     const defaultMode = operation === 'dev' ? 'development' : 'production';
@@ -40,3 +95,18 @@ function getResolveConfigArgs(viteConfig, operation) {
     const isPreview = operation === 'preview';
     return [inlineConfig, command, defaultMode, defaultNodeEnv, isPreview];
 }
+function normalizeViteRoot(root) {
+    return toPosixPath(path.resolve(root));
+}
+const errMsg = `A Vite plugin is modifying Vite's setting ${pc.cyan('root')} which is forbidden`;
+async function assertViteRoot2(root, viteConfigEnhanced, operation) {
+    const args = getResolveConfigArgs(viteConfigEnhanced, operation);
+    // We can eventually this resolveConfig() call (along with removing the whole assertViteRoot2() function which is redundant with the assertViteRoot() function) so that Vike doesn't make any resolveConfig() (except for pre-rendering which is required). But let's keep it for now, just to see whether calling resolveConfig() can be problematic.
+    const viteConfigResolved = await resolveConfig(...args);
+    assertUsage(normalizeViteRoot(viteConfigResolved.root) === normalizeViteRoot(root), errMsg);
+}
+function assertViteRoot(root, config) {
+    if (globalObject.root)
+        assert(normalizeViteRoot(globalObject.root) === normalizeViteRoot(root));
+    assertUsage(normalizeViteRoot(root) === normalizeViteRoot(config.root), errMsg);
+}

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

@@ -1,2 +1,4 @@
 export * from '../../utils/assert.js';
 export * from '../../utils/getGlobalObject.js';
+export * from '../../utils/filesystemPathHandling.js';
+export * from '../../utils/isObject.js';

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

@@ -4,3 +4,5 @@ import { onLoad } from './onLoad.js';
 onLoad();
 export * from '../../utils/assert.js';
 export * from '../../utils/getGlobalObject.js';
+export * from '../../utils/filesystemPathHandling.js';
+export * from '../../utils/isObject.js';

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

@@ -31,7 +31,7 @@ markSetup_vikeVitePlugin();
 assertViteVersion();
 setResolveClientEntriesDev(resolveClientEntriesDev);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
-function plugin(vikeVitePluginOptions) {
+function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...commonConfig(vikeVitePluginOptions),
         importUserCode(),
@@ -53,6 +53,7 @@ function plugin(vikeVitePluginOptions) {
         workaroundCssModuleHmr(),
         vite6HmrRegressionWorkaround()
     ];
+    Object.assign(plugins, { __vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;
 }
 // Error upon wrong usage

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

@@ -1,4 +1,3 @@
 export { baseUrls };
 import type { Plugin } from 'vite';
-import type { VikeVitePluginOptions } from './importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
-declare function baseUrls(vikeVitePluginOptions?: VikeVitePluginOptions): Plugin;
+declare function baseUrls(vikeVitePluginOptions: unknown): Plugin;

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

@@ -1,36 +1,42 @@
 export { baseUrls };
 import { resolveBase, resolveBaseFromResolvedConfig } from '../../shared/resolveBase.js';
 import { assert } from '../utils.js';
-import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfig, getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
+import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
 function baseUrls(vikeVitePluginOptions) {
-    let bases;
+    let basesResolved;
+    let root;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        async config(config) {
-            // TODO: fix bug: use getVikeConfig2() and udpate check below
-            bases = resolveBaseFromUserConfig(config, vikeVitePluginOptions);
-            const { baseServer, baseAssets } = bases;
+        async config(config, env) {
+            const isDev = config._isDev;
+            assert(typeof isDev === 'boolean');
+            const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
+            root = config.root ? normalizeViteRoot(config.root) : await getViteRoot(operation);
+            assert(root);
+            const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
+            const vikeConfig = await getVikeConfig2(root, isDev, vikeVitePluginOptions);
+            basesResolved = resolveBase(baseViteOriginal, vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
-            process.env.BASE_SERVER = baseServer;
-            process.env.BASE_ASSETS = baseAssets;
+            process.env.BASE_SERVER = basesResolved.baseServer;
+            process.env.BASE_ASSETS = basesResolved.baseAssets;
             return {
                 envPrefix: [
                     'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
                     'BASE_SERVER',
                     'BASE_ASSETS'
                 ],
-                base: baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseViteOriginal: config.base ?? '/__UNSET__' // Vite resolves `_baseViteOriginal: null` to `undefined`
+                base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
+                _baseViteOriginal: baseViteOriginal
             };
         },
         async configResolved(config) {
+            assertViteRoot(root, config);
             const vikeConfig = await getVikeConfig(config);
-            const { baseServer, baseAssets } = vikeConfig.vikeConfigGlobal;
-            const basesResolved = resolveBaseFromResolvedConfig(baseServer, baseAssets, config);
-            // Ensure that the premature base URL resolving we did in config() isn't erroneous
-            assert(basesResolved.baseServer === bases.baseServer);
-            assert(basesResolved.baseAssets === bases.baseAssets);
+            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
+            assert(basesResolved2.baseServer === basesResolved.baseServer);
+            assert(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
              *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
              *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
@@ -39,7 +45,3 @@ function baseUrls(vikeVitePluginOptions) {
         }
     };
 }
-function resolveBaseFromUserConfig(config, vikeVitePluginOptions) {
-    const baseViteOriginal = config.base ?? null;
-    return resolveBase(baseViteOriginal, vikeVitePluginOptions?.baseServer ?? null, vikeVitePluginOptions?.baseAssets ?? null);
-}

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

@@ -6,4 +6,4 @@ declare module 'vite' {
         _vikeVitePluginOptions?: unknown;
     }
 }
-declare function commonConfig(vikeVitePluginOptions?: unknown): Plugin[];
+declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];

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

@@ -6,11 +6,11 @@ import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import path from 'path';
 import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
-import { pluginName } from './commonConfig/pluginName.js';
 import { getEnvVarObject } from '../shared/getEnvVarObject.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
-function commonConfig(vikeVitePluginOptions = {}) {
+const pluginName = 'vike:commonConfig';
+function commonConfig(vikeVitePluginOptions) {
     return [
         {
             name: `${pluginName}:pre`,

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 } 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';
@@ -68,10 +68,8 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         'git',
         preserveUTF8,
         'ls-files',
-        // We don't filter because:
-        //  - It would skip symlink directories
-        //  - Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
-        // ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
+        // Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
+        ...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?
@@ -100,18 +98,18 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
     }
     const files = [];
     for (const filePath of filesAll) {
-        // Deleted?
-        if (filesDeleted.includes(filePath))
+        // + file?
+        if (!path.posix.basename(filePath).startsWith('+'))
             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;
-        // + file?
-        if (!path.posix.basename(filePath).startsWith('+'))
-            continue;
         // JavaScript file?
         if (!isScriptFile(filePath))
             continue;
+        // Deleted?
+        if (filesDeleted.includes(filePath))
+            continue;
         files.push(filePath);
     }
     return files;

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -30,5 +30,5 @@ declare function runPrerenderFromAPI(options?: PrerenderOptions): Promise<{
     viteConfig: ResolvedConfig;
 }>;
 declare function runPrerenderFromCLIPrerenderCommand(): Promise<void>;
-declare function runPrerenderFromAutoRun(viteConfig: InlineConfig, forceExit: boolean): Promise<void>;
+declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined, forceExit: boolean): Promise<void>;
 declare function runPrerender_forceExit(): void;

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

@@ -68,7 +68,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
         console.log(`${pc.cyan(`vike v${projectInfo.projectVersion}`)} ${pc.green('pre-rendering HTML...')}`);
     }
     await disableReactStreaming();
-    const viteConfig = await resolveConfig(options.viteConfig || {}, 'vike pre-rendering', 'production');
+    const viteConfig = await resolveConfig(options.viteConfig || {}, 'build', 'production');
     assertLoadedConfig(viteConfig, options);
     const vikeConfig = await getVikeConfig(viteConfig);
     const { outDirClient } = getOutDirs(viteConfig);

package/dist/esm/node/shared/resolveBase.js

@@ -4,12 +4,12 @@ import { assert, assertUsage, isBaseServer, isBaseAssets } from './utils.js';
 import pc from '@brillout/picocolors';
 function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
     let baseViteOriginal = config._baseViteOriginal;
-    if (baseViteOriginal === '/__UNSET__')
-        baseViteOriginal = null;
     assert(baseViteOriginal === null || typeof baseViteOriginal == 'string');
     return resolveBase(baseViteOriginal, baseServer, baseAssets);
 }
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
+    if (baseViteOriginal === '/__UNSET__')
+        baseViteOriginal = null;
     {
         const wrongBase = (val) => `should start with ${pc.cyan('/')}, ${pc.cyan('http://')}, or ${pc.cyan('https://')} (it's ${pc.cyan(val)} instead)`;
         assertUsage(baseViteOriginal === null || isBaseAssets(baseViteOriginal), `vite.config.js#base ${wrongBase(baseViteOriginal)}`);

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.217-commit-99ea561";
+export declare const PROJECT_VERSION: "0.4.218";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.217-commit-99ea561';
+export const PROJECT_VERSION = '0.4.218';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.217-commit-99ea561";
+    projectVersion: "0.4.218";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.217-commit-99ea561",
+  "version": "0.4.218",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

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

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pluginName = void 0;
-exports.pluginName = 'vike:commonConfig';

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

@@ -1 +0,0 @@
-export declare const pluginName = "vike:commonConfig";

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

@@ -1 +0,0 @@
-export const pluginName = 'vike:commonConfig';