vike 0.4.227-commit-c9cc081 → 0.4.227-commit-e36b916

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

@@ -5,7 +5,6 @@ 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");
@@ -21,7 +20,7 @@ const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
-    let vite5Config;
+    let config;
     let vikeConfig;
     return [
         {
@@ -30,7 +29,7 @@ function pluginAutoFullBuild() {
             enforce: 'pre',
             async configResolved(config_) {
                 vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
-                vite5Config = config_;
+                config = config_;
                 abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
@@ -39,7 +38,6 @@ 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);
                 }
@@ -53,7 +51,6 @@ 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,20 +9,17 @@
  */
 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 vite5Config;
+    let config;
     return {
         name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
-            vite5Config = config_;
+            config = 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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (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");
@@ -13,24 +12,34 @@ const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 // 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 vite5Config;
+    let config;
+    let disabled = false;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
-            vite5Config = config_;
+            config = config_;
+            if (config.build.minify && config.build.minify !== 'esbuild') {
+                // Doesn't work upon `config.build.minify === 'terser'`
+                // https://github.com/vikejs/vike/issues/2315
+                disabled = true;
+            }
         },
         generateBundle: {
             order: 'post',
             handler(_options, bundle) {
-                const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
+                if (disabled)
+                    return;
                 for (const module of Object.values(bundle)) {
                     if (module.type === 'chunk') {
                         if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
                             const codeOld = module.code;
                             const codeNew = codeOld.replace(/vikeModuleBannerPlaceholder\("([^"]*)"\);/g, '/* $1 [vike:pluginModuleBanner] */');
-                            (0, utils_js_1.assert)(!codeNew.includes(vikeModuleBannerPlaceholder));
+                            if (codeNew.includes(vikeModuleBannerPlaceholder)) {
+                                console.log('codeNew', codeNew);
+                                (0, utils_js_1.assert)(false);
+                            }
                             module.code = codeNew;
                         }
                         else {
@@ -43,7 +52,8 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
+                if (disabled)
+                    return;
                 if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options))
                     return;
                 if (id.startsWith('\0'))

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

@@ -5,7 +5,6 @@ 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");
@@ -18,7 +17,7 @@ if ((0, isErrorDebug_js_1.isErrorDebug)()) {
     Error.stackTraceLimit = Infinity;
 }
 function devConfig() {
-    let vite5Config;
+    let config;
     return [
         {
             name: 'vike:devConfig',
@@ -63,14 +62,14 @@ function devConfig() {
                 };
             },
             async configResolved(config_) {
-                vite5Config = config_;
-                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(vite5Config);
-                await (0, determineFsAllowList_js_1.determineFsAllowList)(vite5Config);
+                config = config_;
+                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(config);
+                await (0, determineFsAllowList_js_1.determineFsAllowList)(config);
                 if (!(0, isErrorDebug_js_1.isErrorDebug)()) {
                     await (0, getHttpRequestAsyncStore_js_1.installHttpRequestAsyncStore)();
-                    (0, loggerVite_js_1.improveViteLogs)(vite5Config);
+                    (0, loggerVite_js_1.improveViteLogs)(config);
                 }
-                logDockerHint(vite5Config.server.host);
+                logDockerHint(config.server.host);
             }
         },
         {
@@ -81,7 +80,6 @@ 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

@@ -10,30 +10,28 @@ const utils_js_1 = require("../utils.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
 //   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
-const PUBLIC_ENV_WHITELIST = [
+const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK'
 ];
 function envVarsPlugin() {
     let envsAll;
-    let vite5Config;
+    let config;
     return {
         name: 'vike:envVars',
         enforce: 'post',
         configResolved(config_) {
-            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)));
+            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)));
         },
         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/'))
@@ -57,7 +55,7 @@ function envVarsPlugin() {
                 const envStatementRegExStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {
-                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
+                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
                         if (!new RegExp(envStatementRegExStr).test(code))
                             return;

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

@@ -7,17 +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");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const handleAssetsManifest_js_1 = require("./build/handleAssetsManifest.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
@@ -31,7 +25,7 @@ const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = (0, utils_js_1.createDebugger)('vike:extractAssets');
 function extractAssetsPlugin() {
-    let vite5Config;
+    let config;
     let vikeConfig;
     let isFixEnabled;
     return [
@@ -42,7 +36,6 @@ 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;
@@ -59,7 +52,7 @@ function extractAssetsPlugin() {
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
+                return (0, utils_js_1.rollupSourceMapRemove)(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs
@@ -71,7 +64,6 @@ 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));
@@ -147,12 +139,12 @@ function extractAssetsPlugin() {
         {
             name: 'vike:extractAssets-4',
             async configResolved(config_) {
-                vite5Config = config_;
-                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(vite5Config);
-                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(vite5Config);
+                config = config_;
+                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config);
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
-                    (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');
+                    (0, utils_js_1.assertUsage)(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
                 }
             }
         }

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

@@ -5,7 +5,6 @@ exports.extractExportNamesPlugin = extractExportNamesPlugin;
 exports.isUsingClientRouter = isUsingClientRouter;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
@@ -42,7 +41,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
+    return (0, utils_js_1.rollupSourceMapRemove)(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

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

@@ -4,29 +4,26 @@ 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");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getFilePath_js_1 = require("../shared/getFilePath.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 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 vite5Config;
+    let config;
     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(config, id))
+            if (skip(id))
                 return;
             // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
             if (id.endsWith('?direct'))
@@ -36,36 +33,34 @@ function fileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(config, id, !!options?.ssr, importers, 
+            assertFileEnv(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(config, id))
+            if (skip(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(config, id, isServerSide, importers, false, true);
+            const errMsg = getErrorMessage(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)([
+            return (0, utils_js_1.rollupSourceMapRemove)([
                 `throw new Error(${JSON.stringify(errMsg)});`,
                 ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`)
             ].join('\n'));
         },
         generateBundle() {
-            const config = (0, getResolvedConfig_js_1.getResolvedConfig)(this.environment?.config, vite5Config);
             Array.from(this.getModuleIds())
-                .filter((id) => !skip(config, id))
+                .filter((id) => !skip(id))
                 .forEach((moduleId) => {
                 const mod = this.getModuleInfo(moduleId);
                 const { importers } = mod;
@@ -76,20 +71,20 @@ function fileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(config, moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
             });
         },
         configResolved(config_) {
-            vite5Config = config_;
+            config = config_;
         },
         configureServer(viteDevServer_) {
             viteDevServer = viteDevServer_;
         }
     };
-    function assertFileEnv(config, moduleId, isServerSide, importers, onlyWarn) {
+    function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
         if (!isWrongEnv(moduleId, isServerSide))
             return;
-        const errMsg = getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, false);
+        const errMsg = getErrorMessage(moduleId, isServerSide, importers, onlyWarn, false);
         if (onlyWarn) {
             (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
         }
@@ -97,7 +92,7 @@ function fileEnv() {
             (0, utils_js_1.assertUsage)(false, errMsg);
         }
     }
-    function getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, noColor) {
+    function getErrorMessage(moduleId, isServerSide, importers, onlyWarn, noColor) {
         const modulePath = getModulePath(moduleId);
         const envActual = isServerSide ? 'server' : 'client';
         const envExpect = isServerSide ? 'client' : 'server';
@@ -122,7 +117,7 @@ function fileEnv() {
         const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
         return modulePath.includes(suffixWrong);
     }
-    function skip(config, id) {
+    function skip(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,7 +4,6 @@ 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");
@@ -19,16 +18,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 vite5Config;
+    let config;
     let vikeConfig;
     return {
         name: 'vike:importUserCode',
         async configResolved(config_) {
             vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
-            vite5Config = config_;
+            config = config_;
             // TODO/v1-release: remove
-            if (!(0, getVikeConfig_js_1.isV1Design)(vite5Config))
-                vite5Config.experimental.importGlobRestoreExtension = true;
+            if (!(0, getVikeConfig_js_1.isV1Design)(config))
+                config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
             if ((0, virtual_files_js_1.isVirtualFileId)(id)) {
@@ -37,7 +36,7 @@ function importUserCode() {
         },
         async handleHotUpdate(ctx) {
             try {
-                return await handleHotUpdate(ctx, vite5Config);
+                return await handleHotUpdate(ctx, config);
             }
             catch (err) {
                 // Vite swallows errors thrown by handleHotUpdate()
@@ -46,7 +45,6 @@ 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);
@@ -62,7 +60,7 @@ function importUserCode() {
             }
         },
         configureServer(server) {
-            handleFileAddRemove(server, vite5Config);
+            handleFileAddRemove(server, config);
         }
     };
 }

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

@@ -45,3 +45,4 @@ __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/isEqualStringList.js"), exports);
 __exportStar(require("../../utils/isDocker.js"), exports);
 __exportStar(require("../../utils/isVitest.js"), exports);
+__exportStar(require("../../utils/rollupSourceMap.js"), exports);

package/dist/cjs/shared/route/executeOnBeforeRouteHook.js

@@ -72,7 +72,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'urlLogical')) {
         (0, utils_js_1.assertUsageUrlPathnameAbsolute)(
         // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
-        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} but ${picocolors_1.default.cyan('urlLogical')}`);
+        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} and ${picocolors_1.default.cyan('urlLogical')}`);
     }
     (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(hookReturn.pageContext, {
         hookFilePath: onBeforeRouteHook.hookFilePath,

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-c9cc081';
+exports.PROJECT_VERSION = '0.4.227-commit-e36b916';

package/dist/cjs/utils/isScriptFile.js

@@ -8,12 +8,12 @@ const assert_js_1 = require("./assert.js");
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
 //    - Vite's `import.meta.glob()` uses Micromatch
-//  - We need this to be a whitelist because:
+//  - We need this to be a allowlist because:
 //   - A pattern `*([a-zA-Z0-9]` doesn't work.
 //     - Because of ReScript: `.res` are ReScript source files which need to be ignored. (The ReScript compiler generates `.js` files alongside `.res` files.)
-//   - Black listing doesn't work.
-//     - We cannot implement a blacklist with a glob pattern.
-//     - A post `import.meta.glob()` blacklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
+//   - Block listing doesn't work.
+//     - We cannot implement a blocklist with a glob pattern.
+//     - A post `import.meta.glob()` blocklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
 // prettier-ignore
 // biome-ignore format:
 const extJavaScript = [

package/dist/cjs/utils/parseUrl.js

@@ -186,14 +186,14 @@ function parseProtocol(uri) {
     return { protocol, uriWithoutProtocol };
 }
 function isUrlProtocol(protocol) {
-    // Is there an altenrative to having a blacklist?
-    // - If the blacklist becomes too big, maybe use a whitelist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
-    const blacklist = [
+    // Is there an alternative to having a blocklist?
+    // - If the blocklist becomes too big, maybe use a allowlist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
+    const blocklist = [
         // https://docs.ipfs.tech/how-to/address-ipfs-on-web
         'ipfs://',
         'ipns://'
     ];
-    if (blacklist.includes(protocol))
+    if (blocklist.includes(protocol))
         return false;
     return protocol.endsWith('://');
 }

package/dist/cjs/{node/plugin/shared → utils}/rollupSourceMap.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sourceMapRemove = sourceMapRemove;
-exports.sourceMapPassthrough = sourceMapPassthrough;
+exports.rollupSourceMapRemove = rollupSourceMapRemove;
+exports.rollupSourceMapPassthrough = rollupSourceMapPassthrough;
 // https://rollupjs.org/guide/en/#source-code-transformations
 /** Remove entire source mapping, to save KBs. */
-function sourceMapRemove(code) {
+function rollupSourceMapRemove(code) {
     return {
         code,
         map: { mappings: '' }
     };
 }
 /** Don't provide any source map, pass through current source map instead. */
-function sourceMapPassthrough(code) {
+function rollupSourceMapPassthrough(code) {
     return {
         code,
         map: null

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

@@ -1,4 +1,3 @@
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginAutoFullBuild };
 export { isPrerenderForceExit };
 import { build } from 'vite';
@@ -16,7 +15,7 @@ import { isViteClientBuild, isViteServerBuild_onlySsrEnv } from '../../shared/is
 assertIsSingleModuleInstance('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
-    let vite5Config;
+    let config;
     let vikeConfig;
     return [
         {
@@ -25,7 +24,7 @@ function pluginAutoFullBuild() {
             enforce: 'pre',
             async configResolved(config_) {
                 vikeConfig = await getVikeConfig(config_);
-                vite5Config = config_;
+                config = config_;
                 abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
@@ -34,7 +33,6 @@ 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);
                 }
@@ -48,7 +46,6 @@ 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,20 +7,18 @@
  * 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 vite5Config;
+    let config;
     return {
         name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
-            vite5Config = config_;
+            config = 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,4 +1,3 @@
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginModuleBanner };
 import MagicString from 'magic-string';
 import { assert } from '../../utils.js';
@@ -8,24 +7,34 @@ import { isViteServerBuild, isViteServerBuild_safe } from '../../shared/isViteSe
 // 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 vite5Config;
+    let config;
+    let disabled = false;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
-            vite5Config = config_;
+            config = config_;
+            if (config.build.minify && config.build.minify !== 'esbuild') {
+                // Doesn't work upon `config.build.minify === 'terser'`
+                // https://github.com/vikejs/vike/issues/2315
+                disabled = true;
+            }
         },
         generateBundle: {
             order: 'post',
             handler(_options, bundle) {
-                const config = getResolvedConfig(this.environment?.config, vite5Config);
+                if (disabled)
+                    return;
                 for (const module of Object.values(bundle)) {
                     if (module.type === 'chunk') {
                         if (isViteServerBuild(config)) {
                             const codeOld = module.code;
                             const codeNew = codeOld.replace(/vikeModuleBannerPlaceholder\("([^"]*)"\);/g, '/* $1 [vike:pluginModuleBanner] */');
-                            assert(!codeNew.includes(vikeModuleBannerPlaceholder));
+                            if (codeNew.includes(vikeModuleBannerPlaceholder)) {
+                                console.log('codeNew', codeNew);
+                                assert(false);
+                            }
                             module.code = codeNew;
                         }
                         else {
@@ -38,7 +47,8 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                const config = getResolvedConfig(this.environment?.config, vite5Config);
+                if (disabled)
+                    return;
                 if (!isViteServerBuild_safe(config, options))
                     return;
                 if (id.startsWith('\0'))

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

@@ -1,4 +1,3 @@
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { devConfig };
 export { logDockerHint };
 import { determineOptimizeDeps } from './determineOptimizeDeps.js';
@@ -13,7 +12,7 @@ if (isErrorDebug()) {
     Error.stackTraceLimit = Infinity;
 }
 function devConfig() {
-    let vite5Config;
+    let config;
     return [
         {
             name: 'vike:devConfig',
@@ -58,14 +57,14 @@ function devConfig() {
                 };
             },
             async configResolved(config_) {
-                vite5Config = config_;
-                await determineOptimizeDeps(vite5Config);
-                await determineFsAllowList(vite5Config);
+                config = config_;
+                await determineOptimizeDeps(config);
+                await determineFsAllowList(config);
                 if (!isErrorDebug()) {
                     await installHttpRequestAsyncStore();
-                    improveViteLogs(vite5Config);
+                    improveViteLogs(config);
                 }
-                logDockerHint(vite5Config.server.host);
+                logDockerHint(config.server.host);
             }
         },
         {
@@ -76,7 +75,6 @@ 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,34 +1,32 @@
-import MagicString from 'magic-string';
 export { envVarsPlugin };
+import MagicString from 'magic-string';
 import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.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
 //   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
-const PUBLIC_ENV_WHITELIST = [
+const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK'
 ];
 function envVarsPlugin() {
     let envsAll;
-    let vite5Config;
+    let config;
     return {
         name: 'vike:envVars',
         enforce: 'post',
         configResolved(config_) {
-            vite5Config = config_;
-            vite5Config.command;
-            envsAll = loadEnv(vite5Config.mode, vite5Config.envDir || vite5Config.root, '');
-            vite5Config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+            config = config_;
+            config.command;
+            envsAll = loadEnv(config.mode, config.envDir || config.root, '');
+            config.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/'))
@@ -52,7 +50,7 @@ function envVarsPlugin() {
                 const envStatementRegExStr = escapeRegex(envStatement) + '\\b';
                 // Security check
                 {
-                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
+                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
                         if (!new RegExp(envStatementRegExStr).test(code))
                             return;

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

@@ -4,15 +4,13 @@
 //  - 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';
+import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage, rollupSourceMapRemove } from '../utils.js';
 import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../shared/virtual-files.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import pc from '@brillout/picocolors';
 import { handleAssetsManifest_isFixEnabled } from './build/handleAssetsManifest.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
@@ -25,7 +23,7 @@ const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = createDebugger('vike:extractAssets');
 function extractAssetsPlugin() {
-    let vite5Config;
+    let config;
     let vikeConfig;
     let isFixEnabled;
     return [
@@ -36,7 +34,6 @@ 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;
@@ -53,7 +50,7 @@ function extractAssetsPlugin() {
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return sourceMapRemove(code);
+                return rollupSourceMapRemove(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs
@@ -65,7 +62,6 @@ 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));
@@ -141,12 +137,12 @@ function extractAssetsPlugin() {
         {
             name: 'vike:extractAssets-4',
             async configResolved(config_) {
-                vite5Config = config_;
-                vikeConfig = await getVikeConfig(vite5Config);
-                isFixEnabled = handleAssetsManifest_isFixEnabled(vite5Config);
+                config = config_;
+                vikeConfig = await getVikeConfig(config);
+                isFixEnabled = handleAssetsManifest_isFixEnabled(config);
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
-                    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');
+                    assertUsage(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
                 }
             }
         }

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

@@ -1,9 +1,8 @@
 export { extractExportNamesPlugin };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
-import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
+import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage, rollupSourceMapRemove } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_options } from '../shared/isViteServerBuild.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
@@ -39,7 +38,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return sourceMapRemove(code);
+    return rollupSourceMapRemove(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

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

@@ -1,27 +1,24 @@
-import { getResolvedConfig } from '../shared/getResolvedConfig.js';
 export { fileEnv };
-import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish } from '../utils.js';
+import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish, rollupSourceMapRemove } from '../utils.js';
 import { extractAssetsRE } from './extractAssetsPlugin.js';
 import { extractExportNamesRE } from './extractExportNamesPlugin.js';
 import pc from '@brillout/picocolors';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 function fileEnv() {
-    let vite5Config;
+    let config;
     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(config, id))
+            if (skip(id))
                 return;
             // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
             if (id.endsWith('?direct'))
@@ -31,36 +28,34 @@ function fileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(config, id, !!options?.ssr, importers, 
+            assertFileEnv(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(config, id))
+            if (skip(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(config, id, isServerSide, importers, false, true);
+            const errMsg = getErrorMessage(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([
+            return rollupSourceMapRemove([
                 `throw new Error(${JSON.stringify(errMsg)});`,
                 ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`)
             ].join('\n'));
         },
         generateBundle() {
-            const config = getResolvedConfig(this.environment?.config, vite5Config);
             Array.from(this.getModuleIds())
-                .filter((id) => !skip(config, id))
+                .filter((id) => !skip(id))
                 .forEach((moduleId) => {
                 const mod = this.getModuleInfo(moduleId);
                 const { importers } = mod;
@@ -71,20 +66,20 @@ function fileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(config, moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
             });
         },
         configResolved(config_) {
-            vite5Config = config_;
+            config = config_;
         },
         configureServer(viteDevServer_) {
             viteDevServer = viteDevServer_;
         }
     };
-    function assertFileEnv(config, moduleId, isServerSide, importers, onlyWarn) {
+    function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
         if (!isWrongEnv(moduleId, isServerSide))
             return;
-        const errMsg = getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, false);
+        const errMsg = getErrorMessage(moduleId, isServerSide, importers, onlyWarn, false);
         if (onlyWarn) {
             assertWarning(false, errMsg, { onlyOnce: true });
         }
@@ -92,7 +87,7 @@ function fileEnv() {
             assertUsage(false, errMsg);
         }
     }
-    function getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, noColor) {
+    function getErrorMessage(moduleId, isServerSide, importers, onlyWarn, noColor) {
         const modulePath = getModulePath(moduleId);
         const envActual = isServerSide ? 'server' : 'client';
         const envExpect = isServerSide ? 'client' : 'server';
@@ -117,7 +112,7 @@ function fileEnv() {
         const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
         return modulePath.includes(suffixWrong);
     }
-    function skip(config, id) {
+    function skip(id) {
         // TODO/v1-release: remove
         if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
             return true;

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

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

package/dist/esm/node/plugin/utils.d.ts

@@ -23,3 +23,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
+export * from '../../utils/rollupSourceMap.js';

package/dist/esm/node/plugin/utils.js

@@ -29,3 +29,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
+export * from '../../utils/rollupSourceMap.js';

package/dist/esm/shared/route/executeOnBeforeRouteHook.js

@@ -67,7 +67,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     if (hasProp(hookReturn.pageContext, 'urlLogical')) {
         assertUsageUrlPathnameAbsolute(
         // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
-        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${pc.cyan('{ pageContext: { urlLogical } }')} but ${pc.cyan('urlLogical')}`);
+        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${pc.cyan('{ pageContext: { urlLogical } }')} and ${pc.cyan('urlLogical')}`);
     }
     assertPageContextProvidedByUser(hookReturn.pageContext, {
         hookFilePath: onBeforeRouteHook.hookFilePath,

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

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

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-c9cc081';
+export const PROJECT_VERSION = '0.4.227-commit-e36b916';

package/dist/esm/utils/isScriptFile.js

@@ -7,12 +7,12 @@ import { assert } from './assert.js';
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
 //    - Vite's `import.meta.glob()` uses Micromatch
-//  - We need this to be a whitelist because:
+//  - We need this to be a allowlist because:
 //   - A pattern `*([a-zA-Z0-9]` doesn't work.
 //     - Because of ReScript: `.res` are ReScript source files which need to be ignored. (The ReScript compiler generates `.js` files alongside `.res` files.)
-//   - Black listing doesn't work.
-//     - We cannot implement a blacklist with a glob pattern.
-//     - A post `import.meta.glob()` blacklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
+//   - Block listing doesn't work.
+//     - We cannot implement a blocklist with a glob pattern.
+//     - A post `import.meta.glob()` blocklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
 // prettier-ignore
 // biome-ignore format:
 const extJavaScript = [

package/dist/esm/utils/parseUrl.js

@@ -182,14 +182,14 @@ function parseProtocol(uri) {
     return { protocol, uriWithoutProtocol };
 }
 function isUrlProtocol(protocol) {
-    // Is there an altenrative to having a blacklist?
-    // - If the blacklist becomes too big, maybe use a whitelist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
-    const blacklist = [
+    // Is there an alternative to having a blocklist?
+    // - If the blocklist becomes too big, maybe use a allowlist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
+    const blocklist = [
         // https://docs.ipfs.tech/how-to/address-ipfs-on-web
         'ipfs://',
         'ipns://'
     ];
-    if (blacklist.includes(protocol))
+    if (blocklist.includes(protocol))
         return false;
     return protocol.endsWith('://');
 }

package/dist/esm/{node/plugin/shared → utils}/rollupSourceMap.d.ts

@@ -1,14 +1,14 @@
-export { sourceMapRemove };
-export { sourceMapPassthrough };
+export { rollupSourceMapRemove };
+export { rollupSourceMapPassthrough };
 /** Remove entire source mapping, to save KBs. */
-declare function sourceMapRemove(code: string): {
+declare function rollupSourceMapRemove(code: string): {
     code: string;
     map: {
         mappings: '';
     };
 };
 /** Don't provide any source map, pass through current source map instead. */
-declare function sourceMapPassthrough(code: string): {
+declare function rollupSourceMapPassthrough(code: string): {
     code: string;
     map: null;
 };

package/dist/esm/{node/plugin/shared → utils}/rollupSourceMap.js

@@ -1,15 +1,15 @@
-export { sourceMapRemove };
-export { sourceMapPassthrough };
+export { rollupSourceMapRemove };
+export { rollupSourceMapPassthrough };
 // https://rollupjs.org/guide/en/#source-code-transformations
 /** Remove entire source mapping, to save KBs. */
-function sourceMapRemove(code) {
+function rollupSourceMapRemove(code) {
     return {
         code,
         map: { mappings: '' }
     };
 }
 /** Don't provide any source map, pass through current source map instead. */
-function sourceMapPassthrough(code) {
+function rollupSourceMapPassthrough(code) {
     return {
         code,
         map: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-c9cc081",
+  "version": "0.4.227-commit-e36b916",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

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

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

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

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

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

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