Merge branch 'master' into next

Author: ghengeveld

.circleci/config.yml

@@ -83,7 +83,7 @@ jobs:
           name: Deploy examples
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              yarn deploy:examples --token $NOW_API_TOKEN
+              yarn deploy:examples
             fi
           no_output_timeout: 30m
   chromatic:

README.md

@@ -54,7 +54,7 @@
   <a href="https://discord.gg/CAYQ6mU">
     <img src="https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat" />
   </a>
-  <a href="https://react-async.async-library.now.sh/examples/">
+  <a href="https://react-async.now.sh/examples/">
     <img src="https://badgen.net/badge/live%20examples/available/pink?icon=now" alt="live examples">
   </a>
 </p>
@@ -192,9 +192,13 @@ All standalone helper components were renamed to avoid import naming collision.
 - `<Settled>` was renamed to `<IfSettled>`.
 
 > A [codemod](https://github.com/async-library/react-async/tree/master/codemods) is available to automate the upgrade.
+> <<<<<<< HEAD
 
 The return type for `run` was changed from `Promise` to `undefined`. You should now use the `promise` prop instead. This
 is a manual upgrade. See [`promise`](#promise-1) for details.
+=======
+
+> > > > > > > master
 
 #### Upgrade to v6
 

examples/basic-fetch/package.json

@@ -35,5 +35,8 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ]
+  ],
+  "engines": {
+    "node": ">=8"
+  }
 }

examples/basic-hook/package.json

@@ -35,5 +35,8 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ]
+  ],
+  "engines": {
+    "node": ">=8"
+  }
 }

examples/custom-instance/package.json

@@ -35,5 +35,8 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ]
+  ],
+  "engines": {
+    "node": ">=8"
+  }
 }

examples/movie-app/package.json

@@ -35,5 +35,8 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ]
+  ],
+  "engines": {
+    "node": ">=8"
+  }
 }

examples/with-abortcontroller/package.json

@@ -35,5 +35,8 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ]
+  ],
+  "engines": {
+    "node": ">=8"
+  }
 }

examples/with-nextjs/package.json

@@ -28,5 +28,8 @@
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",
     "react-async-devtools": "../../packages/react-async-devtools/pkg"
+  },
+  "engines": {
+    "node": ">=8"
   }
 }

examples/with-react-native/package.json

@@ -1,6 +1,7 @@
 {
   "name": "with-react-native-example",
   "version": "8.0.0",
+  "private": true,
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "postinstall": "relative-deps",
@@ -28,5 +29,7 @@
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg"
   },
-  "private": true
+  "engines": {
+    "node": ">=8"
+  }
 }

examples/with-react-router/package.json

@@ -26,5 +26,8 @@
   "relativeDependencies": {
     "react-async": "../../packages/react-async/pkg",
     "react-async-devtools": "../../packages/react-async-devtools/pkg"
+  },
+  "engines": {
+    "node": ">=8"
   }
 }