Upgrade misc deps

kpdecker · kpdecker · commit 8b1f184930ab · 2017-09-03T13:42:49.000-05:00
diff --git a/.eslintrc b/.eslintrc
@@ -2,22 +2,9 @@
   "env": {
     "browser": true
   },
-  "ecmaFeatures": {
-    // Enabling features that can be implemented without polyfills. Want to avoid polyfills at this time.
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "classes": false,
-    "defaultParams": true,
-    "destructuring": true,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": true,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "regexUFlag": true,
-    "restParams": true,
-    "spread": true,
-    "templateStrings": true
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
   },
   "rules": {
     // Possible Errors //
@@ -78,7 +65,6 @@
     "no-caller": 2,
     "no-div-regex": 1,
     "no-else-return": 0,
-    "no-empty-label": 2,
     "no-eq-null": 0,
     "no-eval": 2,
     "no-extend-native": 2,
@@ -90,7 +76,6 @@
     "no-labels": 2,
     "no-lone-blocks": 2,
     "no-loop-func": 0,
-    "no-multi-spaces": 2,
     "no-multi-str": 1,
     "no-native-reassign": 2,
     "no-new": 2,
@@ -181,13 +166,12 @@
     "semi": 2,
     "semi-spacing": [2, {"before": false, "after": true}],
     "sort-vars": 0,
-    "space-after-keywords": [2, "always"],
+    "keyword-spacing": [2, {"after": true}],
     "space-before-blocks": [2, "always"],
     "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
     "space-in-brackets": 0,
     "space-in-parens": [2, "never"],
     "space-infix-ops": 2,
-    "space-return-throw-case": 2,
     "space-unary-ops": 2,
     "spaced-comment": [2, "always"],
     "wrap-regex": 1,
diff --git a/package.json b/package.json
@@ -33,18 +33,17 @@
     "babel-loader": "^6.0.0",
     "babel-preset-es2015-mod": "^6.3.13",
     "babel-preset-es3": "^1.0.1",
-    "chai": "^3.3.0",
+    "chai": "^4.1.2",
     "colors": "^1.1.2",
-    "eslint": "^1.6.0",
     "grunt": "^0.4.5",
-    "grunt-babel": "^6.0.0",
+    "grunt-babel": "^7.0.0",
     "grunt-clean": "^0.4.0",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-uglify": "^1.0.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-eslint": "^17.3.1",
+    "grunt-eslint": "^20.1.0",
     "grunt-karma": "^0.12.1",
     "grunt-mocha-istanbul": "^3.0.1",
     "grunt-mocha-test": "^0.12.7",
diff --git a/test/patch/parse.js b/test/patch/parse.js
@@ -385,13 +385,13 @@ Index: test2
     });
 
     it('should perform sanity checks on line numbers', function() {
-      parsePatch(`@@ -1 +1 @@`, {strict: true});
+      parsePatch('@@ -1 +1 @@', {strict: true});
 
       expect(function() {
-        parsePatch(`@@ -1 +1,4 @@`, {strict: true});
+        parsePatch('@@ -1 +1,4 @@', {strict: true});
       }).to['throw']('Added line count did not match for hunk at line 1');
       expect(function() {
-        parsePatch(`@@ -1,4 +1 @@`, {strict: true});
+        parsePatch('@@ -1,4 +1 @@', {strict: true});
       }).to['throw']('Removed line count did not match for hunk at line 1');
     });
 
diff --git a/yarn.lock b/yarn.lock
