Merge branch 'main' into compare-plugin

sitespeedio · Nov 24, 2023 · fe2a418 · fe2a418
2 parents 4b9d138 + 1f0cf12
commit fe2a418
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM sitespeedio/webbrowsers:chrome-119.0-firefox-119.0-edge-119.0
+FROM sitespeedio/webbrowsers:chrome-119.0-firefox-120.0-edge-119.0
 
 ARG TARGETPLATFORM=linux/amd64
 

diff --git a/lib/plugins/html/templates/url/iteration/downloads.pug b/lib/plugins/html/templates/url/iteration/downloads.pug
@@ -12,3 +12,6 @@ if d.browsertime && d.browsertime.har
 if options.browsertime.chrome && options.browsertime.chrome.collectNetLog
     - const netlogPath = 'data/chromeNetlog-' + (iteration ? iteration : 1) + '.json.gz'
     a.button.button-download(href=netlogPath, download=downloadName + '-netlog.json.gz') Download netlog
+if options.browsertime.chrome && options.browsertime.chrome.collectConsoleLog
+    - const consoleLogPath = 'data/console-' + (iteration ? iteration : 1) + '.json.gz'
+    a.button.button-download(href=consoleLogPath, download=downloadName + '-consoleLogs.json.gz') Download Console Logs
diff --git a/lib/plugins/html/templates/url/summary/downloads.pug b/lib/plugins/html/templates/url/summary/downloads.pug
@@ -11,4 +11,7 @@ if d.browsertime && d.browsertime.har
     - const harEnding = options.gzipHAR ? '.har.gz' : '.har'
     - const harName = 'data/browsertime' + harEnding
     - const harDownloadName = downloadName + harEnding
-    a.button.button-download(href=harName, download=harDownloadName) Download HAR    
+    a.button.button-download(href=harName, download=harDownloadName) Download HAR
+if options.browsertime.chrome && options.browsertime.chrome.collectConsoleLog
+    - const consoleLogPath = 'data/console-' + (runNumber? runNumber : 1) + '.json.gz'
+    a.button.button-download(href=consoleLogPath, download=downloadName + '-consoleLogs.json.gz') Download Console Logs
diff --git a/lib/plugins/html/templates/url/summary/index.pug b/lib/plugins/html/templates/url/summary/index.pug
@@ -67,6 +67,9 @@ block content
         if d.browsertime && d.browsertime.har
           a(href='#downloads') Download HAR
           | &nbsp;|&nbsp;
+        if options.browsertime.chrome && options.browsertime.chrome.collectConsoleLog
+          a(href='#downloads') Download Console Logs
+          | &nbsp;|&nbsp;
 
       a#summary
       h2 Summary