Merge branch 'develop' into maintenance/3.x

# Conflicts:
#	package.json

.eslintrc

@@ -6,8 +6,7 @@
     "markdown"
   ],
   "extends": [
-    "prettier",
-    "plugin:prettier/recommended"
+    "prettier"
   ],
   "parserOptions": {
     "ecmaVersion": 2020

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [2.5.4](https://github.com/mariadb-corporation/mariadb-connector-nodejs/tree/2.5.4) (08 Jun 2021)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-nodejs/compare/2.5.3...2.5.4)
+
+* [CONJS-163] Authentication plugin failing doesn't always return error
+* [CONJS-164] Add API that list options default value
+* [CONJS-161] escaping correction
+* update iconv-lite dependency to 0.6.3
+
 ## [2.5.3](https://github.com/mariadb-corporation/mariadb-connector-nodejs/tree/2.5.3) (16 Feb 2021)
 [Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-nodejs/compare/2.5.2...2.5.3)
 

package.json

@@ -47,14 +47,11 @@
   "dependencies": {
     "@alloc/quick-lru": "^5.2.0",
     "@types/geojson": "^7946.0.7",
-    "@types/node": "^14.17.0",
-    "denque": "^1.4.1",
-    "iconv-lite": "^0.6.2",
+    "@types/node": "^14.14.28",
+    "denque": "^1.5.0",
+    "iconv-lite": "^0.6.3",
     "moment-timezone": "^0.5.33",
-    "mysql": "^2.18.1",
-    "mysql2": "^2.2.5",
-    "please-upgrade-node": "^3.2.0",
-    "promise-mysql": "^5.0.3"
+    "please-upgrade-node": "^3.2.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.24.0",
@@ -65,15 +62,15 @@
     "colors": "^1.4.0",
     "dom-parser": "^0.1.6",
     "error-stack-parser": "^2.0.6",
-    "eslint": "^7.26.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-markdown": "^1.0.1",
+    "eslint": "^7.28.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-markdown": "^2.2.0",
     "eslint-plugin-prettier": "^3.4.0",
-    "mocha": "^8.4.0",
+    "mocha": "^8.3.0",
     "mocha-lcov-reporter": "^1.3.0",
-    "nyc": "^15.0.0",
-    "prettier": "^2.3.0",
-    "typescript": "^4.2.4",
+    "nyc": "^15.1.0",
+    "prettier": "^2.3.1",
+    "typescript": "^4.1.5",
     "winston": "^3.3.3"
   },
   "bugs": {

test/integration/test-pool-callback.js

@@ -125,7 +125,7 @@ describe('Pool callback', () => {
     });
     pool.getConnection((err, conn) => {
       conn.query('SELECT SLEEP(1)', () => {
-        assert(Date.now() - initTime >= 1999, 'expected > 2s, but was ' + (Date.now() - initTime));
+        assert(Date.now() - initTime >= 1985, 'expected > 2s, but was ' + (Date.now() - initTime));
         conn.release();
         pool.end((err) => {
           done();

types/.eslintrc

@@ -8,9 +8,7 @@
   "parser":  "@typescript-eslint/parser",
   "extends": [
     "prettier",
-    "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
-    "plugin:prettier/recommended"
+    "plugin:@typescript-eslint/recommended"
   ],
   "parserOptions": {
     "ecmaVersion": 6