Merge pull request #50 from yahoo/upgrade-eslint

Upgrade ESLint

Author: ericf

.eslintrc

@@ -1,13 +1,16 @@
 {
-    "parser": "babel-eslint",
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "experimentalObjectRestSpread": true
+        }
+    },
     "extends": "eslint:recommended",
     "env": {
         "es6": true,
         "node": true
     },
-    "ecmaFeatures": {
-        "modules": true
-    },
     "rules": {
         "no-console": 0,
 
@@ -17,7 +20,7 @@
         "indent": [2, 4],
         "linebreak-style": [2, "unix"],
         "prefer-arrow-callback": 2,
-        "quotes": [2, "single"],
+        "quotes": [2, "single", "avoid-escape"],
         "semi": [2, "always"],
         "strict": [2, "never"],
         "yoda": [2, "never"],

package.json

@@ -16,11 +16,10 @@
   },
   "devDependencies": {
     "babel-cli": "^6.1.18",
-    "babel-eslint": "^4.1.5",
     "babel-plugin-transform-object-rest-spread": "^6.1.18",
     "babel-plugin-transform-runtime": "^6.1.18",
     "babel-preset-es2015": "^6.1.18",
-    "eslint": "^1.9.0",
+    "eslint": "^2.9.0",
     "rimraf": "^2.4.3"
   },
   "scripts": {

src/index.js

@@ -223,8 +223,8 @@ export default function () {
                     if (!(messageObj && messageObj.isObjectExpression())) {
                         throw path.buildCodeFrameError(
                             `[React Intl] \`${callee.node.name}()\` must be ` +
-                            `called with message descriptors defined as ` +
-                            `object expressions.`
+                            'called with message descriptors defined as ' +
+                            'object expressions.'
                         );
                     }