Merge branch 'main' of github.com:HTTPArchive/almanac.httparchive.org…

… into production
HTTPArchive · Jun 10, 2024 · a76ab9f · a76ab9f
2 parents 4538b65 + 523ae0d
commit a76ab9f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/src/config/last_updated.json b/src/config/last_updated.json
@@ -36,13 +36,13 @@
   },
   "/static/js/send-web-vitals.js": {
     "date_published": "2021-02-24T00:00:00.000Z",
-    "date_modified": "2024-06-05T00:00:00.000Z",
-    "hash": "93b415ccbc2d2f5de8627d6019546f09"
+    "date_modified": "2024-06-10T00:00:00.000Z",
+    "hash": "b7224f484fe762e075d4838286ddb066"
   },
   "/static/js/web-vitals.js": {
     "date_published": "2020-11-13T00:00:00.000Z",
-    "date_modified": "2024-06-05T00:00:00.000Z",
-    "hash": "10638eba1611ff0dc07edbe721e3eb45"
+    "date_modified": "2024-06-10T00:00:00.000Z",
+    "hash": "fd1e29002e3518e8bf128dbbddaecc07"
   },
   "/static/js/webmentions.js": {
     "date_published": "2021-12-01T00:00:00.000Z",

diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -47,7 +47,7 @@
     "run-script-os": "1.1.6",
     "showdown": "2.1.0",
     "smartypants": "0.2.2",
-    "web-vitals": "4.0.1",
+    "web-vitals": "4.1.0",
     "xml-js": "1.6.11"
   }
 }
diff --git a/src/static/js/send-web-vitals.js b/src/static/js/send-web-vitals.js
@@ -54,7 +54,7 @@ function sendWebVitals() {
     }));
   }
 
-  function sendWebVitalsGAEvents({name, delta, id, attribution, navigationType}) {
+  function sendWebVitalsGAEvents({name, delta, value, id, attribution, navigationType}) {
 
     let overrides = {};
 
@@ -136,6 +136,11 @@ function sendWebVitals() {
       event_category: 'Web Vitals',
       value: Math.round(name === 'CLS' ? delta * 1000 : delta),
       event_label: id,
+      // Repeat with new fields to match web-vitals documentation
+      // TODO deprecate above names when no longer required
+      metric_value: Math.round(name === 'CLS' ? value * 1000 : value),
+      metric_delta: Math.round(name === 'CLS' ? delta * 1000 : delta),
+      metric_id: id,
       non_interaction: true,
       effective_type: effectiveType,
       data_saver: dataSaver,