From 7b23335d290a9225dcb094652e15677ef3227852 Mon Sep 17 00:00:00 2001 From: Emil Hesslow Date: Mon, 23 Nov 2020 13:38:26 -0800 Subject: [PATCH 1/2] Amazon Fire do not always contain build number --- src/ua-parser.js | 4 ++-- test/device-test.json | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index 07ecc5e..9588a85 100755 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -437,9 +437,9 @@ /(dell)\s(strea[kpr\s\d]*[\dko])/i // Dell Streak ], [VENDOR, MODEL, [TYPE, TABLET]], [ - /(kf[A-z]+)\sbuild\/.+silk\//i // Kindle Fire HD + /(kf[A-z]+)(\sbuild\/|\)).+silk\//i // Kindle Fire HD ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [ - /(sd|kf)[0349hijorstuw]+\sbuild\/.+silk\//i // Fire Phone + /(sd|kf)[0349hijorstuw]+(\sbuild\/|\)).+silk\//i // Fire Phone ], [[MODEL, mapper.str, maps.device.amazon.model], [VENDOR, 'Amazon'], [TYPE, MOBILE]], [ /android.+aft([bms])\sbuild/i // Fire TV ], [MODEL, [VENDOR, 'Amazon'], [TYPE, SMARTTV]], [ diff --git a/test/device-test.json b/test/device-test.json index 3add728..1f6f0b9 100644 --- a/test/device-test.json +++ b/test/device-test.json @@ -324,6 +324,15 @@ "type": "tablet" } }, + { + "desc": "Kindle Fire HD", + "ua": "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.4 Mobile Safari/535.19 Silk-Accelerated=true", + "expect": { + "vendor": "Amazon", + "model": "KFTT", + "type": "tablet" + } + }, { "desc": "Samsung Galaxy Note 8", "ua": "Mozilla/5.0 (Linux; Android 4.2.2; GT-N5100 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Safari/537.36", @@ -1025,6 +1034,15 @@ "type": "tablet" } }, + { + "desc": "Amazon Kindle Fire Tablet", + "ua": "Mozilla/5.0 (Linux; U; Android 4.4.3; en-us; KFSAWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/3.66 like Chrome/39.0.2171.93 Safari/537.36", + "expect": { + "vendor": "Amazon", + "model": "KFSAWI", + "type": "tablet" + } + }, { "desc": "Amazon Fire TV", "ua": "Mozilla/5.0 (Linux; Android 4.2.2; AFTB Build/JDQ39) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.173 Mobile Safari/537.22", From 4547dbc0b478af6bdcee97693d87d17922d885ca Mon Sep 17 00:00:00 2001 From: Queen Vinyl Darkscratch Date: Sat, 28 Nov 2020 05:42:37 -0800 Subject: [PATCH 2/2] Bump version for all dependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 614021f..8b419c5 100644 --- a/package.json +++ b/package.json @@ -115,10 +115,10 @@ ] }, "devDependencies": { - "jshint": "~1.1.0", - "mocha": "~1.8.0", + "jshint": "~2.12.0", + "mocha": "~8.2.0", "requirejs": "^2.3.2", - "uglify-js": "~2.7.5", + "uglify-js": "~3.12.0", "verup": "^1.3.x" }, "repository": {