From 18c7deb7c223ee0d6b9fec5dbc78109597c085be Mon Sep 17 00:00:00 2001
From: Sabrina <sabrina.castelli@adevinta.com>
Date: Thu, 19 Oct 2023 08:53:20 +0200
Subject: [PATCH] feat(packages/sui-ssr): improvements

---
 packages/sui-ssr/server/index.js           | 6 +++---
 packages/sui-ssr/server/middlewares/ssr.js | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/sui-ssr/server/index.js b/packages/sui-ssr/server/index.js
index 5bf4e25dd..9eed1cae9 100644
--- a/packages/sui-ssr/server/index.js
+++ b/packages/sui-ssr/server/index.js
@@ -18,9 +18,9 @@ import {
 import ssrConf from './config.js'
 noOPConsole(console)
 
-// if (process.env.CONSOLE) {
-console._restore()
-// }
+if (process.env.CONSOLE) {
+  console._restore()
+}
 
 const app = express()
 
diff --git a/packages/sui-ssr/server/middlewares/ssr.js b/packages/sui-ssr/server/middlewares/ssr.js
index 53d89eebb..4c77007f5 100644
--- a/packages/sui-ssr/server/middlewares/ssr.js
+++ b/packages/sui-ssr/server/middlewares/ssr.js
@@ -204,15 +204,12 @@ export default async (req, res, next) => {
   const {bodyAttributes, headString, htmlAttributes} =
     renderHeadTagsToString(headTags)
 
-  res.set({
-    'Content-Security-Policy-Report-Only': `default-src 'self'; report-uri ${CSP_REPORT_PATH}`
-  })
-
   res.set({
     'Server-Timing': formatServerTimingHeader({
       ...performance,
       ...ssrPerformance
-    })
+    }),
+    'Content-Security-Policy-Report-Only': `default-src 'self'; report-uri ${CSP_REPORT_PATH}`
   })
   res.write(HtmlBuilder.buildHead({headTplPart, headString, htmlAttributes}))
   res.flush()