vike 0.4.238-commit-d48a597 → 0.4.239-commit-050a4a3

package/dist/cjs/node/runtime/globalContext.js

@@ -21,6 +21,7 @@ exports.setGlobalContext_prodBuildEntry = setGlobalContext_prodBuildEntry;
 exports.clearGlobalContext = clearGlobalContext;
 exports.assertBuildInfo = assertBuildInfo;
 exports.updateUserFiles = updateUserFiles;
+exports.isRunnable = isRunnable;
 // The core logic revolves around:
 // - virtualFileExportsGlobalEntry is the main requirement
 // - In production: globalObject.prodBuildEntry which is the production entry set by @brillout/vite-plugin-server-entry

package/dist/cjs/node/vite/onLoad.js

@@ -15,7 +15,7 @@ function onLoad() {
     // TO-DO/eventually: let's also use this.meta.viteVersion
     // - https://github.com/vitejs/vite/pull/20088
     // - https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
-    (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, '6.0.0');
+    (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, ['6.0.0']);
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     (0, assertSetup_js_1.assertIsNotProductionRuntime)();
 }

package/dist/cjs/node/vite/plugins/pluginBaseUrls.js

@@ -9,35 +9,39 @@ function pluginBaseUrls() {
     return {
         name: 'vike:pluginBaseUrls',
         enforce: 'post',
-        async config(config) {
-            const isDev = config._isDev;
-            (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null);
-            // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
-            process.env.BASE_SERVER = basesResolved.baseServer;
-            process.env.BASE_ASSETS = basesResolved.baseAssets;
-            return {
-                envPrefix: [
-                    'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
-                    'BASE_SERVER',
-                    'BASE_ASSETS',
-                ],
-                base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseViteOriginal: baseViteOriginal,
-            };
+        config: {
+            async handler(config) {
+                const isDev = config._isDev;
+                (0, utils_js_1.assert)(typeof isDev === 'boolean');
+                const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
+                const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null);
+                // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
+                process.env.BASE_SERVER = basesResolved.baseServer;
+                process.env.BASE_ASSETS = basesResolved.baseAssets;
+                return {
+                    envPrefix: [
+                        'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
+                        'BASE_SERVER',
+                        'BASE_ASSETS',
+                    ],
+                    base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
+                    _baseViteOriginal: baseViteOriginal,
+                };
+            },
         },
-        async configResolved(config) {
-            const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null, config);
-            (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
-            (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
-            /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
-             *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
-             *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
-            assert(config.base === baseAssets)
-            */
+        configResolved: {
+            async handler(config) {
+                const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null, config);
+                (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
+                (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
+                /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
+               *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
+               *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
+              assert(config.base === baseAssets)
+              */
+            },
         },
     };
 }

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js

@@ -51,35 +51,39 @@ function pluginBuildApp() {
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            config(config) {
-                return {
-                    environments: {
-                        ssr: {
-                            consumer: 'server',
-                            build: {
-                                outDir: (0, getOutDirs_js_1.resolveOutDir)(config, true),
-                                ssr: true,
+            config: {
+                handler(config) {
+                    return {
+                        environments: {
+                            ssr: {
+                                consumer: 'server',
+                                build: {
+                                    outDir: (0, getOutDirs_js_1.resolveOutDir)(config, true),
+                                    ssr: true,
+                                },
                             },
-                        },
-                        client: {
-                            consumer: 'client',
-                            build: {
-                                outDir: (0, getOutDirs_js_1.resolveOutDir)(config, false),
-                                copyPublicDir: true,
-                                ssr: false,
+                            client: {
+                                consumer: 'client',
+                                build: {
+                                    outDir: (0, getOutDirs_js_1.resolveOutDir)(config, false),
+                                    copyPublicDir: true,
+                                    ssr: false,
+                                },
                             },
                         },
-                    },
-                };
+                    };
+                },
             },
         },
         {
             name: 'vike:build:pluginBuildApp:autoFullBuild:pre',
             apply: 'build',
             enforce: 'pre',
-            async configResolved(config_) {
-                config = config_;
-                await abortViteBuildSsr();
+            configResolved: {
+                async handler(config_) {
+                    config = config_;
+                    await abortViteBuildSsr();
+                },
             },
             // TO-DO/eventually: stop using this writeBundle() hack and, instead, use the buildApp() implementation above.
             // - Could it cause issues if a tool uses the writeBundle() hack together with getVikeConfig() ?

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js

@@ -42,8 +42,10 @@ function pluginBuildConfig() {
                     return { build };
                 },
             },
-            buildStart() {
-                (0, utils_js_1.onSetupBuild)();
+            buildStart: {
+                handler() {
+                    (0, utils_js_1.onSetupBuild)();
+                },
             },
         },
     ];

package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistFileNames.js

@@ -17,88 +17,90 @@ function pluginDistFileNames() {
         name: 'vike:build:pluginDistFileNames',
         apply: 'build',
         enforce: 'post',
-        configResolved(config) {
-            const rollupOutputs = getRollupOutputs(config);
-            // We need to support multiple outputs: @vite/plugin-legacy adds an output, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
-            rollupOutputs.forEach((rollupOutput) => {
-                if (!('entryFileNames' in rollupOutput)) {
-                    rollupOutput.entryFileNames = (chunkInfo) => getEntryFileName(chunkInfo, config, true);
-                }
-                if (!('chunkFileNames' in rollupOutput)) {
-                    rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
-                }
-                if (!('assetFileNames' in rollupOutput)) {
-                    rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
-                    rollupOutput.assetFileNames.isTheOneSetByVike = true;
-                    (0, utils_js_1.assert)(rollupOutput.assetFileNames.isTheOneSetByVike);
-                }
-                else {
-                    // If a user needs this:
-                    //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
-                    //    - It's needed for getHash() of handleAssetsManifest()
-                    //    - Asset URLs should always contain a hash: it's paramount for caching assets.
-                    //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
-                    (0, utils_js_1.assertUsage)(rollupOutput.assetFileNames.isTheOneSetByVike, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use it.");
-                }
-                {
-                    const manualChunksOriginal = rollupOutput.manualChunks;
-                    rollupOutput.manualChunks = function (id, ...args) {
-                        if (manualChunksOriginal) {
-                            if ((0, utils_js_1.isCallable)(manualChunksOriginal)) {
-                                const result = manualChunksOriginal.call(this, id, ...args);
-                                if (result !== undefined)
-                                    return result;
-                            }
-                            else {
-                                (0, utils_js_1.assertUsage)(false, "The Vite's configuration build.rollupOptions.output.manualChunks must be a function. Reach out if you need to set it to another value.");
-                            }
-                        }
-                        // Disable CSS bundling to workaround https://github.com/vikejs/vike/issues/1815
-                        // TO-DO/eventually: let's bundle CSS again once Rolldown replaces Rollup
-                        if (id.endsWith('.css')) {
-                            const userRootDir = config.root;
-                            if (id.startsWith(userRootDir)) {
-                                (0, utils_js_1.assertPosixPath)(id);
-                                (0, getFilePath_js_1.assertModuleId)(id);
-                                let name;
-                                const isNodeModules = id.match(/node_modules\/([^\/]+)\/(?!.*node_modules)/);
-                                if (isNodeModules) {
-                                    name = isNodeModules[1];
+        configResolved: {
+            handler(config) {
+                const rollupOutputs = getRollupOutputs(config);
+                // We need to support multiple outputs: @vite/plugin-legacy adds an output, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
+                rollupOutputs.forEach((rollupOutput) => {
+                    if (!('entryFileNames' in rollupOutput)) {
+                        rollupOutput.entryFileNames = (chunkInfo) => getEntryFileName(chunkInfo, config, true);
+                    }
+                    if (!('chunkFileNames' in rollupOutput)) {
+                        rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
+                    }
+                    if (!('assetFileNames' in rollupOutput)) {
+                        rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
+                        rollupOutput.assetFileNames.isTheOneSetByVike = true;
+                        (0, utils_js_1.assert)(rollupOutput.assetFileNames.isTheOneSetByVike);
+                    }
+                    else {
+                        // If a user needs this:
+                        //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
+                        //    - It's needed for getHash() of handleAssetsManifest()
+                        //    - Asset URLs should always contain a hash: it's paramount for caching assets.
+                        //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
+                        (0, utils_js_1.assertUsage)(rollupOutput.assetFileNames.isTheOneSetByVike, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use it.");
+                    }
+                    {
+                        const manualChunksOriginal = rollupOutput.manualChunks;
+                        rollupOutput.manualChunks = function (id, ...args) {
+                            if (manualChunksOriginal) {
+                                if ((0, utils_js_1.isCallable)(manualChunksOriginal)) {
+                                    const result = manualChunksOriginal.call(this, id, ...args);
+                                    if (result !== undefined)
+                                        return result;
                                 }
                                 else {
-                                    const filePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
-                                    name = filePath;
-                                    name = name.split('.').slice(0, -1).join('.'); // remove file extension
-                                    name = name.split('/').filter(Boolean).join('_');
+                                    (0, utils_js_1.assertUsage)(false, "The Vite's configuration build.rollupOptions.output.manualChunks must be a function. Reach out if you need to set it to another value.");
                                 }
-                                // Make fileHash the same between local development and CI
-                                const idStable = node_path_1.default.posix.relative(userRootDir, id);
-                                // Don't remove `?` queries because each `id` should belong to a unique bundle.
-                                const hash = getIdHash(idStable);
-                                return `${name}-${hash}`;
                             }
-                            else {
-                                let name;
-                                const isVirtualModule = id.match(/virtual:([^:]+):/);
-                                if (isVirtualModule) {
-                                    name = isVirtualModule[1];
-                                    (0, utils_js_1.assert)(name);
-                                }
-                                else if (
-                                // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
-                                id.startsWith('/__uno')) {
-                                    name = 'uno';
+                            // Disable CSS bundling to workaround https://github.com/vikejs/vike/issues/1815
+                            // TO-DO/eventually: let's bundle CSS again once Rolldown replaces Rollup
+                            if (id.endsWith('.css')) {
+                                const userRootDir = config.root;
+                                if (id.startsWith(userRootDir)) {
+                                    (0, utils_js_1.assertPosixPath)(id);
+                                    (0, getFilePath_js_1.assertModuleId)(id);
+                                    let name;
+                                    const isNodeModules = id.match(/node_modules\/([^\/]+)\/(?!.*node_modules)/);
+                                    if (isNodeModules) {
+                                        name = isNodeModules[1];
+                                    }
+                                    else {
+                                        const filePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
+                                        name = filePath;
+                                        name = name.split('.').slice(0, -1).join('.'); // remove file extension
+                                        name = name.split('/').filter(Boolean).join('_');
+                                    }
+                                    // Make fileHash the same between local development and CI
+                                    const idStable = node_path_1.default.posix.relative(userRootDir, id);
+                                    // Don't remove `?` queries because each `id` should belong to a unique bundle.
+                                    const hash = getIdHash(idStable);
+                                    return `${name}-${hash}`;
                                 }
                                 else {
-                                    name = 'style';
+                                    let name;
+                                    const isVirtualModule = id.match(/virtual:([^:]+):/);
+                                    if (isVirtualModule) {
+                                        name = isVirtualModule[1];
+                                        (0, utils_js_1.assert)(name);
+                                    }
+                                    else if (
+                                    // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
+                                    id.startsWith('/__uno')) {
+                                        name = 'uno';
+                                    }
+                                    else {
+                                        name = 'style';
+                                    }
+                                    const hash = getIdHash(id);
+                                    return `${name}-${hash}`;
                                 }
-                                const hash = getIdHash(id);
-                                return `${name}-${hash}`;
                             }
-                        }
-                    };
-                }
-            });
+                        };
+                    }
+                });
+            },
         },
     };
 }

package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js

@@ -8,21 +8,25 @@ function pluginDistPackageJsonFile() {
     return {
         name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
-        generateBundle(options, bundle) {
-            if (!(0, isViteServerSide_js_1.isViteServerSide)(config, this.environment))
-                return;
-            const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
-            const fileName = 'package.json';
-            if (bundle[fileName])
-                return; // E.g. already generated by Telefunc / vike
-            this.emitFile({
-                fileName,
-                type: 'asset',
-                source: getPackageJsonContent(isEsm),
-            });
+        generateBundle: {
+            handler(options, bundle) {
+                if (!(0, isViteServerSide_js_1.isViteServerSide)(config, this.environment))
+                    return;
+                const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
+                const fileName = 'package.json';
+                if (bundle[fileName])
+                    return; // E.g. already generated by Telefunc / vike
+                this.emitFile({
+                    fileName,
+                    type: 'asset',
+                    source: getPackageJsonContent(isEsm),
+                });
+            },
         },
     };
 }

package/dist/cjs/node/vite/plugins/pluginBuild/pluginModuleBanner.js

@@ -12,8 +12,10 @@ function pluginModuleBanner() {
         name: 'vike:build:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
         transform: {
             order: 'post',

package/dist/cjs/node/vite/plugins/pluginBuild/pluginProdBuildEntry.js

@@ -22,8 +22,10 @@ function pluginProdBuildEntry() {
             name: 'vike:build:pluginProdBuildEntry',
             apply: 'build',
             enforce: 'post',
-            async configResolved(config_) {
-                config = config_;
+            configResolved: {
+                async handler(config_) {
+                    config = config_;
+                },
             },
         },
         ...(0, plugin_1.serverProductionEntryPlugin)({

package/dist/cjs/node/vite/plugins/pluginBuild/pluginSuppressRollupWarning.js

@@ -7,24 +7,26 @@ function pluginSuppressRollupWarning() {
         name: 'vike:build:pluginSuppressRollupWarning',
         apply: 'build',
         enforce: 'post',
-        async configResolved(config) {
-            const onWarnOriginal = config.build.rollupOptions.onwarn;
-            config.build.rollupOptions.onwarn = function (warning, warn) {
-                // Suppress
-                if (suppressUnusedImport(warning))
-                    return;
-                if (suppressEmptyBundle(warning))
-                    return;
-                if (suppressUseClientDirective(warning))
-                    return;
-                // Pass through
-                if (onWarnOriginal) {
-                    onWarnOriginal.apply(this, arguments);
-                }
-                else {
-                    warn(warning);
-                }
-            };
+        configResolved: {
+            async handler(config) {
+                const onWarnOriginal = config.build.rollupOptions.onwarn;
+                config.build.rollupOptions.onwarn = function (warning, warn) {
+                    // Suppress
+                    if (suppressUnusedImport(warning))
+                        return;
+                    if (suppressEmptyBundle(warning))
+                        return;
+                    if (suppressUseClientDirective(warning))
+                        return;
+                    // Pass through
+                    if (onWarnOriginal) {
+                        onWarnOriginal.apply(this, arguments);
+                    }
+                    else {
+                        warn(warning);
+                    }
+                };
+            },
         },
     };
 }

package/dist/cjs/node/vite/plugins/pluginCommon.js

@@ -8,7 +8,6 @@ const utils_js_1 = require("../utils.js");
 const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const node_path_1 = __importDefault(require("node:path"));
 const assertResolveAlias_js_1 = require("./pluginCommon/assertResolveAlias.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const context_js_1 = require("../../api/context.js");
@@ -47,10 +46,12 @@ function pluginCommon(vikeVitePluginOptions) {
         },
         {
             name: pluginName,
-            configResolved(config) {
-                (0, prepareViteApiCall_js_1.assertViteRoot)(config._rootResolvedEarly, config);
-                assertSingleInstance(config);
-                (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
+            configResolved: {
+                handler(config) {
+                    (0, prepareViteApiCall_js_1.assertViteRoot)(config._rootResolvedEarly, config);
+                    assertSingleInstance(config);
+                    (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
+                },
             },
         },
         {
@@ -69,7 +70,6 @@ function pluginCommon(vikeVitePluginOptions) {
                     workaroundCI(config);
                     (0, pluginBuildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
-                    assertEsm(config.root);
                     assertVikeCliOrApi(config);
                     temp_supportOldInterface(config);
                     await emitServerEntryOnlyIfNeeded(config);
@@ -112,7 +112,7 @@ function setDefault(setting, value, configFromUser, configFromVike) {
 /*
 import { version } from 'vite'
 function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
-  if (!isVersionOrAbove(version, '5.0.12')) return
+  if (!isVersionMatch(version, ['5.0.12'])) return
   // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
   config.ssr.external ??= true
 }
@@ -125,20 +125,6 @@ function workaroundCI(config) {
         (_b = config.preview).host ?? (_b.host = true);
     }
 }
-function assertEsm(userViteRoot) {
-    const found = (0, utils_js_1.findPackageJson)(userViteRoot);
-    if (!found)
-        return;
-    const { packageJson, packageJsonPath } = found;
-    let dir = node_path_1.default.posix.dirname(packageJsonPath);
-    if (dir !== '/') {
-        (0, utils_js_1.assert)(!dir.endsWith('/'));
-        dir = dir + '/';
-    }
-    (0, utils_js_1.assert)(dir.endsWith('/'));
-    dir = picocolors_1.default.dim(dir);
-    (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
-}
 function assertSingleInstance(config) {
     const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
     (0, utils_js_1.assertUsage)(numberOfInstances === 1, `Vike's Vite plugin (${picocolors_1.default.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);