Cleans up project.

ctrlplusb · ctrlplusb · commit d864c00ca699 · 2017-03-14T07:45:53.000+08:00
Removes flow.
Adds prettier and eslint-prettier. 😍
diff --git a/.eslintrc b/.eslintrc
@@ -2,9 +2,7 @@
   "root": true,
   "parser": "babel-eslint",
   "extends": "airbnb",
-  "plugins": [
-    "flowtype"
-  ],
+  "plugins": [],
   "env": {
     "browser": true,
     "es6": true,
diff --git a/.flowconfig b/.flowconfig
diff --git a/package.json b/package.json
@@ -24,19 +24,23 @@
     "webpack"
   ],
   "scripts": {
+    "precommit": "lint-staged && npm run test",
     "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",
     "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",
+    "lint": "eslint src,tools",
     "prepublish": "yarn run build",
     "test": "jest",
     "test:coverage": "yarn run test -- --coverage",
     "test:coverage:deploy": "yarn run test:coverage && codecov"
   },
+  "lint-staged": {
+    "*.js": [
+      "prettier-eslint --write",
+      "git add"
+    ]
+  },
   "peerDependencies": {
     "react": "^0.14.0 || ^15.0.0-0",
     "react-dom": "^0.14.0 || ^15.0.0-0"
@@ -63,17 +67,17 @@
     "enzyme-to-json": "1.5.0",
     "eslint": "3.17.1",
     "eslint-config-airbnb": "14.1.0",
-    "eslint-plugin-flowtype": "2.30.3",
     "eslint-plugin-import": "2.2.0",
     "eslint-plugin-jsx-a11y": "4.0.0",
     "eslint-plugin-react": "6.10.0",
-    "flow-bin": "0.41.0",
-    "flow-coverage-report": "0.3.0",
-    "flow-typed": "2.0.0",
-    "ghooks": "2.0.0",
     "gzip-size": "3.0.0",
+    "husky": "0.13.2",
     "in-publish": "2.0.0",
     "jest": "19.0.2",
+    "lint-staged": "3.4.0",
+    "prettier": "0.22.0",
+    "prettier-eslint": "4.2.1",
+    "prettier-eslint-cli": "^3.1.2",
     "pretty-bytes": "4.0.2",
     "ramda": "0.23.0",
     "react": "15.4.2",
@@ -86,11 +90,6 @@
     "webpack-dev-middleware": "1.10.1",
     "webpack-hot-middleware": "2.17.1"
   },
-  "config": {
-    "ghooks": {
-      "pre-commit": "yarn run check"
-    }
-  },
   "jest": {
     "collectCoverageFrom": [
       "src/**/*.{js,jsx}"
diff --git a/src/AsyncComponentProvider.js b/src/AsyncComponentProvider.js
@@ -1,27 +1,15 @@
-/* @flow */
-
 import React from 'react'
-import type { ExecContext, ProviderChildContext } from './types'
 
 import createContext from './createContext'
 
-type Props = {
-  // eslint-disable-next-line
-  children?: any,
-  execContext?: ExecContext,
-};
-
 class AsyncComponentProvider extends React.Component {
-  props: Props
-  execContext: ExecContext
-
-  constructor(props : Props, context : Object) {
+  constructor(props, context) {
     super(props, context)
 
     this.execContext = props.execContext || createContext()
   }
 
-  getChildContext() : ProviderChildContext {
+  getChildContext() {
     return {
       asyncComponents: {
         getNextId: this.execContext.getNextId,
diff --git a/src/__tests__/integration.test.js b/src/__tests__/integration.test.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import React from 'react'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { mount } from 'enzyme'
@@ -13,7 +11,7 @@ import {
 } from '../'
 
 function Bob({ children }) {
-  return (<div>{children}</div>)
+  return <div>{children}</div>
 }
 Bob.propTypes = { children: React.PropTypes.node }
 Bob.defaultProps = { children: null }
@@ -56,7 +54,9 @@ const app = execContext => (
           <span>In Defer.</span>
         </DeferredAsyncBob>
         <BoundaryAsyncBob>
-          <span>In Boundary but outside an AsyncComponent, server render me!</span>
+          <span>
+            In Boundary but outside an AsyncComponent, server render me!
+          </span>
           <AsyncBobThree>
             <span>In Boundary - Do not server render me!</span>
           </AsyncBobThree>
@@ -93,21 +93,22 @@ describe('integration tests', () => {
         // "Client" side render...
         const clientContext = createContext()
         const clientApp = app(clientContext)
-        return withAsyncComponents(clientApp)
-          .then(() => {
-            const clientRenderWrapper = mount(clientApp)
-            expect(clientRenderWrapper).toMatchSnapshot()
-            expect(renderToStaticMarkup(clientApp)).toEqual(serverHTML)
-            return clientRenderWrapper
-          })
-          // Now give the client side components time to resolve
-          .then(clientRenderWrapper => new Promise(resolve =>
-            setTimeout(() => resolve(clientRenderWrapper), 100),
-          ))
-          // Now a full render should have occured on client
-          .then(clientRenderWrapper =>
-            expect(clientRenderWrapper).toMatchSnapshot(),
-          )
+        return (
+          withAsyncComponents(clientApp)
+            .then(() => {
+              const clientRenderWrapper = mount(clientApp)
+              expect(clientRenderWrapper).toMatchSnapshot()
+              expect(renderToStaticMarkup(clientApp)).toEqual(serverHTML)
+              return clientRenderWrapper
+            })
+            // Now give the client side components time to resolve
+            .then(
+              clientRenderWrapper =>
+                new Promise(resolve => setTimeout(() => resolve(clientRenderWrapper), 100)),
+            )
+            // Now a full render should have occured on client
+            .then(clientRenderWrapper => expect(clientRenderWrapper).toMatchSnapshot())
+        )
       })
   })
 
diff --git a/src/constants.js b/src/constants.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint-disable import/prefer-default-export */
 
 export const STATE_IDENTIFIER = '__REACT_ASYNC_COMPONENTS_STATE__'
diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import AsyncComponentProvider from './AsyncComponentProvider'
 import createContext from './createContext'
 import createAsyncComponent from './createAsyncComponent'
diff --git a/src/types.js b/src/types.js
@@ -1,20 +1,2 @@
-/* @flow */
-
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Element } from 'react'
-
-export type React$Element = Element<*>;
-
-export type ExecContext = {
-  getNextId : () => number,
-  registerComponent : (number, Function) => void,
-  getComponent : (number) => ?Function,
-  getResolved : () => { [key : number] : true },
-}
-
-export type ProviderChildContext = {
-  asyncComponents: {
-    getNextId : () => number,
-    getComponent : (number) => ?Function,
-  }
-};
diff --git a/src/withAsyncComponents.js b/src/withAsyncComponents.js
@@ -1,13 +1,9 @@
-/* @flow */
-
 import reactTreeWalker from 'react-tree-walker'
 import { STATE_IDENTIFIER } from './constants'
-import type { React$Element } from './types'
 
-export default function withAsyncComponents(app : React$Element) : Promise<any> {
+export default function withAsyncComponents(app) {
   const isBrowser = typeof window !== 'undefined'
-  const rehydrateState = isBrowser
-    && typeof window[STATE_IDENTIFIER] !== 'undefined'
+  const rehydrateState = isBrowser && typeof window[STATE_IDENTIFIER] !== 'undefined'
     ? window[STATE_IDENTIFIER]
     : null
 
@@ -36,7 +32,9 @@ export default function withAsyncComponents(app : React$Element) : Promise<any>
     return true
   }
 
-  return reactTreeWalker(app, visitor, {})
-    // Swallow errors.
-    .catch(() => undefined)
+  return (
+    reactTreeWalker(app, visitor, {})
+      // Swallow errors.
+      .catch(() => undefined)
+  )
 }
diff --git a/tools/.eslintrc b/tools/.eslintrc
diff --git a/tools/scripts/build.js b/tools/scripts/build.js
@@ -1,4 +1,4 @@
-/* @flow */
+/*  */
 
 import { readFileSync } from 'fs'
 import { inInstall } from 'in-publish'
@@ -19,12 +19,8 @@ exec('cross-env BABEL_ENV=commonjs babel --ignore **/__tests__ ./src -d ./common
 exec('cross-env BABEL_ENV=umd webpack --config ./tools/webpack/umd.config.babel.js', nodeEnv)
 exec('cross-env BABEL_ENV=umd webpack --config ./tools/webpack/umd-min.config.babel.js', nodeEnv)
 
-function fileGZipSize(path : string) : string {
-  return pipe(
-    readFileSync,
-    gzipSizeSync,
-    prettyBytes,
-  )(path)
+function fileGZipSize(path) {
+  return pipe(readFileSync, gzipSizeSync, prettyBytes)(path)
 }
 
 const umdMinFilePath = `umd/${getPackageJson().name}.min.js`
diff --git a/tools/scripts/flow.js b/tools/scripts/flow.js
@@ -1,4 +1,4 @@
-/* @flow */
+/*  */
 
 // Runs flow type checking.
 
@@ -8,7 +8,9 @@ import appRootDir from 'app-root-dir'
 import { exec } from '../utils'
 
 if (!existsSync(resolvePath(appRootDir.get(), './flow-typed'))) {
-  console.warn('You haven\'t installed the flow-typed definitions. Please run the `npm run flow:defs` command if you would like to install them.')
+  console.warn(
+    "You haven't installed the flow-typed definitions. Please run the `npm run flow:defs` command if you would like to install them.",
+  )
 }
 
 try {
diff --git a/tools/tests/warningsToErrors.js b/tools/tests/warningsToErrors.js
@@ -1,13 +1,17 @@
-/* @flow */
+/*  */
 
 import sinon from 'sinon'
 
 export default function warningsToErrors() {
   // Ensure console.warnings become thrown errors.
   beforeAll(() => {
-    sinon.stub(console, 'error', (warning) => { throw new Error(warning) })
+    sinon.stub(console, 'error', (warning) => {
+      throw new Error(warning)
+    })
   })
 
   // While not forgetting to restore it afterwards.
-  afterAll(() => { console.error.restore() })
+  afterAll(() => {
+    console.error.restore()
+  })
 }
diff --git a/tools/utils.js b/tools/utils.js
@@ -1,11 +1,11 @@
-/* @flow */
+/*  */
 
 import { execSync } from 'child_process'
 import appRootDir from 'app-root-dir'
 import { resolve as resolvePath } from 'path'
 import { readFileSync } from 'fs'
 
-export function removeEmpty<A>(x : Array<A>) : Array<A> {
+export function removeEmpty(x) {
   return x.filter(y => y != null)
 }
 
@@ -35,19 +35,17 @@ export function removeEmpty<A>(x : Array<A>) : Array<A> {
 // then this function will only be interpretted after the ifElse has run. This
 // can be handy for values that require some complex initialization process.
 // e.g. ifDev(() => 'lazy', 'not lazy');
-export function ifElse(condition : boolean) {
-  return function ifElseResolver<A, B>(then : A, or : B) : A|B {
-    const execIfFuc = x => (typeof x === 'function' ? x() : x)
-    return condition ? execIfFuc(then) : (or)
+export function ifElse(condition) {
+  return function ifElseResolver(then, or) {
+    const execIfFuc = x => typeof x === 'function' ? x() : x
+    return condition ? execIfFuc(then) : or
   }
 }
 
 export function getPackageJson() {
-  return JSON.parse(
-    readFileSync(resolvePath(appRootDir.get(), './package.json'), 'utf-8'),
-  )
+  return JSON.parse(readFileSync(resolvePath(appRootDir.get(), './package.json'), 'utf-8'))
 }
 
-export function exec(command : string) {
+export function exec(command) {
   execSync(command, { stdio: 'inherit', cwd: appRootDir.get() })
 }
diff --git a/tools/webpack/configFactory.js b/tools/webpack/configFactory.js
diff --git a/tools/webpack/umd-min.config.babel.js b/tools/webpack/umd-min.config.babel.js
diff --git a/tools/webpack/umd.config.babel.js b/tools/webpack/umd.config.babel.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* @flow */`
`2`	`1`	`/* eslint-disable import/prefer-default-export */`
`3`	`2`
`4`	`3`	`export const STATE_IDENTIFIER = '__REACT_ASYNC_COMPONENTS_STATE__'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/* @flow */`
`2`		`-`
`3`	`1`	`import AsyncComponentProvider from './AsyncComponentProvider'`
`4`	`2`	`import createContext from './createContext'`
`5`	`3`	`import createAsyncComponent from './createAsyncComponent'`