remove support for Node.js 10 (#864)

xmppjs · Nov 8, 2020 · 52bc8e3 · 52bc8e3
1 parent 3cc3f9c
commit 52bc8e3
Show file tree

Hide file tree

Showing 41 changed files with 891 additions and 641 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,9 @@ dist: focal
 language: node_js
 
 node_js:
-  - "10"
   - "12"
   - "14"
+  - "15"
 
 cache:
   yarn: true

diff --git a/package.json b/package.json
@@ -2,34 +2,34 @@
   "private": true,
   "devDependencies": {
     "@ava/babel": "^1.0.1",
-    "@babel/core": "^7.11.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-    "@babel/plugin-transform-react-jsx": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/runtime": "^7.11.2",
-    "ava": "^3.12.1",
+    "@babel/core": "^7.12.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+    "@babel/plugin-transform-react-jsx": "^7.12.5",
+    "@babel/plugin-transform-runtime": "^7.12.1",
+    "@babel/preset-env": "^7.12.1",
+    "@babel/runtime": "^7.12.5",
+    "ava": "^3.13.0",
     "babel-plugin-jsx-pragmatic": "^1.0.2",
     "babel-plugin-transform-async-to-promises": "^0.8.15",
     "babelify": "^10.0.0",
     "babylon": "^6.18.0",
     "browser-pack-flat": "^3.4.2",
-    "browserify": "^16.5.2",
+    "browserify": "^17.0.0",
     "bundlesize": "^0.18.0",
     "common-shakeify": "^0.6.2",
-    "eslint": "^7.9.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint": "^7.13.0",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-unicorn": "^21.0.0",
+    "eslint-plugin-unicorn": "^23.0.0",
     "exorcist": "^1.0.1",
     "jsdom": "^16.4.0",
     "lerna": "^3.22.1",
     "node-fetch": "^2.6.1",
     "prettier": "^2.1.2",
-    "sinon": "^9.0.3",
-    "uglify-js": "^3.10.4"
+    "sinon": "^9.2.1",
+    "uglify-js": "^3.11.5"
   },
   "scripts": {
     "bootstrap": "lerna bootstrap",
@@ -39,7 +39,7 @@
     "ncu": "ncu && for dir in packages/*; do (cd \"$dir\" && ncu); done"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "workspaces": [

diff --git a/packages/base64/package.json b/packages/base64/package.json
@@ -11,12 +11,12 @@
     "base64"
   ],
   "dependencies": {
-    "base-64": "^0.1.0"
+    "base-64": "^1.0.0"
   },
   "react-native": "index.js",
   "browser": "browser.js",
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/client-core/package.json b/packages/client-core/package.json
@@ -11,7 +11,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -32,7 +32,7 @@
   "browser": "./browser.js",
   "react-native": "./react-native.js",
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/component-core/package.json b/packages/component-core/package.json
@@ -17,7 +17,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/component/index.js b/packages/component/index.js
@@ -20,11 +20,9 @@ function component(options) {
   entity.on("open", async (el) => {
     try {
       const { id } = el.attrs;
-      if (typeof password === "function") {
-        await password((creds) => entity.authenticate(id, creds));
-      } else {
-        await entity.authenticate(id, password);
-      }
+      await (typeof password === "function"
+        ? password((creds) => entity.authenticate(id, creds))
+        : entity.authenticate(id, password));
     } catch (err) {
       entity.emit("error", err);
     }

diff --git a/packages/component/package.json b/packages/component/package.json
@@ -17,7 +17,7 @@
     "@xmpp/reconnect": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/connection-tcp/package.json b/packages/connection-tcp/package.json
@@ -16,7 +16,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/connection/index.js b/packages/connection/index.js
@@ -130,11 +130,9 @@ class Connection extends EventEmitter {
     const { port } = parseHost(host);
 
     let service;
-    if (port) {
-      service = `${protocol || "xmpp:"}//${host}`;
-    } else {
-      service = (protocol ? `${protocol}//` : "") + host;
-    }
+    service = port
+      ? `${protocol || "xmpp:"}//${host}`
+      : (protocol ? `${protocol}//` : "") + host;
 
     try {
       await promise(this, "disconnect");

diff --git a/packages/connection/package.json b/packages/connection/package.json
@@ -17,7 +17,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -11,7 +11,7 @@
     "debug"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "dependencies": {

diff --git a/packages/error/package.json b/packages/error/package.json
@@ -11,7 +11,7 @@
     "error"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -13,7 +13,7 @@
     "EventEmitter"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/id/package.json b/packages/id/package.json
@@ -11,7 +11,7 @@
     "id"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/iq/package.json b/packages/iq/package.json
@@ -13,7 +13,7 @@
     "callee"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "dependencies": {

diff --git a/packages/jid/lib/JID.js b/packages/jid/lib/JID.js
@@ -82,11 +82,7 @@ class JID {
     unescape = unescape || false;
     let local = null;
 
-    if (unescape) {
-      local = escaping.unescape(this._local);
-    } else {
-      local = this._local;
-    }
+    local = unescape ? escaping.unescape(this._local) : this._local;
 
     return local;
   }

diff --git a/packages/jid/package.json b/packages/jid/package.json
@@ -11,7 +11,7 @@
     "JID"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/middleware/package.json b/packages/middleware/package.json
@@ -17,7 +17,7 @@
     "koa-compose": "^4.1.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/reconnect/package.json b/packages/reconnect/package.json
@@ -14,7 +14,7 @@
     "@xmpp/events": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/resolve/package.json b/packages/resolve/package.json
@@ -26,7 +26,7 @@
     "node-fetch": "^2.6.1"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/resource-binding/index.js b/packages/resource-binding/index.js
@@ -22,11 +22,9 @@ async function bind(entity, iqCaller, resource) {
 
 function route({ iqCaller }, resource) {
   return async ({ entity }, next) => {
-    if (typeof resource === "function") {
-      await resource((resource) => bind(entity, iqCaller, resource));
-    } else {
-      await bind(entity, iqCaller, resource);
-    }
+    await (typeof resource === "function"
+      ? resource((resource) => bind(entity, iqCaller, resource))
+      : bind(entity, iqCaller, resource));
 
     next();
   };

diff --git a/packages/resource-binding/package.json b/packages/resource-binding/package.json
@@ -15,7 +15,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/sasl-anonymous/package.json b/packages/sasl-anonymous/package.json
@@ -15,7 +15,7 @@
     "sasl-anonymous": "^0.1.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/sasl-plain/package.json b/packages/sasl-plain/package.json
@@ -15,7 +15,7 @@
     "sasl-plain": "^0.1.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/sasl-scram-sha-1/package.json b/packages/sasl-scram-sha-1/package.json
@@ -15,7 +15,7 @@
     "sasl-scram-sha-1": "^1.2.1"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/sasl/package.json b/packages/sasl/package.json
@@ -17,7 +17,7 @@
     "saslmechanisms": "^0.1.1"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/session-establishment/package.json b/packages/session-establishment/package.json
@@ -15,7 +15,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/starttls/package.json b/packages/starttls/package.json
@@ -15,7 +15,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/stream-features/package.json b/packages/stream-features/package.json
@@ -12,7 +12,7 @@
     "features"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/stream-management/package.json b/packages/stream-management/package.json
@@ -15,7 +15,7 @@
     "@xmpp/xml": "^0.11.0"
   },
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/tcp/package.json b/packages/tcp/package.json
@@ -14,7 +14,7 @@
     "tcp"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -11,7 +11,7 @@
     "test"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "dependencies": {

diff --git a/packages/time/package.json b/packages/time/package.json
@@ -12,7 +12,7 @@
     "date"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {

diff --git a/packages/tls/package.json b/packages/tls/package.json
@@ -15,7 +15,7 @@
     "tls"
   ],
   "engines": {
-    "node": ">= 10.0.0",
+    "node": ">= 12.4.0",
     "yarn": ">= 1.0.0"
   },
   "publishConfig": {