Merge branch 'master' into greenkeeper/typedoc-0.12.0

morganstanley · Aug 20, 2018 · 0c9ac61 · 0c9ac61
2 parents 88baa4b + 9c190e0
commit 0c9ac61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -55,12 +55,12 @@
     "rollup-plugin-replace": "^2.0.0",
     "rollup-plugin-typescript": "^0.8.1",
     "run-sequence": "^2.2.0",
-    "tslib": "^1.6.0",
-    "tslint": "^5.3.2",
-    "tslint-microsoft-contrib": "^5.0.0",
-    "tsutils": "^2.12.1",
+    "tslib": "^1.9.3",
+    "tslint": "^5.11.0",
+    "tslint-microsoft-contrib": "^5.2.0",
+    "tsutils": "^3.0.0",
     "typedoc": "^0.12.0",
-    "typescript": "2.6.1"
+    "typescript": "^3.0.1"
   },
   "greenkeeper": {
     "ignore": [

diff --git a/tslint.json b/tslint.json
@@ -167,7 +167,7 @@
         "no-parameter-properties": true,
         "no-relative-imports": false,
         "no-require-imports": false,
-        "no-shadowed-variable": true,
+        "no-shadowed-variable": false,
         "no-suspicious-comment": true,
         "no-typeof-undefined": false,
         "no-unnecessary-field-initialization": true,