vike 0.4.247-commit-14351e3 → 0.4.247-commit-9b74d50

package/dist/utils/debug.js

@@ -9,11 +9,6 @@ import { getTerminalWidth } from './getTerminalWidth.js';
 import pc from '@brillout/picocolors';
 import { isArray } from './isArray.js';
 import { isObject } from './isObject.js';
-// Assert tree-shaking (ensure this module is loaded on the client-side only if debug is enabled).
-assert(!globalThis.__VIKE__IS_CLIENT ||
-    globalThis.__VIKE__IS_DEBUG ||
-    // Vite doesn't do tree-shaking in dev (maybe it will with Rolldown?)
-    import.meta.env.DEV);
 const flags = [
     'vike',
     'vike:crawl',
@@ -36,13 +31,18 @@ const flags = [
     'vike:vite-rpc',
 ];
 const flagsSkipWildcard = ['vike:log'];
+// Assert tree-shaking (ensure this module is loaded on the client-side only if debug is enabled).
+const isUsed = !globalThis.__VIKE__IS_CLIENT ||
+    globalThis.__VIKE__IS_DEBUG ||
+    // Vite doesn't do tree-shaking in dev (maybe it will with Rolldown?)
+    import.meta.env.DEV;
 // We purposely read process.env.DEBUG early, in order to avoid users from the temptation to set process.env.DEBUG with JavaScript, since reading & writing process.env.DEBUG dynamically leads to inconsistencies such as https://github.com/vikejs/vike/issues/2239
-const DEBUG = getDEBUG() ?? '';
-if (isDebug())
-    Error.stackTraceLimit = Infinity;
-assertFlagsActivated();
+const DEBUG = (isUsed && getDEBUG()) || '';
+if (isUsed)
+    assertFlagsActivated();
 function createDebug(flag, optionsGlobal) {
     assert(flags.includes(flag));
+    assert(isUsed);
     const debugWithOptions = (optionsLocal) => {
         return (...msgs) => {
             const options = { ...optionsGlobal, ...optionsLocal };
@@ -57,6 +57,7 @@ function debug(flag, ...msgs) {
     return debug_(flag, {}, ...msgs);
 }
 function debug_(flag, options, ...msgs) {
+    assert(isUsed);
     if (!isDebug(flag))
         return;
     let [msgFirst, ...msgsRest] = msgs;
@@ -84,6 +85,7 @@ function debug_(flag, options, ...msgs) {
     });
 }
 function isDebug(flag) {
+    assert(isUsed);
     assert(flag === undefined || (flag && flags.includes(flag)));
     const { flagsActivated, isAll, isGlobal } = getFlagsActivated();
     if (flag) {
@@ -157,6 +159,7 @@ function replaceFunctionSerializer(_key, value) {
     return value;
 }
 function assertFlagsActivated() {
+    assert(isUsed);
     const { flagsActivated } = getFlagsActivated();
     flagsActivated.forEach((flag) => {
         assertUsage(flags.includes(flag), `Unknown DEBUG flag ${pc.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${pc.cyan(f)}`).join('\n')}`);
@@ -169,6 +172,7 @@ function getFlagsActivated() {
     return { flagsActivated, isAll, isGlobal };
 }
 function getDEBUG() {
+    assert(isUsed);
     let DEBUG;
     // ssr.noExternal
     /* // Full implementation:

package/dist/utils/formatHintLog.d.ts

@@ -1,2 +1,2 @@
 export { formatHintLog };
-declare function formatHintLog(msg: string): string;
+declare function formatHintLog<Msg extends string>(msg: Msg): `| ${Msg} |`;

package/dist/utils/formatHintLog.js

@@ -1,15 +1,13 @@
+export { formatHintLog };
 import { assert } from './assert.js';
 import { stripAnsi } from './colors.js';
-export { formatHintLog };
 function formatHintLog(msg) {
     assert(msg.length > 0);
     const msgLength = stripAnsi(msg).length;
     const sep = '─'.repeat(msgLength);
-    return [
-        // prettier-ignore
-        // biome-ignore format:
-        `┌─${sep}─┐`,
-        `│ ${msg} │`,
-        `└─${sep}─┘`,
-    ].join('\n');
+    const top = `┌─${sep}─┐\n`;
+    const mid = `│ ${msg} │\n`;
+    const bot = `└─${sep}─┘`;
+    const msgWrapped = `${top}${mid}${bot}`;
+    return msgWrapped;
 }

package/dist/utils/getBetterError.d.ts

@@ -1,9 +1,15 @@
 export { getBetterError };
 declare function getBetterError(err: unknown, modifications: {
-    message?: string;
+    message?: string | {
+        prepend?: string;
+        append?: string;
+    };
     stack?: string;
     hideStack?: true;
 }): {
     message: string;
     stack: string;
+    hideStack?: true;
+} & {
+    getOriginalError: () => any;
 };

package/dist/utils/getBetterError.js

@@ -1,7 +1,9 @@
 export { getBetterError };
-// TO-DO/eventually: make it a library `@brillout/better-error`
-// TODO: fix? Reprod: 7f4baa40ec95fa55319f85a38a50291460790683
+// TO-DO/maybe: make it a library `@brillout/better-error`
 import { isObject } from './isObject.js';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+import { objectAssign } from './objectAssign.js';
+assertIsNotBrowser();
 function getBetterError(err, modifications) {
     let errBetter;
     // Normalize
@@ -17,16 +19,42 @@ function getBetterError(err, modifications) {
         warnMalformed(err);
         errBetter.stack = new Error(errBetter.message).stack;
     }
-    if (!errBetter.stack.includes(errBetter.message)) {
-        warnMalformed(err);
+    // Modifications: err.hideStack and err.stack
+    const { message: modsMessage, ...mods } = modifications;
+    Object.assign(errBetter, mods);
+    // Modifications: err.message
+    if (typeof modsMessage === 'string') {
+        // Modify err.message
+        const messagePrev = errBetter.message;
+        const messageNext = modsMessage;
+        errBetter.message = messageNext;
+        // Update err.stack
+        const messagePrevIdx = errBetter.stack.indexOf(messagePrev);
+        if (messagePrevIdx >= 0) {
+            // Completely replace the beginning of err.stack — removing prefix such as "SyntaxError: "
+            // - Following isn't always true: `err.stack.startsWith(err.message)` — because err.stack can start with "SyntaxError: " whereas err.message doesn't
+            const stack = errBetter.stack.slice(messagePrevIdx + messagePrev.length);
+            errBetter.stack = messageNext + stack;
+        }
+        else {
+            warnMalformed(err);
+        }
+    }
+    else {
+        if (modsMessage?.append) {
+            const messagePrev = errBetter.message;
+            const messageNext = errBetter.message + modsMessage.append;
+            errBetter.message = messageNext;
+            errBetter.stack = errBetter.stack.replace(messagePrev, messageNext);
+        }
+        if (modsMessage?.prepend) {
+            const { prepend } = modsMessage;
+            errBetter.message = prepend + errBetter.message;
+            errBetter.stack = prepend + errBetter.stack;
+        }
     }
-    // Modifications
-    const errMessageOriginal = errBetter.message;
-    Object.assign(errBetter, modifications);
-    if (modifications.message)
-        errBetter.stack = errBetter.stack.replaceAll(errMessageOriginal, modifications.message);
     // Enable users to retrieve the original error
-    Object.assign(errBetter, { getOriginalError: () => err?.getOriginalError?.() ?? err });
+    objectAssign(errBetter, { getOriginalError: () => err?.getOriginalError?.() ?? err });
     return errBetter;
 }
 // TO-DO/eventually: think about whether logging this warning is a good idea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.247-commit-14351e3",
+  "version": "0.4.247-commit-9b74d50",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -249,7 +249,7 @@
     "react-streaming": "^0.4.13",
     "rimraf": "^5.0.5",
     "typescript": "^5.9.3",
-    "vite": "^7.1.5"
+    "vite": "^7.2.6"
   },
   "scripts": {
     "dev": "tsc --watch",

package/dist/node/vite/shared/loggerVite/removeSuperfluousViteLog.d.ts

@@ -1,6 +0,0 @@
-export { removeSuperfluousViteLog };
-export { removeSuperfluousViteLog_enable };
-export { removeSuperfluousViteLog_disable };
-declare function removeSuperfluousViteLog(msg: string): boolean;
-declare function removeSuperfluousViteLog_enable(): void;
-declare function removeSuperfluousViteLog_disable(): void;

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

@@ -1,24 +0,0 @@
-export { removeSuperfluousViteLog };
-export { removeSuperfluousViteLog_enable };
-export { removeSuperfluousViteLog_disable };
-import { assert, getGlobalObject } from '../../utils.js';
-const globalObject = getGlobalObject('removeSuperfluousViteLog.ts', {
-    enabled: false,
-});
-const superfluousLog = 'Forced re-optimization of dependencies';
-function removeSuperfluousViteLog(msg) {
-    if (!globalObject.enabled) {
-        return false;
-    }
-    if (msg.toLowerCase().includes('forced') && msg.toLowerCase().includes('optimization')) {
-        assert(msg === superfluousLog, msg); // assertion fails => Vite changed its message => update this function
-        return true;
-    }
-    return false;
-}
-function removeSuperfluousViteLog_enable() {
-    globalObject.enabled = true;
-}
-function removeSuperfluousViteLog_disable() {
-    globalObject.enabled = false;
-}