vike 0.4.220-commit-af5c91f → 0.4.221-commit-8577456

package/dist/cjs/__internal/index.js

@@ -3,20 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalContext_buildEntry = void 0;
 exports.route = route;
 exports.getPagesAndRoutes = getPagesAndRoutes;
-exports.getMiddlewares = getMiddlewares;
-// Internals needed by Vike
+// 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/getPageFiles.js");
 const globalContext_js_2 = require("../node/runtime/globalContext.js");
 const assertSetup_js_1 = require("../utils/assertSetup.js");
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
+ *
+ * TODO/eventually: remove
  */
 async function getPagesAndRoutes() {
     (0, assertSetup_js_1.setNodeEnvProduction)();
-    const globalContext = (0, globalContext_js_2.getGlobalContext)();
+    await (0, globalContext_js_2.initGlobalContext_getPagesAndRoutes)();
+    const globalContext = await (0, globalContext_js_2.getGlobalContextInternal)();
     const { 
     //
     pageRoutes, pageFilesAll, pageConfigs, allPageIds } = globalContext;
@@ -27,25 +28,6 @@ async function getPagesAndRoutes() {
         allPageIds
     };
 }
-// TODO/eventually:
-//  - Remove the need for `isProduction` after Vike's CLI is implemented
-//  - Remove it in favor of https://vike.dev/getGlobalContext
-async function getMiddlewares() {
-    const isProduction = process.env.NODE_ENV === 'production';
-    const { pageConfigs } = await getPageFilesAllSafe(isProduction);
-    const middlewares = pageConfigs[0].configValues.middleware.value.flat(Infinity);
-    return middlewares;
-}
-// TODO/eventually:
-//  - Make it cleaner once the internal refactoring about global configs is done.
-//  - 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_2.initGlobalContext_getGlobalContextAsync)(isProduction);
-    const globalContext = (0, globalContext_js_2.getGlobalContext)();
-    const pageFilesAll = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
-    return pageFilesAll;
-}
 async function route(pageContext) {
     const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
     // Old interface

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

@@ -1,4 +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 () {
+    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 };
 };
@@ -9,26 +42,37 @@ 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");
+const utils_js_1 = require("./utils.js");
 /**
  * Programmatically trigger `$ vike build`
  *
  * https://vike.dev/api#build
  */
 async function build(options = {}) {
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
+    const { viteConfigEnhanced, vikeConfig } = 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)()));
+    if (vikeConfig.global.config.viteEnvironmentAPI) {
+        (0, utils_js_1.assertVersion)('Vite', vite_1.version, '6.0.0');
+        const { createBuilder } = await Promise.resolve().then(() => __importStar(require('vite')));
+        const builder = await createBuilder(viteConfigEnhanced);
+        await builder.buildApp();
+    }
+    else {
+        // This buildVite() call does everything:
+        // 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);
+        // After pre-rendering, when using the Vike CLI, the process is forcefully exited at the end of the buildVite() call above.
+        if ((0, context_js_1.isVikeCli)() && (0, context_js_2.isPrerendering)())
+            (0, assert_1.default)(false);
+    }
     return {
     /* We don't return `viteConfig` because `viteConfigEnhanced` is `InlineConfig` not `ResolvedConfig`
     viteConfig: viteConfigEnhanced,

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

@@ -49,32 +49,34 @@ 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) {
+async function prepareViteApiCall(viteConfigFromOptions, operation) {
     clear();
     (0, context_js_1.setContextApiOperation)(operation);
-    return enhanceViteConfig(viteConfig, operation);
+    return enhanceViteConfig(viteConfigFromOptions, 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 viteInfo = await getInfoFromVite(viteConfig, operation);
+async function enhanceViteConfig(viteConfigFromOptions, operation) {
+    const viteInfo = await getInfoFromVite(viteConfigFromOptions, 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 {
+        vikeConfig,
         viteConfigEnhanced
     };
 }
 function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
-    const viteConfigs = vikeConfig.global.from.configsCumulative.vite;
+    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);
+        (0, utils_js_1.assertUsage)(findVikeVitePlugin(v.value), "Using the +vite setting to add Vike's Vite plugin is forbidden");
     });
     return viteConfigEnhanced;
 }
@@ -84,13 +86,14 @@ async function getViteRoot(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());
+async function getInfoFromVite(viteConfigFromOptions, operation) {
+    const viteConfigFromUserViteFile = await loadViteConfigFile(viteConfigFromOptions, operation);
+    const root = normalizeViteRoot(viteConfigFromUserViteFile?.root ?? viteConfigFromOptions?.root ?? process.cwd());
     globalObject.root = root;
     let vikeVitePluginOptions;
-    let viteConfigEnhanced = viteConfig;
-    const found = findVikeVitePlugin([...(viteConfig?.plugins ?? []), ...(viteConfigFromFile?.plugins ?? [])]);
+    let viteConfigEnhanced = viteConfigFromOptions;
+    // If Vike's Vite plugin is found in both viteConfigFromOptions and viteConfigFromUserViteFile then Vike will later throw an error
+    const found = findVikeVitePlugin(viteConfigFromOptions) || findVikeVitePlugin(viteConfigFromUserViteFile);
     if (found) {
         vikeVitePluginOptions = found.vikeVitePluginOptions;
     }
@@ -99,20 +102,20 @@ async function getInfoFromVite(viteConfig, operation) {
         // 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()]
+            ...viteConfigFromOptions,
+            plugins: [...(viteConfigFromOptions?.plugins ?? []), vikePlugin()]
         };
-        const res = findVikeVitePlugin(viteConfigEnhanced.plugins);
+        const res = findVikeVitePlugin(viteConfigEnhanced);
         (0, utils_js_1.assert)(res);
         vikeVitePluginOptions = res.vikeVitePluginOptions;
     }
     (0, utils_js_1.assert)(vikeVitePluginOptions);
     return { root, vikeVitePluginOptions, viteConfigEnhanced };
 }
-function findVikeVitePlugin(plugins) {
+function findVikeVitePlugin(viteConfig) {
     let vikeVitePluginOptions;
     let vikeVitePuginFound = false;
-    plugins.forEach((p) => {
+    viteConfig?.plugins?.forEach((p) => {
         if (p && '__vikeVitePluginOptions' in p) {
             vikeVitePuginFound = true;
             const options = p.__vikeVitePluginOptions;
@@ -125,8 +128,8 @@ function findVikeVitePlugin(plugins) {
     return { vikeVitePluginOptions };
 }
 // 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);
+async function loadViteConfigFile(viteConfigFromOptions, operation) {
+    const [inlineConfig, command, defaultMode, _defaultNodeEnv, isPreview] = getResolveConfigArgs(viteConfigFromOptions, operation);
     let config = inlineConfig;
     let mode = inlineConfig.mode || defaultMode;
     const configEnv = {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prerender = prerender;
 const runPrerender_js_1 = require("../prerender/runPrerender.js");
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
+// TODO/soon use importServerProductionIndex()
 /**
  * Programmatically trigger `$ vike prerender`
  *

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

@@ -22,3 +22,4 @@ __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../utils/path.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
+__exportStar(require("../../utils/assertVersion.js"), exports);

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

@@ -32,6 +32,7 @@ const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
 const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
 const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
+const buildApp_js_1 = require("./plugins/buildApp.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
@@ -41,6 +42,7 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, index_js_2.importUserCode)(),
         ...(0, index_js_1.devConfig)(),
         ...(0, buildConfig_js_1.buildConfig)(),
+        ...(0, buildApp_js_1.buildApp)(),
         (0, previewConfig_js_1.previewConfig)(),
         ...(0, autoFullBuild_js_1.autoFullBuild)(),
         (0, packageJsonFile_js_1.packageJsonFile)(),

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoFullBuild = autoFullBuild;
+const getFullBuildInlineConfig_js_1 = require("../shared/getFullBuildInlineConfig.js");
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const runPrerender_js_1 = require("../../prerender/runPrerender.js");
@@ -15,7 +16,6 @@ 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;
@@ -57,6 +57,7 @@ function autoFullBuild() {
                 handler() {
                     if (forceExit) {
                         (0, runPrerender_js_1.runPrerender_forceExit)();
+                        (0, utils_js_1.assert)(false);
                     }
                 }
             }
@@ -74,21 +75,7 @@ async function triggerFullBuild(config, vikeConfig, bundle) {
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
     if (!bundle[buildConfig_js_1.manifestTempFile])
         return;
-    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
-    let configInline;
-    if (config._viteConfigEnhanced) {
-        configInline = config._viteConfigEnhanced;
-    }
-    else {
-        configInline = {
-            ...configFromCli,
-            configFile: configFromCli?.configFile || config.configFile,
-            root: config.root,
-            build: {
-                ...configFromCli?.build
-            }
-        };
-    }
+    const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
     try {
         await (0, vite_1.build)(setSSR(configInline));
     }
@@ -98,9 +85,8 @@ async function triggerFullBuild(config, vikeConfig, bundle) {
         process.exit(1);
     }
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
-        const { prerenderContextPublic } = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
-        config.vike.prerenderContext = prerenderContextPublic;
-        forceExit = (0, context_js_3.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
+        const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
+        forceExit = res.forceExit;
     }
 }
 function setSSR(configInline) {
@@ -119,7 +105,10 @@ function abortViteBuildSsr(vikeConfig) {
     }
 }
 function isDisabled(vikeConfig) {
-    const { disableAutoFullBuild } = vikeConfig.global.config;
+    const { disableAutoFullBuild, viteEnvironmentAPI } = vikeConfig.global.config;
+    if (viteEnvironmentAPI) {
+        return true;
+    }
     if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
         const isViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
         return isViteApi;

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

@@ -13,7 +13,7 @@ function baseUrls() {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vike.global.config.baseServer ?? null, config.vike.global.config.baseAssets ?? null);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vike.config.baseServer ?? null, config.vike.config.baseAssets ?? null);
             // 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;

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

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildApp = buildApp;
+const runPrerender_js_1 = require("../../prerender/runPrerender.js");
+const context_js_1 = require("../../prerender/context.js");
+const getOutDirs_js_1 = require("../shared/getOutDirs.js");
+const utils_js_1 = require("../utils.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const getFullBuildInlineConfig_js_1 = require("../shared/getFullBuildInlineConfig.js");
+function buildApp() {
+    let config;
+    return [
+        {
+            name: 'vike:buildApp',
+            apply: 'build',
+            config(config) {
+                if (!config.vike.config.viteEnvironmentAPI)
+                    return;
+                return {
+                    builder: {
+                        buildApp: async (builder) => {
+                            (0, utils_js_1.assert)(builder.environments.client);
+                            (0, utils_js_1.assert)(builder.environments.ssr);
+                            await builder.build(builder.environments.client);
+                            await builder.build(builder.environments.ssr);
+                        }
+                    },
+                    environments: {
+                        ssr: {
+                            consumer: 'server',
+                            build: {
+                                outDir: (0, getOutDirs_js_1.resolveOutDir)(config, true),
+                                ssr: true
+                            }
+                        },
+                        client: {
+                            consumer: 'client',
+                            build: {
+                                copyPublicDir: true,
+                                ssr: false
+                            }
+                        }
+                    }
+                };
+            }
+        },
+        {
+            name: 'vike:buildApp:prerender',
+            apply: 'build',
+            enforce: 'pre',
+            applyToEnvironment(env) {
+                return env.name === 'ssr';
+            },
+            configResolved(_config) {
+                config = _config;
+            },
+            async writeBundle() {
+                if (!config.vike.config.viteEnvironmentAPI)
+                    return;
+                const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                if (!(0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig))
+                    return;
+                const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
+                const { forceExit } = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
+                if (forceExit) {
+                    (0, runPrerender_js_1.runPrerender_forceExit)();
+                    (0, utils_js_1.assert)(false);
+                }
+            }
+        }
+    ];
+}

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

@@ -7,7 +7,6 @@ exports.fixServerAssets = fixServerAssets;
 exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
 exports.fixServerAssets_assertCssCodeSplit = fixServerAssets_assertCssCodeSplit;
 exports.fixServerAssets_assertCssTarget = fixServerAssets_assertCssTarget;
-exports.fixServerAssets_assertCssTarget_populate = fixServerAssets_assertCssTarget_populate;
 const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -200,17 +199,15 @@ function fixServerAssets_assertCssCodeSplit(config) {
     (0, utils_js_1.assertWarning)(config.build.cssCodeSplit, `${picocolors_1.default.cyan('build.cssCodeSplit')} shouldn't be set to ${picocolors_1.default.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
-function fixServerAssets_assertCssTarget_populate(config) {
-    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config);
-    (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
-    (0, utils_js_1.assert)(config.build.target !== undefined);
-    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
-}
 async function fixServerAssets_assertCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
     if (!(await (0, getVikeConfig_js_1.isV1Design)(config)))
         return;
+    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config);
+    (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
+    (0, utils_js_1.assert)(config.build.target !== undefined);
+    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
     const targetsServer = targets.filter((t) => t.isServerSide);
     const targetsClient = targets.filter((t) => !t.isServerSide);
     targetsClient.forEach((targetClient) => {
@@ -218,9 +215,10 @@ async function fixServerAssets_assertCssTarget(config) {
         targetsServer.forEach((targetServer) => {
             const targetCssResolvedServer = resolveCssTarget(targetServer);
             (0, utils_js_1.assertWarning)((0, utils_js_1.isEqualStringList)(targetCssResolvedClient, targetCssResolvedServer), [
-                'The CSS browser target should be the same for both client-side and server-side (https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979) but we got:',
-                `Client-side: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
-                `Server-side: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`
+                'The CSS browser target should be the same for both client and server, but we got:',
+                `Client: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
+                `Server: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`,
+                `Different targets leads to CSS duplication, see ${picocolors_1.default.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`
             ].join('\n'), {
                 showStackTrace: true,
                 onlyOnce: 'different-css-target'

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

@@ -29,7 +29,6 @@ const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function buildConfig() {
     let isServerAssetsFixEnabled;
-    let isSsrBuild;
     let outDirs;
     let config;
     return [
@@ -55,7 +54,6 @@ function buildConfig() {
                             config.build.ssrEmitAssets = true;
                             // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
                             config.build.cssMinify = 'esbuild';
-                            (0, fixServerAssets_js_1.fixServerAssets_assertCssTarget_populate)(config);
                             (0, fixServerAssets_js_1.fixServerAssets_assertCssCodeSplit)(config);
                         }
                     }
@@ -65,12 +63,14 @@ function buildConfig() {
                 order: 'post',
                 handler(config) {
                     (0, utils_js_1.onSetupBuild)();
-                    isSsrBuild = (0, viteIsSSR_js_1.viteIsSSR)(config);
                     return {
                         build: {
                             outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
                             manifest: manifestTempFile,
-                            copyPublicDir: !isSsrBuild
+                            copyPublicDir: config.vike.config.viteEnvironmentAPI
+                                ? // Already set by buildApp() plugin
+                                    undefined
+                                : !(0, viteIsSSR_js_1.viteIsSSR)(config)
                         }
                     };
                 }
@@ -94,7 +94,7 @@ function buildConfig() {
                 order: 'pre',
                 sequential: true,
                 async handler(options, bundle) {
-                    if (isSsrBuild) {
+                    if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
                         // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
                         //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
                         //  - We'll able to do so once we replace `$ vite build` with `$ vike build`

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

@@ -47,14 +47,14 @@ function getServerProductionEntryCode(config) {
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
         `  import { setGlobalContext_buildEntry } from '${importPath}';`,
-        `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
+        `  import * as virtualFileExports from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
         // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MANIFEST};`,
         `    const buildInfo = ${JSON.stringify(buildInfo, null, 2)};`,
         '    setGlobalContext_buildEntry({',
-        `      pageFiles,`,
+        `      virtualFileExports,`,
         `      assetsManifest,`,
         `      buildInfo,`,
         '    });',

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

@@ -35,7 +35,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: { global: vikeConfig.global },
+                        vike: { config: vikeConfig.global.config },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
                             prerender: (0, context_js_2.isPrerenderEnabled)(vikeConfig)

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

@@ -9,7 +9,7 @@ const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/vi
 const vite_1 = require("vite");
 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 getVirtualFilePageConfigs_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigs.js");
 const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importUserCode = importUserCode;
 const vite_1 = require("vite");
-const getVirtualFilePageConfigValuesAll_js_1 = require("./v1-design/getVirtualFilePageConfigValuesAll.js");
+const getVirtualFilePageConfigValuesAll_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js");
 const getVirtualFileImportUserCode_js_1 = require("./getVirtualFileImportUserCode.js");
 const utils_js_1 = require("../../utils.js");
 const virtual_files_js_1 = require("../../../shared/virtual-files.js");
@@ -15,6 +15,8 @@ const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loggerNotProd_js_1 = require("../../shared/loggerNotProd.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
+const getPlusFilesAll_js_1 = require("./v1-design/getVikeConfig/getPlusFilesAll.js");
+const globalContext_js_1 = require("../../../runtime/globalContext.js");
 function importUserCode() {
     let config;
     let vikeConfig;
@@ -71,7 +73,7 @@ function handleFileAddRemove(server, config) {
     return;
     function listener(file, isRemove) {
         file = (0, vite_1.normalizePath)(file);
-        const isVikeConfig = isVikeConfigModule(file) || (0, getVikeConfig_js_1.isVikeConfigFile)(file);
+        const isVikeConfig = isVikeConfigModule(file) || isVikeConfigFile(file);
         if (isVikeConfig) {
             const virtualModules = getVirtualModules(server);
             virtualModules.forEach((mod) => {
@@ -123,6 +125,7 @@ function reloadConfig(filePath, config, op) {
         (0, loggerNotProd_js_1.logConfigInfo)(msg, 'info');
     }
     (0, getVikeConfig_js_1.reloadVikeConfig)(config);
+    (0, globalContext_js_1.updateUserFiles)();
 }
 function getVirtualModules(server) {
     const virtualModules = Array.from(server.moduleGraph.urlToModuleMap.keys())
@@ -134,3 +137,6 @@ function getVirtualModules(server) {
     });
     return virtualModules;
 }
+function isVikeConfigFile(filePath) {
+    return !!(0, getPlusFilesAll_js_1.getPlusFileValueConfigName)(filePath);
+}