Merge pull request #264 from webpack-contrib/fix-escape-regression

th0r · web-flow · commit a615815d6c6f · 2019-04-11T17:22:29.000+03:00
Fix regression with escaping internal assets
diff --git 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 `<script>` tag.
+ * Escapes `<` characters in JSON to safely use it in `<script>` tag.
  */
-function escapeScript(value) {
-  return String(value).replace(/</gu, '\\u003c');
+function escapeJson(json) {
+  return JSON.stringify(json).replace(/</gu, '\\u003c');
 }
 
 function getChartData(analyzerOpts, ...args) {
diff --git a/views/script.ejs b/views/script.ejs
@@ -1,7 +1,7 @@
 <% if (mode === 'static') { %>
   <!-- <%= filename %> -->
   <script>
-    <%- escapeScript(assetContent(filename)) %>
+    <%- assetContent(filename) %>
   </script>
 <% } else { %>
   <script src="<%= filename %>"></script>
diff --git a/views/viewer.ejs b/views/viewer.ejs
@@ -11,9 +11,9 @@
   <body>
     <div id="app"></div>
     <script>
-      window.chartData = <%- escapeScript(chartData) %>;
-      window.defaultSizes = <%- escapeScript(defaultSizes) %>;
-      window.enableWebSocket = <%- escapeScript(enableWebSocket) %>;
+      window.chartData = <%- escapeJson(chartData) %>;
+      window.defaultSizes = <%- escapeJson(defaultSizes) %>;
+      window.enableWebSocket = <%- escapeJson(enableWebSocket) %>;
     </script>
   </body>
 </html>
