vike 0.4.248 → 0.4.249-commit-55681da

package/bin.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import './dist/node/cli/entry.js'

package/dist/client/runtime-client-routing/getPageContext.js

@@ -1,8 +1,6 @@
 export { getPageContext };
 export { providePageContext };
 // TO-DO/eventually: create new setting `+asyncHook: true` that sets the default value of the `asyncHook` parameter below to `true`
-// TODO/next-release: update vike-{react,vue,solid} usage
-// TODO/next-release: contact Da-Jin about `window.history.state?.vike` https://vike.dev/navigate#history-pushstate
 import { getPageContext_sync, providePageContext } from '../../shared-server-client/hooks/execHook.js';
 import { getPageContextClient } from './renderPageClient.js';
 function getPageContext({ asyncHook } = {}) {

package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts

@@ -136,7 +136,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
+    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
@@ -152,7 +152,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
+    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
         previousPageContext: {
             pageId: string;
         } | null;
@@ -204,7 +204,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
+}, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
@@ -220,7 +220,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-}, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
+}, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
     previousPageContext: {
         pageId: string;
     } | null;
@@ -362,7 +362,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
+    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
@@ -378,7 +378,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
+    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
         previousPageContext: {
             pageId: string;
         } | null;
@@ -428,7 +428,7 @@ declare function getPageContextFromHooksClient(pageContext: {
     url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
+}, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
@@ -444,7 +444,7 @@ declare function getPageContextFromHooksClient(pageContext: {
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-}, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
+}, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
     previousPageContext: {
         pageId: string;
     } | null;

package/dist/client/runtime-client-routing/renderPageClient.d.ts

@@ -149,7 +149,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
+    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
@@ -165,7 +165,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
+    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
         previousPageContext: {
             pageId: string;
         } | null;
@@ -300,7 +300,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
+    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
@@ -316,7 +316,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
+    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
         previousPageContext: {
             pageId: string;
         } | null;

package/dist/node/api/utils.d.ts

@@ -6,6 +6,6 @@ export * from '../../utils/assertVersion.js';
 export * from '../../utils/pick.js';
 export * from '../../utils/assertSetup.js';
 export * from '../../utils/isCallable.js';
-export * from '../../utils/colors.js';
-export * from '../../utils/colorVike.js';
+export * from '../../utils/colorsServer.js';
+export * from '../../utils/colorsClient.js';
 export * from '../../utils/PROJECT_VERSION.js';

package/dist/node/api/utils.js

@@ -10,6 +10,6 @@ export * from '../../utils/assertVersion.js';
 export * from '../../utils/pick.js';
 export * from '../../utils/assertSetup.js';
 export * from '../../utils/isCallable.js';
-export * from '../../utils/colors.js';
-export * from '../../utils/colorVike.js';
+export * from '../../utils/colorsServer.js';
+export * from '../../utils/colorsClient.js';
 export * from '../../utils/PROJECT_VERSION.js';

package/dist/node/vite/plugins/build/pluginBuildConfig.js

@@ -1,7 +1,7 @@
 export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
-import { assert, addOnBeforeAssertLog, removeFileExtension, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsImportPathNpmPackage, requireResolveDistFile, } from '../../utils.js';
+import { assert, setAssertOnBeforeLog, removeFileExtension, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsImportPathNpmPackage, requireResolveDistFile, } from '../../utils.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { generateVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
@@ -203,7 +203,7 @@ function addLogHook() {
         'rendering chunks (',
         'computing gzip size ('
     ];
-    addOnBeforeAssertLog(() => {
+    setAssertOnBeforeLog(() => {
         // Using viteTransientLogs is very conservative as clearing the current line is low risk. (We can assume that important messages, such as errors, include a trailing new line. Usually, only transient messages have no trailing new lines.)
         if (viteTransientLogs.some((s) => lastLog?.startsWith(s))) {
             process.stdout.clearLine(0);

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

@@ -9,7 +9,7 @@ import pc from '@brillout/picocolors';
 import { logConfigInfo } from '../shared/loggerDev.js';
 import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
 import { updateUserFiles } from '../../../server/runtime/globalContext.js';
-import { isPlusFile } from '../shared/resolveVikeConfigInternal/crawlPlusFiles.js';
+import { isPlusFile } from '../shared/resolveVikeConfigInternal/crawlPlusFilePaths.js';
 import { isTemporaryBuildFile } from '../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js';
 import { debugFileChange, getVikeConfigError } from '../../../shared-server-node/getVikeConfigError.js';
 const filterRolldown = {
@@ -38,11 +38,12 @@ function pluginVirtualFiles() {
                     return addVirtualFileIdPrefix(id);
                 },
             },
+            // Vite calls handleHotUpdate() whenever *any file* is modified — including files that aren't in Vite's module graph such as +config.js
             handleHotUpdate: {
                 async handler(ctx) {
                     debugFileChange('handleHotUpdate()', ctx.file);
                     try {
-                        return await handleHotUpdate(ctx, config);
+                        return await onFileModified(ctx, config);
                     }
                     catch (err) {
                         // Vite swallows errors thrown by handleHotUpdate()
@@ -73,106 +74,89 @@ function pluginVirtualFiles() {
             },
             configureServer: {
                 handler(server) {
-                    handleFileAddRemove(server, config);
+                    server.watcher.prependListener('add', (file) => onFileCreatedOrRemoved(file, false, server, config));
+                    server.watcher.prependListener('unlink', (file) => onFileCreatedOrRemoved(file, true, 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 = normalizePath(file);
-        if (isTemporaryBuildFile(file))
-            return;
-        const operation = isRemove ? 'removed' : 'created';
-        debugFileChange('server.watcher', file, operation);
-        const { moduleGraph } = server;
-        const isVikeConfigDep = await isVikeConfigDependency(file, moduleGraph);
-        const reload = () => reloadConfig(file, config, operation, server);
-        // Config code
-        if (isVikeConfigDep && !isVikeConfigDep.isProcessedByVite) {
-            reload();
-            return;
-        }
-        // New or deleted + file
-        if (isPlusFile(file)) {
-            reload();
-            return;
-        }
-        // Runtime code => let Vite handle it
-        if (isVikeConfigDep && isVikeConfigDep.isProcessedByVite) {
-            assert(existsInViteModuleGraph(file, moduleGraph));
-            return;
-        }
-        // 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.
+async function onFileModified(ctx, config) {
+    const { file, server } = ctx;
+    const isAppFile = await isAppDependency(ctx.file, ctx.server.moduleGraph);
+    debugFileChange(isAppFile);
+    if (!isAppFile)
+        return;
+    const reloadVikeConfig = () => reloadConfig(file, config, 'modified', server);
+    if (isAppFile.isRuntimeDependency) {
+        // Ensure we invalidate `file` *before* server.ssrLoadModule() in updateUserFiles()
+        // Vite also invalidates it, but *after* handleHotUpdate() and thus after server.ssrLoadModule()
+        ctx.modules.forEach((mod) => server.moduleGraph.invalidateModule(mod));
+        // Re-running ssrLoadModule() is cheap (Vite uses a cache) => eagerly calling updateUserFiles() makes sense.
+        // - Even for SPA apps that don't have (m)any server files? Ideally, we should set `isRuntimeDependency: true` only for server modules (let's do it once Vite has a clear separate per-environment module graphs).
+        await updateUserFiles();
+    }
+    if (isAppFile.isConfigDependency) {
+        /* Tailwind breaks this assertion, see https://github.com/vikejs/vike/discussions/1330#discussioncomment-7787238
+        const isViteModule = ctx.modules.length > 0
+        assert(!isViteModule)
+        */
+        reloadVikeConfig();
+        // Trigger a full page reload. (Because files such as +config.js can potentially modify Vike's virtual files.)
+        const vikeVirtualFiles = getVikeVirtualFiles(server);
+        return vikeVirtualFiles;
+    }
+}
+async function onFileCreatedOrRemoved(file, isRemove, server, config) {
+    file = normalizePath(file);
+    if (isTemporaryBuildFile(file))
+        return;
+    const operation = isRemove ? 'removed' : 'created';
+    debugFileChange('server.watcher', file, operation);
+    const { moduleGraph } = server;
+    const isAppFile = await isAppDependency(file, moduleGraph);
+    const reloadVikeConfig = () => reloadConfig(file, config, operation, server);
+    if (
+    // Vike config (non-runtime) code
+    isAppFile?.isConfigDependency ||
+        // New + file => not tracked yet by Vike (`vikeConfigObject._vikeConfigDependencies`) nor Vite (`moduleGraph`)
+        isPlusFile(file) ||
+        // Trick: when fixing the path of a relative import => we don't know whether `file` is the imported file => we take a leap of faith when the conditions below are met.
+        // - Reloading Vike's config is cheap => eagerly reloading it makes sense when it's in an erroneous state.
         // - 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
+        //   rm someImportedFile.js && sleep 2 && git checkout someImportedFile.js
         //   ```
-        if (isScriptFile(file) && getVikeConfigError() && !existsInViteModuleGraph(file, moduleGraph)) {
-            reload();
-            return;
-        }
+        (isScriptFile(file) && getVikeConfigError())) {
+        reloadVikeConfig();
     }
 }
-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 isVikeConfigDep = await isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
-    debugFileChange(isVikeConfigDep);
-    if (isVikeConfigDep) {
-        if (!isVikeConfigDep.isProcessedByVite) {
-            /* 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 also invalidates it, but *after* handleHotUpdate() and thus after server.ssrLoadModule()
-            ctx.modules.forEach((mod) => server.moduleGraph.invalidateModule(mod));
-            await updateUserFiles();
-        }
-    }
-}
-async function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
-    // Non-runtime Vike config files such as `pages/+config.js` which aren't processed by Vite.
+async function isAppDependency(filePathAbsoluteFilesystem, moduleGraph) {
+    const isAppFile = {};
+    // =============================
+    // { isConfigDependency: false }
+    // =============================
+    // Vike config (non-runtime) files such as +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.
+    // - Same for all `pages/+config.js` transitive dependencies.
     assertPosixPath(filePathAbsoluteFilesystem);
     const vikeConfigObject = await getVikeConfigInternalOptional();
     if (vikeConfigObject) {
         const { _vikeConfigDependencies: vikeConfigDependencies } = vikeConfigObject;
         vikeConfigDependencies.forEach((f) => assertPosixPath(f));
-        if (vikeConfigDependencies.has(filePathAbsoluteFilesystem))
-            return { isProcessedByVite: false };
+        isAppFile.isConfigDependency = vikeConfigDependencies.has(filePathAbsoluteFilesystem);
     }
-    // Runtime Vike config files such as +data.js which are processed by Vite.
+    // =============================
+    // { isRuntimeDependency: true }
+    // =============================
+    // Vike runtime 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 && isPlusFile(importer.file));
-    if (isPlusValueFileDependency)
-        return { isProcessedByVite: true };
-    return null;
+    // - Same for all `+data.js` transitive dependencies.
+    isAppFile.isRuntimeDependency = existsInViteModuleGraph(filePathAbsoluteFilesystem, moduleGraph);
+    return isAppFile;
 }
 function reloadConfig(filePath, config, operation, server) {
     // Ensure server.ssrLoadModule() loads fresh Vike virtual files (`reloadConfig()` > `updateUserFiles()` > `server.ssrLoadModule()`)
@@ -185,6 +169,12 @@ function reloadConfig(filePath, config, operation, server) {
     reloadVikeConfig();
     updateUserFiles();
 }
+function invalidateVikeVirtualFiles(server) {
+    const vikeVirtualFiles = getVikeVirtualFiles(server);
+    vikeVirtualFiles.forEach((mod) => {
+        server.moduleGraph.invalidateModule(mod);
+    });
+}
 function getVikeVirtualFiles(server) {
     const vikeVirtualFiles = Array.from(server.moduleGraph.urlToModuleMap.keys())
         .filter((url) => parseVirtualFileId(url))
@@ -195,38 +185,6 @@ function getVikeVirtualFiles(server) {
     });
     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/node/vite/shared/loggerDev.d.ts

@@ -2,8 +2,11 @@ export { logVite };
 export { logConfigInfo };
 export { logErrorServerDev };
 export type { LogType };
+export type { AddTagsDev };
 import { type PageContext_logRuntime } from '../../../server/runtime/loggerRuntime.js';
 type LogType = 'info' | 'warn' | 'error' | 'error-resolve';
 declare function logConfigInfo(msg: string, logType: LogType): void;
 declare function logVite(msg: string, logType: LogType, requestId: number | null, prependViteTag: boolean): void;
 declare function logErrorServerDev(err: unknown, pageContext: PageContext_logRuntime, errorComesFromVite?: boolean): void;
+type AddTagsDev = typeof addTagsDev;
+declare function addTagsDev<TagVike extends string, TagType extends string>(tagVike: TagVike, tagType: TagType): `1:37:00 PM ${TagVike}[request(n)]${TagType}`;

package/dist/node/vite/shared/loggerDev.js

@@ -12,7 +12,7 @@ export { logErrorServerDev };
 import { isAbortError } from '../../../shared-server-client/route/abort.js';
 import { getViteConfig } from '../../../server/runtime/globalContext.js';
 import { assertPageContext_logRuntime, setLogRuntimeDev, } from '../../../server/runtime/loggerRuntime.js';
-import { addOnBeforeAssertErr, assert, assertIsNotProductionRuntime, colorVike, colorVite, formatHintLog, hasGreen, hasProp, hasRed, hasYellow, isDebugError, stripAnsi, } from '../utils.js';
+import { setAssertOnBeforeErr, assert, assertIsNotProductionRuntime, colorVike, colorVite, formatHintLog, hasGreen, hasProp, hasRed, hasYellow, isDebugError, stripAnsi, colorError, colorWarning, setAssertAddTagsDev, } from '../utils.js';
 import { isErrorWithCodeSnippet, getPrettyErrorWithCodeSnippet } from './loggerDev/errorWithCodeSnippet.js';
 import { getConfigExecutionErrorIntroMsg, getConfigBuildErrorFormatted, } from './resolveVikeConfigInternal/transpileAndExecuteFile.js';
 import pc from '@brillout/picocolors';
@@ -20,13 +20,14 @@ import { isUserHookError } from '../../../shared-server-client/hooks/execHook.js
 import { getViteDevServer } from '../../../server/runtime/globalContext.js';
 import { logErrorServer } from '../../../server/runtime/logErrorServer.js';
 import { getBetterError } from '../../../utils/getBetterError.js';
-import { getHttpRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
+import { getRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
 assertIsNotProductionRuntime();
 setLogRuntimeDev(logErrorServerDev, logRuntimeInfoDev);
-addOnBeforeAssertErr((err) => {
+setAssertOnBeforeErr((err) => {
     // We must directly apply vite.ssrFixStacktrace() to `assertWarning(..., { showStackTrace: true })` because warnings aren't caught by the try-catch of renderPageServer()
-    applyViteSourceMapToStackTrace(err);
+    applyViteSourceMap(err);
 });
+setAssertAddTagsDev(addTagsDev);
 // Note shown to user when Vike completely modifies the error message (which is somewhat risky)
 const errorDebugNote = pc.dim(formatHintLog("Error isn't helpful? See https://vike.dev/debug#verbose-errors"));
 function logRuntimeInfoDev(msg, pageContext, logType) {
@@ -44,7 +45,7 @@ function logVite(msg, logType, requestId, prependViteTag) {
 }
 function logErrorServerDev(err, pageContext, errorComesFromVite = false) {
     assertPageContext_logRuntime(pageContext);
-    applyViteSourceMapToStackTrace(err);
+    applyViteSourceMap(err);
     // Skip `throw render()` / `throw redirect()`
     if (isAbortError(err) && !isDebugError()) {
         return;
@@ -96,7 +97,7 @@ function logErrorServerDev(err, pageContext, errorComesFromVite = false) {
         }
     }
     if (tagSource) {
-        const errIntro = pc.bold(pc.red(`[Error] ${errorComesFromVite ? 'Transpilation error' : 'An error was thrown'}:`));
+        const errIntro = colorError(`[Error] ${errorComesFromVite ? 'Transpilation error' : 'An error was thrown'}:`);
         const prepend = `${getTagsError(errIntro, tagSource)}${errIntro}\n`;
         const errBetter = getBetterError(err, { message: { prepend } });
         logErr(errBetter);
@@ -128,7 +129,7 @@ function logDev(msg, logType, tagSource, tagTool, doNotAddTags) {
     assert(false);
 }
 function getTagSource(requestId = null) {
-    const requestIdFromStore = getHttpRequestId_withAsyncHook();
+    const requestIdFromStore = getRequestId_withAsyncHook();
     if (requestIdFromStore !== null) {
         if (requestId === null) {
             requestId = requestIdFromStore;
@@ -143,7 +144,7 @@ function getTagSource(requestId = null) {
     const tagSource = `request-${requestId}`;
     return tagSource;
 }
-function applyViteSourceMapToStackTrace(thing) {
+function applyViteSourceMap(thing) {
     if (isDebugError())
         return;
     if (!hasProp(thing, 'stack'))
@@ -160,20 +161,35 @@ function getTagsError(msg, tagSource) {
 function getTags(msg, tagTool, tagSource, logType) {
     const tagToolColored = (() => {
         if (logType === 'error' && !hasRed(msg))
-            return pc.bold(pc.red(tagTool));
+            return colorError(tagTool);
         if (logType === 'error-resolve' && !hasGreen(msg))
             return pc.bold(pc.green(tagTool));
         if (logType === 'warn' && !hasYellow(msg))
-            return pc.yellow(tagTool);
+            return colorWarning(tagTool);
         if (tagTool === '[vite]')
             return colorVite(tagTool);
         if (tagTool === '[vike]')
             return colorVike(tagTool);
         assert(false);
     })();
-    const timestamp = pc.dim(new Date().toLocaleTimeString());
+    const timestamp = getTagTimestamp();
     const whitespace = (/\s|\[/.test(stripAnsi(msg)[0]) ? '' : ' ');
-    const tagSourceStr = (!tagSource ? '' : pc.dim(`[${tagSource}]`));
-    const tags = `${timestamp} ${tagToolColored}${tagSourceStr}${whitespace}`;
+    const tagSourceOuter = getTagSourceOuter(tagSource);
+    const tags = `${timestamp} ${tagToolColored}${tagSourceOuter}${whitespace}`;
     return tags;
 }
+function getTagTimestamp() {
+    const timestamp = pc.dim(new Date().toLocaleTimeString());
+    return timestamp;
+}
+function getTagSourceOuter(tagSource) {
+    const tagSourceOuter = (!tagSource ? '' : pc.dim(`[${tagSource}]`));
+    return tagSourceOuter;
+}
+function addTagsDev(tagVike, tagType) {
+    const timestamp = getTagTimestamp();
+    const tagSource = getTagSource();
+    const tagSourceOuter = getTagSourceOuter(tagSource);
+    const tagsDev = `${timestamp} ${tagVike}${tagSourceOuter}${tagType}`;
+    return tagsDev;
+}

package/dist/node/vite/shared/loggerVite.js

@@ -5,7 +5,7 @@ export { swallowViteLogForceOptimization_disable };
 export { swallowViteLogConnected };
 export { swallowViteLogConnected_clean };
 import { assert, getGlobalObject, isDebugError, removeEmptyLines, trimWithAnsi, trimWithAnsiTrailOnly, } from '../utils.js';
-import { getHttpRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
+import { getRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
 import { logErrorServerDev, logVite } from './loggerDev.js';
 const globalObject = getGlobalObject('vite/shared/loggerDev.ts', {
     processStartupLog_isCompact: null,
@@ -43,7 +43,7 @@ function intercept(loggerType, config) {
             //  - It doesn't format error code snippets.
             //  - It only shows error.message which means that crucial information such as error.id isn't shown to the user.
             logErrorServerDev(options.error, null, true);
-            // We swallow Vite's message: we didn't see it add any value so far.
+            // We swallow Vite's message: it doesn't seem to add any value.
             //  - It can even be confusing, such as the following:
             //    ```
             //    Error when evaluating SSR module virtual:vike:page-entry:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
@@ -51,7 +51,7 @@ function intercept(loggerType, config) {
             assert(!isDebugError());
             return;
         }
-        const requestId = getHttpRequestId_withAsyncHook();
+        const requestId = getRequestId_withAsyncHook();
         // Vite's default logger preprends the "[vite]" tag if and only if options.timestamp is true
         const prependViteTag = options.timestamp || typeof requestId === 'number';
         // If it's an actual error => options.error is set => it's handled with logErrorServerDev() above

package/dist/node/vite/shared/resolveVikeConfigInternal/assertExtensions.d.ts

@@ -1,5 +1,5 @@
 export { assertExtensionsConventions };
 export { assertExtensionsRequire };
-import type { PlusFile } from './getPlusFilesAll.js';
+import type { PlusFile } from './getPlusFilesByLocationId.js';
 declare function assertExtensionsConventions(plusFile: PlusFile): void;
 declare function assertExtensionsRequire(plusFiles: PlusFile[]): void;

package/dist/node/vite/shared/resolveVikeConfigInternal/{crawlPlusFiles.d.ts → crawlPlusFilePaths.d.ts}

@@ -1,7 +1,7 @@
-export { crawlPlusFiles };
+export { crawlPlusFilePaths };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
-declare function crawlPlusFiles(userRootDir: string): Promise<{
+declare function crawlPlusFilePaths(userRootDir: string): Promise<{
     filePathAbsoluteUserRootDir: string;
 }[]>;
 declare function isPlusFile(filePath: string): boolean;

package/dist/node/vite/shared/resolveVikeConfigInternal/{crawlPlusFiles.js → crawlPlusFilePaths.js}

@@ -1,4 +1,4 @@
-export { crawlPlusFiles };
+export { crawlPlusFilePaths };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
 import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsNotProductionRuntime, isVersionMatch, isScriptFile, scriptFileExtensionList, createDebug, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, getGlobalObject, } from '../../utils.js';
@@ -10,14 +10,14 @@ import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
 import { getEnvVarObject } from '../getEnvVarObject.js';
 import pc from '@brillout/picocolors';
 import picomatch from 'picomatch';
-import { ignorePatternsBuiltIn } from './crawlPlusFiles/ignorePatternsBuiltIn.js';
+import { ignorePatternsBuiltIn } from './crawlPlusFilePaths/ignorePatternsBuiltIn.js';
 const execA = promisify(exec);
 const debug = createDebug('vike:crawl');
 assertIsNotProductionRuntime();
-const globalObject = getGlobalObject('getVikeConfig/crawlPlusFiles.ts', {
+const globalObject = getGlobalObject('getVikeConfig/crawlPlusFilePaths.ts', {
     gitIsNotUsable: false,
 });
-async function crawlPlusFiles(userRootDir) {
+async function crawlPlusFilePaths(userRootDir) {
     assertPosixPath(userRootDir);
     assertFilePathAbsoluteFilesystem(userRootDir);
     const userSettings = getUserSettings();

package/dist/node/vite/shared/resolveVikeConfigInternal/{getPlusFilesAll.d.ts → getPlusFilesByLocationId.d.ts}

@@ -1,4 +1,4 @@
-export { getPlusFilesAll };
+export { getPlusFilesByLocationId };
 export type { PlusFileValue };
 export type { PlusFile };
 export type { PlusFilesByLocationId };
@@ -7,21 +7,23 @@ import { type EsbuildCache } from './transpileAndExecuteFile.js';
 import { PointerImportLoaded } from './loadFileAtConfigTime.js';
 import type { FilePathResolved } from '../../../../types/FilePath.js';
 type PlusFile = PlusFileConfig | PlusFileValue;
-type PlusFileCommons = {
+type PlusFileCommon = {
     locationId: LocationId;
     filePath: FilePathResolved;
 };
-type PlusFileConfig = PlusFileCommons & {
+/** +config.js */
+type PlusFileConfig = PlusFileCommon & {
     isConfigFile: true;
     fileExportsByConfigName: Record<string, // configName
     unknown>;
     pointerImportsByConfigName: Record<string, // configName
-    PointerImportLoaded>;
+    PointerImportLoaded[]>;
     isExtensionConfig: boolean;
     extendsFilePaths: string[];
     isNotLoaded?: undefined;
 };
-type PlusFileValue = PlusFileCommons & {
+/** +{configName}.js */
+type PlusFileValue = PlusFileCommon & {
     isConfigFile: false;
     configName: string;
 } & ({
@@ -34,4 +36,4 @@ type PlusFileValue = PlusFileCommons & {
     isExtensionConfig?: undefined;
 };
 type PlusFilesByLocationId = Record<LocationId, PlusFile[]>;
-declare function getPlusFilesAll(userRootDir: string, esbuildCache: EsbuildCache): Promise<PlusFilesByLocationId>;
+declare function getPlusFilesByLocationId(userRootDir: string, esbuildCache: EsbuildCache): Promise<PlusFilesByLocationId>;