vike 0.4.230-commit-f07cc20 → 0.4.231-commit-a0ca5e4

package/dist/cjs/node/{plugin/plugins/previewConfig.js → vite/plugins/pluginPreview.js}

@@ -3,21 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.previewConfig = previewConfig;
+exports.pluginPreview = pluginPreview;
 const utils_js_1 = require("../utils.js");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const addSsrMiddleware_js_1 = require("../shared/addSsrMiddleware.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const index_js_1 = require("./devConfig/index.js");
+const pluginDev_js_1 = require("./pluginDev.js");
 const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 const sirv_1 = __importDefault(require("sirv"));
-const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
-function previewConfig() {
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+function pluginPreview() {
     let config;
-    // let vikeConfig: VikeConfigObject
+    let vikeConfig;
     return {
-        name: 'vike:previewConfig',
+        name: 'vike:pluginPreview',
         apply: utils_js_1.applyPreview,
         config(config) {
             return {
@@ -29,7 +29,8 @@ function previewConfig() {
         },
         async configResolved(config_) {
             config = config_;
-            (0, index_js_1.logDockerHint)(config.preview.host);
+            vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+            (0, pluginDev_js_1.logDockerHint)(config.preview.host);
             // vikeConfig = await getVikeConfig(config)
         },
         configurePreviewServer(server) {
@@ -38,8 +39,7 @@ function previewConfig() {
             config.appType = 'mpa'
             */
             return () => {
-                const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject);
-                const { isPrerenderingEnabledForAllPages, isPrerenderingEnabled } = prerenderConfigGlobal;
+                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);

package/dist/cjs/node/{plugin/plugins/replaceConstants.js → vite/plugins/pluginReplaceConstants.js}

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceConstants = replaceConstants;
+exports.pluginReplaceConstants = pluginReplaceConstants;
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_js_1 = require("../utils.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
-function replaceConstants() {
+function pluginReplaceConstants() {
     let config;
     return {
-        name: 'vike:replaceConstants',
+        name: 'vike:pluginReplaceConstants',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {

package/dist/cjs/node/{plugin/plugins/setGlobalContext.js → vite/plugins/pluginSetGlobalContext.js}

@@ -1,24 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setGlobalContext = setGlobalContext;
+exports.pluginSetGlobalContext = pluginSetGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
-function setGlobalContext() {
+function pluginSetGlobalContext() {
     let isServerReload = false;
-    let config;
     return [
         {
-            name: 'vike:setGlobalContext:pre',
+            name: 'vike:pluginSetGlobalContext:pre',
             enforce: 'pre',
             // This hook is called not only at server start but also at server restart (a new `viteDevServer` instance is created)
             configureServer: {
                 order: 'pre',
                 handler(viteDevServer) {
-                    (0, utils_js_1.assert)(config);
                     if (isServerReload)
-                        (0, getVikeConfig_js_1.reloadVikeConfig)(config);
+                        (0, resolveVikeConfigInternal_js_1.reloadVikeConfig)();
                     isServerReload = true;
                     (0, globalContext_js_1.setGlobalContext_viteDevServer)(viteDevServer);
                     (0, utils_js_1.markSetup_viteDevServer)();
@@ -37,12 +35,11 @@ function setGlobalContext() {
             }
         },
         {
-            name: 'vike:setGlobalContext:post',
+            name: 'vike:pluginSetGlobalContext:post',
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                async handler(config_) {
-                    config = config_;
+                async handler(config) {
                     const viteConfigRuntime = (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config);
                     (0, globalContext_js_1.setGlobalContext_viteConfig)(config, viteConfigRuntime);
                 }

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

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.debug = void 0;
+const utils_js_1 = require("../../utils.js");
+exports.debug = (0, utils_js_1.createDebugger)('vike:virtualFiles');

package/dist/cjs/node/{plugin/plugins/importUserCode/getVirtualFileImportUserCode.js → vite/plugins/pluginVirtualFiles/getVirtualFileEntry.js}

@@ -3,25 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFileImportUserCode = getVirtualFileImportUserCode;
+exports.getVirtualFileEntry = getVirtualFileEntry;
 const utils_js_1 = require("../../utils.js");
-const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 const vite_1 = require("vite");
 const fileTypes_js_1 = require("../../../../shared/getPageFiles/fileTypes.js");
 const path_1 = __importDefault(require("path"));
-const getVirtualFilePageConfigs_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigs.js");
-const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
+const getVirtualFilePageConfigsEager_js_1 = require("./getVirtualFilePageConfigsEager.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-async function getVirtualFileImportUserCode(id, options, vikeConfig, config, isDev) {
-    const idParsed = (0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id);
+const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
+async function getVirtualFileEntry(id, options, config, isDev) {
+    const idParsed = (0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id);
     (0, utils_js_1.assert)(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
     (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options));
-    const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id);
+    const code = await getCode(config, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
-async function getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id) {
+async function getCode(config, isForClientSide, isClientRouting, isDev, id) {
     const { command } = config;
     (0, utils_js_1.assert)(command === 'serve' || command === 'build');
     const isBuild = command === 'build';
@@ -30,7 +31,7 @@ async function getCode(config, vikeConfig, isForClientSide, isClientRouting, isD
     {
         const globRoots = getGlobRoots(config);
         (0, utils_js_1.debugGlob)('Glob roots: ', globRoots);
-        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfig, config, isDev, id);
+        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, isDev, id);
     }
     (0, utils_js_1.debugGlob)(`Glob imports for ${isForClientSide ? 'client' : 'server'}:\n`, content);
     return content;
@@ -60,8 +61,8 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
         }
     }
 }
-async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfig, config, isDev, id) {
-    let fileContent = `// Generated by https://github.com/vikejs/vike/blob/main/vike/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.ts
+async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, isDev, id) {
+    let fileContent = `// Generated by Vike
 
 export const pageFilesLazy = {};
 export const pageFilesEager = {};
@@ -70,13 +71,14 @@ export const pageFilesExportNamesEager = {};
 export const pageFilesList = [];
 export const neverLoaded = {};
 
-${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClientSide, isDev, id, isClientRouting, config)}
+${await (0, getVirtualFilePageConfigsEager_js_1.getVirtualFilePageConfigsEager)(isForClientSide, isDev, id, isClientRouting)}
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = (0, getVikeConfig_js_1.isV1Design)(config);
+    const isV1Design = (0, resolveVikeConfigInternal_js_1.isV1Design)();
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     // Old design => no + files => only to enable pre-rendering is setting `vike({prerender})` in vite.config.js
-    const isPrerendering = !!vikeConfig.global.config.prerender;
+    const isPrerendering = !!vikeConfig.config.prerender;
     fileTypes_js_1.fileTypes
         .filter((fileType) => fileType !== '.css')
         .forEach((fileType) => {
@@ -94,8 +96,7 @@ ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClien
             fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
         }
     });
-    // TODO/now: add meta.default
-    const includeAssetsImportedByServer = vikeConfig.global.config.includeAssetsImportedByServer ?? true;
+    const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
     if (includeAssetsImportedByServer && isForClientSide) {
         fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
     }

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js → vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigLazy.js}

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFilePageConfigValuesAll = getVirtualFilePageConfigValuesAll;
-const utils_js_1 = require("../../../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-const getVikeConfig_js_1 = require("../getVikeConfig.js");
-const extractAssetsQuery_js_1 = require("../../../../../shared/extractAssetsQuery.js");
+exports.getVirtualFilePageConfigLazy = getVirtualFilePageConfigLazy;
+const utils_js_1 = require("../../utils.js");
+const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
+const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const handleAssetsManifest_js_1 = require("../../../build/handleAssetsManifest.js");
-const getConfigValueBuildTime_js_1 = require("../../../../../../shared/page-configs/getConfigValueBuildTime.js");
-async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
-    const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
+const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
+const handleAssetsManifest_js_1 = require("../pluginBuild/handleAssetsManifest.js");
+const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
+const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
+async function getVirtualFilePageConfigLazy(id, isDev, config) {
+    const result = (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id);
     (0, utils_js_1.assert)(result);
     /* This assertion fails when using includeAssetsImportedByServer
     {
@@ -20,17 +21,15 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     }
     */
     const { pageId, isForClientSide } = result;
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
-    const { pageConfigs } = vikeConfig;
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)(true);
+    const { _pageConfigs: pageConfigs } = vikeConfig;
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig, { id, pageId });
-    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, 
-    // TODO/now: add meta.default
-    vikeConfig.global.config.includeAssetsImportedByServer ?? true, config, isDev);
+    const code = getLoadConfigLazy(pageConfig, isForClientSide, pageId, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config), config, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
+function getLoadConfigLazy(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
     const lines = [];
     const importStatements = [];
     const filesEnv = new Map();
@@ -39,7 +38,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
     lines.push('};');
     if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
-        importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, false))}'`);
+        importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, false))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');
     return code;

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/virtual-files/getVirtualFilePageConfigs.js → vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigsEager.js}

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFilePageConfigs = getVirtualFilePageConfigs;
-const virtualFilePageConfigValuesAll_js_1 = require("../../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+exports.getVirtualFilePageConfigsEager = getVirtualFilePageConfigsEager;
+const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const debug_js_1 = require("./debug.js");
-const getVikeConfig_js_1 = require("../getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
-    const { pageConfigs, pageConfigGlobal } = vikeConfig;
+const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
+async function getVirtualFilePageConfigsEager(isForClientSide, isDev, id, isClientRouting) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)(true);
+    const { _pageConfigs: pageConfigs, _pageConfigGlobal: pageConfigGlobal } = vikeConfig;
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
@@ -33,9 +33,9 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    pageId: ${JSON.stringify(pageId)},`);
         lines.push(`    isErrorPage: ${JSON.stringify(isErrorPage)},`);
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
-        const virtualFileId = JSON.stringify((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide));
+        const virtualFileId = JSON.stringify((0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, isForClientSide));
         const load = `() => ({ moduleId: ${virtualFileId}, moduleExports: import(${virtualFileId}) })`;
-        lines.push(`    loadConfigValuesAll: ${load},`);
+        lines.push(`    loadConfigLazy: ${load},`);
         lines.push(`    configValuesSerialized: {`);
         lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
         lines.push(`    },`);

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

@@ -0,0 +1,209 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluginVirtualFiles = pluginVirtualFiles;
+const vite_1 = require("vite");
+const getVirtualFilePageConfigLazy_js_1 = require("./pluginVirtualFiles/getVirtualFilePageConfigLazy.js");
+const getVirtualFileEntry_js_1 = require("./pluginVirtualFiles/getVirtualFileEntry.js");
+const utils_js_1 = require("../utils.js");
+const virtualFiles_js_1 = require("../../shared/virtualFiles.js");
+const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileEntry_js_1 = require("../../shared/virtualFiles/virtualFileEntry.js");
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const loggerNotProd_js_1 = require("../shared/loggerNotProd.js");
+const getFilePath_js_1 = require("../shared/getFilePath.js");
+const globalContext_js_1 = require("../../runtime/globalContext.js");
+const crawlPlusFiles_js_1 = require("../shared/resolveVikeConfigInternal/crawlPlusFiles.js");
+const renderPage_js_1 = require("../../runtime/renderPage.js");
+const transpileAndExecuteFile_js_1 = require("../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js");
+function pluginVirtualFiles() {
+    let config;
+    return {
+        name: 'vike:pluginVirtualFiles',
+        async configResolved(config_) {
+            config = config_;
+            // TODO/v1-release: remove
+            if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
+                config.experimental.importGlobRestoreExtension = true;
+        },
+        resolveId(id) {
+            if ((0, virtualFiles_js_1.isVirtualFileId)(id)) {
+                return (0, virtualFiles_js_1.resolveVirtualFileId)(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, virtualFiles_js_1.isVirtualFileId)(id))
+                return undefined;
+            id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+            const isDev = config._isDev;
+            (0, utils_js_1.assert)(typeof isDev === 'boolean');
+            if ((0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id)) {
+                const code = await (0, getVirtualFilePageConfigLazy_js_1.getVirtualFilePageConfigLazy)(id, isDev, config);
+                return code;
+            }
+            if ((0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id)) {
+                const code = await (0, getVirtualFileEntry_js_1.getVirtualFileEntry)(id, options, config, isDev);
+                return code;
+            }
+        },
+        configureServer(server) {
+            handleFileAddRemove(server, config);
+        }
+    };
+}
+function handleFileAddRemove(server, config) {
+    server.watcher.prependListener('add', (f) => listener(f, false));
+    server.watcher.prependListener('unlink', (f) => listener(f, true));
+    return;
+    async function listener(file, isRemove) {
+        file = (0, vite_1.normalizePath)(file);
+        if ((0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(file))
+            return;
+        const { moduleGraph } = server;
+        const isVikeConfig = await isVikeConfigDependency(file, moduleGraph);
+        const reload = () => reloadConfig(file, config, isRemove ? 'removed' : 'created', server);
+        if (isVikeConfig) {
+            if (isVikeConfig.isNotProcessedByVite) {
+                reload();
+            }
+            else {
+                // Let Vite handle it
+                (0, utils_js_1.assert)(existsInViteModuleGraph(file, moduleGraph));
+            }
+        }
+        else {
+            // Trick: when importing a file that doesn't exist => we don't know whether `file` is that missing file => we take a leap of faith when the conditions below are met.
+            // - Not sure how reliable that trick is.
+            // - Reloading Vike's config is cheap and file creation/removal is rare => the trick is worth it.
+            // - Reproduction:
+            //   ```bash
+            //   rm someDep.js && sleep 2 && git checkout someDep.js
+            //   ```
+            if ((0, utils_js_1.isScriptFile)(file) && (0, renderPage_js_1.vikeConfigHasError)() && !existsInViteModuleGraph(file, moduleGraph)) {
+                reload();
+            }
+        }
+    }
+}
+function invalidateVikeVirtualFiles(server) {
+    const vikeVirtualFiles = getVikeVirtualFiles(server);
+    vikeVirtualFiles.forEach((mod) => {
+        server.moduleGraph.invalidateModule(mod);
+    });
+}
+// Vite calls its hook handleHotUpdate() whenever *any file* is modified — including files that aren't in Vite's module graph such as `pages/+config.js`
+async function handleHotUpdate(ctx, config) {
+    const { file, server } = ctx;
+    const isVikeConfig = await isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
+    if (isVikeConfig) {
+        if (isVikeConfig.isNotProcessedByVite) {
+            /* Tailwind breaks this assertion, see https://github.com/vikejs/vike/discussions/1330#discussioncomment-7787238
+            const isViteModule = ctx.modules.length > 0
+            assert(!isViteModule)
+            */
+            reloadConfig(file, config, 'modified', server);
+            // Files such as `pages/+config.js` can potentially modify Vike's virtual files.
+            // Triggers a full page reload
+            const vikeVirtualFiles = getVikeVirtualFiles(server);
+            return vikeVirtualFiles;
+        }
+        else {
+            // 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)();
+        }
+    }
+}
+async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
+    // Non-runtime Vike config files such as `pages/+config.js` which aren't processed by Vite.
+    // - They're missing in Vite's module graph.
+    // - Potentially modifies Vike's virtual files.
+    // - Same for all `pages/+config.js` dependencies.
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
+    const vikeConfigObject = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternalOptional)();
+    if (vikeConfigObject) {
+        const { _vikeConfigDependencies: vikeConfigDependencies } = vikeConfigObject;
+        vikeConfigDependencies.forEach((f) => (0, utils_js_1.assertPosixPath)(f));
+        if (vikeConfigDependencies.has(filePathAbsoluteFilesystem))
+            return { isNotProcessedByVite: true };
+    }
+    // Runtime Vike config files such as +data.js which are processed by Vite.
+    // - They're included in Vite's module graph.
+    // - They never modify Vike's virtual files.
+    // - Same for all `+data.js` dependencies.
+    const importers = getImporters(filePathAbsoluteFilesystem, moduleGraph);
+    const isPlusValueFileDependency = Array.from(importers).some((importer) => importer.file && (0, crawlPlusFiles_js_1.isPlusFile)(importer.file));
+    if (isPlusValueFileDependency)
+        return { isNotProcessedByVite: false };
+    return null;
+}
+function reloadConfig(filePath, config, op, server) {
+    // Ensure server.ssrLoadModule() loads fresh Vike virtual files (`reloadConfig()` > `updateUserFiles()` > `server.ssrLoadModule()`)
+    invalidateVikeVirtualFiles(server);
+    {
+        const filePathToShowToUserResolved = (0, getFilePath_js_1.getModuleFilePathAbsolute)(filePath, config);
+        const msg = `${op} ${picocolors_1.default.dim(filePathToShowToUserResolved)}`;
+        (0, loggerNotProd_js_1.logConfigInfo)(msg, 'info');
+    }
+    (0, resolveVikeConfigInternal_js_1.reloadVikeConfig)();
+    (0, globalContext_js_1.updateUserFiles)();
+}
+function getVikeVirtualFiles(server) {
+    const vikeVirtualFiles = Array.from(server.moduleGraph.urlToModuleMap.keys())
+        .filter((url) => (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(url) || (0, virtualFileEntry_js_1.isVirtualFileIdEntry)(url))
+        .map((url) => {
+        const mod = server.moduleGraph.urlToModuleMap.get(url);
+        (0, utils_js_1.assert)(mod);
+        return mod;
+    });
+    return vikeVirtualFiles;
+}
+// Get all transitive importers (including the module itself)
+function getImporters(file, moduleGraph) {
+    const importers = new Set();
+    const mods = moduleGraph.getModulesByFile(file);
+    if (!mods)
+        return importers;
+    for (const mod of mods) {
+        getModuleImporters(mod).forEach((importer) => {
+            if (importer)
+                importers.add(importer);
+        });
+    }
+    return importers;
+}
+function getModuleImporters(mod, seen = new Set()) {
+    if (seen.has(mod))
+        return new Set();
+    seen.add(mod);
+    const importers = new Set();
+    if (mod.id)
+        importers.add(mod);
+    // Traverse through the importers (modules that import this module)
+    for (const importer of mod.importers) {
+        if (importer.id)
+            importers.add(importer);
+        getModuleImporters(importer, seen).forEach((importerTransitive) => {
+            if (importerTransitive)
+                importers.add(importerTransitive);
+        });
+    }
+    return importers;
+}
+function existsInViteModuleGraph(file, moduleGraph) {
+    return !!moduleGraph.getModulesByFile(file);
+}

package/dist/cjs/node/{plugin/plugins/workaroundCssModuleHmr.js → vite/plugins/pluginWorkaroundCssModuleHmr.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workaroundCssModuleHmr = workaroundCssModuleHmr;
-function workaroundCssModuleHmr() {
+exports.pluginWorkaroundCssModuleHmr = pluginWorkaroundCssModuleHmr;
+function pluginWorkaroundCssModuleHmr() {
     return {
-        name: 'vike:workaroundCssModuleHmr',
+        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.

package/dist/cjs/node/{plugin/plugins/workaroundVite6HmrRegression.js → vite/plugins/pluginWorkaroundVite6HmrRegression.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workaroundVite6HmrRegression = workaroundVite6HmrRegression;
+exports.pluginWorkaroundVite6HmrRegression = pluginWorkaroundVite6HmrRegression;
 // https://vite.dev/guide/migration (will be 404 after vite@7 release) > search for `hmrReload()`
 // https://v6.vite.dev/guide/migration (will exist after vite@7 release) > search for `hmrReload()`
 // Workaround seems to work for docs page /banner (which is HTML-only)
 // But doesn't seem to work for /examples/render-modes/ (see https://github.com/vikejs/vike/pull/2069 commit `renable HMR test for HTML-only`)
-function workaroundVite6HmrRegression() {
+function pluginWorkaroundVite6HmrRegression() {
     return {
-        name: 'vike:workaroundVite6HmrRegression',
+        name: 'vike:pluginWorkaroundVite6HmrRegression',
         enforce: 'post',
         hotUpdate: {
             order: 'post',

package/dist/cjs/node/{plugin → vite}/shared/getHttpRequestAsyncStore.js

@@ -40,7 +40,7 @@ exports.getHttpRequestAsyncStore = getHttpRequestAsyncStore;
 exports.installHttpRequestAsyncStore = installHttpRequestAsyncStore;
 const renderPage_js_1 = require("../../runtime/renderPage.js");
 const utils_js_1 = require("../utils.js");
-const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js");
+const transpileAndExecuteFile_js_1 = require("./resolveVikeConfigInternal/transpileAndExecuteFile.js");
 const loggerNotProd_js_1 = require("./loggerNotProd.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
 const node_util_1 = require("node:util");

package/dist/cjs/node/{plugin → vite}/shared/loggerNotProd.js

@@ -17,12 +17,12 @@ exports.logConfigErrorRecover = logConfigErrorRecover;
 exports.logErrorDebugNote = logErrorDebugNote;
 const abort_js_1 = require("../../../shared/route/abort.js");
 const globalContext_js_1 = require("../../runtime/globalContext.js");
-const loggerRuntime_js_1 = require("../../runtime/renderPage/loggerRuntime.js");
+const loggerRuntime_js_1 = require("../../runtime/loggerRuntime.js");
 const utils_js_1 = require("../utils.js");
 const getHttpRequestAsyncStore_js_1 = require("./getHttpRequestAsyncStore.js");
 const isErrorDebug_js_1 = require("../../shared/isErrorDebug.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
-const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js");
+const transpileAndExecuteFile_js_1 = require("./resolveVikeConfigInternal/transpileAndExecuteFile.js");
 const log_js_1 = require("./loggerNotProd/log.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isNewError_js_1 = require("../../runtime/renderPage/isNewError.js");
@@ -33,7 +33,6 @@ const execHook_js_1 = require("../../../shared/hooks/execHook.js");
 (0, utils_js_1.overwriteAssertProductionLogger)(assertLogger);
 function logRuntimeInfo(msg, httpRequestId, logType) {
     const category = getCategory(httpRequestId);
-    (0, utils_js_1.assert)(category);
     (0, log_js_1.logWithVikeTag)(msg, logType, category);
 }
 function logViteAny(msg, logType, httpRequestId, prependViteTag) {
@@ -50,9 +49,8 @@ function logConfigInfo(msg, logType) {
     (0, log_js_1.logWithVikeTag)(msg, logType, category);
 }
 function logConfigErrorRecover() {
-    const msg = picocolors_1.default.bold(picocolors_1.default.green('Configuration successfully loaded'));
     const category = getConfigCategory();
-    (0, log_js_1.logWithVikeTag)(msg, 'error-recover', category);
+    (0, log_js_1.logWithVikeTag)(globalContext_js_1.vikeConfigErrorRecoverMsg, 'error-recover', category);
 }
 function logRuntimeError(err, 
 // httpRequestId is `null` when pre-rendering

package/dist/cjs/node/{plugin → vite}/shared/loggerVite.js

@@ -33,7 +33,7 @@ function intercept(logType, config) {
             // We swallow Vite's message: we didn't see it add any value so far.
             //  - It can even be confusing, such as the following:
             //    ```
-            //    Error when evaluating SSR module virtual:vike:pageConfigValuesAll:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
+            //    Error when evaluating SSR module virtual:vike:pageConfigLazy:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
             //    ```
             (0, utils_js_1.assert)(!(0, isErrorDebug_js_1.isErrorDebug)());
             return;

package/dist/cjs/node/{plugin/plugins/importUserCode/v1-design/getVikeConfig → vite/shared/resolveVikeConfigInternal}/assertExtensions.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertExtensionsConventions = assertExtensionsConventions;
 exports.assertExtensionsRequire = assertExtensionsRequire;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("../../../../utils.js");
-const getVikeConfig_js_1 = require("../getVikeConfig.js");
+const utils_js_1 = require("../../utils.js");
+const resolveVikeConfigInternal_js_1 = require("../resolveVikeConfigInternal.js");
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 function assertExtensionsConventions(plusFile) {
@@ -75,7 +75,7 @@ function assertExtensionsRequire(plusFiles) {
     });
 }
 function resolveRequireSetting(plusFile) {
-    const confVal = (0, getVikeConfig_js_1.getConfVal)(plusFile, 'require');
+    const confVal = (0, resolveVikeConfigInternal_js_1.getConfVal)(plusFile, 'require');
     if (!confVal)
         return null;
     (0, utils_js_1.assert)(confVal.valueIsLoaded);
@@ -98,7 +98,7 @@ function resolveRequireSetting(plusFile) {
     return requireSetting;
 }
 function getNameValue(plusFile) {
-    const confVal = (0, getVikeConfig_js_1.getConfVal)(plusFile, 'name');
+    const confVal = (0, resolveVikeConfigInternal_js_1.getConfVal)(plusFile, 'name');
     if (!confVal)
         return null;
     (0, utils_js_1.assert)(confVal.valueIsLoaded);