Merge branch 'main' into main

Author: max-ostapenko

definitions/output/reports/tech_report_categories.js

@@ -71,7 +71,7 @@ technology_stats AS (
   SELECT
     technology,
     category_obj AS categories,
-    SUM(origins.mobile + origins.desktop) AS total_origins
+    origins.mobile AS mobile_origins
   FROM ${ctx.ref('reports', 'tech_report_technologies')}
   GROUP BY
     technology,
@@ -82,7 +82,7 @@ SELECT
   category,
   description,
   origins,
-  ARRAY_AGG(technology IGNORE NULLS ORDER BY technology_stats.total_origins DESC) AS technologies
+  ARRAY_AGG(technology IGNORE NULLS ORDER BY technology_stats.mobile_origins DESC) AS technologies
 FROM category_stats
 INNER JOIN technology_stats
 ON category_stats.category IN UNNEST(technology_stats.categories)

infra/bigquery-export/package-lock.json

@@ -8,7 +8,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@google-cloud/bigquery": "8.0.0",
+    "@google-cloud/bigquery": "8.1.0",
     "@google-cloud/firestore": "7.11.1",
     "@google-cloud/storage": "7.16.0"
   },

infra/bigquery-export/package.json

@@ -4,7 +4,7 @@
   "author": "@max-ostapenko",
   "main": "index.js",
   "dependencies": {
-    "@google-cloud/bigquery": "8.0.0",
+    "@google-cloud/bigquery": "8.1.0",
     "@google-cloud/dataform": "2.1.0",
     "@google-cloud/functions-framework": "4.0.0"
   },

infra/dataform-trigger/package-lock.json

@@ -2,7 +2,7 @@
   "name": "crawl-data",
   "author": "@max-ostapenko",
   "dependencies": {
-    "@dataform/core": "3.0.21"
+    "@dataform/core": "3.0.22"
   },
   "scripts": {
     "format": "npx standard --fix; npx markdownlint --ignore-path .gitignore --config package.json --configPointer /markdownlint . --fix; terraform -chdir=infra/tf fmt -recursive",