Replaced tslint with @typescript-eslint, and format standard output (#…

…267)
moscajs · Jul 17, 2019 · ec11c39 · ec11c39
1 parent eac037c
commit ec11c39
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -5,9 +5,10 @@
   "main": "aedes.js",
   "types": "types/index.d.ts",
   "scripts": {
-    "lint": "standard",
-    "tslint": "tslint types/**/*.d.ts",
-    "typescript-compile-test": "tsc -p test/typescript/tsconfig.json",
+    "lint": "npm run lint:standard && npm run lint:typescript",
+    "lint:standard": "standard --verbose | snazzy",
+    "lint:typescript": "standard --parser @typescript-eslint/parser --plugin @typescript-eslint/eslint-plugin types/**/*.d.ts",
+    "typescript-compile-test": "tsc --project test/typescript/tsconfig.json",
     "typescript-compile-execute": "node test/typescript/*.js",
     "typescript-test": "npm run typescript-compile-test && npm run typescript-compile-execute",
     "test": "tape test/*.js test/*/*.js | faucet",
@@ -55,6 +56,8 @@
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^12.6.3",
+    "@typescript-eslint/eslint-plugin": "^1.12.0",
+    "@typescript-eslint/parser": "^1.12.0",
     "compute-mode": "^1.0.0",
     "concat-stream": "^2.0.0",
     "convert-hrtime": "^3.0.0",
@@ -66,9 +69,9 @@
     "mqtt-connection": "^4.0.0",
     "nyc": "^14.1.1",
     "pre-commit": "^1.2.2",
+    "snazzy": "^8.0.0",
     "standard": "^13.0.2",
     "tape": "^4.11.0",
-    "tslint": "^5.18.0",
     "tslint-config-standard": "^8.0.1",
     "typescript": "^3.5.3",
     "websocket-stream": "^5.5.0"

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,9 +1,16 @@
+/* eslint no-unused-vars: 0 */
+/* eslint no-undef: 0 */
+/* eslint space-infix-ops: 0 */
+
 /// <reference types="node" />
 
 import { IPublishPacket, ISubscribePacket, ISubscription, IUnsubscribePacket } from 'mqtt-packet'
 import { Duplex } from 'stream'
 import EventEmitter = NodeJS.EventEmitter
 
+declare function aedes (options?: aedes.AedesOptions): aedes.Aedes
+
+// eslint-disable-next-line no-redeclare
 declare namespace aedes {
   export enum AuthErrorCode {
     UNNACCEPTABLE_PROTOCOL = 1,
@@ -85,6 +92,4 @@ declare namespace aedes {
   export function Server (options?: aedes.AedesOptions): aedes.Aedes
 }
 
-declare function aedes (options?: aedes.AedesOptions): aedes.Aedes
-
 export = aedes