From 2ab612aac3772b926908d7eb612d271ff8b7a386 Mon Sep 17 00:00:00 2001
From: housseindjirdeh <houssein@google.com>
Date: Tue, 5 Mar 2019 12:17:49 -0800
Subject: [PATCH 1/2] adds wordpress detection

---
 icons/wordpress.png  | Bin 0 -> 1008 bytes
 library/libraries.js |  15 +++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 icons/wordpress.png

diff --git a/icons/wordpress.png b/icons/wordpress.png
new file mode 100644
index 0000000000000000000000000000000000000000..88bd883045169fada149045e6992f04ab84b3e99
GIT binary patch
literal 1008
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?i-8JC
zL6~udmBnqKg43BH5hW46K32*3xq68y`AMmI6}bgK)eH<a6;?oIZfZ%QLPc&)Ua?h$
ztrA#;6_5=Q)>l#hD=EpgRf_NpP;kyKN>wn`Gto0pvg1-vP_QXVNwW%aaf50H@@$nd
zN=gc>^!3Zj%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUl_7?}%yCIAPA<wU
zD9OyvQvjKpn3P{yVymPCvIq{K?#wNKTa;G}^%c;6`W1-<`i6Q2`q(s;WTqjUhoTE4
z1JMTd6~r<dV9;1O7o{ea<QIkH=jYgge3Y4&U7Va)kP7mbjXt^xgiCEeMq2q7Wu^lC
z3i6Sip^ZL<7*xHDKFGUB-iL%OSQHqzc3eQ4U=d}<C2=}50vN6PJY5_^ECg#O@AtkI
zDAK+^e|=QaY$xxIMg^rwO-Wl<OzE<c2nqJy@`GLEk-{#mTaS`Dop*R}HFErO5|C+W
zo3d=%GNtQBCTzL#eCPdYRjFSGiqHR?SADOze$H>PO);)#=D#RU{=LwoZhkU%0n_RY
zoUgd%SPII#F`dyS|3S>|u%t%utA~;j(rnz){94H|4d4EJ-v8KUv;4oa6}}HFLmYFr
zti2&!ApEZ36>IpkNRF&zlLC(47kI9Ikn?-Uq2_p(xp;4X`~{|)5;@Jn(i1}Zk^>*}
z2MO$!NY*oWr5bX;JD_ZVVnt+GkEti`Gqs+_7vm33i+o^J(_$M?yOT3n>%z(D-xu#|
znj6(##66{<DEn1n-k}Kbzg{{1U-A=U-&lu4D15Er{BK?n_$}sU<ID%CHy3B@?Jo&;
z<*u0B`+;?v!`8#O77d&M-wz(Y#`6BaT$$f3cMl40coizaz<s+l_6N(ctOK&MjQN!}
zusP;S>|T_AKX>lrRtf1Y!^iL5>76;awC2?52i==})%G<kk&+4j&*pznxnhn&|H3<;
zv~MtSUpaLDlg6>-2Vz2fqPKYbvMzsM&vtvZRmwg853v>cT7RA~iQJ42IQ3U=5-1yb
My85}Sb4q9e0GA?sI{*Lx

literal 0
HcmV?d00001

diff --git a/library/libraries.js b/library/libraries.js
index 257353e..e5ecdf4 100644
--- a/library/libraries.js
+++ b/library/libraries.js
@@ -1361,6 +1361,21 @@ var d41d8cd98f00b204e9800998ecf8427e_LibraryDetectorTests = {
             return false;
         }
     },
+    'WordPress': {
+        icon: 'wordpress',
+        url: 'https://wordpress.org/',
+        npm: null,
+        test: function (win) {
+            if (!!document.querySelector('meta[name=generator][content^="WordPress"]')) {
+                var versionName = document.querySelector("meta[name='generator']").getAttribute("content");
+                return { version: versionName.replace(/[^0-9\.]+/g,"") };
+            }
+            else if (!!document.querySelectorAll('link[href*="wp-includes"], script[src*="wp-includes"]').length) {
+                return { version: UNKNOWN_VERSION }; 
+            }
+            return false;
+        }
+    },
     'Workbox': {
       icon: 'workbox',
       url: 'https://developers.google.com/web/tools/workbox/',

From a8a627667670e40016af987af6bc5bbfe27e5a69 Mon Sep 17 00:00:00 2001
From: housseindjirdeh <houssein@google.com>
Date: Tue, 5 Mar 2019 15:16:25 -0800
Subject: [PATCH 2/2] updates wordpress check

---
 library/libraries.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/libraries.js b/library/libraries.js
index e5ecdf4..edb921c 100644
--- a/library/libraries.js
+++ b/library/libraries.js
@@ -1366,14 +1366,14 @@ var d41d8cd98f00b204e9800998ecf8427e_LibraryDetectorTests = {
         url: 'https://wordpress.org/',
         npm: null,
         test: function (win) {
-            if (!!document.querySelector('meta[name=generator][content^="WordPress"]')) {
-                var versionName = document.querySelector("meta[name='generator']").getAttribute("content");
-                return { version: versionName.replace(/[^0-9\.]+/g,"") };
-            }
-            else if (!!document.querySelectorAll('link[href*="wp-includes"], script[src*="wp-includes"]').length) {
-                return { version: UNKNOWN_VERSION }; 
-            }
-            return false;
+            const hasAPILinkElem = !!document.querySelector('link[rel="https://api.w.org/"]');
+            const hasWPIncludes = !!document.querySelectorAll('link[href*="wp-includes"], script[src*="wp-includes"]').length;
+      
+            if (!hasAPILinkElem && !hasWPIncludes) return false;
+      
+            const generatorMeta = document.querySelector('meta[name=generator][content^="WordPress"]')
+            const version = generatorMeta ? generatorMeta.getAttribute("content").replace(/^\w+\s/,'') : UNKNOWN_VERSION;
+            return { version };
         }
     },
     'Workbox': {