vike 0.4.217-commit-99ea561 → 0.4.218-commit-01a099d

package/dist/cjs/__internal/index.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setBuildEntry = 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, "setBuildEntry", { enumerable: true, get: function () { return globalContext_js_1.setBuildEntry; } });
 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)();
@@ -41,8 +42,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

@@ -15,17 +15,28 @@ 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.build = build;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
+const isPrerenderEnabled_js_1 = require("../prerender/isPrerenderEnabled.js");
 /**
  * Programmatically trigger `$ vike build`
  *
@@ -38,9 +49,7 @@ async function build(options = {}) {
     // Build server-side
     const outputServer = await (0, vite_1.build)(setSSR(viteConfigEnhanced));
     // Pre-render
-    if (vikeConfigGlobal.prerender &&
-        !vikeConfigGlobal.prerender.disableAutoRun &&
-        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
+    if ((0, isPrerenderEnabled_js_1.isPrerenderEnabled)(vikeConfigGlobal)) {
         const { runPrerenderFromAutoRun } = await Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
         await runPrerenderFromAutoRun(viteConfigEnhanced, true);
     }
@@ -56,7 +65,7 @@ function setSSR(viteConfig) {
     return {
         ...viteConfig,
         build: {
-            ...viteConfig.build,
+            ...viteConfig?.build,
             ssr: true
         }
     };

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,49 +15,117 @@ 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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareViteApiCall = prepareViteApiCall;
+exports.getViteRoot = getViteRoot;
+exports.assertViteRoot = assertViteRoot;
+exports.normalizeViteRoot = normalizeViteRoot;
+// TODO: enable Vike extensions to add Vite plugins
 const vite_1 = require("vite");
-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) {
+const path_1 = __importDefault(require("path"));
+const utils_js_1 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const globalObject = (0, utils_js_1.getGlobalObject)('prepareViteApiCall.ts', {});
+async function prepareViteApiCall(viteConfig, operation) {
     (0, context_js_1.setOperation)(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
-async function enhanceViteConfig(viteConfig = {}, operation) {
-    let viteConfigResolved = await resolveViteConfig(viteConfig, operation);
+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);
+    return {
+        viteConfigEnhanced,
+        vikeConfigGlobal
+    };
+}
+async function getViteRoot(operation) {
+    if (!globalObject.root)
+        await getInfoFromVite(undefined, operation);
+    (0, utils_js_1.assert)(globalObject.root);
+    return globalObject.root;
+}
+async function getInfoFromVite(viteConfig, operation) {
+    const viteConfigFromFile = await loadViteConfigFile(viteConfig, operation);
+    const root = normalizeViteRoot(viteConfigFromFile?.root ?? viteConfig?.root ?? process.cwd());
+    globalObject.root = root;
+    let vikeVitePluginOptions;
     let viteConfigEnhanced = viteConfig;
-    // Add vike to plugins if not present
-    if (!viteConfigResolved.plugins.some((p) => p.name === pluginName_js_1.pluginName)) {
-        // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus have vike/plugin may resolved to two different node_modules/vike directories
+    const found = findVikeVitePlugin([...(viteConfig?.plugins ?? []), ...(viteConfigFromFile?.plugins ?? [])]);
+    if (found) {
+        vikeVitePluginOptions = found.vikeVitePluginOptions;
+    }
+    else {
+        // Add Vike to plugins if not present.
+        // Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus vike/plugin may resolved to two different node_modules/vike directories.
         const { plugin: vikePlugin } = await Promise.resolve().then(() => __importStar(require('../plugin/index.js')));
         viteConfigEnhanced = {
             ...viteConfig,
-            plugins: [...(viteConfig.plugins ?? []), vikePlugin()]
+            plugins: [...(viteConfig?.plugins ?? []), vikePlugin()]
         };
-        viteConfigResolved = await resolveViteConfig(viteConfigEnhanced, operation);
+        const res = findVikeVitePlugin(viteConfigEnhanced.plugins);
+        (0, utils_js_1.assert)(res);
+        vikeVitePluginOptions = res.vikeVitePluginOptions;
     }
-    // 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,
-        vikeConfigGlobal
-    };
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
+    return { root, vikeVitePluginOptions, viteConfigEnhanced };
+}
+function findVikeVitePlugin(plugins) {
+    let vikeVitePluginOptions;
+    let vikeVitePuginFound = false;
+    plugins.forEach((p) => {
+        if (p && '__vikeVitePluginOptions' in p) {
+            vikeVitePuginFound = true;
+            const options = p.__vikeVitePluginOptions;
+            vikeVitePluginOptions ?? (vikeVitePluginOptions = {});
+            Object.assign(vikeVitePluginOptions, options);
+        }
+    });
+    if (!vikeVitePuginFound)
+        return null;
+    return { vikeVitePluginOptions };
 }
-async function resolveViteConfig(viteConfig, operation) {
-    const args = getResolveConfigArgs(viteConfig, operation);
-    return await (0, vite_1.resolveConfig)(...args);
+// Copied from https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L961-L1005
+async function loadViteConfigFile(viteConfig, operation) {
+    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfig, operation);
+    let config = inlineConfig;
+    let mode = inlineConfig.mode || defaultMode;
+    const configEnv = {
+        mode,
+        command,
+        isSsrBuild: command === 'build' && !!config.build?.ssr,
+        isPreview
+    };
+    let { configFile } = config;
+    if (configFile !== false) {
+        const loadResult = await (0, vite_1.loadConfigFromFile)(configEnv, configFile, config.root, config.logLevel, config.customLogger);
+        return loadResult?.config;
+    }
+    return null;
 }
-function getResolveConfigArgs(viteConfig, operation) {
+function getResolveConfigArgs(viteConfig = {}, operation) {
     const inlineConfig = viteConfig;
     const command = operation === 'build' || operation === 'prerender' ? 'build' : 'serve';
     const defaultMode = operation === 'dev' ? 'development' : 'production';
@@ -65,3 +133,18 @@ function getResolveConfigArgs(viteConfig, operation) {
     const isPreview = operation === 'preview';
     return [inlineConfig, command, defaultMode, defaultNodeEnv, isPreview];
 }
+function normalizeViteRoot(root) {
+    return (0, utils_js_1.toPosixPath)(path_1.default.resolve(root));
+}
+const errMsg = `A Vite plugin is modifying Vite's setting ${picocolors_1.default.cyan('root')} which is forbidden`;
+async function assertViteRoot2(root, viteConfigEnhanced, operation) {
+    const args = getResolveConfigArgs(viteConfigEnhanced, operation);
+    // We can eventually this resolveConfig() call (along with removing the whole assertViteRoot2() function which is redundant with the assertViteRoot() function) so that Vike doesn't make any resolveConfig() (except for pre-rendering which is required). But let's keep it for now, just to see whether calling resolveConfig() can be problematic.
+    const viteConfigResolved = await (0, vite_1.resolveConfig)(...args);
+    (0, utils_js_1.assertUsage)(normalizeViteRoot(viteConfigResolved.root) === normalizeViteRoot(root), errMsg);
+}
+function assertViteRoot(root, config) {
+    if (globalObject.root)
+        (0, utils_js_1.assert)(normalizeViteRoot(globalObject.root) === normalizeViteRoot(root));
+    (0, utils_js_1.assertUsage)(normalizeViteRoot(root) === normalizeViteRoot(config.root), errMsg);
+}

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

@@ -20,3 +20,5 @@ const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
+__exportStar(require("../../utils/filesystemPathHandling.js"), exports);
+__exportStar(require("../../utils/isObject.js"), exports);

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 };
 };

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,12 +32,12 @@ 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);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
-function plugin(vikeVitePluginOptions) {
+function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...(0, commonConfig_js_1.commonConfig)(vikeVitePluginOptions),
         (0, index_js_2.importUserCode)(),
@@ -52,13 +52,14 @@ function plugin(vikeVitePluginOptions) {
         (0, extractExportNamesPlugin_js_1.extractExportNamesPlugin)(),
         (0, suppressRollupWarning_js_1.suppressRollupWarning)(),
         ...(0, setGlobalContext_js_1.setGlobalContext)(),
-        ...(0, index_js_3.importBuild)(),
+        ...(0, index_js_3.buildEntry)(),
         (0, baseUrls_js_1.baseUrls)(vikeVitePluginOptions),
         (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;
 }
 // Error upon wrong usage

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

@@ -8,6 +8,7 @@ exports.autoFullBuild = autoFullBuild;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const runPrerender_js_1 = require("../../prerender/runPrerender.js");
+const isPrerenderEnabled_js_1 = require("../../prerender/isPrerenderEnabled.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");
@@ -95,9 +96,7 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    if (vikeConfigGlobal.prerender &&
-        !vikeConfigGlobal.prerender.disableAutoRun &&
-        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
+    if ((0, isPrerenderEnabled_js_1.isPrerenderEnabled)(vikeConfigGlobal)) {
         await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, false);
         forceExit = true;
     }

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

@@ -4,35 +4,41 @@ 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) {
-    let bases;
+    let basesResolved;
+    let root;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        async config(config) {
-            // TODO: fix bug: use getVikeConfig2() and udpate check below
-            bases = resolveBaseFromUserConfig(config, vikeVitePluginOptions);
-            const { baseServer, baseAssets } = bases;
+        async config(config, env) {
+            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);
             // 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;
+            process.env.BASE_SERVER = basesResolved.baseServer;
+            process.env.BASE_ASSETS = basesResolved.baseAssets;
             return {
                 envPrefix: [
                     'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
                     'BASE_SERVER',
                     'BASE_ASSETS'
                 ],
-                base: baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseViteOriginal: config.base ?? '/__UNSET__' // Vite resolves `_baseViteOriginal: null` to `undefined`
+                base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
+                _baseViteOriginal: baseViteOriginal
             };
         },
         async configResolved(config) {
+            (0, prepareViteApiCall_js_1.assertViteRoot)(root, 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)(basesResolved.baseServer === bases.baseServer);
-            (0, utils_js_1.assert)(basesResolved.baseAssets === bases.baseAssets);
+            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
+            (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
+            (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.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.
@@ -41,7 +47,3 @@ function baseUrls(vikeVitePluginOptions) {
         }
     };
 }
-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.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 { setBuildEntry } 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,`,
+        '    setBuildEntry({',
+        `      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);

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

@@ -11,14 +11,14 @@ const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const path_1 = __importDefault(require("path"));
 const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
-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(vikeVitePluginOptions = {}) {
+const pluginName = 'vike:commonConfig';
+function commonConfig(vikeVitePluginOptions) {
     return [
         {
-            name: `${pluginName_js_1.pluginName}:pre`,
+            name: `${pluginName}:pre`,
             enforce: 'pre',
             config: {
                 order: 'pre',
@@ -31,14 +31,14 @@ function commonConfig(vikeVitePluginOptions = {}) {
             }
         },
         {
-            name: pluginName_js_1.pluginName,
+            name: pluginName,
             configResolved(config) {
                 assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }
         },
         {
-            name: `${pluginName_js_1.pluginName}:post`,
+            name: `${pluginName}:post`,
             enforce: 'post',
             configResolved: {
                 order: 'post',
@@ -111,7 +111,7 @@ function assertEsm(userViteRoot) {
     (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }
 function assertSingleInstance(config) {
-    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName_js_1.pluginName).length;
+    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
     (0, utils_js_1.assertUsage)(numberOfInstances === 1, `Vike's Vite plugin (${picocolors_1.default.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
 }
 function assertVikeCliOrApi(config) {

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

@@ -145,9 +145,7 @@ const configDefinitionsBuiltInGlobal = {
         env: { server: true, client: 'if-client-routing' },
         eager: true
     },
-    prerender: {
-        env: { config: true }
-    },
+    prerender: { env: { config: true } },
     disableAutoFullBuild: { env: { config: true } },
     includeAssetsImportedByServer: { env: { config: true } },
     baseAssets: { env: { config: true } },