Merge branch 'master' into napi

Author: kewde

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 4.2.0
+- electron: Electron v8, v8.1.x & v8.2.x [#1294](https://github.com/mapbox/node-sqlite3/pull/1294) [#1308](https://github.com/mapbox/node-sqlite3/pull/1308)
+- sqlite3: update to 3.31.1 (3310100) [#1289](https://github.com/mapbox/node-sqlite3/pull/1289)
+-  webpack: split sqlite3-binding.js out so that it could be override by webpack [#1268](https://github.com/mapbox/node-sqlite3/pull/1268)
+- sqlite3: enable 'SQLITE_ENABLE_DBSTAT_VTAB=1' [#1281](https://github.com/mapbox/node-sqlite3/pull/1281)
+- deps: remove request [#1287](https://github.com/mapbox/node-sqlite3/pull/1287)
+- deps: alternative update of node-gyp for electron (v1 - v4), windows [#1283](https://github.com/mapbox/node-sqlite3/pull/1283)
+- electron: fix dist url [#1282](https://github.com/mapbox/node-sqlite3/pull/1282)
+- docs: Added json1 support note [#1303](https://github.com/mapbox/node-sqlite3/pull/1303)
+
 ## 4.1.1
 - Electron v6.1 and v7 support [#1237](https://github.com/mapbox/node-sqlite3/pull/1237)
 - Electron v7.1 support [#1254](https://github.com/mapbox/node-sqlite3/pull/1254)

README.md

@@ -11,7 +11,9 @@ Asynchronous, non-blocking [SQLite3](https://sqlite.org/) bindings for [Node.js]
 
 ## Supported platforms
 
-The `sqlite3` module works with Node.js v10.x, v11.x, v12.x and v13.x.
+The `sqlite3` module works with:
+* Node.js v11.x, v12.x, v13.x and v14.x.
+* Electron v6.0.x, v6.1.x, v7.0.x, v7.1.x, v8.0.x, v8.1.x and v8.2.x
 
 Binaries for most Node versions and platforms are provided by default via [node-pre-gyp](https://github.com/mapbox/node-pre-gyp).
 

deps/sqlite3.gyp

@@ -88,7 +88,8 @@
           'SQLITE_ENABLE_FTS4',
           'SQLITE_ENABLE_FTS5',
           'SQLITE_ENABLE_JSON1',
-          'SQLITE_ENABLE_RTREE'
+          'SQLITE_ENABLE_RTREE',
+          'SQLITE_ENABLE_DBSTAT_VTAB=1'
         ],
       },
       'cflags_cc': [
@@ -102,7 +103,8 @@
         'SQLITE_ENABLE_FTS4',
         'SQLITE_ENABLE_FTS5',
         'SQLITE_ENABLE_JSON1',
-        'SQLITE_ENABLE_RTREE'
+        'SQLITE_ENABLE_RTREE',
+        'SQLITE_ENABLE_DBSTAT_VTAB=1'
       ],
       'export_dependent_settings': [
         'action_before_build',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sqlite3",
   "description": "Asynchronous, non-blocking SQLite3 bindings",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "homepage": "https://github.com/mapbox/node-sqlite3",
   "author": {
     "name": "MapBox",