diff --git a/package.json b/package.json index 2148f0f67..cdb767828 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "dependencies": { - "file-type": "3.8.*", - "is-svg": "2.0.*", - "read-chunk": "2.0.*" + "file-type": "7.4.*", + "is-svg": "2.1.*", + "read-chunk": "2.1.*" } } diff --git a/schema.json b/schema.json index 0f161fbeb..a4685bd59 100644 --- a/schema.json +++ b/schema.json @@ -3,6 +3,9 @@ "type": "object", "additionalProperties": false, "properties": { + "$schema": { + "type": "string" + }, "categories": { "type": "object", "required": true, @@ -48,19 +51,28 @@ } }, "html": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } }, "excludes": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } }, "implies": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } @@ -72,7 +84,10 @@ } }, "script": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } @@ -91,4 +106,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/apps.json b/src/apps.json index 3024e0e9c..b8deca396 100644 --- a/src/apps.json +++ b/src/apps.json @@ -1,4 +1,5 @@ { + "$schema": "../schema.json", "apps": { "1&1": { "cats": [ @@ -98,6 +99,14 @@ "icon": "ebis.png", "website": "http://www.ebis.ne.jp" }, + "Accelerated Mobile Pages": { + "cats": [ + "12" + ], + "html": "]* (?:amp|⚡)", + "icon": "Accelerated-Mobile-Pages.svg", + "website": "https://www.ampproject.org" + }, "Amber": { "cats": [ "18", @@ -606,6 +615,14 @@ "website": "http://material.angularjs.org" }, "Angular": { + "cats": [ + "12" + ], + "html": "]+ng-version=\"([\\d.]+)\">\\;version:\\1", + "icon": "Angular.svg", + "website": "https://angular.io" + }, + "AngularJS": { "cats": [ "12" ], @@ -613,14 +630,14 @@ "angular": "", "angular.version.full": "(.*)\\;version:\\1" }, - "html": "]+ng-version=\"([\\d.]+)\">\\;version:\\1", + "html": "<[^>]+ ng-version=\"([\\d.]+)\">\\;version:\\1", "icon": "Angular.svg", "script": [ "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1", "angular.*\\.js" ], - "website": "http://angular.io" + "website": "https://angularjs.org" }, "Apache": { "cats": [ @@ -1271,7 +1288,16 @@ "cats": [ "13" ], - "html": "href=\"enter_bug\\.cgi\">", + "html": [ + "href=\"enter_bug\\.cgi\">", + "
]+/(?:sys_master|hybr|_ui/(?:desktop|common/img/webicons))/", + "html": "<[^>]+/(?:sys_master|hybr|_ui/(?:responsive/)?(?:desktop|common(?:/images|/img)?))/", "icon": "Hybris.png", "implies": "Java", "website": "https://hybris.com" @@ -5051,6 +5077,17 @@ "implies": "PHP", "website": "http://laravel.com" }, + "Laterpay": { + "cats": [ + "41" + ], + "meta": { + "laterpay:connector:callbacks:on_user_has_access": "deobfuscateText" + }, + "script": "https?://connectormwi\\.laterpay\\.net/([0-9.]+)[a-zA-z\\-]*/live/[\\w-]+\\.js\\;version:\\1", + "icon": "laterpay.png", + "website": "https://www.laterpay.net/" + }, "MYPAGE Platform": { "cats": [ "1", @@ -5060,7 +5097,7 @@ "Set-Cookie": "botble_session" }, "icon": "mypage-platform.png", - "implies": "laravel", + "implies": "Laravel", "website": "https://www.mypage.vn" }, "Lazy.js": { @@ -5639,7 +5676,7 @@ "implies": [ "MongoDB", "Express", - "AngularJS" + "Angular" ], "website": "http://mean.io" }, @@ -7831,6 +7868,9 @@ "cats": [ "13" ], + "headers": { + "Set-Cookie": "^_redmine_session" + }, "html": "Powered by ]+Redmine", "icon": "Redmine.png", "implies": "Ruby on Rails", @@ -8494,6 +8534,19 @@ ], "website": "http://shopery.com" }, + "Shopfa": { + "cats": [ + "6" + ], + "js": { + "shopfa": "" + }, + "meta": { + "generator": "^ShopFA ([\\d.]+)$\\;version:\\1" + }, + "icon": "Shopfa.svg", + "website": "https://shopfa.com" + }, "Shopify": { "cats": [ "6" @@ -9175,8 +9228,8 @@ "excludes": "SweetAlert", "html": "]+?href=\"[^\"]+sweetalert2(?:\\.min)?\\.css", "icon": "SweetAlert2.png", - "script": "sweetalert2(?:\\.min)?\\.js", - "website": "https://limonte.github.io/sweetalert2" + "script": "sweetalert2(?:\\.all)?(?:\\.min)?\\.js", + "website": "https://sweetalert2.github.io/" }, "Swiftlet": { "cats": [ @@ -9548,6 +9601,16 @@ "script": "tracker\\.js", "website": "http://trackjs.com" }, + "Transifex": { + "cats": [ + "12" + ], + "icon": "transifex.png", + "js": { + "Transifex.live.lib_version": "(.+)\\;version:\\1" + }, + "website": "https://www.transifex.com" + }, "Translucide": { "cats": [ "1" @@ -10123,14 +10186,6 @@ "script": "/volusion\\.js(?:\\?([\\d.]*))?\\;version:\\1", "website": "http://volusion.com" }, - "Vox": { - "cats": [ - "11" - ], - "icon": "Vox.png", - "url": "\\.vox\\.com", - "website": "http://www.vox.com" - }, "Vue.js": { "cats": [ "12" @@ -10138,6 +10193,7 @@ "js": { "Vue": "" }, + "html": "<[^>]+data-v-", "icon": "Vue.js.png", "script": [ "vue(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", @@ -10906,7 +10962,7 @@ ], "headers": { "Set-Cookie": "ZENDSERVERSESSID", - "X-Powered-By": "Zend" + "X-Powered-By": "Zend(?:Server)?(?:[\\s/]?([0-9.]+))?\\;version:\\1" }, "icon": "Zend.png", "website": "http://zend.com" @@ -11317,6 +11373,9 @@ "cats": [ "12" ], + "js": { + "jQuery.migrateVersion": "([\\d.]+)\\;version:\\1" + }, "icon": "jQuery.svg", "implies": "jQuery", "script": "jquery.migrate(?:-([\\d.]+rc\\d))?.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2", @@ -11814,7 +11873,7 @@ "Scriptaculous": "" }, "icon": "script.aculo.us.png", - "script": "(?:scriptaculous|protoaculous)\\.js", + "script": "/(?:scriptaculous|protoaculous)(?:\\.js|/)", "website": "http://script.aculo.us" }, "shine.js": { @@ -11913,7 +11972,7 @@ "icon": "vBulletin.png", "implies": "PHP", "meta": { - "generator": "vBulletin" + "generator": "vBulletin ?([\\d.]+)?\\;version:\\1" }, "website": "http://www.vbulletin.com" }, @@ -12154,7 +12213,7 @@ }, "3": { "name": "Database Managers", - "priority": "4" + "priority": "2" }, "4": { "name": "Documentation Tools", @@ -12190,7 +12249,7 @@ }, "12": { "name": "JavaScript Frameworks", - "priority": "3" + "priority": "5" }, "13": { "name": "Issue Trackers", @@ -12198,7 +12257,7 @@ }, "14": { "name": "Video Players", - "priority": "9" + "priority": "7" }, "15": { "name": "Comment Systems", @@ -12214,7 +12273,7 @@ }, "18": { "name": "Web Frameworks", - "priority": "2" + "priority": "4" }, "19": { "name": "Miscellaneous", @@ -12222,7 +12281,7 @@ }, "20": { "name": "Editors", - "priority": "9" + "priority": "4" }, "21": { "name": "LMS", @@ -12230,7 +12289,7 @@ }, "22": { "name": "Web Servers", - "priority": "9" + "priority": "7" }, "23": { "name": "Cache Tools", @@ -12238,7 +12297,7 @@ }, "24": { "name": "Rich Text Editors", - "priority": "9" + "priority": "5" }, "25": { "name": "JavaScript Graphics", @@ -12258,11 +12317,11 @@ }, "29": { "name": "Search Engines", - "priority": "9" + "priority": "4" }, "30": { "name": "Web Mail", - "priority": "9" + "priority": "2" }, "31": { "name": "CDN", @@ -12274,11 +12333,11 @@ }, "33": { "name": "Web Server Extensions", - "priority": "9" + "priority": "7" }, "34": { "name": "Databases", - "priority": "9" + "priority": "5" }, "35": { "name": "Maps", @@ -12306,7 +12365,7 @@ }, "41": { "name": "Payment Processors", - "priority": "9" + "priority": "8" }, "42": { "name": "Tag Managers", @@ -12318,19 +12377,19 @@ }, "44": { "name": "Build CI Systems", - "priority": "9" + "priority": "4" }, "45": { "name": "Control Systems", - "priority": "9" + "priority": "8" }, "46": { "name": "Remote Access", - "priority": "9" + "priority": "8" }, "47": { "name": "Dev Tools", - "priority": "9" + "priority": "3" }, "48": { "name": "Network Storage", @@ -12354,11 +12413,11 @@ }, "53": { "name": "CRM", - "priority": "9" + "priority": "7" }, "54": { "name": "SEO", - "priority": "9" + "priority": "7" }, "55": { "name": "Accounting", diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js index 399999089..651b6d9c7 100644 --- a/src/drivers/npm/driver.js +++ b/src/drivers/npm/driver.js @@ -246,7 +246,7 @@ class Driver { return parent && parent.hasOwnProperty(property) ? parent[property] : null; }, browser.window); - value = typeof value === 'string' ? value : !!value; + value = typeof value === 'string' || typeof value === 'number' ? value : !!value; if ( value ) { js[appName][chain][index] = value; diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json index 74397a22c..5e2b573e2 100644 --- a/src/drivers/npm/package.json +++ b/src/drivers/npm/package.json @@ -17,7 +17,7 @@ "wappalyzer.js" ], "dependencies": { - "request": "^2.81.0", + "request": "^2.83.0", "zombie": "^5.0.7" } } diff --git a/src/drivers/webextension/js/inject.js b/src/drivers/webextension/js/inject.js index ac3938f2a..26fc00de6 100644 --- a/src/drivers/webextension/js/inject.js +++ b/src/drivers/webextension/js/inject.js @@ -53,7 +53,7 @@ } } - return typeof value === 'string' ? value : !!value; + return typeof value === 'string' || typeof value === 'number' ? value : !!value; } catch(e) { // Fail quietly } diff --git a/src/drivers/webextension/package.json b/src/drivers/webextension/package.json index f27b81af6..9b344ae21 100644 --- a/src/drivers/webextension/package.json +++ b/src/drivers/webextension/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "webextension-polyfill": "^0.1.1" + "webextension-polyfill": "^0.2.1" } } diff --git a/src/icons/Accelerated-Mobile-Pages.svg b/src/icons/Accelerated-Mobile-Pages.svg new file mode 100644 index 000000000..23bcd2654 --- /dev/null +++ b/src/icons/Accelerated-Mobile-Pages.svg @@ -0,0 +1,12 @@ + + + + AMP-Brand-Blue-Icon + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/src/icons/OpenUI5.png b/src/icons/OpenUI5.png index 1a3703019..17a2b943e 100644 Binary files a/src/icons/OpenUI5.png and b/src/icons/OpenUI5.png differ diff --git a/src/icons/Shopfa.svg b/src/icons/Shopfa.svg new file mode 100644 index 000000000..dafcfd5c3 --- /dev/null +++ b/src/icons/Shopfa.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/Vox.png b/src/icons/Vox.png deleted file mode 100644 index 8644dd574..000000000 Binary files a/src/icons/Vox.png and /dev/null differ diff --git a/src/icons/laterpay.png b/src/icons/laterpay.png new file mode 100644 index 000000000..b425ec8e9 Binary files /dev/null and b/src/icons/laterpay.png differ diff --git a/src/icons/transifex.png b/src/icons/transifex.png new file mode 100644 index 000000000..4c90c29a6 Binary files /dev/null and b/src/icons/transifex.png differ