vike 0.4.230-commit-f07cc20 → 0.4.231-commit-a0ca5e4

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configDefinitionsBuiltIn = void 0;
-const utils_js_1 = require("../../../../utils.js");
-const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
+const utils_js_1 = require("../../utils.js");
+const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true }
@@ -178,54 +178,41 @@ const configDefinitionsBuiltIn = {
     prerender: {
         env: { config: true },
         global: (value, { isGlobalLocation }) => typeof value === 'object' || isGlobalLocation,
-        type: ['boolean', 'object'],
         cumulative: true
     },
-    vite: { env: { config: true }, global: true, cumulative: true, type: 'object' },
+    vite: { env: { config: true }, global: true, cumulative: true },
     disableAutoFullBuild: {
         env: { config: true },
-        global: true,
-        type: [
-            'boolean',
-            // Can be 'prerender'
-            'string'
-        ]
+        global: true
     },
     vite6BuilderApp: {
         env: { config: true },
-        global: true,
-        type: 'boolean'
+        global: true
     },
     includeAssetsImportedByServer: {
         env: { config: true },
-        global: true,
-        type: 'boolean'
+        global: true
     },
     baseAssets: {
         env: { config: true, server: true },
-        global: true,
-        type: 'string'
+        global: true
     },
     baseServer: {
         env: { config: true, server: true },
-        global: true,
-        type: 'string'
+        global: true
     },
     redirects: {
         env: { server: true },
         global: true,
-        type: 'string{}',
         cumulative: true
     },
     trailingSlash: {
         env: { server: true },
-        global: true,
-        type: 'boolean'
+        global: true
     },
     disableUrlNormalization: {
         env: { server: true },
-        global: true,
-        type: 'boolean'
+        global: true
     }
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;

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

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.crawlPlusFiles = crawlPlusFiles;
 exports.isPlusFile = isPlusFile;
 exports.getPlusFileValueConfigName = getPlusFileValueConfigName;
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
 const tinyglobby_1 = require("tinyglobby");
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
-const getEnvVarObject_js_1 = require("../../../../shared/getEnvVarObject.js");
+const getEnvVarObject_js_1 = require("../getEnvVarObject.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const picomatch_1 = __importDefault(require("picomatch"));
 const ignorePatternsBuiltIn_js_1 = require("./crawlPlusFiles/ignorePatternsBuiltIn.js");

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

@@ -11,7 +11,7 @@ exports.sortAfterInheritanceOrder = sortAfterInheritanceOrder;
 exports.applyFilesystemRoutingRootEffect = applyFilesystemRoutingRootEffect;
 exports.getLogicalPath = getLogicalPath;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 /**
  * `getLocationId('/pages/some-page/+Page.js')` => `'/pages/some-page'`

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

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigFileExport = getConfigFileExport;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const assertPlusFileExport_js_1 = require("../../../../../../shared/page-configs/assertPlusFileExport.js");
-const utils_js_1 = require("../../../../utils.js");
+const assertPlusFileExport_js_1 = require("../../../../shared/page-configs/assertPlusFileExport.js");
+const utils_js_1 = require("../../utils.js");
 function getConfigFileExport(fileExports, filePathToShowToUser) {
     (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, 'config');
     const usesNamedExport = !!fileExports.config;

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlusFilesAll = getPlusFilesAll;
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./filesystemRouting.js");
 const crawlPlusFiles_js_1 = require("./crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const loadFileAtConfigTime_js_1 = require("./loadFileAtConfigTime.js");
 const resolvePointerImport_js_1 = require("./resolvePointerImport.js");
-const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
+const getFilePath_js_1 = require("../getFilePath.js");
 const assertExtensions_js_1 = require("./assertExtensions.js");
 async function getPlusFilesAll(userRootDir, esbuildCache) {
     const plusFiles = await findPlusFiles(userRootDir);

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

@@ -7,22 +7,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPointerImport = loadPointerImport;
 exports.loadValueFile = loadValueFile;
 exports.loadConfigFile = loadConfigFile;
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
-const getVikeConfig_js_1 = require("../getVikeConfig.js");
-const assertPlusFileExport_js_1 = require("../../../../../../shared/page-configs/assertPlusFileExport.js");
+const resolveVikeConfigInternal_js_1 = require("../resolveVikeConfigInternal.js");
+const assertPlusFileExport_js_1 = require("../../../../shared/page-configs/assertPlusFileExport.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const pointerImports_js_1 = require("./pointerImports.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const resolvePointerImport_js_1 = require("./resolvePointerImport.js");
-const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
+const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 // Load pointer import
 async function loadPointerImport(pointerImport, userRootDir, configName, configDefinitions, esbuildCache) {
     // The value of `extends` was already loaded and already used: we don't need the value of `extends` anymore
     if (configName === 'extends')
         return;
-    const configDef = (0, getVikeConfig_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
+    const configDef = (0, resolveVikeConfigInternal_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
     // Only load pointer import if `env.config===true`
     if (!configDef || !shouldBeLoadableAtBuildTime(configDef))
         return;
@@ -37,7 +37,7 @@ async function loadPointerImport(pointerImport, userRootDir, configName, configD
 // Load +{configName}.js
 async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir, esbuildCache) {
     const { configName } = interfaceValueFile;
-    const configDef = (0, getVikeConfig_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
+    const configDef = (0, resolveVikeConfigInternal_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
     // Only load value files with `env.config===true`
     if (!configDef || !shouldBeLoadableAtBuildTime(configDef))
         return;

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

@@ -23,7 +23,7 @@ exports.assertPointerImportPath = 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)
 const acorn_1 = require("acorn");
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function transformPointerImports(code, filePathToShowToUser2, pointerImports, 
 // For ./transformPointerImports.spec.ts

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePointerImport = resolvePointerImport;
 exports.resolvePointerImportData = resolvePointerImportData;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const pointerImports_js_1 = require("./pointerImports.js");
-const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
+const getFilePath_js_1 = require("../getFilePath.js");
 function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {
     if (typeof configValue !== 'string')
         return null;

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

@@ -12,10 +12,10 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const import_1 = require("@brillout/import");
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../../utils.js");
 const pointerImports_js_1 = require("./pointerImports.js");
 const source_map_support_1 = __importDefault(require("source-map-support"));
-const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
+const getFilePath_js_1 = require("../getFilePath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 installSourceMapSupport();
 const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');

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

@@ -3,178 +3,203 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVikeConfig = getVikeConfig;
-exports.getVikeConfigOptional = getVikeConfigOptional;
-exports.getVikeConfig2 = getVikeConfig2;
+exports.getVikeConfigInternal = getVikeConfigInternal;
+exports.getVikeConfigInternalOptional = getVikeConfigInternalOptional;
+exports.getVikeConfigInternalSync = getVikeConfigInternalSync;
+exports.setVikeConfigContext = setVikeConfigContext;
 exports.reloadVikeConfig = reloadVikeConfig;
 exports.isV1Design = isV1Design;
 exports.getConfVal = getConfVal;
 exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
 exports.getVikeConfigFromCliOrEnv = getVikeConfigFromCliOrEnv;
 exports.isOverriden = isOverriden;
-const utils_js_1 = require("../../../utils.js");
-const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
-const filesystemRouting_js_1 = require("./getVikeConfig/filesystemRouting.js");
-const isVikeConfigInvalid_js_1 = require("../../../../runtime/renderPage/isVikeConfigInvalid.js");
-const globalContext_js_1 = require("../../../../runtime/globalContext.js");
-const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
-const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
+exports.getVikeConfig = getVikeConfig;
+const utils_js_1 = require("../utils.js");
+const configDefinitionsBuiltIn_js_1 = require("./resolveVikeConfigInternal/configDefinitionsBuiltIn.js");
+const filesystemRouting_js_1 = require("./resolveVikeConfigInternal/filesystemRouting.js");
+const globalContext_js_1 = require("../../runtime/globalContext.js");
+const loggerNotProd_js_1 = require("./loggerNotProd.js");
+const removeSuperfluousViteLog_js_1 = require("./loggerVite/removeSuperfluousViteLog.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getConfigDefinedAt_js_1 = require("../../../../../shared/page-configs/getConfigDefinedAt.js");
-const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.js");
-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 getUserFriendlyConfigs_js_1 = require("../../../../../shared/page-configs/getUserFriendlyConfigs.js");
-const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const getPlusFilesAll_js_1 = require("./getVikeConfig/getPlusFilesAll.js");
-const getEnvVarObject_js_1 = require("../../../shared/getEnvVarObject.js");
-const context_js_1 = require("../../../../api/context.js");
-const context_js_2 = require("../../../../cli/context.js");
+const getConfigDefinedAt_js_1 = require("../../../shared/page-configs/getConfigDefinedAt.js");
+const loadFileAtConfigTime_js_1 = require("./resolveVikeConfigInternal/loadFileAtConfigTime.js");
+const resolvePointerImport_js_1 = require("./resolveVikeConfigInternal/resolvePointerImport.js");
+const getFilePath_js_1 = require("./getFilePath.js");
+const getConfigValueBuildTime_js_1 = require("../../../shared/page-configs/getConfigValueBuildTime.js");
+const resolveVikeConfigPublic_js_1 = require("../../../shared/page-configs/resolveVikeConfigPublic.js");
+const serializeConfigValues_js_1 = require("../../../shared/page-configs/serialize/serializeConfigValues.js");
+const getPlusFilesAll_js_1 = require("./resolveVikeConfigInternal/getPlusFilesAll.js");
+const getEnvVarObject_js_1 = require("./getEnvVarObject.js");
+const context_js_1 = require("../../api/context.js");
+const context_js_2 = require("../../cli/context.js");
+const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
+const getProxyForPublicUsage_js_1 = require("../../../shared/getProxyForPublicUsage.js");
+const renderPage_js_1 = require("../../runtime/renderPage.js");
 (0, utils_js_1.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)
 (0, utils_js_1.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() {
+    (0, utils_js_1.assert)(vikeConfigCtx);
+    const { userRootDir, vikeVitePluginOptions } = vikeConfigCtx;
     (0, utils_js_1.assert)(vikeVitePluginOptions);
-    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
-    handleReloadSideEffects();
+    resolveVikeConfigInternal_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
 }
-async function handleReloadSideEffects() {
-    wasConfigInvalid = !!isVikeConfigInvalid_js_1.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);
-        (0, utils_js_1.assert)(false);
-    }
-    if (vikeConfigPromise !== vikeConfigPromisePrevious) {
-        // Let the next handleReloadSideEffects() call handle side effects
-        return;
-    }
-    if (!isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
-        if (wasConfigInvalid) {
-            wasConfigInvalid = false;
-            (0, loggerNotProd_js_1.logConfigErrorRecover)();
-        }
-        if (restartVite) {
-            restartVite = false;
-            const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
-            (0, utils_js_1.assert)(viteDevServer);
-            (0, removeSuperfluousViteLog_js_1.removeSuperfluousViteLog_enable)();
-            await viteDevServer.restart(true);
-            (0, removeSuperfluousViteLog_js_1.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) {
+    (0, utils_js_1.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;
-    (0, utils_js_1.assert)(vikeVitePluginOptions);
-    const isDev = config._isDev;
-    (0, utils_js_1.assert)(typeof isDev === 'boolean');
-    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError ?? false);
+// TODO/v1-release: remove
+function getVikeConfigInternalSync() {
+    (0, utils_js_1.assert)(vikeConfigSync);
+    return vikeConfigSync;
 }
-async function getVikeConfig2(userRootDir, isDev, vikeVitePluginOptions) {
-    (0, utils_js_1.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();
+    (0, utils_js_1.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 = (0, getProxyForPublicUsage_js_1.getProxyForPublicUsage)(vikeConfig, 'vikeConfig');
+    return vikeConfigPublic;
 }
-async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
+function setVikeConfigContext(vikeConfigCtx_) {
+    // If the user changes Vite's `config.root` => Vite completely reloads itself => setVikeConfigContext() is called again
+    vikeConfigCtx = vikeConfigCtx_;
+}
+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;
+    (0, utils_js_1.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;
-    (0, utils_js_1.assert)(vikeConfig);
-    const { pageConfigs } = vikeConfig;
-    const isV1Design = pageConfigs.length > 0;
-    return isV1Design;
+function isV1Design() {
+    (0, utils_js_1.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 } = (0, utils_js_1.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) {
         (0, utils_js_1.assert)(ret);
         (0, utils_js_1.assert)(err === undefined);
-        (0, isVikeConfigInvalid_js_1.isVikeConfigInvalid_set)(false);
-        return ret;
+        const hadError = vikeConfigHasBuildError;
+        vikeConfigHasBuildError = false;
+        (0, renderPage_js_1.renderPage_vikeConfigHasError)({ hasBuildError: false });
+        if (hadError) {
+            (0, loggerNotProd_js_1.logConfigErrorRecover)();
+            if (restartVite) {
+                restartVite = false;
+                restartViteDevServer();
+            }
+        }
+        resolve(ret);
     }
     else {
         (0, utils_js_1.assert)(ret === undefined);
         (0, utils_js_1.assert)(err);
-        (0, isVikeConfigInvalid_js_1.isVikeConfigInvalid_set)({ err });
+        vikeConfigHasBuildError = true;
+        (0, renderPage_js_1.renderPage_vikeConfigHasError)({ hasBuildError: { err } });
+        if (!doNotRestartViteOnError)
+            restartVite = true;
         if (!isDev) {
-            (0, utils_js_1.assert)((0, globalContext_js_1.getViteDevServer)() === null);
-            throw err;
+            reject(err);
         }
         else {
             (0, loggerNotProd_js_1.logConfigError)(err);
-            if (!doNotRestartViteOnError) {
-                restartVite = true;
-            }
-            const dummyData = {
-                pageConfigs: [],
-                pageConfigGlobal: {
-                    configDefinitions: {},
-                    configValueSources: {}
-                },
-                global: (0, getUserFriendlyConfigs_js_1.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 (0, getPlusFilesAll_js_1.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 = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsGlobal)({ pageConfigGlobalValues });
+    const vikeConfigPublicGlobal = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({ pageConfigGlobalValues });
     // pages
-    const userFriendlyConfigsPageEager = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
+    const vikeConfigPublicPagesEager = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
         const pageConfigValues = getConfigValues(pageConfig, true);
-        return (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageEager)(pageConfigGlobalValues, pageConfig, pageConfigValues);
+        return (0, resolveVikeConfigPublic_js_1.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)
@@ -1086,3 +1111,56 @@ function isOverriden(source, configName, pageConfig) {
     (0, utils_js_1.assert)(idx >= 0);
     return idx > 0;
 }
+function resolvePrerenderContext(vikeConfig) {
+    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = (0, resolvePrerenderConfig_js_1.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 = (0, globalContext_js_1.getViteDevServer)();
+    (0, utils_js_1.assert)(viteDevServer);
+    (0, removeSuperfluousViteLog_js_1.removeSuperfluousViteLog_enable)();
+    (async () => {
+        try {
+            await viteDevServer.restart(true);
+        }
+        catch (err) {
+            console.error('Vite restart error:');
+            console.error(err);
+        }
+    })();
+    (0, removeSuperfluousViteLog_js_1.removeSuperfluousViteLog_disable)();
+}
+function getVikeConfigDummy(esbuildCache) {
+    const globalDummy = (0, resolveVikeConfigPublic_js_1.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;
+}

package/dist/cjs/shared/createGlobalContextShared.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextSyncErrMsg = void 0;
 exports.createGlobalContextShared = createGlobalContextShared;
 const utils_js_1 = require("./utils.js");
-const parseGlobResults_js_1 = require("./getPageFiles/parseGlobResults.js");
-const getUserFriendlyConfigs_js_1 = require("./page-configs/getUserFriendlyConfigs.js");
+const parseVirtualFileExports_js_1 = require("./getPageFiles/parseVirtualFileExports.js");
+const resolveVikeConfigPublic_js_1 = require("./page-configs/resolveVikeConfigPublic.js");
 const execHook_js_1 = require("./hooks/execHook.js");
 const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextForPublicUsage.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
@@ -36,7 +36,7 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
     return globalObject.globalContext;
 }
 function createGlobalContextBase(virtualFileExports) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, userFriendlyConfigsGlobal, userFriendlyConfigsPageEager } = getConfigsAll(virtualFileExports);
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager } = getConfigsAll(virtualFileExports);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -50,29 +50,29 @@ function createGlobalContextBase(virtualFileExports) {
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _allPageIds: allPageIds,
-        _userFriendlyConfigsGlobal: userFriendlyConfigsGlobal,
-        config: userFriendlyConfigsGlobal.config,
-        pages: userFriendlyConfigsPageEager
+        _vikeConfigPublicGlobal: vikeConfigPublicGlobal,
+        config: vikeConfigPublicGlobal.config,
+        pages: vikeConfigPublicPagesEager
     };
     (0, utils_js_1.changeEnumerable)(globalContext, '_isOriginalObject', false);
     return globalContext;
 }
 function getConfigsAll(virtualFileExports) {
-    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseGlobResults_js_1.parseGlobResults)(virtualFileExports);
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExports_js_1.parseVirtualFileExports)(virtualFileExports);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
-    const userFriendlyConfigsGlobal = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsGlobal)({
+    const vikeConfigPublicGlobal = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({
         pageConfigGlobalValues: pageConfigGlobal.configValues
     });
-    const userFriendlyConfigsPageEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        return (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+    const vikeConfigPublicPagesEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
     }));
     return {
         pageFilesAll,
         allPageIds,
         pageConfigs,
         pageConfigGlobal,
-        userFriendlyConfigsGlobal,
-        userFriendlyConfigsPageEager
+        vikeConfigPublicGlobal,
+        vikeConfigPublicPagesEager
     };
 }
 function getAllPageIds(pageFilesAll, pageConfigs) {