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

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

@@ -18,68 +18,78 @@ function pluginFileEnv() {
     let viteDevServer;
     return {
         name: 'vike:pluginFileEnv',
-        load(id, options) {
-            // 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, resolveVikeConfigInternal_js_1.isV1Design)())
-                return;
-            if (skip(id))
-                return;
-            // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
-            if (id.endsWith('?direct'))
-                id = id.slice(0, -1 * '?direct'.length);
-            const moduleInfo = viteDevServer.moduleGraph.getModuleById(id);
-            (0, utils_js_1.assert)(moduleInfo);
-            const importers = Array.from(moduleInfo.importers)
-                .map((m) => m.id)
-                .filter((id) => id !== null);
-            assertFileEnv(id, (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options), 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);
+        load: {
+            handler(id, options) {
+                // 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, resolveVikeConfigInternal_js_1.isV1Design)())
+                    return;
+                if (skip(id))
+                    return;
+                // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
+                if (id.endsWith('?direct'))
+                    id = id.slice(0, -1 * '?direct'.length);
+                const moduleInfo = viteDevServer.moduleGraph.getModuleById(id);
+                (0, utils_js_1.assert)(moduleInfo);
+                const importers = Array.from(moduleInfo.importers)
+                    .map((m) => m.id)
+                    .filter((id) => id !== null);
+                assertFileEnv(id, (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options), 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) {
-            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))
-                return;
-            const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
-            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 split.
-            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, 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() {
-            Array.from(this.getModuleIds())
-                .filter((id) => !skip(id))
-                .forEach((moduleId) => {
-                const mod = this.getModuleInfo(moduleId);
-                const { importers } = mod;
-                if (importers.length === 0) {
-                    // Dynamic imports can only be verified at runtime
-                    /* This assertion can fail: https://github.com/vikejs/vike/issues/2227
-                    assert(dynamicImporters.length > 0)
-                    */
+        transform: {
+            async handler(code, id, options) {
+                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;
-                }
-                assertFileEnv(moduleId, (0, isViteServerSide_js_1.isViteServerSide)(config, this.environment), importers, false);
-            });
+                if (skip(id))
+                    return;
+                const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
+                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 split.
+                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, 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: {
+            handler() {
+                Array.from(this.getModuleIds())
+                    .filter((id) => !skip(id))
+                    .forEach((moduleId) => {
+                    const mod = this.getModuleInfo(moduleId);
+                    const { importers } = mod;
+                    if (importers.length === 0) {
+                        // Dynamic imports can only be verified at runtime
+                        /* This assertion can fail: https://github.com/vikejs/vike/issues/2227
+                      assert(dynamicImporters.length > 0)
+                      */
+                        return;
+                    }
+                    assertFileEnv(moduleId, (0, isViteServerSide_js_1.isViteServerSide)(config, this.environment), importers, false);
+                });
+            },
         },
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
-        configureServer(viteDevServer_) {
-            viteDevServer = viteDevServer_;
+        configureServer: {
+            handler(viteDevServer_) {
+                viteDevServer = viteDevServer_;
+            },
         },
     };
     function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {

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

@@ -25,28 +25,34 @@ function pluginNonRunnableDev() {
     let config;
     return {
         name: 'vike:pluginNonRunnableDev',
-        configureServer(viteDevServer) {
-            (0, utils_js_1.createViteRPC)(viteDevServer, getViteRpcFunctions);
+        configureServer: {
+            handler(viteDevServer) {
+                (0, utils_js_1.createViteRPC)(viteDevServer, getViteRpcFunctions);
+            },
         },
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
-        transform(code, id) {
-            if (!config._isDev)
-                return;
-            const idWithoutQuery = id.split('?')[0];
-            if (idWithoutQuery !== distFileIsNonRunnableDev && idWithoutQuery !== distFileGlobalContext)
-                return;
-            if ((0, utils_js_1.isRunnableDevEnvironment)(this.environment))
-                return;
-            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
-            if (idWithoutQuery === distFileIsNonRunnableDev) {
-                magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(true));
-            }
-            if (idWithoutQuery === distFileGlobalContext) {
-                magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
-            }
-            return getMagicStringResult();
+        transform: {
+            handler(code, id) {
+                if (!config._isDev)
+                    return;
+                const idWithoutQuery = id.split('?')[0];
+                if (idWithoutQuery !== distFileIsNonRunnableDev && idWithoutQuery !== distFileGlobalContext)
+                    return;
+                if ((0, utils_js_1.isRunnableDevEnvironment)(this.environment))
+                    return;
+                const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
+                if (idWithoutQuery === distFileIsNonRunnableDev) {
+                    magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(true));
+                }
+                if (idWithoutQuery === distFileGlobalContext) {
+                    magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
+                }
+                return getMagicStringResult();
+            },
         },
     };
 }

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

@@ -19,32 +19,38 @@ function pluginPreview() {
     return {
         name: 'vike:pluginPreview',
         apply: utils_js_1.applyPreview,
-        config() {
-            return {
-                appType: 'custom',
-            };
+        config: {
+            handler() {
+                return {
+                    appType: 'custom',
+                };
+            },
         },
-        async configResolved(config_) {
-            config = config_;
-            vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-            (0, pluginDev_js_1.logDockerHint)(config.preview.host);
-            // vikeConfig = await getVikeConfig(config)
+        configResolved: {
+            async handler(config_) {
+                config = config_;
+                vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                (0, pluginDev_js_1.logDockerHint)(config.preview.host);
+                // vikeConfig = await getVikeConfig(config)
+            },
         },
-        configurePreviewServer(server) {
-            /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
-               - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
-            config.appType = 'mpa'
-            */
-            return () => {
-                const { isPrerenderingEnabledForAllPages, isPrerenderingEnabled } = vikeConfig.prerenderContext;
-                assertDist(isPrerenderingEnabledForAllPages);
-                // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
-                addStaticAssetsMiddleware(server.middlewares);
-                if (!isPrerenderingEnabledForAllPages) {
-                    (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, isPrerenderingEnabled);
-                }
-                addStatic404Middleware(server.middlewares);
-            };
+        configurePreviewServer: {
+            handler(server) {
+                /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
+                 - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
+              config.appType = 'mpa'
+              */
+                return () => {
+                    const { isPrerenderingEnabledForAllPages, isPrerenderingEnabled } = vikeConfig.prerenderContext;
+                    assertDist(isPrerenderingEnabledForAllPages);
+                    // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
+                    addStaticAssetsMiddleware(server.middlewares);
+                    if (!isPrerenderingEnabledForAllPages) {
+                        (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, isPrerenderingEnabled);
+                    }
+                    addStatic404Middleware(server.middlewares);
+                };
+            },
         },
     };
     function assertDist(isPrerenderingEnabledForAllPages) {

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

@@ -11,41 +11,49 @@ function pluginReplaceConstants() {
         name: 'vike:pluginReplaceConstants',
         enforce: 'post',
         apply: 'build',
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
-        transform(code, id, options) {
-            id = (0, normalizeId_js_1.normalizeId)(id);
-            (0, utils_js_1.assertPosixPath)(id);
-            if (id.includes('/node_modules/'))
-                return;
-            (0, utils_js_1.assertPosixPath)(config.root);
-            if (!id.startsWith(config.root))
-                return;
-            if (!code.includes('({}).'))
-                return;
-            const isBuild = config.command === 'build';
-            (0, utils_js_1.assert)(isBuild);
-            // Used by vike.dev
-            // https://github.com/vikejs/vike/blob/08a1ff55c80ddca64ca6d4417fefd45fefeb4ffb/docs/vite.config.ts#L12
-            // @ts-expect-error
-            if (config._skipVikeReplaceConstants?.(id))
-                return;
-            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
-            const constantsMap = [];
-            constantsMap.push({
-                constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options),
-            });
-            constantsMap.forEach(({ constants, replacement }) => {
-                if (!constants.some((c) => code.includes(c)))
+        transform: {
+            handler(code, id, options) {
+                id = (0, normalizeId_js_1.normalizeId)(id);
+                (0, utils_js_1.assertPosixPath)(id);
+                if (id.includes('/node_modules/'))
                     return;
-                const regExp = getConstantRegExp(constants);
-                magicString.replaceAll(regExp, JSON.stringify(replacement));
-            });
-            if (!magicString.hasChanged())
-                return null;
-            return getMagicStringResult();
+                (0, utils_js_1.assertPosixPath)(config.root);
+                if (!id.startsWith(config.root))
+                    return;
+                if (!code.includes('({}).'))
+                    return;
+                const isBuild = config.command === 'build';
+                (0, utils_js_1.assert)(isBuild);
+                // Used by vike.dev
+                // https://github.com/vikejs/vike/blob/08a1ff55c80ddca64ca6d4417fefd45fefeb4ffb/docs/vite.config.ts#L12
+                // @ts-expect-error
+                if (config._skipVikeReplaceConstants?.(id))
+                    return;
+                const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
+                const constantsMap = [];
+                constantsMap.push({
+                    constants: [
+                        'pageContext.isClientSide',
+                        'globalContext.isClientSide',
+                        'pageContext.globalContext.isClientSide',
+                    ],
+                    replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options),
+                });
+                constantsMap.forEach(({ constants, replacement }) => {
+                    if (!constants.some((c) => code.includes(c)))
+                        return;
+                    const regExp = getConstantRegExp(constants);
+                    magicString.replaceAll(regExp, JSON.stringify(replacement));
+                });
+                if (!magicString.hasChanged())
+                    return null;
+                return getMagicStringResult();
+            },
         },
     };
 }

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

@@ -22,8 +22,10 @@ function pluginSetGlobalContext() {
                     (0, utils_js_1.markSetup_viteDevServer)();
                 },
             },
-            configurePreviewServer() {
-                (0, utils_js_1.markSetup_vitePreviewServer)();
+            configurePreviewServer: {
+                handler() {
+                    (0, utils_js_1.markSetup_vitePreviewServer)();
+                },
             },
             config: {
                 order: 'pre',

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js

@@ -144,7 +144,7 @@ function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
             const globExcludePath = globRoot.excludeDir ? `'!${getGlobPath(globRoot.excludeDir, fileType)}'` : null;
             const globOptions = { eager: isEager };
             if (query) {
-                const isNewViteInterface = (0, utils_js_1.isVersionOrAbove)(vite_1.version, '5.1.0');
+                const isNewViteInterface = (0, utils_js_1.isVersionMatch)(vite_1.version, ['5.1.0']);
                 if (isNewViteInterface &&
                     // When used for the old design, the new syntax breaks Vike's CI (surprinsigly so). I couldn't reproduce locally (I didn't dig much).
                     isV1Design) {

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

@@ -21,47 +21,57 @@ function pluginVirtualFiles() {
     let config;
     return {
         name: 'vike:pluginVirtualFiles',
-        async configResolved(config_) {
-            config = config_;
-            // TO-DO/next-major-release: remove
-            if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
-                config.experimental.importGlobRestoreExtension = true;
+        configResolved: {
+            async handler(config_) {
+                config = config_;
+                // TO-DO/next-major-release: remove
+                if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
+                    config.experimental.importGlobRestoreExtension = true;
+            },
         },
-        resolveId(id) {
-            if ((0, utils_js_1.isVirtualFileId)(id)) {
-                return (0, utils_js_1.addVirtualFileIdPrefix)(id);
-            }
-        },
-        async handleHotUpdate(ctx) {
-            try {
-                return await handleHotUpdate(ctx, config);
-            }
-            catch (err) {
-                // Vite swallows errors thrown by handleHotUpdate()
-                console.error(err);
-                throw err;
-            }
+        resolveId: {
+            handler(id) {
+                if ((0, utils_js_1.isVirtualFileId)(id)) {
+                    return (0, utils_js_1.addVirtualFileIdPrefix)(id);
+                }
+            },
         },
-        async load(id, options) {
-            if (!(0, utils_js_1.isVirtualFileId)(id))
-                return undefined;
-            id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
-            const isDev = config._isDev;
-            (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
-            if (idParsed) {
-                if (idParsed.type === 'page-entry') {
-                    const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev);
-                    return code;
+        handleHotUpdate: {
+            async handler(ctx) {
+                try {
+                    return await handleHotUpdate(ctx, config);
                 }
-                if (idParsed.type === 'global-entry') {
-                    const code = await (0, generateVirtualFileGlobalEntryWithOldDesign_js_1.generateVirtualFileGlobalEntryWithOldDesign)(id, options, config, this.environment, isDev);
-                    return code;
+                catch (err) {
+                    // Vite swallows errors thrown by handleHotUpdate()
+                    console.error(err);
+                    throw err;
                 }
-            }
+            },
+        },
+        load: {
+            async handler(id, options) {
+                if (!(0, utils_js_1.isVirtualFileId)(id))
+                    return undefined;
+                id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
+                const isDev = config._isDev;
+                (0, utils_js_1.assert)(typeof isDev === 'boolean');
+                const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+                if (idParsed) {
+                    if (idParsed.type === 'page-entry') {
+                        const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev);
+                        return code;
+                    }
+                    if (idParsed.type === 'global-entry') {
+                        const code = await (0, generateVirtualFileGlobalEntryWithOldDesign_js_1.generateVirtualFileGlobalEntryWithOldDesign)(id, options, config, this.environment, isDev);
+                        return code;
+                    }
+                }
+            },
         },
-        configureServer(server) {
-            handleFileAddRemove(server, config);
+        configureServer: {
+            handler(server) {
+                handleFileAddRemove(server, config);
+            },
         },
     };
 }
@@ -130,7 +140,10 @@ async function handleHotUpdate(ctx, config) {
             // Ensure we invalidate `file` *before* server.ssrLoadModule() in updateUserFiles()
             // Vite already invalidates it, but *after* handleHotUpdate() and thus after server.ssrLoadModule()
             ctx.modules.forEach((mod) => server.moduleGraph.invalidateModule(mod));
-            (0, globalContext_js_1.updateUserFiles)();
+            if ((0, globalContext_js_1.isRunnable)(server)) {
+                // TODO/now: await
+                (0, globalContext_js_1.updateUserFiles)();
+            }
         }
     }
 }

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

@@ -4,12 +4,14 @@ exports.pluginWorkaroundCssModuleHmr = pluginWorkaroundCssModuleHmr;
 function pluginWorkaroundCssModuleHmr() {
     return {
         name: 'vike:pluginWorkaroundCssModuleHmr',
-        handleHotUpdate(ctx) {
-            // prevent full reload due to non self-accepting css module.
-            // here only "?direct" module should be filtered out as it doesn't have a parent module.
-            if (ctx.file.includes('module.css')) {
-                return ctx.modules.filter((m) => !m.id?.includes('?direct'));
-            }
+        handleHotUpdate: {
+            handler(ctx) {
+                // prevent full reload due to non self-accepting css module.
+                // here only "?direct" module should be filtered out as it doesn't have a parent module.
+                if (ctx.file.includes('module.css')) {
+                    return ctx.modules.filter((m) => !m.id?.includes('?direct'));
+                }
+            },
         },
     };
 }

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js

@@ -152,7 +152,7 @@ async function isGitNotUsable(userRootDir) {
         //    - We didn't bother test which is the earliest version that works.
         //  - Git 2.32.0 doesn't seem to work: https://github.com/vikejs/vike/discussions/1549
         //    - Maybe it's because of StackBlitz: looking at the release notes, Git 2.32.0 should be working.
-        if (!(0, utils_js_1.isVersionOrAbove)(gitVersion, '2.43.1'))
+        if (!(0, utils_js_1.isVersionMatch)(gitVersion, ['2.43.1']))
             return true;
     }
     // Is userRootDir inside a Git repository?

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.238-commit-d48a597';
+exports.PROJECT_VERSION = '0.4.239-commit-050a4a3';

package/dist/cjs/utils/assertNodeVersion.js

@@ -8,5 +8,7 @@ function assertNodeVersion() {
     if (!(0, isNodeJS_js_1.isNodeJS)())
         return;
     const version = process.versions.node;
-    (0, assertVersion_js_1.assertVersion)('Node.js', version, '18.0.0');
+    (0, assertVersion_js_1.assertVersion)('Node.js', version, 
+    // https://gist.github.com/brillout/8e0133716e169b981b6c4e8a938b0134
+    ['20.19.0', '22.12.0', '23.0.0']);
 }

package/dist/cjs/utils/assertVersion.js

@@ -1,16 +1,37 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertVersion = assertVersion;
-exports.isVersionOrAbove = isVersionOrAbove;
+exports.isVersionMatch = isVersionMatch;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+const joinEnglish_js_1 = require("./joinEnglish.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
-function assertVersion(dependencyName, versionActual, versionExpected) {
+function assertVersion(dependencyName, versionActual, versionExpectedList) {
+    (0, assert_js_1.assertUsage)(isVersionMatch(versionActual, versionExpectedList), `${picocolors_1.default.bold(dependencyName)} ${picocolors_1.default.red(picocolors_1.default.bold(versionActual))} isn't supported, use ${picocolors_1.default.bold(dependencyName)} ${(0, joinEnglish_js_1.joinEnglish)([...versionExpectedList, 'above'].map((v) => picocolors_1.default.green(picocolors_1.default.bold(v))), 'or')}.`);
+}
+function isVersionMatch(versionActual, versionExpectedList) {
     (0, assert_js_1.assert)(versionActual);
-    (0, assert_js_1.assert)(versionExpected);
-    (0, assert_js_1.assertUsage)(isVersionOrAbove(versionActual, versionExpected), `${dependencyName} ${versionActual} isn't supported, use ${dependencyName} >= ${versionExpected} instead.`);
+    (0, assert_js_1.assert)(versionExpectedList);
+    (0, assert_js_1.assert)(versionExpectedList.length > 0);
+    const versionActualMajor = parseVersion(versionActual)[0];
+    const versionExpectedListSameMajor = versionExpectedList.filter((versionExpected) => {
+        const versionExpectedMajor = parseVersion(versionExpected)[0];
+        return versionExpectedMajor === versionActualMajor;
+    });
+    (0, assert_js_1.assert)(versionExpectedListSameMajor.length <= 1);
+    const versionExpectedSameMajor = versionExpectedListSameMajor[0];
+    if (versionExpectedSameMajor) {
+        return isSameOrAbove(versionActual, versionExpectedSameMajor);
+    }
+    else {
+        return versionExpectedList.every((versionExpected) => isSameOrAbove(versionActual, versionExpected));
+    }
 }
-function isVersionOrAbove(versionActual, versionExpected) {
+function isSameOrAbove(versionActual, versionExpected) {
     const p1 = parseVersion(versionActual);
     const p2 = parseVersion(versionExpected);
     // major

package/dist/cjs/utils/joinEnglish.js

@@ -9,5 +9,6 @@ function joinEnglish(arr, conjunction, colorizer = (s) => s) {
         return colorizer(arr[0]);
     const firsts = arr.slice(0, arr.length - 1);
     const last = arr[arr.length - 1];
-    return firsts.map(colorizer).join(', ') + `, ${conjunction} ` + colorizer(last);
+    const lastComma = arr.length > 2 ? ',' : '';
+    return firsts.map(colorizer).join(', ') + `${lastComma} ${conjunction} ` + colorizer(last);
 }

package/dist/esm/node/runtime/globalContext.d.ts

@@ -15,6 +15,7 @@ export { setGlobalContext_prodBuildEntry };
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
+export { isRunnable };
 export { vikeConfigErrorRecoverMsg };
 export type { BuildInfo };
 export type { GlobalContextServerInternal as GlobalContextServerInternal };
@@ -364,3 +365,4 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     };
 })>;
 declare function clearGlobalContext(): void;
+declare function isRunnable(viteDevServer: ViteDevServer): boolean;

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

@@ -17,6 +17,7 @@ export { setGlobalContext_prodBuildEntry }; // production entry
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
+export { isRunnable };
 export { vikeConfigErrorRecoverMsg };
 // The core logic revolves around:
 // - virtualFileExportsGlobalEntry is the main requirement

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

@@ -13,7 +13,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
-    assertVersion('Vite', version, '6.0.0');
+    assertVersion('Vite', version, ['6.0.0']);
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     assertIsNotProductionRuntime();
 }