Merge remote-tracking branch 'node-ts-sapling/master'

Author: mdnorman

package-lock.json

@@ -44,7 +44,9 @@
     "ts-node": "8.0.2",
     "tslint": "5.12.1",
     "tslint-config-airbnb": "5.11.1",
+    "tslint-config-prettier": "1.18.0",
     "tslint-react": "3.6.0",
+    "tsutils": "3.8.0",
     "typescript": "3.3.1"
   },
   "optionalDependencies": {},

package.json

@@ -1,13 +1,14 @@
 {
   "defaultSeverity": "error",
-  "extends": ["tslint-config-airbnb"],
+  "extends": ["tslint-config-airbnb", "tslint-config-prettier"],
   "jsRules": {},
   "rules": {
     "import-name": [false],
     "max-line-length": [true, 120],
     "variable-name": [true, "check-format", "allow-pascal-case", "allow-leading-underscore"],
     "no-unused-variable": [true, { "ignore-pattern": "^_" }],
-    "ter-arrow-parens": [true, "as-needed"]
+    "ter-arrow-parens": [true, "as-needed"],
+    "semicolon": false
   },
   "rulesDirectory": []
 }