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

… into production
HTTPArchive · Oct 19, 2023 · b130143 · b130143
2 parents 2d9d0e6 + 7a3c208
commit b130143
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 74 deletions.
diff --git a/src/config/last_updated.json b/src/config/last_updated.json
@@ -36,8 +36,8 @@
   },
   "/static/js/send-web-vitals.js": {
     "date_published": "2021-02-24T00:00:00.000Z",
-    "date_modified": "2023-06-26T00:00:00.000Z",
-    "hash": "b25cb04b670393c1b9d203b9a9138c21"
+    "date_modified": "2023-10-19T00:00:00.000Z",
+    "hash": "f39931f7013948beff8a4d85804cbf7a"
   },
   "/static/js/web-vitals.js": {
     "date_published": "2020-11-13T00:00:00.000Z",
@@ -425,23 +425,23 @@
   },
   "en/2020/stories/content_distribution.html": {
     "date_published": "2021-01-18T00:00:00.000Z",
-    "date_modified": "2023-06-23T00:00:00.000Z",
-    "hash": "6fd47663cfb0c739ffc6b3f0f268dea1"
+    "date_modified": "2023-10-19T00:00:00.000Z",
+    "hash": "162bc5e5f51975bb756a49bdbe721d84"
   },
   "en/2020/stories/content_publishing.html": {
     "date_published": "2021-01-13T00:00:00.000Z",
-    "date_modified": "2023-06-23T00:00:00.000Z",
-    "hash": "94a8cfe74b13a0d749fb91a1fa60199d"
+    "date_modified": "2023-10-19T00:00:00.000Z",
+    "hash": "892505cf0e382a58d05622551193dd65"
   },
   "en/2020/stories/page_content.html": {
     "date_published": "2020-12-22T00:00:00.000Z",
-    "date_modified": "2023-06-23T00:00:00.000Z",
-    "hash": "22823ffbea656764455d3f86e33329ff"
+    "date_modified": "2023-10-19T00:00:00.000Z",
+    "hash": "f567610520c1795d7c9aee3d086491db"
   },
   "en/2020/stories/user_experience.html": {
     "date_published": "2021-01-07T00:00:00.000Z",
-    "date_modified": "2023-06-23T00:00:00.000Z",
-    "hash": "f5bcfdba63c429f600c3a758458e84b8"
+    "date_modified": "2023-10-19T00:00:00.000Z",
+    "hash": "924fc47a85ceeae0a4a4b3fa80682dfa"
   },
   "en/2020/table_of_contents.html": {
     "date_published": "2020-10-24T00:00:00.000Z",

diff --git a/src/static/js/send-web-vitals.js b/src/static/js/send-web-vitals.js
@@ -86,14 +86,6 @@ function sendWebVitals() {
         event_label: id,
         non_interaction: true,
 
-        // See: https://web.dev/debug-web-vitals-in-the-field/
-        dimension1: overrides.debug_target,
-        dimension2: effectiveType,
-        dimension3: dataSaver,
-        dimension4: deviceMemory,
-        dimension5: prefersReducedMotion,
-        dimension6: prefersColorScheme,
-        dimension7: navigationType,
         //GA4
         effective_type: effectiveType,
         data_saver: dataSaver,

diff --git a/src/templates/en/2020/stories/content_distribution.html b/src/templates/en/2020/stories/content_distribution.html
@@ -1652,9 +1652,9 @@
       <script type="application/json">
         {
           "vars": {
-            "gtag_id": "UA-22381566-3",
+            "gtag_id": "G-PQ5N2MZG5M",
             "config": {
-              "UA-22381566-3": {
+              "G-PQ5N2MZG5M": {
                 "groups": "default"
               }
             }
@@ -1669,7 +1669,7 @@
                 "event_category": "${title}",
                 "event_label": "${storyPageIndex}",
                 "event_value": "${storyProgress}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyEnd": {
@@ -1680,7 +1680,7 @@
                 "event_action": "story_complete",
                 "event_category": "${title}",
                 "event_label": "${storyPageCount}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "trackFocusState": {
@@ -1691,7 +1691,7 @@
                 "event_name": "custom",
                 "event_action": "story_focus",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "trackClickThrough": {
@@ -1702,7 +1702,7 @@
                 "event_name": "custom",
                 "event_action": "story_click_through",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyOpen": {
@@ -1712,7 +1712,7 @@
                 "event_name": "custom",
                 "event_action": "story_open",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyClose": {
@@ -1722,7 +1722,7 @@
                 "event_name": "custom",
                 "event_action": "story_close",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "audioMuted": {
@@ -1732,7 +1732,7 @@
                 "event_name": "custom",
                 "event_action": "story_audio_muted",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "audioUnmuted": {
@@ -1742,7 +1742,7 @@
                 "event_name": "custom",
                 "event_action": "story_audio_unmuted",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "pageAttachmentEnter": {
@@ -1752,7 +1752,7 @@
                 "event_name": "custom",
                 "event_action": "story_page_attachment_enter",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "pageAttachmentExit": {
@@ -1762,7 +1762,7 @@
                 "event_name": "custom",
                 "event_action": "story_page_attachment_exit",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyBookendEnter": {
@@ -1772,7 +1772,7 @@
                 "event_name": "custom",
                 "event_action": "story_bookend_enter",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyBookendExit": {
@@ -1782,7 +1782,7 @@
                 "event_name": "custom",
                 "event_action": "story_bookend_exit",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             }
           }

diff --git a/src/templates/en/2020/stories/content_publishing.html b/src/templates/en/2020/stories/content_publishing.html
@@ -1330,9 +1330,9 @@
       <script type="application/json">
         {
           "vars": {
-            "gtag_id": "UA-22381566-3",
+            "gtag_id": "G-PQ5N2MZG5M",
             "config": {
-              "UA-22381566-3": {
+              "G-PQ5N2MZG5M": {
                 "groups": "default"
               }
             }
@@ -1347,7 +1347,7 @@
                 "event_category": "${title}",
                 "event_label": "${storyPageIndex}",
                 "event_value": "${storyProgress}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyEnd": {
@@ -1358,7 +1358,7 @@
                 "event_action": "story_complete",
                 "event_category": "${title}",
                 "event_label": "${storyPageCount}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "trackFocusState": {
@@ -1369,7 +1369,7 @@
                 "event_name": "custom",
                 "event_action": "story_focus",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "trackClickThrough": {
@@ -1380,7 +1380,7 @@
                 "event_name": "custom",
                 "event_action": "story_click_through",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyOpen": {
@@ -1390,7 +1390,7 @@
                 "event_name": "custom",
                 "event_action": "story_open",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyClose": {
@@ -1400,7 +1400,7 @@
                 "event_name": "custom",
                 "event_action": "story_close",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "audioMuted": {
@@ -1410,7 +1410,7 @@
                 "event_name": "custom",
                 "event_action": "story_audio_muted",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "audioUnmuted": {
@@ -1420,7 +1420,7 @@
                 "event_name": "custom",
                 "event_action": "story_audio_unmuted",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "pageAttachmentEnter": {
@@ -1430,7 +1430,7 @@
                 "event_name": "custom",
                 "event_action": "story_page_attachment_enter",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "pageAttachmentExit": {
@@ -1440,7 +1440,7 @@
                 "event_name": "custom",
                 "event_action": "story_page_attachment_exit",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyBookendEnter": {
@@ -1450,7 +1450,7 @@
                 "event_name": "custom",
                 "event_action": "story_bookend_enter",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             },
             "storyBookendExit": {
@@ -1460,7 +1460,7 @@
                 "event_name": "custom",
                 "event_action": "story_bookend_exit",
                 "event_category": "${title}",
-                "send_to": "UA-22381566-3"
+                "send_to": "G-PQ5N2MZG5M"
               }
             }
           }