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

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

@@ -14,32 +14,38 @@ function pluginPreview() {
     return {
         name: 'vike:pluginPreview',
         apply: applyPreview,
-        config() {
-            return {
-                appType: 'custom',
-            };
+        config: {
+            handler() {
+                return {
+                    appType: 'custom',
+                };
+            },
         },
-        async configResolved(config_) {
-            config = config_;
-            vikeConfig = await getVikeConfigInternal();
-            logDockerHint(config.preview.host);
-            // vikeConfig = await getVikeConfig(config)
+        configResolved: {
+            async handler(config_) {
+                config = config_;
+                vikeConfig = await getVikeConfigInternal();
+                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) {
-                    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) {
+                        addSsrMiddleware(server.middlewares, config, true, isPrerenderingEnabled);
+                    }
+                    addStatic404Middleware(server.middlewares);
+                };
+            },
         },
     };
     function assertDist(isPrerenderingEnabledForAllPages) {

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

@@ -9,41 +9,49 @@ function pluginReplaceConstants() {
         name: 'vike:pluginReplaceConstants',
         enforce: 'post',
         apply: 'build',
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
-        transform(code, id, options) {
-            id = normalizeId(id);
-            assertPosixPath(id);
-            if (id.includes('/node_modules/'))
-                return;
-            assertPosixPath(config.root);
-            if (!id.startsWith(config.root))
-                return;
-            if (!code.includes('import.meta.env.'))
-                return;
-            const isBuild = config.command === 'build';
-            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 } = getMagicString(code, id);
-            const constantsMap = [];
-            constantsMap.push({
-                constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !isViteServerSide_extraSafe(config, this.environment, options),
-            });
-            constantsMap.forEach(({ constants, replacement }) => {
-                if (!constants.some((c) => code.includes(c)))
+        transform: {
+            handler(code, id, options) {
+                id = normalizeId(id);
+                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();
+                assertPosixPath(config.root);
+                if (!id.startsWith(config.root))
+                    return;
+                if (!code.includes('import.meta.env.'))
+                    return;
+                const isBuild = config.command === 'build';
+                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 } = getMagicString(code, id);
+                const constantsMap = [];
+                constantsMap.push({
+                    constants: [
+                        'pageContext.isClientSide',
+                        'globalContext.isClientSide',
+                        'pageContext.globalContext.isClientSide',
+                    ],
+                    replacement: !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/esm/node/vite/plugins/pluginSetGlobalContext.js

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

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

@@ -1,5 +1,5 @@
 export { generateVirtualFileGlobalEntryWithOldDesign };
-import { assert, assertPosixPath, scriptFileExtensionPattern, debugGlob, isVersionOrAbove, assertWarning, } from '../../utils.js';
+import { assert, assertPosixPath, scriptFileExtensionPattern, debugGlob, isVersionMatch, assertWarning, } from '../../utils.js';
 import { parseVirtualFileId } from '../../../shared/virtualFileId.js';
 import { version as viteVersion } from 'vite';
 import { fileTypes } from '../../../../shared/getPageFiles/fileTypes.js';
@@ -139,7 +139,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 = isVersionOrAbove(viteVersion, '5.1.0');
+                const isNewViteInterface = isVersionMatch(viteVersion, ['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/esm/node/vite/plugins/pluginVirtualFiles.js

@@ -8,7 +8,7 @@ import { reloadVikeConfig, isV1Design, getVikeConfigInternalOptional } from '../
 import pc from '@brillout/picocolors';
 import { logConfigInfo } from '../shared/loggerNotProd.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
-import { updateUserFiles } from '../../runtime/globalContext.js';
+import { isRunnable, updateUserFiles } from '../../runtime/globalContext.js';
 import { isPlusFile } from '../shared/resolveVikeConfigInternal/crawlPlusFiles.js';
 import { isTemporaryBuildFile } from '../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js';
 import { getVikeConfigError } from '../../shared/getVikeConfigError.js';
@@ -16,47 +16,57 @@ function pluginVirtualFiles() {
     let config;
     return {
         name: 'vike:pluginVirtualFiles',
-        async configResolved(config_) {
-            config = config_;
-            // TO-DO/next-major-release: remove
-            if (!isV1Design())
-                config.experimental.importGlobRestoreExtension = true;
+        configResolved: {
+            async handler(config_) {
+                config = config_;
+                // TO-DO/next-major-release: remove
+                if (!isV1Design())
+                    config.experimental.importGlobRestoreExtension = true;
+            },
         },
-        resolveId(id) {
-            if (isVirtualFileId(id)) {
-                return 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 (isVirtualFileId(id)) {
+                    return addVirtualFileIdPrefix(id);
+                }
+            },
         },
-        async load(id, options) {
-            if (!isVirtualFileId(id))
-                return undefined;
-            id = removeVirtualFileIdPrefix(id);
-            const isDev = config._isDev;
-            assert(typeof isDev === 'boolean');
-            const idParsed = parseVirtualFileId(id);
-            if (idParsed) {
-                if (idParsed.type === 'page-entry') {
-                    const code = await generateVirtualFilePageEntry(id, isDev);
-                    return code;
+        handleHotUpdate: {
+            async handler(ctx) {
+                try {
+                    return await handleHotUpdate(ctx, config);
                 }
-                if (idParsed.type === 'global-entry') {
-                    const code = await 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 (!isVirtualFileId(id))
+                    return undefined;
+                id = removeVirtualFileIdPrefix(id);
+                const isDev = config._isDev;
+                assert(typeof isDev === 'boolean');
+                const idParsed = parseVirtualFileId(id);
+                if (idParsed) {
+                    if (idParsed.type === 'page-entry') {
+                        const code = await generateVirtualFilePageEntry(id, isDev);
+                        return code;
+                    }
+                    if (idParsed.type === 'global-entry') {
+                        const code = await generateVirtualFileGlobalEntryWithOldDesign(id, options, config, this.environment, isDev);
+                        return code;
+                    }
+                }
+            },
         },
-        configureServer(server) {
-            handleFileAddRemove(server, config);
+        configureServer: {
+            handler(server) {
+                handleFileAddRemove(server, config);
+            },
         },
     };
 }
@@ -125,7 +135,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));
-            updateUserFiles();
+            if (isRunnable(server)) {
+                // TODO/now: await
+                updateUserFiles();
+            }
         }
     }
 }

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

@@ -2,12 +2,14 @@ export { 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/esm/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js

@@ -1,7 +1,7 @@
 export { crawlPlusFiles };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
-import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, getGlobalObject, } from '../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsNotProductionRuntime, isVersionMatch, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, getGlobalObject, } from '../../utils.js';
 import path from 'node:path';
 import { glob } from 'tinyglobby';
 import { exec } from 'node:child_process';
@@ -147,7 +147,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 (!isVersionOrAbove(gitVersion, '2.43.1'))
+        if (!isVersionMatch(gitVersion, ['2.43.1']))
             return true;
     }
     // Is userRootDir inside a Git repository?

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.238-commit-d48a597";
+export declare const PROJECT_VERSION: "0.4.239-commit-050a4a3";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.238-commit-d48a597';
+export const PROJECT_VERSION = '0.4.239-commit-050a4a3';

package/dist/esm/utils/assertNodeVersion.js

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

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

@@ -1,4 +1,5 @@
 export { assertVersion };
-export { isVersionOrAbove };
-declare function assertVersion(dependencyName: 'Vite' | 'Node.js', versionActual: string, versionExpected: `${number}.${number}.${number}`): void;
-declare function isVersionOrAbove(versionActual: string, versionExpected: `${number}.${number}.${number}`): boolean;
+export { isVersionMatch };
+type Version = `${number}.${number}.${number}`;
+declare function assertVersion(dependencyName: 'Vite' | 'Node.js', versionActual: string, versionExpectedList: Version[]): void;
+declare function isVersionMatch(versionActual: string, versionExpectedList: Version[]): boolean;

package/dist/esm/utils/assertVersion.js

@@ -1,14 +1,32 @@
 export { assertVersion };
-export { isVersionOrAbove };
+export { isVersionMatch };
+import pc from '@brillout/picocolors';
 import { assert, assertUsage } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+import { joinEnglish } from './joinEnglish.js';
 assertIsNotBrowser();
-function assertVersion(dependencyName, versionActual, versionExpected) {
+function assertVersion(dependencyName, versionActual, versionExpectedList) {
+    assertUsage(isVersionMatch(versionActual, versionExpectedList), `${pc.bold(dependencyName)} ${pc.red(pc.bold(versionActual))} isn't supported, use ${pc.bold(dependencyName)} ${joinEnglish([...versionExpectedList, 'above'].map((v) => pc.green(pc.bold(v))), 'or')}.`);
+}
+function isVersionMatch(versionActual, versionExpectedList) {
     assert(versionActual);
-    assert(versionExpected);
-    assertUsage(isVersionOrAbove(versionActual, versionExpected), `${dependencyName} ${versionActual} isn't supported, use ${dependencyName} >= ${versionExpected} instead.`);
+    assert(versionExpectedList);
+    assert(versionExpectedList.length > 0);
+    const versionActualMajor = parseVersion(versionActual)[0];
+    const versionExpectedListSameMajor = versionExpectedList.filter((versionExpected) => {
+        const versionExpectedMajor = parseVersion(versionExpected)[0];
+        return versionExpectedMajor === versionActualMajor;
+    });
+    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/esm/utils/joinEnglish.js

@@ -7,5 +7,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.238-commit-d48a597",
+  "version": "0.4.239-commit-050a4a3",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -159,7 +159,7 @@
     }
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.19.0"
   },
   "license": "MIT",
   "description": "The Framework *You* Control - Next.js & Nuxt alternative for unprecedented flexibility and dependability.",