Merge pull request #1 from akveo/master

fix(dependencies): fix #426 #423, tslint config update
akveo · Nov 16, 2016 · 205c5f0 · 205c5f0
2 parents 3e66636 + 2108067
commit 205c5f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "postcss-loader": "^1.0.0",
     "rxjs": "5.0.0-beta.12",
     "tether": "^1.2.4",
-    "zone.js": "~0.6.23"
+    "zone.js": "~0.6.25"
   },
   "devDependencies": {
     "angular2-template-loader": "^0.5.0",
@@ -99,7 +99,7 @@
     "webpack": "2.1.0-beta.25",
     "webpack-dashboard": "^0.1.8",
     "webpack-dev-middleware": "^1.6.1",
-    "webpack-dev-server": "^2.1.0-beta.9",
+    "webpack-dev-server": "2.1.0-beta.9",
     "webpack-md5-hash": "^0.0.5",
     "webpack-merge": "^0.15.0",
     "compression-webpack-plugin": "^0.3.1",

diff --git a/tslint.json b/tslint.json
@@ -37,7 +37,6 @@
     "curly": false,
     "forin": true,
     "label-position": true,
-    "label-undefined": true,
     "no-arg": true,
     "no-bitwise": true,
     "no-conditional-assignment": true,
@@ -70,11 +69,6 @@
       true,
       "allow-null-check"
     ],
-    "use-strict": [
-      true,
-      "check-module"
-    ],
-
     "eofline": true,
     "indent": [
       true,
@@ -104,7 +98,6 @@
     "interface-name": false,
     "jsdoc-format": true,
     "no-consecutive-blank-lines": false,
-    "no-constructor-vars": false,
     "one-line": [
       true,
       "check-open-brace",