Skip to content
Merged
Changes from all commits
Commits
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
fix: make typescriptformatter support 0.5 of fork checker
  • Loading branch information
SimenB committed Nov 22, 2018
commit 06d4151720ae586eb026b2daa40600239383ebd3
25 changes: 19 additions & 6 deletions packages/react-dev-utils/typescriptFormatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,24 @@ const chalk = require('chalk');
const fs = require('fs');

function formatter(message, useColors) {
const hasGetters = typeof message.getFile === 'function';
const colors = new chalk.constructor({ enabled: useColors });
const messageColor = message.isWarningSeverity() ? colors.yellow : colors.red;

const source =
message.getFile() &&
fs.existsSync(message.getFile()) &&
fs.readFileSync(message.getFile(), 'utf-8');
let source;

if (hasGetters) {
source =
message.getFile() &&
fs.existsSync(message.getFile()) &&
fs.readFileSync(message.getFile(), 'utf-8');
} else {
source =
message.file &&
fs.existsSync(message.file) &&
fs.readFileSync(message.file, 'utf-8');
}

let frame = '';

if (source) {
Expand All @@ -33,9 +44,11 @@ function formatter(message, useColors) {
.join(os.EOL);
}

const severity = hasGetters ? message.getSeverity() : message.severity;

return [
messageColor.bold(`Type ${message.getSeverity().toLowerCase()}: `) +
message.getContent() +
messageColor.bold(`Type ${severity.toLowerCase()}: `) +
(hasGetters ? message.getContent() : message.content) +
' ' +
messageColor.underline(`TS${message.code}`),
'',
Expand Down