vike 0.4.216 → 0.4.217

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

@@ -0,0 +1,128 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveVikeConfigGlobal = resolveVikeConfigGlobal;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const utils_js_1 = require("../../../../utils.js");
+function resolveVikeConfigGlobal(vikeVitePluginOptions, pageConfigGlobalValues) {
+    // TODO/v1-release: remove
+    assertVikeConfigGlobal(vikeVitePluginOptions, ({ prop, errMsg }) => `vite.config.js > vike option ${prop} ${errMsg}`);
+    const configs = [vikeVitePluginOptions];
+    assertVikeConfigGlobal(pageConfigGlobalValues, ({ prop, errMsg }) => {
+        // Can we add the config file path ?
+        return `config ${picocolors_1.default.cyan(prop)} ${errMsg}`;
+    });
+    configs.push(pageConfigGlobalValues);
+    const vikeConfigGlobal = {
+        disableAutoFullBuild: pickFirst(configs.map((c) => c.disableAutoFullBuild)) ?? null,
+        prerender: resolvePrerenderOptions(configs),
+        includeAssetsImportedByServer: pickFirst(configs.map((c) => c.includeAssetsImportedByServer)) ?? true,
+        baseServer: pickFirst(configs.map((c) => c.baseServer)) ?? null,
+        baseAssets: pickFirst(configs.map((c) => c.baseAssets)) ?? null,
+        redirects: merge(configs.map((c) => c.redirects)) ?? {},
+        disableUrlNormalization: pickFirst(configs.map((c) => c.disableUrlNormalization)) ?? false,
+        trailingSlash: pickFirst(configs.map((c) => c.trailingSlash)) ?? false,
+        crawl: {
+            git: vikeVitePluginOptions.crawl?.git ?? null
+        }
+    };
+    return vikeConfigGlobal;
+}
+function resolvePrerenderOptions(configs) {
+    if (!configs.some((c) => c.prerender)) {
+        return false;
+    }
+    const configsPrerender = configs.map((c) => c.prerender).filter(isObject2);
+    return {
+        partial: pickFirst(configsPrerender.map((c) => c.partial)) ?? false,
+        noExtraDir: pickFirst(configsPrerender.map((c) => c.noExtraDir)) ?? false,
+        parallel: pickFirst(configsPrerender.map((c) => c.parallel)) ?? true,
+        disableAutoRun: pickFirst(configsPrerender.map((c) => c.disableAutoRun)) ?? false
+    };
+}
+function isObject2(p) {
+    return typeof p === 'object';
+}
+function merge(objs) {
+    const obj = {};
+    objs.forEach((e) => {
+        Object.assign(obj, e);
+    });
+    return obj;
+}
+function pickFirst(arr) {
+    return arr.filter((v) => v !== undefined)[0];
+}
+function assertVikeConfigGlobal(vikeConfigGlobal, wrongUsageMsg) {
+    const wrongUsageError = check(vikeConfigGlobal);
+    if (wrongUsageError) {
+        (0, utils_js_1.assertUsage)(false, wrongUsageMsg(wrongUsageError));
+    }
+}
+function check(vikeConfigGlobal) {
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(vikeConfigGlobal));
+    {
+        const prop = 'disableUrlNormalization';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be a boolean' };
+    }
+    {
+        const prop = 'trailingSlash';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be a boolean' };
+    }
+    {
+        const prop = 'redirects';
+        const { redirects } = vikeConfigGlobal;
+        if (!(redirects === undefined ||
+            ((0, utils_js_1.isObject)(redirects) && Object.values(redirects).every((v) => typeof v === 'string'))))
+            return { prop, errMsg: 'should be an object of strings' };
+    }
+    {
+        const prop = 'disableAutoFullBuild';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') &&
+            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined') &&
+            !(vikeConfigGlobal[prop] === 'prerender'))
+            return { prop, errMsg: "should be a boolean or 'prerender'" };
+    }
+    {
+        const prop = 'includeAssetsImportedByServer';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') && !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be a boolean' };
+    }
+    {
+        const prop = 'prerender';
+        if (!(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'object') &&
+            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'boolean') &&
+            !(0, utils_js_1.hasProp)(vikeConfigGlobal, prop, 'undefined'))
+            return { prop, errMsg: 'should be an object or a boolean' };
+    }
+    const configVikePrerender = vikeConfigGlobal.prerender;
+    if (typeof configVikePrerender === 'object') {
+        {
+            const p = 'partial';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
+        }
+        {
+            const p = 'noExtraDir';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
+        }
+        {
+            const p = 'disableAutoRun';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') && !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean' };
+        }
+        {
+            const p = 'parallel';
+            if (!(0, utils_js_1.hasProp)(configVikePrerender, p, 'boolean') &&
+                !(0, utils_js_1.hasProp)(configVikePrerender, p, 'number') &&
+                !(0, utils_js_1.hasProp)(configVikePrerender, p, 'undefined'))
+                return { prop: `prerender.${p}`, errMsg: 'should be a boolean or a number' };
+        }
+    }
+    return null;
+}

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vikeConfigDependencies = void 0;
 exports.getVikeConfig = getVikeConfig;
+exports.getVikeConfig2 = getVikeConfig2;
 exports.reloadVikeConfig = reloadVikeConfig;
 exports.isVikeConfigFile = isVikeConfigFile;
 exports.isV1Design = isV1Design;
@@ -26,18 +27,21 @@ const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.
 const resolvePointerImport_js_1 = require("./getVikeConfig/resolvePointerImport.js");
 const getFilePath_js_1 = require("../../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const assertExtensions_js_1 = require("./assertExtensions.js");
+const resolveVikeConfigGlobal_js_1 = require("./getVikeConfig/resolveVikeConfigGlobal.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-let devServerIsCorrupt = false;
+let restartVite = false;
 let wasConfigInvalid = null;
 let vikeConfigPromise = null;
 const vikeConfigDependencies = new Set();
 exports.vikeConfigDependencies = vikeConfigDependencies;
-function reloadVikeConfig(userRootDir, outDirRoot) {
+function reloadVikeConfig(config) {
+    const userRootDir = config.root;
+    const vikeVitePluginOptions = config._vikeVitePluginOptions;
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
     vikeConfigDependencies.clear();
     (0, resolvePointerImport_js_1.clearFilesEnvMap)();
-    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, true, true);
+    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
 }
 async function handleReloadSideEffects() {
@@ -61,8 +65,8 @@ async function handleReloadSideEffects() {
             wasConfigInvalid = false;
             (0, loggerNotProd_js_1.logConfigErrorRecover)();
         }
-        if (devServerIsCorrupt) {
-            devServerIsCorrupt = false;
+        if (restartVite) {
+            restartVite = false;
             const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
             (0, utils_js_1.assert)(viteDevServer);
             (0, removeSuperfluousViteLog_js_1.removeSuperfluousViteLog_enable)();
@@ -71,23 +75,31 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, { crawlWithGit, tolerateInvalidConfig } = {}) {
-    const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
+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);
+}
+async function getVikeConfig2(userRootDir, isDev, vikeVitePluginOptions) {
+    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, false);
+}
+async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     if (!vikeConfigPromise) {
-        const crawlWithGit_ = crawlWithGit !== undefined ? crawlWithGit : (await (0, getConfigVike_js_1.getConfigVike)(config)).crawl.git;
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit_, tolerateInvalidConfig);
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     }
     return await vikeConfigPromise;
 }
-async function isV1Design(config, isDev) {
-    const vikeConfig = await getVikeConfig(config, isDev);
+async function isV1Design(config) {
+    const vikeConfig = await getVikeConfig(config);
     const { pageConfigs } = vikeConfig;
     const isV1Design = pageConfigs.length > 0;
     return isV1Design;
 }
-async function loadInterfaceFiles(userRootDir, outDirRoot, crawlWithGit) {
-    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, crawlWithGit);
+async function loadInterfaceFiles(userRootDir, crawlWithGit) {
+    const plusFiles = await findPlusFiles(userRootDir, null, crawlWithGit);
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
@@ -196,12 +208,12 @@ function assertAllConfigsAreKnown(interfaceFilesByLocationId) {
         });
     });
 }
-async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit, tolerateInvalidConfig) {
+async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     let hasError = false;
     let ret;
     let err;
     try {
-        ret = await loadVikeConfig(userRootDir, outDirRoot, crawlWithGit);
+        ret = await loadVikeConfig(userRootDir, vikeVitePluginOptions);
     }
     catch (err_) {
         hasError = true;
@@ -223,8 +235,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
         }
         else {
             (0, loggerNotProd_js_1.logConfigError)(err);
-            if (!tolerateInvalidConfig) {
-                devServerIsCorrupt = true;
+            if (!doNotRestartViteOnError) {
+                restartVite = true;
             }
             const dummyData = {
                 pageConfigs: [],
@@ -232,16 +244,18 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                globalVikeConfig: {}
+                vikeConfigGlobal: (0, resolveVikeConfigGlobal_js_1.resolveVikeConfigGlobal)({}, {})
             };
             return dummyData;
         }
     }
 }
-async function loadVikeConfig(userRootDir, outDirRoot, crawlWithGit) {
-    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, crawlWithGit);
+async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
+    const crawlWithGit = (0, resolveVikeConfigGlobal_js_1.resolveVikeConfigGlobal)(vikeVitePluginOptions, {}).crawl.git ?? null;
+    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, crawlWithGit);
     const importedFilesLoaded = {};
-    const { globalVikeConfig, pageConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
+    const { pageConfigGlobal, pageConfigGlobalValues } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
+    const vikeConfigGlobal = (0, resolveVikeConfigGlobal_js_1.resolveVikeConfigGlobal)(vikeVitePluginOptions, pageConfigGlobalValues);
     const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
         .filter(([_pageId, interfaceFiles]) => isDefiningPage(interfaceFiles))
         .map(async ([locationId]) => {
@@ -291,7 +305,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, crawlWithGit) {
         return pageConfig;
     }));
     assertPageConfigs(pageConfigs);
-    return { pageConfigs, pageConfigGlobal, globalVikeConfig };
+    return { pageConfigs, pageConfigGlobal, vikeConfigGlobal };
 }
 // TODO/soon: refactor
 //  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
@@ -401,7 +415,7 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
             });
         });
     }
-    const globalVikeConfig = {};
+    const pageConfigGlobalValues = {};
     const pageConfigGlobal = {
         configDefinitions: configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal,
         configValueSources: {}
@@ -421,10 +435,10 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
                 return;
             const { filePathToShowToUser } = configValueSource.definedAtFilePath;
             (0, utils_js_1.assertWarning)(false, `Being able to define config ${picocolors_1.default.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${picocolors_1.default.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
-            globalVikeConfig[configName] = configValueSource.value;
+            pageConfigGlobalValues[configName] = configValueSource.value;
         }
     }));
-    return { pageConfigGlobal, globalVikeConfig };
+    return { pageConfigGlobal, pageConfigGlobalValues };
 }
 async function resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded) {
     const sourcesInfo = [];

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

@@ -8,7 +8,6 @@ const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.j
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
@@ -21,11 +20,11 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     }
     */
     const { pageId, isForClientSide } = result;
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
+    const { pageConfigs } = vikeConfig;
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig, { id, pageId });
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, configVike.includeAssetsImportedByServer, isDev);
+    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }

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

@@ -7,7 +7,7 @@ const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
-    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
+    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {

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

@@ -12,7 +12,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const index_js_1 = require("./devConfig/index.js");
 function previewConfig() {
     let config;
-    // let configVike: ConfigVikeResolved
+    // let vikeConfigGlobal: VikeConfigGlobal
     return {
         name: 'vike:previewConfig',
         apply: utils_js_1.applyPreview,
@@ -27,7 +27,8 @@ function previewConfig() {
         async configResolved(config_) {
             config = config_;
             (0, index_js_1.logDockerHint)(config.preview.host);
-            // configVike = await getConfigVike(config)
+            // const vikeConfig = await getVikeConfig(config)
+            // vikeConfigGlobal = vikeConfig.vikeConfigGlobal
         },
         configurePreviewServer(server) {
             /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
@@ -37,7 +38,7 @@ function previewConfig() {
             return () => {
                 assertDist();
                 /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.
-                if (!configVike.prerender || configVike.prerender.partial) {
+                if (!vikeConfigGlobal.prerender || vikeConfigGlobal.prerender.partial) {
                   addSsrMiddleware(server.middlewares, config, true)
                 }
                 /*/

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 function setGlobalContext() {
     return [
         {
@@ -32,10 +33,12 @@ function setGlobalContext() {
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
                     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
                     (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
+                    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                    (0, globalContext_js_1.setGlobalContext_vikeConfig)(vikeConfig);
                 }
             }
         }

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

@@ -39,7 +39,6 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const os_1 = require("os");
 const globalContext_js_1 = require("../runtime/globalContext.js");
 const vite_1 = require("vite");
-const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
@@ -99,10 +98,10 @@ async function runPrerender(options = {}, standaloneTrigger) {
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
     assertLoadedConfig(viteConfig, options);
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = configVike.prerender;
+    const prerenderConfig = vikeConfig.vikeConfigGlobal.prerender;
     if (!prerenderConfig) {
         (0, utils_js_1.assert)(standaloneTrigger);
         (0, utils_js_1.assertWarning)(prerenderConfig, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but the config ${picocolors_1.default.cyan('prerender')} isn't set to true`, {
@@ -122,7 +121,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
         pageContextInit: options.pageContextInit ?? null
     });
     const doNotPrerenderList = [];
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig, false);
     await collectDoNoPrerenderList(renderContext, vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit);
     await callOnBeforePrerenderStartHooks(prerenderContext, renderContext, concurrencyLimit, doNotPrerenderList);
     await handlePagesWithStaticRoutes(prerenderContext, renderContext, doNotPrerenderList, concurrencyLimit);

package/dist/cjs/node/runtime/globalContext.js

@@ -14,16 +14,17 @@ exports.initGlobalContext_runPrerender = initGlobalContext_runPrerender;
 exports.initGlobalContext_getGlobalContextAsync = initGlobalContext_getGlobalContextAsync;
 exports.setGlobalContext_viteDevServer = setGlobalContext_viteDevServer;
 exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
+exports.setGlobalContext_vikeConfig = setGlobalContext_vikeConfig;
 exports.setGlobalContext_isViteDev = setGlobalContext_isViteDev;
 exports.setGlobalContext_isPrerendering = setGlobalContext_isPrerendering;
 const utils_js_1 = require("./utils.js");
 const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
-const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getPageFilesExports_js_1 = require("./page-files/getPageFilesExports.js");
+const resolveBase_js_1 = require("../shared/resolveBase.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', (() => {
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
     return {
@@ -88,6 +89,12 @@ function setGlobalContext_viteConfig(viteConfig, outDirRoot) {
     globalObject.viteConfig = viteConfig;
     globalObject.outDirRoot = outDirRoot;
 }
+function setGlobalContext_vikeConfig(vikeConfig) {
+    if (globalObject.vikeConfig)
+        return;
+    assertIsNotInitilizedYet();
+    globalObject.vikeConfig = vikeConfig;
+}
 function assertIsNotInitilizedYet() {
     // In develpoment, globalObject.viteDevServer always needs to be awaited for before initializing globalObject.globalContext
     (0, utils_js_1.assert)(!globalObject.globalContext);
@@ -141,14 +148,15 @@ async function initGlobalContext(isProduction) {
         (0, utils_js_1.assert)(globalObject.globalContext.isPrerendering === (globalObject.isPrerendering ?? false));
         return;
     }
-    const { viteDevServer, viteConfig, isPrerendering } = globalObject;
+    const { viteDevServer, viteConfig, vikeConfig, isPrerendering } = globalObject;
     (0, utils_js_1.onSetupRuntime)();
     if (!isProduction) {
         (0, utils_js_1.assert)(viteConfig);
+        (0, utils_js_1.assert)(vikeConfig);
         (0, utils_js_1.assert)(viteDevServer);
         (0, utils_js_1.assert)(!isPrerendering);
-        const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
-        const pluginManifest = getRuntimeManifest(configVike);
+        const vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
+        const pluginManifest = getRuntimeManifest(vikeConfigGlobal, viteConfig);
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
@@ -156,6 +164,7 @@ async function initGlobalContext(isProduction) {
             pluginManifest: null,
             viteDevServer,
             viteConfig,
+            vikeConfig,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
@@ -185,8 +194,6 @@ async function initGlobalContext(isProduction) {
         };
         if (isPrerendering) {
             (0, utils_js_1.assert)(viteConfig);
-            const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
-            (0, utils_js_1.assert)(configVike);
             (0, utils_js_1.objectAssign)(globalContext, {
                 isPrerendering: true,
                 viteConfig
@@ -202,8 +209,9 @@ async function initGlobalContext(isProduction) {
         }
     }
 }
-function getRuntimeManifest(configVike) {
-    const { includeAssetsImportedByServer, baseServer, baseAssets, redirects, trailingSlash, disableUrlNormalization } = configVike;
+function getRuntimeManifest(vikeConfigGlobal, viteConfig) {
+    const { includeAssetsImportedByServer, redirects, trailingSlash, disableUrlNormalization } = vikeConfigGlobal;
+    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfigGlobal.baseServer, vikeConfigGlobal.baseAssets, viteConfig);
     const manifest = {
         baseServer,
         baseAssets,

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

@@ -126,7 +126,7 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { url
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
-        // The following is defined on `pageContext` because we can eventually make these non-global (e.g. sot that two pages can have different includeAssetsImportedByServer settings)
+        // The following is defined on `pageContext` because we can eventually make these non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
         _includeAssetsImportedByServer: globalContext.includeAssetsImportedByServer,

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

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveBase = resolveBase;
+exports.resolveBaseFromResolvedConfig = resolveBaseFromResolvedConfig;
+const utils_js_1 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
+    let baseViteOriginal = config._baseViteOriginal;
+    if (baseViteOriginal === '/__UNSET__')
+        baseViteOriginal = null;
+    (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
+    return resolveBase(baseViteOriginal, baseServer, baseAssets);
+}
+function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
+    {
+        const wrongBase = (val) => `should start with ${picocolors_1.default.cyan('/')}, ${picocolors_1.default.cyan('http://')}, or ${picocolors_1.default.cyan('https://')} (it's ${picocolors_1.default.cyan(val)} instead)`;
+        (0, utils_js_1.assertUsage)(baseViteOriginal === null || (0, utils_js_1.isBaseAssets)(baseViteOriginal), `vite.config.js#base ${wrongBase(baseViteOriginal)}`);
+        (0, utils_js_1.assertUsage)(baseAssetsUnresolved === null || (0, utils_js_1.isBaseAssets)(baseAssetsUnresolved), `Config ${picocolors_1.default.cyan('baseAssets')} ${wrongBase(baseAssetsUnresolved)}`);
+        (0, utils_js_1.assertUsage)(baseServerUnresolved === null || baseServerUnresolved.startsWith('/'), `Config ${picocolors_1.default.cyan('baseServer')} should start with a leading slash ${picocolors_1.default.cyan('/')} (it's ${picocolors_1.default.cyan(String(baseServerUnresolved))} instead)`);
+    }
+    if (baseViteOriginal) {
+        if (baseViteOriginal.startsWith('http')) {
+            baseAssetsUnresolved = baseAssetsUnresolved ?? baseViteOriginal;
+        }
+        else {
+            baseAssetsUnresolved = baseAssetsUnresolved ?? baseViteOriginal;
+            baseServerUnresolved = baseServerUnresolved ?? baseViteOriginal;
+        }
+    }
+    const baseServer = baseServerUnresolved ?? '/';
+    const baseAssets = baseAssetsUnresolved ?? '/';
+    (0, utils_js_1.assert)((0, utils_js_1.isBaseAssets)(baseAssets));
+    (0, utils_js_1.assert)((0, utils_js_1.isBaseServer)(baseServer));
+    return {
+        baseServer,
+        baseAssets
+    };
+}

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.216';
+exports.PROJECT_VERSION = '0.4.217';

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

@@ -7,13 +7,15 @@ import { build as buildVite } from 'vite';
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigEnhanced, configVike } = await prepareViteApiCall(options.viteConfig, 'build');
+    const { viteConfigEnhanced, vikeConfigGlobal } = await prepareViteApiCall(options.viteConfig, 'build');
     // Build client-side
     const outputClient = await buildVite(viteConfigEnhanced);
     // Build server-side
     const outputServer = await buildVite(setSSR(viteConfigEnhanced));
     // Pre-render
-    if (configVike.prerender && !configVike.prerender.disableAutoRun && configVike.disableAutoFullBuild !== 'prerender') {
+    if (vikeConfigGlobal.prerender &&
+        !vikeConfigGlobal.prerender.disableAutoRun &&
+        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
         const { runPrerenderFromAutoRun } = await import('../prerender/runPrerender.js');
         await runPrerenderFromAutoRun(viteConfigEnhanced, true);
     }

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

@@ -3,5 +3,5 @@ import type { InlineConfig } from 'vite';
 import type { Operation } from './types.js';
 declare function prepareViteApiCall(viteConfig: InlineConfig | undefined, operation: Operation): Promise<{
     viteConfigEnhanced: InlineConfig;
-    configVike: import("../../shared/ConfigVike.js").ConfigVikeResolved;
+    vikeConfigGlobal: import("../plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js").VikeConfigGlobal;
 }>;

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

@@ -1,8 +1,8 @@
 export { prepareViteApiCall };
 import { resolveConfig } from 'vite';
-import { getConfigVike } from '../shared/getConfigVike.js';
 import { pluginName } from '../plugin/plugins/commonConfig/pluginName.js';
 import { setOperation } from './context.js';
+import { getVikeConfig2 } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 async function prepareViteApiCall(viteConfig = {}, operation) {
     setOperation(operation);
     return enhanceViteConfig(viteConfig, operation);
@@ -20,13 +20,23 @@ async function enhanceViteConfig(viteConfig = {}, operation) {
         };
         viteConfigResolved = await resolveViteConfig(viteConfigEnhanced, operation);
     }
-    const configVike = await getConfigVike(viteConfigResolved);
+    // TODO: use loadConfigFromFile() instead of viteConfigResolved
+    const { vikeConfigGlobal } = await getVikeConfig2(viteConfigResolved.root, operation === 'dev', viteConfigResolved._vikeVitePluginOptions);
     // TODO: enable Vike extensions to add Vite plugins
     return {
         viteConfigEnhanced,
-        configVike
+        vikeConfigGlobal
     };
 }
 async function resolveViteConfig(viteConfig, operation) {
-    return await resolveConfig(viteConfig, operation === 'build' || operation === 'prerender' ? 'build' : 'serve', 'custom', operation === 'dev' ? 'development' : 'production', operation === 'preview');
+    const args = getResolveConfigArgs(viteConfig, operation);
+    return await resolveConfig(...args);
+}
+function getResolveConfigArgs(viteConfig, operation) {
+    const inlineConfig = viteConfig;
+    const command = operation === 'build' || operation === 'prerender' ? 'build' : 'serve';
+    const defaultMode = operation === 'dev' ? 'development' : 'production';
+    const defaultNodeEnv = defaultMode;
+    const isPreview = operation === 'preview';
+    return [inlineConfig, command, defaultMode, defaultNodeEnv, isPreview];
 }

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

@@ -1,7 +1,7 @@
 export default plugin;
 export { plugin };
 export { plugin as ssr };
-export type { ConfigVikeUserProvided as UserConfig };
+export type { VikeVitePluginOptions as UserConfig };
 export { PROJECT_VERSION as version } from './utils.js';
-import type { ConfigVikeUserProvided } from '../../shared/ConfigVike.js';
-declare function plugin(vikeConfig?: ConfigVikeUserProvided): any;
+import type { VikeVitePluginOptions } from './plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
+declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): any;