Merge branch 'master' into react

Author: ctrlplusb

.eslintignore

@@ -1,5 +1,3 @@
-flow-typed/
-tools/flow/
 node_modules/
 commonjs/
 coverage/

.eslintrc

@@ -2,9 +2,7 @@
   "root": true,
   "parser": "babel-eslint",
   "extends": "airbnb",
-  "plugins": [
-    "flowtype"
-  ],
+  "plugins": [],
   "env": {
     "browser": true,
     "es6": true,
@@ -15,6 +13,20 @@
     "defaultParams": true
   },
   "rules": {
-    "react/jsx-filename-extension": 0
+    "react/jsx-filename-extension": 0,
+
+    "no-confusing-arrow": 0,
+
+    "max-len": [
+      "error",
+      {
+        "ignoreComments": false,
+        "ignoreStrings": true,
+        "code": 80
+      }
+    ],
+
+    // Going hipster
+    "semi": [2, "never"]
   }
 }

.flowconfig

@@ -1 +1 @@
-6.9.4
+6.10.0

.nvmrc

@@ -22,12 +22,10 @@
   "scripts": {
     "build": "babel-node ./tools/scripts/build.js",
     "check": "yarn run lint && yarn run test",
-    "clean": "rimraf ./commonjs && rimraf ./umd && rimraf ./coverage && rimraf ./flow-coverage && rimraf ./umd",
+    "clean": "rimraf ./commonjs && rimraf ./umd && rimraf ./coverage && rimraf ./umd",
     "example:web": "echo 'Make sure to `cd example/web && yarn install`' && cd example/web && yarn run start",
-    "flow": "babel-node ./tools/scripts/flow",
-    "flow:coverage": "flow-coverage-report -i 'src/**/*.js' -t html -t json -t text",
-    "flow:defs": "flow-typed install --overwrite",
     "lint": "eslint src",
+    "precommit": "lint-staged && npm run test",
     "prepublish": "yarn run build",
     "test": "jest",
     "test:coverage": "yarn run test -- --coverage",
@@ -37,62 +35,60 @@
     "react": "^0.14.0 || ^15.0.0-0",
     "react-dom": "^0.14.0 || ^15.0.0-0"
   },
+  "jest": {
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx}"
+    ],
+    "testPathIgnorePatterns": [
+      "<rootDir>/(commonjs|coverage|flow-typed|node_modules|tools|umd)/"
+    ]
+  },
+  "lint-staged": {
+    "*.js": [
+      "prettier-eslint --write",
+      "git add"
+    ]
+  },
   "devDependencies": {
     "app-root-dir": "1.0.2",
-    "babel-cli": "6.18.0",
-    "babel-core": "6.21.0",
+    "babel-cli": "6.24.0",
+    "babel-core": "6.24.0",
     "babel-eslint": "7.1.1",
-    "babel-jest": "18.0.0",
-    "babel-loader": "6.2.10",
-    "babel-polyfill": "6.20.0",
-    "babel-preset-env": "1.1.8",
-    "babel-preset-latest": "6.16.0",
-    "babel-preset-react": "6.16.0",
-    "babel-preset-stage-3": "6.17.0",
-    "babel-register": "6.18.0",
+    "babel-jest": "19.0.0",
+    "babel-loader": "6.4.0",
+    "babel-polyfill": "6.23.0",
+    "babel-preset-env": "1.2.1",
+    "babel-preset-latest": "6.24.0",
+    "babel-preset-react": "6.23.0",
+    "babel-preset-stage-3": "6.22.0",
+    "babel-register": "6.24.0",
     "codecov": "1.0.1",
-    "cross-env": "3.1.4",
-    "enzyme": "2.7.0",
-    "enzyme-to-json": "1.4.5",
-    "eslint": "3.13.1",
-    "eslint-config-airbnb": "14.0.0",
-    "eslint-plugin-flowtype": "2.30.0",
+    "cross-env": "3.2.3",
+    "enzyme": "2.7.1",
+    "enzyme-to-json": "1.5.0",
+    "eslint": "3.17.1",
+    "eslint-config-airbnb": "14.1.0",
     "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsx-a11y": "3.0.2",
-    "eslint-plugin-react": "6.9.0",
-    "flow-bin": "0.37.4",
-    "flow-coverage-report": "0.2.0",
-    "flow-typed": "2.0.0",
-    "ghooks": "2.0.0",
+    "eslint-plugin-jsx-a11y": "4.0.0",
+    "eslint-plugin-react": "6.10.0",
     "gzip-size": "3.0.0",
+    "husky": "0.13.2",
     "in-publish": "2.0.0",
-    "jest": "18.1.0",
+    "jest": "19.0.2",
+    "lint-staged": "3.4.0",
+    "prettier": "0.22.0",
+    "prettier-eslint": "4.3.0",
+    "prettier-eslint-cli": "3.1.2",
     "pretty-bytes": "4.0.2",
     "ramda": "0.23.0",
     "react": "15.4.2",
     "react-addons-test-utils": "15.4.2",
     "react-dom": "15.4.2",
-    "readline-sync": "1.4.5",
-    "rimraf": "2.5.4",
+    "readline-sync": "1.4.6",
+    "rimraf": "2.6.1",
     "sinon": "1.17.7",
-    "webpack": "2.2.0-rc.3",
-    "webpack-dev-middleware": "1.9.0",
-    "webpack-hot-middleware": "2.15.0"
-  },
-  "config": {
-    "ghooks": {
-      "pre-commit": "yarn run check"
-    }
-  },
-  "jest": {
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx}"
-    ],
-    "snapshotSerializers": [
-      "<rootDir>/node_modules/enzyme-to-json/serializer"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/(commonjs|coverage|flow-typed|node_modules|tools|umd)/"
-    ]
+    "webpack": "2.2.1",
+    "webpack-dev-middleware": "1.10.1",
+    "webpack-hot-middleware": "2.17.1"
   }
 }

package.json

@@ -1,4 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
 exports[`MyComponent renders 1`] = `
 <MyComponent
-  msg="foo" />
+  msg="foo"
+/>
 `;

src/__tests__/__snapshots__/MyComponent.test.js.snap

@@ -1,11 +1,9 @@
-/* @flow */
-
-import helloWorld from '../helloWorld';
+import helloWorld from '../helloWorld'
 
 describe('helloWorld', () => {
   it('returns the expected result', () => {
-    const expected = 'hello world';
-    const actual = helloWorld();
-    expect(expected).toEqual(actual);
-  });
-});
+    const expected = 'hello world'
+    const actual = helloWorld()
+    expect(expected).toEqual(actual)
+  })
+})

src/__tests__/helloWorld.test.js

@@ -1,7 +1,5 @@
-/* @flow */
-
 function goodbyeWorld() {
-  return 'goodbye world';
+  return 'goodbye world'
 }
 
-export default goodbyeWorld;
+export default goodbyeWorld

src/goodbyeWorld.js

@@ -1,7 +1,5 @@
-/* @flow */
-
 function helloWorld() {
-  return 'hello world';
+  return 'hello world'
 }
 
-export default helloWorld;
+export default helloWorld

src/helloWorld.js

@@ -1,11 +1,5 @@
-/* @flow */
+import helloWorld from './helloWorld'
+import goodbyeWorld from './goodbyeWorld'
+import MyComponent from './MyComponent'
 
-import helloWorld from './helloWorld';
-import goodbyeWorld from './goodbyeWorld';
-import MyComponent from './MyComponent';
-
-export {
-  helloWorld,
-  goodbyeWorld,
-  MyComponent,
-};
+export { helloWorld, goodbyeWorld, MyComponent }