From 20f2b4c553ee343f491faf63e39427fba9908c7c Mon Sep 17 00:00:00 2001 From: th0r Date: Thu, 11 Apr 2019 17:16:00 +0300 Subject: [PATCH] Fix regression with escaping internal assets --- src/viewer.js | 18 +++++++++--------- views/script.ejs | 2 +- views/viewer.ejs | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index 564039ac..2c6fd5fc 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -52,11 +52,11 @@ async function startServer(bundleStats, opts) { app.use('/', (req, res) => { res.render('viewer', { mode: 'server', - get chartData() { return JSON.stringify(chartData) }, - defaultSizes: JSON.stringify(defaultSizes), + get chartData() { return chartData }, + defaultSizes, enableWebSocket: true, // Helpers - escapeScript + escapeJson }); }); @@ -133,12 +133,12 @@ async function generateReport(bundleStats, opts) { `${projectRoot}/views/viewer.ejs`, { mode: 'static', - chartData: JSON.stringify(chartData), - defaultSizes: JSON.stringify(defaultSizes), + chartData, + defaultSizes, enableWebSocket: false, // Helpers assetContent: getAssetContent, - escapeScript + escapeJson }, (err, reportHtml) => { try { @@ -180,10 +180,10 @@ function getAssetContent(filename) { } /** - * Escapes `<` characters in the string to safely use it in ` <% } else { %> diff --git a/views/viewer.ejs b/views/viewer.ejs index daec0e13..deb189b3 100644 --- a/views/viewer.ejs +++ b/views/viewer.ejs @@ -11,9 +11,9 @@