Merge branch 'AliasIO:master' into oceanwp

src/drivers/npm/driver.js

@@ -1002,12 +1002,9 @@ class Site {
     if (this.cache[url.href]) {
       const resolved = resolve(this.detections)
 
-      const requires = Wappalyzer.requires
+      const requires = Wappalyzer.requires.filter(({ name, technologies }) =>
-        .filter(({ name, technologies }) =>
+        resolved.some(({ name: _name }) => _name === name)
-          resolved.some(({ name: _name }) => _name === name)
+      )
-        )
-        .map(({ technologies }) => technologies)
-        .flat()
 
       await Promise.all(
         Object.keys(requires).map(async (name) => {

src/drivers/webextension/_locales/ca/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/de/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/el/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/en/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/es/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/fa/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/fr/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/gl_ES/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/gr/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/id/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/it/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/ja/messages.json

@@ -51,6 +51,8 @@
 	"attributeIpRegion":               { "message": "IP region" },
 	"attributeLanguage":               { "message": "言語" },
 	"attributeEmail":                  { "message": "Eメールアドレス" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
 	"attributePhone":                  { "message": "電話番号" },
 	"attributeSkype":                  { "message": "Skype" },
 	"attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/ko/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP 지역" },
   "attributeLanguage":               { "message": "언어" },
   "attributeEmail":                  { "message": "이메일 주소" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "휴대폰 번호" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/pl/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/pt/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/pt_BR/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/ro/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/ru/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/sk/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/tr/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/uk/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/uz/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/zh_CN/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/_locales/zh_TW/messages.json

@@ -51,6 +51,8 @@
   "attributeIpRegion":               { "message": "IP region" },
   "attributeLanguage":               { "message": "Language" },
   "attributeEmail":                  { "message": "Email address" },
+  "attributeVerifiedEmail":          { "message": "Email address (verified)" },
+  "attributeSafeEmail":              { "message": "Email address (safe)" },
   "attributePhone":                  { "message": "Phone number" },
   "attributeSkype":                  { "message": "Skype" },
   "attributeWhatsapp":               { "message": "WhatsApp" },

src/drivers/webextension/js/popup.js

@@ -145,19 +145,16 @@ const Popup = {
         Popup.driver('getDetections').then(Popup.onGetDetections.bind(this))
       })
 
-      el.termsButtonDecline('.terms__button--decline').addEventListener(
+      el.termsButtonDecline.addEventListener('click', async () => {
-        'click',
+        await setOption('termsAccepted', true)
-        async () => {
+        await setOption('tracking', false)
-          await setOption('termsAccepted', true)
-          await setOption('tracking', false)
 
-          el.terms.classList.add('terms--hidden')
+        el.terms.classList.add('terms--hidden')
-          el.footer.classList.remove('footer--hidden')
+        el.footer.classList.remove('footer--hidden')
-          el.tabPro.classList.remove('tab--disabled')
+        el.tabPro.classList.remove('tab--disabled')
 
-          Popup.driver('getDetections').then(Popup.onGetDetections.bind(this))
+        Popup.driver('getDetections').then(Popup.onGetDetections.bind(this))
-        }
+      })
-      )
     }
 
     let url