vike 0.4.172 → 0.4.173

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

@@ -28,9 +28,12 @@ const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fileEnv_js_1 = require("./plugins/fileEnv.js");
+const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
+const resolveClientEntriesDev_js_1 = require("./resolveClientEntriesDev.js");
 (0, utils_js_2.assertNodeEnv_onVikePluginLoad)();
 (0, utils_js_2.markEnvAsVikePluginLoaded)();
 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(vikeConfig) {
     const plugins = [

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

@@ -9,11 +9,7 @@ const buildConfig_js_1 = require("./buildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const path_1 = __importDefault(require("path"));
-const module_1 = require("module");
 const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
 const pluginName = 'vike:commonConfig-1';
 function commonConfig() {
     return [
@@ -70,11 +66,11 @@ function workaroundCI(config) {
     }
 }
 function assertEsm(userViteRoot) {
-    const packageJsonPath = (0, utils_js_1.findFile)('package.json', userViteRoot);
-    if (!packageJsonPath)
+    const found = (0, utils_js_1.findPackageJson)(userViteRoot);
+    if (!found)
         return;
-    const packageJson = require_(packageJsonPath);
-    let dir = path_1.default.dirname(packageJsonPath);
+    const { packageJson, packageJsonPath } = found;
+    let dir = path_1.default.posix.dirname(packageJsonPath);
     if (dir !== '/') {
         (0, utils_js_1.assert)(!dir.endsWith('/'));
         dir = dir + '/';

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

@@ -26,15 +26,16 @@ async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
     const configs = [fromPluginOptions, fromViteConfig];
-    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config));
+    (0, assertVikeConfig_js_1.assertVikeConfig)(fromViteConfig, ({ prop, errMsg }) => `vite.config.js#vike.${prop} ${errMsg}`);
+    // TODO/v1-release: deprecate this
+    (0, assertVikeConfig_js_1.assertVikeConfig)(fromPluginOptions, ({ prop, errMsg }) => `vite.config.js > vike option ${prop} ${errMsg}`);
+    const crawlWithGit = fromPluginOptions.crawl?.git ?? null;
+    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config), { crawlWithGit });
     configs.push(fromPlusConfigFile);
     (0, assertVikeConfig_js_1.assertVikeConfig)(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?
         return `config ${picocolors_1.default.cyan(prop)} ${errMsg}`;
     });
-    (0, assertVikeConfig_js_1.assertVikeConfig)(fromViteConfig, ({ prop, errMsg }) => `vite.config.js#vike.${prop} ${errMsg}`);
-    // TODO/v1-release: deprecate this
-    (0, assertVikeConfig_js_1.assertVikeConfig)(fromPluginOptions, ({ prop, errMsg }) => `vite.config.js > vike option ${prop} ${errMsg}`);
     const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBase)(configs, config);
     const configVike = {
         disableAutoFullBuild: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.disableAutoFullBuild)) ?? null,
@@ -44,7 +45,10 @@ async function getConfigVikPromise(vikeConfig, config) {
         baseAssets,
         redirects: merge(configs.map((c) => c.redirects)) ?? {},
         disableUrlNormalization: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.disableUrlNormalization)) ?? false,
-        trailingSlash: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.trailingSlash)) ?? false
+        trailingSlash: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.trailingSlash)) ?? false,
+        crawl: {
+            git: crawlWithGit
+        }
     };
     return configVike;
 }

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

@@ -6,7 +6,7 @@ const determineFsAllowList_js_1 = require("./determineFsAllowList.js");
 const addSsrMiddleware_js_1 = require("../../shared/addSsrMiddleware.js");
 const utils_js_1 = require("../../utils.js");
 const loggerVite_js_1 = require("../../shared/loggerVite.js");
-const isErrorDebug_js_1 = require("../../shared/isErrorDebug.js");
+const isErrorDebug_js_1 = require("../../../shared/isErrorDebug.js");
 const getHttpRequestAsyncStore_js_1 = require("../../shared/getHttpRequestAsyncStore.js");
 if ((0, isErrorDebug_js_1.isErrorDebug)()) {
     Error.stackTraceLimit = Infinity;
@@ -79,7 +79,7 @@ function devConfig() {
                     if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;
                     return () => {
-                        (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares);
+                        (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, false);
                     };
                 }
             },

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

@@ -0,0 +1,135 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertExtensionsPeerDependencies = exports.assertExtensionsConventions = void 0;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const isObjectOfStrings_js_1 = require("../../../../../utils/isObjectOfStrings.js");
+const utils_js_1 = require("../../../utils.js");
+const getVikeConfig_js_1 = require("./getVikeConfig.js");
+const path_1 = __importDefault(require("path"));
+const semver_1 = __importDefault(require("semver"));
+function assertExtensionsConventions(interfaceFile) {
+    assertExtensionName(interfaceFile);
+    assertConfigExportPath(interfaceFile);
+}
+exports.assertExtensionsConventions = assertExtensionsConventions;
+function assertConfigExportPath(interfaceFile) {
+    const { importPathAbsolute } = interfaceFile.filePath;
+    (0, utils_js_1.assert)(importPathAbsolute);
+    const name = getConfigNameValue(interfaceFile);
+    (0, utils_js_1.assert)(name); // already asserted in assertExtensionName()
+    const importPathAbsoluteExpected = `${name}/config`;
+    (0, utils_js_1.assertWarning)(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${picocolors_1.default.bold(name)} is exported at ${picocolors_1.default.bold(importPathAbsolute)}, but it should be exported at ${picocolors_1.default.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
+}
+function assertExtensionName(interfaceFile) {
+    let nameDeduced;
+    {
+        const { importPathAbsolute } = interfaceFile.filePath;
+        (0, utils_js_1.assert)(importPathAbsolute);
+        nameDeduced = importPathAbsolute
+            .split('/')
+            .slice(0, importPathAbsolute.startsWith('@') ? 2 : 1)
+            .join('/');
+    }
+    const name = getConfigNameValue(interfaceFile);
+    const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
+    if (name) {
+        (0, utils_js_1.assertWarning)(name === nameDeduced, `The setting ${picocolors_1.default.bold('name')} defined at ${filePathToShowToUser} is ${picocolors_1.default.bold(name)}, but it should be ${picocolors_1.default.bold(nameDeduced)} instead (the name of the npm package).`, { onlyOnce: true });
+    }
+    else {
+        if (
+        // Let's eventually remove this
+        [
+            'vike-react',
+            'vike-react-query',
+            'vike-react-zustand',
+            'vike-vue',
+            'vike-vue-query',
+            'vike-vue-pinia',
+            'vike-pinia',
+            'vike-solid'
+        ].includes(nameDeduced)) {
+            (0, utils_js_1.assertUsage)(false, `Update ${nameDeduced} to its latest version.`);
+        }
+        else {
+            (0, utils_js_1.assertUsage)(false, `The setting ${picocolors_1.default.bold('name')} is missing: it should be set by the config ${filePathToShowToUser} of ${picocolors_1.default.bold(nameDeduced)}.`);
+        }
+    }
+}
+function assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
+    // Get installed extensions
+    const extensions = {};
+    interfaceFilesRelevantList.forEach((interfaceFile) => {
+        const name = getConfigNameValue(interfaceFile);
+        if (name) {
+            const version = getExtensionVersion(name, interfaceFile);
+            extensions[name] = version;
+        }
+    });
+    // Enforce peer dependencies
+    interfaceFilesRelevantList.forEach((interfaceFile) => {
+        const require = getConfigRequireValue(interfaceFile);
+        if (!require)
+            return;
+        const name = getConfigNameValue(interfaceFile);
+        const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
+        (0, utils_js_1.assertUsage)(name, `Setting ${picocolors_1.default.bold('name')} is required for being able to use setting ${picocolors_1.default.bold('require')} in ${filePathToShowToUser}.`);
+        Object.entries(require).forEach(([reqName, reqVersion]) => {
+            const errBase = `${picocolors_1.default.bold(name)} requires ${picocolors_1.default.bold(reqName)}`;
+            if (reqName === 'vike') {
+                (0, utils_js_1.assertUsage)(isVersionRange(utils_js_1.PROJECT_VERSION, reqVersion), `${errBase} version ${picocolors_1.default.bold(reqVersion)}, but ${picocolors_1.default.bold(utils_js_1.PROJECT_VERSION)} is installed.`);
+                return;
+            }
+            const extensionVersion = extensions[reqName];
+            (0, utils_js_1.assertUsage)(extensionVersion, `${errBase}.`);
+            (0, utils_js_1.assertUsage)(isVersionRange(extensionVersion, reqVersion), `${errBase} version ${picocolors_1.default.bold(reqVersion)}, but ${picocolors_1.default.bold(extensionVersion)} is installed.`);
+        });
+    });
+}
+exports.assertExtensionsPeerDependencies = assertExtensionsPeerDependencies;
+function getConfigRequireValue(interfaceFile) {
+    const require = (0, getVikeConfig_js_1.getConfigValueInterfaceFile)(interfaceFile, 'require');
+    if (!require)
+        return null;
+    const { filePathToShowToUserResolved } = interfaceFile.filePath;
+    (0, utils_js_1.assert)(filePathToShowToUserResolved);
+    (0, utils_js_1.assertUsage)((0, isObjectOfStrings_js_1.isObjectOfStrings)(require), `The setting ${picocolors_1.default.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${picocolors_1.default.bold('Record<string, string>')}).`);
+    return require;
+}
+function getConfigNameValue(interfaceFile) {
+    const name = (0, getVikeConfig_js_1.getConfigValueInterfaceFile)(interfaceFile, 'name');
+    if (!name)
+        return null;
+    const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
+    (0, utils_js_1.assertUsage)(typeof name === 'string', `The setting ${picocolors_1.default.bold('name')} defined at ${filePathToShowToUser} should be a string.`);
+    return name;
+}
+// We use a forever cache: users need to restart the dev server anyways when touching node_modules/**/* (I presume Vite doesn't pick up node_modules/**/* changes).
+const extensionsVersion = {};
+function getExtensionVersion(name, interfaceFile) {
+    if (!extensionsVersion[name]) {
+        const extensionConfigFilePath = interfaceFile.filePath.filePathAbsoluteFilesystem;
+        const found = (0, utils_js_1.findPackageJson)(path_1.default.posix.dirname(extensionConfigFilePath));
+        (0, utils_js_1.assert)(found);
+        const { packageJson, packageJsonPath } = found;
+        const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
+        const nameExpected = packageJson.name;
+        (0, utils_js_1.assertWarning)(name === nameExpected, `The setting ${picocolors_1.default.bold('name')} defined at ${filePathToShowToUser} is ${picocolors_1.default.bold(JSON.stringify(name))}, but it should be equal to ${picocolors_1.default.bold(JSON.stringify(nameExpected))} (the value of ${packageJsonPath}${picocolors_1.default.dim('#')}${picocolors_1.default.bold('name')})`, { onlyOnce: true });
+        const { version } = packageJson;
+        (0, utils_js_1.assert)(typeof version === 'string');
+        extensionsVersion[name] = version;
+    }
+    return extensionsVersion[name];
+}
+function getFilePathToShowToUser(interfaceFile) {
+    const { filePathToShowToUserResolved } = interfaceFile.filePath;
+    (0, utils_js_1.assert)(filePathToShowToUserResolved);
+    return filePathToShowToUserResolved;
+}
+function isVersionRange(version, range) {
+    // Remove pre-release tag
+    version = version.split('-')[0];
+    return semver_1.default.satisfies(version, range);
+}

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configDefinitionsBuiltInGlobal = exports.configDefinitionsBuiltIn = void 0;
 const utils_js_1 = require("../../../../utils.js");
+const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true }
@@ -55,6 +56,9 @@ const configDefinitionsBuiltIn = {
         // We could make it { client: false } but we don't yet because of some legacy V0.4 design code
         env: { server: true, client: true, config: true, eager: true }
     },
+    clientHooks: {
+        env: { config: true }
+    },
     prerender: {
         env: { config: true }
     },
@@ -70,11 +74,22 @@ const configDefinitionsBuiltIn = {
     meta: {
         env: { config: true }
     },
-    isClientSideRenderable: {
+    clientEntryLoaded: {
         env: { server: true, client: true, eager: true },
-        _computed: (configValueSources) => isConfigSet(configValueSources, 'onRenderClient') &&
-            isConfigSet(configValueSources, 'Page') &&
-            !!getConfigEnv(configValueSources, 'Page')?.client
+        _computed: (configValueSources) => {
+            {
+                const source = getConfigValueSource(configValueSources, 'clientHooks');
+                if (source && source.value !== null) {
+                    const { value } = source;
+                    const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAtFilePath);
+                    (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${definedAt} should be a boolean`);
+                    return value;
+                }
+            }
+            return (isConfigSet(configValueSources, 'onRenderClient') &&
+                isConfigSet(configValueSources, 'Page') &&
+                !!getConfigEnv(configValueSources, 'Page')?.client);
+        }
     },
     onBeforeRenderEnv: {
         env: { client: true },
@@ -92,6 +107,9 @@ const configDefinitionsBuiltIn = {
     },
     name: {
         env: { config: true }
+    },
+    require: {
+        env: { config: true }
     }
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;

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

@@ -15,7 +15,7 @@ const execA = (0, util_1.promisify)(child_process_1.exec);
 (0, utils_js_1.assertIsNotProductionRuntime)();
 (0, utils_js_1.assertIsSingleModuleInstance)('crawlPlusFiles.ts');
 let gitIsNotUsable = false;
-async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
+async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev, crawlWithGit) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
     (0, utils_js_1.assertPosixPath)(outDirAbsoluteFilesystem);
     let outDirRelativeFromUserRootDir = path_1.default.posix.relative(userRootDir, outDirAbsoluteFilesystem);
@@ -31,8 +31,9 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     const timeBefore = new Date().getTime();
+    // Crawl
     let files = [];
-    const res = await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir);
+    const res = crawlWithGit !== false && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
     if (res &&
         // Fallback to fast-glob for users that dynamically generate plus files. (Assuming all (generetad) plus files to be skipped because users usually included them in `.gitignore`.)
         res.length > 0) {
@@ -41,7 +42,9 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
     else {
         files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
     }
+    // Filter build files
     files = files.filter((file) => !(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(file));
+    // Check performance
     {
         const timeAfter = new Date().getTime();
         const timeSpent = timeAfter - timeBefore;
@@ -53,10 +56,12 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
             });
         }
     }
-    const plusFiles = files.map((p) => {
-        p = (0, utils_js_1.toPosixPath)(p);
-        (0, utils_js_1.assert)(!p.startsWith(userRootDir));
-        const filePathAbsoluteUserRootDir = path_1.default.posix.join('/', p);
+    // Normalize
+    const plusFiles = files.map((filePath) => {
+        // Both `$ git-ls files` and fast-glob return posix paths
+        (0, utils_js_1.assertPosixPath)(filePath);
+        (0, utils_js_1.assert)(!filePath.startsWith(userRootDir));
+        const filePathAbsoluteUserRootDir = path_1.default.posix.join('/', filePath);
         return { filePathAbsoluteUserRootDir };
     });
     return plusFiles;
@@ -66,10 +71,17 @@ exports.crawlPlusFiles = crawlPlusFiles;
 async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
     if (gitIsNotUsable)
         return null;
+    // Preserve UTF-8 file paths.
+    // https://github.com/vikejs/vike/issues/1658
+    // https://stackoverflow.com/questions/22827239/how-to-make-git-properly-display-utf-8-encoded-pathnames-in-the-console-window/22828826#22828826
+    // https://stackoverflow.com/questions/15884180/how-do-i-override-git-configuration-options-by-command-line-parameters/15884261#15884261
+    const preserveUTF8 = '-c core.quotepath=off';
     const ignoreAsPatterns = getIgnoreAsPatterns(outDirRelativeFromUserRootDir);
     const ignoreAsFilterFn = getIgnoreAsFilterFn(outDirRelativeFromUserRootDir);
     const cmd = [
-        'git ls-files',
+        'git',
+        preserveUTF8,
+        'ls-files',
         ...utils_js_1.scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
         ...ignoreAsPatterns.map((pattern) => `--exclude="${pattern}"`),
         // --others lists untracked files only (but using .gitignore because --exclude-standard)

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isV1Design = exports.isVikeConfigFile = exports.vikeConfigDependencies = exports.reloadVikeConfig = exports.getVikeConfig = void 0;
+exports.getConfigValueInterfaceFile = exports.isV1Design = exports.isVikeConfigFile = exports.vikeConfigDependencies = exports.reloadVikeConfig = exports.getVikeConfig = void 0;
 const utils_js_1 = require("../../../utils.js");
 const path_1 = __importDefault(require("path"));
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
@@ -21,6 +21,8 @@ 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");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -65,11 +67,12 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, tolerateInvalidConfig) {
+async function getVikeConfig(config, isDev, { crawlWithGit, tolerateInvalidConfig } = {}) {
     const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
     const userRootDir = config.root;
     if (!vikeConfigPromise) {
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, tolerateInvalidConfig);
+        const crawlWithGit_ = crawlWithGit !== undefined ? crawlWithGit : (await (0, getConfigVike_js_1.getConfigVike)(config)).crawl.git;
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit_, tolerateInvalidConfig);
     }
     return await vikeConfigPromise;
 }
@@ -81,8 +84,8 @@ async function isV1Design(config, isDev) {
     return isV1Design;
 }
 exports.isV1Design = isV1Design;
-async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
-    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev);
+async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, crawlWithGit) {
+    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, isDev, crawlWithGit);
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
@@ -123,29 +126,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
                 ```
                 */
                 const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true, locationId);
-                {
-                    const alreadyMigrated = [
-                        'vike-react',
-                        'vike-react-query',
-                        'vike-react-zustand',
-                        'vike-vue',
-                        'vike-pinia',
-                        'vike-solid'
-                    ];
-                    (0, utils_js_1.assert)(extendsConfig.filePath.importPathAbsolute);
-                    const extensionName = extendsConfig.filePath.importPathAbsolute.split('/')[0];
-                    const warnMsg = alreadyMigrated.includes(extensionName)
-                        ? `You're using a deprecated version of the Vike extension ${extensionName}, update ${extensionName} to its latest version.`
-                        : `The config of the Vike extension ${extensionName} should set a ${picocolors_1.default.cyan('name')} value`;
-                    const isNameDefined = interfaceFile.fileExportsByConfigName.name?.configValue;
-                    if (alreadyMigrated) {
-                        // Eventually always make it a assertUsage()
-                        (0, utils_js_1.assertWarning)(isNameDefined, warnMsg, { onlyOnce: true });
-                    }
-                    else {
-                        (0, utils_js_1.assertUsage)(isNameDefined, warnMsg);
-                    }
-                }
+                (0, assertExtensions_js_1.assertExtensionsConventions)(interfaceFile);
                 interfaceFilesByLocationId[locationId].push(interfaceFile);
             });
         }),
@@ -213,12 +194,12 @@ function assertAllConfigsAreKnown(interfaceFilesByLocationId) {
         });
     });
 }
-async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, tolerateInvalidConfig) {
+async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit, tolerateInvalidConfig) {
     let hasError = false;
     let ret;
     let err;
     try {
-        ret = await loadVikeConfig(userRootDir, outDirRoot, isDev);
+        ret = await loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit);
     }
     catch (err_) {
         hasError = true;
@@ -255,17 +236,19 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
         }
     }
 }
-async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
-    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, isDev);
+async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
+    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, isDev, crawlWithGit);
     const importedFilesLoaded = {};
     const { globalVikeConfig, pageConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
     const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
         .filter(([_pageId, interfaceFiles]) => isDefiningPage(interfaceFiles))
         .map(async ([locationId]) => {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesByLocationId, locationId);
+        const interfaceFilesRelevantList = Object.values(interfaceFilesByLocationId).flat(1);
+        (0, assertExtensions_js_1.assertExtensionsPeerDependencies)(interfaceFilesRelevantList);
         const configDefinitions = getConfigDefinitions(interfaceFilesRelevant);
         // Load value files of custom config-only configs
-        await Promise.all(getInterfaceFileList(interfaceFilesRelevant).map(async (interfaceFile) => {
+        await Promise.all(interfaceFilesRelevantList.map(async (interfaceFile) => {
             if (!interfaceFile.isValueFile)
                 return;
             const { configName } = interfaceFile;
@@ -353,13 +336,6 @@ function getInterfaceFilesRelevant(interfaceFilesByLocationId, locationIdPage) {
         .sort(([locationId1], [locationId2]) => (0, filesystemRouting_js_1.sortAfterInheritanceOrder)(locationId1, locationId2, locationIdPage)));
     return interfaceFilesRelevant;
 }
-function getInterfaceFileList(interfaceFilesByLocationId) {
-    const interfaceFiles = [];
-    Object.values(interfaceFilesByLocationId).forEach((interfaceFiles_) => {
-        interfaceFiles.push(...interfaceFiles_);
-    });
-    return interfaceFiles;
-}
 async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded) {
     const locationIds = (0, utils_js_1.objectKeys)(interfaceFilesByLocationId);
     const interfaceFilesGlobal = (0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(interfaceFilesByLocationId).filter(([locationId]) => {
@@ -770,8 +746,8 @@ function getComputed(configValueSources, configDefinitions) {
     });
     return configValuesComputed;
 }
-async function findPlusFiles(userRootDir, outDirRoot, isDev) {
-    const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, isDev);
+async function findPlusFiles(userRootDir, outDirRoot, isDev, crawlWithGit) {
+    const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, isDev, crawlWithGit);
     const plusFiles = files.map(({ filePathAbsoluteUserRootDir }) => (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir }));
     return plusFiles;
 }
@@ -973,3 +949,7 @@ function sortConfigValueSources(configValueSources, locationIdPage) {
         // Sort after the filesystem inheritance of the config value
         .sort(([, [source1]], [, [source2]]) => (0, utils_js_1.reverse)((0, filesystemRouting_js_1.sortAfterInheritanceOrder)(source1.locationId, source2.locationId, locationIdPage))));
 }
+function getConfigValueInterfaceFile(interfaceFile, configName) {
+    return interfaceFile.fileExportsByConfigName[configName]?.configValue;
+}
+exports.getConfigValueInterfaceFile = getConfigValueInterfaceFile;

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

@@ -21,7 +21,7 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     }
     */
     const { pageId, isForClientSide } = result;
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, true);
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig);
     const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);

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, true);
+    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
 exports.getVirtualFilePageConfigs = getVirtualFilePageConfigs;

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

@@ -38,10 +38,10 @@ function previewConfig() {
                 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) {
-                  addSsrMiddleware(server.middlewares)
+                  addSsrMiddleware(server.middlewares, config, true)
                 }
                 /*/
-                (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares);
+                (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true);
                 //*/
                 addStatic404Middleware(server.middlewares);
             };

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

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveClientEntriesDev = void 0;
+const utils_js_1 = require("./utils.js");
+const module_1 = require("module");
+const path_1 = require("path");
+const url_1 = require("url");
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const importMetaUrl = `file://${__filename}`;
+const require_ = (0, module_1.createRequire)(importMetaUrl);
+const __dirname_ = (0, path_1.dirname)((0, url_1.fileURLToPath)(importMetaUrl));
+(0, utils_js_1.assertIsNotProductionRuntime)();
+async function resolveClientEntriesDev(clientEntry, viteDevServer) {
+    let root = viteDevServer.config.root;
+    (0, utils_js_1.assert)(root);
+    root = (0, utils_js_1.toPosixPath)(root);
+    // The `?import` suffix is needed for MDX to be transpiled:
+    //   - Not transpiled: `/pages/markdown.page.mdx`
+    //   - Transpiled: `/pages/markdown.page.mdx?import`
+    // But `?import` doesn't work with `/@fs/`:
+    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx
+    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx?import
+    if (clientEntry.endsWith('?import')) {
+        (0, utils_js_1.assert)(clientEntry.startsWith('/'));
+        return clientEntry;
+    }
+    (0, utils_js_1.assertPosixPath)(clientEntry);
+    let filePath;
+    if (clientEntry.startsWith('/')) {
+        filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
+    }
+    else {
+        if (clientEntry.startsWith('@@vike/')) {
+            (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
+            try {
+                // For Vitest (which doesn't resolve vike to its dist but to its source files)
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/resolveClientEntriesDev.js
+                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../client/').replace('.js', '.ts')));
+            }
+            catch {
+                // For users
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/resolveClientEntriesDev.js
+                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../dist/esm/client/')));
+            }
+        }
+        else {
+            (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
+            filePath = require_.resolve(clientEntry);
+        }
+    }
+    if (!filePath.startsWith('/')) {
+        (0, utils_js_1.assert)(process.platform === 'win32');
+        filePath = '/' + filePath;
+    }
+    filePath = '/@fs' + filePath;
+    (0, utils_js_1.assertPosixPath)(filePath);
+    return filePath;
+}
+exports.resolveClientEntriesDev = resolveClientEntriesDev;

package/dist/cjs/node/plugin/shared/addSsrMiddleware.js

@@ -7,7 +7,7 @@ exports.addSsrMiddleware = void 0;
 const renderPage_js_1 = require("../../runtime/renderPage.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function addSsrMiddleware(middlewares) {
+function addSsrMiddleware(middlewares, config, isPreview) {
     middlewares.use(async (req, res, next) => {
         if (res.headersSent)
             return next();
@@ -42,6 +42,12 @@ function addSsrMiddleware(middlewares) {
             // - We purposely don't use next(err) to align behavior: we use our own/copied implementation of buildErrorMessage() regardless of whether the user uses Vite's dev middleware or Vite's standalone dev server
             return next();
         }
+        const configHeaders = (isPreview && config?.preview?.headers) || config?.server?.headers;
+        if (configHeaders) {
+            for (const [name, value] of Object.entries(configHeaders))
+                if (value)
+                    res.setHeader(name, value);
+        }
         if (!pageContext.httpResponse) {
             return next();
         }

package/dist/cjs/node/plugin/shared/loggerNotProd/log.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyViteSourceMapToStackTrace = exports.screenHasErrors = exports.clearScreen = exports.isFirstLog = exports.logDirectly = exports.logWithVikeTag = exports.logWithViteTag = void 0;
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const isErrorDebug_js_1 = require("../isErrorDebug.js");
+const isErrorDebug_js_1 = require("../../../shared/isErrorDebug.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let isFirstLog = true;

package/dist/cjs/node/plugin/shared/loggerNotProd.js

@@ -15,7 +15,7 @@ const globalContext_js_1 = require("../../runtime/globalContext.js");
 const loggerRuntime_js_1 = require("../../runtime/renderPage/loggerRuntime.js");
 const utils_js_1 = require("../utils.js");
 const getHttpRequestAsyncStore_js_1 = require("./getHttpRequestAsyncStore.js");
-const isErrorDebug_js_1 = require("./isErrorDebug.js");
+const isErrorDebug_js_1 = require("../../shared/isErrorDebug.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
 const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js");
 const log_js_1 = require("./loggerNotProd/log.js");

package/dist/cjs/node/plugin/shared/loggerVite.js

@@ -5,7 +5,7 @@ const utils_js_1 = require("../utils.js");
 const loggerNotProd_js_1 = require("./loggerNotProd.js");
 const getHttpRequestAsyncStore_js_1 = require("./getHttpRequestAsyncStore.js");
 const removeSuperfluousViteLog_js_1 = require("./loggerVite/removeSuperfluousViteLog.js");
-const isErrorDebug_js_1 = require("./isErrorDebug.js");
+const isErrorDebug_js_1 = require("../../shared/isErrorDebug.js");
 function improveViteLogs(config) {
     intercept('info', config);
     intercept('warn', config);