Skip to content

Commit fd98ac4

Browse files
committed
Merge branch 'master' into next
2 parents 78f7e9e + 320222a commit fd98ac4

File tree

18 files changed

+49
-45
lines changed

18 files changed

+49
-45
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ cache:
55
yarn: true
66
directories:
77
- node_modules
8-
script: yarn ci
8+
script: yarn && yarn ci
99
after_success:
1010
- bash <(curl -s https://codecov.io/bash) -e TRAVIS_NODE_VERSION

docs/contributing/releasing.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ Release management is currently a manual process, to be performed by core team m
88
1. Create a `release` branch, usually based on `next`.
99
2. Open a pull request for `release` -> `master`
1010
3. Write the release notes in the PR description.
11-
4. Run `yarn bump` to increment the version number. Take care to follow semver.
12-
5. Tag the release with `git tag vX.X.X` (using the correct version number).
13-
6. Push the release commit AND tag: `git push --follow-tags`
14-
7. Publish each package (in `./packages`) to npm using the script below.
15-
8. Create a new release on GitHub and copy the release notes there.
11+
4. Decide on the version number, taking care to follow semver. Do a pre-release before doing the actual release.
12+
5. Run `yarn bump` to increment the version number in all `package.json` files as well as `lerna.json`.
13+
6. Commit the version change as "Release vX.X.X" (using the correct version number).
14+
7. Tag the release commit with `git tag vX.X.X` (using the correct version number).
15+
8. Push the release commit AND tag: `git push --follow-tags`
16+
9. Publish each package (in `./packages`) to npm using the script below.
17+
10. Create a new release on GitHub and copy the release notes there.
1618

1719
```
20+
yarn build:packages
1821
cd packages/react-async
1922
npm publish pkg
2023
cd ../react-async-devtools

examples/basic-fetch/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "basic-fetch-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/basic-fetch",
66
"scripts": {
@@ -15,8 +15,8 @@
1515
},
1616
"dependencies": {
1717
"react": "16.11.0",
18-
"react-async": "^9.0.0",
19-
"react-async-devtools": "^9.0.0",
18+
"react-async": "^10.0.0",
19+
"react-async-devtools": "^10.0.0",
2020
"react-dom": "16.11.0",
2121
"react-scripts": "3.2.0"
2222
},

examples/basic-hook/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "basic-hook-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/basic-hook",
66
"scripts": {
@@ -15,8 +15,8 @@
1515
},
1616
"dependencies": {
1717
"react": "16.11.0",
18-
"react-async": "^9.0.0",
19-
"react-async-devtools": "^9.0.0",
18+
"react-async": "^10.0.0",
19+
"react-async-devtools": "^10.0.0",
2020
"react-dom": "16.11.0",
2121
"react-scripts": "3.2.0"
2222
},

examples/custom-instance/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "custom-instance-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/custom-instance",
66
"scripts": {
@@ -15,8 +15,8 @@
1515
},
1616
"dependencies": {
1717
"react": "16.11.0",
18-
"react-async": "^9.0.0",
19-
"react-async-devtools": "^9.0.0",
18+
"react-async": "^10.0.0",
19+
"react-async-devtools": "^10.0.0",
2020
"react-dom": "16.11.0",
2121
"react-scripts": "3.2.0"
2222
},

examples/movie-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "movie-app-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/movie-app",
66
"scripts": {
@@ -15,8 +15,8 @@
1515
},
1616
"dependencies": {
1717
"react": "16.11.0",
18-
"react-async": "^9.0.0",
19-
"react-async-devtools": "^9.0.0",
18+
"react-async": "^10.0.0",
19+
"react-async-devtools": "^10.0.0",
2020
"react-dom": "16.11.0",
2121
"react-scripts": "3.2.0"
2222
},

examples/with-abortcontroller/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "with-abortcontroller-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/with-abortcontroller",
66
"scripts": {
@@ -15,8 +15,8 @@
1515
},
1616
"dependencies": {
1717
"react": "16.11.0",
18-
"react-async": "^9.0.0",
19-
"react-async-devtools": "^9.0.0",
18+
"react-async": "^10.0.0",
19+
"react-async-devtools": "^10.0.0",
2020
"react-dom": "16.11.0",
2121
"react-scripts": "3.2.0"
2222
},

examples/with-graphql/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "with-graphql-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/with-graphql",
66
"scripts": {
@@ -16,8 +16,8 @@
1616
"dependencies": {
1717
"graphql-request": "1.8.2",
1818
"react": "16.11.0",
19-
"react-async": "^9.0.0",
20-
"react-async-devtools": "^9.0.0",
19+
"react-async": "^10.0.0",
20+
"react-async-devtools": "^10.0.0",
2121
"react-dom": "16.11.0",
2222
"react-scripts": "3.2.0"
2323
},

examples/with-nextjs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "with-nextjs-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"main": "index.js",
66
"scripts": {
@@ -18,8 +18,8 @@
1818
"isomorphic-fetch": "2.2.1",
1919
"next": "9.1.3",
2020
"react": "16.11.0",
21-
"react-async": "^9.0.0",
22-
"react-async-devtools": "^9.0.0",
21+
"react-async": "^10.0.0",
22+
"react-async-devtools": "^10.0.0",
2323
"react-dom": "16.11.0"
2424
},
2525
"devDependencies": {

examples/with-react-native/package-lock.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/with-react-native/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "with-react-native-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"main": "node_modules/expo/AppEntry.js",
66
"scripts": {
@@ -17,7 +17,7 @@
1717
"dependencies": {
1818
"expo": "35.0.1",
1919
"react": "16.11.0",
20-
"react-async": "^9.0.0",
20+
"react-async": "^10.0.0",
2121
"react-dom": "16.11.0",
2222
"react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz",
2323
"react-native-web": "0.11.7"

examples/with-react-router/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "with-react-router-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"main": "index.js",
66
"scripts": {
@@ -12,8 +12,8 @@
1212
},
1313
"dependencies": {
1414
"react": "16.11.0",
15-
"react-async": "^9.0.0",
16-
"react-async-devtools": "^9.0.0",
15+
"react-async": "^10.0.0",
16+
"react-async-devtools": "^10.0.0",
1717
"react-dom": "16.11.0",
1818
"react-router-dom": "5.1.2"
1919
},

examples/with-suspense/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "with-suspense-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/with-suspense",
66
"scripts": {
@@ -15,8 +15,8 @@
1515
},
1616
"dependencies": {
1717
"react": "16.11.0",
18-
"react-async": "^9.0.0",
19-
"react-async-devtools": "^9.0.0",
18+
"react-async": "^10.0.0",
19+
"react-async-devtools": "^10.0.0",
2020
"react-dom": "16.11.0",
2121
"react-scripts": "3.2.0"
2222
},

examples/with-typescript/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "with-typescript-example",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"private": true,
55
"homepage": "https://react-async.async-library.now.sh/examples/with-typescript",
66
"scripts": {
@@ -18,8 +18,8 @@
1818
"@types/react": "16.9.11",
1919
"@types/react-dom": "16.9.4",
2020
"react": "16.11.0",
21-
"react-async": "^9.0.0",
22-
"react-async-devtools": "^9.0.0",
21+
"react-async": "^10.0.0",
22+
"react-async-devtools": "^10.0.0",
2323
"react-dom": "16.11.0",
2424
"react-scripts": "3.2.0",
2525
"typescript": "3.7.2"

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
]
1111
},
1212
"useWorkspaces": true,
13-
"version": "9.0.0"
13+
"version": "10.0.0"
1414
}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"test:latest": "yarn add -D -W react@latest react-dom@latest && yarn resolutions:fix-react && yarn test",
2626
"test:compat": "yarn test:backwards && yarn test:forwards && yarn test:latest",
2727
"test:examples": "CI=1 lerna run --scope '*-example' test -- --passWithNoTests --watchAll=false",
28-
"test:chromatic": "chromatic --app-code iiua39bmt0j --build-script-name build:storybook",
29-
"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",
28+
"test:chromatic": "chromatic --app-code iiua39bmt0j --build-script-name build:storybook --exit-zero-on-changes",
29+
"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",
3030
"ci": "yarn lint && yarn test:compat && yarn test:examples",
3131
"build:packages": "lerna run --scope 'react-async*' build",
3232
"build:examples": "lerna run --scope '*-example' build",
@@ -75,7 +75,7 @@
7575
"prettier": "1.19.1",
7676
"prop-types": "15.7.2",
7777
"react": "16.12.0",
78-
"react-async": "9.0.0",
78+
"react-async": "10.0.0-alpha.0",
7979
"react-dom": "16.12.0",
8080
"storybook-chromatic": "3.1.0",
8181
"typescript": "3.7.2"

packages/react-async-devtools/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-async-devtools",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"description": "DevTools for React Async",
55
"keywords": [
66
"react",

packages/react-async/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-async",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"description": "React component for declarative promise resolution and data fetching",
55
"keywords": [
66
"react",

0 commit comments

Comments
 (0)