Skip to content

Commit 36d8521

Browse files
brainkimbrainkim
committed
upgrade deps
1 parent c7098d0 commit 36d8521

File tree

4 files changed

+609
-488
lines changed

4 files changed

+609
-488
lines changed

‎package.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,36 @@
2525
"build-storybook": "build-storybook --config-dir stories"
2626
},
2727
"dependencies": {
28-
"@repeaterjs/repeater": "^2.0.0"
28+
"@repeaterjs/repeater": "^3.0.1"
2929
},
3030
"devDependencies": {
31-
"@babel/core": "^7.5.5",
32-
"@storybook/addon-actions": "^5.2.0-rc.0",
33-
"@storybook/addon-links": "^5.2.0-rc.0",
34-
"@storybook/addon-storysource": "^5.2.0-rc.0",
35-
"@storybook/addons": "^5.2.0-rc.0",
36-
"@storybook/react": "^5.2.0-rc.0",
37-
"@testing-library/react-hooks": "^2.0.1",
38-
"@types/jest": "^24.0.18",
39-
"@types/react": "^16.9.2",
40-
"@typescript-eslint/eslint-plugin": "^2.0.0",
41-
"@typescript-eslint/parser": "^2.0.0",
31+
"@babel/core": "^7.7.2",
32+
"@storybook/addon-actions": "^5.2.6",
33+
"@storybook/addon-links": "^5.2.6",
34+
"@storybook/addon-storysource": "^5.2.6",
35+
"@storybook/addons": "^5.2.6",
36+
"@storybook/react": "^5.2.6",
37+
"@testing-library/react-hooks": "^3.2.1",
38+
"@types/jest": "^24.0.22",
39+
"@types/react": "^16.9.11",
40+
"@typescript-eslint/eslint-plugin": "^2.6.1",
41+
"@typescript-eslint/parser": "^2.6.1",
4242
"babel-loader": "^8.0.6",
43-
"eslint": "^6.2.1",
44-
"eslint-config-prettier": "^6.1.0",
45-
"eslint-plugin-jest": "^22.15.2",
46-
"eslint-plugin-prettier": "^3.1.0",
47-
"eslint-plugin-react": "^7.14.3",
48-
"eslint-plugin-react-hooks": "^2.0.1",
43+
"eslint": "^6.6.0",
44+
"eslint-config-prettier": "^6.5.0",
45+
"eslint-plugin-jest": "^23.0.3",
46+
"eslint-plugin-prettier": "^3.1.1",
47+
"eslint-plugin-react": "^7.16.0",
48+
"eslint-plugin-react-hooks": "^2.2.0",
4949
"jest": "^24.9.0",
50-
"prettier": "^1.18.2",
51-
"react": "^16.9.0",
52-
"react-test-renderer": "^16.9.0",
53-
"rollup": "^1.20.0",
54-
"rollup-plugin-typescript2": "^0.22.1",
50+
"prettier": "^1.19.1",
51+
"react": "^16.11.0",
52+
"react-test-renderer": "^16.11.0",
53+
"rollup": "^1.26.4",
54+
"rollup-plugin-typescript2": "^0.25.2",
5555
"shx": "^0.3.2",
56-
"ts-jest": "^24.0.0",
57-
"typescript": "^3.5.3",
56+
"ts-jest": "^24.1.0",
57+
"typescript": "^3.7.2",
5858
"weak": "^1.0.1"
5959
},
6060
"peerDependencies": {

‎src/__tests__/react-hooks.ts‎

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { act } from "react-test-renderer";
2-
import { Repeater } from "@repeaterjs/repeater";
2+
import { Push, Repeater, Stop } from "@repeaterjs/repeater";
33
import { renderHook } from "@testing-library/react-hooks";
44
import { useAsyncIter, useRepeater, useResult, useValue } from "../react-hooks";
55

@@ -98,8 +98,8 @@ describe("useAsyncIter", () => {
9898

9999
describe("useResult", () => {
100100
test("basic", async () => {
101-
let push: (value: number) => Promise<void>;
102-
let stop: (() => void) & Promise<void>;
101+
let push: Push<number>;
102+
let stop: Stop;
103103
const repeater = new Repeater(async (push1, stop1) => {
104104
push = push1;
105105
stop = stop1;
@@ -115,22 +115,21 @@ describe("useResult", () => {
115115
});
116116

117117
expect(result.current).toBeUndefined();
118-
await act(() => push(1));
118+
await act(async () => void (await push(1)));
119119
expect(result.current).toEqual({ value: 1, done: false });
120-
await act(() => push(2));
120+
await act(async () => void (await push(2)));
121121
expect(result.current).toEqual({ value: 2, done: false });
122-
await act(() => push(3));
122+
await act(async () => void (await push(3)));
123123
expect(result.current).toEqual({ value: 3, done: false });
124-
await act(() => push(4));
124+
await act(async () => void (await push(4)));
125125
expect(result.current).toEqual({ value: 4, done: false });
126-
// we have to return stop here to stop act from yelling at us
127126
await act(async () => (stop(), stop));
128127
expect(result.current).toEqual({ value: -1, done: true });
129128
expect(callback).toHaveBeenCalledTimes(1);
130129
});
131130

132131
test("unmount", async () => {
133-
let push: (value: number) => Promise<void>;
132+
let push: Push<number>;
134133
const repeater = new Repeater(async (push1) => {
135134
push = push1;
136135
return -1;
@@ -145,7 +144,7 @@ describe("useResult", () => {
145144
});
146145

147146
expect(result.current).toBeUndefined();
148-
await act(() => push(1));
147+
await act(async () => void (await push(1)));
149148
expect(result.current).toEqual({ value: 1, done: false });
150149
unmount();
151150
expect(callback).toHaveBeenCalledTimes(1);
@@ -154,11 +153,7 @@ describe("useResult", () => {
154153

155154
test("deps", async () => {
156155
const callback = jest.fn((deps) => {
157-
return new Repeater<number>(async (push1) => {
158-
const push = async (num: number) => {
159-
return act(() => push1(num));
160-
};
161-
156+
return new Repeater<number>(async (push) => {
162157
for await (const [num] of deps) {
163158
await push(num);
164159
}
@@ -191,8 +186,8 @@ describe("useResult", () => {
191186

192187
describe("useValue", () => {
193188
test("basic", async () => {
194-
let push: (value: number) => Promise<void>;
195-
let stop: (() => void) & Promise<void>;
189+
let push: Push<number>;
190+
let stop: Stop;
196191
const repeater = new Repeater(async (push1, stop1) => {
197192
push = push1;
198193
stop = stop1;
@@ -208,15 +203,14 @@ describe("useValue", () => {
208203
});
209204

210205
expect(result.current).toBeUndefined();
211-
await act(() => push(1));
206+
await act(async () => void (await push(1)));
212207
expect(result.current).toBe(1);
213-
await act(() => push(2));
208+
await act(async () => void (await push(2)));
214209
expect(result.current).toBe(2);
215-
await act(() => push(3));
210+
await act(async () => void (await push(3)));
216211
expect(result.current).toBe(3);
217-
await act(() => push(4));
212+
await act(async () => void (await push(4)));
218213
expect(result.current).toBe(4);
219-
// we have to return stop here to stop act from yelling at us
220214
await act(async () => (stop(), stop));
221215
expect(result.current).toBe(-1);
222216
rerender();
@@ -225,7 +219,7 @@ describe("useValue", () => {
225219
});
226220

227221
test("unmount", async () => {
228-
let push: (value: number) => Promise<void>;
222+
let push: Push<number>;
229223
const repeater = new Repeater(async (push1) => {
230224
push = push1;
231225
return -1;
@@ -241,7 +235,7 @@ describe("useValue", () => {
241235
});
242236

243237
expect(result.current).toBeUndefined();
244-
await act(() => push(1));
238+
await act(async () => void (await push(1)));
245239
expect(result.current).toBe(1);
246240
unmount();
247241
expect(callback).toHaveBeenCalledTimes(1);
@@ -250,11 +244,7 @@ describe("useValue", () => {
250244

251245
test("deps", async () => {
252246
const callback = jest.fn((deps) => {
253-
return new Repeater<number>(async (push1) => {
254-
const push = async (num: number) => {
255-
return act(() => push1(num));
256-
};
257-
247+
return new Repeater<number>(async (push) => {
258248
for await (const [num] of deps) {
259249
await push(num);
260250
}

‎src/react-hooks.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { Push, Repeater, RepeaterBuffer, Stop } from "@repeaterjs/repeater";
55
// We need to return push and stop synchronously from the useRepeater hook so
66
// we prime the repeater by calling next immediately.
77
function createPrimedRepeater<T>(
8-
buffer?: RepeaterBuffer<T>,
8+
buffer?: RepeaterBuffer,
99
): [Repeater<T>, Push<T>, Stop] {
1010
let push: Push<T>;
1111
let stop: Stop;
12-
const repeater = new Repeater((push1, stop1) => {
12+
const repeater = new Repeater<T>((push1, stop1) => {
1313
push = push1;
1414
stop = stop1;
1515
// this value is thrown away
@@ -21,9 +21,9 @@ function createPrimedRepeater<T>(
2121
}
2222

2323
export function useRepeater<T>(
24-
buffer?: RepeaterBuffer<T>,
24+
buffer?: RepeaterBuffer,
2525
): [Repeater<T>, Push<T>, Stop] {
26-
const [tuple] = useState(() => createPrimedRepeater(buffer));
26+
const [tuple] = useState(() => createPrimedRepeater<T>(buffer));
2727
return tuple;
2828
}
2929

0 commit comments

Comments
 (0)