vike 0.4.172-commit-605b4a5 → 0.4.172-commit-55d8662

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/importUserCode/v1-design/assertExtensions.js

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertExtensionsPeerDependencies = 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 assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
+    // Get installed extensions
+    const extensions = {};
+    interfaceFilesRelevantList.forEach((interfaceFile) => {
+        const name = getConfigNameValue(interfaceFile);
+        if (name) {
+            const extensionConfigFilePath = interfaceFile.filePath.filePathAbsoluteFilesystem;
+            const version = getExtensionVersion(extensionConfigFilePath, name);
+            extensions[name] = version;
+        }
+    });
+    // Enforce peer dependencies
+    interfaceFilesRelevantList.forEach((interfaceFile) => {
+        const require = getConfigRequireValue(interfaceFile);
+        if (!require)
+            return;
+        const name = getConfigNameValue(interfaceFile);
+        // TODO: unify assertUsage()?
+        (0, utils_js_1.assertUsage)(name, `Setting ${picocolors_1.default.bold('name')} is required when using setting ${picocolors_1.default.bold('require')}.`);
+        Object.entries(require).forEach(([reqName, reqVersion]) => {
+            const extensionVersion = extensions[reqName];
+            const errBase = `The Vike extension ${picocolors_1.default.bold(name)} requires ${picocolors_1.default.bold(reqName)}`;
+            (0, utils_js_1.assertUsage)(extensionVersion, `${errBase}.`);
+            (0, utils_js_1.assertUsage)(semver_1.default.satisfies(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;
+    // TODO: move assertUsage() here
+    (0, utils_js_1.assert)(typeof name === '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(extensionConfigFilePath, name) {
+    if (!extensionsVersion[name]) {
+        const found = (0, utils_js_1.findPackageJson)(path_1.default.posix.dirname(extensionConfigFilePath));
+        (0, utils_js_1.assert)(found);
+        const { packageJson, packageJsonPath } = found;
+        (0, utils_js_1.assertUsage)(packageJson.name === name, `The setting ${picocolors_1.default.bold('name')} set by ${extensionConfigFilePath} is ${picocolors_1.default.bold(JSON.stringify(name))} but it should be equal to ${packageJsonPath}${picocolors_1.default.dim('#')}${picocolors_1.default.bold('name')} which is ${picocolors_1.default.bold(JSON.stringify(packageJson.name))}`);
+        const { version } = packageJson;
+        (0, utils_js_1.assert)(typeof version === 'string');
+        extensionsVersion[name] = version;
+    }
+    return extensionsVersion[name];
+}

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.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");
@@ -22,6 +22,7 @@ const resolvePointerImport_js_1 = require("./getVikeConfig/resolvePointerImport.
 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;
@@ -125,29 +126,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, crawlWithGit)
                 ```
                 */
                 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);
-                    }
-                }
+                assertVikeExtensionConventions(extendsConfig, interfaceFile);
                 interfaceFilesByLocationId[locationId].push(interfaceFile);
             });
         }),
@@ -186,6 +165,56 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, crawlWithGit)
     assertAllConfigsAreKnown(interfaceFilesByLocationId);
     return interfaceFilesByLocationId;
 }
+function assertVikeExtensionConventions(extendsConfig, interfaceFile) {
+    const alreadyMigrated = [
+        'vike-react',
+        'vike-react-query',
+        'vike-react-zustand',
+        'vike-vue',
+        'vike-pinia',
+        'vike-solid'
+    ];
+    const { importPathAbsolute } = extendsConfig.filePath;
+    (0, utils_js_1.assert)(importPathAbsolute);
+    const extensionName = importPathAbsolute
+        .split('/')
+        .slice(0, importPathAbsolute.startsWith('@') ? 2 : 1)
+        .join('/');
+    const errMsg = 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 define the ${picocolors_1.default.cyan('name')} setting.`;
+    const extensionNameValue = getConfigValueInterfaceFile(interfaceFile, 'name');
+    if (alreadyMigrated) {
+        // Eventually remove (always use assertUsage())
+        (0, utils_js_1.assertWarning)(extensionNameValue, errMsg, { onlyOnce: true });
+    }
+    else {
+        (0, utils_js_1.assertUsage)(extensionNameValue, errMsg);
+    }
+    {
+        const { filePathToShowToUserResolved } = interfaceFile.filePath;
+        (0, utils_js_1.assert)(filePathToShowToUserResolved);
+        const errPrefix = `The setting ${picocolors_1.default.bold('name')} defined at ${filePathToShowToUserResolved}`;
+        (0, utils_js_1.assertUsage)(typeof extensionNameValue === 'string', `${errPrefix} should be a string.`);
+        (0, utils_js_1.assertWarning)(extensionNameValue === extensionName, `${errPrefix} is ${picocolors_1.default.bold(extensionNameValue)} but it should be ${picocolors_1.default.bold(extensionName)} instead.`, { onlyOnce: true });
+    }
+    {
+        const importPathAbsoluteExpected = `${extensionName}/config`;
+        (0, utils_js_1.assertWarning)(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${extensionName} is exported at ${picocolors_1.default.bold(importPathAbsolute)} but it should be exported at ${picocolors_1.default.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
+    }
+    if (extensionName.startsWith('vike-')) {
+        const prefix = [
+            //
+            'vike-react',
+            'vike-vue',
+            'vike-solid',
+            'vike-svelte',
+            'vike-angular',
+            'vike-preact'
+        ];
+        (0, utils_js_1.assertWarning)(prefix.some((p) => extensionName === p || extensionName.startsWith(`${p}-`)), `The name of the Vike extension ${picocolors_1.default.bold(extensionName)} should be or start with ${(0, utils_js_1.joinEnglish)(prefix.map(picocolors_1.default.bold), 'or')}.`, { onlyOnce: true });
+    }
+}
 function getInterfaceFileFromConfigFile(configFile, isConfigExtend, locationId) {
     const { fileExports, filePath, extendsFilePaths } = configFile;
     const interfaceFile = {
@@ -265,9 +294,11 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
         .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;
@@ -355,13 +386,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]) => {
@@ -975,3 +999,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/utils.js

@@ -32,7 +32,7 @@ __exportStar(require("../../utils/escapeRegex.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
 __exportStar(require("../../utils/trimWithAnsi.js"), exports);
 __exportStar(require("../../utils/removeEmptyLines.js"), exports);
-__exportStar(require("../../utils/findFile.js"), exports);
+__exportStar(require("../../utils/findPackageJson.js"), exports);
 __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/deepEqual.js"), exports);
 __exportStar(require("../../utils/assertKeys.js"), exports);

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

@@ -9,17 +9,17 @@ const globalContext_js_1 = require("../globalContext.js");
 const getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
-        const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
+        const { clientEntryLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
         const clientFilePath = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
-        if (isClientSideRenderable)
+        if (clientEntryLoaded)
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),
-            onlyAssets: isClientSideRenderable ? false : true,
+            onlyAssets: clientEntryLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
@@ -55,7 +55,7 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
             });
         });
         return {
-            isHtmlOnly: !isClientSideRenderable,
+            isHtmlOnly: !clientEntryLoaded,
             isClientRouting,
             clientEntries,
             clientDependencies,

package/dist/cjs/shared/getPageFiles/analyzeClientSide.js

@@ -7,14 +7,14 @@ function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
         const isClientRouting = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const isClientSideRenderable = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
-        return { isClientSideRenderable, isClientRouting };
+        const clientEntryLoaded = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientEntryLoaded', 'boolean')?.value ?? false;
+        return { clientEntryLoaded, isClientRouting };
     }
     else {
         // TODO/v1-release: remove
         // V0.4 design
         const { isHtmlOnly, isClientRouting } = (0, analyzePageClientSide_js_1.analyzePageClientSide)(pageFilesAll, pageId);
-        return { isClientSideRenderable: !isHtmlOnly, isClientRouting };
+        return { clientEntryLoaded: !isHtmlOnly, isClientRouting };
     }
 }
 exports.analyzeClientSide = analyzeClientSide;

package/dist/cjs/utils/findFile.js

@@ -7,19 +7,21 @@ exports.findFile = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const isArray_js_1 = require("./isArray.js");
+const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 function findFile(arg, cwd) {
+    (0, filesystemPathHandling_js_1.assertPosixPath)(cwd);
     const filenames = (0, isArray_js_1.isArray)(arg) ? arg : [arg];
     let dir = cwd;
     while (true) {
         for (const filename of filenames) {
-            const configFilePath = path_1.default.join(dir, `./${filename}`);
+            const configFilePath = path_1.default.posix.join(dir, `./${filename}`);
             if (fs_1.default.existsSync(configFilePath)) {
-                // return toPosixPath(configFilePath)
+                (0, filesystemPathHandling_js_1.assertPosixPath)(configFilePath);
                 return configFilePath;
             }
         }
         const dirPrevious = dir;
-        dir = path_1.default.dirname(dir);
+        dir = path_1.default.posix.dirname(dir);
         if (dir === dirPrevious) {
             return null;
         }

package/dist/cjs/utils/findPackageJson.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findPackageJson = void 0;
+const findFile_js_1 = require("./findFile.js");
+const module_1 = require("module");
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const importMetaUrl = `file://${__filename}`;
+const require_ = (0, module_1.createRequire)(importMetaUrl);
+function findPackageJson(cwd) {
+    const packageJsonPath = (0, findFile_js_1.findFile)('package.json', cwd);
+    if (!packageJsonPath)
+        return null;
+    const packageJson = require_(packageJsonPath);
+    return {
+        packageJson,
+        packageJsonPath
+    };
+}
+exports.findPackageJson = findPackageJson;

package/dist/cjs/utils/joinEnglish.js

@@ -9,6 +9,6 @@ function joinEnglish(arr, conjunction, colorizer = (s) => s) {
         return colorizer(arr[0]);
     const firsts = arr.slice(0, arr.length - 1);
     const last = arr[arr.length - 1];
-    return firsts.map(colorizer).join(', ') + ` ${conjunction} ` + colorizer(last);
+    return firsts.map(colorizer).join(', ') + `, ${conjunction} ` + colorizer(last);
 }
 exports.joinEnglish = joinEnglish;

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.172-commit-605b4a5';
+const PROJECT_VERSION = '0.4.172-commit-55d8662';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -7,6 +7,6 @@ async function isClientSideRoutable(pageId, pageContext) {
         sharedPageFilesAlreadyLoaded: false
     });
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageId);
-    const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageContext._pageFilesAll, pageId);
-    return isClientSideRenderable && isClientRouting;
+    const { clientEntryLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageContext._pageFilesAll, pageId);
+    return clientEntryLoaded && isClientRouting;
 }

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

@@ -1,14 +1,10 @@
 export { commonConfig };
-import { assert, assertUsage, assertWarning, findFile } from '../utils.js';
+import { assert, assertUsage, assertWarning, findPackageJson } from '../utils.js';
 import { assertRollupInput } from './buildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import path from 'path';
-import { createRequire } from 'module';
 import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
-const importMetaUrl = import.meta.url;
-const require_ = createRequire(importMetaUrl);
 const pluginName = 'vike:commonConfig-1';
 function commonConfig() {
     return [
@@ -64,11 +60,11 @@ function workaroundCI(config) {
     }
 }
 function assertEsm(userViteRoot) {
-    const packageJsonPath = findFile('package.json', userViteRoot);
-    if (!packageJsonPath)
+    const found = findPackageJson(userViteRoot);
+    if (!found)
         return;
-    const packageJson = require_(packageJsonPath);
-    let dir = path.dirname(packageJsonPath);
+    const { packageJson, packageJsonPath } = found;
+    let dir = path.posix.dirname(packageJsonPath);
     if (dir !== '/') {
         assert(!dir.endsWith('/'));
         dir = dir + '/';

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

@@ -0,0 +1,3 @@
+export { assertExtensionsPeerDependencies };
+import { type InterfaceFile } from './getVikeConfig.js';
+declare function assertExtensionsPeerDependencies(interfaceFilesRelevantList: InterfaceFile[]): void;

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

@@ -0,0 +1,65 @@
+export { assertExtensionsPeerDependencies };
+import pc from '@brillout/picocolors';
+import { isObjectOfStrings } from '../../../../../utils/isObjectOfStrings.js';
+import { assert, assertUsage, findPackageJson } from '../../../utils.js';
+import { getConfigValueInterfaceFile } from './getVikeConfig.js';
+import path from 'path';
+import semver from 'semver';
+function assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
+    // Get installed extensions
+    const extensions = {};
+    interfaceFilesRelevantList.forEach((interfaceFile) => {
+        const name = getConfigNameValue(interfaceFile);
+        if (name) {
+            const extensionConfigFilePath = interfaceFile.filePath.filePathAbsoluteFilesystem;
+            const version = getExtensionVersion(extensionConfigFilePath, name);
+            extensions[name] = version;
+        }
+    });
+    // Enforce peer dependencies
+    interfaceFilesRelevantList.forEach((interfaceFile) => {
+        const require = getConfigRequireValue(interfaceFile);
+        if (!require)
+            return;
+        const name = getConfigNameValue(interfaceFile);
+        // TODO: unify assertUsage()?
+        assertUsage(name, `Setting ${pc.bold('name')} is required when using setting ${pc.bold('require')}.`);
+        Object.entries(require).forEach(([reqName, reqVersion]) => {
+            const extensionVersion = extensions[reqName];
+            const errBase = `The Vike extension ${pc.bold(name)} requires ${pc.bold(reqName)}`;
+            assertUsage(extensionVersion, `${errBase}.`);
+            assertUsage(semver.satisfies(extensionVersion, reqVersion), `${errBase} version ${pc.bold(reqVersion)} but ${pc.bold(extensionVersion)} is installed.`);
+        });
+    });
+}
+function getConfigRequireValue(interfaceFile) {
+    const require = getConfigValueInterfaceFile(interfaceFile, 'require');
+    if (!require)
+        return null;
+    const { filePathToShowToUserResolved } = interfaceFile.filePath;
+    assert(filePathToShowToUserResolved);
+    assertUsage(isObjectOfStrings(require), `The setting ${pc.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${pc.bold('Record<string, string>')}).`);
+    return require;
+}
+function getConfigNameValue(interfaceFile) {
+    const name = getConfigValueInterfaceFile(interfaceFile, 'name');
+    if (!name)
+        return null;
+    // TODO: move assertUsage() here
+    assert(typeof name === '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(extensionConfigFilePath, name) {
+    if (!extensionsVersion[name]) {
+        const found = findPackageJson(path.posix.dirname(extensionConfigFilePath));
+        assert(found);
+        const { packageJson, packageJsonPath } = found;
+        assertUsage(packageJson.name === name, `The setting ${pc.bold('name')} set by ${extensionConfigFilePath} is ${pc.bold(JSON.stringify(name))} but it should be equal to ${packageJsonPath}${pc.dim('#')}${pc.bold('name')} which is ${pc.bold(JSON.stringify(packageJson.name))}`);
+        const { version } = packageJson;
+        assert(typeof version === 'string');
+        extensionsVersion[name] = version;
+    }
+    return extensionsVersion[name];
+}

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

@@ -7,7 +7,7 @@ export type { ConfigNameGlobal };
 export type { ConfigEffect };
 import type { ConfigEnvInternal, ConfigEnv, ConfigValueSources, DefinedAtFilePath } from '../../../../../../shared/page-configs/PageConfig.js';
 import type { Config, ConfigNameBuiltIn } from '../../../../../../shared/page-configs/Config.js';
-import type { ConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
+import { type ConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
 /** The meta definition of a config.
  *
  * https://vike.dev/meta

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

@@ -1,6 +1,7 @@
 export { configDefinitionsBuiltIn };
 export { configDefinitionsBuiltInGlobal };
-import { assert } from '../../../../utils.js';
+import { assert, assertUsage } from '../../../../utils.js';
+import { getConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true }
@@ -54,6 +55,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 }
     },
@@ -69,11 +73,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 = getConfigDefinedAt('Config', 'clientHooks', source.definedAtFilePath);
+                    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 },
@@ -91,6 +106,9 @@ const configDefinitionsBuiltIn = {
     },
     name: {
         env: { config: true }
+    },
+    require: {
+        env: { config: true }
     }
 };
 const configDefinitionsBuiltInGlobal = {

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

@@ -3,12 +3,15 @@ export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
 export { isV1Design };
+export { getConfigValueInterfaceFile };
 export type { VikeConfigObject };
 export type { InterfaceValueFile };
+export type { InterfaceFile };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type LocationId } from './getVikeConfig/filesystemRouting.js';
 import type { ResolvedConfig } from 'vite';
 import type { FilePathResolved } from '../../../../../shared/page-configs/FilePath.js';
+type InterfaceFile = InterfaceConfigFile | InterfaceValueFile;
 type InterfaceFileCommons = {
     locationId: LocationId;
     filePath: FilePathResolved;
@@ -16,6 +19,12 @@ type InterfaceFileCommons = {
         configValue?: unknown;
     }>;
 };
+type InterfaceConfigFile = InterfaceFileCommons & {
+    isConfigFile: true;
+    isValueFile: false;
+    extendsFilePaths: string[];
+    isConfigExtend: boolean;
+};
 type InterfaceValueFile = InterfaceFileCommons & {
     isConfigFile: false;
     isValueFile: true;
@@ -35,3 +44,4 @@ declare function getVikeConfig(config: ResolvedConfig, isDev: boolean, { crawlWi
 }): Promise<VikeConfigObject>;
 declare function isV1Design(config: ResolvedConfig, isDev: boolean): Promise<boolean>;
 declare function isVikeConfigFile(filePath: string): boolean;
+declare function getConfigValueInterfaceFile(interfaceFile: InterfaceFile, configName: string): unknown;

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

@@ -3,6 +3,7 @@ export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
 export { isV1Design };
+export { getConfigValueInterfaceFile };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, arrayIncludes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, lowerFirst, getOutDirs, assertKeys, objectKeys, objectFromEntries, makeFirst, isNpmPackageImport, reverse } from '../../../utils.js';
 import path from 'path';
 import { configDefinitionsBuiltIn, configDefinitionsBuiltInGlobal } from './getVikeConfig/configDefinitionsBuiltIn.js';
@@ -21,6 +22,7 @@ import { clearFilesEnvMap, resolvePointerImportOfConfig } from './getVikeConfig/
 import { getFilePathResolved } from '../../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { getConfigVike } from '../../../../shared/getConfigVike.js';
+import { assertExtensionsPeerDependencies } from './assertExtensions.js';
 assertIsNotProductionRuntime();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -120,29 +122,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, crawlWithGit)
                 ```
                 */
                 const interfaceFile = getInterfaceFileFromConfigFile(extendsConfig, true, locationId);
-                {
-                    const alreadyMigrated = [
-                        'vike-react',
-                        'vike-react-query',
-                        'vike-react-zustand',
-                        'vike-vue',
-                        'vike-pinia',
-                        'vike-solid'
-                    ];
-                    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 ${pc.cyan('name')} value`;
-                    const isNameDefined = interfaceFile.fileExportsByConfigName.name?.configValue;
-                    if (alreadyMigrated) {
-                        // Eventually always make it a assertUsage()
-                        assertWarning(isNameDefined, warnMsg, { onlyOnce: true });
-                    }
-                    else {
-                        assertUsage(isNameDefined, warnMsg);
-                    }
-                }
+                assertVikeExtensionConventions(extendsConfig, interfaceFile);
                 interfaceFilesByLocationId[locationId].push(interfaceFile);
             });
         }),
@@ -181,6 +161,56 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev, crawlWithGit)
     assertAllConfigsAreKnown(interfaceFilesByLocationId);
     return interfaceFilesByLocationId;
 }
+function assertVikeExtensionConventions(extendsConfig, interfaceFile) {
+    const alreadyMigrated = [
+        'vike-react',
+        'vike-react-query',
+        'vike-react-zustand',
+        'vike-vue',
+        'vike-pinia',
+        'vike-solid'
+    ];
+    const { importPathAbsolute } = extendsConfig.filePath;
+    assert(importPathAbsolute);
+    const extensionName = importPathAbsolute
+        .split('/')
+        .slice(0, importPathAbsolute.startsWith('@') ? 2 : 1)
+        .join('/');
+    const errMsg = 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 define the ${pc.cyan('name')} setting.`;
+    const extensionNameValue = getConfigValueInterfaceFile(interfaceFile, 'name');
+    if (alreadyMigrated) {
+        // Eventually remove (always use assertUsage())
+        assertWarning(extensionNameValue, errMsg, { onlyOnce: true });
+    }
+    else {
+        assertUsage(extensionNameValue, errMsg);
+    }
+    {
+        const { filePathToShowToUserResolved } = interfaceFile.filePath;
+        assert(filePathToShowToUserResolved);
+        const errPrefix = `The setting ${pc.bold('name')} defined at ${filePathToShowToUserResolved}`;
+        assertUsage(typeof extensionNameValue === 'string', `${errPrefix} should be a string.`);
+        assertWarning(extensionNameValue === extensionName, `${errPrefix} is ${pc.bold(extensionNameValue)} but it should be ${pc.bold(extensionName)} instead.`, { onlyOnce: true });
+    }
+    {
+        const importPathAbsoluteExpected = `${extensionName}/config`;
+        assertWarning(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${extensionName} is exported at ${pc.bold(importPathAbsolute)} but it should be exported at ${pc.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
+    }
+    if (extensionName.startsWith('vike-')) {
+        const prefix = [
+            //
+            'vike-react',
+            'vike-vue',
+            'vike-solid',
+            'vike-svelte',
+            'vike-angular',
+            'vike-preact'
+        ];
+        assertWarning(prefix.some((p) => extensionName === p || extensionName.startsWith(`${p}-`)), `The name of the Vike extension ${pc.bold(extensionName)} should be or start with ${joinEnglish(prefix.map(pc.bold), 'or')}.`, { onlyOnce: true });
+    }
+}
 function getInterfaceFileFromConfigFile(configFile, isConfigExtend, locationId) {
     const { fileExports, filePath, extendsFilePaths } = configFile;
     const interfaceFile = {
@@ -260,9 +290,11 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev, crawlWithGit) {
         .filter(([_pageId, interfaceFiles]) => isDefiningPage(interfaceFiles))
         .map(async ([locationId]) => {
         const interfaceFilesRelevant = getInterfaceFilesRelevant(interfaceFilesByLocationId, locationId);
+        const interfaceFilesRelevantList = Object.values(interfaceFilesByLocationId).flat(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;
@@ -350,13 +382,6 @@ function getInterfaceFilesRelevant(interfaceFilesByLocationId, locationIdPage) {
         .sort(([locationId1], [locationId2]) => 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 = objectKeys(interfaceFilesByLocationId);
     const interfaceFilesGlobal = objectFromEntries(objectEntries(interfaceFilesByLocationId).filter(([locationId]) => {
@@ -969,3 +994,6 @@ function sortConfigValueSources(configValueSources, locationIdPage) {
         // Sort after the filesystem inheritance of the config value
         .sort(([, [source1]], [, [source2]]) => reverse(sortAfterInheritanceOrder(source1.locationId, source2.locationId, locationIdPage))));
 }
+function getConfigValueInterfaceFile(interfaceFile, configName) {
+    return interfaceFile.fileExportsByConfigName[configName]?.configValue;
+}

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

@@ -10,7 +10,7 @@ export * from '../../utils/escapeRegex.js';
 export * from '../../utils/stripAnsi.js';
 export * from '../../utils/trimWithAnsi.js';
 export * from '../../utils/removeEmptyLines.js';
-export * from '../../utils/findFile.js';
+export * from '../../utils/findPackageJson.js';
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/deepEqual.js';
 export * from '../../utils/assertKeys.js';

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

@@ -16,7 +16,7 @@ export * from '../../utils/escapeRegex.js';
 export * from '../../utils/stripAnsi.js';
 export * from '../../utils/trimWithAnsi.js';
 export * from '../../utils/removeEmptyLines.js';
-export * from '../../utils/findFile.js';
+export * from '../../utils/findPackageJson.js';
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/deepEqual.js';
 export * from '../../utils/assertKeys.js';

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

@@ -7,17 +7,17 @@ import { getGlobalContext } from '../globalContext.js';
 import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValue.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
-        const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
+        const { clientEntryLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
         const clientFilePath = getConfigValueRuntime(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
-        if (isClientSideRenderable)
+        if (clientEntryLoaded)
             clientEntries.push(getVikeClientEntry(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, true),
-            onlyAssets: isClientSideRenderable ? false : true,
+            onlyAssets: clientEntryLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
@@ -53,7 +53,7 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
             });
         });
         return {
-            isHtmlOnly: !isClientSideRenderable,
+            isHtmlOnly: !clientEntryLoaded,
             isClientRouting,
             clientEntries,
             clientDependencies,

package/dist/esm/shared/getPageFiles/analyzeClientSide.d.ts

@@ -2,6 +2,6 @@ export { analyzeClientSide };
 import type { PageConfigRuntime } from '../page-configs/PageConfig.js';
 import type { PageFile } from './getPageFileObject.js';
 declare function analyzeClientSide(pageConfig: PageConfigRuntime | null, pageFilesAll: PageFile[], pageId: string): {
-    isClientSideRenderable: boolean;
+    clientEntryLoaded: boolean;
     isClientRouting: boolean;
 };

package/dist/esm/shared/getPageFiles/analyzeClientSide.js

@@ -5,13 +5,13 @@ function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
         const isClientRouting = getConfigValueRuntime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const isClientSideRenderable = getConfigValueRuntime(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
-        return { isClientSideRenderable, isClientRouting };
+        const clientEntryLoaded = getConfigValueRuntime(pageConfig, 'clientEntryLoaded', 'boolean')?.value ?? false;
+        return { clientEntryLoaded, isClientRouting };
     }
     else {
         // TODO/v1-release: remove
         // V0.4 design
         const { isHtmlOnly, isClientRouting } = analyzePageClientSide(pageFilesAll, pageId);
-        return { isClientSideRenderable: !isHtmlOnly, isClientRouting };
+        return { clientEntryLoaded: !isHtmlOnly, isClientRouting };
     }
 }

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

@@ -40,7 +40,7 @@ type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
 type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
 type HookNameOldDesign = 'render' | 'prerender';
-type ConfigNameBuiltIn = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'isClientSideRenderable' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout';
+type ConfigNameBuiltIn = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'clientEntryLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks';
 type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte | VikePackages.ConfigVikeAngular);
 /** Hook for fetching data.
  *
@@ -326,6 +326,12 @@ type ConfigBuiltIn = {
      * https://vike.dev/clientRouting
      */
     clientRouting?: boolean | ImportString;
+    /**
+     * Whether hooks are loaded on the client-side.
+     *
+     * https://vike.dev/clientHooks
+     */
+    clientHooks?: boolean | null | ImportString;
     /** Create new or modify existing configurations.
      *
      * https://vike.dev/meta
@@ -352,6 +358,11 @@ type ConfigBuiltIn = {
      * https://vike.dev/extends
      */
     name?: string;
+    /** Used by Vike extensions to enforce their peer dependencies.
+     *
+     * https://vike.dev/require
+     */
+    require?: string;
 };
 type ConfigMeta = Record<string, ConfigDefinition>;
 type ImportString = `import:${string}`;

package/dist/esm/utils/findFile.js

@@ -2,19 +2,21 @@ export { findFile };
 import path from 'path';
 import fs from 'fs';
 import { isArray } from './isArray.js';
+import { assertPosixPath } from './filesystemPathHandling.js';
 function findFile(arg, cwd) {
+    assertPosixPath(cwd);
     const filenames = isArray(arg) ? arg : [arg];
     let dir = cwd;
     while (true) {
         for (const filename of filenames) {
-            const configFilePath = path.join(dir, `./${filename}`);
+            const configFilePath = path.posix.join(dir, `./${filename}`);
             if (fs.existsSync(configFilePath)) {
-                // return toPosixPath(configFilePath)
+                assertPosixPath(configFilePath);
                 return configFilePath;
             }
         }
         const dirPrevious = dir;
-        dir = path.dirname(dir);
+        dir = path.posix.dirname(dir);
         if (dir === dirPrevious) {
             return null;
         }

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

@@ -0,0 +1,5 @@
+export { findPackageJson };
+declare function findPackageJson(cwd: string): null | {
+    packageJson: Record<string, unknown>;
+    packageJsonPath: string;
+};

package/dist/esm/utils/findPackageJson.js

@@ -0,0 +1,16 @@
+export { findPackageJson };
+import { findFile } from './findFile.js';
+import { createRequire } from 'module';
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const importMetaUrl = import.meta.url;
+const require_ = createRequire(importMetaUrl);
+function findPackageJson(cwd) {
+    const packageJsonPath = findFile('package.json', cwd);
+    if (!packageJsonPath)
+        return null;
+    const packageJson = require_(packageJsonPath);
+    return {
+        packageJson,
+        packageJsonPath
+    };
+}

package/dist/esm/utils/joinEnglish.js

@@ -7,5 +7,5 @@ function joinEnglish(arr, conjunction, colorizer = (s) => s) {
         return colorizer(arr[0]);
     const firsts = arr.slice(0, arr.length - 1);
     const last = arr[arr.length - 1];
-    return firsts.map(colorizer).join(', ') + ` ${conjunction} ` + colorizer(last);
+    return firsts.map(colorizer).join(', ') + `, ${conjunction} ` + colorizer(last);
 }

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.172-commit-605b4a5";
+declare const PROJECT_VERSION: "0.4.172-commit-55d8662";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.172-commit-605b4a5";
+    projectVersion: "0.4.172-commit-55d8662";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.172-commit-605b4a5';
+const PROJECT_VERSION = '0.4.172-commit-55d8662';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.172-commit-605b4a5",
+  "version": "0.4.172-commit-55d8662",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",