Merge pull request #159 from agraboso/next

Merge next into master for 2.0 Release 🎉

Author: nason

.babelrc

@@ -1,7 +1,4 @@
 {
-  "stage": 0,
-  "loose": "all",
-  "optional": [
-    "runtime"
-  ]
+  "plugins": ["transform-runtime", "transform-object-rest-spread"],
+  "presets": ["env"]
 }

.eslintrc

@@ -1,29 +1,32 @@
 {
   "parser": "babel-eslint",
-  "plugins": ["babel"],
+  "plugins": [
+    "babel",
+    "prettier"
+  ],
   "env": {
     "browser": true,
     "es6": true
   },
-  "ecmaFeatures": {
-    "experimentalObjectRestSpread": true,
-    "modules": true
+  "parserOptions": {
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "modules": true
+    }
   },
+  "root": true,
   "rules": {
-    "babel/arrow-parens": [2, "always"],
     "no-underscore-dangle": 0,
     "strict": [2, "global"],
     "eqeqeq": [2, "smart"],
     "no-undef": 2,
     "no-console": 1,
     "no-nested-ternary": 2,
-    "indent": [2, 2],
-    "quotes": [2, "single"],
-    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
-    "object-curly-spacing": [2, "always"],
-    "eol-last": 2,
-    "padded-blocks": [2, "never"],
-    "space-before-function-paren": [2, { "anonymous": "always", "named": "never" }],
-    "space-before-blocks": [2, "always"]
+    "prettier/prettier": [
+      "error",
+      {
+        "singleQuote": true
+      }
+    ]
   }
 }

.gitignore

@@ -2,3 +2,4 @@ node_modules
 *.log
 lib
 coverage
+.idea

.travis.yml

@@ -1,9 +1,8 @@
 language: node_js
 node_js:
-  - "4.2.1"
-  - "0.12"
-  - "iojs-v3.3.1"
-  - "iojs-v2.5.0"
+  - "stable"
+  - "lts/*"
+  - "4"
 script:
   - npm run cover
 after_success: