Fix Google Analytics, Google Ads Conversion Tracking detection

src/technologies/a.json

@@ -606,8 +606,8 @@
     "headers": {
       "via": "Acquia Platform CDN (.+)\\;version:\\1"
     },
-    "implies": "Acquia Cloud Platform",
     "icon": "acquia-cloud-platform.svg",
+    "implies": "Acquia Cloud Platform",
     "saas": true,
     "website": "https://docs.acquia.com/cloud-platform/platformcdn/"
   },
@@ -2858,14 +2858,14 @@
     ],
     "description": "Animate.css is a ready-to-use library collection of CSS3 animation effects.",
     "dom": {
-      "link[href*='animate']": {
+      ".animate__animated": {
         "attributes": {
-          "href": "([\\d\\.]+)?/animate\\.min\\.css\\;version:\\1"
+          "class": "\\;confidence:99"
         }
       },
-      ".animate__animated": {
+      "link[href*='animate']": {
         "attributes": {
-          "class": "\\;confidence:99"
+          "href": "([\\d\\.]+)?/animate\\.min\\.css\\;version:\\1"
         }
       }
     },

src/technologies/c.json

@@ -1192,30 +1192,11 @@
     "scriptSrc": "js\\.chilipiper\\.com/marketing\\.js",
     "website": "https://www.chilipiper.com/"
   },
-  "Chinese Menu Online": {
-    "cats": [
-      51,
-      93
-    ],
-    "description": "Chinese Menu Online is an online food ordering service.",
-    "dom": "li > a[href*='chinesemenuonline.com']",
-    "icon": "Chinese Menu Online.png",
-    "pricing": [
-      "payg"
-    ],
-    "saas": true,
-    "website": "https://www.chinesemenuonline.com"
-  },
   "Chimpmatic": {
     "cats": [
       87
     ],
     "description": "Chimpmatic is a premium Contact Form 7 and Mailchimp integration plugin.",
-    "icon": "default.svg",
-    "implies": [
-      "Contact Form 7",
-      "MailChimp"
-    ],
     "dom": {
       "form[class*='chimpmatic']": {
         "attributes": {
@@ -1223,14 +1204,33 @@
         }
       }
     },
-    "saas": true,
+    "icon": "default.svg",
+    "implies": [
+      "Contact Form 7",
+      "MailChimp"
+    ],
     "pricing": [
       "low",
       "recurring"
     ],
     "requires": "WordPress",
+    "saas": true,
     "website": "https://chimpmatic.com"
   },
+  "Chinese Menu Online": {
+    "cats": [
+      51,
+      93
+    ],
+    "description": "Chinese Menu Online is an online food ordering service.",
+    "dom": "li > a[href*='chinesemenuonline.com']",
+    "icon": "Chinese Menu Online.png",
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "website": "https://www.chinesemenuonline.com"
+  },
   "Chitika": {
     "cats": [
       36
@@ -1407,15 +1407,15 @@
     "description": "Clarip is an enterprise data privacy and risk management platform.",
     "icon": "Clarip.png",
     "js": {
-      "pageData.claripConsentJSUrl": "",
       "claripCdnHost": "",
-      "claripHost": ""
+      "claripHost": "",
+      "pageData.claripConsentJSUrl": ""
     },
-    "scriptSrc": "//cdn\\.clarip\\.com/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "//cdn\\.clarip\\.com/",
     "website": "https://www.clarip.com"
   },
   "Claris FileMaker": {
@@ -1946,23 +1946,6 @@
     "saas": true,
     "website": "https://www.coconstruct.com"
   },
-  "CoreUI": {
-    "cats": [
-      66
-    ],
-    "description": "CoreUI provides cloud hosting, web and mobile design, animations, wireframes, and UX testing services.",
-    "icon": "CoreUI.svg",
-    "js": {
-      "coreui": ""
-    },
-    "scripts": "webpackJsonp@coreui/coreui",
-    "pricing": [
-      "mid",
-      "recurring"
-    ],
-    "saas": true,
-    "website": "https://coreui.io"
-  },
   "CoRover": {
     "cats": [
       52
@@ -2484,33 +2467,19 @@
     "scriptSrc": "\\.conferwith\\.io/",
     "website": "https://conferwith.io"
   },
-  "Conjured": {
-    "cats": [
-      100
-    ],
-    "description": "Conjured provides Shopify brands with Shopify apps and custom development.",
-    "icon": "Conjured.png",
-    "pricing": [
-      "recurring",
-      "mid"
-    ],
-    "saas": true,
-    "scriptSrc": "app\\.conjured\\.co/",
-    "website": "https://conjured.co"
-  },
   "Congressus": {
     "cats": [
       1
     ],
+    "cookies": {
+      "_gat_congressus_analytics": "",
+      "congressus_session": ""
+    },
     "description": "Congressus is a Dutch-language online application for member administration, financial management, communication and a linked website with webshop.",
     "icon": "Congressus.svg",
     "meta": {
       "generator": "^Congressus\\s-\\s.+$"
     },
-    "cookies": {
-      "congressus_session": "",
-      "_gat_congressus_analytics": ""
-    },
     "pricing": [
       "recurring",
       "low"
@@ -2518,6 +2487,20 @@
     "saas": true,
     "website": "https://congressus.nl"
   },
+  "Conjured": {
+    "cats": [
+      100
+    ],
+    "description": "Conjured provides Shopify brands with Shopify apps and custom development.",
+    "icon": "Conjured.png",
+    "pricing": [
+      "recurring",
+      "mid"
+    ],
+    "saas": true,
+    "scriptSrc": "app\\.conjured\\.co/",
+    "website": "https://conjured.co"
+  },
   "Connectif": {
     "cats": [
       76,
@@ -3033,6 +3016,23 @@
     "scriptSrc": "copypoison\\.com/cp\\.js",
     "website": "https://copypoison.com/"
   },
+  "CoreUI": {
+    "cats": [
+      66
+    ],
+    "description": "CoreUI provides cloud hosting, web and mobile design, animations, wireframes, and UX testing services.",
+    "icon": "CoreUI.svg",
+    "js": {
+      "coreui": ""
+    },
+    "pricing": [
+      "mid",
+      "recurring"
+    ],
+    "saas": true,
+    "scripts": "webpackJsonp@coreui/coreui",
+    "website": "https://coreui.io"
+  },
   "Corebine": {
     "cats": [
       1

src/technologies/g.json

@@ -1383,6 +1383,7 @@
     ],
     "description": "Google Ads Conversion Tracking is a free tool that shows you what happens after a customer interacts with your ads.",
     "icon": "Google.svg",
+    "implies": "Google Ads",
     "js": {
       "google_trackConversion": ""
     },
@@ -1391,6 +1392,7 @@
     ],
     "saas": true,
     "scriptSrc": "\\.googleadservices\\.com/pagead/conversion_async\\.js",
+    "scripts": "gtag\\([^)]+'(AW-)",
     "website": "https://support.google.com/google-ads/answer/1722022"
   },
   "Google Analytics": {
@@ -1403,7 +1405,7 @@
       "_gat": ""
     },
     "description": "Google Analytics is a free web analytics service that tracks and reports website traffic.",
-    "html": "<amp-analytics [^>]*type=[\"']googleanalytics[\"']",
+    "dom": "amp-analytics[type*=googleanalytics]",
     "icon": "Google Analytics.svg",
     "js": {
       "GoogleAnalyticsObject": "",
@@ -1413,6 +1415,10 @@
       "google-analytics\\.com/(?:ga|urchin|analytics)\\.js",
       "googletagmanager\\.com/gtag/js"
     ],
+    "scripts": [
+      "gtag\\([^)]+'(UA-)\\;version:\\1?UA:",
+      "gtag\\([^)]+'(G-)\\;version:\\1?GA4:"
+    ],
     "website": "http://google.com/analytics"
   },
   "Google Analytics Enhanced eCommerce": {

src/technologies/m.json

@@ -619,9 +619,9 @@
       59
     ],
     "description": "Mantine is a React components library.",
+    "dom": "style[data-emotion='mantine-global'], style[data-emotion='mantine']",
     "icon": "Mantine.svg",
     "implies": "TypeScript",
-    "dom": "style[data-emotion='mantine-global'], style[data-emotion='mantine']",
     "oss": true,
     "website": "https://mantine.dev"
   },

src/technologies/p.json

@@ -1396,8 +1396,8 @@
       68
     ],
     "description": "Piman is an open-source accessibility UI framework create by Blueplanet Inc.",
-    "icon": "Piman.svg",
     "dom": "button.bpa-btn",
+    "icon": "Piman.svg",
     "oss": true,
     "website": "https://ya-sai.github.io/piman/"
   },

src/technologies/w.json

@@ -1011,10 +1011,10 @@
     "description": "Pearl Theme for Magento 2 by WeltPixel. Pearl Theme is following the Magento architecture, layouts and best practice in order to assure highest compatibility with 3rd party extensions.",
     "dom": "body.theme-pearl",
     "icon": "WeltPixel.svg",
+    "implies": "Magento\\;version:2",
     "js": {
       "Pearl": ""
     },
-    "implies": "Magento\\;version:2",
     "pricing": [
       "high",
       "onetime"