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

tunetheweb · tunetheweb · commit f79361b9409d · 2024-11-30T09:16:53.000Z
diff --git a/src/config/contributors.json b/src/config/contributors.json
@@ -1984,7 +1984,7 @@
   "pgjaiganesh": {
     "avatar_url": "1788195",
     "github": "pgjaiganesh",
-    "name": "Jaiganesh Girinatha",
+    "name": "Jaiganesh Girinathan",
     "teams": {
       "2024": [
         "analysts",
diff --git a/src/config/last_updated.json b/src/config/last_updated.json
@@ -753,8 +753,8 @@
   },
   "en/2024/chapters/accessibility.html": {
     "date_published": "2024-11-11T00:00:00.000Z",
-    "date_modified": "2024-11-22T00:00:00.000Z",
-    "hash": "db405edaff762e930358c9471d3fd358"
+    "date_modified": "2024-11-30T00:00:00.000Z",
+    "hash": "d437f8d0a37f119170da4d0eb0b1bfe9"
   },
   "en/2024/chapters/cdn.html": {
     "date_published": "2024-11-11T00:00:00.000Z",
@@ -848,13 +848,13 @@
   },
   "en/2024/chapters/sustainability.html": {
     "date_published": "2024-11-11T00:00:00.000Z",
-    "date_modified": "2024-11-18T00:00:00.000Z",
-    "hash": "bb49d876d3e33811819746edc96ed447"
+    "date_modified": "2024-11-30T00:00:00.000Z",
+    "hash": "48be7a85f0dfefe06c709a2ff9f5449b"
   },
   "en/2024/chapters/third-parties.html": {
     "date_published": "2024-11-21T00:00:00.000Z",
-    "date_modified": "2024-11-21T00:00:00.000Z",
-    "hash": "075bec99b73be68c6fa7b97b97808182"
+    "date_modified": "2024-11-30T00:00:00.000Z",
+    "hash": "f5e703ed3f81f6969d2000e33d06a7fd"
   },
   "en/2024/chapters/webassembly.html": {
     "date_published": "2024-11-11T00:00:00.000Z",
diff --git a/src/content/en/2024/accessibility.md b/src/content/en/2024/accessibility.md
@@ -15,7 +15,7 @@ featured_quote: Most modern governments have committed to either WCAG 2.0 AA or
 featured_stat_1: 40%
 featured_stat_label_1: Of desktop sites and 39% of mobile sites have at least one `role="presentation"`.
 featured_stat_2: 0.1%
-featured_stat_label_2: Sites with `<audio>` elements include a `<track>` element.
+featured_stat_label_2: Sites with `<audio>` elements that include a `<track>` element.
 featured_stat_3: 57%
 featured_stat_label_3: Mobile sites passing the Lighthouse audit for properly ordered headings.
 doi: 10.5281/zenodo.14063775
diff --git a/src/content/en/2024/sustainability.md b/src/content/en/2024/sustainability.md
@@ -123,6 +123,7 @@ For further information on specific regulations and standards, refer to:
 - <a hreflang="en" href="https://w3c.github.io/sustyweb/star.html">WSG: Draft Sustainable Tooling And Reporting (STAR) 1.0</a>
 - <a hreflang="en" href="https://www.globalreporting.org/how-to-use-the-gri-standards/gri-standards-english-language/">GRI: Global Reporting Initiative</a>
 - <a hreflang="en" href="https://gr491.isit-europe.org/en/">GR491, The Handbook of sustainable design of digital services | ISIT</a>
+- <a hreflang="en" href="https://github.com/cnumr/best-practices/blob/main/README.en.md">WERF: Web Ecodesign Reference Framework</a>
 - <a hreflang="en" href="https://apolitical.co/solution-articles/en/keeping-tech-sustainable">Apolitical: Keeping tech sustainable</a>
 
 ## Evaluating the environmental impact of websites
diff --git a/src/content/en/2024/third-parties.md b/src/content/en/2024/third-parties.md
@@ -13,7 +13,7 @@ Yash-Vekaria_bio: Yash Vekaria is a PhD candidate in Computer Science at <a href
 zubairshafiq_bio: Zubair Shafiq is a computer science professor at <a hreflang="en" href="https://www.ucdavis.edu/">University of California, Davis</a>. His research aims to make the Internet private, secure, and safe using empirically grounded measurement and modeling methods.
 ChrisBeeti_bio: Chris Böttger is a PhD candidate in Computer Science at the <a hreflang="en" href="https://www.en.w-hs.de/">Westphalian University of Applied Science</a>. His research focuses on web and network security, primarily focusing on user privacy and tracking technologies.
 results: https://docs.google.com/spreadsheets/d/18uTDBygSqgT_PNFldOz4guLSuXyMzDthRGnAG5if4sU/
-featured_quote: Google is the most popular third-parties on the web, with five of the top ten third-party domains being Google domains.
+featured_quote: Google is the most popular third party on the web, with five of the top ten third-party domains being Google domains.
 featured_stat_1: 92%
 featured_stat_label_1: Web pages including one or more third parties
 featured_stat_2: 78
@@ -194,6 +194,6 @@ When we look specifically at `googletagmanager.com`, one of the top third-party
 
 Our findings show the ubiquitous and complex nature of third-parties on the web. We find that the use of third parties on the web is more common than ever before. More than nine-in-ten web pages include one or more third-parties, often indirectly.
 
-We find that third parties are often not directly included by the first party. Nearly one-third of third parties on all web pages are used for advertising, analytics, and consent management. Google is the most popular third-parties on the web, with five of the top ten third-party domains being Google domains, such as `googleapis.com`, `googletagmanager.com`, `google.com`, `google-analytics.com`, and `youtube.com`.
+We find that third parties are often not directly included by the first party. Nearly one-third of third parties on all web pages are used for advertising, analytics, and consent management. Google is the most popular third party on the web, with five of the top ten third-party domains being Google domains: `googleapis.com`, `googletagmanager.com`, `google.com`, `google-analytics.com`, and `youtube.com`.
 
 The inclusion of third-parties presents privacy, security, and performance implications that should be considered by web developers.
diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -40,7 +40,7 @@
     "jsdom": "25.0.1",
     "node-fetch": "3.3.2",
     "node-watch": "0.7.4",
-    "prettier": "3.3.3",
+    "prettier": "3.4.1",
     "puppeteer": "23.9.0",
     "rainbow-code": "2.1.7",
     "recursive-readdir": "2.2.3",
diff --git a/src/requirements.txt b/src/requirements.txt
@@ -7,6 +7,6 @@ pytest-cov==5.0.0
 sqlfluff==1.4.5
 
 # sql/util/* dependencies
-pandas==2.2.2
+pandas==2.2.3
 google-cloud-bigquery==3.25.0
 requests==2.32.3
diff --git a/src/server/helpers.py b/src/server/helpers.py
@@ -306,7 +306,7 @@ def accentless_sort(value):
 def get_file_date_info(file, type):
     timestamps_config = get_timestamps_config()
     # Default Published and Last Updated to today
-    today = datetime.datetime.utcnow().isoformat(timespec='milliseconds')
+    today = datetime.datetime.now(datetime.UTC).isoformat(timespec='milliseconds')
     if type == "date_published" or type == "date_modified":
         return timestamps_config.get(file, {}).get(type, today)
     else:
diff --git a/src/templates/en/base.html b/src/templates/en/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Markup",
     "media": "Media",
     "third-parties": "Third Parties",
diff --git a/src/templates/es/base.html b/src/templates/es/base.html
@@ -176,6 +176,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Marcado Web",
     "media": "Media",
     "third-parties": "Contenido de Terceros",
diff --git a/src/templates/fr/base.html b/src/templates/fr/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Balisage Web",
     "media": "Média",
     "third-parties": "Tierces Parties",
diff --git a/src/templates/hi/base.html b/src/templates/hi/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "मार्कअप",
     "media": "मीडिया",
     "third-parties": "तीसरे पक्ष",
diff --git a/src/templates/it/base.html b/src/templates/it/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Markup",
     "media": "Media",
     "third-parties": "Terze parti",
diff --git a/src/templates/ja/base.html b/src/templates/ja/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "マークアップ",
     "media": "メディア",
     "third-parties": "サードパーティ",
diff --git a/src/templates/nl/base.html b/src/templates/nl/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Opmaak",
     "media": "Media",
     "third-parties": "Derden",
diff --git a/src/templates/pt/base.html b/src/templates/pt/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Marcação",
     "media": "Mídia",
     "third-parties": "Terceiros",
diff --git a/src/templates/ru/base.html b/src/templates/ru/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Разметка",
     "media": "Медиа",
     "third-parties": "Сторонний код",
diff --git a/src/templates/tr/base.html b/src/templates/tr/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Markup",
     "media": "Media",
     "third-parties": "Üçüncü Partiler",
diff --git a/src/templates/uk/base.html b/src/templates/uk/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "Розмітка",
     "media": "Медіа",
     "third-parties": "Сторонні ресурси",
diff --git a/src/templates/zh-CN/base.html b/src/templates/zh-CN/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "标记",
     "media": "媒体",
     "third-parties": "第三方",
diff --git a/src/templates/zh-TW/base.html b/src/templates/zh-TW/base.html
@@ -177,6 +177,7 @@
   set localizedChapterTitles = {
     "javascript": "JavaScript",
     "css": "CSS",
+    "cookies": "Cookies",
     "markup": "標記",
     "media": "媒體",
     "third-parties": "第三方",
diff --git a/src/tools/scripts/run_and_test_website.bat b/src/tools/scripts/run_and_test_website.bat
@@ -26,7 +26,8 @@ echo "Building website"
 call npm run generate
 
 echo "Starting website"
-start python main.py
+rem # Can remove -Xutf8 argument after Python 3.15 is everywhere - https://peps.python.org/pep-0686/
+start python -Xutf8 main.py
 rem # Sleep for 5 seconds to make sure server is up
 timeout /t 5 /nobreak
 rem # Use sleep as well in case running in GitBash where above command fails
