vike 0.4.216 → 0.4.217

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

@@ -32,13 +32,15 @@ const vite_1 = require("vite");
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigEnhanced, configVike } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
+    const { viteConfigEnhanced, vikeConfigGlobal } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
     // Build client-side
     const outputClient = await (0, vite_1.build)(viteConfigEnhanced);
     // Build server-side
     const outputServer = await (0, vite_1.build)(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 Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
         await runPrerenderFromAutoRun(viteConfigEnhanced, true);
     }

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

@@ -25,9 +25,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareViteApiCall = prepareViteApiCall;
 const vite_1 = require("vite");
-const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const pluginName_js_1 = require("../plugin/plugins/commonConfig/pluginName.js");
 const context_js_1 = require("./context.js");
+const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 async function prepareViteApiCall(viteConfig = {}, operation) {
     (0, context_js_1.setOperation)(operation);
     return enhanceViteConfig(viteConfig, operation);
@@ -45,13 +45,23 @@ async function enhanceViteConfig(viteConfig = {}, operation) {
         };
         viteConfigResolved = await resolveViteConfig(viteConfigEnhanced, operation);
     }
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfigResolved);
+    // TODO: use loadConfigFromFile() instead of viteConfigResolved
+    const { vikeConfigGlobal } = await (0, getVikeConfig_js_1.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 (0, vite_1.resolveConfig)(viteConfig, operation === 'build' || operation === 'prerender' ? 'build' : 'serve', 'custom', operation === 'dev' ? 'development' : 'production', operation === 'preview');
+    const args = getResolveConfigArgs(viteConfig, operation);
+    return await (0, vite_1.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/cjs/node/plugin/index.js

@@ -18,13 +18,12 @@ const index_js_1 = require("./plugins/devConfig/index.js");
 const packageJsonFile_js_1 = require("./plugins/packageJsonFile.js");
 const removeRequireHookPlugin_js_1 = require("./plugins/removeRequireHookPlugin.js");
 const index_js_2 = require("./plugins/importUserCode/index.js");
-const index_js_3 = require("./plugins/config/index.js");
 const distFileNames_js_1 = require("./plugins/distFileNames.js");
 const extractAssetsPlugin_js_1 = require("./plugins/extractAssetsPlugin.js");
 const extractExportNamesPlugin_js_1 = require("./plugins/extractExportNamesPlugin.js");
 const suppressRollupWarning_js_1 = require("./plugins/suppressRollupWarning.js");
 const setGlobalContext_js_1 = require("./plugins/setGlobalContext.js");
-const index_js_4 = require("./plugins/importBuild/index.js");
+const index_js_3 = require("./plugins/importBuild/index.js");
 const commonConfig_js_1 = require("./plugins/commonConfig.js");
 const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
@@ -38,10 +37,9 @@ const vite6HmrRegressionWorkaround_js_1 = require("./plugins/vite6HmrRegressionW
 assertViteVersion();
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
-function plugin(vikeConfig) {
+function plugin(vikeVitePluginOptions) {
     const plugins = [
-        (0, index_js_3.resolveVikeConfig)(vikeConfig), // The configResolved() hook of resolveVikeConfig() should be the first called
-        ...(0, commonConfig_js_1.commonConfig)(),
+        ...(0, commonConfig_js_1.commonConfig)(vikeVitePluginOptions),
         (0, index_js_2.importUserCode)(),
         ...(0, index_js_1.devConfig)(),
         ...(0, buildConfig_js_1.buildConfig)(),
@@ -54,8 +52,8 @@ function plugin(vikeConfig) {
         (0, extractExportNamesPlugin_js_1.extractExportNamesPlugin)(),
         (0, suppressRollupWarning_js_1.suppressRollupWarning)(),
         ...(0, setGlobalContext_js_1.setGlobalContext)(),
-        ...(0, index_js_4.importBuild)(),
-        (0, baseUrls_js_1.baseUrls)(vikeConfig),
+        ...(0, index_js_3.importBuild)(),
+        (0, baseUrls_js_1.baseUrls)(vikeVitePluginOptions),
         (0, envVars_js_1.envVarsPlugin)(),
         (0, fileEnv_js_1.fileEnv)(),
         (0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)(),

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

@@ -8,24 +8,25 @@ exports.autoFullBuild = autoFullBuild;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const runPrerender_js_1 = require("../../prerender/runPrerender.js");
-const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const logErrorHint_js_1 = require("../../runtime/renderPage/logErrorHint.js");
 const buildConfig_js_1 = require("./buildConfig.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 let forceExit = false;
 function autoFullBuild() {
     let config;
-    let configVike;
+    let vikeConfigGlobal;
     return [
         {
             name: 'vike:autoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
-                configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
+                const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
+                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
                 config = config_;
-                abortViteBuildSsr(configVike);
+                abortViteBuildSsr(vikeConfigGlobal);
             },
             writeBundle: {
                 /* We can't use this because it breaks Vite's logging. TODO: try again with latest Vite version.
@@ -34,7 +35,7 @@ function autoFullBuild() {
                 */
                 async handler(_options, bundle) {
                     try {
-                        await triggerFullBuild(config, configVike, bundle);
+                        await triggerFullBuild(config, vikeConfigGlobal, bundle);
                     }
                     catch (err) {
                         // Avoid Rollup prefixing the error with [vike:autoFullBuild], for example see https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
@@ -60,10 +61,10 @@ function autoFullBuild() {
         }
     ];
 }
-async function triggerFullBuild(config, configVike, bundle) {
+async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
     if (config.build.ssr)
         return; // already triggered
-    if (isDisabled(configVike))
+    if (isDisabled(vikeConfigGlobal))
         return;
     // Workaround for @vitejs/plugin-legacy
     //  - The legacy plugin triggers its own Rollup build for the client-side.
@@ -94,19 +95,21 @@ async function triggerFullBuild(config, configVike, bundle) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    if (configVike.prerender && !configVike.prerender.disableAutoRun && configVike.disableAutoFullBuild !== 'prerender') {
+    if (vikeConfigGlobal.prerender &&
+        !vikeConfigGlobal.prerender.disableAutoRun &&
+        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
         await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, false);
         forceExit = true;
     }
 }
-function abortViteBuildSsr(configVike) {
-    if (configVike.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
+function abortViteBuildSsr(vikeConfigGlobal) {
+    if (vikeConfigGlobal.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
         (0, utils_js_1.assertWarning)(false, `The CLI call ${picocolors_1.default.cyan('$ vite build --ssr')} is superfluous since ${picocolors_1.default.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${picocolors_1.default.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
 }
-function isDisabled(configVike) {
-    const { disableAutoFullBuild } = configVike;
+function isDisabled(vikeConfigGlobal) {
+    const { disableAutoFullBuild } = vikeConfigGlobal;
     if (disableAutoFullBuild === null || disableAutoFullBuild === 'prerender') {
         return !(0, isViteCliCall_js_1.isViteCliCall)();
     }

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

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseUrls = baseUrls;
-const resolveBase_js_1 = require("../plugins/config/resolveBase.js");
+const resolveBase_js_1 = require("../../shared/resolveBase.js");
 const utils_js_1 = require("../utils.js");
-const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
-function baseUrls(configVike) {
-    let baseServer;
-    let baseAssets;
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+function baseUrls(vikeVitePluginOptions) {
+    let bases;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
         async config(config) {
-            const bases = (0, resolveBase_js_1.resolveBaseFromUserConfig)(config, configVike);
-            baseServer = bases.baseServer;
-            baseAssets = bases.baseAssets;
+            // TODO: fix bug: use getVikeConfig2() and udpate check below
+            bases = resolveBaseFromUserConfig(config, vikeVitePluginOptions);
+            const { baseServer, baseAssets } = bases;
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = baseServer;
             process.env.BASE_ASSETS = baseAssets;
@@ -24,14 +23,16 @@ function baseUrls(configVike) {
                     'BASE_ASSETS'
                 ],
                 base: baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseOriginal: config.base ?? '/__UNSET__' // Vite resolves `_baseOriginal: null` to `undefined`
+                _baseViteOriginal: config.base ?? '/__UNSET__' // Vite resolves `_baseViteOriginal: null` to `undefined`
             };
         },
         async configResolved(config) {
-            const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
+            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+            const { baseServer, baseAssets } = vikeConfig.vikeConfigGlobal;
+            const basesResolved = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(baseServer, baseAssets, config);
             // Ensure that the premature base URL resolving we did in config() isn't erroneous
-            (0, utils_js_1.assert)(configVike.baseServer === baseServer);
-            (0, utils_js_1.assert)(configVike.baseAssets === baseAssets);
+            (0, utils_js_1.assert)(basesResolved.baseServer === bases.baseServer);
+            (0, utils_js_1.assert)(basesResolved.baseAssets === bases.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
              *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
              *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
@@ -40,3 +41,7 @@ function baseUrls(configVike) {
         }
     };
 }
+function resolveBaseFromUserConfig(config, vikeVitePluginOptions) {
+    const baseViteOriginal = config.base ?? null;
+    return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeVitePluginOptions?.baseServer ?? null, vikeVitePluginOptions?.baseAssets ?? null);
+}

package/dist/cjs/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -207,7 +207,7 @@ function fixServerAssets_assertCssTarget_populate(config) {
 async function fixServerAssets_assertCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
-    if (!(await (0, getVikeConfig_js_1.isV1Design)(config, false)))
+    if (!(await (0, getVikeConfig_js_1.isV1Design)(config)))
         return;
     const targetsServer = targets.filter((t) => t.isServerSide);
     const targetsClient = targets.filter((t) => !t.isServerSide);

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

@@ -10,7 +10,6 @@ exports.analyzeClientEntries = analyzeClientEntries;
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const findPageFiles_js_1 = require("../shared/findPageFiles.js");
-const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const module_1 = require("module");
@@ -48,7 +47,7 @@ function buildConfig() {
                     addLogHook();
                     outDirs = (0, utils_js_1.getOutDirs)(config);
                     {
-                        isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
+                        isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config));
                         if (isServerAssetsFixEnabled) {
                             // https://github.com/vikejs/vike/issues/1339
                             config.build.ssrEmitAssets = true;
@@ -117,9 +116,9 @@ function buildConfig() {
     ];
 }
 async function getEntries(config) {
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-    const pageFileEntries = await getPageFileEntries(config, configVike.includeAssetsImportedByServer); // TODO/v1-release: remove
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, false);
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+    const { pageConfigs } = vikeConfig;
+    const pageFileEntries = await getPageFileEntries(config, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer); // TODO/v1-release: remove
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if ((0, utils_js_1.viteIsSSR)(config)) {
         const pageEntries = getPageEntries(pageConfigs);

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

@@ -15,8 +15,21 @@ const pluginName_js_1 = require("./commonConfig/pluginName.js");
 const getEnvVarObject_js_1 = require("../shared/getEnvVarObject.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const context_js_1 = require("../../api/context.js");
-function commonConfig() {
+function commonConfig(vikeVitePluginOptions = {}) {
     return [
+        {
+            name: `${pluginName_js_1.pluginName}:pre`,
+            enforce: 'pre',
+            config: {
+                order: 'pre',
+                handler(_config, env) {
+                    return {
+                        _isDev: (0, utils_js_1.isDevCheck)(env),
+                        _vikeVitePluginOptions: vikeVitePluginOptions
+                    };
+                }
+            }
+        },
         {
             name: pluginName_js_1.pluginName,
             configResolved(config) {

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

@@ -8,9 +8,9 @@ const buildConfig_js_1 = require("../buildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
-async function determineOptimizeDeps(config, isDev) {
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev);
-    const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
+async function determineOptimizeDeps(config) {
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+    const { entries, include } = await getPageDeps(config, pageConfigs);
     {
         // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
         //  - Should we make it work? E.g. by creating a temporary file at node_modules/.vike/virtualFiles.js
@@ -30,7 +30,7 @@ async function determineOptimizeDeps(config, isDev) {
             'config.optimizeDeps.include': config.optimizeDeps.include
         });
 }
-async function getPageDeps(config, pageConfigs, isDev) {
+async function getPageDeps(config, pageConfigs) {
     let entries = [];
     let include = [];
     const addEntry = (e) => {
@@ -69,7 +69,7 @@ async function getPageDeps(config, pageConfigs, isDev) {
     }
     // V0.4 design
     {
-        const pageFiles = await (0, findPageFiles_js_1.findPageFiles)(config, ['.page', '.page.client'], isDev);
+        const pageFiles = await (0, findPageFiles_js_1.findPageFiles)(config, ['.page', '.page.client'], true);
         const userRootDir = config.root;
         pageFiles.forEach((filePathAbsoluteUserRootDir) => {
             const entry = (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir });

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

@@ -63,7 +63,7 @@ function devConfig() {
             },
             async configResolved(config_) {
                 config = config_;
-                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(config, true);
+                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(config);
                 await (0, determineFsAllowList_js_1.determineFsAllowList)(config);
                 if (!(0, isErrorDebug_js_1.isErrorDebug)()) {
                     await (0, getHttpRequestAsyncStore_js_1.installHttpRequestAsyncStore)();

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

@@ -10,7 +10,6 @@ exports.extractAssetsPlugin = extractAssetsPlugin;
 const utils_js_1 = require("../utils.js");
 const virtual_files_js_1 = require("../../shared/virtual-files.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
-const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
@@ -27,7 +26,6 @@ const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = (0, utils_js_1.createDebugger)('vike:extractAssets');
 function extractAssetsPlugin() {
     let config;
-    let configVike;
     let vikeConfig;
     let isServerAssetsFixEnabled;
     return [
@@ -47,7 +45,7 @@ function extractAssetsPlugin() {
                     (0, assertV1Design_js_1.assertV1Design)(vikeConfig.pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
-                (0, utils_js_1.assert)(configVike.includeAssetsImportedByServer);
+                (0, utils_js_1.assert)(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
                 (0, utils_js_1.assert)(!(0, utils_js_1.viteIsSSR_options)(options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
@@ -80,7 +78,7 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(importer)) {
                     return;
                 }
-                (0, utils_js_1.assert)(configVike.includeAssetsImportedByServer);
+                (0, utils_js_1.assert)(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
                 let resolution = null;
                 try {
                     resolution = await this.resolve(source, importer, { skipSelf: true, ...options });
@@ -139,10 +137,9 @@ function extractAssetsPlugin() {
         {
             name: 'vike:extractAssets-4',
             async configResolved(config_) {
-                configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
                 config = config_;
-                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, false);
-                isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
+                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config));
                 if (!isServerAssetsFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
                     (0, utils_js_1.assertUsage)(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');

package/dist/cjs/node/plugin/plugins/importBuild/getVikeManifest.js

@@ -5,8 +5,8 @@ const utils_js_1 = require("../../utils.js");
 const assertPluginManifest_js_1 = require("../../../shared/assertPluginManifest.js");
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
-function getVikeManifest(configVike) {
-    const runtimeManifest = (0, globalContext_js_1.getRuntimeManifest)(configVike);
+function getVikeManifest(vikeConfigGlobal, viteConfig) {
+    const runtimeManifest = (0, globalContext_js_1.getRuntimeManifest)(vikeConfigGlobal, viteConfig);
     const manifest = {
         version: utils_js_1.projectInfo.projectVersion,
         usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove

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

@@ -9,37 +9,39 @@ const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
 const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
 const module_1 = require("module");
-const getConfigVike_js_1 = require("../../../shared/getConfigVike.js");
 const getVikeManifest_js_1 = require("./getVikeManifest.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const ASSETS_MAP = '__VITE_ASSETS_MAP__';
 function importBuild() {
     let config;
-    let configVike;
+    let vikeConfigGlobal;
     return [
         {
             name: 'vike:importBuild:config',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
-                configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
+                const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
             }
         },
         ...(0, plugin_1.serverProductionEntryPlugin)({
             getServerProductionEntry: () => {
-                return getServerProductionEntryCode(config, configVike);
+                return getServerProductionEntryCode(config, vikeConfigGlobal);
             },
             libraryName: 'Vike'
         })
     ];
 }
-function getServerProductionEntryCode(config, configVike) {
+function getServerProductionEntryCode(config, vikeConfigGlobal) {
     const importPath = getImportPath(config);
-    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(configVike);
+    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(vikeConfigGlobal, config);
+    // Let's eventually simplify and move everything to a single virtual module
     const importerCode = [
         `  import { setImportBuildGetters } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -11,16 +11,16 @@ const fileTypes_js_1 = require("../../../../shared/getPageFiles/fileTypes.js");
 const path_1 = __importDefault(require("path"));
 const getVirtualFilePageConfigs_js_1 = require("./v1-design/getVirtualFilePageConfigs.js");
 const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
-async function getVirtualFileImportUserCode(id, options, configVike, config, isDev) {
+async function getVirtualFileImportUserCode(id, options, vikeConfigGlobal, config, isDev) {
     const idParsed = (0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id);
     (0, utils_js_1.assert)(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
     (0, utils_js_1.assert)(isForClientSide === !(0, utils_js_1.viteIsSSR_options)(options));
-    const isPrerendering = !!configVike.prerender;
-    const code = await getCode(config, configVike, isForClientSide, isClientRouting, isPrerendering, isDev, id);
+    const isPrerendering = !!vikeConfigGlobal.prerender;
+    const code = await getCode(config, vikeConfigGlobal, isForClientSide, isClientRouting, isPrerendering, isDev, id);
     return code;
 }
-async function getCode(config, configVike, isForClientSide, isClientRouting, isPrerendering, isDev, id) {
+async function getCode(config, vikeConfigGlobal, isForClientSide, isClientRouting, isPrerendering, isDev, id) {
     const { command } = config;
     (0, utils_js_1.assert)(command === 'serve' || command === 'build');
     const isBuild = command === 'build';
@@ -29,7 +29,7 @@ async function getCode(config, configVike, isForClientSide, isClientRouting, isP
     {
         const globRoots = getGlobRoots(config);
         (0, utils_js_1.debugGlob)('Glob roots: ', globRoots);
-        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id);
+        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfigGlobal, isPrerendering, config, isDev, id);
     }
     (0, utils_js_1.debugGlob)(`Glob imports for ${isForClientSide ? 'client' : 'server'}:\n`, content);
     return content;
@@ -59,7 +59,7 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
         }
     }
 }
-async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id) {
+async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfigGlobal, isPrerendering, config, isDev, id) {
     let fileContent = `// Generated by https://github.com/vikejs/vike/blob/main/vike/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.ts
 
 export const pageFilesLazy = {};
@@ -73,7 +73,7 @@ ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClien
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = await (0, getVikeConfig_js_1.isV1Design)(config, isDev);
+    const isV1Design = await (0, getVikeConfig_js_1.isV1Design)(config);
     fileTypes_js_1.fileTypes
         .filter((fileType) => fileType !== '.css')
         .forEach((fileType) => {
@@ -91,7 +91,7 @@ ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClien
             fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
         }
     });
-    if (configVike.includeAssetsImportedByServer && isForClientSide) {
+    if (vikeConfigGlobal.includeAssetsImportedByServer && isForClientSide) {
         fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
     }
     return fileContent;

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importUserCode = importUserCode;
 const vite_1 = require("vite");
-const getConfigVike_js_1 = require("../../../shared/getConfigVike.js");
 const getVirtualFilePageConfigValuesAll_js_1 = require("./v1-design/getVirtualFilePageConfigValuesAll.js");
 const getVirtualFileImportUserCode_js_1 = require("./getVirtualFileImportUserCode.js");
 const utils_js_1 = require("../../utils.js");
@@ -18,20 +17,16 @@ const loggerNotProd_js_1 = require("../../shared/loggerNotProd.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 function importUserCode() {
     let config;
-    let configVike;
-    let isDev;
+    let vikeConfigGlobal;
     return {
         name: 'vike:importUserCode',
-        config(_, env) {
-            isDev = (0, utils_js_1.isDevCheck)(env);
-        },
         async configResolved(config_) {
-            configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
+            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
+            vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
             config = config_;
             // TODO/v1-release: remove
             {
-                (0, utils_js_1.assert)(isDev !== undefined);
-                const isV1 = await (0, getVikeConfig_js_1.isV1Design)(config, isDev);
+                const isV1 = await (0, getVikeConfig_js_1.isV1Design)(config);
                 if (!isV1)
                     config.experimental.importGlobRestoreExtension = true;
             }
@@ -55,13 +50,14 @@ function importUserCode() {
             if (!(0, virtual_files_js_1.isVirtualFileId)(id))
                 return undefined;
             id = (0, virtual_files_js_1.getVirtualFileId)(id);
+            const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             if ((0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id)) {
                 const code = await (0, getVirtualFilePageConfigValuesAll_js_1.getVirtualFilePageConfigValuesAll)(id, isDev, config);
                 return code;
             }
             if ((0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id)) {
-                const code = await (0, getVirtualFileImportUserCode_js_1.getVirtualFileImportUserCode)(id, options, configVike, config, isDev);
+                const code = await (0, getVirtualFileImportUserCode_js_1.getVirtualFileImportUserCode)(id, options, vikeConfigGlobal, config, isDev);
                 return code;
             }
         },
@@ -88,8 +84,6 @@ function handleFileAddRemove(server, config) {
 }
 function handleHotUpdate(ctx, config) {
     const { file, server } = ctx;
-    (0, utils_js_1.assertPosixPath)(file);
-    getVikeConfig_js_1.vikeConfigDependencies.forEach((f) => (0, utils_js_1.assertPosixPath)(f));
     const isVikeConfig = isVikeConfigModule(file);
     const isViteModule = ctx.modules.length > 0;
     /* Should we show this?
@@ -119,6 +113,8 @@ function handleHotUpdate(ctx, config) {
     }
 }
 function isVikeConfigModule(filePathAbsoluteFilesystem) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
+    getVikeConfig_js_1.vikeConfigDependencies.forEach((f) => (0, utils_js_1.assertPosixPath)(f));
     return getVikeConfig_js_1.vikeConfigDependencies.has(filePathAbsoluteFilesystem);
 }
 function reloadConfig(filePath, config, op) {
@@ -127,7 +123,7 @@ function reloadConfig(filePath, config, op) {
         const msg = `${op} ${picocolors_1.default.dim(filePathToShowToUserResolved)}`;
         (0, loggerNotProd_js_1.logConfigInfo)(msg, 'info');
     }
-    (0, getVikeConfig_js_1.reloadVikeConfig)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot);
+    (0, getVikeConfig_js_1.reloadVikeConfig)(config);
 }
 function getVirtualModules(server) {
     const virtualModules = Array.from(server.moduleGraph.urlToModuleMap.keys())