vike 0.4.238 → 0.4.239-commit-33e55d4

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

@@ -13,73 +13,100 @@ const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
+const skipNodeModules = '/node_modules/'; // Only apply `.server.js` and `.client.js` to user files
+const filterRolldown = {
+    id: {
+        include: ['client', 'server'].map((env) => `**/*${getSuffix(env)}*`),
+        exclude: [`**${skipNodeModules}**`],
+    },
+};
+const filterFunction = (id) => {
+    if (id.includes(skipNodeModules))
+        return false;
+    if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
+        return false;
+    return true;
+};
 function pluginFileEnv() {
     let config;
     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: {
+            filter: filterRolldown,
+            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, config.root))
+                    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: {
+            filter: filterRolldown,
+            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;
+                if (skip(id, config.root))
                     return;
-                }
-                assertFileEnv(moduleId, (0, isViteServerSide_js_1.isViteServerSide)(config, this.environment), importers, false);
-            });
+                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(filterFunction)
+                    .filter((id) => !skip(id, config.root))
+                    .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) {
@@ -119,31 +146,27 @@ function pluginFileEnv() {
         }
         return errMsg;
     }
-    function isWrongEnv(moduleId, isServerSide) {
-        const modulePath = getModulePath(moduleId);
-        const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
-        return modulePath.includes(suffixWrong);
-    }
-    function skip(id) {
-        // TO-DO/next-major-release: remove
-        if (pluginExtractAssets_js_1.extractAssetsRE.test(id) || pluginExtractExportNames_js_1.extractExportNamesRE.test(id))
-            return true;
-        if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
-            return true;
-        if (getModulePath(id).endsWith('.css'))
-            return true;
-        // Apply `.server.js` and `.client.js` only to user files
-        if (id.includes('/node_modules/'))
-            return true;
-        // Only user files
-        if (!id.startsWith(config.root))
-            return true;
-        return false;
-    }
-    function getSuffix(env) {
-        return `.${env}.`;
-    }
-    function getModulePath(moduleId) {
-        return moduleId.split('?')[0];
-    }
+}
+function isWrongEnv(moduleId, isServerSide) {
+    const modulePath = getModulePath(moduleId);
+    const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
+    return modulePath.includes(suffixWrong);
+}
+function skip(id, userRootDir) {
+    (0, utils_js_1.assert)(filterFunction(id));
+    // TO-DO/next-major-release: remove
+    if (pluginExtractAssets_js_1.extractAssetsRE.test(id) || pluginExtractExportNames_js_1.extractExportNamesRE.test(id))
+        return true;
+    if (getModulePath(id).endsWith('.css'))
+        return true;
+    // Skip linked dependencies
+    if (!id.startsWith(userRootDir))
+        return true;
+    return false;
+}
+function getSuffix(env) {
+    return `.${env}.`;
+}
+function getModulePath(moduleId) {
+    return moduleId.split('?')[0];
 }

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

@@ -6,6 +6,17 @@ const retrievePageAssetsDev_js_1 = require("../../runtime/renderPage/getPageAsse
 const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
 const getMagicString_js_1 = require("../shared/getMagicString.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
+const distFileIsNonRunnableDev = (0, utils_js_1.requireResolveDistFile)('dist/esm/utils/isNonRunnableDev.js');
+const distFileGlobalContext = (0, utils_js_1.requireResolveDistFile)('dist/esm/node/runtime/globalContext.js');
+const filterRolldown = {
+    id: {
+        include: [distFileIsNonRunnableDev, distFileGlobalContext].map((filePath) => new RegExp(`^${(0, utils_js_1.escapeRegex)(filePath)}($|${(0, utils_js_1.escapeRegex)('?')}.*)`)),
+    },
+};
+const filterFunction = (id) => {
+    const idWithoutQuery = getIdWithoutQuery(id);
+    return idWithoutQuery === distFileIsNonRunnableDev || idWithoutQuery === distFileGlobalContext;
+};
 function getViteRpcFunctions(viteDevServer) {
     return {
         async transformIndexHtmlRPC(html) {
@@ -20,32 +31,40 @@ function getViteRpcFunctions(viteDevServer) {
     };
 }
 function pluginNonRunnableDev() {
-    const distFileIsNonRunnableDev = (0, utils_js_1.requireResolveDistFile)('dist/esm/utils/isNonRunnableDev.js');
-    const distFileGlobalContext = (0, utils_js_1.requireResolveDistFile)('dist/esm/node/runtime/globalContext.js');
     let config;
     return {
         name: 'vike:pluginNonRunnableDev',
-        configureServer(viteDevServer) {
-            (0, utils_js_1.createViteRPC)(viteDevServer, getViteRpcFunctions);
+        apply: (_, configEnv) => (0, utils_js_1.isDevCheck)(configEnv),
+        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;
-            if (id !== distFileIsNonRunnableDev && id !== distFileGlobalContext)
-                return;
-            if ((0, utils_js_1.isRunnableDevEnvironment)(this.environment))
-                return;
-            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
-            if (id === distFileIsNonRunnableDev) {
-                magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(true));
-            }
-            if (id === distFileGlobalContext) {
-                magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
-            }
-            return getMagicStringResult();
+        transform: {
+            filter: filterRolldown,
+            handler(code, id) {
+                (0, utils_js_1.assert)(config._isDev);
+                (0, utils_js_1.assert)(filterFunction(id));
+                const idWithoutQuery = getIdWithoutQuery(id);
+                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();
+            },
         },
     };
 }
+function getIdWithoutQuery(id) {
+    return id.split('?')[0];
+}

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

@@ -1,51 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterRolldown = exports.filterFunction = void 0;
 exports.pluginReplaceConstants = pluginReplaceConstants;
 const utils_js_1 = require("../utils.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
 const getMagicString_js_1 = require("../shared/getMagicString.js");
+const skipNodeModules = '/node_modules/';
+const skipIrrelevant = '({}).';
+const filterRolldown = {
+    id: {
+        exclude: `**${skipNodeModules}**`,
+    },
+    code: {
+        include: skipIrrelevant,
+    },
+};
+exports.filterRolldown = filterRolldown;
+const filterFunction = (id, code) => {
+    if (id.includes(skipNodeModules))
+        return false;
+    if (!code.includes(skipIrrelevant))
+        return false;
+    return true;
+};
+exports.filterFunction = filterFunction;
 function pluginReplaceConstants() {
     let config;
     return {
         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: {
+            filter: filterRolldown,
+            handler(code, id, options) {
+                id = (0, normalizeId_js_1.normalizeId)(id);
+                (0, utils_js_1.assertPosixPath)(id);
+                (0, utils_js_1.assertPosixPath)(config.root);
+                if (!id.startsWith(config.root))
+                    return; // skip linked dependencies
+                (0, utils_js_1.assert)(filterFunction(id, code));
+                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 regExp = getConstantRegExp(constants);
-                magicString.replaceAll(regExp, JSON.stringify(replacement));
-            });
-            if (!magicString.hasChanged())
-                return null;
-            return getMagicStringResult();
+                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

@@ -17,51 +17,67 @@ const globalContext_js_1 = require("../../runtime/globalContext.js");
 const crawlPlusFiles_js_1 = require("../shared/resolveVikeConfigInternal/crawlPlusFiles.js");
 const transpileAndExecuteFile_js_1 = require("../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js");
 const getVikeConfigError_js_1 = require("../../shared/getVikeConfigError.js");
+const filterRolldown = {
+    id: {
+        include: new RegExp(`^(${(0, utils_js_1.escapeRegex)(utils_js_1.virtualFileIdPrefix1)}|${(0, utils_js_1.escapeRegex)(utils_js_1.virtualFileIdPrefix2)})`),
+    },
+};
+const filterFunction = (id) => (0, utils_js_1.isVirtualFileId)(id);
 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)) {
+        resolveId: {
+            filter: filterRolldown,
+            handler(id) {
+                (0, utils_js_1.assert)(filterFunction(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;
-            }
+            },
         },
-        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: {
+            filter: filterRolldown,
+            async handler(id, options) {
+                (0, utils_js_1.assert)(filterFunction(id));
+                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 +146,9 @@ 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)) {
+                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/configDefinitionsBuiltIn.js

@@ -173,6 +173,9 @@ const configDefinitionsBuiltIn = {
         env: { config: true },
         global: true,
     },
+    csp: {
+        env: { server: true },
+    },
     injectScriptsAt: {
         env: { server: true },
     },