Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync changes with private repo for common files #150

Merged
merged 4 commits into from
Jul 14, 2022
Merged

sync changes with private repo for common files #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a1d57a
sync changes with private repo for common files
Jul 8, 2022
a79860d
Merge branch 'main' into sync-with-private-repo
Jul 14, 2022
71f522c
Revert "fix: update @testing-library/react to use create root (#151)"
Jul 14, 2022
84073d2
Merge branch 'main' into sync-with-private-repo
sheilaXu Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
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
View file
Open in desktop
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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the change in range for react versions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the current version locks react and react-dom to v18, but our new package installs a v17 which then caused multi react error. our new package was using v16, it can build with v17 but it could take a while to migrate itself and its dependencies to v18. the react-components packages also uses v17. so if there isn't a hard requirement to support v18, can we target v17?

"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
View file
Open in desktop
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