Merge pull request #725 from aoberoi/update-deps

Update deps

.vscode/launch.json

@@ -11,8 +11,8 @@
       "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "stopOnEntry": false,
       "args": [
-        "--opts",
-        "src/mocha.opts",
+        "--config",
+        "src/.mocharc.json",
         "--no-timeouts",
         "src/*.spec.js",
         "src/**/*.spec.js"

package.json

@@ -30,66 +30,68 @@
   },
   "scripts": {
     "prepublish": "npm run build",
-    "precommit": "lint-staged",
-    "prepush": "npm run build",
     "lint": "tslint --project .",
     "test": "npm run build && npm run test:spec && npm run test:integration",
-    "test:spec": "nyc mocha --opts src/mocha.opts src/*.spec.js src/**/*.spec.js",
-    "test:integration": "mocha --opts test/mocha.opts test/typescript/test.ts test/proxy/test.js",
+    "test:spec": "nyc mocha --config src/.mocharc.json src/*.spec.js src/**/*.spec.js",
+    "test:integration": "mocha --config test/.mocharc.json test/typescript/test.ts test/proxy/test.js",
     "coverage": "codecov",
     "build": "npm run build:clean && tsc",
     "build:clean": "shx rm -rf ./dist ./coverage ./.nyc_output",
     "docs": "node support/jsdoc-to-markdown.js",
     "docs:jsdoc": "ts2jsdoc"
   },
+  "husky": {
+    "pre-push": "npm run build",
+    "pre-commit": "lint-staged"
+  },
   "dependencies": {
     "@types/form-data": "^2.2.1",
     "@types/is-stream": "^1.1.0",
     "@types/node": ">=6.0.0",
-    "@types/p-cancelable": "^0.3.0",
-    "@types/p-queue": "^2.3.1",
-    "@types/p-retry": "^1.0.1",
-    "@types/retry": "^0.10.2",
+    "@types/p-cancelable": "^1.0.0",
+    "@types/p-queue": "^2.3.2",
+    "@types/p-retry": "^3.0.0",
+    "@types/retry": "^0.12.0",
     "@types/ws": "^5.1.1",
     "axios": "^0.18.0",
-    "eventemitter3": "^3.0.0",
+    "eventemitter3": "^3.1.0",
     "finity": "^0.5.4",
-    "form-data": "^2.3.1",
+    "form-data": "^2.3.3",
     "is-stream": "^1.1.0",
-    "object.entries": "^1.0.4",
+    "object.entries": "^1.1.0",
     "object.getownpropertydescriptors": "^2.0.3",
-    "object.values": "^1.0.4",
-    "p-cancelable": "^0.3.0",
-    "p-queue": "^2.3.0",
-    "p-retry": "^2.0.0",
+    "object.values": "^1.1.0",
+    "p-cancelable": "^1.0.0",
+    "p-queue": "^2.4.2",
+    "p-retry": "^3.0.1",
     "retry": "^0.12.0",
     "ws": "^5.2.0"
   },
   "devDependencies": {
-    "@aoberoi/capture-console": "^1.0.0",
-    "@types/chai": "^4.1.2",
-    "@types/mocha": "^2.2.48",
-    "busboy": "^0.2.14",
-    "chai": "^4.1.2",
-    "codecov": "^3.0.0",
+    "@aoberoi/capture-console": "^1.1.0",
+    "@types/chai": "^4.1.7",
+    "@types/mocha": "^5.2.6",
+    "busboy": "^0.3.0",
+    "chai": "^4.2.0",
+    "codecov": "^3.2.0",
     "http-shutdown": "^1.2.0",
     "https-proxy-agent": "^2.2.1",
-    "husky": "^0.14.3",
+    "husky": "^1.3.1",
     "jsdoc-to-markdown": "^4.0.1",
-    "lint-staged": "^6.1.0",
-    "mocha": "^5.0.0",
-    "nock": "^9.1.6",
+    "lint-staged": "^7.3.0",
+    "mocha": "^6.0.2",
+    "nock": "^10.0.6",
     "nyc": "^13.3.0",
-    "p-is-promise": "^1.1.0",
+    "p-is-promise": "^2.0.0",
     "proxy": "^0.2.4",
-    "shx": "^0.2.2",
-    "sinon": "^4.2.2",
-    "source-map-support": "^0.5.3",
-    "ts-jsdoc": "^3.0.0",
-    "ts-node": "^4.1.0",
-    "tslint": "^5.9.1",
-    "tslint-config-airbnb": "^5.5.0",
+    "shx": "^0.3.2",
+    "sinon": "^7.2.7",
+    "source-map-support": "^0.5.10",
+    "ts-jsdoc": "^3.0.1",
+    "ts-node": "^8.0.3",
+    "tslint": "^5.13.1",
+    "tslint-config-airbnb": "^5.11.1",
     "typescript": "^2.7.1",
-    "typings-tester": "^0.3.1"
+    "typings-tester": "^0.3.2"
   }
 }

src/.mocharc.json

@@ -0,0 +1,3 @@
+{
+  "require": ["ts-node/register", "source-map-support/register"]
+}

src/RTMClient.ts

@@ -470,7 +470,7 @@ export class RTMClient extends EventEmitter {
   public addOutgoingEvent(awaitReply: false, type: string, body?: {}): Promise<void>;
   public addOutgoingEvent(awaitReply: boolean, type: string, body?: {}): Promise<RTMCallResult | void> {
     const awaitReplyTask = (messageId: number) => {
-      const replyPromise = new PCancelable<RTMCallResult>((onCancel, resolve, reject) => {
+      const replyPromise = new PCancelable<RTMCallResult>((resolve, reject, onCancel) => {
         const eventHandler = (_type: string, event: RTMCallResult) => {
           if (event.reply_to === messageId) {
             this.off('slack_event', eventHandler);

test/.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "require": ["ts-node/register", "source-map-support/register"],
+  "recursive": true,
+  "timeout": 10000
+}