Skip to content

Commit

Permalink
internal: Update tests for react 19
Browse files Browse the repository at this point in the history
  • Loading branch information
ntucker committed Dec 6, 2024
1 parent 2e4e44f commit 26ba748
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 23 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"@js-temporal/polyfill": "^0.4.4",
"@react-navigation/native": "^7.0.0",
"@react-navigation/native-stack": "^7.0.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/react": "16.0.1",
"@testing-library/react-hooks": "8.0.1",
"@testing-library/react-native": "12.9.0",
Expand Down Expand Up @@ -87,8 +88,8 @@
"node-fetch": "^3.3.0",
"npm-run-all": "^4.1.5",
"prettier": "3.4.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-native": "0.76.3",
"react-native-safe-area-context": "^4.14.0",
"react-native-screens": "^4.1.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/img/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"@anansi/browserslist-config": "^1.4.2",
"@data-client/react": "workspace:*",
"@types/node": "^22.0.0",
"@types/react": "19.0.0"
"@types/react": "19.0.0",
"react": "19.0.0"
}
}
1 change: 1 addition & 0 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
"@types/qs": "^6",
"@types/react": "19.0.0",
"qs": "^6.13.1",
"react": "19.0.0",
"react-native": "^0.76.0"
}
}
9 changes: 6 additions & 3 deletions packages/react/src/__tests__/integration-endpoint.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,8 @@ describe.each([
let data = result.current;
expect(data).toBeInstanceOf(ArticleResource.get.schema);
expect(data.title).toBe(temppayload.title);
expect(throws.length).toBe(1);
// react 19 suspends twice
expect(throws.length).toBeGreaterThanOrEqual(1);

mynock
.persist()
Expand Down Expand Up @@ -544,7 +545,8 @@ describe.each([
let [data, { invalidate }] = result.current;
expect(data).toBeInstanceOf(CoolerArticle);
expect(data.title).toBe(temppayload.title);
expect(throws.length).toBe(1);
// react 19 suspends twice
expect(throws.length).toBeGreaterThanOrEqual(1);

mynock
.persist()
Expand All @@ -553,7 +555,8 @@ describe.each([
act(() => {
invalidate(CoolerArticleResource.get, { id: temppayload.id });
});
expect(throws.length).toBe(2);
// react 19 suspends twice
expect(throws.length).toBeGreaterThanOrEqual(2);
await waitForNextUpdate();
[data, { invalidate }] = result.current;
expect(data).toBeInstanceOf(CoolerArticle);
Expand Down
5 changes: 2 additions & 3 deletions packages/react/src/components/DataProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,11 @@ See https://dataclient.io/docs/guides/ssr.`,
);
}
// contents of this component expected to be relatively stable
const controllerRef: React.MutableRefObject<DataController> =
useRef<any>(undefined);
const controllerRef: React.RefObject<DataController> = useRef<any>(undefined);
if (!controllerRef.current) controllerRef.current = new Controller();
//TODO: bind all methods so destructuring works

const managersRef: React.MutableRefObject<Manager[]> = useRef<any>(managers);
const managersRef: React.RefObject<Manager[]> = useRef<any>(managers);
if (!managersRef.current) managersRef.current = getDefaultManagers();

// run in a useEffect in DataStore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ describe('expireAll', () => {
act(() => {
controller.expireAll(CoolerArticleResource.get);
});
expect(throws.length).toBe(1);
// react 19 throws twice
expect(throws.length).toBeGreaterThanOrEqual(1);
});

it('should *not* suspend when invalidIfStale is false', () => {
Expand Down
9 changes: 6 additions & 3 deletions packages/react/src/hooks/__tests__/useController/fetch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -291,19 +291,22 @@ describe.each([
const [data, fetch] = result.current;
expect(data).toBeInstanceOf(CoolerArticle);
expect(data?.title).toBe(temppayload.title);
expect(throws.length).toBe(1);
// react 19 suspends twice
expect(throws.length).toBeGreaterThanOrEqual(1);

mynock
.persist()
.get(`/article-cooler/${temppayload.id}`)
.reply(200, { ...temppayload, title: 'othertitle' });

expect(throws.length).toBe(1);
// react 19 suspends twice
expect(throws.length).toBeGreaterThanOrEqual(1);
await act(async () => {
await fetch(FutureArticleResource.delete, temppayload.id);
rerender({ id: null });
});
expect(throws.length).toBe(1);
// react 19 suspends twice
expect(throws.length).toBeGreaterThanOrEqual(1);
expect(result.current[0]).toBe(null);
});

Expand Down
5 changes: 3 additions & 2 deletions packages/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"peerDependencies": {
"@data-client/react": "^0.1.0 || ^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0",
"@data-client/redux": "^0.1.0 || ^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0",
"@types/react": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"@types/react": "^16.14.0 || ^17.0.0 || ^18.0.0-0 || ^19.0.0",
"next": ">=12.0.0",
"react": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"redux": "^4.0.0 || ^5.0.0"
Expand All @@ -139,7 +139,8 @@
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"next": "^15.0.0",
"react-dom": "^19.0.0",
"react": "19.0.0",
"react-dom": "19.0.0",
"redux": "^5.0.0"
}
}
4 changes: 3 additions & 1 deletion packages/test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"@types/react-test-renderer": "19.0.0",
"jest": "^29.5.0"
"jest": "^29.5.0",
"react": "19.0.0",
"react-dom": "19.0.0"
}
}
20 changes: 13 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3149,6 +3149,7 @@ __metadata:
"@data-client/react": "workspace:*"
"@types/node": "npm:^22.0.0"
"@types/react": "npm:19.0.0"
react: "npm:19.0.0"
peerDependencies:
"@data-client/react": ^0.1.0 || ^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0
"@types/react": ^16.14.0 || ^17.0.0 || ^18.0.0-0 || ^19.0.0
Expand Down Expand Up @@ -3192,6 +3193,7 @@ __metadata:
"@types/qs": "npm:^6"
"@types/react": "npm:19.0.0"
qs: "npm:^6.13.1"
react: "npm:19.0.0"
react-native: "npm:^0.76.0"
peerDependencies:
"@react-navigation/native": ^6.0.0 || ^7.0.0
Expand Down Expand Up @@ -3247,12 +3249,13 @@ __metadata:
"@types/react": "npm:19.0.0"
"@types/react-dom": "npm:19.0.0"
next: "npm:^15.0.0"
react-dom: "npm:^19.0.0"
react: "npm:19.0.0"
react-dom: "npm:19.0.0"
redux: "npm:^5.0.0"
peerDependencies:
"@data-client/react": ^0.1.0 || ^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0
"@data-client/redux": ^0.1.0 || ^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0
"@types/react": ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
"@types/react": ^16.14.0 || ^17.0.0 || ^18.0.0-0 || ^19.0.0
next: ">=12.0.0"
react: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
redux: ^4.0.0 || ^5.0.0
Expand Down Expand Up @@ -3280,6 +3283,8 @@ __metadata:
"@types/react-dom": "npm:19.0.0"
"@types/react-test-renderer": "npm:19.0.0"
jest: "npm:^29.5.0"
react: "npm:19.0.0"
react-dom: "npm:19.0.0"
peerDependencies:
"@data-client/react": ^0.12.15 || ^0.13.0 || ^0.14.0
"@testing-library/react-hooks": ^8.0.0
Expand Down Expand Up @@ -6534,7 +6539,7 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/dom@npm:^10.1.0":
"@testing-library/dom@npm:^10.1.0, @testing-library/dom@npm:^10.4.0":
version: 10.4.0
resolution: "@testing-library/dom@npm:10.4.0"
dependencies:
Expand Down Expand Up @@ -25235,7 +25240,7 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^19.0.0":
"react-dom@npm:19.0.0, react-dom@npm:^19.0.0":
version: 19.0.0
resolution: "react-dom@npm:19.0.0"
dependencies:
Expand Down Expand Up @@ -25550,7 +25555,7 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^19.0.0":
"react@npm:19.0.0, react@npm:^19.0.0":
version: 19.0.0
resolution: "react@npm:19.0.0"
checksum: 10c0/9cad8f103e8e3a16d15cb18a0d8115d8bd9f9e1ce3420310aea381eb42aa0a4f812cf047bb5441349257a05fba8a291515691e3cb51267279b2d2c3253f38471
Expand Down Expand Up @@ -26727,6 +26732,7 @@ __metadata:
"@js-temporal/polyfill": "npm:^0.4.4"
"@react-navigation/native": "npm:^7.0.0"
"@react-navigation/native-stack": "npm:^7.0.0"
"@testing-library/dom": "npm:^10.4.0"
"@testing-library/react": "npm:16.0.1"
"@testing-library/react-hooks": "npm:8.0.1"
"@testing-library/react-native": "npm:12.9.0"
Expand Down Expand Up @@ -26754,8 +26760,8 @@ __metadata:
node-fetch: "npm:^3.3.0"
npm-run-all: "npm:^4.1.5"
prettier: "npm:3.4.1"
react: "npm:^19.0.0"
react-dom: "npm:^19.0.0"
react: "npm:19.0.0"
react-dom: "npm:19.0.0"
react-native: "npm:0.76.3"
react-native-safe-area-context: "npm:^4.14.0"
react-native-screens: "npm:^4.1.0"
Expand Down

0 comments on commit 26ba748

Please sign in to comment.