Merge branch '2.6.0' into production

.github/workflows/nodejs.yml

@@ -0,0 +1,27 @@
+name: Node CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: npm install, build, and test
+      run: |
+        npm install
+        npm run lint
+        npm run build
+        npm test
+      env:
+        CI: true

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bowser Changelog
 
+### 2.6.0 (Sep 6, 2019)
+- [ADD] Define "module" export in package.json [#354]
+- [FIX] Fix Tablet PC detection [#334]
+
 ### 2.5.4 (Sep 2, 2019)
 - [FIX] Exclude docs from the npm package [#349]
 

README.md

@@ -6,7 +6,7 @@ A small, fast and rich-API browser/platform/engine detector for both browser and
 
 Don't hesitate to support the project on Github or [OpenCollective](https://opencollective.com/bowser) if you like it ❤️ Also, contributors are always welcome!
 
-[![Build Status](https://travis-ci.org/lancedikson/bowser.svg?branch=master)](https://travis-ci.org/lancedikson/bowser/)  [![Greenkeeper badge](https://badges.greenkeeper.io/lancedikson/bowser.svg)](https://greenkeeper.io/)  [![Coverage Status](https://coveralls.io/repos/github/lancedikson/bowser/badge.svg?branch=master)](https://coveralls.io/github/lancedikson/bowser?branch=master)
+[![Build Status](https://travis-ci.org/lancedikson/bowser.svg?branch=master)](https://travis-ci.org/lancedikson/bowser/)  [![Greenkeeper badge](https://badges.greenkeeper.io/lancedikson/bowser.svg)](https://greenkeeper.io/)  [![Coverage Status](https://coveralls.io/repos/github/lancedikson/bowser/badge.svg?branch=master)](https://coveralls.io/github/lancedikson/bowser?branch=master) ![Downloads](https://img.shields.io/npm/dm/bowser)
 
 # Contents
 - [Overview](#overview)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bowser",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "description": "Lightweight browser detector",
   "keywords": [
     "browser",
@@ -21,6 +21,7 @@
     }
   ],
   "main": "es5.js",
+  "module": "src/bowser.js",
   "types": "index.d.ts",
   "repository": {
     "type": "git",

src/parser-platforms.js

@@ -82,7 +82,7 @@ export default [
 
   /* Tablet */
   {
-    test: [/tablet/i],
+    test: [/tablet(?! pc)/i],
     describe() {
       return {
         type: PLATFORMS_MAP.tablet,

test/acceptance/useragentstrings.yml

@@ -1418,6 +1418,21 @@
         engine:
           name: "Trident"
           version: "7.0"
+    -
+      ua: "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; Touch; .NET4.0C; .NET4.0E; .NET CLR 2.0.50727; .NET CLR 3.0.30729; .NET CLR 3.5.30729; Tablet PC 2.0; Zoom 3.6.0; InfoPath.3; rv:11.0) like Gecko"
+      spec:
+        browser:
+          name: "Internet Explorer"
+          version: "11.0"
+        os:
+          name: "Windows"
+          version: "NT 10.0"
+          versionName: "10"
+        platform:
+          type: "desktop"
+        engine:
+          name: "Trident"
+          version: "7.0"
   Microsoft Edge:
     -
       ua: 'Mozilla/5.0 (Linux; Android 8.0; Pixel XL Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.0 Mobile Safari/537.36 EdgA/41.1.35.1'