Fix merge

package.json

@@ -2,8 +2,7 @@
   "dependencies": {
     "@prantlf/jsonlint": "^10.2.0",
     "adm-zip": "^0.4.16",
-    "convert-svg-to-png": "^0.5.0",
+    "convert-svg-to-png": "^0.5.0"
-    "languagedetect": "^2.0.0"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config": "^3.1.0",

src/apps.json

@@ -1650,7 +1650,7 @@
       "meta": {
         "generator": "^Blogger$"
       },
-      "url": "^https?://[^/]+\\.blogspot\\.com",
+      "url": "^https?://[^/]+\\.(blogspot|blogger)\\.com",
       "website": "http://www.blogger.com"
     },
     "Bloomreach": {
@@ -3373,6 +3373,19 @@
       "script": "googletagservices\\.com/tag/js/gpt(?:_mobile)?\\.js",
       "website": "http://www.google.com/dfp"
     },
+    "Duopana": {
+      "cats": [
+        1,
+        11,
+        51,
+        53,
+        61
+      ],
+      "html": "(?:<!-- \/*BeraCode script)",
+      "icon": "Duopana.svg",
+      "script": "\\*berajs.beracode.com\\*",
+      "website": "https://duopana.com/"
+    },
     "DovetailWRP": {
       "cats": [
         1
@@ -3473,12 +3486,14 @@
       "cats": [
         10
       ],
-      "headers": {
-        "X-dynaTrace-JS-Agent": ""
-      },
       "icon": "Dynatrace.png",
-      "script": "dtagent.*\\.js",
+      "js": {
-      "website": "http://dynatrace.com"
+        "dtrum": ""
+      },
+      "cookies": {
+        "dtCookie1": ""
+      },
+      "website": "https://www.dynatrace.com"
     },
     "EC-CUBE": {
       "cats": [
@@ -5443,6 +5458,9 @@
         "_hsq": "",
         "hubspot": ""
       },
+      "meta": {
+        "generator": "HubSpot"
+      },
       "website": "https://www.hubspot.com"
     },
     "Hugo": {
@@ -10141,14 +10159,6 @@
       "script": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
       "website": "https://rubyonrails.org"
     },
-    "Ruxit": {
-      "cats": [
-        10
-      ],
-      "icon": "Ruxit.png",
-      "script": "ruxitagentjs",
-      "website": "http://ruxit.com"
-    },
     "RxJS": {
       "cats": [
         12
@@ -10437,6 +10447,16 @@
       "icon": "Scala.png",
       "website": "http://www.scala-lang.org"
     },
+    "Scaleway": {
+      "cats": [
+        19
+      ],
+      "icon": "Scaleway.png",
+      "website": "https://www.scaleway.com/",
+      "html": [
+        "scw.cloud"
+      ]
+    },
     "Scenari": {
       "cats": [
         1,
@@ -11101,6 +11121,19 @@
       "script": "snap\\.svg(?:-min)?\\.js",
       "website": "http://snapsvg.io"
     },
+    "Snipcart": {
+      "cats": [6],
+      "website": "https://snipcart.com/",
+      "icon": "Snipcart.png", 
+      "cookies": {
+        "snipcart-cart": ""
+      },
+      "html": [
+        "<link [^>]*href=\".*snipcart\\.css\"",
+        "<div [^>]*id=\".*snipcart.*\""
+      ],
+      "script": "https://cdn\\.snipcart\\.com/themes/v([\\w.]+)/default/snipcart\\.js\\;version:\\1" 
+    },
     "Snoobi": {
       "cats": [
         10
@@ -13361,7 +13394,10 @@
         "generator": "^WordPress ?([\\d.]+)?\\;version:\\1",
         "shareaholic:wp_version": ""
       },
-      "script": "/wp-(?:content|includes)/",
+      "script": [
+        "/wp-(?:content|includes)/",
+        "wp-embed\\.min\\.js\\?ver=([\\d.]+)\\;version:\\1"
+      ],
       "website": "https://wordpress.org"
     },
     "WordPress Super Cache": {
@@ -15301,6 +15337,17 @@
         "generator": "xt:Commerce"
       },
       "website": "https://www.xt-commerce.com"
+    },
+    "hantana": {
+      "cats": [
+        10
+      ],
+      "icon": "hantana.png",
+      "js": {
+        "Hantana": ""
+      },
+      "script": "//hantana\\.org/widget",
+      "website": "https://hantana.org/"
     }
   },
   "categories": {

src/drivers/webextension/images/icons/Duopana.svg

@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.4688 25.0011C25.2172 27.7251 13.6558 30.3464 8.28806 23.9989C6.61063 21.9944 5.7332 19.3731 5.42352 16.5977C2.1977 17.8569 0.107359 19.8357 0.00413197 22.1229C-0.202321 26.3631 7.35902 37.2336 15.6688 37.6191C23.9785 38.0045 29.914 27.8022 30.0947 23.5363C30.1205 23.0994 30.0689 22.6882 29.9398 22.2771C29.7334 23.4078 29.243 24.3329 28.4688 25.0011Z" fill="#6F2680"/>
+<path d="M15.4365 15.1586C22.9204 15.5184 28.985 18.5765 29.9914 22.2771C30.714 18.7564 28.7527 13.3597 24.7011 8.55406C19.3075 2.20653 12.3139 -0.723094 9.06225 2.02665C6.81707 3.90264 4.77835 10.5585 5.42351 16.5977C8.13321 15.5441 11.6429 14.9787 15.4365 15.1586Z" fill="#F7C526"/>
+<path d="M28.4689 25.0011C29.2431 24.3329 29.7592 23.4078 29.9914 22.3028C28.985 18.6022 22.9204 15.5441 15.4365 15.1843C11.6429 15.0044 8.13323 15.5698 5.44934 16.6234C5.75902 19.3988 6.61064 22.0201 8.31388 24.0246C13.63 30.3464 25.1914 27.7251 28.4689 25.0011Z" fill="#F53081"/>
+</svg>

src/drivers/webextension/js/inject.js

@@ -19,7 +19,9 @@
                 .split('.')
                 .reduce(
                   (value, method) =>
-                    value && value.hasOwnProperty(method)
+                    value &&
+                    value instanceof Object &&
+                    value.hasOwnProperty(method)
                       ? value[method]
                       : undefined,
                   window

yarn.lock

@@ -1186,11 +1186,6 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-languagedetect@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/languagedetect/-/languagedetect-2.0.0.tgz#4b8fa2b7593b2a3a02fb1100891041c53238936c"
-  integrity sha512-AZb/liiQ+6ZoTj4f1J0aE6OkzhCo8fyH+tuSaPfSo8YHCWLFJrdSixhtO2TYdIkjcDQNaR4RmGaV2A5FJklDMQ==
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"