Merge branch 'main' into cookies-2025

Author: tunetheweb

sql/2025/webassembly/counts.sql

@@ -1,16 +1,17 @@
-# Query for wasm requests' count with distinct wasm name
+# Query for wasm requests' count with distinct wasm origin name
 
 WITH wasmRequests AS (
   SELECT
     client,
+    page,
     CASE
       WHEN REGEXP_CONTAINS(url, r'/(hyphenopoly|patterns).*/[a-z-]{2,5}\.wasm')
         THEN '(hyphenopoly dictionary)'
       WHEN ENDS_WITH(url, '.unityweb')
         THEN '(unityweb app)'
       ELSE
         REGEXP_REPLACE(
-          REGEXP_EXTRACT(LOWER(url), r'.*/([^./?]*)'), -- lowercase & extract filename between last `/` and `.` or `?`
+          REGEXP_EXTRACT(LOWER(url), r'./([^./?])'), -- lowercase & extract filename between last `/` and `.` or `?`
           r'-[0-9a-f]{20,32}$', -- trim trailing hashes to transform `name-0abc43234[...]` to `name`
           ''
         )
@@ -25,7 +26,7 @@ WITH wasmRequests AS (
 SELECT
   client,
   COUNT(0) AS total_wasm,
-  COUNT(DISTINCT name) AS total_distinct_wasm
+  COUNT(DISTINCT NET.REG_DOMAIN(page)) AS distinct_origin
 FROM
   wasmRequests
 GROUP BY

sql/2025/webassembly/page_rankings.sql

@@ -1,22 +1,21 @@
-# Query to get count of pages which use wasm at page ranking intervals.
-
 SELECT
   client,
-  _rank AS rank_grouping,
+  rank_grouping,
   CASE
-    WHEN _rank = 100000000 THEN 'all'
-    ELSE CAST(_rank AS STRING)
+    WHEN rank_grouping = 100000000 THEN 'all'
+    ELSE CAST(rank_grouping AS STRING)
   END AS ranking,
   COUNT(DISTINCT page) AS pages
 FROM
   `httparchive.crawl.requests`,
-  UNNEST([1000, 10000, 100000, 1000000, 10000000, 100000000]) AS _rank
+  UNNEST([1000, 10000, 100000, 1000000, 10000000, 100000000]) AS rank_grouping
 WHERE
   date = '2025-07-01' AND
   type = 'wasm' AND
-  rank <= _rank
+  rank <= rank_grouping
 GROUP BY
   client,
-  rank
+  rank_grouping
 ORDER BY
-  rank
+  client,
+  rank_grouping

src/config/2025.json

@@ -51,18 +51,9 @@
         {
           "part": "I",
           "chapter_number": "6",
-          "title": "Interoperability",
-          "slug": "interoperability",
-          "hero_dir": "2022",
-          "todo": true
-        },
-        {
-          "part": "I",
-          "chapter_number": "7",
           "title": "Generative AI",
-          "slug": "generartive-ai",
-          "hero_dir": "2025",
-          "todo": true
+          "slug": "generative-ai",
+          "hero_dir": "2025"
         }
       ]
     },
@@ -72,49 +63,49 @@
       "chapters": [
         {
           "part": "II",
-          "chapter_number": "8",
+          "chapter_number": "7",
           "title": "SEO",
           "slug": "seo"
         },
         {
           "part": "II",
-          "chapter_number": "9",
+          "chapter_number": "8",
           "title": "Accessibility",
           "slug": "accessibility"
         },
         {
           "part": "II",
-          "chapter_number": "10",
+          "chapter_number": "9",
           "title": "Performance",
           "slug": "performance",
           "todo": true
         },
         {
           "part": "II",
-          "chapter_number": "11",
+          "chapter_number": "10",
           "title": "Privacy",
           "slug": "privacy",
           "hero_dir": "2020",
           "todo": true
         },
         {
           "part": "II",
-          "chapter_number": "12",
+          "chapter_number": "11",
           "title": "Security",
           "slug": "security",
           "todo": true
         },
         {
           "part": "II",
-          "chapter_number": "13",
+          "chapter_number": "12",
           "title": "Capabilities",
           "slug": "capabilities",
           "hero_dir": "2020",
           "todo": true
         },
         {
           "part": "II",
-          "chapter_number": "14",
+          "chapter_number": "13",
           "title": "PWA",
           "slug": "pwa",
           "todo": true
@@ -127,33 +118,17 @@
       "chapters": [
         {
           "part": "III",
-          "chapter_number": "15",
+          "chapter_number": "14",
           "title": "CMS",
           "slug": "cms",
           "todo": true
         },
         {
           "part": "III",
-          "chapter_number": "16",
+          "chapter_number": "15",
           "title": "Ecommerce",
           "slug": "ecommerce",
           "todo": true
-        },
-        {
-          "part": "III",
-          "chapter_number": "17",
-          "title": "Jamstack",
-          "slug": "jamstack",
-          "hero_dir": "2020",
-          "todo": true
-        },
-        {
-          "part": "III",
-          "chapter_number": "18",
-          "title": "Sustainability",
-          "slug": "sustainability",
-          "hero_dir": "2022",
-          "todo": true
         }
       ]
     },
@@ -163,36 +138,36 @@
       "chapters": [
         {
           "part": "IV",
-          "chapter_number": "19",
+          "chapter_number": "16",
           "title": "Page Weight",
           "slug": "page-weight",
           "todo": true
         },
         {
           "part": "IV",
-          "chapter_number": "20",
+          "chapter_number": "17",
           "title": "Caching",
           "slug": "Caching",
           "hero_dir": "2024",
           "todo": true
         },
         {
           "part": "IV",
-          "chapter_number": "21",
+          "chapter_number": "18",
           "title": "CDN",
           "slug": "cdn",
           "todo": true
         },
         {
           "part": "IV",
-          "chapter_number": "22",
+          "chapter_number": "19",
           "title": "Cookies",
           "slug": "cookies",
           "hero_dir": "2024"
         },
         {
           "part": "IV",
-          "chapter_number": "23",
+          "chapter_number": "20",
           "title": "DNS",
           "slug": "dns",
           "hero_dir": "2025",