Merge branch 'next' into pr/Khartir/105

Author: ghengeveld

.all-contributorsrc

@@ -212,6 +212,15 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "AlixWang",
+      "name": "AlixWang",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/5417459?v=4",
+      "profile": "https://github.com/AlixWang",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.npmrc

@@ -0,0 +1 @@
+save-exact=true

README.md

@@ -147,6 +147,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://munir.dev"><img src="https://avatars3.githubusercontent.com/u/5339664?v=4" width="75px;" alt="Munir Ahmed Elsangedy"/><br /><sub><b>Munir Ahmed Elsangedy</b></sub></a><br /><a href="#ideas-elsangedy" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/AlixWang"><img src="https://avatars0.githubusercontent.com/u/5417459?v=4" width="75px;" alt="AlixWang"/><br /><sub><b>AlixWang</b></sub></a><br /><a href="https://github.com/async-library/react-async/commits?author=AlixWang" title="Documentation">📖</a></td>
   </tr>
 </table>
 

docs/guide/separating-view-logic.md

@@ -15,7 +15,7 @@ const fetchPerson = async ({ id }, { signal }) => {
 }
 
 const Person = ({ id }) => {
-  const { data, error } = useAsync({ promiseFn: fetchPerson, id })
+  const state = useAsync({ promiseFn: fetchPerson, id })
   return children(state)
 }
 

examples/basic-fetch/package.json

@@ -21,7 +21,7 @@
     "react-scripts": "3.2.0"
   },
   "devDependencies": {
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/basic-hook/package.json

@@ -21,7 +21,7 @@
     "react-scripts": "3.2.0"
   },
   "devDependencies": {
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/custom-instance/package.json

@@ -21,7 +21,7 @@
     "react-scripts": "3.2.0"
   },
   "devDependencies": {
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/movie-app/package.json

@@ -21,7 +21,7 @@
     "react-scripts": "3.2.0"
   },
   "devDependencies": {
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/with-abortcontroller/package.json

@@ -21,7 +21,7 @@
     "react-scripts": "3.2.0"
   },
   "devDependencies": {
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/with-nextjs/package.json

@@ -16,14 +16,14 @@
   },
   "dependencies": {
     "isomorphic-fetch": "2.2.1",
-    "next": "9.1.1",
+    "next": "9.1.3",
     "react": "16.11.0",
     "react-async": "^9.0.0",
     "react-async-devtools": "^9.0.0",
     "react-dom": "16.11.0"
   },
   "devDependencies": {
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/with-react-native/package.json

@@ -15,7 +15,7 @@
     "web": "expo start --web"
   },
   "dependencies": {
-    "expo": "35.0.0",
+    "expo": "35.0.1",
     "react": "16.11.0",
     "react-async": "^9.0.0",
     "react-dom": "16.11.0",
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "babel-preset-expo": "7.1.0",
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg"

examples/with-react-router/package.json

@@ -18,10 +18,10 @@
     "react-router-dom": "5.1.2"
   },
   "devDependencies": {
-    "@babel/core": "7.6.4",
-    "@babel/preset-react": "7.6.3",
+    "@babel/core": "7.7.2",
+    "@babel/preset-react": "7.7.0",
     "parcel-bundler": "1.12.4",
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/with-suspense/package.json

@@ -21,7 +21,7 @@
     "react-scripts": "3.2.0"
   },
   "devDependencies": {
-    "relative-deps": "0.1.2"
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

examples/with-typescript/package.json

@@ -14,19 +14,19 @@
     "now-build": "SKIP_PREFLIGHT_CHECK=true react-scripts build"
   },
   "dependencies": {
-    "@types/node": "12.11.7",
+    "@types/node": "12.12.6",
     "@types/react": "16.9.11",
-    "@types/react-dom": "16.9.3",
+    "@types/react-dom": "16.9.4",
     "react": "16.11.0",
     "react-async": "^9.0.0",
     "react-async-devtools": "^9.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0",
-    "typescript": "3.6.4"
+    "typescript": "3.7.2"
   },
   "devDependencies": {
-    "@types/jest": "24.0.20",
-    "relative-deps": "0.1.2"
+    "@types/jest": "24.0.22",
+    "relative-deps": "0.2.0"
   },
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",

package.json

@@ -36,12 +36,12 @@
     "postbump": "yarn build:packages"
   },
   "devDependencies": {
-    "@babel/core": "7.6.4",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/core": "7.7.2",
+    "@babel/plugin-proposal-class-properties": "7.5.5",
     "@babel/plugin-proposal-object-rest-spread": "7.6.2",
     "@babel/plugin-transform-runtime": "7.6.2",
-    "@babel/preset-env": "7.6.3",
-    "@babel/preset-react": "7.6.3",
+    "@babel/preset-env": "7.7.1",
+    "@babel/preset-react": "7.7.0",
     "@babel/preset-typescript": "7.3.3",
     "@pika/pack": "0.5.0",
     "@pika/plugin-build-node": "0.7.1",
@@ -51,33 +51,33 @@
     "@pika/plugin-bundle-types": "0.7.1",
     "@pika/plugin-standard-pkg": "0.7.1",
     "@pika/plugin-ts-standard-pkg": "0.7.1",
-    "@storybook/react": "5.2.5",
-    "@testing-library/jest-dom": "4.2.0",
-    "@testing-library/react": "9.3.0",
+    "@storybook/react": "5.2.6",
+    "@testing-library/jest-dom": "4.2.3",
+    "@testing-library/react": "9.3.2",
     "@typescript-eslint/eslint-plugin": "2.1.0",
     "@typescript-eslint/parser": "2.1.0",
     "babel-eslint": "10.0.3",
     "babel-jest": "24.9.0",
     "babel-loader": "8.0.6",
     "copyfiles": "2.1.1",
     "eslint": "6.6.0",
-    "eslint-config-prettier": "6.4.0",
-    "eslint-plugin-jest": "22.20.1",
+    "eslint-config-prettier": "6.5.0",
+    "eslint-plugin-jest": "23.0.3",
     "eslint-plugin-prettier": "3.1.1",
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-react": "7.16.0",
     "eslint-plugin-react-hooks": "2.2.0",
     "jest": "24.9.0",
-    "lerna": "3.18.3",
+    "lerna": "3.18.4",
     "node-jq": "1.10.3",
-    "now": "16.4.3",
+    "now": "16.4.4",
     "npm-run-all": "4.1.5",
-    "prettier": "1.18.2",
+    "prettier": "1.19.1",
     "prop-types": "15.7.2",
     "react": "16.11.0",
     "react-async": "9.0.0",
     "react-dom": "16.11.0",
-    "storybook-chromatic": "3.0.3",
+    "storybook-chromatic": "3.1.0",
     "typescript": "3.6.4"
   }
 }

renovate.json

@@ -1,5 +1,8 @@
 {
-  "extends": [
-    "config:base"
-  ]
+  "extends": ["config:base"],
+  "automerge": true,
+  "automergeType": "branch",
+  "major": {
+    "automerge": false
+  }
 }