vike 0.4.248 → 0.4.249-commit-55681da

package/dist/types/PageConfig.d.ts

@@ -25,7 +25,7 @@ import type { ConfigValueSerialized } from '../shared-server-client/page-configs
 import type { LocationId } from '../node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js';
 import type { FilePath } from './FilePath.js';
 import type { ConfigDefinitionsInternal } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
-import type { PlusFile } from '../node/vite/shared/resolveVikeConfigInternal/getPlusFilesAll.js';
+import type { PlusFile } from '../node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.js';
 import type { ApiOperation } from '../node/api/types.js';
 type PageConfigCommon = {
     pageId: 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-55681da";

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-55681da';

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-55681da",
   "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",
@@ -221,10 +221,10 @@
   "types": "./dist/server/runtime/index.d.ts",
   "type": "module",
   "bin": {
-    "vike": "./node/cli/bin.js"
+    "vike": "./bin.js"
   },
   "files": [
-    "./node/cli/bin.js",
+    "./bin.js",
     "./dist/",
     "./abort.js",
     "./api.js",
@@ -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));
-}

package/node/cli/bin.js

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