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

Author: tunetheweb

.github/workflows/progress-tracker.yml

@@ -4,9 +4,9 @@ env:
   # Update these environment variables every year
   # And check the tracker is enabled at:
   # https://github.com/HTTPArchive/almanac.httparchive.org/actions/workflows/progress-tracker.yml
-  FILTER_LABEL: '2024 chapter'
-  TRACKER_ISSUE_NUMBER: 3634
-  SQL_BASE_DIR: 'https://github.com/HTTPArchive/almanac.httparchive.org/tree/main/sql/2024/'
+  FILTER_LABEL: '2025 chapter'
+  TRACKER_ISSUE_NUMBER: 4110
+  SQL_BASE_DIR: 'https://github.com/HTTPArchive/almanac.httparchive.org/tree/main/sql/2025/'
 
 on:
   workflow_dispatch:

README.md

@@ -1,10 +1,8 @@
 # 📕 Web Almanac
 
-[![Production Checks GitHub Action](https://github.com/HTTPArchive/almanac.httparchive.org/workflows/Production%20Checks/badge.svg)](https://github.com/HTTPArchive/almanac.httparchive.org/actions?query=workflow%3A%22Production+Checks%22) [![Test Website GitHub Action](https://github.com/HTTPArchive/almanac.httparchive.org/workflows/Test%20Website/badge.svg?branch=main)](https://github.com/HTTPArchive/almanac.httparchive.org/actions?query=workflow%3A%22Test+Website%22) [![TLS Observatory](https://img.shields.io/mozilla-observatory/grade-score/almanac.httparchive.org?publish)](https://observatory.mozilla.org/analyze/almanac.httparchive.org)
+[![Production Checks GitHub Action](https://github.com/HTTPArchive/almanac.httparchive.org/workflows/Production%20Checks/badge.svg)](https://github.com/HTTPArchive/almanac.httparchive.org/actions?query=workflow%3A%22Production+Checks%22) [![Test Website GitHub Action](https://github.com/HTTPArchive/almanac.httparchive.org/workflows/Test%20Website/badge.svg?branch%3Amain)](https://github.com/HTTPArchive/almanac.httparchive.org/actions?query=workflow%3A%22Test+Website%22+branch%3Amain) [![TLS Observatory](https://img.shields.io/mozilla-observatory/grade-score/almanac.httparchive.org?publish)](https://observatory.mozilla.org/analyze/almanac.httparchive.org)
 
-[![2024 Content Planning](https://img.shields.io/github/milestones/progress/HttpArchive/almanac.httparchive.org/27)](https://github.com/HTTPArchive/almanac.httparchive.org/milestone/27) [![2024 Analysis Milestone](https://img.shields.io/github/milestones/progress/HttpArchive/almanac.httparchive.org/24)](https://github.com/HTTPArchive/almanac.httparchive.org/milestone/24) [![2024 Content Writing Milestone](https://img.shields.io/github/milestones/progress/HttpArchive/almanac.httparchive.org/25)](https://github.com/HTTPArchive/almanac.httparchive.org/milestone/25) [![2024 Launch!](https://img.shields.io/github/milestones/progress/HttpArchive/almanac.httparchive.org/26)](https://github.com/HTTPArchive/almanac.httparchive.org/milestone/26) [![Content Translation Milestone](https://img.shields.io/github/milestones/progress/HttpArchive/almanac.httparchive.org/19)](https://github.com/HTTPArchive/almanac.httparchive.org/milestone/19)
-
-[![Open Dev Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/development)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Adevelopment) [![Open Analysis Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/analysis)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Aanalysis) [![Open Translation Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/translation)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Atranslation) [![Open Writing Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/writing)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Awriting)
+[![Open Writing Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/writing)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Awriting) [![Open Dev Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/development)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Adevelopment) [![Open Analysis Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/analysis)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Aanalysis) [![Open Translation Pull Requests](https://img.shields.io/github/issues-pr/HTTPArchive/almanac.httparchive.org/translation)](https://github.com/HTTPArchive/almanac.httparchive.org/pulls?q=is%3Apr+is%3Aopen+label%3Atranslation)
 
 The Web Almanac is HTTP Archive's annual **state of the web** report.
 
@@ -32,12 +30,11 @@ See [our contributing guide](CONTRIBUTING.md). To run the Web Almanac locally pl
 
 ## Next Web Almanac timeline
 
-<!--
-We are currently working on the 2024 version. If you would like to get involved, here's a [list of chapters](https://github.com/HTTPArchive/almanac.httparchive.org/issues?q=is%3Aissue+is%3Aopen+label%3A%222024+chapter%22) looking for help.
--->
-We've just finished the 2024 edition and are starting to think about organizing the 2025 edition. If you'd be interested to contribute, you can sign up to be notified when the project planning kicks off by filling out [this interest form](https://forms.gle/Juz3Ak7RkV6oSBKNA). Check off all teams that interest you and give a detailed description of what your areas of expertise are so we can reach out to you with targeted opportunities.
+We are currently working on the 2025 version. If you would like to get involved, here's a [list of chapters](https://github.com/HTTPArchive/almanac.httparchive.org/issues?q=is%3Aissue%20is%3Aopen%20label%3A%222025%20chapter%22) looking for help. Alternatively, you can fill out [this interest form](https://forms.gle/Juz3Ak7RkV6oSBKNA) to express your interest. Check off all teams that interest you and give a detailed description of what your areas of expertise are so we can reach out to you with targeted opportunities.
 
+<!--
 In the meantime, enjoy the [2024 edition](https://almanac.httparchive.org) and we're still open to contributions in the form of [translations](https://github.com/HTTPArchive/almanac.httparchive.org/issues?q=is%3Aissue+is%3Aopen+label%3Atranslation), [development](https://github.com/HTTPArchive/almanac.httparchive.org/issues?q=is%3Aissue+is%3Aopen+label%3Adevelopment) or bug fixes.
+-->
 
 ## Where to find us
 

src/config/contributors.json

@@ -4081,6 +4081,9 @@
       ],
       "2022": [
         "translators"
+      ],
+      "2024": [
+        "translators"
       ]
     },
     "twitter": "beltway7",

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": "2025-03-03T00:00:00.000Z",
-    "hash": "626d029c7107a8fe569a02a06b2f5894"
+    "date_modified": "2025-05-15T00:00:00.000Z",
+    "hash": "67574c23a511f3149c90c88735c5a6f3"
   },
   "/static/js/web-vitals.js": {
     "date_published": "2020-11-13T00:00:00.000Z",
-    "date_modified": "2024-11-11T00:00:00.000Z",
-    "hash": "f6f30f40e7d014a2d38f1362c5eb6244"
+    "date_modified": "2025-05-15T00:00:00.000Z",
+    "hash": "224e4d80704c73222c7ea0cf1ea453e9"
   },
   "/static/js/webmentions.js": {
     "date_published": "2021-12-01T00:00:00.000Z",

src/package-lock.json

@@ -41,13 +41,13 @@
     "node-fetch": "3.3.2",
     "node-watch": "0.7.4",
     "prettier": "3.5.3",
-    "puppeteer": "24.8.1",
+    "puppeteer": "24.8.2",
     "rainbow-code": "2.1.7",
     "recursive-readdir": "2.2.3",
     "run-script-os": "1.1.6",
     "showdown": "2.1.0",
     "smartypants": "0.2.2",
-    "web-vitals": "4.2.4",
+    "web-vitals": "5.0.1",
     "xml-js": "1.6.11"
   }
 }

src/package.json

@@ -1,4 +1,4 @@
-flask==3.1.0
+flask==3.1.1
 flask-talisman==1.1.0
 gunicorn==23.0.0
 pytest==8.3.5
@@ -8,5 +8,5 @@ sqlfluff==3.4.0
 
 # sql/util/* dependencies
 pandas==2.2.3
-google-cloud-bigquery==3.31.0
+google-cloud-bigquery==3.32.0
 requests==2.32.3

src/requirements.txt

@@ -1,8 +1,6 @@
 feature_policy = {
-    "accelerometer": "'none'",
     "camera": "'none'",
     "geolocation": "'none'",
-    "gyroscope": "'none'",
     "magnetometer": "'none'",
     "microphone": "'none'",
     "payment": "'none'",

src/server/feature_policy.py

@@ -2,64 +2,14 @@
 
 function sendWebVitals() {
 
-  function getLoafAttribution(attribution) {
-    const loafEntriesLength = attribution?.longAnimationFrameEntries?.length || 0;
-    if (loafEntriesLength === 0) {
-      return {};
-    }
-
-    let loafAttribution = {
-      debug_loaf_script_total_duration: 0
-    };
-
-    // The last LoAF entry is usually the most relevant.
-    const loaf = attribution.longAnimationFrameEntries.at(-1);
-    const loafEndTime = loaf.startTime + loaf.duration;
-    loaf.scripts.forEach(script => {
-      if (script.duration <= loafAttribution.debug_loaf_script_total_duration) {
-        return;
-      }
-      loafAttribution = {
-        // Stats for the LoAF entry itself.
-        debug_loaf_entry_start_time: loaf.startTime,
-        debug_loaf_entry_end_time: loafEndTime,
-        debug_loaf_entry_work_duration: loaf.renderStart ? loaf.renderStart - loaf.startTime : loaf.duration,
-        debug_loaf_entry_render_duration: loaf.renderStart ? loafEndTime - loaf.renderStart : 0,
-        debug_loaf_entry_total_forced_style_and_layout_duration: loaf.scripts.reduce((sum, script) => sum + script.forcedStyleAndLayoutDuration, 0),
-        debug_loaf_entry_pre_layout_duration: loaf.styleAndLayoutStart ? loaf.styleAndLayoutStart - loaf.renderStart : 0,
-        debug_loaf_entry_style_and_layout_duration: loaf.styleAndLayoutStart ? loafEndTime - loaf.styleAndLayoutStart : 0,
-
-        // Stats for the longest script in the LoAF entry.
-        debug_loaf_script_total_duration: script.duration,
-        debug_loaf_script_compile_duration: script.executionStart - script.startTime,
-        debug_loaf_script_exec_duration: script.startTime + script.duration - script.executionStart,
-        debug_loaf_script_forced_style_and_layout_duration: script.forcedStyleAndLayoutDuration,
-        debug_loaf_script_type: script.invokerType,
-        debug_loaf_script_invoker: script.invoker,
-        debug_loaf_script_source_url: script.sourceURL,
-        debug_loaf_script_source_function_name: script.sourceFunctionName,
-        debug_loaf_script_source_char_position: script.sourceCharPosition,
-
-        // LoAF metadata.
-        debug_loaf_meta_length: loafEntriesLength,
-      }
-    });
-
-    if (!loafAttribution.debug_loaf_script_total_duration) {
-      return {};
-    }
-
-    // The LoAF script with the single longest total duration.
-    return Object.fromEntries(Object.entries(loafAttribution).map(([k, v]) => {
-      // Convert all floats to ints.
-      return [k, typeof v == 'number' ? Math.floor(v) : v];
-    }));
-  }
-
   function sendWebVitalsGAEvents({name, delta, value, id, attribution, navigationType}) {
 
     let overrides = {};
 
+    function roundIfNotNull(x) {
+      return x != null ? Math.round(x) : null;
+    }
+
     switch (name) {
       case 'CLS':
         overrides = {
@@ -76,18 +26,24 @@ function sendWebVitals() {
           debug_target: attribution.loadState || '(not set)',
         };
         break;
-      case 'FID':
       case 'INP': {
-        const loafAttribution = getLoafAttribution(attribution);
         overrides = {
           debug_event: attribution.interactionType,
-          debug_time: Math.round(attribution.interactionTime),
+          debug_time: roundIfNotNull(attribution.interactionTime),
           debug_load_state: attribution.loadState,
           debug_target: attribution.interactionTarget || '(not set)',
-          debug_interaction_delay: Math.round(attribution.inputDelay),
-          debug_processing_duration: Math.round(attribution.processingDuration),
-          debug_presentation_delay:  Math.round(attribution.presentationDelay),
-          ...loafAttribution
+          debug_interaction_delay: roundIfNotNull(attribution.inputDelay),
+          debug_processing_duration: roundIfNotNull(attribution.processingDuration),
+          debug_presentation_delay:  roundIfNotNull(attribution.presentationDelay),
+          debug_totalPaintDuration: roundIfNotNull(attribution.totalPaintDuration),
+          debug_totalScriptDuration: roundIfNotNull(attribution.totalScriptDuration),
+          debug_totalStyleAndLayoutDuration: roundIfNotNull(attribution.totalStyleAndLayoutDuration),
+          debug_totalUnattributedDuration: roundIfNotNull(attribution.totalUnattributedDuration),
+          debug_longestScriptIntersectingDuration: roundIfNotNull(attribution.longestScript?.intersectingDuration),
+          debug_longestScriptSubPart: attribution.longestScript?.subpart || null,
+          debug_longestScriptInvoker: attribution.longestScript?.entry.invoker || null,
+          debug_longestScriptInvokerType: attribution.longestScript?.entry.invokerType || null,
+          debug_longestScriptName: attribution.longestScript?.entry.name || null,
         };
         break;
       }
@@ -98,7 +54,7 @@ function sendWebVitals() {
           debug_resource_load_delay: attribution.resourceLoadDelay,
           debug_resource_load_time: attribution.resourceLoadTime,
           debug_element_render_delay: attribution.elementRenderDelay,
-          debug_target: attribution.element || '(not set)',
+          debug_target: attribution.target || '(not set)',
         };
         break;
       case 'TTFB':
@@ -163,7 +119,6 @@ function sendWebVitals() {
     webVitals.onLCP(sendWebVitalsGAEvents);
     webVitals.onCLS(sendWebVitalsGAEvents);
     webVitals.onTTFB(sendWebVitalsGAEvents);
-    webVitals.onFID(sendWebVitalsGAEvents);
     webVitals.onINP(sendWebVitalsGAEvents);
   } else {
     console.error('Web Vitals is not loaded!!');