Skip to content

Commit

Permalink
Merge branch 'main' of github.com:redwoodjs/redwood
Browse files Browse the repository at this point in the history
  • Loading branch information
@cannikin
cannikin committed May 12, 2021
2 parents 130507c + 7fe4da6 commit 5cf8f79
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 39 deletions.
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
"whatwg-fetch": "3.4.1"
},
"resolutions": {
"@types/react": "17.0.3",
"@types/react": "17.0.5",
"prop-types": "15.7.2",
"react-dom": "17.0.1",
"react": "17.0.1",
"react-dom": "17.0.2",
"react": "17.0.2",
"typescript": "4.2.4",
"vscode-languageserver-protocol": "3.15.3",
"vscode-languageserver-types": "3.15.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"@auth0/auth0-spa-js": "^1.14.0",
"@supabase/supabase-js": "^1.11.12",
"@types/netlify-identity-widget": "^1.9.1",
"@types/react": "17.0.3",
"@types/react": "17.0.5",
"firebase": "^8.6.0",
"firebase-admin": "^9.7.0",
"gotrue-js": "^0.9.29",
"magic-sdk": "^2.5.0",
"msal": "^1.4.10",
"netlify-identity-widget": "1.9.1",
"nhost-js-sdk": "^3.0.0-14",
"react": "^17.0.1"
"react": "^17.0.2"
},
"scripts": {
"build": "yarn build:js && yarn build:types",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"@testing-library/jest-dom": "5.11.6",
"@types/jest": "^26.0.23",
"@types/node": "^15.0.2",
"@types/react": "17.0.3",
"@types/react-dom": "^17.0.1",
"@types/react": "17.0.5",
"@types/react-dom": "^17.0.4",
"@types/webpack": "^4.41.11",
"babel-jest": "^26.3.0",
"babel-loader": "^8.1.0",
Expand Down
4 changes: 0 additions & 4 deletions packages/create-redwood-app/template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,5 @@
"engines": {
"node": "14.x",
"yarn": "1.x"
},
"resolutions": {
"react": "17.0.1",
"react-dom": "17.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/create-redwood-app/template/web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@redwoodjs/router": "^0.32.0",
"@redwoodjs/web": "^0.32.0",
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-dom": "^17.0.1"
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
}
4 changes: 2 additions & 2 deletions packages/router/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"devDependencies": {
"@types/lodash.isequal": "^4.5.5",
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-dom": "^17.0.1"
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"scripts": {
"build": "yarn build:js && yarn build:types",
Expand Down
2 changes: 1 addition & 1 deletion packages/testing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@redwoodjs/router": "^0.32.0",
"@redwoodjs/web": "^0.32.0",
"@testing-library/react": "11.2.6",
"@types/react": "17.0.3",
"@types/react": "17.0.5",
"msw": "^0.28.2"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"react-hot-toast": "^1.0.2"
},
"peerDependencies": {
"react": "^17.0.1"
"react": "^17.0.2"
},
"devDependencies": {
"@types/react": "17.0.3"
"@types/react": "17.0.5"
},
"scripts": {
"build": "yarn build:js && yarn build:types",
Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4513,10 +4513,10 @@
"@types/react" "*"
"@types/reactcss" "*"

"@types/react-dom@^17.0.1":
version "17.0.2"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.2.tgz#35654cf6c49ae162d5bc90843d5437dc38008d43"
integrity sha512-Icd9KEgdnFfJs39KyRyr0jQ7EKhq8U6CcHRMGAS45fp5qgUvxL3ujUCfWFttUK2UErqZNj97t9gsVPNAqcwoCg==
"@types/react-dom@^17.0.4":
version "17.0.4"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.4.tgz#d65159a847aca2a0fc87a7544a2f8fece8754d04"
integrity sha512-Wb6rlnPJfqbhpkvYN39y1NM/pOGGPzzIRquu0RdUMvTwgXNvASFO7pdtrtvyxGTQNb9wzBaQxXAWDdEqegZw2A==
dependencies:
"@types/react" "*"

Expand All @@ -4534,10 +4534,10 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/[email protected].3":
version "17.0.3"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
"@types/react@*", "@types/[email protected].5":
version "17.0.5"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz#3d887570c4489011f75a3fc8f965bf87d09a1bea"
integrity sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down Expand Up @@ -16102,14 +16102,14 @@ react-docgen@^5.0.0:
node-dir "^0.1.10"
strip-indent "^3.0.0"

[email protected].1, react-dom@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
[email protected].2, react-dom@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler "^0.20.1"
scheduler "^0.20.2"

react-draggable@^4.0.3:
version "4.4.3"
Expand Down Expand Up @@ -16241,10 +16241,10 @@ react-textarea-autosize@^8.1.1, react-textarea-autosize@^8.3.0:
use-composed-ref "^1.0.0"
use-latest "^1.0.0"

[email protected].1, react@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
[email protected].2, react@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down Expand Up @@ -16899,10 +16899,10 @@ saxes@^5.0.1:
dependencies:
xmlchars "^2.2.0"

scheduler@^0.20.1:
version "0.20.1"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
scheduler@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down

0 comments on commit 5cf8f79

Please sign in to comment.