Commit cff167f0 authored by 864907600cc's avatar 864907600cc Committed by Joe Haddad
Browse files

Fix parsing HTML/JSX tags to real elements (#2796)

* Fix parsing HTML/JSX tags to real elements

* Use `html-entities` to escape instead of pure `replace()`

* Remove unnecessary HTML entity replacing
parent 13c73603
Showing with 4 additions and 4 deletions
+4 -4
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
'use strict'; 'use strict';
var Anser = require('anser'); var Anser = require('anser');
var Entities = require('html-entities').AllHtmlEntities;
var entities = new Entities();
// Color scheme inspired by https://chriskempson.github.io/base16/css/base16-github.css // Color scheme inspired by https://chriskempson.github.io/base16/css/base16-github.css
// var base00 = 'ffffff'; // Default Background // var base00 = 'ffffff'; // Default Background
...@@ -61,7 +63,7 @@ var anserMap = { ...@@ -61,7 +63,7 @@ var anserMap = {
}; };
function ansiHTML(txt) { function ansiHTML(txt) {
var arr = new Anser().ansiToJson(txt, { var arr = new Anser().ansiToJson(entities.encode(txt), {
use_classes: true, use_classes: true,
}); });
......
...@@ -22,9 +22,7 @@ var SockJS = require('sockjs-client'); ...@@ -22,9 +22,7 @@ var SockJS = require('sockjs-client');
var stripAnsi = require('strip-ansi'); var stripAnsi = require('strip-ansi');
var url = require('url'); var url = require('url');
var formatWebpackMessages = require('./formatWebpackMessages'); var formatWebpackMessages = require('./formatWebpackMessages');
var Entities = require('html-entities').AllHtmlEntities;
var ansiHTML = require('./ansiHTML'); var ansiHTML = require('./ansiHTML');
var entities = new Entities();
function createOverlayIframe(onIframeLoad) { function createOverlayIframe(onIframeLoad) {
var iframe = document.createElement('iframe'); var iframe = document.createElement('iframe');
...@@ -138,7 +136,7 @@ function showErrorOverlay(message) { ...@@ -138,7 +136,7 @@ function showErrorOverlay(message) {
'margin-bottom: 0.5em; overflow-x: auto; white-space: pre-wrap; ' + 'margin-bottom: 0.5em; overflow-x: auto; white-space: pre-wrap; ' +
'border-radius: 0.25rem; background-color: rgba(206, 17, 38, 0.05)">' + 'border-radius: 0.25rem; background-color: rgba(206, 17, 38, 0.05)">' +
'<code style="font-family: Consolas, Menlo, monospace;">' + '<code style="font-family: Consolas, Menlo, monospace;">' +
ansiHTML(entities.encode(message)) + ansiHTML(message) +
'</code></pre>' + '</code></pre>' +
'<div style="' + '<div style="' +
'font-family: sans-serif; color: rgb(135, 142, 145); margin-top: 0.5rem; ' + 'font-family: sans-serif; color: rgb(135, 142, 145); margin-top: 0.5rem; ' +
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment