vike 0.4.230 → 0.4.231-commit-e23b4f5

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/loadFileAtConfigTime.d.ts

@@ -3,24 +3,24 @@ export { loadValueFile };
 export { loadConfigFile };
 export type { ConfigFile };
 export type { PointerImportLoaded };
-import type { FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
+import type { FilePathResolved } from '../../../../types/FilePath.js';
 import { type EsbuildCache } from './transpileAndExecuteFile.js';
 import type { PlusFileValue } from './getPlusFilesAll.js';
 import { PointerImport } from './resolvePointerImport.js';
-import type { ConfigDefinitions } from './configDefinitionsBuiltIn.js';
+import type { ConfigDefinitionsInternal } from './configDefinitionsBuiltIn.js';
 type ConfigFile = {
     fileExports: Record<string, unknown>;
     filePath: FilePathResolved;
     extendsFilePaths: string[];
 };
-declare function loadPointerImport(pointerImport: PointerImportLoaded, userRootDir: string, configName: string, configDefinitions: ConfigDefinitions, esbuildCache: EsbuildCache): Promise<unknown>;
+declare function loadPointerImport(pointerImport: PointerImportLoaded, userRootDir: string, configName: string, configDefinitions: ConfigDefinitionsInternal, esbuildCache: EsbuildCache): Promise<unknown>;
 type PointerImportLoaded = PointerImport & ({
     fileExportValueLoaded: true;
     fileExportValue: unknown;
 } | {
     fileExportValueLoaded: false;
 });
-declare function loadValueFile(interfaceValueFile: PlusFileValue, configDefinitions: ConfigDefinitions, userRootDir: string, esbuildCache: EsbuildCache): Promise<void>;
+declare function loadValueFile(interfaceValueFile: PlusFileValue, configDefinitions: ConfigDefinitionsInternal, userRootDir: string, esbuildCache: EsbuildCache): Promise<void>;
 declare function loadConfigFile(configFilePath: FilePathResolved, userRootDir: string, visited: string[], isExtensionConfig: boolean, esbuildCache: EsbuildCache): Promise<{
     configFile: ConfigFile;
     extendsConfigs: ConfigFile[];

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/loadFileAtConfigTime.js

@@ -2,15 +2,15 @@
 export { loadPointerImport };
 export { loadValueFile };
 export { loadConfigFile };
-import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject } from '../../../../utils.js';
+import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject } from '../../utils.js';
 import { transpileAndExecuteFile } from './transpileAndExecuteFile.js';
-import { getConfigDefinitionOptional } from '../getVikeConfig.js';
-import { assertPlusFileExport } from '../../../../../../shared/page-configs/assertPlusFileExport.js';
+import { getConfigDefinitionOptional } from '../resolveVikeConfigInternal.js';
+import { assertPlusFileExport } from '../../../../shared/page-configs/assertPlusFileExport.js';
 import pc from '@brillout/picocolors';
 import { parsePointerImportData } from './pointerImports.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { resolvePointerImportData } from './resolvePointerImport.js';
-import { getConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
+import { getConfigDefinedAt } from '../../../../shared/page-configs/getConfigDefinedAt.js';
 assertIsNotProductionRuntime();
 // Load pointer import
 async function loadPointerImport(pointerImport, userRootDir, configName, configDefinitions, esbuildCache) {

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/pointerImports.js

@@ -18,7 +18,7 @@ export { assertPointerImportPath };
 //   - Esbuild removes comments: https://github.com/evanw/esbuild/issues/1439#issuecomment-877656182
 //   - Using source maps to track these magic comments is brittle (source maps can easily break)
 import { parse } from 'acorn';
-import { assert, assertUsage, assertWarning, isFilePathAbsolute, isImportPath, styleFileRE } from '../../../../utils.js';
+import { assert, assertUsage, assertWarning, isFilePathAbsolute, isImportPath, styleFileRE } from '../../utils.js';
 import pc from '@brillout/picocolors';
 function transformPointerImports(code, filePathToShowToUser2, pointerImports, 
 // For ./transformPointerImports.spec.ts

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/resolvePointerImport.d.ts

@@ -1,9 +1,9 @@
 export { resolvePointerImport };
 export { resolvePointerImportData };
 export type { PointerImport };
-import type { DefinedAtFilePath } from '../../../../../../shared/page-configs/PageConfig.js';
+import type { DefinedAtFilePath } from '../../../../types/PageConfig.js';
 import { type PointerImportData } from './pointerImports.js';
-import type { FilePath, FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
+import type { FilePath, FilePathResolved } from '../../../../types/FilePath.js';
 type PointerImport = {
     fileExportPath: FileExportPath;
 };

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/resolvePointerImport.js

@@ -1,9 +1,9 @@
 export { resolvePointerImport };
 export { resolvePointerImportData };
 import pc from '@brillout/picocolors';
-import { assert, assertPosixPath, assertUsage, isFilePathAbsolute, isImportPathRelative, isImportPathNpmPackageOrPathAlias, requireResolveOptional } from '../../../../utils.js';
+import { assert, assertPosixPath, assertUsage, isFilePathAbsolute, isImportPathRelative, isImportPathNpmPackageOrPathAlias, requireResolveOptional } from '../../utils.js';
 import { assertPointerImportPath, parsePointerImportData } from './pointerImports.js';
-import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../../../../shared/getFilePath.js';
+import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../getFilePath.js';
 function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {
     if (typeof configValue !== 'string')
         return null;

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/transpileAndExecuteFile.d.ts

@@ -3,7 +3,7 @@ export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
 export { isTemporaryBuildFile };
 export type { EsbuildCache };
-import type { FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
+import type { FilePathResolved } from '../../../../types/FilePath.js';
 type FileExports = {
     fileExports: Record<string, unknown>;
 };

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/transpileAndExecuteFile.js

@@ -7,10 +7,10 @@ import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsImportPathNpmPackage, genPromise, isVitest, isImportPathNpmPackageOrPathAlias, isImportPathRelative, requireResolveOptionalDir } from '../../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsImportPathNpmPackage, genPromise, isVitest, isImportPathNpmPackageOrPathAlias, isImportPathRelative, requireResolveOptionalDir } from '../../utils.js';
 import { transformPointerImports } from './pointerImports.js';
 import sourceMapSupport from 'source-map-support';
-import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
+import { getFilePathAbsoluteUserRootDir } from '../getFilePath.js';
 assertIsNotProductionRuntime();
 installSourceMapSupport();
 const debug = createDebugger('vike:pointer-imports');

package/dist/esm/node/vite/shared/resolveVikeConfigInternal.d.ts

@@ -0,0 +1,68 @@
+export { getVikeConfigInternal };
+export { getVikeConfigInternalOptional };
+export { getVikeConfigInternalSync };
+export { setVikeConfigContext };
+export { reloadVikeConfig };
+export { isV1Design };
+export { getConfVal };
+export { getConfigDefinitionOptional };
+export { getVikeConfigFromCliOrEnv };
+export { isOverriden };
+export type { VikeConfigInternal };
+export { getVikeConfig };
+export type { VikeConfig };
+import type { PageConfigGlobalBuildTime, ConfigValueSource, PageConfigBuildTime } from '../../../types/PageConfig.js';
+import { type ConfigDefinitionsInternal, type ConfigDefinitionInternal } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import { type VikeConfigPublicGlobal, type VikeConfigPublicPageEager } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
+import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesAll.js';
+import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
+import type { ResolvedConfig, UserConfig } from 'vite';
+type VikeConfigContext = {
+    userRootDir: string;
+    isDev: boolean;
+    vikeVitePluginOptions: unknown;
+};
+type PrerenderContext = {
+    isPrerenderingEnabled: boolean;
+    isPrerenderingEnabledForAllPages: boolean;
+} & ({
+    [K in keyof PrerenderContextPublic]: null;
+} | PrerenderContextPublic);
+type VikeConfigInternal = {
+    _pageConfigs: PageConfigBuildTime[];
+    _pageConfigGlobal: PageConfigGlobalBuildTime;
+    config: VikeConfigPublicGlobal['config'];
+    _from: VikeConfigPublicGlobal['_from'];
+    pages: Record<string, // pageId
+    VikeConfigPublicPageEager>;
+    _vikeConfigDependencies: Set<string>;
+    prerenderContext: PrerenderContext;
+};
+declare function reloadVikeConfig(): void;
+declare function getVikeConfigInternal(doNotRestartViteOnError?: boolean): Promise<VikeConfigInternal>;
+declare function getVikeConfigInternalSync(): VikeConfigInternal;
+/**
+ * Get all the information Vike knows about the app in your Vite plugin.
+ *
+ * https://vike.dev/getVikeConfig
+ */
+declare function getVikeConfig(config: ResolvedConfig | UserConfig): VikeConfig;
+type VikeConfig = Pick<VikeConfigInternal, 'config' | 'pages' | 'prerenderContext'>;
+declare function setVikeConfigContext(vikeConfigCtx_: VikeConfigContext): void;
+declare function getVikeConfigInternalOptional(): Promise<null | VikeConfigInternal>;
+declare function isV1Design(): boolean;
+declare function getVikeConfigFromCliOrEnv(): {
+    vikeConfigFromCliOrEnv: {
+        [x: string]: unknown;
+    };
+    configFromCliOptions: import("../../cli/parseCli.js").CliOptions | null;
+    configFromEnvVar: Record<string, unknown> | null;
+};
+declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitionsInternal, configName: string): ConfigDefinitionInternal | null;
+declare function getConfVal(plusFile: PlusFile, configName: string): null | {
+    value: unknown;
+    valueIsLoaded: true;
+} | {
+    valueIsLoaded: false;
+};
+declare function isOverriden(source: ConfigValueSource, configName: string, pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime): boolean;

package/dist/esm/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig.js → vite/shared/resolveVikeConfigInternal.js}

@@ -1,176 +1,202 @@
-export { getVikeConfig };
-export { getVikeConfigOptional };
-export { getVikeConfig2 };
+// Internal usage
+export { getVikeConfigInternal };
+export { getVikeConfigInternalOptional };
+export { getVikeConfigInternalSync };
+export { setVikeConfigContext };
 export { reloadVikeConfig };
 export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
 export { isOverriden };
-import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast, assertIsSingleModuleInstance } from '../../../utils.js';
-import { configDefinitionsBuiltIn } from './getVikeConfig/configDefinitionsBuiltIn.js';
-import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
-import { isVikeConfigInvalid, isVikeConfigInvalid_set } from '../../../../runtime/renderPage/isVikeConfigInvalid.js';
-import { getViteDevServer } from '../../../../runtime/globalContext.js';
-import { logConfigError, logConfigErrorRecover } from '../../../shared/loggerNotProd.js';
-import { removeSuperfluousViteLog_enable, removeSuperfluousViteLog_disable } from '../../../shared/loggerVite/removeSuperfluousViteLog.js';
+// Public usage
+export { getVikeConfig };
+import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast, assertIsSingleModuleInstance, genPromise } from '../utils.js';
+import { configDefinitionsBuiltIn } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
+import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect } from './resolveVikeConfigInternal/filesystemRouting.js';
+import { getViteDevServer } from '../../runtime/globalContext.js';
+import { logConfigError, logConfigErrorRecover } from './loggerNotProd.js';
+import { removeSuperfluousViteLog_enable, removeSuperfluousViteLog_disable } from './loggerVite/removeSuperfluousViteLog.js';
 import pc from '@brillout/picocolors';
-import { getConfigDefinedAt, getDefinedByString } from '../../../../../shared/page-configs/getConfigDefinedAt.js';
-import { loadPointerImport, loadValueFile } from './getVikeConfig/loadFileAtConfigTime.js';
-import { resolvePointerImport } from './getVikeConfig/resolvePointerImport.js';
-import { getFilePathResolved } from '../../../shared/getFilePath.js';
-import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
-import { assertExtensionsRequire } from './getVikeConfig/assertExtensions.js';
-import { getUserFriendlyConfigsGlobal, getUserFriendlyConfigsPageEager } from '../../../../../shared/page-configs/getUserFriendlyConfigs.js';
-import { getConfigValuesBase, isJsonValue } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
-import { getPlusFilesAll } from './getVikeConfig/getPlusFilesAll.js';
-import { getEnvVarObject } from '../../../shared/getEnvVarObject.js';
-import { getApiOperation } from '../../../../api/context.js';
-import { getCliOptions } from '../../../../cli/context.js';
+import { getConfigDefinedAt, getDefinedByString } from '../../../shared/page-configs/getConfigDefinedAt.js';
+import { loadPointerImport, loadValueFile } from './resolveVikeConfigInternal/loadFileAtConfigTime.js';
+import { resolvePointerImport } from './resolveVikeConfigInternal/resolvePointerImport.js';
+import { getFilePathResolved } from './getFilePath.js';
+import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js';
+import { resolveVikeConfigPublicGlobal, resolveVikeConfigPublicPageEager } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
+import { getConfigValuesBase, isJsonValue } from '../../../shared/page-configs/serialize/serializeConfigValues.js';
+import { getPlusFilesAll } from './resolveVikeConfigInternal/getPlusFilesAll.js';
+import { getEnvVarObject } from './getEnvVarObject.js';
+import { getApiOperation } from '../../api/context.js';
+import { getCliOptions } from '../../cli/context.js';
+import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
+import { getProxyForPublicUsage } from '../../../shared/getProxyForPublicUsage.js';
+import { renderPage_vikeConfigHasError } from '../../runtime/renderPage.js';
 assertIsNotProductionRuntime();
+// We can simply use global variables since Vike's config is:
+//  - gobal
+//  - independent of Vite (therefore we don't need to tie Vike's config with Vite's `config` object)
 assertIsSingleModuleInstance('v1-design/getVikeConfig.ts');
 let restartVite = false;
-let wasConfigInvalid = null;
+let vikeConfigHasBuildError = null;
+let isV1Design_ = null;
 let vikeConfigPromise = null;
-function reloadVikeConfig(config) {
-    const userRootDir = config.root;
-    const vikeVitePluginOptions = config._vikeVitePluginOptions;
+// TODO/v1-release: remove
+let vikeConfigSync = null;
+let vikeConfigCtx = null; // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
+let prerenderContext;
+function reloadVikeConfig() {
+    assert(vikeConfigCtx);
+    const { userRootDir, vikeVitePluginOptions } = vikeConfigCtx;
     assert(vikeVitePluginOptions);
-    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
-    handleReloadSideEffects();
+    resolveVikeConfigInternal_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
 }
-async function handleReloadSideEffects() {
-    wasConfigInvalid = !!isVikeConfigInvalid;
-    const vikeConfigPromisePrevious = vikeConfigPromise;
-    try {
-        await vikeConfigPromise;
-    }
-    catch (err) {
-        // handleReloadSideEffects() is only called in dev.
-        // In dev, if loadVikeConfig_withErrorHandling() throws an error, then it's a vike bug.
-        console.error(err);
-        assert(false);
-    }
-    if (vikeConfigPromise !== vikeConfigPromisePrevious) {
-        // Let the next handleReloadSideEffects() call handle side effects
-        return;
-    }
-    if (!isVikeConfigInvalid) {
-        if (wasConfigInvalid) {
-            wasConfigInvalid = false;
-            logConfigErrorRecover();
-        }
-        if (restartVite) {
-            restartVite = false;
-            const viteDevServer = getViteDevServer();
-            assert(viteDevServer);
-            removeSuperfluousViteLog_enable();
-            await viteDevServer.restart(true);
-            removeSuperfluousViteLog_disable();
-        }
-    }
+async function getVikeConfigInternal(
+// I don't remember the logic behind it — neither why we restart Vite's dev server, nor why we sometimes don't.
+// TO-DO: eventually rethink all that. Some + settings are expected to influence Vite's config (restarting Vite's dev server is needed) while some don't.
+doNotRestartViteOnError = false) {
+    assert(vikeConfigCtx);
+    const { userRootDir, isDev, vikeVitePluginOptions } = vikeConfigCtx;
+    const vikeConfig = await getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
+    return vikeConfig;
 }
-// TODO/soon: predominantly use getVikeConfigInternal() instead of getVikeConfig() then maybe refector?
-async function getVikeConfig(config, { doNotRestartViteOnError } = {}) {
-    const userRootDir = config.root;
-    const vikeVitePluginOptions = config._vikeVitePluginOptions;
-    assert(vikeVitePluginOptions);
-    const isDev = config._isDev;
-    assert(typeof isDev === 'boolean');
-    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError ?? false);
+// TODO/v1-release: remove
+function getVikeConfigInternalSync() {
+    assert(vikeConfigSync);
+    return vikeConfigSync;
 }
-async function getVikeConfig2(userRootDir, isDev, vikeVitePluginOptions) {
-    assert(vikeVitePluginOptions);
-    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, false);
+// TO-DO/eventually: this maybe(/probably?) isn't safe against race conditions upon file changes in development, thus:
+// - Like getGlobalContext() and getGlobalContextSync() — make getVikeConfig() async and provide a getVikeConfigSync() while discourage using it
+// Public usage
+/**
+ * Get all the information Vike knows about the app in your Vite plugin.
+ *
+ * https://vike.dev/getVikeConfig
+ */
+function getVikeConfig(
+// TO-DO/eventually: remove unused arguments (older versions used it and we didn't remove it yet to avoid a TypeScript breaking change)
+// - No rush: we can do it later since it's getVikeConfig() is a beta feature as documented at https://vike.dev/getVikeConfig
+config) {
+    const vikeConfig = getVikeConfigInternalSync();
+    assertUsage(vikeConfig, 'getVikeConfig() can only be used when Vite is loaded (i.e. during development or build) — Vite is never loaded in production.');
+    const vikeConfigPublic = getProxyForPublicUsage(vikeConfig, 'vikeConfig');
+    return vikeConfigPublic;
+}
+function setVikeConfigContext(vikeConfigCtx_) {
+    // If the user changes Vite's `config.root` => Vite completely reloads itself => setVikeConfigContext() is called again
+    vikeConfigCtx = vikeConfigCtx_;
 }
-async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
+async function getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     if (!vikeConfigPromise) {
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
+        resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     }
-    return await vikeConfigPromise;
+    assert(vikeConfigPromise);
+    const vikeConfig = await vikeConfigPromise;
+    return vikeConfig;
 }
-async function getVikeConfigOptional() {
+async function getVikeConfigInternalOptional() {
     if (!vikeConfigPromise)
         return null;
-    return await vikeConfigPromise;
+    const vikeConfig = await vikeConfigPromise;
+    return vikeConfig;
 }
-function isV1Design(config) {
-    const vikeConfig = config._vikeConfigObject;
-    assert(vikeConfig);
-    const { pageConfigs } = vikeConfig;
-    const isV1Design = pageConfigs.length > 0;
-    return isV1Design;
+function isV1Design() {
+    assert(typeof isV1Design_ === 'boolean');
+    return isV1Design_;
 }
-async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
+async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
+    const { promise, resolve, reject } = genPromise();
+    vikeConfigPromise = promise;
+    const esbuildCache = {
+        transpileCache: {},
+        vikeConfigDependencies: new Set()
+    };
     let hasError = false;
     let ret;
     let err;
     try {
-        ret = await loadVikeConfig(userRootDir, vikeVitePluginOptions);
+        ret = await resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esbuildCache);
     }
     catch (err_) {
         hasError = true;
         err = err_;
     }
+    // There is a newer call — let the new call supersede the old one.
+    // We deliberately swallow the intermetidate state (including any potential error) — it's now outdated and has existed only for a very short period of time.
+    if (vikeConfigPromise !== promise) {
+        // vikeConfigPromise.then(resolve).catch(reject)
+        try {
+            resolve(await vikeConfigPromise);
+        }
+        catch (err) {
+            reject(err);
+        }
+        return;
+    }
     if (!hasError) {
         assert(ret);
         assert(err === undefined);
-        isVikeConfigInvalid_set(false);
-        return ret;
+        const hadError = vikeConfigHasBuildError;
+        vikeConfigHasBuildError = false;
+        renderPage_vikeConfigHasError({ hasBuildError: false });
+        if (hadError) {
+            logConfigErrorRecover();
+            if (restartVite) {
+                restartVite = false;
+                restartViteDevServer();
+            }
+        }
+        resolve(ret);
     }
     else {
         assert(ret === undefined);
         assert(err);
-        isVikeConfigInvalid_set({ err });
+        vikeConfigHasBuildError = true;
+        renderPage_vikeConfigHasError({ hasBuildError: { err } });
+        if (!doNotRestartViteOnError)
+            restartVite = true;
         if (!isDev) {
-            assert(getViteDevServer() === null);
-            throw err;
+            reject(err);
         }
         else {
             logConfigError(err);
-            if (!doNotRestartViteOnError) {
-                restartVite = true;
-            }
-            const dummyData = {
-                pageConfigs: [],
-                pageConfigGlobal: {
-                    configDefinitions: {},
-                    configValueSources: {}
-                },
-                global: getUserFriendlyConfigsGlobal({ pageConfigGlobalValues: {} }),
-                pages: {},
-                vikeConfigDependencies: new Set()
-            };
-            return dummyData;
+            resolve(getVikeConfigDummy(esbuildCache));
         }
     }
 }
-async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
-    const esbuildCache = {
-        transpileCache: {},
-        vikeConfigDependencies: new Set()
-    };
+async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esbuildCache) {
     const plusFilesAll = await getPlusFilesAll(userRootDir, esbuildCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
+    if (!isV1Design_)
+        isV1Design_ = pageConfigs.length > 0;
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     // global
     const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
-    const userFriendlyConfigsGlobal = getUserFriendlyConfigsGlobal({ pageConfigGlobalValues });
+    const vikeConfigPublicGlobal = resolveVikeConfigPublicGlobal({ pageConfigGlobalValues });
     // pages
-    const userFriendlyConfigsPageEager = objectFromEntries(pageConfigs.map((pageConfig) => {
+    const vikeConfigPublicPagesEager = objectFromEntries(pageConfigs.map((pageConfig) => {
         const pageConfigValues = getConfigValues(pageConfig, true);
-        return getUserFriendlyConfigsPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues);
+        return resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
-    return {
-        pageConfigs,
-        pageConfigGlobal,
-        global: userFriendlyConfigsGlobal,
-        pages: userFriendlyConfigsPageEager,
-        vikeConfigDependencies: esbuildCache.vikeConfigDependencies
+    const prerenderContext = resolvePrerenderContext({
+        config: vikeConfigPublicGlobal.config,
+        _from: vikeConfigPublicGlobal._from,
+        _pageConfigs: pageConfigs
+    });
+    const vikeConfig = {
+        _pageConfigs: pageConfigs,
+        _pageConfigGlobal: pageConfigGlobal,
+        config: vikeConfigPublicGlobal.config,
+        _from: vikeConfigPublicGlobal._from,
+        pages: vikeConfigPublicPagesEager,
+        prerenderContext,
+        _vikeConfigDependencies: esbuildCache.vikeConfigDependencies
     };
+    vikeConfigSync = vikeConfig;
+    return vikeConfig;
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const plusFilesAllOrdered = Object.values(plusFilesAll)
@@ -322,7 +348,6 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
 }
 function assertPageConfigs(pageConfigs) {
     pageConfigs.forEach((pageConfig) => {
-        assertExtensionsRequire(pageConfig);
         assertOnBeforeRenderEnv(pageConfig);
     });
 }
@@ -705,6 +730,8 @@ function getConfigDefinitions(plusFilesRelevant, filter) {
         assertMetaUsage(meta, `Config ${pc.cyan('meta')} defined at ${plusFile.filePath.filePathToShowToUser}`);
         // Set configDef._userEffectDefinedAtFilePath
         Object.entries(meta).forEach(([configName, configDef]) => {
+            if ('isDefinedByPeerDependency' in configDef)
+                return;
             if (!configDef.effect)
                 return;
             assert(plusFile.isConfigFile);
@@ -714,6 +741,12 @@ function getConfigDefinitions(plusFilesRelevant, filter) {
             };
         });
         objectEntries(meta).forEach(([configName, configDefinitionUserLand]) => {
+            if ('isDefinedByPeerDependency' in configDefinitionUserLand) {
+                configDefinitionUserLand = {
+                    env: { client: false, server: false, config: false },
+                    ...configDefinitionUserLand
+                };
+            }
             // User can override an existing config definition
             configDefinitions[configName] = {
                 ...configDefinitions[configName],
@@ -736,6 +769,8 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
             assert(metaConfigDefinedAt); // We expect internal effects to return a valid meta value
             assertUsage(false, `${metaConfigDefinedAt} sets ${pc.cyan(`meta.${configName}`)} to a value with an invalid type ${pc.cyan(typeof def)}: it should be an object instead.`);
         }
+        if (def.isDefinedByPeerDependency)
+            return;
         // env
         let configEnv;
         {
@@ -846,6 +881,7 @@ function applyEffectMetaEnv(configModFromEffect, configValueSources, configDefEf
         }
         assertMetaUsage(configValue, configDefinedAt);
         objectEntries(configValue).forEach(([configTargetName, configTargetDef]) => {
+            assert(!('isDefinedByPeerDependency' in configTargetDef));
             {
                 const keys = Object.keys(configTargetDef);
                 assertUsage(keys.includes('env'), notSupported);
@@ -1072,3 +1108,56 @@ function isOverriden(source, configName, pageConfig) {
     assert(idx >= 0);
     return idx > 0;
 }
+function resolvePrerenderContext(vikeConfig) {
+    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = resolvePrerenderConfigGlobal(vikeConfig);
+    prerenderContext ?? (prerenderContext = {
+        isPrerenderingEnabled: false,
+        isPrerenderingEnabledForAllPages: false,
+        // Set at runPrerender()
+        output: null,
+        // Set at runPrerender()
+        pageContexts: null
+    });
+    prerenderContext.isPrerenderingEnabled = isPrerenderingEnabled;
+    prerenderContext.isPrerenderingEnabledForAllPages = isPrerenderingEnabledForAllPages;
+    return prerenderContext;
+}
+function restartViteDevServer() {
+    const viteDevServer = getViteDevServer();
+    assert(viteDevServer);
+    removeSuperfluousViteLog_enable();
+    (async () => {
+        try {
+            await viteDevServer.restart(true);
+        }
+        catch (err) {
+            console.error('Vite restart error:');
+            console.error(err);
+        }
+    })();
+    removeSuperfluousViteLog_disable();
+}
+function getVikeConfigDummy(esbuildCache) {
+    const globalDummy = resolveVikeConfigPublicGlobal({ pageConfigGlobalValues: {} });
+    const pageConfigsDummy = [];
+    const prerenderContextDummy = resolvePrerenderContext({
+        config: globalDummy.config,
+        _from: globalDummy._from,
+        _pageConfigs: pageConfigsDummy
+    });
+    const vikeConfigDummy = {
+        _pageConfigs: pageConfigsDummy,
+        _pageConfigGlobal: {
+            configDefinitions: {},
+            configValueSources: {}
+        },
+        config: globalDummy.config,
+        _from: globalDummy._from,
+        pages: {},
+        prerenderContext: prerenderContextDummy,
+        _vikeConfigDependencies: esbuildCache.vikeConfigDependencies
+    };
+    vikeConfigSync = vikeConfigDummy;
+    isV1Design_ = true;
+    return vikeConfigDummy;
+}