Skip to content

Commit cff167f

Browse files
ccloliTimer
authored andcommitted
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
1 parent 13c7360 commit cff167f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

packages/react-dev-utils/ansiHTML.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
'use strict';
1111

1212
var Anser = require('anser');
13+
var Entities = require('html-entities').AllHtmlEntities;
14+
var entities = new Entities();
1315

1416
// Color scheme inspired by https://chriskempson.github.io/base16/css/base16-github.css
1517
// var base00 = 'ffffff'; // Default Background
@@ -61,7 +63,7 @@ var anserMap = {
6163
};
6264

6365
function ansiHTML(txt) {
64-
var arr = new Anser().ansiToJson(txt, {
66+
var arr = new Anser().ansiToJson(entities.encode(txt), {
6567
use_classes: true,
6668
});
6769

packages/react-dev-utils/webpackHotDevClient.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ var SockJS = require('sockjs-client');
2222
var stripAnsi = require('strip-ansi');
2323
var url = require('url');
2424
var formatWebpackMessages = require('./formatWebpackMessages');
25-
var Entities = require('html-entities').AllHtmlEntities;
2625
var ansiHTML = require('./ansiHTML');
27-
var entities = new Entities();
2826

2927
function createOverlayIframe(onIframeLoad) {
3028
var iframe = document.createElement('iframe');
@@ -138,7 +136,7 @@ function showErrorOverlay(message) {
138136
'margin-bottom: 0.5em; overflow-x: auto; white-space: pre-wrap; ' +
139137
'border-radius: 0.25rem; background-color: rgba(206, 17, 38, 0.05)">' +
140138
'<code style="font-family: Consolas, Menlo, monospace;">' +
141-
ansiHTML(entities.encode(message)) +
139+
ansiHTML(message) +
142140
'</code></pre>' +
143141
'<div style="' +
144142
'font-family: sans-serif; color: rgb(135, 142, 145); margin-top: 0.5rem; ' +

0 commit comments

Comments
 (0)