vike 0.4.248 → 0.4.249-commit-775a43e

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

@@ -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/getPlusFilesAll.d.ts

@@ -16,7 +16,7 @@ type PlusFileConfig = PlusFileCommons & {
     fileExportsByConfigName: Record<string, // configName
     unknown>;
     pointerImportsByConfigName: Record<string, // configName
-    PointerImportLoaded>;
+    PointerImportLoaded[]>;
     isExtensionConfig: boolean;
     extendsFilePaths: string[];
     isNotLoaded?: undefined;

package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesAll.js

@@ -95,12 +95,14 @@ function getPlusFileFromConfigFile(configFile, isExtensionConfig, locationId, us
     const fileExport = getConfigFileExport(fileExports, filePath.filePathToShowToUser);
     Object.entries(fileExport).forEach(([configName, configValue]) => {
         fileExportsByConfigName[configName] = configValue;
-        const pointerImport = resolvePointerImport(configValue, configFile.filePath, userRootDir, configName);
-        if (pointerImport) {
-            pointerImportsByConfigName[configName] = {
-                ...pointerImport,
-                fileExportValueLoaded: false,
-            };
+        // Pointer imports
+        const values = Array.isArray(configValue) ? configValue : [configValue];
+        const pointerImports = values
+            .map((value) => resolvePointerImport(value, configFile.filePath, userRootDir, configName))
+            .filter((pointerImport) => pointerImport !== null)
+            .map((pointerImport) => ({ ...pointerImport, fileExportValueLoaded: false }));
+        if (pointerImports.length > 0) {
+            pointerImportsByConfigName[configName] = pointerImports;
         }
     });
     const plusFile = {

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

@@ -246,8 +246,8 @@ async function loadCustomConfigBuildTimeFiles(plusFiles, configDefinitions, user
             await loadValueFile(plusFile, configDefinitions, userRootDir, esbuildCache);
         }
         else {
-            await Promise.all(Object.entries(plusFile.pointerImportsByConfigName).map(async ([configName, pointerImport]) => {
-                await loadPointerImport(pointerImport, userRootDir, configName, configDefinitions, esbuildCache);
+            await Promise.all(Object.entries(plusFile.pointerImportsByConfigName).map(async ([configName, pointerImports]) => {
+                await Promise.all(pointerImports.map((pointerImport) => loadPointerImport(pointerImport, userRootDir, configName, configDefinitions, esbuildCache)));
             }));
         }
     }));
@@ -558,7 +558,7 @@ function sortPlusFilesSameLocationId(plusFile1, plusFile2, configName) {
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal, plusFilesAll) {
     let sources = plusFilesRelevant
         .filter((plusFile) => isDefiningConfig(plusFile, configName))
-        .map((plusFile) => getConfigValueSource(configName, plusFile, configDef, userRootDir));
+        .flatMap((plusFile) => getConfigValueSources(configName, plusFile, configDef, userRootDir));
     // Filter hydrid global-local configs
     if (!isCallable(configDef.global)) {
         // Already filtered
@@ -579,7 +579,7 @@ function resolveConfigValueSources(configName, configDef, plusFilesRelevant, use
 function isDefiningConfig(plusFile, configName) {
     return getConfigNamesSetByPlusFile(plusFile).includes(configName);
 }
-function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
+function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
     const confVal = getConfVal(plusFile, configName);
     assert(confVal);
     const configValueSourceCommon = {
@@ -622,7 +622,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             valueIsDefinedByPlusValueFile: false,
             definedAt: definedAtFilePath,
         };
-        return configValueSource;
+        return [configValueSource];
     }
     // +config.js
     if (plusFile.isConfigFile) {
@@ -630,23 +630,25 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
         // Defined over pointer import
         const pointerImport = plusFile.pointerImportsByConfigName[configName];
         if (pointerImport) {
-            const value = pointerImport.fileExportValueLoaded
-                ? {
-                    valueIsLoaded: true,
-                    value: pointerImport.fileExportValue,
-                }
-                : {
-                    valueIsLoaded: false,
+            return pointerImport.map((pointerImport) => {
+                const value = pointerImport.fileExportValueLoaded
+                    ? {
+                        valueIsLoaded: true,
+                        value: pointerImport.fileExportValue,
+                    }
+                    : {
+                        valueIsLoaded: false,
+                    };
+                const configValueSource = {
+                    ...configValueSourceCommon,
+                    ...value,
+                    configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
+                    valueIsLoadedWithImport: true,
+                    valueIsDefinedByPlusValueFile: false,
+                    definedAt: pointerImport.fileExportPath,
                 };
-            const configValueSource = {
-                ...configValueSourceCommon,
-                ...value,
-                configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
-                valueIsLoadedWithImport: true,
-                valueIsDefinedByPlusValueFile: false,
-                definedAt: pointerImport.fileExportPath,
-            };
-            return configValueSource;
+                return configValueSource;
+            });
         }
         // Defined inside +config.js
         const configValueSource = {
@@ -658,7 +660,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             valueIsDefinedByPlusValueFile: false,
             definedAt: definedAtFilePath_,
         };
-        return configValueSource;
+        return [configValueSource];
     }
     // Defined by value file, i.e. +{configName}.js
     if (!plusFile.isConfigFile) {
@@ -678,7 +680,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
                         [configName],
             },
         };
-        return configValueSource;
+        return [configValueSource];
     }
     assert(false);
 }

package/dist/server/runtime/asyncHook.d.ts

@@ -1,5 +1,5 @@
 export { getPageContext_withAsyncHook };
-export { getHttpRequestId_withAsyncHook };
+export { getRequestId_withAsyncHook };
 export { getAsyncLocalStorage };
 export type { AsyncStore };
 import type { AsyncLocalStorage as AsyncLocalStorageType } from 'node:async_hooks';
@@ -8,5 +8,5 @@ type AsyncStore = null | {
     pageContext?: Record<string, unknown>;
 };
 declare function getAsyncLocalStorage(): Promise<AsyncLocalStorageType<AsyncStore> | null>;
-declare function getHttpRequestId_withAsyncHook(): number | null;
+declare function getRequestId_withAsyncHook(): number | null;
 declare function getPageContext_withAsyncHook(): any;

package/dist/server/runtime/asyncHook.js

@@ -1,5 +1,5 @@
 export { getPageContext_withAsyncHook };
-export { getHttpRequestId_withAsyncHook };
+export { getRequestId_withAsyncHook };
 export { getAsyncLocalStorage };
 import { preparePageContextForPublicUsageServer } from './renderPageServer/preparePageContextForPublicUsageServer.js';
 import { assert, assertIsNotBrowser, getGlobalObject, isObject } from '../utils.js';
@@ -30,7 +30,7 @@ function getAsyncStore() {
     assert(asyncStore === undefined || isObject(asyncStore));
     return asyncStore ?? null;
 }
-function getHttpRequestId_withAsyncHook() {
+function getRequestId_withAsyncHook() {
     const asyncStore = getAsyncStore();
     return asyncStore?.requestId ?? null;
 }

package/dist/server/utils.d.ts

@@ -42,8 +42,8 @@ export * from '../utils/assertSetup.js';
 export * from '../utils/path.js';
 export * from '../utils/isHtml.js';
 export * from '../utils/virtualFileId.js';
-export * from '../utils/colors.js';
-export * from '../utils/colorVike.js';
+export * from '../utils/colorsServer.js';
+export * from '../utils/colorsClient.js';
 export * from '../utils/getTerminalWidth.js';
 export * from '../utils/truncateString.js';
 export * from '../utils/formatHintLog.js';

package/dist/server/utils.js

@@ -46,8 +46,8 @@ export * from '../utils/assertSetup.js';
 export * from '../utils/path.js';
 export * from '../utils/isHtml.js';
 export * from '../utils/virtualFileId.js';
-export * from '../utils/colors.js';
-export * from '../utils/colorVike.js';
+export * from '../utils/colorsServer.js';
+export * from '../utils/colorsClient.js';
 export * from '../utils/getTerminalWidth.js';
 export * from '../utils/truncateString.js';
 export * from '../utils/formatHintLog.js';

package/dist/types/Config.d.ts

@@ -339,7 +339,7 @@ type ConfigBuiltIn = {
      *
      * https://vike.dev/extends
      */
-    extends?: Config | ImportString | (Config | ImportString)[];
+    extends?: Config | Config[] | ImportString;
     /** Hook called before the page is rendered.
      *
      *  https://vike.dev/onBeforeRender
@@ -596,4 +596,5 @@ type ConfigBuiltInResolved = {
     headersResponse?: Exclude<Config['headersResponse'], ImportString | undefined>[];
 };
 type ConfigMeta = Record<string, ConfigDefinition>;
-type ImportString = `import:${string}`;
+type ImportString = ImportStringVal | ImportStringVal[];
+type ImportStringVal = `import:${string}`;

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.247-commit-1250e38";
+export declare const PROJECT_VERSION: "0.4.249-commit-775a43e";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.247-commit-1250e38';
+export const PROJECT_VERSION = '0.4.249-commit-775a43e';

package/dist/utils/assert.d.ts

@@ -3,10 +3,12 @@ export { assertUsage };
 export { assertWarning };
 export { assertInfo };
 export { getProjectError };
-export { addOnBeforeAssertLog };
-export { addOnBeforeAssertErr };
 export { isVikeBug };
+export { setAssertOnBeforeLog };
+export { setAssertOnBeforeErr };
 export { setAlwaysShowStackTrace };
+export { setAssertAddTagsDev };
+import type { AddTagsDev } from '../node/vite/shared/loggerDev.js';
 declare function assert(condition: unknown, debugInfo?: unknown): asserts condition;
 declare function assertUsage(condition: unknown, errMsg: string, { showStackTrace, exitOnError }?: {
     showStackTrace?: true;
@@ -20,7 +22,8 @@ declare function assertWarning(condition: unknown, msg: string, { onlyOnce, show
 declare function assertInfo(condition: unknown, msg: string, { onlyOnce }: {
     onlyOnce: boolean;
 }): void;
-declare function addOnBeforeAssertLog(onBeforeAssertLog: () => void): void;
-declare function addOnBeforeAssertErr(onBeforeAssertErr: (err: unknown) => void): void;
+declare function setAssertOnBeforeLog(onBeforeAssertLog: () => void): void;
+declare function setAssertOnBeforeErr(onBeforeAssertErr: (err: unknown) => void): void;
+declare function setAssertAddTagsDev(addTagsDev: AddTagsDev): void;
 declare function isVikeBug(err: unknown): boolean;
 declare function setAlwaysShowStackTrace(): void;

package/dist/utils/assert.js

@@ -3,24 +3,24 @@ export { assertUsage };
 export { assertWarning };
 export { assertInfo };
 export { getProjectError };
-export { addOnBeforeAssertLog };
-export { addOnBeforeAssertErr };
 export { isVikeBug };
+export { setAssertOnBeforeLog };
+export { setAssertOnBeforeErr };
 export { setAlwaysShowStackTrace };
+export { setAssertAddTagsDev };
 import { assertSingleInstance_onAssertModuleLoad } from './assertSingleInstance.js';
 import { createErrorWithCleanStackTrace } from './createErrorWithCleanStackTrace.js';
 import { getGlobalObject } from './getGlobalObject.js';
 import { PROJECT_VERSION } from './PROJECT_VERSION.js';
-import { colorVike } from './colorVike.js';
+import { colorVike, colorWarning, colorError } from './colorsClient.js';
 import pc from '@brillout/picocolors';
 const globalObject = getGlobalObject('utils/assert.ts', {
     alreadyLogged: new Set(),
 });
 assertSingleInstance_onAssertModuleLoad();
-const projectTag = `[vike]`;
-const projectTagWithVersion = `[vike@${PROJECT_VERSION}]`;
-const bugTag = 'Bug';
-const numberOfStackTraceLinesToRemove = 2;
+const tagVike = `[vike]`;
+const tagVikeWithVersion = `[vike@${PROJECT_VERSION}]`;
+const tagTypeBug = 'Bug';
 function assert(condition, debugInfo) {
     if (condition)
         return;
@@ -38,24 +38,20 @@ function assert(condition, debugInfo) {
     ]
         .filter(Boolean)
         .join(' ');
-    errMsg = addWhitespace(errMsg);
-    errMsg = addPrefixAssertType(errMsg, bugTag);
-    errMsg = addPrefixProjectName(errMsg, true);
-    const internalError = createErrorWithCleanStackTrace(errMsg, numberOfStackTraceLinesToRemove);
-    globalObject.onBeforeAssertLog?.();
-    globalObject.onBeforeAssertErr?.(internalError);
+    errMsg = addTags(errMsg, tagTypeBug, true);
+    const internalError = createError(errMsg);
+    globalObject.onBeforeLog?.();
+    globalObject.onBeforeErr?.(internalError);
     throw internalError;
 }
 function assertUsage(condition, errMsg, { showStackTrace, exitOnError } = {}) {
     if (condition)
         return;
     showStackTrace = showStackTrace || globalObject.alwaysShowStackTrace;
-    errMsg = addWhitespace(errMsg);
-    errMsg = addPrefixAssertType(errMsg, 'Wrong Usage');
-    errMsg = addPrefixProjectName(errMsg);
-    const usageError = createErrorWithCleanStackTrace(errMsg, numberOfStackTraceLinesToRemove);
-    globalObject.onBeforeAssertLog?.();
-    globalObject.onBeforeAssertErr?.(usageError);
+    errMsg = addTags(errMsg, 'Wrong Usage');
+    const usageError = createError(errMsg);
+    globalObject.onBeforeLog?.();
+    globalObject.onBeforeErr?.(usageError);
     if (!exitOnError) {
         throw usageError;
     }
@@ -65,19 +61,14 @@ function assertUsage(condition, errMsg, { showStackTrace, exitOnError } = {}) {
     }
 }
 function getProjectError(errMsg) {
-    errMsg = addWhitespace(errMsg);
-    errMsg = addPrefixAssertType(errMsg, 'Error');
-    errMsg = addPrefixProjectName(errMsg);
-    const projectError = createErrorWithCleanStackTrace(errMsg, numberOfStackTraceLinesToRemove);
+    errMsg = addTags(errMsg, 'Error');
+    const projectError = createError(errMsg);
     return projectError;
 }
 function assertWarning(condition, msg, { onlyOnce, showStackTrace }) {
     if (condition)
         return;
     showStackTrace = showStackTrace || globalObject.alwaysShowStackTrace;
-    msg = addWhitespace(msg);
-    msg = addPrefixAssertType(msg, 'Warning');
-    msg = addPrefixProjectName(msg);
     if (onlyOnce) {
         const { alreadyLogged } = globalObject;
         const key = onlyOnce === true ? msg : onlyOnce;
@@ -85,22 +76,22 @@ function assertWarning(condition, msg, { onlyOnce, showStackTrace }) {
             return;
         alreadyLogged.add(key);
     }
-    globalObject.onBeforeAssertLog?.();
+    const msgWithTags = addTags(msg, 'Warning');
+    globalObject.onBeforeLog?.();
     if (showStackTrace) {
-        const err = createErrorWithCleanStackTrace(msg, numberOfStackTraceLinesToRemove);
-        globalObject.onBeforeAssertErr?.(err);
+        const err = createError(msgWithTags);
+        globalObject.onBeforeErr?.(err);
         console.warn(err);
     }
     else {
-        console.warn(msg);
+        console.warn(msgWithTags);
     }
 }
 function assertInfo(condition, msg, { onlyOnce }) {
     if (condition) {
         return;
     }
-    msg = addWhitespace(msg);
-    msg = addPrefixProjectName(msg);
+    msg = addTags(msg, null);
     if (onlyOnce) {
         const { alreadyLogged } = globalObject;
         const key = msg;
@@ -111,41 +102,65 @@ function assertInfo(condition, msg, { onlyOnce }) {
             alreadyLogged.add(key);
         }
     }
-    globalObject.onBeforeAssertLog?.();
+    globalObject.onBeforeLog?.();
     console.log(msg);
 }
-function addOnBeforeAssertLog(onBeforeAssertLog) {
-    globalObject.onBeforeAssertLog = onBeforeAssertLog;
+function setAssertOnBeforeLog(onBeforeAssertLog) {
+    globalObject.onBeforeLog = onBeforeAssertLog;
 }
-function addOnBeforeAssertErr(onBeforeAssertErr) {
-    globalObject.onBeforeAssertErr = onBeforeAssertErr;
+function setAssertOnBeforeErr(onBeforeAssertErr) {
+    globalObject.onBeforeErr = onBeforeAssertErr;
 }
-function addPrefixAssertType(msg, tag) {
-    let prefix = `[${tag}]`;
-    if (tag === 'Warning') {
-        prefix = pc.yellow(prefix);
+function setAssertAddTagsDev(addTagsDev) {
+    globalObject.addTagsDev = addTagsDev;
+}
+function addTags(msg, tagType, showProjectVersion = false) {
+    const tagVike = getTagVike(showProjectVersion);
+    const tagTypeOuter = getTagType(tagType);
+    const whitespace = getTagWhitespace(msg);
+    if (globalObject.addTagsDev) {
+        const tagsDev = globalObject.addTagsDev(tagVike, tagTypeOuter);
+        return `${tagsDev}${whitespace}${msg}`;
     }
     else {
-        prefix = pc.bold(pc.red(prefix));
+        const tags = `${tagVike}${tagTypeOuter}`;
+        return `${tags}${whitespace}${msg}`;
     }
-    return `${prefix}${msg}`;
 }
-function addWhitespace(msg) {
+function getTagWhitespace(msg) {
     if (msg.startsWith('[')) {
-        return msg;
+        return '';
+    }
+    else {
+        return ' ';
+    }
+}
+function getTagType(tagType) {
+    if (!tagType)
+        return '';
+    let tag = `[${tagType}]`;
+    if (tagType === 'Warning') {
+        tag = colorWarning(tag);
     }
     else {
-        return ` ${msg}`;
+        tag = colorError(tag);
     }
+    return tag;
 }
-function addPrefixProjectName(msg, showProjectVersion = false) {
-    const prefix = showProjectVersion ? projectTagWithVersion : projectTag;
-    return `${colorVike(prefix)}${msg}`;
+function getTagVike(showProjectVersion = false) {
+    const tag = showProjectVersion ? tagVikeWithVersion : tagVike;
+    return colorVike(tag);
 }
 function isVikeBug(err) {
-    return String(err).includes(`[${bugTag}]`);
+    return String(err).includes(`[${tagTypeBug}]`);
 }
 // Called upon `DEBUG=vike:error`
 function setAlwaysShowStackTrace() {
     globalObject.alwaysShowStackTrace = true;
 }
+function createError(errMsg) {
+    const err = createErrorWithCleanStackTrace(errMsg, 3);
+    if (globalObject.addTagsDev)
+        err.stack = err.stack?.replace(/^Error:\s*/, '');
+    return err;
+}

package/dist/utils/colorsClient.d.ts

@@ -0,0 +1,6 @@
+export { colorVike };
+export { colorError };
+export { colorWarning };
+declare function colorVike<Str extends string>(str: Str): Str;
+declare function colorError<Str extends string>(str: Str): Str;
+declare function colorWarning<Str extends string>(str: Str): Str;

package/dist/utils/colorsClient.js

@@ -0,0 +1,16 @@
+// ./colorsServer.js => server only
+// ./colorsClient.js => server & client
+// !!!WARNING!!! KEEP THIS FILE MINIMAL: to save KBs sent to the browser
+export { colorVike };
+export { colorError };
+export { colorWarning };
+import pc from '@brillout/picocolors';
+function colorVike(str) {
+    return pc.bold(pc.yellow(str));
+}
+function colorError(str) {
+    return pc.bold(pc.red(str));
+}
+function colorWarning(str) {
+    return pc.yellow(str);
+}

package/dist/utils/{colors.js → colorsServer.js}

@@ -1,3 +1,5 @@
+// ./colorsServer.js => server only
+// ./colorsClient.js => server & client
 export { stripAnsi };
 export { hasRed };
 export { hasGreen };

package/dist/utils/formatHintLog.js

@@ -1,6 +1,6 @@
 export { formatHintLog };
 import { assert } from './assert.js';
-import { stripAnsi } from './colors.js';
+import { stripAnsi } from './colorsServer.js';
 function formatHintLog(msg) {
     assert(msg.length > 0);
     const msgLength = stripAnsi(msg).length;

package/dist/utils/getBetterError.js

@@ -6,20 +6,24 @@ export { getBetterError };
 import { isObject } from './isObject.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { objectAssign } from './objectAssign.js';
+import { shallowClone } from './shallowClone.js';
 assertIsNotBrowser();
 function getBetterError(err, modifications) {
+    const errOriginal = shallowClone(err);
     let errBetter;
     // Normalize
     if (!isObject(err)) {
-        warnMalformed(err);
+        warnMalformed(errOriginal);
         errBetter = new Error(String(err));
     }
     else {
-        errBetter = structuredClone(err);
+        // We mutate instead of structuredClone(err) to avoid breaking Vite's ssrFixStacktrace() internal rewroteStacktraces.has(err) check
+        // https://github.com/vitejs/vite/blob/dafd726032daa98d0e614f97aebe9d4dbffe2ea7/packages/vite/src/node/ssr/ssrStacktrace.ts#L95
+        errBetter = err;
     }
     errBetter.message ?? (errBetter.message = '');
     if (!errBetter.stack) {
-        warnMalformed(err);
+        warnMalformed(errOriginal);
         errBetter.stack = new Error(errBetter.message).stack;
     }
     // Modifications: err.hideStack and err.stack
@@ -40,7 +44,7 @@ function getBetterError(err, modifications) {
             errBetter.stack = messageNext + stack;
         }
         else {
-            warnMalformed(err);
+            warnMalformed(errOriginal);
         }
     }
     else {
@@ -57,10 +61,10 @@ function getBetterError(err, modifications) {
         }
     }
     // Enable users to retrieve the original error
-    objectAssign(errBetter, { getOriginalError: () => err?.getOriginalError?.() ?? err });
+    objectAssign(errBetter, { getOriginalError: () => errOriginal?.getOriginalError?.() ?? errOriginal });
     return errBetter;
 }
 // TO-DO/eventually: think about whether logging this warning is a good idea
-function warnMalformed(err) {
-    console.warn('Malformed error: ', err);
+function warnMalformed(errOriginal) {
+    console.warn('Malformed error: ', errOriginal);
 }

package/dist/utils/shallowClone.d.ts

@@ -0,0 +1,2 @@
+export { shallowClone };
+declare function shallowClone<Obj>(obj: Obj): Obj;

package/dist/utils/shallowClone.js

@@ -0,0 +1,11 @@
+export { shallowClone };
+import { isObject } from './isObject.js';
+// - AFAICT it's the most accurate.
+// - The structuredClone() built-in isn't usable: https://www.typescriptlang.org/play/?ssl=7&ssc=1&pln=9&pc=1#code/G4QwTgBApmkLwQHZQO4QKKwPZgBQHIBhAVwGcAXLAW2mzHwEoIRTnEBPAKAh95jAB0AYywATKBAT50AfUIBVAMoAVAPIBZfN149+AiiHJlCYiQgCsABkucRiCrTCEANlmSjJECmGJCjYKFEXNyhcfgZOAHpIiAAZLABzVgADYkRxADMAS3dk2zdSLGcoAVcEgn5g92FTfAAaRyrAmvEIqJjlAAswLBRWEERHHE5vX39AptwAby9qKAAxNKFcJimAXzWGIA
+function shallowClone(obj) {
+    if (!isObject(obj))
+        return obj;
+    const clone = Object.create(Object.getPrototypeOf(obj));
+    Object.defineProperties(clone, Object.getOwnPropertyDescriptors(obj));
+    return clone;
+}

package/dist/utils/trimWithAnsi.js

@@ -1,7 +1,7 @@
 export { trimWithAnsi };
 export { trimWithAnsiTrailOnly };
 import { assert } from './assert.js';
-import { stripAnsi } from './colors.js';
+import { stripAnsi } from './colorsServer.js';
 const whitespaceRegex = /(\s+)/; // Capturing parathesis so that split preserves separator
 /* Same as trim() but works with ANSI escape codes */
 function trimWithAnsi(str) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.248",
+  "version": "0.4.249-commit-775a43e",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -120,7 +120,7 @@
   "dependencies": {
     "@brillout/import": "^0.2.6",
     "@brillout/json-serializer": "^0.5.21",
-    "@brillout/picocolors": "^1.0.29",
+    "@brillout/picocolors": "^1.0.30",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.7.15",
     "acorn": "^8.0.0",
@@ -244,13 +244,13 @@
     "./universal-middleware.js"
   ],
   "devDependencies": {
-    "@brillout/release-me": "^0.4.9",
+    "@brillout/release-me": "^0.4.12",
     "@types/estree": "^1.0.5",
     "@types/node": "^20.10.5",
     "@types/picomatch": "^3.0.2",
     "@types/semver": "^7.5.8",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.14",
+    "react-streaming": "^0.4.15",
     "rimraf": "^5.0.5",
     "typescript": "^5.9.3",
     "vite": "^7.2.6"

package/dist/utils/colorVike.d.ts

@@ -1,2 +0,0 @@
-export { colorVike };
-declare function colorVike<Str extends string>(str: Str): Str;

package/dist/utils/colorVike.js

@@ -1,5 +0,0 @@
-export { colorVike };
-import pc from '@brillout/picocolors';
-function colorVike(str) {
-    return pc.bold(pc.yellow(str));
-}