From 605f3852bb9857e73c038f54531b34ee3c7d1077 Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Thu, 8 Jul 2021 19:40:14 +1000 Subject: [PATCH 1/2] Fix "requires" in NPM driver --- src/drivers/npm/driver.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js index 35ec8a2a8..826384929 100644 --- a/src/drivers/npm/driver.js +++ b/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 - .filter(({ name, technologies }) => - resolved.some(({ name: _name }) => _name === name) - ) - .map(({ technologies }) => technologies) - .flat() + const requires = Wappalyzer.requires.filter(({ name, technologies }) => + resolved.some(({ name: _name }) => _name === name) + ) await Promise.all( Object.keys(requires).map(async (name) => { From b5c8fe532d297d5ad44e4fdc2ba4af995063146c Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Thu, 8 Jul 2021 19:43:33 +1000 Subject: [PATCH 2/2] Fix merge --- .../webextension/_locales/ca/messages.json | 2 ++ .../webextension/_locales/de/messages.json | 2 ++ .../webextension/_locales/el/messages.json | 2 ++ .../webextension/_locales/en/messages.json | 2 ++ .../webextension/_locales/es/messages.json | 2 ++ .../webextension/_locales/fa/messages.json | 2 ++ .../webextension/_locales/fr/messages.json | 2 ++ .../webextension/_locales/gl_ES/messages.json | 2 ++ .../webextension/_locales/gr/messages.json | 2 ++ .../webextension/_locales/id/messages.json | 2 ++ .../webextension/_locales/it/messages.json | 2 ++ .../webextension/_locales/ja/messages.json | 2 ++ .../webextension/_locales/ko/messages.json | 2 ++ .../webextension/_locales/pl/messages.json | 2 ++ .../webextension/_locales/pt/messages.json | 2 ++ .../webextension/_locales/pt_BR/messages.json | 2 ++ .../webextension/_locales/ro/messages.json | 2 ++ .../webextension/_locales/ru/messages.json | 2 ++ .../webextension/_locales/sk/messages.json | 2 ++ .../webextension/_locales/tr/messages.json | 2 ++ .../webextension/_locales/uk/messages.json | 2 ++ .../webextension/_locales/uz/messages.json | 2 ++ .../webextension/_locales/zh_CN/messages.json | 2 ++ .../webextension/_locales/zh_TW/messages.json | 2 ++ src/drivers/webextension/js/popup.js | 19 ++++++++----------- 25 files changed, 56 insertions(+), 11 deletions(-) diff --git a/src/drivers/webextension/_locales/ca/messages.json b/src/drivers/webextension/_locales/ca/messages.json index 4abf3f187..d382b94e7 100644 --- a/src/drivers/webextension/_locales/ca/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/de/messages.json b/src/drivers/webextension/_locales/de/messages.json index 6fa57f57e..76d4b9506 100644 --- a/src/drivers/webextension/_locales/de/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json index d081e7248..1012cd7ca 100644 --- a/src/drivers/webextension/_locales/el/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json index 59f58dfa2..142891b7a 100644 --- a/src/drivers/webextension/_locales/en/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json index 8f26d5757..018ba6409 100644 --- a/src/drivers/webextension/_locales/es/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/fa/messages.json b/src/drivers/webextension/_locales/fa/messages.json index 05ddfa5c8..ce9442213 100644 --- a/src/drivers/webextension/_locales/fa/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json index 3c3674338..bae622379 100644 --- a/src/drivers/webextension/_locales/fr/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/gl_ES/messages.json b/src/drivers/webextension/_locales/gl_ES/messages.json index 578a6b1d6..d00a755c5 100644 --- a/src/drivers/webextension/_locales/gl_ES/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json index 6d1f5ba95..93de33be6 100644 --- a/src/drivers/webextension/_locales/gr/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/id/messages.json b/src/drivers/webextension/_locales/id/messages.json index e5c8301fa..0cea2e6c1 100644 --- a/src/drivers/webextension/_locales/id/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json index f42d0d0fe..26d05c6db 100644 --- a/src/drivers/webextension/_locales/it/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/ja/messages.json b/src/drivers/webextension/_locales/ja/messages.json index e4da2a79c..3427f7ed3 100644 --- a/src/drivers/webextension/_locales/ja/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/ko/messages.json b/src/drivers/webextension/_locales/ko/messages.json index df970e38e..d0a419b2c 100644 --- a/src/drivers/webextension/_locales/ko/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/pl/messages.json b/src/drivers/webextension/_locales/pl/messages.json index d869ce66e..59b54b663 100644 --- a/src/drivers/webextension/_locales/pl/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/pt/messages.json b/src/drivers/webextension/_locales/pt/messages.json index 0921f9b27..6e21ae7f7 100644 --- a/src/drivers/webextension/_locales/pt/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/pt_BR/messages.json b/src/drivers/webextension/_locales/pt_BR/messages.json index 299969804..879502590 100644 --- a/src/drivers/webextension/_locales/pt_BR/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json index 4c253c69c..a57cb791f 100644 --- a/src/drivers/webextension/_locales/ro/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json index 687ddca32..6e16c4b59 100644 --- a/src/drivers/webextension/_locales/ru/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json index e20832a02..1a98108c5 100644 --- a/src/drivers/webextension/_locales/sk/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/tr/messages.json b/src/drivers/webextension/_locales/tr/messages.json index 619ea9bc3..8a4f6e0fe 100644 --- a/src/drivers/webextension/_locales/tr/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/uk/messages.json b/src/drivers/webextension/_locales/uk/messages.json index dad6d7ec5..c7d649b22 100644 --- a/src/drivers/webextension/_locales/uk/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/uz/messages.json b/src/drivers/webextension/_locales/uz/messages.json index b3f466e6a..c8ea6219a 100644 --- a/src/drivers/webextension/_locales/uz/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/zh_CN/messages.json b/src/drivers/webextension/_locales/zh_CN/messages.json index 84f3e4599..3cb82b4ac 100644 --- a/src/drivers/webextension/_locales/zh_CN/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/_locales/zh_TW/messages.json b/src/drivers/webextension/_locales/zh_TW/messages.json index 1556c4287..dbb9793fd 100644 --- a/src/drivers/webextension/_locales/zh_TW/messages.json +++ b/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" }, diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js index f7c006dd7..567547444 100644 --- a/src/drivers/webextension/js/popup.js +++ b/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( - 'click', - async () => { - await setOption('termsAccepted', true) - await setOption('tracking', false) + el.termsButtonDecline.addEventListener('click', async () => { + await setOption('termsAccepted', true) + await setOption('tracking', false) - el.terms.classList.add('terms--hidden') - el.footer.classList.remove('footer--hidden') - el.tabPro.classList.remove('tab--disabled') + el.terms.classList.add('terms--hidden') + el.footer.classList.remove('footer--hidden') + el.tabPro.classList.remove('tab--disabled') - Popup.driver('getDetections').then(Popup.onGetDetections.bind(this)) - } - ) + Popup.driver('getDetections').then(Popup.onGetDetections.bind(this)) + }) } let url