Merge branch 'master' into next

ghengeveld · ghengeveld · commit fd98ac4f211b · 2019-12-02T12:08:46.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,6 @@ cache:
   yarn: true
   directories:
     - node_modules
-script: yarn ci
+script: yarn && yarn ci
 after_success:
   - bash <(curl -s https://codecov.io/bash) -e TRAVIS_NODE_VERSION
diff --git a/docs/contributing/releasing.md b/docs/contributing/releasing.md
@@ -8,13 +8,16 @@ Release management is currently a manual process, to be performed by core team m
 1. Create a `release` branch, usually based on `next`.
 2. Open a pull request for `release` -> `master`
 3. Write the release notes in the PR description.
-4. Run `yarn bump` to increment the version number. Take care to follow semver.
-5. Tag the release with `git tag vX.X.X` (using the correct version number).
-6. Push the release commit AND tag: `git push --follow-tags`
-7. Publish each package (in `./packages`) to npm using the script below.
-8. Create a new release on GitHub and copy the release notes there.
+4. Decide on the version number, taking care to follow semver. Do a pre-release before doing the actual release.
+5. Run `yarn bump` to increment the version number in all `package.json` files as well as `lerna.json`.
+6. Commit the version change as "Release vX.X.X" (using the correct version number).
+7. Tag the release commit with `git tag vX.X.X` (using the correct version number).
+8. Push the release commit AND tag: `git push --follow-tags`
+9. Publish each package (in `./packages`) to npm using the script below.
+10. Create a new release on GitHub and copy the release notes there.
 
 ```
+yarn build:packages
 cd packages/react-async
 npm publish pkg
 cd ../react-async-devtools
diff --git a/examples/basic-fetch/package.json b/examples/basic-fetch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basic-fetch-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/basic-fetch",
   "scripts": {
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0"
   },
diff --git a/examples/basic-hook/package.json b/examples/basic-hook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basic-hook-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/basic-hook",
   "scripts": {
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0"
   },
diff --git a/examples/custom-instance/package.json b/examples/custom-instance/package.json
@@ -1,6 +1,6 @@
 {
   "name": "custom-instance-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/custom-instance",
   "scripts": {
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0"
   },
diff --git a/examples/movie-app/package.json b/examples/movie-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "movie-app-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/movie-app",
   "scripts": {
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0"
   },
diff --git a/examples/with-abortcontroller/package.json b/examples/with-abortcontroller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "with-abortcontroller-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/with-abortcontroller",
   "scripts": {
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0"
   },
diff --git a/examples/with-graphql/package.json b/examples/with-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "with-graphql-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/with-graphql",
   "scripts": {
@@ -16,8 +16,8 @@
   "dependencies": {
     "graphql-request": "1.8.2",
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0"
   },
diff --git a/examples/with-nextjs/package.json b/examples/with-nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "with-nextjs-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "main": "index.js",
   "scripts": {
@@ -18,8 +18,8 @@
     "isomorphic-fetch": "2.2.1",
     "next": "9.1.3",
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0"
   },
   "devDependencies": {
diff --git a/examples/with-react-native/package-lock.json b/examples/with-react-native/package-lock.json
diff --git a/examples/with-react-native/package.json b/examples/with-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "with-react-native-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "dependencies": {
     "expo": "35.0.1",
     "react": "16.11.0",
-    "react-async": "^9.0.0",
+    "react-async": "^10.0.0",
     "react-dom": "16.11.0",
     "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz",
     "react-native-web": "0.11.7"
diff --git a/examples/with-react-router/package.json b/examples/with-react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "with-react-router-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "main": "index.js",
   "scripts": {
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-router-dom": "5.1.2"
   },
diff --git a/examples/with-suspense/package.json b/examples/with-suspense/package.json
@@ -1,6 +1,6 @@
 {
   "name": "with-suspense-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/with-suspense",
   "scripts": {
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0"
   },
diff --git a/examples/with-typescript/package.json b/examples/with-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "with-typescript-example",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "private": true,
   "homepage": "https://react-async.async-library.now.sh/examples/with-typescript",
   "scripts": {
@@ -18,8 +18,8 @@
     "@types/react": "16.9.11",
     "@types/react-dom": "16.9.4",
     "react": "16.11.0",
-    "react-async": "^9.0.0",
-    "react-async-devtools": "^9.0.0",
+    "react-async": "^10.0.0",
+    "react-async-devtools": "^10.0.0",
     "react-dom": "16.11.0",
     "react-scripts": "3.2.0",
     "typescript": "3.7.2"
diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
     ]
   },
   "useWorkspaces": true,
-  "version": "9.0.0"
+  "version": "10.0.0"
 }
diff --git a/package.json b/package.json
@@ -25,8 +25,8 @@
     "test:latest": "yarn add -D -W react@latest react-dom@latest && yarn resolutions:fix-react && yarn test",
     "test:compat": "yarn test:backwards && yarn test:forwards && yarn test:latest",
     "test:examples": "CI=1 lerna run --scope '*-example' test -- --passWithNoTests --watchAll=false",
-    "test:chromatic": "chromatic --app-code iiua39bmt0j --build-script-name build:storybook",
-    "resolutions:fix-react": "jq '.resolutions.react = .devDependencies.react|.resolutions.\"react-dom\"=.devDependencies.react' package.json > package.json.new; mv package.json.new package.json; yarn install",
+    "test:chromatic": "chromatic --app-code iiua39bmt0j --build-script-name build:storybook --exit-zero-on-changes",
+    "resolutions:fix-react": "jq '.resolutions.react = .devDependencies.react|.resolutions.\"react-dom\"=.devDependencies.react' package.json > package.json.new && mv package.json.new package.json && yarn install",
     "ci": "yarn lint && yarn test:compat && yarn test:examples",
     "build:packages": "lerna run --scope 'react-async*' build",
     "build:examples": "lerna run --scope '*-example' build",
@@ -75,7 +75,7 @@
     "prettier": "1.19.1",
     "prop-types": "15.7.2",
     "react": "16.12.0",
-    "react-async": "9.0.0",
+    "react-async": "10.0.0-alpha.0",
     "react-dom": "16.12.0",
     "storybook-chromatic": "3.1.0",
     "typescript": "3.7.2"
diff --git a/packages/react-async-devtools/package.json b/packages/react-async-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-async-devtools",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "description": "DevTools for React Async",
   "keywords": [
     "react",
diff --git a/packages/react-async/package.json b/packages/react-async/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-async",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "description": "React component for declarative promise resolution and data fetching",
   "keywords": [
     "react",
