Skip to content

Commit e320bb2

Browse files
committed
Merge branch 'next' into switch-to-ts
2 parents 9c5d5ce + 428256a commit e320bb2

File tree

31 files changed

+568
-218
lines changed

31 files changed

+568
-218
lines changed

.all-contributorsrc

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
{
2+
"files": [
3+
"README.md"
4+
],
5+
"badgeTemplate": "<a href=\"#contributors\"><img src=\"https://badgen.net/badge/all%20contributors/<%= contributors.length %>/6d60e6\" alt=\"All Contributors\"></a>",
6+
"imageSize": 75,
7+
"commit": false,
8+
"contributors": [
9+
{
10+
"login": "ghengeveld",
11+
"name": "Gert Hengeveld",
12+
"avatar_url": "https://avatars1.githubusercontent.com/u/321738?v=4",
13+
"profile": "https://medium.com/@ghengeveld",
14+
"contributions": [
15+
"code",
16+
"review",
17+
"question"
18+
]
19+
},
20+
{
21+
"login": "Khartir",
22+
"name": "Khartir",
23+
"avatar_url": "https://avatars3.githubusercontent.com/u/5592420?v=4",
24+
"profile": "https://github.com/Khartir",
25+
"contributions": [
26+
"code",
27+
"platform"
28+
]
29+
},
30+
{
31+
"login": "phryneas",
32+
"name": "Lenz Weber",
33+
"avatar_url": "https://avatars1.githubusercontent.com/u/4282439?v=4",
34+
"profile": "https://twitter.com/phry",
35+
"contributions": [
36+
"code",
37+
"platform",
38+
"ideas"
39+
]
40+
},
41+
{
42+
"login": "Avi98",
43+
"name": "Avinash",
44+
"avatar_url": "https://avatars1.githubusercontent.com/u/26133749?v=4",
45+
"profile": "https://github.com/Avi98",
46+
"contributions": [
47+
"review",
48+
"doc"
49+
]
50+
},
51+
{
52+
"login": "FredKSchott",
53+
"name": "Fred K. Schott",
54+
"avatar_url": "https://avatars1.githubusercontent.com/u/622227?v=4",
55+
"profile": "http://www.fredkschott.com",
56+
"contributions": [
57+
"tool"
58+
]
59+
},
60+
{
61+
"login": "byCedric",
62+
"name": "Cedric van Putten",
63+
"avatar_url": "https://avatars2.githubusercontent.com/u/1203991?v=4",
64+
"profile": "https://bycedric.com",
65+
"contributions": [
66+
"code"
67+
]
68+
},
69+
{
70+
"login": "tomshane",
71+
"name": "Tom Shane",
72+
"avatar_url": "https://avatars1.githubusercontent.com/u/11005356?v=4",
73+
"profile": "https://github.com/tomshane",
74+
"contributions": [
75+
"review"
76+
]
77+
},
78+
{
79+
"login": "philip-peterson",
80+
"name": "Philip Peterson",
81+
"avatar_url": "https://avatars1.githubusercontent.com/u/1326208?v=4",
82+
"profile": "http://philippeterson.com/",
83+
"contributions": [
84+
"code"
85+
]
86+
},
87+
{
88+
"login": "sibelius",
89+
"name": "Sibelius Seraphini",
90+
"avatar_url": "https://avatars3.githubusercontent.com/u/2005841?v=4",
91+
"profile": "https://twitter.com/sseraphini",
92+
"contributions": [
93+
"review"
94+
]
95+
},
96+
{
97+
"login": "jimthedev",
98+
"name": "Jim Cummins",
99+
"avatar_url": "https://avatars0.githubusercontent.com/u/108938?v=4",
100+
"profile": "https://jimthedev.com",
101+
"contributions": [
102+
"review"
103+
]
104+
},
105+
{
106+
"login": "msokk",
107+
"name": "Mihkel Sokk",
108+
"avatar_url": "https://avatars3.githubusercontent.com/u/231978?v=4",
109+
"profile": "http://mihkel.sokk.ee",
110+
"contributions": [
111+
"review"
112+
]
113+
},
114+
{
115+
"login": "brabeji",
116+
"name": "Jiří Brabec",
117+
"avatar_url": "https://avatars3.githubusercontent.com/u/2237954?v=4",
118+
"profile": "https://github.com/brabeji",
119+
"contributions": [
120+
"code"
121+
]
122+
},
123+
{
124+
"login": "unorsk",
125+
"name": "Andrii U",
126+
"avatar_url": "https://avatars0.githubusercontent.com/u/25188?v=4",
127+
"profile": "https://github.com/unorsk",
128+
"contributions": [
129+
"example"
130+
]
131+
},
132+
{
133+
"login": "matthisk",
134+
"name": "Matthisk Heimensen",
135+
"avatar_url": "https://avatars0.githubusercontent.com/u/602837?v=4",
136+
"profile": "http://matthisk.nl",
137+
"contributions": [
138+
"code"
139+
]
140+
},
141+
{
142+
"login": "dhurlburtusa",
143+
"name": "Danny Hurlburt",
144+
"avatar_url": "https://avatars3.githubusercontent.com/u/4006431?v=4",
145+
"profile": "https://github.com/dhurlburtusa",
146+
"contributions": [
147+
"ideas",
148+
"doc"
149+
]
150+
},
151+
{
152+
"login": "noelyoo",
153+
"name": "Noel Yoo",
154+
"avatar_url": "https://avatars2.githubusercontent.com/u/25740248?v=4",
155+
"profile": "https://noelyoo.github.io/resume",
156+
"contributions": [
157+
"test",
158+
"code",
159+
"ideas"
160+
]
161+
},
162+
{
163+
"login": "aratcliffe",
164+
"name": "Adam Ratcliffe",
165+
"avatar_url": "https://avatars3.githubusercontent.com/u/491126?v=4",
166+
"profile": "https://github.com/aratcliffe",
167+
"contributions": [
168+
"code"
169+
]
170+
},
171+
{
172+
"login": "kentcdodds",
173+
"name": "Kent C. Dodds",
174+
"avatar_url": "https://avatars0.githubusercontent.com/u/1500684?v=4",
175+
"profile": "https://kentcdodds.com",
176+
"contributions": [
177+
"code"
178+
]
179+
},
180+
{
181+
"login": "walter-ind",
182+
"name": "walter-ind",
183+
"avatar_url": "https://avatars2.githubusercontent.com/u/52423075?v=4",
184+
"profile": "https://github.com/walter-ind",
185+
"contributions": [
186+
"doc"
187+
]
188+
},
189+
{
190+
"login": "artdent",
191+
"name": "Jacob Lee",
192+
"avatar_url": "https://avatars3.githubusercontent.com/u/80536?v=4",
193+
"profile": "https://twitter.com/arthurdenture",
194+
"contributions": [
195+
"code"
196+
]
197+
},
198+
{
199+
"login": "rokoroku",
200+
"name": "Youngrok Kim",
201+
"avatar_url": "https://avatars1.githubusercontent.com/u/5208632?v=4",
202+
"profile": "http://rokoroku.github.io",
203+
"contributions": [
204+
"code"
205+
]
206+
},
207+
{
208+
"login": "elsangedy",
209+
"name": "Munir Ahmed Elsangedy",
210+
"avatar_url": "https://avatars3.githubusercontent.com/u/5339664?v=4",
211+
"profile": "https://munir.dev",
212+
"contributions": [
213+
"ideas"
214+
]
215+
}
216+
],
217+
"contributorsPerLine": 7,
218+
"projectName": "react-async",
219+
"projectOwner": "async-library",
220+
"repoType": "github",
221+
"repoHost": "https://github.com"
222+
}

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
name: Deploy examples
8484
command: |
8585
if [ "${CIRCLE_BRANCH}" == "master" ]; then
86-
yarn deploy:examples --token $NOW_API_TOKEN
86+
yarn deploy:examples
8787
fi
8888
no_output_timeout: 30m
8989
chromatic:

.codesandbox/ci.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"buildCommand": "build:packages",
3+
"packages": ["packages/react-async", "packages/react-async-devtools"],
4+
"publishDirectory": {
5+
"react-async": "packages/react-async/pkg",
6+
"react-async-devtools": "packages/react-async-devtools/pkg"
7+
},
8+
"sandboxes": ["new"]
9+
}

CONTRIBUTING.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ Please have the **_latest_** stable versions of the following on your machine
1616
To start working on React Async, clone the repo and bootstrap the project:
1717

1818
```sh
19-
git clone https://github.com/ghengeveld/react-async.git
19+
git clone https://github.com/async-library/react-async.git
2020
cd react-async
21-
yarn && yarn bootstrap
22-
yarn build && yarn test
21+
yarn && yarn bootstrap && yarn test
2322
```
2423

2524
Note that all work is done against the `next` branch, we only merge to `master` when doing a release.
@@ -80,6 +79,14 @@ This runs all tests using various versions of `react` and `react-dom`, to check
8079

8180
In the `examples` folder, you will find sample React applications that use React Async in various ways with various other libraries. Please add a new example when introducing a major new feature. Make sure to add it to `now.json` so it is automatically deployed when merged to `master`.
8281

82+
To run sample examples on your local environments
83+
84+
```sh
85+
yarn build:examples
86+
yarn test:examples
87+
yarn start:examples
88+
```
89+
8390
### Resolving issues
8491

8592
Sometimes your dependencies might end up in a weird state, causing random issues, especially when working with the examples. In this case it often helps to run `yarn clean -y && yarn bootstrap`. This will delete `node_modules` from all packages/examples and do a clean install.

0 commit comments

Comments
 (0)