Skip to content

Commit

Permalink
sync changes with private repo for common files (#150)
Browse files Browse the repository at this point in the history
* sync changes with private repo for common files

* Revert "fix: update @testing-library/react to use create root (#151)"

This reverts commit 960f53f.

Co-authored-by: Xinyi <xinyxu@amazon.com>
  • Loading branch information
sheilaXu and Xinyi authored Jul 14, 2022
1 parent 6efeac4 commit 36100db
Show file tree
Hide file tree
Showing 4 changed files with 213 additions and 47 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@
"eslint-config-prettier": "8.3.0",
"eslint-plugin-chai-friendly": "0.7.2",
"eslint-plugin-cypress": "2.12.1",
"eslint-plugin-formatjs": "3.0.0",
"eslint-plugin-import": "2.25.2",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-react": "7.26.1",
"eslint-plugin-react-hooks": "^4.2.0",
Expand All @@ -89,11 +91,12 @@
"stylelint-config-standard": "25.0.0",
"ts-jest": "26.5.6",
"ts-loader": "9.2.6",
"ts-node": "^10.0.0",
"webpack": "^4.41.2",
"write-file-webpack-plugin": "^4.5.0"
},
"resolutions": {
"@types/react": "^17.0.2",
"@types/react-dom": "^17.0.2"
"@types/react-dom": "^17.0.2"
}
}
16 changes: 8 additions & 8 deletions packages/related-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"@awsui/collection-hooks": "^1.0.0",
"@awsui/components-react": "^3.0.0",
"@awsui/design-tokens": "^3.0.0",
"react": ">=17.0.2",
"react-dom": ">=17.0.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"styled-components": "^5.3.0"
},
"devDependencies": {
Expand All @@ -53,9 +53,10 @@
"@storybook/addons": "^6.2.9",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^6.2.9",
"@testing-library/react": "^13.1.1",
"@types/react": ">=17.0.2",
"@types/react-dom": ">=17.0.2",
"@testing-library/react": "^12.0.0",
"@testing-library/react-hooks": "^7.0.0",
"@types/react": "^17.0.2",
"@types/react-dom": "^17.0.2",
"@types/styled-components": "^5.1.10",
"@types/uuid": "^8.3.4",
"autoprefixer": "^10.2.6",
Expand All @@ -66,14 +67,13 @@
"husky": "^6.0.0",
"microbundle": "^0.13.3",
"postcss": "^8.3.4",
"react": ">=17.0.2",
"react-dom": ">=17.0.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"rollup": "^2.52.2",
"rollup-plugin-postcss": "^4.0.0",
"sass": "^1.30.0",
"sass-loader": "^10.2.0",
"style-loader": "^2.0.0",
"ts-node": "^10.0.0",
"tslib": "^2.3.0",
"typescript": "^4.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/related-table/src/Hooks/useTreeCollection.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { act, renderHook } from '@testing-library/react';
import { act, renderHook } from '@testing-library/react-hooks';
import { useTreeCollection } from './useTreeCollection';

const items = [
Expand Down
Loading

0 comments on commit 36100db

Please sign in to comment.