From 642fd6164f7cbef1198de4029d0e5bf396aae034 Mon Sep 17 00:00:00 2001 From: Denis Demchenko Date: Tue, 6 Aug 2019 14:19:35 +0300 Subject: [PATCH 1/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index efcb360..ace28d5 100644 --- a/README.md +++ b/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) From 75f928c3bf140f65c3bc272137aa349dfb453ddc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 07:28:43 +0000 Subject: [PATCH 2/7] chore(deps): bump eslint-utils from 1.4.0 to 1.4.2 Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.2. - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 95ee1bb..b6ee969 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4526,9 +4526,9 @@ } }, "eslint-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz", - "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", + "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", "dev": true, "requires": { "eslint-visitor-keys": "^1.0.0" From 40c6be6654473a0aafc2d3bfb375f4c1153eaac6 Mon Sep 17 00:00:00 2001 From: Denis Demchenko Date: Tue, 27 Aug 2019 20:13:33 +0300 Subject: [PATCH 3/7] Activate github actions --- .github/workflows/nodejs.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/nodejs.yml diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml new file mode 100644 index 0000000..73bebb5 --- /dev/null +++ b/.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 From 8fb6e3a080a1f5c11d60ad00a76b1b8df3b935d5 Mon Sep 17 00:00:00 2001 From: Denis Demchenko Date: Tue, 27 Aug 2019 20:17:55 +0300 Subject: [PATCH 4/7] Update nodejs.yml --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 73bebb5..221b0c4 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - node-version: 12.x + node-version: [12.x] steps: - uses: actions/checkout@v1 From 4356c0a5038e25d6c16681e9511f19c93f47a546 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Thu, 5 Sep 2019 18:17:01 -0300 Subject: [PATCH 5/7] Add 'module' field to manifest The 'module' field is used by bundlers such as rollup and webpack to determine the entrypoint for a package. Conventionally 'module' is used for the ES6 entrypoint, and 'main' is used for the CommonJS entrypoint. Adding a 'module' field allows importing bowser as an ES6 module directly, rather than using a package-relative path to the ES6 entrypoint (e.g. `bowser/src/bowser`) Closes #353 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 816748e..10a6100 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ } ], "main": "es5.js", + "module": "src/bowser.js", "types": "index.d.ts", "repository": { "type": "git", From d9885c9de36c81a783d0351641fa0651926cad43 Mon Sep 17 00:00:00 2001 From: Denis Demchenko Date: Fri, 6 Sep 2019 14:27:16 +0300 Subject: [PATCH 6/7] fix(platform): fix Tablet PC detection as tablets fixes #334 --- src/parser-platforms.js | 2 +- test/acceptance/useragentstrings.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/parser-platforms.js b/src/parser-platforms.js index 62a309a..f9553bd 100644 --- a/src/parser-platforms.js +++ b/src/parser-platforms.js @@ -82,7 +82,7 @@ export default [ /* Tablet */ { - test: [/tablet/i], + test: [/tablet(?! pc)/i], describe() { return { type: PLATFORMS_MAP.tablet, diff --git a/test/acceptance/useragentstrings.yml b/test/acceptance/useragentstrings.yml index 403275a..8e3e7d0 100644 --- a/test/acceptance/useragentstrings.yml +++ b/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' From b8ef17a7baee61d89e63678a08bc6c08baef12dc Mon Sep 17 00:00:00 2001 From: Denis Demchenko Date: Fri, 6 Sep 2019 14:35:23 +0300 Subject: [PATCH 7/7] chore(package): write changelog, bump version --- CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd62d53..362ace4 100644 --- a/CHANGELOG.md +++ b/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] diff --git a/package-lock.json b/package-lock.json index df31928..7c21413 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bowser", - "version": "2.5.4", + "version": "2.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 10a6100..39d9470 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bowser", - "version": "2.5.4", + "version": "2.6.0", "description": "Lightweight browser detector", "keywords": [ "browser",