Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

revert: fix(logger): truncate log over 5000 characters long (#16581) #17729

Merged
merged 2 commits into from
Jul 22, 2024
Merged

revert: fix(logger): truncate log over 5000 characters long (#16581) #17729

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0306c8
revert: fix(logger): truncate log over 5000 characters long (#16581)
Henry-Hong Jul 21, 2024
4eee7c8
refactor(logger): convert ternary-operator to if-else
Henry-Hong Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 10 additions & 28 deletions packages/vite/src/node/logger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import readline from 'node:readline'
import colors from 'picocolors'
import type { RollupError } from 'rollup'
import type { ResolvedServerUrls } from './server'
import { splitRE } from './utils'

export type LogType = 'error' | 'warn' | 'info'
export type LogLevel = LogType | 'silent'
Expand Down Expand Up @@ -64,8 +63,6 @@ function getTimeFormatter() {
return timeFormatter
}

const MAX_LOG_CHAR = 5000

export function createLogger(
level: LogLevel = 'info',
options: LoggerOptions = {},
Expand All @@ -81,32 +78,17 @@ export function createLogger(
allowClearScreen && process.stdout.isTTY && !process.env.CI
const clear = canClearScreen ? clearScreen : () => {}

function preventOverflow(msg: string) {
if (msg.length > MAX_LOG_CHAR) {
const shorten = msg.slice(0, MAX_LOG_CHAR)
const lines = msg.slice(MAX_LOG_CHAR).match(splitRE)?.length || 0

return `${shorten}\n... and ${lines} lines more`
}
return msg
}

function format(
type: LogType,
rawMsg: string,
options: LogErrorOptions = {},
) {
const msg = preventOverflow(rawMsg)
function format(type: LogType, msg: string, options: LogErrorOptions = {}) {
if (options.timestamp) {
const tag =
type === 'info'
? colors.cyan(colors.bold(prefix))
: type === 'warn'
? colors.yellow(colors.bold(prefix))
: colors.red(colors.bold(prefix))
return `${colors.dim(
getTimeFormatter().format(new Date()),
)} ${tag} ${msg}`
let tag = ''
if (type === 'info') {
tag = colors.cyan(colors.bold(prefix))
} else if (type === 'warn') {
tag = colors.yellow(colors.bold(prefix))
} else {
tag = colors.red(colors.bold(prefix))
}
return `${colors.dim(getTimeFormatter().format(new Date()))} ${tag} ${msg}`
} else {
return msg
}
Expand Down