Merge branch 'master' into patch-1

Author: Synvox

.babelrc

@@ -1,3 +1,4 @@
 {
-  "presets": ["react-app"]
+  "presets": ["@babel/preset-env", "@babel/react"],
+  "ignore": ["**/__tests__"]
 }

README.md

@@ -4,8 +4,6 @@
 
 Rehook implements an API similar to [Recompose](https://github.com/acdlite/recompose), but using React Hooks.
 
-> Note, React Hooks are in alpha. Refer to the official documentation: [React Hooks](https://reactjs.org/docs/hooks-intro.html)
-
 ```
 npm i @synvox/rehook
 ```

package.json

@@ -1,13 +1,14 @@
 {
   "name": "@synvox/rehook",
   "public": true,
-  "version": "0.0.14",
-  "main": "dist/rehook.js",
-  "umd:main": "dist/rehook.umd.js",
-  "source": "src/rehook/index.js",
-  "types": "dist/rehook.d.ts",
+  "version": "0.0.16",
+  "main": "dist/index.js",
   "devDependencies": {
+    "@babel/cli": "^7.1.5",
+    "@babel/preset-env": "^7.1.6",
+    "@babel/preset-react": "^7.0.0",
     "@otris/jsdoc-tsd": "^1.0.4",
+    "@types/jest": "^24.0.11",
     "babel-eslint": "9.0.0",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
@@ -24,32 +25,28 @@
     "eslint-plugin-standard": "^4.0.0",
     "husky": "^1.1.3",
     "jsdoc": "^3.5.5",
-    "microbundle": "^0.7.0",
     "prettier": "1.14.3",
-    "react": "^16.7.0-alpha.0",
-    "react-dom": "^16.7.0-alpha.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
     "react-scripts": "2.1.0",
-    "rollup": "^0.67.1",
-    "rollup-plugin-babel": "^4.0.3",
-    "rollup-plugin-commonjs": "^9.2.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
-    "rollup-plugin-replace": "^2.1.0",
-    "rollup-plugin-uglify": "^6.0.0"
+    "tsc": "^1.20150623.0"
   },
   "peerDependencies": {
-    "react": "^16.7.0-alpha.0",
-    "react-dom": "^16.7.0-alpha.0"
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build:cra": "react-scripts build",
     "test:eslint": "eslint src --fix",
     "test:jest": "react-scripts test",
     "test": "CI=true npm run test:eslint && CI=true npm run test:jest --findRelatedTests",
     "eject": "react-scripts eject",
-    "build:bundle": "NODE_ENV='production' rollup --config rollup.config.js",
+    "build": "npm run build:bundle && npm run build:types && npm run build:package",
+    "build:bundle": "NODE_ENV='production' babel -s -d ./dist/ ./src/rehook",
+    "build:package": "cp ./README.md dist/README.md && cp ./package.json dist/package.json",
     "build:types": "jsdoc -t node_modules/@otris/jsdoc-tsd -r ./src/rehook -d dist/rehook.d.ts",
-    "prepublish": "npm run build:bundle && npm run build:types"
+    "pub": "npm run build && npm publish"
   },
   "browserslist": [
     ">0.2%",

src/app.js

@@ -4,6 +4,7 @@ import testUtil from '../test-utils'
 import pipe from '../pipe'
 import withState from '../with-state'
 import withPropsOnChange from '../with-props-on-change'
+import { act } from 'react-dom/test-utils'
 
 test('maps props using fn true', () => {
   let called = 0
@@ -26,7 +27,7 @@ test('maps props using fn true', () => {
   expect(getProps().a).toBe(true)
   expect(getProps().b).toBe(0)
   expect(called).toBe(1)
-  getProps().setB(1)
+  act(() => getProps().setB(1))
   expect(called).toBe(2)
   expect(getProps().a).toBe(true)
   expect(getProps().c).toBe(1)
@@ -53,7 +54,7 @@ test('maps props using fn false', () => {
   expect(getProps().a).toBe(true)
   expect(getProps().b).toBe(0)
   expect(called).toBe(1)
-  getProps().setB(1)
+  act(() => getProps().setB(1))
   expect(called).toBe(1)
   expect(getProps().a).toBe(true)
   expect(getProps().c).toBe(0)
@@ -77,7 +78,7 @@ test('maps props using keys', () => {
   expect(getProps().a).toBe(true)
   expect(getProps().b).toBe(0)
   expect(called).toBe(1)
-  getProps().setB(1)
+  act(() => getProps().setB(1))
   expect(called).toBe(2)
   expect(getProps().a).toBe(true)
   expect(getProps().b).toBe(1)

src/index.js

@@ -2,6 +2,7 @@
 
 import testUtil from '../test-utils'
 import withReducer from '../with-reducer'
+import { act } from 'react-dom/test-utils'
 
 test('with state handlers', () => {
   const getProps = testUtil(
@@ -22,7 +23,7 @@ test('with state handlers', () => {
   )
 
   expect(getProps().state).toEqual({ count: 0 })
-  getProps().dispatch({ type: 'INCREMENT' })
+  act(() => getProps().dispatch({ type: 'INCREMENT' }))
   expect(getProps().state).toEqual({ count: 1 })
 })
 
@@ -45,6 +46,6 @@ test('with state handlers memo', () => {
   )
 
   expect(getProps().state).toEqual({ count: 0 })
-  getProps().dispatch({ type: 'INCREMENT' })
+  act(() => getProps().dispatch({ type: 'INCREMENT' }))
   expect(getProps().state).toEqual({ count: 1 })
 })

src/rehook/__tests__/with-props-on-change-test.js

@@ -2,6 +2,7 @@
 
 import testUtil from '../test-utils'
 import withStateHandlers from '../with-state-handlers'
+import { act } from 'react-dom/test-utils'
 
 test('with state handlers', () => {
   const getProps = testUtil(
@@ -14,7 +15,7 @@ test('with state handlers', () => {
     {}
   )
 
-  getProps().handle({ b: true })
+  act(() => getProps().handle({ b: true }))
   expect(getProps().b).toEqual(true)
 })
 
@@ -29,7 +30,7 @@ test('with state handlers calling undefined', () => {
     {}
   )
 
-  getProps().handle()
+  act(() => getProps().handle())
   expect(getProps().b).toEqual(false)
 })
 
@@ -41,6 +42,6 @@ test('with state handlers memo', () => {
     {}
   )
 
-  getProps().handle({ b: true })
+  act(() => getProps().handle({ b: true }))
   expect(getProps().b).toEqual(true)
 })

src/rehook/__tests__/with-reducer-test.js

@@ -2,12 +2,13 @@
 
 import testUtil from '../test-utils'
 import withState from '../with-state'
+import { act } from 'react-dom/test-utils'
 
 test('with state', () => {
   const getProps = testUtil(withState('state', 'setState', 0))
 
   expect(getProps().state).toEqual(0)
-  getProps().setState(1)
+  act(() => getProps().setState(1))
   expect(getProps().state).toEqual(1)
 })
 test('with state function', () => {
@@ -20,7 +21,7 @@ test('with state function', () => {
   )
 
   expect(getProps().state).toEqual(0)
-  getProps().setState(1)
+  act(() => getProps().setState(1))
   expect(getProps().state).toEqual(1)
   expect(called).toEqual(1)
 })

src/rehook/__tests__/with-state-handlers-test.js

@@ -1,13 +1,10 @@
-import React from 'react'
-// @ts-ignore
-const { useMemo } = React
-
+// @ts-check
+import { useMemo } from 'react'
 // Note, branching disobeys one of the hook rules because
 // it wraps hooks in a condition. For this reason, the branch
 // is cached and kept the same regardless of updates.
 
 /**
- *
  * @param {Function} condition
  * @param {Function} left
  * @param {Function} right

src/rehook/__tests__/with-state-test.js

@@ -1,8 +1,9 @@
+// @ts-check
 import React from 'react'
 
 /**
  * @param {Function} component
- * @returns {Object}
+ * @returns {object}
  */
 const catchRender = component => {
   const newComponent = (props = {}) => {
@@ -19,6 +20,7 @@ const catchRender = component => {
   }
 
   newComponent.displayName =
+    // @ts-ignore
     component.displayName || component.name || 'Component'
 
   return newComponent

src/rehook/branch.js

@@ -1,6 +1,7 @@
+// @ts-check
 /**
- * @param {Object} defaultProps
- * @returns {Object}
+ * @param {object} defaultProps
+ * @returns {object}
  */
 const defaultProps = defaultProps => (props = {}) => ({
   ...defaultProps,

src/rehook/catch-render.js

@@ -1,6 +1,7 @@
+// @ts-check
 /**
  * @param {string|symbol} propName
- * @returns {Object}
+ * @returns {object}
  */
 const flattenProp = propName => (props = {}) => ({
   ...props,

src/rehook/default-props.js

@@ -1,9 +1,8 @@
-import React from 'react'
-// @ts-ignore
-const { useEffect, useRef, useState } = React
+// @ts-check
+import { useEffect, useRef, useState } from 'react'
 
 function usePrevious(value) {
-  const ref = useRef()
+  const ref = useRef(null)
 
   useEffect(() => {
     ref.current = value
@@ -13,8 +12,8 @@ function usePrevious(value) {
 }
 
 /**
- * @param {Object} spec
- * @returns {Object}
+ * @param {object} spec
+ * @returns {object}
  */
 const lifecycle = spec => (props = {}) => {
   const [state, setStateRaw] = useState({})

src/rehook/flatten-prop.js

@@ -1,6 +1,7 @@
+// @ts-check
 /**
  * @param {Function} fn
- * @returns {Object}
+ * @returns {object}
  */
 const mapProps = fn => (props = {}) => fn(props)
 

src/rehook/lifecycle.js

@@ -1,7 +1,8 @@
+// @ts-check
 /**
  * @param {string|symbol} propName
  * @param {Function} enhance
- * @returns {Object}
+ * @returns {object}
  */
 const namespace = (propName, enhance) => (props = {}) => ({
   ...props,

src/rehook/map-props.js

@@ -1,6 +1,7 @@
+// @ts-check
 /**
  * @param  {...Function[]} fns
- * @returns {Object}
+ * @returns {object}
  */
 const pipe = (...fns) => (props = {}) => fns.reduce((v, f) => f(v), props)
 

src/rehook/namespace.js

@@ -1,7 +1,8 @@
+// @ts-check
 /**
  * @param {string|symbol} a
  * @param {string|symbol} b
- * @returns {Object}
+ * @returns {object}
  */
 const renameProp = (a, b) => ({ [a]: prop, ...props } = {}) => ({
   ...props,

src/rehook/pipe.js

@@ -1,6 +1,7 @@
+// @ts-check
 /**
- * @param {Object} propMap
- * @returns {Object}
+ * @param {object} propMap
+ * @returns {object}
  */
 const renameProps = propMap => (props = {}) => ({
   // Remove renamed props

src/rehook/rename-prop.js

@@ -1,6 +1,7 @@
+// @ts-check
 /**
  * @param {any} comp
- * @returns {Object}
+ * @returns {object}
  */
 const renderComponent = comp => (props = {}) => {
   throw comp(props)

src/rehook/rename-props.js

@@ -1,9 +1,10 @@
+// @ts-check
 /**
- * @returns {Object}
+ * @returns {object}
  */
 const renderNothing = (/* props */) => {
   // eslint-disable-next-line
-  throw null;
+  throw null
 }
 
 export default renderNothing

src/rehook/render-component.js

@@ -1,3 +1,4 @@
+// @ts-check
 import React from 'react'
 import { mount } from 'enzyme'