vike 0.4.218 → 0.4.220-commit-a9f46b8

package/dist/cjs/__internal/index.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setGlobalContext_buildEntry = void 0;
 exports.route = route;
 exports.getPagesAndRoutes = getPagesAndRoutes;
 exports.getMiddlewares = getMiddlewares;
+// Internals needed by Vike
+var globalContext_js_1 = require("../node/runtime/globalContext.js");
+Object.defineProperty(exports, "setGlobalContext_buildEntry", { enumerable: true, get: function () { return globalContext_js_1.setGlobalContext_buildEntry; } });
 const index_js_1 = require("../shared/route/index.js");
-const getPageFiles_js_1 = require("../shared/getPageFiles.js");
-const globalContext_js_1 = require("../node/runtime/globalContext.js");
+const getPageFiles_js_1 = require("../shared/getPageFiles/getPageFiles.js");
+const globalContext_js_2 = require("../node/runtime/globalContext.js");
 const assertSetup_js_1 = require("../utils/assertSetup.js");
-const renderPageAlreadyRouted_js_1 = require("../node/runtime/renderPage/renderPageAlreadyRouted.js");
 /**
- * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel}
- * to compute some rewrite rules and extract { isr } configs.
- * Needs `import 'vike/__internal/setup'`
- * @param config
+ * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  */
 async function getPagesAndRoutes() {
     (0, assertSetup_js_1.setNodeEnvProduction)();
-    const renderContext = await (0, renderPageAlreadyRouted_js_1.getRenderContext)();
+    const globalContext = (0, globalContext_js_2.getGlobalContext)();
     const { 
     //
-    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = renderContext;
+    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = globalContext;
     return {
         pageRoutes,
         pageFilesAll,
@@ -41,8 +41,8 @@ async function getMiddlewares() {
 //  - Remove it in favor of https://vike.dev/getGlobalContext
 // Demo usage: https://github.com/vikejs/vike/pull/1823
 async function getPageFilesAllSafe(isProduction) {
-    await (0, globalContext_js_1.initGlobalContext_getGlobalContextAsync)(isProduction);
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    await (0, globalContext_js_2.initGlobalContext_getGlobalContextAsync)(isProduction);
+    const globalContext = (0, globalContext_js_2.getGlobalContext)();
     const pageFilesAll = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
     return pageFilesAll;
 }

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

@@ -1,63 +1,37 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
+const assert_1 = __importDefault(require("assert"));
+const context_js_1 = require("../cli/context.js");
+const context_js_2 = require("../prerender/context.js");
 /**
  * Programmatically trigger `$ vike build`
  *
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    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 (vikeConfigGlobal.prerender &&
-        !vikeConfigGlobal.prerender.disableAutoRun &&
-        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
-        const { runPrerenderFromAutoRun } = await Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
-        await runPrerenderFromAutoRun(viteConfigEnhanced, true);
-    }
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
+    // Pass it to autoFullBuild()
+    if (viteConfigEnhanced)
+        viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;
+    // 1. Build client-side
+    // 2. Build server-side
+    //    > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L90
+    // 3. Pre-render (if enabled)
+    //    > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L98
+    //    > We purposely don't start the pre-rendering in this `build()` function but in a Rollup hook instead.
+    //    > Rationale: https://github.com/vikejs/vike/issues/2123
+    await (0, vite_1.build)(viteConfigEnhanced);
+    // When using the Vike CLI with pre-rendering the process is forcefully exited at the end of the buildVite() call above
+    (0, assert_1.default)(!((0, context_js_1.isVikeCli)() && (0, context_js_2.isPrerendering)()));
     return {
-        /* We don't return `viteConfig` because `viteConfigEnhanced` is `InlineConfig` not `ResolvedConfig`
-        viteConfig: viteConfigEnhanced,
-        */
-        rollupOutputClient: outputClient,
-        rollupOutputServer: outputServer
-    };
-}
-function setSSR(viteConfig) {
-    return {
-        ...viteConfig,
-        build: {
-            ...viteConfig?.build,
-            ssr: true
-        }
+    /* We don't return `viteConfig` because `viteConfigEnhanced` is `InlineConfig` not `ResolvedConfig`
+    viteConfig: viteConfigEnhanced,
+    */
     };
 }

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

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isVikeCliOrApi = isVikeCliOrApi;
-exports.setOperation = setOperation;
+exports.setContextApiOperation = setContextApiOperation;
+exports.clearContextApiOperation = clearContextApiOperation;
 const utils_js_1 = require("./utils.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('context.ts', {
-    apiOperation: undefined
-});
-function getOperation() {
+const globalObject = (0, utils_js_1.getGlobalObject)('api/context.ts', {});
+function getApiOperation() {
     (0, utils_js_1.assert)(globalObject.apiOperation);
     return globalObject.apiOperation;
 }
@@ -14,7 +13,10 @@ function isVikeCliOrApi() {
     // The CLI uses the API
     return !!globalObject.apiOperation;
 }
-function setOperation(operation) {
+function setContextApiOperation(operation) {
     (0, utils_js_1.assert)(!globalObject.apiOperation);
     globalObject.apiOperation = operation;
 }
+function clearContextApiOperation() {
+    globalObject.apiOperation = undefined;
+}

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prerender = exports.preview = exports.dev = exports.build = void 0;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -37,20 +47,37 @@ const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/g
 const path_1 = __importDefault(require("path"));
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const globalContext_js_1 = require("../runtime/globalContext.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfig, operation) {
-    (0, context_js_1.setOperation)(operation);
+    clear();
+    (0, context_js_1.setContextApiOperation)(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
+// For subsequent API calls, e.g. calling prerender() after build()
+function clear() {
+    (0, context_js_1.clearContextApiOperation)();
+    (0, globalContext_js_1.clearGlobalContext)();
+}
 async function enhanceViteConfig(viteConfig, operation) {
-    const { root, vikeVitePluginOptions, viteConfigEnhanced } = await getInfoFromVite(viteConfig, operation);
-    await assertViteRoot2(root, viteConfigEnhanced, operation);
-    const { vikeConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig2)(root, operation === 'dev', vikeVitePluginOptions);
+    const viteInfo = await getInfoFromVite(viteConfig, operation);
+    await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
+    const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
     return {
-        viteConfigEnhanced,
-        vikeConfigGlobal
+        viteConfigEnhanced
     };
 }
+function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
+    const viteConfigs = vikeConfig.global.from.configsCumulative.vite;
+    if (!viteConfigs)
+        return viteConfigEnhanced;
+    viteConfigs.values.forEach((v) => {
+        (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(v.value), `${v.definedAt} should be an object`);
+        viteConfigEnhanced = (0, vite_1.mergeConfig)(viteConfigEnhanced ?? {}, v.value);
+    });
+    return viteConfigEnhanced;
+}
 async function getViteRoot(operation) {
     if (!globalObject.root)
         await getInfoFromVite(undefined, operation);

package/dist/cjs/node/cli/context.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVikeCli = isVikeCli;
+exports.setContextCliCommand = setContextCliCommand;
+const utils_js_1 = require("./utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('cli/context.ts', {});
+function getCliCommand() {
+    return globalObject.cliCommand;
+}
+function isVikeCli() {
+    return !!globalObject.cliCommand;
+}
+function setContextCliCommand(command) {
+    (0, utils_js_1.assert)(!globalObject.cliCommand);
+    globalObject.cliCommand = command;
+}

package/dist/cjs/node/cli/entry.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,9 +40,11 @@ const utils_js_1 = require("./utils.js");
 const index_js_1 = require("../api/index.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const parseCli_js_1 = require("./parseCli.js");
+const context_js_1 = require("./context.js");
 cli();
 async function cli() {
     const { command } = (0, parseCli_js_1.parseCli)();
+    (0, context_js_1.setContextCliCommand)(command);
     if (command === 'dev') {
         await cmdDev();
     }
@@ -77,6 +89,8 @@ async function cmdBuild() {
         console.error(err);
         process.exit(1);
     }
+    // See comments at runPrerender_forceExit()
+    process.exit(0);
 }
 async function cmdPreview() {
     try {

package/dist/cjs/node/cli/utils.js

@@ -21,3 +21,4 @@ const onLoad_js_1 = require("./onLoad.js");
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/includes.js"), exports);
+__exportStar(require("../../utils/getGlobalObject.js"), exports);

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

@@ -23,7 +23,7 @@ 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_3 = require("./plugins/importBuild/index.js");
+const index_js_3 = require("./plugins/buildEntry/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");
@@ -32,7 +32,7 @@ const fileEnv_js_1 = require("./plugins/fileEnv.js");
 const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
 const resolveClientEntriesDev_js_1 = require("./resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
-const vite6HmrRegressionWorkaround_js_1 = require("./plugins/vite6HmrRegressionWorkaround.js");
+const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
 (0, utils_js_2.markSetup_vikeVitePlugin)();
 assertViteVersion();
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
@@ -52,12 +52,12 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, extractExportNamesPlugin_js_1.extractExportNamesPlugin)(),
         (0, suppressRollupWarning_js_1.suppressRollupWarning)(),
         ...(0, setGlobalContext_js_1.setGlobalContext)(),
-        ...(0, index_js_3.importBuild)(),
-        (0, baseUrls_js_1.baseUrls)(vikeVitePluginOptions),
+        ...(0, index_js_3.buildEntry)(),
+        (0, baseUrls_js_1.baseUrls)(),
         (0, envVars_js_1.envVarsPlugin)(),
         (0, fileEnv_js_1.fileEnv)(),
         (0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)(),
-        (0, vite6HmrRegressionWorkaround_js_1.vite6HmrRegressionWorkaround)()
+        (0, workaroundVite6HmrRegression_js_1.workaroundVite6HmrRegression)()
     ];
     Object.assign(plugins, { __vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

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

@@ -8,11 +8,14 @@ exports.autoFullBuild = autoFullBuild;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const runPrerender_js_1 = require("../../prerender/runPrerender.js");
+const context_js_1 = require("../../prerender/context.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");
+const context_js_2 = require("../../api/context.js");
+const context_js_3 = require("../../cli/context.js");
 let forceExit = false;
 function autoFullBuild() {
     let config;
@@ -73,35 +76,43 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
     if (!bundle[buildConfig_js_1.manifestTempFile])
         return;
     const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
-    const configInline = {
-        ...configFromCli,
-        configFile: configFromCli?.configFile || config.configFile,
-        root: config.root,
-        build: {
-            ...configFromCli?.build
-        }
-    };
-    try {
-        await (0, vite_1.build)({
-            ...configInline,
+    let configInline;
+    if (config._viteConfigEnhanced) {
+        configInline = config._viteConfigEnhanced;
+    }
+    else {
+        configInline = {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
             build: {
-                ...configInline.build,
-                ssr: true
+                ...configFromCli?.build
             }
-        });
+        };
+    }
+    try {
+        await (0, vite_1.build)(setSSR(configInline));
     }
     catch (err) {
         console.error(err);
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    if (vikeConfigGlobal.prerender &&
-        !vikeConfigGlobal.prerender.disableAutoRun &&
-        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
-        await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, false);
-        forceExit = true;
+    if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfigGlobal)) {
+        const { prerenderContextPublic } = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
+        config.vike.prerenderContext = prerenderContextPublic;
+        forceExit = (0, context_js_3.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
     }
 }
+function setSSR(configInline) {
+    return {
+        ...configInline,
+        build: {
+            ...configInline.build,
+            ssr: true
+        }
+    };
+}
 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 });
@@ -111,7 +122,8 @@ function abortViteBuildSsr(vikeConfigGlobal) {
 function isDisabled(vikeConfigGlobal) {
     const { disableAutoFullBuild } = vikeConfigGlobal;
     if (disableAutoFullBuild === null || disableAutoFullBuild === 'prerender') {
-        return !(0, isViteCliCall_js_1.isViteCliCall)();
+        const isViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
+        return isViteApi;
     }
     else {
         return disableAutoFullBuild;

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

@@ -4,22 +4,16 @@ exports.baseUrls = baseUrls;
 const resolveBase_js_1 = require("../../shared/resolveBase.js");
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
-function baseUrls(vikeVitePluginOptions) {
+function baseUrls() {
     let basesResolved;
-    let root;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        async config(config, env) {
+        async config(config) {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
-            root = config.root ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(config.root) : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
-            (0, utils_js_1.assert)(root);
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(root, isDev, vikeVitePluginOptions);
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config._vikeConfigGlobal.baseServer, config._vikeConfigGlobal.baseAssets);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -34,7 +28,6 @@ function baseUrls(vikeVitePluginOptions) {
             };
         },
         async configResolved(config) {
-            (0, prepareViteApiCall_js_1.assertViteRoot)(root, config);
             const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
             const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);

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

@@ -16,7 +16,7 @@ const module_1 = require("module");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
-const index_js_1 = require("./importBuild/index.js");
+const index_js_1 = require("./buildEntry/index.js");
 const prependEntriesDir_js_1 = require("../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../shared/page-configs/getConfigValueBuildTime.js");
@@ -123,7 +123,7 @@ async function getEntries(config) {
     if ((0, utils_js_1.viteIsSSR)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
-            // importBuild: resolve('dist/esm/node/importBuild.js'), // TODO/next-major-release: remove
+            // buildEntry: resolve('dist/esm/node/buildEntry.js'), // TODO/next-major-release: remove
             ...pageFileEntries,
             // Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
             ...pageEntries

package/dist/cjs/node/plugin/plugins/{importBuild → buildEntry}/index.js

@@ -3,26 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importBuild = importBuild;
+exports.buildEntry = buildEntry;
 exports.set_ASSETS_MAP = set_ASSETS_MAP;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
+const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const getVikeManifest_js_1 = require("./getVikeManifest.js");
+const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
 const utils_js_1 = require("../../utils.js");
+const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const module_1 = require("module");
-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() {
+function buildEntry() {
     let config;
     let vikeConfigGlobal;
     return [
         {
-            name: 'vike:importBuild:config',
+            name: 'vike:buildEntry',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
@@ -43,17 +43,16 @@ function getServerProductionEntryCode(config, vikeConfigGlobal) {
     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 { setGlobalContext_buildEntry } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MAP};`,
         `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
-        '    setImportBuildGetters({',
-        `      pageFiles: () => pageFiles,`,
-        `      getAssetsManifest: () => assetsManifest,`,
-        // TODO: rename pluginManifest -> vikeManifest
-        `      pluginManifest: () => pluginManifest,`,
+        '    setGlobalContext_buildEntry({',
+        `      pageFiles,`,
+        `      assetsManifest,`,
+        `      pluginManifest,`,
         '    });',
         `  }`,
         ''
@@ -90,12 +89,12 @@ function find_ASSETS_MAP(bundle) {
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
     const filePathAbsolute = (0, utils_js_1.toPosixPath)(
-    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/importBuild/index.js
-    require_.resolve(`../../../../../../dist/esm/node/runtime/globalContext/loadImportBuild.js`));
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/buildEntry/index.js
+    require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
     if (
-    // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal/loadImportBuild' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
+    // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
     true) {
-        return 'vike/__internal/loadImportBuild';
+        return 'vike/__internal';
     }
     else {
         const { outDirServer } = (0, utils_js_1.getOutDirs)(config);