From f2a3f105b994b4999bf1f258885b655b30c086c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= <wangxinhe06@gmail.com>
Date: Fri, 31 Jul 2020 23:48:07 +0800
Subject: [PATCH 1/5] Add Bootstrap implies

---
 src/apps.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/apps.json b/src/apps.json
index ea49872d0..54b8b31e2 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1703,6 +1703,9 @@
         "<link[^>]+?href=\"[^\"]*bootstrap(?:\\.min)?\\.css",
         "<div[^>]+class=\"[^\"]*glyphicon glyphicon-"
       ],
+      "implies": [
+        "jQuery"
+      ],
       "icon": "Bootstrap.png",
       "js": {
         "bootstrap.Alert.VERSION": "^(.+)$\\;version:\\1",

From 8894f4eb666cc56f238a125c39f7885ef50b8810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= <wangxinhe06@gmail.com>
Date: Fri, 31 Jul 2020 23:58:25 +0800
Subject: [PATCH 2/5] SVG logo of Bootstrap

https://getbootstrap.com/#content
---
 src/apps.json                                    |   2 +-
 .../webextension/images/icons/Bootstrap.png      | Bin 3473 -> 0 bytes
 .../webextension/images/icons/Bootstrap.svg      |   1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 src/drivers/webextension/images/icons/Bootstrap.png
 create mode 100644 src/drivers/webextension/images/icons/Bootstrap.svg

diff --git a/src/apps.json b/src/apps.json
index 54b8b31e2..869493aa3 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1706,7 +1706,7 @@
       "implies": [
         "jQuery"
       ],
-      "icon": "Bootstrap.png",
+      "icon": "Bootstrap.svg",
       "js": {
         "bootstrap.Alert.VERSION": "^(.+)$\\;version:\\1",
         "jQuery.fn.tooltip.Constructor.VERSION": "^(.+)$\\;version:\\1"
diff --git a/src/drivers/webextension/images/icons/Bootstrap.png b/src/drivers/webextension/images/icons/Bootstrap.png
deleted file mode 100644
index 7a2650aab3fb41680c574308ce47ec78e6bcf1d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3473
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

diff --git a/src/drivers/webextension/images/icons/Bootstrap.svg b/src/drivers/webextension/images/icons/Bootstrap.svg
new file mode 100644
index 000000000..025ba32d4
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Bootstrap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="430" class="img-fluid mb-3 mb-md-0" viewBox="0 0 1024 860" focusable="false" role="img"><title>Bootstrap</title><defs><linearGradient id="c" x1="50%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#5c24ae"/><stop offset="100%" stop-color="#30135a"/></linearGradient><path id="b" d="M355.967 242.807l-322 216.395c-44.275 29.754-44.275 78.443 0 108.197l322 216.395c44.275 29.754 116.725 29.754 161 0l322-216.395c44.275-29.754 44.275-78.443 0-108.197l-322-216.395c-44.275-29.754-116.725-29.754-161 0z"/><filter id="a" width="108%" height="112%" x="-4%" y="-4.3%" filterUnits="objectBoundingBox"><feOffset dy="10" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="10"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/></filter><linearGradient id="f" x1="50%" x2="50%" y1="-17.303%" y2="100%"><stop offset="0%" stop-color="#7331d4"/><stop offset="100%" stop-color="#461b84"/></linearGradient><path id="e" d="M355.967 132.807l-322 216.395c-44.275 29.754-44.275 78.443 0 108.197l322 216.395c44.275 29.754 116.725 29.754 161 0l322-216.395c44.275-29.754 44.275-78.443 0-108.197l-322-216.395c-44.275-29.754-116.725-29.754-161 0z"/><filter id="d" width="108%" height="112%" x="-4%" y="-4.3%" filterUnits="objectBoundingBox"><feOffset dy="10" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="10"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/></filter><linearGradient id="i" x1="50%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#905bdd"/><stop offset="100%" stop-color="#5521a0"/></linearGradient><path id="h" d="M355.967 22.807l-322 216.395c-44.275 29.754-44.275 78.443 0 108.197l322 216.395c44.275 29.754 116.725 29.754 161 0l322-216.395c44.275-29.754 44.275-78.443 0-108.197l-322-216.395c-44.275-29.754-116.725-29.754-161 0z"/><filter id="g" width="108%" height="112%" x="-4%" y="-4.3%" filterUnits="objectBoundingBox"><feOffset dy="10" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="10"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/></filter></defs><g fill="none"><g transform="translate(75 23)"><use fill="#000" filter="url(#a)" xlink:href="#b"/><use fill="url(#c)" xlink:href="#b"/></g><g transform="translate(75 23)"><use fill="#000" filter="url(#d)" xlink:href="#e"/><use fill="url(#f)" xlink:href="#e"/></g><g transform="translate(75 23)"><use fill="#000" filter="url(#g)" xlink:href="#h"/><use fill="url(#i)" xlink:href="#h"/></g><path fill="#fff" d="M558.273 447.667L308.036 279.5l97.982-65.847c42.83-28.784 96.789-31.483 134.245-6.311 26.044 17.502 31.214 46.615 11.444 65.724l1.389.934c38.324-19.932 84.107-18.527 117.396 3.845 44.046 29.6 38.671 68.419-14.561 104.193l-97.658 65.629zM447.112 331.01l49.942-33.562c36.935-24.822 42.31-48.249 15.224-66.451-24.798-16.665-55.49-14.453-85.851 5.95l-59.641 40.081 80.326 53.982zm176.532 35.663c37.63-25.289 42.136-48.832 13.203-68.276-28.932-19.444-64.163-15.614-104.042 11.186l-58.789 39.508 87.92 59.084 61.708-41.502z"/></g></svg>

From ed9fc2849d0b4afc0d56960fdf1ce788b7cc33a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= <wangxinhe06@gmail.com>
Date: Sat, 1 Aug 2020 16:50:14 +0800
Subject: [PATCH 3/5] Improve Bootstrap detection

---
 src/apps.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 869493aa3..8bf5529bb 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1699,9 +1699,7 @@
       "cpe": "cpe:/a:getbootstrap:bootstrap",
       "html": [
         "<style>/\\*!\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
-        "<link[^>]+?href=[^\"]/css/([\\d.]+)/bootstrap\\.(?:min\\.)?css\\;version:\\1",
-        "<link[^>]+?href=\"[^\"]*bootstrap(?:\\.min)?\\.css",
-        "<div[^>]+class=\"[^\"]*glyphicon glyphicon-"
+        "<link[^>]* href=[^>]*?bootstrap(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.css\\;version:\\1"
       ],
       "implies": [
         "jQuery"
@@ -1712,9 +1710,7 @@
         "jQuery.fn.tooltip.Constructor.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": [
-        "twitter\\.github\\.com/bootstrap",
-        "bootstrap[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
-        "(?:/([\\d.]+))?(?:/js)?/bootstrap(?:\\.min)?\\.js\\;version:\\1"
+        "bootstrap(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.js\\;version:\\1"
       ],
       "website": "https://getbootstrap.com"
     },

From 477b951739212969b9aaaf224b1f1183f7721cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE=20Wang=2C=20Xinhe?=
 <wangxinhe06@gmail.com>
Date: Thu, 27 Aug 2020 14:54:05 +0800
Subject: [PATCH 4/5] Improve Bootstarp detection

Match CSS whitespace via `\s`
---
 src/apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 8bf5529bb..b2b3fea7b 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1698,7 +1698,7 @@
       ],
       "cpe": "cpe:/a:getbootstrap:bootstrap",
       "html": [
-        "<style>/\\*!\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
+        "<style>\\s+/\\*!\\s+\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
         "<link[^>]* href=[^>]*?bootstrap(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.css\\;version:\\1"
       ],
       "implies": [
@@ -15473,4 +15473,4 @@
       "priority": 6
     }
   }
-}
\ No newline at end of file
+}

From 783ccdcd3b52c4b12917560bcd04a43a811b2365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= <wangxinhe06@gmail.com>
Date: Thu, 27 Aug 2020 15:13:21 +0800
Subject: [PATCH 5/5] Add confidence to Bootstrap's implies

f2a3f105b994b4999bf1f258885b655b30c086c5
---
 src/apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps.json b/src/apps.json
index b2b3fea7b..9bb80fa46 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1702,7 +1702,7 @@
         "<link[^>]* href=[^>]*?bootstrap(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.css\\;version:\\1"
       ],
       "implies": [
-        "jQuery"
+        "jQuery\\;confidence:50"
       ],
       "icon": "Bootstrap.svg",
       "js": {