vike 0.4.227-commit-68a216b → 0.4.227-commit-c9cc081

package/dist/cjs/node/plugin/plugins/build/pluginAutoFullBuild.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginAutoFullBuild = pluginAutoFullBuild;
 exports.isPrerenderForceExit = isPrerenderForceExit;
+const getResolvedConfig_js_1 = require("../../shared/getResolvedConfig.js");
 const vite_1 = require("vite");
 const utils_js_1 = require("../../utils.js");
 const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
@@ -20,7 +21,7 @@ const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
-    let config;
+    let vite5Config;
     let vikeConfig;
     return [
         {
@@ -29,7 +30,7 @@ function pluginAutoFullBuild() {
             enforce: 'pre',
             async configResolved(config_) {
                 vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
-                config = config_;
+                vite5Config = config_;
                 abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
@@ -38,6 +39,7 @@ function pluginAutoFullBuild() {
                 order: 'pre',
                 */
                 async handler(options, bundle) {
+                    const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
                     await (0, handleAssetsManifest_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
                     await triggerFullBuild(config, vikeConfig, this.environment, bundle);
                 }
@@ -51,6 +53,7 @@ function pluginAutoFullBuild() {
                 sequential: true,
                 order: 'post',
                 handler() {
+                    const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
                     (0, utils_js_1.onSetupBuild)();
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config);
                     if (forceExit &&

package/dist/cjs/node/plugin/plugins/build/pluginDistPackageJsonFile.js

@@ -9,17 +9,20 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginDistPackageJsonFile = pluginDistPackageJsonFile;
+// TODO/refactor: prefix all other plugins with `plugin` as well?
+const getResolvedConfig_js_1 = require("../../shared/getResolvedConfig.js");
 const rollupIsEsm_js_1 = require("../../shared/rollupIsEsm.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 function pluginDistPackageJsonFile() {
-    let config;
+    let vite5Config;
     return {
         name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
-            config = config_;
+            vite5Config = config_;
         },
         generateBundle(options, bundle) {
+            const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
             if (!(0, isViteServerBuild_js_1.isViteServerBuild)(config))
                 return;
             const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);

package/dist/cjs/node/plugin/plugins/build/pluginModuleBanner.js

@@ -1,25 +1,30 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
+const getResolvedConfig_js_1 = require("../../shared/getResolvedConfig.js");
+const magic_string_1 = __importDefault(require("magic-string"));
 const utils_js_1 = require("../../utils.js");
 const virtual_files_js_1 = require("../../../shared/virtual-files.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const rollupSourceMap_js_1 = require("../../shared/rollupSourceMap.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 const vikeModuleBannerPlaceholder = 'vikeModuleBannerPlaceholder';
 function pluginModuleBanner() {
-    let config;
+    let vite5Config;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
-            config = config_;
+            vite5Config = config_;
         },
         generateBundle: {
             order: 'post',
             handler(_options, bundle) {
+                const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
                 for (const module of Object.values(bundle)) {
                     if (module.type === 'chunk') {
                         if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
@@ -38,6 +43,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
+                const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
                 if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options))
                     return;
                 if (id.startsWith('\0'))
@@ -45,9 +51,13 @@ function pluginModuleBanner() {
                 id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
+                const s = new magic_string_1.default(code);
                 // No need to insert a new line; Rollup formats the code and will insert a new line.
-                const codeNew = `${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); ${code}`;
-                return (0, rollupSourceMap_js_1.sourceMapPassthrough)(codeNew);
+                s.prepend(`${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); `);
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ hires: true, source: id })
+                };
             }
         }
     };

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.devConfig = devConfig;
 exports.logDockerHint = logDockerHint;
+const getResolvedConfig_js_1 = require("../../shared/getResolvedConfig.js");
 const determineOptimizeDeps_js_1 = require("./determineOptimizeDeps.js");
 const determineFsAllowList_js_1 = require("./determineFsAllowList.js");
 const addSsrMiddleware_js_1 = require("../../shared/addSsrMiddleware.js");
@@ -17,7 +18,7 @@ if ((0, isErrorDebug_js_1.isErrorDebug)()) {
     Error.stackTraceLimit = Infinity;
 }
 function devConfig() {
-    let config;
+    let vite5Config;
     return [
         {
             name: 'vike:devConfig',
@@ -62,14 +63,14 @@ function devConfig() {
                 };
             },
             async configResolved(config_) {
-                config = config_;
-                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(config);
-                await (0, determineFsAllowList_js_1.determineFsAllowList)(config);
+                vite5Config = config_;
+                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(vite5Config);
+                await (0, determineFsAllowList_js_1.determineFsAllowList)(vite5Config);
                 if (!(0, isErrorDebug_js_1.isErrorDebug)()) {
                     await (0, getHttpRequestAsyncStore_js_1.installHttpRequestAsyncStore)();
-                    (0, loggerVite_js_1.improveViteLogs)(config);
+                    (0, loggerVite_js_1.improveViteLogs)(vite5Config);
                 }
-                logDockerHint(config.server.host);
+                logDockerHint(vite5Config.server.host);
             }
         },
         {
@@ -80,6 +81,7 @@ function devConfig() {
             configureServer: {
                 order: 'post',
                 handler(server) {
+                    const config = (0, getResolvedConfig_js_1.getResolvedConfig)(server?.config, vite5Config);
                     const hasHonoViteDevServer = !!config.plugins.find((p) => p.name === '@hono/vite-dev-server');
                     if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;

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

@@ -1,12 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.envVarsPlugin = envVarsPlugin;
+const magic_string_1 = __importDefault(require("magic-string"));
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const getResolvedConfig_js_1 = require("../shared/getResolvedConfig.js");
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -18,17 +22,18 @@ const PUBLIC_ENV_WHITELIST = [
 ];
 function envVarsPlugin() {
     let envsAll;
-    let config;
+    let vite5Config;
     return {
         name: 'vike:envVars',
         enforce: 'post',
         configResolved(config_) {
-            config = config_;
-            config.command;
-            envsAll = (0, vite_1.loadEnv)(config.mode, config.envDir || config.root, '');
-            config.plugins.sort((0, utils_js_1.lowerFirst)((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+            vite5Config = config_;
+            vite5Config.command;
+            envsAll = (0, vite_1.loadEnv)(vite5Config.mode, vite5Config.envDir || vite5Config.root, '');
+            vite5Config.plugins.sort((0, utils_js_1.lowerFirst)((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
         transform(code, id, options) {
+            const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
             id = (0, normalizeId_js_1.normalizeId)(id);
             (0, utils_js_1.assertPosixPath)(id);
             if (id.includes('/node_modules/'))
@@ -40,6 +45,7 @@ function envVarsPlugin() {
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
+            const s = new magic_string_1.default(code);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -48,12 +54,12 @@ function envVarsPlugin() {
             })
                 .forEach(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegEx = new RegExp((0, utils_js_1.escapeRegex)(envStatement) + '\\b', 'g');
+                const envStatementRegExStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {
                     const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!envStatementRegEx.test(code))
+                        if (!new RegExp(envStatementRegExStr).test(code))
                             return;
                         const modulePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -72,16 +78,21 @@ function envVarsPlugin() {
                     (0, utils_js_1.assert)(!(isPrivate && isClientSide) || !isBuild);
                 }
                 // Apply
-                code = applyEnvVar(envStatementRegEx, envVal, code);
+                applyEnvVar(s, envStatementRegExStr, envVal);
             });
-            // Line numbers didn't change.
-            //  - We only break the column number of a couple of lines, wich is acceptable.
-            //  - Anyways, I'm not even sure Vite supports high-resolution column number source mapping.
-            const ret = (0, rollupSourceMap_js_1.sourceMapPassthrough)(code);
-            return ret;
+            if (!s.hasChanged())
+                return null;
+            return {
+                code: s.toString(),
+                map: s.generateMap({ hires: true, source: id })
+            };
         }
     };
 }
-function applyEnvVar(envStatementRegEx, envVal, code) {
-    return code.replace(envStatementRegEx, JSON.stringify(envVal));
+function applyEnvVar(s, envStatementRegExStr, envVal) {
+    const envStatementRegEx = new RegExp(envStatementRegExStr, 'g');
+    let match;
+    while ((match = envStatementRegEx.exec(s.original))) {
+        s.overwrite(match.index, match.index + match[0].length, JSON.stringify(envVal));
+    }
 }

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

@@ -7,6 +7,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractAssetsRE = void 0;
 exports.extractAssetsPlugin = extractAssetsPlugin;
+// Workaround to make client-side bundles include the CSS imports living in server-side-only code.
+//  - This is needed for HTML-only pages, and React Server Components.
+//  - We recommend using the debug flag to get an idea of how this plugin works: `$ DEBUG=vike:extractAssets pnpm exec vike build`. Then have a look at `dist/client/manifest.json` and see how `.page.server.js` entries have zero JavaScript but only CSS.
+//  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
+const getResolvedConfig_js_1 = require("../shared/getResolvedConfig.js");
 const utils_js_1 = require("../utils.js");
 const virtual_files_js_1 = require("../../shared/virtual-files.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
@@ -26,7 +31,7 @@ const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = (0, utils_js_1.createDebugger)('vike:extractAssets');
 function extractAssetsPlugin() {
-    let config;
+    let vite5Config;
     let vikeConfig;
     let isFixEnabled;
     return [
@@ -37,6 +42,7 @@ function extractAssetsPlugin() {
             apply: 'build',
             enforce: 'post',
             async transform(src, id, options) {
+                const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
                 id = (0, normalizeId_js_1.normalizeId)(id);
                 if (!extractAssetsRE.test(id)) {
                     return;
@@ -65,6 +71,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
+                const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
                 if ((0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
@@ -140,12 +147,12 @@ function extractAssetsPlugin() {
         {
             name: 'vike:extractAssets-4',
             async configResolved(config_) {
-                config = config_;
-                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config);
+                vite5Config = config_;
+                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(vite5Config);
+                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(vite5Config);
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
-                    (0, utils_js_1.assertUsage)(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
+                    (0, utils_js_1.assertUsage)(!vite5Config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
                 }
             }
         }

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileEnv = fileEnv;
+const getResolvedConfig_js_1 = require("../shared/getResolvedConfig.js");
 const utils_js_1 = require("../utils.js");
 const extractAssetsPlugin_js_1 = require("./extractAssetsPlugin.js");
 const extractExportNamesPlugin_js_1 = require("./extractExportNamesPlugin.js");
@@ -14,17 +15,18 @@ const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 function fileEnv() {
-    let config;
+    let vite5Config;
     let viteDevServer;
     return {
         name: 'vike:fileEnv',
         load(id, options) {
+            const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
             // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
             if (!viteDevServer)
                 return;
             if (!(0, getVikeConfig_js_1.isV1Design)(config))
                 return;
-            if (skip(id))
+            if (skip(config, id))
                 return;
             // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
             if (id.endsWith('?direct'))
@@ -34,24 +36,25 @@ function fileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(id, !!options?.ssr, importers, 
+            assertFileEnv(config, id, !!options?.ssr, importers, 
             // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
             true);
         },
         // In production, we have to use transform() to replace modules with a runtime error because generateBundle() doesn't work for dynamic imports. In production, dynamic imports can only be verified at runtime.
         async transform(code, id, options) {
+            const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
             id = (0, normalizeId_js_1.normalizeId)(id);
             // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
             if (viteDevServer)
                 return;
-            if (skip(id))
+            if (skip(config, id))
                 return;
             const isServerSide = !!options?.ssr;
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);
             // Throwing a verbose error doesn't waste client-side KBs as dynamic imports are code splitted.
-            const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
+            const errMsg = getErrorMessage(config, id, isServerSide, importers, false, true);
             // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
             const { exportNames } = await (0, parseEsModule_js_1.getExportNames)(code);
             return (0, rollupSourceMap_js_1.sourceMapRemove)([
@@ -60,8 +63,9 @@ function fileEnv() {
             ].join('\n'));
         },
         generateBundle() {
+            const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
             Array.from(this.getModuleIds())
-                .filter((id) => !skip(id))
+                .filter((id) => !skip(config, id))
                 .forEach((moduleId) => {
                 const mod = this.getModuleInfo(moduleId);
                 const { importers } = mod;
@@ -72,20 +76,20 @@ function fileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(config, moduleId, !!config.build.ssr, importers, false);
             });
         },
         configResolved(config_) {
-            config = config_;
+            vite5Config = config_;
         },
         configureServer(viteDevServer_) {
             viteDevServer = viteDevServer_;
         }
     };
-    function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
+    function assertFileEnv(config, moduleId, isServerSide, importers, onlyWarn) {
         if (!isWrongEnv(moduleId, isServerSide))
             return;
-        const errMsg = getErrorMessage(moduleId, isServerSide, importers, onlyWarn, false);
+        const errMsg = getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, false);
         if (onlyWarn) {
             (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
         }
@@ -93,7 +97,7 @@ function fileEnv() {
             (0, utils_js_1.assertUsage)(false, errMsg);
         }
     }
-    function getErrorMessage(moduleId, isServerSide, importers, onlyWarn, noColor) {
+    function getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, noColor) {
         const modulePath = getModulePath(moduleId);
         const envActual = isServerSide ? 'server' : 'client';
         const envExpect = isServerSide ? 'client' : 'server';
@@ -118,7 +122,7 @@ function fileEnv() {
         const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
         return modulePath.includes(suffixWrong);
     }
-    function skip(id) {
+    function skip(config, id) {
         // TODO/v1-release: remove
         if (extractAssetsPlugin_js_1.extractAssetsRE.test(id) || extractExportNamesPlugin_js_1.extractExportNamesRE.test(id))
             return true;

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importUserCode = importUserCode;
+const getResolvedConfig_js_1 = require("../../shared/getResolvedConfig.js");
 const vite_1 = require("vite");
 const getVirtualFilePageConfigValuesAll_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js");
 const getVirtualFileImportUserCode_js_1 = require("./getVirtualFileImportUserCode.js");
@@ -18,16 +19,16 @@ const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const crawlPlusFiles_js_1 = require("./v1-design/getVikeConfig/crawlPlusFiles.js");
 function importUserCode() {
-    let config;
+    let vite5Config;
     let vikeConfig;
     return {
         name: 'vike:importUserCode',
         async configResolved(config_) {
             vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
-            config = config_;
+            vite5Config = config_;
             // TODO/v1-release: remove
-            if (!(0, getVikeConfig_js_1.isV1Design)(config))
-                config.experimental.importGlobRestoreExtension = true;
+            if (!(0, getVikeConfig_js_1.isV1Design)(vite5Config))
+                vite5Config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
             if ((0, virtual_files_js_1.isVirtualFileId)(id)) {
@@ -36,7 +37,7 @@ function importUserCode() {
         },
         async handleHotUpdate(ctx) {
             try {
-                return await handleHotUpdate(ctx, config);
+                return await handleHotUpdate(ctx, vite5Config);
             }
             catch (err) {
                 // Vite swallows errors thrown by handleHotUpdate()
@@ -45,6 +46,7 @@ function importUserCode() {
             }
         },
         async load(id, options) {
+            const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
             if (!(0, virtual_files_js_1.isVirtualFileId)(id))
                 return undefined;
             id = (0, virtual_files_js_1.getVirtualFileId)(id);
@@ -60,7 +62,7 @@ function importUserCode() {
             }
         },
         configureServer(server) {
-            handleFileAddRemove(server, config);
+            handleFileAddRemove(server, vite5Config);
         }
     };
 }

package/dist/cjs/node/plugin/shared/getResolvedConfig.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getResolvedConfig = getResolvedConfig;
+function getResolvedConfig(vite6Config, vite5Config) {
+    return vite6Config ?? vite5Config;
+}

package/dist/cjs/utils/PROJECT_VERSION.js

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

package/dist/esm/node/plugin/plugins/build/pluginAutoFullBuild.js

@@ -1,3 +1,4 @@
+import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginAutoFullBuild };
 export { isPrerenderForceExit };
 import { build } from 'vite';
@@ -15,7 +16,7 @@ import { isViteClientBuild, isViteServerBuild_onlySsrEnv } from '../../shared/is
 assertIsSingleModuleInstance('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
-    let config;
+    let vite5Config;
     let vikeConfig;
     return [
         {
@@ -24,7 +25,7 @@ function pluginAutoFullBuild() {
             enforce: 'pre',
             async configResolved(config_) {
                 vikeConfig = await getVikeConfig(config_);
-                config = config_;
+                vite5Config = config_;
                 abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
@@ -33,6 +34,7 @@ function pluginAutoFullBuild() {
                 order: 'pre',
                 */
                 async handler(options, bundle) {
+                    const config = getResolvedConfig(this.environment?.config, vite5Config);
                     await handleAssetsManifest(config, this.environment, options, bundle);
                     await triggerFullBuild(config, vikeConfig, this.environment, bundle);
                 }
@@ -46,6 +48,7 @@ function pluginAutoFullBuild() {
                 sequential: true,
                 order: 'post',
                 handler() {
+                    const config = getResolvedConfig(this.environment?.config, vite5Config);
                     onSetupBuild();
                     handleAssetsManifest_assertUsageCssTarget(config);
                     if (forceExit &&

package/dist/esm/node/plugin/plugins/build/pluginDistPackageJsonFile.js

@@ -7,18 +7,20 @@
  * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
  */
 // TODO/refactor: prefix all other plugins with `plugin` as well?
+import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginDistPackageJsonFile };
 import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
 import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
 function pluginDistPackageJsonFile() {
-    let config;
+    let vite5Config;
     return {
         name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
-            config = config_;
+            vite5Config = config_;
         },
         generateBundle(options, bundle) {
+            const config = getResolvedConfig(this.environment?.config, vite5Config);
             if (!isViteServerBuild(config))
                 return;
             const isEsm = rollupIsEsm(options);

package/dist/esm/node/plugin/plugins/build/pluginModuleBanner.js

@@ -1,23 +1,25 @@
+import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginModuleBanner };
+import MagicString from 'magic-string';
 import { assert } from '../../utils.js';
 import { removeVirtualIdTag } from '../../../shared/virtual-files.js';
 import { isViteServerBuild, isViteServerBuild_safe } from '../../shared/isViteServerBuild.js';
-import { sourceMapPassthrough } from '../../shared/rollupSourceMap.js';
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 const vikeModuleBannerPlaceholder = 'vikeModuleBannerPlaceholder';
 function pluginModuleBanner() {
-    let config;
+    let vite5Config;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
-            config = config_;
+            vite5Config = config_;
         },
         generateBundle: {
             order: 'post',
             handler(_options, bundle) {
+                const config = getResolvedConfig(this.environment?.config, vite5Config);
                 for (const module of Object.values(bundle)) {
                     if (module.type === 'chunk') {
                         if (isViteServerBuild(config)) {
@@ -36,6 +38,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
+                const config = getResolvedConfig(this.environment?.config, vite5Config);
                 if (!isViteServerBuild_safe(config, options))
                     return;
                 if (id.startsWith('\0'))
@@ -43,9 +46,13 @@ function pluginModuleBanner() {
                 id = removeVirtualIdTag(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
+                const s = new MagicString(code);
                 // No need to insert a new line; Rollup formats the code and will insert a new line.
-                const codeNew = `${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); ${code}`;
-                return sourceMapPassthrough(codeNew);
+                s.prepend(`${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); `);
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ hires: true, source: id })
+                };
             }
         }
     };

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

@@ -1,3 +1,4 @@
+import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { devConfig };
 export { logDockerHint };
 import { determineOptimizeDeps } from './determineOptimizeDeps.js';
@@ -12,7 +13,7 @@ if (isErrorDebug()) {
     Error.stackTraceLimit = Infinity;
 }
 function devConfig() {
-    let config;
+    let vite5Config;
     return [
         {
             name: 'vike:devConfig',
@@ -57,14 +58,14 @@ function devConfig() {
                 };
             },
             async configResolved(config_) {
-                config = config_;
-                await determineOptimizeDeps(config);
-                await determineFsAllowList(config);
+                vite5Config = config_;
+                await determineOptimizeDeps(vite5Config);
+                await determineFsAllowList(vite5Config);
                 if (!isErrorDebug()) {
                     await installHttpRequestAsyncStore();
-                    improveViteLogs(config);
+                    improveViteLogs(vite5Config);
                 }
-                logDockerHint(config.server.host);
+                logDockerHint(vite5Config.server.host);
             }
         },
         {
@@ -75,6 +76,7 @@ function devConfig() {
             configureServer: {
                 order: 'post',
                 handler(server) {
+                    const config = getResolvedConfig(server?.config, vite5Config);
                     const hasHonoViteDevServer = !!config.plugins.find((p) => p.name === '@hono/vite-dev-server');
                     if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;

package/dist/esm/node/plugin/plugins/envVars.js

@@ -1,10 +1,11 @@
+import MagicString from 'magic-string';
 export { envVarsPlugin };
 import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.js';
-import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
+import { getResolvedConfig } from '../shared/getResolvedConfig.js';
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -16,17 +17,18 @@ const PUBLIC_ENV_WHITELIST = [
 ];
 function envVarsPlugin() {
     let envsAll;
-    let config;
+    let vite5Config;
     return {
         name: 'vike:envVars',
         enforce: 'post',
         configResolved(config_) {
-            config = config_;
-            config.command;
-            envsAll = loadEnv(config.mode, config.envDir || config.root, '');
-            config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+            vite5Config = config_;
+            vite5Config.command;
+            envsAll = loadEnv(vite5Config.mode, vite5Config.envDir || vite5Config.root, '');
+            vite5Config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
         transform(code, id, options) {
+            const config = getResolvedConfig(this.environment?.config, vite5Config);
             id = normalizeId(id);
             assertPosixPath(id);
             if (id.includes('/node_modules/'))
@@ -38,6 +40,7 @@ function envVarsPlugin() {
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !isViteServerBuild_safe(config, options);
+            const s = new MagicString(code);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -46,12 +49,12 @@ function envVarsPlugin() {
             })
                 .forEach(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegEx = new RegExp(escapeRegex(envStatement) + '\\b', 'g');
+                const envStatementRegExStr = escapeRegex(envStatement) + '\\b';
                 // Security check
                 {
                     const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!envStatementRegEx.test(code))
+                        if (!new RegExp(envStatementRegExStr).test(code))
                             return;
                         const modulePath = getModuleFilePathAbsolute(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -70,16 +73,21 @@ function envVarsPlugin() {
                     assert(!(isPrivate && isClientSide) || !isBuild);
                 }
                 // Apply
-                code = applyEnvVar(envStatementRegEx, envVal, code);
+                applyEnvVar(s, envStatementRegExStr, envVal);
             });
-            // Line numbers didn't change.
-            //  - We only break the column number of a couple of lines, wich is acceptable.
-            //  - Anyways, I'm not even sure Vite supports high-resolution column number source mapping.
-            const ret = sourceMapPassthrough(code);
-            return ret;
+            if (!s.hasChanged())
+                return null;
+            return {
+                code: s.toString(),
+                map: s.generateMap({ hires: true, source: id })
+            };
         }
     };
 }
-function applyEnvVar(envStatementRegEx, envVal, code) {
-    return code.replace(envStatementRegEx, JSON.stringify(envVal));
+function applyEnvVar(s, envStatementRegExStr, envVal) {
+    const envStatementRegEx = new RegExp(envStatementRegExStr, 'g');
+    let match;
+    while ((match = envStatementRegEx.exec(s.original))) {
+        s.overwrite(match.index, match.index + match[0].length, JSON.stringify(envVal));
+    }
 }

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

@@ -4,6 +4,7 @@
 //  - This is needed for HTML-only pages, and React Server Components.
 //  - We recommend using the debug flag to get an idea of how this plugin works: `$ DEBUG=vike:extractAssets pnpm exec vike build`. Then have a look at `dist/client/manifest.json` and see how `.page.server.js` entries have zero JavaScript but only CSS.
 //  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
+import { getResolvedConfig } from '../shared/getResolvedConfig.js';
 export { extractAssetsPlugin };
 export { extractAssetsRE };
 import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage } from '../utils.js';
@@ -24,7 +25,7 @@ const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = createDebugger('vike:extractAssets');
 function extractAssetsPlugin() {
-    let config;
+    let vite5Config;
     let vikeConfig;
     let isFixEnabled;
     return [
@@ -35,6 +36,7 @@ function extractAssetsPlugin() {
             apply: 'build',
             enforce: 'post',
             async transform(src, id, options) {
+                const config = getResolvedConfig(this.environment?.config, vite5Config);
                 id = normalizeId(id);
                 if (!extractAssetsRE.test(id)) {
                     return;
@@ -63,6 +65,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
+                const config = getResolvedConfig(this.environment?.config, vite5Config);
                 if (isViteServerBuild_safe(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     assert(!extractAssetsRE.test(source));
@@ -138,12 +141,12 @@ function extractAssetsPlugin() {
         {
             name: 'vike:extractAssets-4',
             async configResolved(config_) {
-                config = config_;
-                vikeConfig = await getVikeConfig(config);
-                isFixEnabled = handleAssetsManifest_isFixEnabled(config);
+                vite5Config = config_;
+                vikeConfig = await getVikeConfig(vite5Config);
+                isFixEnabled = handleAssetsManifest_isFixEnabled(vite5Config);
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
-                    assertUsage(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
+                    assertUsage(!vite5Config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
                 }
             }
         }

package/dist/esm/node/plugin/plugins/fileEnv.js

@@ -1,3 +1,4 @@
+import { getResolvedConfig } from '../shared/getResolvedConfig.js';
 export { fileEnv };
 import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish } from '../utils.js';
 import { extractAssetsRE } from './extractAssetsPlugin.js';
@@ -9,17 +10,18 @@ import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 function fileEnv() {
-    let config;
+    let vite5Config;
     let viteDevServer;
     return {
         name: 'vike:fileEnv',
         load(id, options) {
+            const config = getResolvedConfig(this.environment?.config, vite5Config);
             // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
             if (!viteDevServer)
                 return;
             if (!isV1Design(config))
                 return;
-            if (skip(id))
+            if (skip(config, id))
                 return;
             // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
             if (id.endsWith('?direct'))
@@ -29,24 +31,25 @@ function fileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(id, !!options?.ssr, importers, 
+            assertFileEnv(config, id, !!options?.ssr, importers, 
             // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
             true);
         },
         // In production, we have to use transform() to replace modules with a runtime error because generateBundle() doesn't work for dynamic imports. In production, dynamic imports can only be verified at runtime.
         async transform(code, id, options) {
+            const config = getResolvedConfig(this.environment?.config, vite5Config);
             id = normalizeId(id);
             // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
             if (viteDevServer)
                 return;
-            if (skip(id))
+            if (skip(config, id))
                 return;
             const isServerSide = !!options?.ssr;
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);
             // Throwing a verbose error doesn't waste client-side KBs as dynamic imports are code splitted.
-            const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
+            const errMsg = getErrorMessage(config, id, isServerSide, importers, false, true);
             // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
             const { exportNames } = await getExportNames(code);
             return sourceMapRemove([
@@ -55,8 +58,9 @@ function fileEnv() {
             ].join('\n'));
         },
         generateBundle() {
+            const config = getResolvedConfig(this.environment?.config, vite5Config);
             Array.from(this.getModuleIds())
-                .filter((id) => !skip(id))
+                .filter((id) => !skip(config, id))
                 .forEach((moduleId) => {
                 const mod = this.getModuleInfo(moduleId);
                 const { importers } = mod;
@@ -67,20 +71,20 @@ function fileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(config, moduleId, !!config.build.ssr, importers, false);
             });
         },
         configResolved(config_) {
-            config = config_;
+            vite5Config = config_;
         },
         configureServer(viteDevServer_) {
             viteDevServer = viteDevServer_;
         }
     };
-    function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
+    function assertFileEnv(config, moduleId, isServerSide, importers, onlyWarn) {
         if (!isWrongEnv(moduleId, isServerSide))
             return;
-        const errMsg = getErrorMessage(moduleId, isServerSide, importers, onlyWarn, false);
+        const errMsg = getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, false);
         if (onlyWarn) {
             assertWarning(false, errMsg, { onlyOnce: true });
         }
@@ -88,7 +92,7 @@ function fileEnv() {
             assertUsage(false, errMsg);
         }
     }
-    function getErrorMessage(moduleId, isServerSide, importers, onlyWarn, noColor) {
+    function getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, noColor) {
         const modulePath = getModulePath(moduleId);
         const envActual = isServerSide ? 'server' : 'client';
         const envExpect = isServerSide ? 'client' : 'server';
@@ -113,7 +117,7 @@ function fileEnv() {
         const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
         return modulePath.includes(suffixWrong);
     }
-    function skip(id) {
+    function skip(config, id) {
         // TODO/v1-release: remove
         if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
             return true;

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

@@ -1,3 +1,4 @@
+import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { importUserCode };
 import { normalizePath } from 'vite';
 import { getVirtualFilePageConfigValuesAll } from './v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js';
@@ -13,16 +14,16 @@ import { getModuleFilePathAbsolute } from '../../shared/getFilePath.js';
 import { updateUserFiles } from '../../../runtime/globalContext.js';
 import { isPlusFile } from './v1-design/getVikeConfig/crawlPlusFiles.js';
 function importUserCode() {
-    let config;
+    let vite5Config;
     let vikeConfig;
     return {
         name: 'vike:importUserCode',
         async configResolved(config_) {
             vikeConfig = await getVikeConfig(config_);
-            config = config_;
+            vite5Config = config_;
             // TODO/v1-release: remove
-            if (!isV1Design(config))
-                config.experimental.importGlobRestoreExtension = true;
+            if (!isV1Design(vite5Config))
+                vite5Config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
             if (isVirtualFileId(id)) {
@@ -31,7 +32,7 @@ function importUserCode() {
         },
         async handleHotUpdate(ctx) {
             try {
-                return await handleHotUpdate(ctx, config);
+                return await handleHotUpdate(ctx, vite5Config);
             }
             catch (err) {
                 // Vite swallows errors thrown by handleHotUpdate()
@@ -40,6 +41,7 @@ function importUserCode() {
             }
         },
         async load(id, options) {
+            const config = getResolvedConfig(this.environment?.config, vite5Config);
             if (!isVirtualFileId(id))
                 return undefined;
             id = getVirtualFileId(id);
@@ -55,7 +57,7 @@ function importUserCode() {
             }
         },
         configureServer(server) {
-            handleFileAddRemove(server, config);
+            handleFileAddRemove(server, vite5Config);
         }
     };
 }

package/dist/esm/node/plugin/shared/getResolvedConfig.d.ts

@@ -0,0 +1,2 @@
+import type { ResolvedConfig } from 'vite';
+export declare function getResolvedConfig(vite6Config: ResolvedConfig | undefined, vite5Config: ResolvedConfig): ResolvedConfig;

package/dist/esm/node/plugin/shared/getResolvedConfig.js

@@ -0,0 +1,3 @@
+export function getResolvedConfig(vite6Config, vite5Config) {
+    return vite6Config ?? vite5Config;
+}

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.227-commit-68a216b";
+export declare const PROJECT_VERSION: "0.4.227-commit-c9cc081";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.227-commit-68a216b';
+export const PROJECT_VERSION = '0.4.227-commit-c9cc081';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-68a216b",
+  "version": "0.4.227-commit-c9cc081",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -129,6 +129,7 @@
     "es-module-lexer": "^1.0.0",
     "esbuild": "^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0",
     "json5": "^2.0.0",
+    "magic-string": "^0.30.17",
     "picomatch": "^4.0.2",
     "semver": "^7.0.0",
     "sirv": "^3.0.1",