Fix colors not showing (#265)

houfio · typicode · commit 0c6c9ab12c09 · 2018-01-23T12:44:05.000+01:00
* Fix colors not showing

Also fixes the `&amp;nbsp;` on newlines.

* Add html escape back

Also add proper types to fix type errors
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,6 +75,7 @@
   },
   "devDependencies": {
     "@types/classnames": "^2.2.3",
+    "@types/escape-html": "0.0.20",
     "@types/react": "^16.0.34",
     "@types/react-dom": "^16.0.3",
     "@types/react-icons": "^2.2.4",
diff --git a/src/app/formatter.ts b/src/app/formatter.ts
@@ -10,9 +10,9 @@ export function formatLines(str: string): string[] {
   return str
     .replace(/\n$/, '')
     .split('\n')
+    .map(escapeHTML)
     .map(blankLine)
     .map(ansi2HTML)
-    .map(escapeHTML)
 }
 
 export function statusTitle(monitor: IMonitor) {
diff --git a/src/app/global.d.ts b/src/app/global.d.ts
@@ -1,5 +1,4 @@
 declare module 'ansi2html'
-declare module 'escape-html'
 declare module 'lodash.uniqueid'
 declare module 'react-icons/lib/md/arrow-downward'
 declare module 'react-icons/lib/md/clear-all'
diff --git a/test/fixtures/verbose/index.js b/test/fixtures/verbose/index.js
@@ -1 +1 @@
-setInterval(() => console.log(Math.random()), 100)
+setInterval(() => console.log('[31m' + Math.random() + '\n'), 200)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`declare module 'ansi2html'`
`2`		`-declare module 'escape-html'`
`3`	`2`	`declare module 'lodash.uniqueid'`
`4`	`3`	`declare module 'react-icons/lib/md/arrow-downward'`
`5`	`4`	`declare module 'react-icons/lib/md/clear-all'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-setInterval(() => console.log(Math.random()), 100)`
	`1`	`+setInterval(() => console.log('[31m' + Math.random() + '\n'), 200)`