Skip to content

Commit

Permalink
Merge branch 'main' into update-get-started
Browse files Browse the repository at this point in the history
  • Loading branch information
julieg18 authored May 31, 2023
2 parents a863a41 + 8572ef0 commit 9750ed1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
},
"resolutions": {
"decode-uri-component": "0.2.2",
"@types/react": "18.2.6",
"@types/react": "18.2.7",
"**/recursive-readdir/minimatch": "6.2.0",
"fastify": "3.29.5",
"json5": "2.2.3",
Expand Down
2 changes: 1 addition & 1 deletion webview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@types/jest": "29.5.1",
"@types/jsdom": "21.1.1",
"@types/node": "16.x",
"@types/react": "18.2.6",
"@types/react": "18.2.7",
"@types/react-dom": "18.2.4",
"@types/react-measure": "2.0.8",
"@types/react-virtualized": "9.21.22",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5493,10 +5493,10 @@
"@types/prop-types" "*"
"@types/react" "*"

"@types/react@*", "@types/[email protected].6", "@types/react@>=16", "@types/react@^16.9.19":
version "18.2.6"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.6.tgz#5cd53ee0d30ffc193b159d3516c8c8ad2f19d571"
integrity sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==
"@types/react@*", "@types/[email protected].7", "@types/react@>=16", "@types/react@^16.9.19":
version "18.2.7"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.7.tgz#dfb4518042a3117a045b8c222316f83414a783b3"
integrity sha512-ojrXpSH2XFCmHm7Jy3q44nXDyN54+EYKP2lBhJ2bqfyPj6cIUW/FZW/Csdia34NQgq7KYcAlHi5184m4X88+yw==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down

0 comments on commit 9750ed1

Please sign in to comment.