Merge branch 'master' into v1.1-dev

Author: jakezatecky

.babelrc

@@ -1,3 +1,11 @@
 {
-  "presets": ["react", "es2015", "stage-2"]
+  "presets": [
+    "react",
+    ["env", {
+      "targets": {
+        "browsers": ["last 2 versions"]
+      }
+    }],
+    "stage-2"
+  ]
 }

gulpfile.js

@@ -29,10 +29,8 @@ gulp.task('test-script-format', () => (
 gulp.task('test-mocha', ['test-script-format'], () => (
     gulp.src(['./test/**/*.js'])
         .pipe(mocha({
-            compilers: [
-                'js:babel-core/register',
-            ],
             require: [
+                'babel-register',
                 './test/setup.js',
             ],
         }))

package.json

@@ -30,18 +30,18 @@
     "babel-core": "^6.13.2",
     "babel-eslint": "^8.0.0",
     "babel-loader": "^7.0.0",
-    "babel-preset-es2015": "^6.13.2",
+    "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.11.1",
     "babel-preset-stage-2": "^6.5.0",
     "browser-sync": "^2.18.6",
     "chai": "^4.0.0",
     "enzyme": "^3.0.0",
     "enzyme-adapter-react-16": "^1.0.0",
     "eslint": "^4.3.0",
-    "eslint-config-takiyon-react": "^0.2.1",
+    "eslint-config-takiyon-react": "^0.3.0",
     "eslint-import-resolver-webpack": "^0.8.1",
     "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^5.0.1",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.1.0",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^4.0.0",
@@ -51,7 +51,7 @@
     "gulp-sass": "^3.0.0",
     "gulp-scss-lint": "^0.5.0",
     "jsdom": "^11.0.0",
-    "mocha": "^3.0.2",
+    "mocha": "^4.0.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "react-test-renderer": "^16.0.0",