sitespeed.io 32.2.0 → 33.0.0

package/lib/plugins/html/templates/layout.pug

@@ -6,7 +6,10 @@ html(lang='en')
         title= pageTitle
         meta(name='description', content=pageDescription)
         meta(name='robots', content='noindex')
-        link(rel='stylesheet', href=assetsPath + 'css/index.min.css')
+        if options.html.darkMode
+          link(rel='stylesheet', href=assetsPath + 'css/index-dark.min.css')
+        else
+          link(rel='stylesheet', href=assetsPath + 'css/index-light.min.css')
         block inlineStyles
         style(type='text/css').
          #{css}

package/lib/plugins/html/templates/url/thirdparty/index.pug

@@ -1,92 +1,93 @@
 include ../../_tableMixins
 
-- const pagexray = pageInfo.data.pagexray.run || pageInfo.data.pagexray.pageSummary;
-- const thirdparty = medianRun ? pageInfo.data.thirdparty.pageSummary.runs[medianRun.runIndex - 1] : pageInfo.data.thirdparty.run;
+if pageInfo.data.coach
+    - const pagexray = pageInfo.data.pagexray.run || pageInfo.data.pagexray.pageSummary;
+    - const thirdparty = medianRun ? pageInfo.data.thirdparty.pageSummary.runs[medianRun.runIndex - 1] : pageInfo.data.thirdparty.run;
 
-small
-    || 
-    if thirdparty.category && Object.keys(thirdparty.category).length > 0
-        a(href='#third-party-categories') Categories |
-        |  | 
-    if thirdparty.assets && Object.keys(thirdparty.assets).length > 0
-        a(href='#third-party-tools') Tools |
-        |  | 
-    if pagexray.cookieNamesThirdParties.length > 0
-        a(href='#third-party-cookies') Cookies |
-        |  | 
-    if pagexray.firstParty.requests || options.firstParty
-        a(href='#first-vs-third') First vs third
-        |  | 
-a#third-party
-a#third-party-categories
-h2 Third party
+    small
+        || 
+        if thirdparty.category && Object.keys(thirdparty.category).length > 0
+            a(href='#third-party-categories') Categories |
+            |  | 
+        if thirdparty.assets && Object.keys(thirdparty.assets).length > 0
+            a(href='#third-party-tools') Tools |
+            |  | 
+        if pagexray.cookieNamesThirdParties.length > 0
+            a(href='#third-party-cookies') Cookies |
+            |  | 
+        if pagexray.firstParty.requests || options.firstParty
+            a(href='#first-vs-third') First vs third
+            |  | 
+    a#third-party
+    a#third-party-categories
+    h2 Third party
 
-- const thirdPartyWebVersion = pageInfo.data.coach.run ? pageInfo.data.coach.run.thirdPartyWebVersion : pageInfo.data.coach.pageSummary.thirdPartyWebVersion; 
-p Third party requests categorised by 
-    a(href='https://github.com/patrickhulce/third-party-web') Third party web
-    |  version #{thirdPartyWebVersion}.
+    - const thirdPartyWebVersion = pageInfo.data.coach.run ? pageInfo.data.coach.run.thirdPartyWebVersion : pageInfo.data.coach.pageSummary.thirdPartyWebVersion; 
+    p Third party requests categorised by 
+        a(href='https://github.com/patrickhulce/third-party-web') Third party web
+        |  version #{thirdPartyWebVersion}.
 
-if thirdparty.category && Object.keys(thirdparty.category).length > 0
-    .row
-        .one-half.column
-            table(data-sortable, id='thirdPartyCategories')
-                +rowHeading(['Category', 'Requests'])
-                each metric, category in thirdparty.category
-                    if (category !== 'unknown')
-                        tr 
-                            td(data-title='Category') #{category} 
-                            +numberCell('requests', metric.requests ? metric.requests.median : metric)
-        .one-half.column
-            table(data-sortable, id='thirdPartyTools')
-                +rowHeading(['Category', 'Number of tools'])
-                each metric, category in thirdparty.category
-                    if (category !== 'unknown')
-                        tr 
-                            td(data-title='Category') #{category}     
-                            +numberCell('Tools', metric.tools ? metric.tools.median :Object.keys(thirdparty.toolsByCategory[category]).length)
+    if thirdparty.category && Object.keys(thirdparty.category).length > 0
+        .row
+            .one-half.column
+                table(data-sortable, id='thirdPartyCategories')
+                    +rowHeading(['Category', 'Requests'])
+                    each metric, category in thirdparty.category
+                        if (category !== 'unknown')
+                            tr 
+                                td(data-title='Category') #{category} 
+                                +numberCell('requests', metric.requests ? metric.requests.median : metric)
+            .one-half.column
+                table(data-sortable, id='thirdPartyTools')
+                    +rowHeading(['Category', 'Number of tools'])
+                    each metric, category in thirdparty.category
+                        if (category !== 'unknown')
+                            tr 
+                                td(data-title='Category') #{category}     
+                                +numberCell('Tools', metric.tools ? metric.tools.median :Object.keys(thirdparty.toolsByCategory[category]).length)
 
-if thirdparty.assets && Object.keys(thirdparty.assets).length > 0
-    a#third-party-tools
-    h3 Third party requests and tools
-    button.hidden-small.button.button--primary(onclick='toggleRow(this);') Show/hide third party URLs
-    table
-        each category in Object.keys(thirdparty.assets)
-            tr
-                td(style='text-transform: uppercase;') 
-                    b #{category} 
-                    | (#{thirdparty.assets[category].length} requests) 
-            - let oldNames = [];    
-            each asset in thirdparty.assets[category]  
-                if (!oldNames.includes(asset.entity.name)) 
-                    - oldNames.push(asset.entity.name)
-                    tr
-                        td
-                            if asset.entity.homepage
-                                a(href=asset.entity.homepage) #{asset.entity.name}  
-                            else 
-                                span #{asset.entity.name}         
+    if thirdparty.assets && Object.keys(thirdparty.assets).length > 0
+        a#third-party-tools
+        h3 Third party requests and tools
+        button.hidden-small.button.button--primary(onclick='toggleRow(this);') Show/hide third party URLs
+        table
+            each category in Object.keys(thirdparty.assets)
+                tr
+                    td(style='text-transform: uppercase;') 
+                        b #{category} 
+                        | (#{thirdparty.assets[category].length} requests) 
+                - let oldNames = [];    
+                each asset in thirdparty.assets[category]  
+                    if (!oldNames.includes(asset.entity.name)) 
+                        - oldNames.push(asset.entity.name)
+                        tr
+                            td
+                                if asset.entity.homepage
+                                    a(href=asset.entity.homepage) #{asset.entity.name}  
+                                else 
+                                    span #{asset.entity.name}         
 
-            tr.u-hideable
-                td.url.offendingurl
-                    ul
-                        each asset in thirdparty.assets[category]
-                            li 
-                                a(href=asset.url) #{h.shortAsset(asset.url, true)}  
-                                b (#{asset.entity.name})
+                tr.u-hideable
+                    td.url.offendingurl
+                        ul
+                            each asset in thirdparty.assets[category]
+                                li 
+                                    a(href=asset.url) #{h.shortAsset(asset.url, true)}  
+                                    b (#{asset.entity.name})
 
-if  thirdparty.possibileMissedThirdPartyDomains && thirdparty.possibileMissedThirdPartyDomains.length > 0 
-    h3 Unmatched third party domains
-    p Here's a list of domains that didn't match any tool in 
-        a(href='https://github.com/patrickhulce/third-party-web') Third party web
-        | . If you are sure they are third party domains, please do a PR to that project. You can also fine tune the list using 
-        code --firstParty
-        | .
-    table
-            each domain in thirdparty.possibileMissedThirdPartyDomains 
-                tr 
-                    td #{domain}
+    if  thirdparty.possibileMissedThirdPartyDomains && thirdparty.possibileMissedThirdPartyDomains.length > 0 
+        h3 Unmatched third party domains
+        p Here's a list of domains that didn't match any tool in 
+            a(href='https://github.com/patrickhulce/third-party-web') Third party web
+            | . If you are sure they are third party domains, please do a PR to that project. You can also fine tune the list using 
+            code --firstParty
+            | .
+        table
+                each domain in thirdparty.possibileMissedThirdPartyDomains 
+                    tr 
+                        td #{domain}
 
-include ./thirdPartyCookies.pug
+    include ./thirdPartyCookies.pug
 
-if pagexray.firstParty.requests || options.firstParty
-  include ./firstParty.pug
+    if pagexray.firstParty.requests || options.firstParty
+    include ./firstParty.pug

package/lib/plugins/sustainable/index.js

@@ -128,7 +128,7 @@ export default class SustainablePlugin extends SitespeedioPlugin {
         } else {
           hostingGreenCheck =
             this.sustainableOptions.useGreenWebHostingAPI === true
-              ? await hosting.check(listOfDomains)
+              ? await hosting.check(listOfDomains, undefined, 'sitespeed.io')
               : await hosting.check(
                   listOfDomains,
                   await loadJSON(greenDomainJSONpath)

package/npm-shrinkwrap.json

@@ -1,21 +1,21 @@
 {
   "name": "sitespeed.io",
-  "version": "32.2.0",
+  "version": "33.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sitespeed.io",
-      "version": "32.2.0",
+      "version": "33.0.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/storage": "6.9.5",
         "@influxdata/influxdb-client": "1.33.2",
         "@sitespeed.io/plugin": "0.0.6",
-        "@tgwf/co2": "0.13.10",
+        "@tgwf/co2": "0.14.2",
         "aws-sdk": "2.1327.0",
         "axe-core": "4.8.2",
-        "browsertime": "21.1.0",
+        "browsertime": "21.2.1",
         "cli-color": "2.0.3",
         "coach-core": "8.0.2",
         "concurrent-queue": "7.0.2",
@@ -229,9 +229,9 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/@devicefarmer/adbkit": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@devicefarmer/adbkit/-/adbkit-3.2.5.tgz",
-      "integrity": "sha512-+J479WWZW3GU3t40flicDfiDrFz6vpiy2RcBQPEhFcs/3La9pOtr4Bgz2Q02E4luUG2RAL068rqIkKNUTy3tZw==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@devicefarmer/adbkit/-/adbkit-3.2.6.tgz",
+      "integrity": "sha512-8lO1hSeTgtxcOHhp4tTWq/JaOysp5KNbbyFoxNEBnwkCDZu/Bji3ZfOaG++Riv9jN6c9bgdLBOZqJTC5VJPRKQ==",
       "dependencies": {
         "@devicefarmer/adbkit-logcat": "^2.1.2",
         "@devicefarmer/adbkit-monkey": "~1.2.1",
@@ -1026,9 +1026,9 @@
       }
     },
     "node_modules/@tgwf/co2": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/@tgwf/co2/-/co2-0.13.10.tgz",
-      "integrity": "sha512-iQZMYdLP+l1Kyi03EEE4jAZgzlAA8HRAbfgT3GgN6sUgbSoNS/UHijICUqgkum9aHIkDSOrtwkgbB/x3Gc/cQA==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/@tgwf/co2/-/co2-0.14.2.tgz",
+      "integrity": "sha512-NuruTf7RlLDvi+WDRGENmrnUkiJBH0KkN7p/RM3G10erT+TcnzQM1UslSNk7SIJQBvKXptqhV6xJjYi0LDu8OQ==",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -1759,12 +1759,12 @@
       }
     },
     "node_modules/browsertime": {
-      "version": "21.1.0",
-      "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.1.0.tgz",
-      "integrity": "sha512-1V5xQDdwMHcOO8/GxHepMwrutoy4pa7Prg0GxePC+THuToGUPPemMrFmwN7I3WJWieS++F4/7hJ4wVIddotVcw==",
+      "version": "21.2.1",
+      "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.2.1.tgz",
+      "integrity": "sha512-LlU9fvaGCDL4G8uyQQmRZ6bR2bwlFPyDI85s5zOZdGOrB6/eIuxIM5/LD8oKcm7qGglmHInXG2qQUVYLROoC4w==",
       "dependencies": {
         "@cypress/xvfb": "1.2.4",
-        "@devicefarmer/adbkit": "3.2.5",
+        "@devicefarmer/adbkit": "3.2.6",
         "@sitespeed.io/chromedriver": "121.0.6167-85",
         "@sitespeed.io/edgedriver": "120.0.2210-77",
         "@sitespeed.io/geckodriver": "0.34.0",
@@ -1787,7 +1787,7 @@
         "lodash.merge": "4.6.2",
         "lodash.pick": "4.4.0",
         "lodash.set": "4.3.2",
-        "selenium-webdriver": "4.16.0",
+        "selenium-webdriver": "4.17.0",
         "yargs": "17.7.2"
       },
       "bin": {
@@ -7834,9 +7834,9 @@
       "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.16.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.16.0.tgz",
-      "integrity": "sha512-IbqpRpfGE7JDGgXHJeWuCqT/tUqnLvZ14csSwt+S8o4nJo3RtQoE9VR4jB47tP/A8ArkYsh/THuMY6kyRP6kuA==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.17.0.tgz",
+      "integrity": "sha512-e2E+2XBlGepzwgFbyQfSwo9Cbj6G5fFfs9MzAS00nC99EewmcS2rwn2MwtgfP7I5p1e7DYv4HQJXtWedsu6DvA==",
       "dependencies": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",
@@ -7847,9 +7847,9 @@
       }
     },
     "node_modules/selenium-webdriver/node_modules/ws": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.0.tgz",
-      "integrity": "sha512-H/Z3H55mrcrgjFwI+5jKavgXvwQLtfPCUEp6pi35VhoB0pfcHnSoyuTzkBEZpzq49g1193CUEwIvmsjcotenYw==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -9454,9 +9454,9 @@
       }
     },
     "@devicefarmer/adbkit": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@devicefarmer/adbkit/-/adbkit-3.2.5.tgz",
-      "integrity": "sha512-+J479WWZW3GU3t40flicDfiDrFz6vpiy2RcBQPEhFcs/3La9pOtr4Bgz2Q02E4luUG2RAL068rqIkKNUTy3tZw==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@devicefarmer/adbkit/-/adbkit-3.2.6.tgz",
+      "integrity": "sha512-8lO1hSeTgtxcOHhp4tTWq/JaOysp5KNbbyFoxNEBnwkCDZu/Bji3ZfOaG++Riv9jN6c9bgdLBOZqJTC5VJPRKQ==",
       "requires": {
         "@devicefarmer/adbkit-logcat": "^2.1.2",
         "@devicefarmer/adbkit-monkey": "~1.2.1",
@@ -10048,9 +10048,9 @@
       }
     },
     "@tgwf/co2": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/@tgwf/co2/-/co2-0.13.10.tgz",
-      "integrity": "sha512-iQZMYdLP+l1Kyi03EEE4jAZgzlAA8HRAbfgT3GgN6sUgbSoNS/UHijICUqgkum9aHIkDSOrtwkgbB/x3Gc/cQA=="
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/@tgwf/co2/-/co2-0.14.2.tgz",
+      "integrity": "sha512-NuruTf7RlLDvi+WDRGENmrnUkiJBH0KkN7p/RM3G10erT+TcnzQM1UslSNk7SIJQBvKXptqhV6xJjYi0LDu8OQ=="
     },
     "@tokenizer/token": {
       "version": "0.3.0",
@@ -10601,12 +10601,12 @@
       }
     },
     "browsertime": {
-      "version": "21.1.0",
-      "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.1.0.tgz",
-      "integrity": "sha512-1V5xQDdwMHcOO8/GxHepMwrutoy4pa7Prg0GxePC+THuToGUPPemMrFmwN7I3WJWieS++F4/7hJ4wVIddotVcw==",
+      "version": "21.2.1",
+      "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.2.1.tgz",
+      "integrity": "sha512-LlU9fvaGCDL4G8uyQQmRZ6bR2bwlFPyDI85s5zOZdGOrB6/eIuxIM5/LD8oKcm7qGglmHInXG2qQUVYLROoC4w==",
       "requires": {
         "@cypress/xvfb": "1.2.4",
-        "@devicefarmer/adbkit": "3.2.5",
+        "@devicefarmer/adbkit": "3.2.6",
         "@sitespeed.io/chromedriver": "121.0.6167-85",
         "@sitespeed.io/edgedriver": "120.0.2210-77",
         "@sitespeed.io/geckodriver": "0.34.0",
@@ -10630,7 +10630,7 @@
         "lodash.merge": "4.6.2",
         "lodash.pick": "4.4.0",
         "lodash.set": "4.3.2",
-        "selenium-webdriver": "4.16.0",
+        "selenium-webdriver": "4.17.0",
         "yargs": "17.7.2"
       },
       "dependencies": {
@@ -15208,9 +15208,9 @@
       "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
     "selenium-webdriver": {
-      "version": "4.16.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.16.0.tgz",
-      "integrity": "sha512-IbqpRpfGE7JDGgXHJeWuCqT/tUqnLvZ14csSwt+S8o4nJo3RtQoE9VR4jB47tP/A8ArkYsh/THuMY6kyRP6kuA==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.17.0.tgz",
+      "integrity": "sha512-e2E+2XBlGepzwgFbyQfSwo9Cbj6G5fFfs9MzAS00nC99EewmcS2rwn2MwtgfP7I5p1e7DYv4HQJXtWedsu6DvA==",
       "requires": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",
@@ -15218,9 +15218,9 @@
       },
       "dependencies": {
         "ws": {
-          "version": "8.15.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.0.tgz",
-          "integrity": "sha512-H/Z3H55mrcrgjFwI+5jKavgXvwQLtfPCUEp6pi35VhoB0pfcHnSoyuTzkBEZpzq49g1193CUEwIvmsjcotenYw==",
+          "version": "8.16.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+          "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
           "requires": {}
         }
       }

package/package.json

@@ -5,7 +5,7 @@
     "sitespeed.io": "./bin/sitespeed.js",
     "sitespeed.io-wpr": "./bin/browsertimeWebPageReplay.js"
   },
-  "version": "32.2.0",
+  "version": "33.0.0",
   "description": "sitespeed.io is an open-source tool for comprehensive web performance analysis, enabling you to test, monitor, and optimize your website’s speed using real browsers in various environments.",
   "keywords": [
     "performance",
@@ -53,7 +53,9 @@
     "pug-lint": "pug-lint lib/plugins/html/templates",
     "test": "ava",
     "check-licenses": "tools/check-licenses.js",
-    "build:css": "sass lib/plugins/html/src/sass/main.scss > lib/plugins/html/assets/css/index.css && cleancss -o lib/plugins/html/assets/css/index.min.css lib/plugins/html/assets/css/index.css && rm lib/plugins/html/assets/css/index.css",
+    "build:css": "npm run build:css-light && npm run build:css-dark",
+    "build:css-light": "sass lib/plugins/html/src/sass/main-light.scss > lib/plugins/html/assets/css/index-light.css && cleancss -o lib/plugins/html/assets/css/index-light.min.css lib/plugins/html/assets/css/index-light.css && rm lib/plugins/html/assets/css/index-light.css ",
+    "build:css-dark": "sass lib/plugins/html/src/sass/main-dark.scss > lib/plugins/html/assets/css/index-dark.css && cleancss -o lib/plugins/html/assets/css/index-dark.min.css lib/plugins/html/assets/css/index-dark.css && rm lib/plugins/html/assets/css/index-dark.css",
     "generate:assets": "mkdir -p assets/$npm_package_version && cp -R lib/plugins/html/assets/ assets/$npm_package_version/"
   },
   "engines": {
@@ -80,10 +82,10 @@
   "dependencies": {
     "@google-cloud/storage": "6.9.5",
     "@influxdata/influxdb-client": "1.33.2",
-    "@tgwf/co2": "0.13.10",
+    "@tgwf/co2": "0.14.2",
     "aws-sdk": "2.1327.0",
     "axe-core": "4.8.2",
-    "browsertime": "21.1.0",
+    "browsertime": "21.2.1",
     "coach-core": "8.0.2",
     "cli-color": "2.0.3",
     "concurrent-queue": "7.0.2",

package/lib/plugins/html/src/sass/main.scss

@@ -1,44 +0,0 @@
-//
-// INDEX STYLESHEET
-// ================
-// All Sass requires should live in here.
-//
-
-
-//
-// SETUP
-//
-
-@import 'utilities/settings';
-
-//
-// FOUNDATIONS
-// Base HTML and generic site-wide elements
-//
-
-@import 'foundations/normalize';
-@import 'foundations/base';
-@import 'foundations/grid';
-@import 'foundations/tables';
-@import 'foundations/typography';
-@import 'foundations/utilies';
-
-//
-// LAYOUT
-//
-
-@import 'components/buttons';
-@import 'components/navigation';
-@import 'components/sortable';
-@import 'components/summarybox';
-@import 'components/misc';
-@import 'components/waterfall';
-@import 'components/waterfallExtras';
-@import 'components/screenshot';
-@import 'components/tabs';
-@import 'components/groupitem';
-@import 'components/loader';
-@import 'components/chartist';
-@import 'components/chartist-plugin-tooltip';
-@import 'components/chartistExtras';
-@import 'components/filmstrip';