Merge branch 'hotfix/1.7.3' into production

rshiny · Aug 30, 2017 · 64f1ac1 · 64f1ac1
2 parents af5e1d4 + 76cff33
commit 64f1ac1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Bowser Changelog
 
-### 1.7.1 (August 17, 2017)
+### 1.7.3 (August 30, 2017)
+- [FIX] Fix detection of Chrome on Android 8 OPR6 (#193)
+
+### 1.7.2 (August 17, 2017)
 - [FIX] Fix typings.d.ts according to #185
 
 ### 1.7.1 (July 13, 2017)

diff --git a/bower.json b/bower.json
@@ -11,7 +11,7 @@
     "ender",
     "sniff"
   ],
-  "version": "1.7.2",
+  "version": "1.7.3",
   "homepage": "https://github.com/lancedikson/bowser",
   "scripts": [
     "src/bowser.js"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bowser",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Lightweight browser detector",
   "keywords": [
     "browser",

diff --git a/src/bowser.js b/src/bowser.js
@@ -56,7 +56,7 @@
       , opera: t
       , version: versionIdentifier || getFirstMatch(/(?:opera|opr|opios)[\s\/](\d+(\.\d+)?)/i)
       }
-    } else if (/opr|opios/i.test(ua)) {
+    } else if (/opr\/|opios/i.test(ua)) {
       // a new Opera
       result = {
         name: 'Opera'
@@ -351,7 +351,7 @@
         default: return undefined
       }
     }
-    
+
     // OS version extraction
     var osVersion = '';
     if (result.windows) {

diff --git a/src/useragents.js b/src/useragents.js
@@ -7,7 +7,16 @@
  */
 module.exports.useragents = {
     Chrome: {
-      'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 9 Build/LMY48T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Safari/537.36': {
+      'Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPR6.170623.013) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.107 Mobile Safari/537.36': {
+        chrome: true
+      , android: true
+      , osversion: '8.0.0'
+      , mobile: true
+      , version: '60.0'
+      , blink: true
+      , a: true
+      }
+    , 'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 9 Build/LMY48T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Safari/537.36': {
         chrome: true
       , android: true
       , osversion: '5.1.1'
@@ -206,7 +215,24 @@ module.exports.useragents = {
       }
     }
   , Opera: {
-      'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 7 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.72 Safari/537.36 OPR/19.0.1340.69721': {
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36 OPR/47.0.2631.55': {
+        opera: true
+      , blink: true
+      , mac: true
+      , osversion: '10.11.6'
+      , version: '47.0'
+      , a: true
+      }
+    , 'Mozilla/5.0 (Linux; Android 8.0; Nexus 6P Build/OPR6.170623.013) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 OPR/42.7.2246.114996': {
+        opera: true
+      , blink: true
+      , android: true
+      , osversion: '8.0'
+      , mobile: true
+      , version: '42.7'
+      , a: true
+      }
+    , 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 7 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.72 Safari/537.36 OPR/19.0.1340.69721': {
         opera: true
       , blink: true
       , android: true