Skip to content

Commit

Permalink
Set version for avatars (cypress-io#689)
Browse files Browse the repository at this point in the history
* Set version for avatars

* upgrade @material-ui/core and @material-ui/icons

* add .yarnrc with increase network timeout for windows to help with material ui download

per mui/material-ui#12432 (comment)
  • Loading branch information
Kevin Old authored Dec 14, 2020
1 parent 79b13b0 commit 4a2045e
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 36 deletions.
4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,14 @@ windows-workflow: &windows-workflow
# executor comes from the "windows" orb
name: win/default
shell: bash.exe
size: large
post-steps:
- run:
name: Cypress info
command: yarn cypress info
- run:
name: Cypress cache list
command: yarn cypress cache list
- run:
name: Check Types
command: yarn types
Expand Down
1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
network-timeout 500000
10 changes: 5 additions & 5 deletions data/database-seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Norene39@yahoo.com",
"phoneNumber": "625-316-9882",
"avatar": "https://avatars.dicebear.com/api/human/t45AiwidW.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/t45AiwidW.svg",
"defaultPrivacyLevel": "public",
"balance": 168137,
"createdAt": "2019-08-27T23:47:05.637Z",
Expand All @@ -24,7 +24,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Aniya_Powlowski36@hotmail.com",
"phoneNumber": "537-041-4355",
"avatar": "https://avatars.dicebear.com/api/human/qywYp6hS0U.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/qywYp6hS0U.svg",
"defaultPrivacyLevel": "private",
"balance": 101805,
"createdAt": "2019-09-09T13:48:45.489Z",
Expand All @@ -39,7 +39,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Rebeca35@yahoo.com",
"phoneNumber": "072-208-4283",
"avatar": "https://avatars.dicebear.com/api/human/bDjUb4ir5O.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/bDjUb4ir5O.svg",
"defaultPrivacyLevel": "private",
"balance": 164867,
"createdAt": "2019-09-15T04:44:05.536Z",
Expand All @@ -54,7 +54,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Pearl56@gmail.com",
"phoneNumber": "974-916-8746",
"avatar": "https://avatars.dicebear.com/api/human/24VniajY1y.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/24VniajY1y.svg",
"defaultPrivacyLevel": "private",
"balance": 145779,
"createdAt": "2020-03-06T02:15:42.584Z",
Expand All @@ -69,7 +69,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Jordy37@yahoo.com",
"phoneNumber": "277-189-3402",
"avatar": "https://avatars.dicebear.com/api/human/tsHF6_D5oQ.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/tsHF6_D5oQ.svg",
"defaultPrivacyLevel": "contacts",
"balance": 75369,
"createdAt": "2020-02-11T21:26:46.510Z",
Expand Down
10 changes: 5 additions & 5 deletions data/database.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Norene39@yahoo.com",
"phoneNumber": "625-316-9882",
"avatar": "https://avatars.dicebear.com/api/human/t45AiwidW.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/t45AiwidW.svg",
"defaultPrivacyLevel": "public",
"balance": 168137,
"createdAt": "2019-08-27T23:47:05.637Z",
Expand All @@ -24,7 +24,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Aniya_Powlowski36@hotmail.com",
"phoneNumber": "537-041-4355",
"avatar": "https://avatars.dicebear.com/api/human/qywYp6hS0U.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/qywYp6hS0U.svg",
"defaultPrivacyLevel": "private",
"balance": 101805,
"createdAt": "2019-09-09T13:48:45.489Z",
Expand All @@ -39,7 +39,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Rebeca35@yahoo.com",
"phoneNumber": "072-208-4283",
"avatar": "https://avatars.dicebear.com/api/human/bDjUb4ir5O.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/bDjUb4ir5O.svg",
"defaultPrivacyLevel": "private",
"balance": 164867,
"createdAt": "2019-09-15T04:44:05.536Z",
Expand All @@ -54,7 +54,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Pearl56@gmail.com",
"phoneNumber": "974-916-8746",
"avatar": "https://avatars.dicebear.com/api/human/24VniajY1y.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/24VniajY1y.svg",
"defaultPrivacyLevel": "private",
"balance": 145779,
"createdAt": "2020-03-06T02:15:42.584Z",
Expand All @@ -69,7 +69,7 @@
"password": "$2a$10$5PXHGtcsckWtAprT5/JmluhR13f16BL8SIGhvAKNP.Dhxkt69FfzW",
"email": "Jordy37@yahoo.com",
"phoneNumber": "277-189-3402",
"avatar": "https://avatars.dicebear.com/api/human/tsHF6_D5oQ.svg",
"avatar": "https://avatars.dicebear.com/4.4/api/human/tsHF6_D5oQ.svg",
"defaultPrivacyLevel": "contacts",
"balance": 75369,
"createdAt": "2020-02-11T21:26:46.510Z",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@babel/cli": "7.12.8",
"@babel/core": "7.12.9",
"@babel/preset-env": "7.12.7",
"@material-ui/core": "4.11.0",
"@material-ui/icons": "4.9.1",
"@material-ui/core": "4.11.2",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "4.0.0-alpha.56",
"@percy/cypress": "2.3.3",
"@types/bcryptjs": "2.4.2",
Expand Down
57 changes: 33 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2480,28 +2480,28 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"

"@material-ui/core@4.11.0":
version "4.11.0"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"
integrity sha512-bYo9uIub8wGhZySHqLQ833zi4ZML+XCBE1XwJ8EuUVSpTWWG57Pm+YugQToJNFsEyiKFhPh8DPD0bgupz8n01g==
"@material-ui/core@4.11.2":
version "4.11.2"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.2.tgz#f8276dfa40d88304e6ceb98962af73803d27d42d"
integrity sha512-/D1+AQQeYX/WhT/FUk78UCRj8ch/RCglsQLYujYTIqPSJlwZHKcvHidNeVhODXeApojeXjkl0tWdk5C9ofwOkQ==
dependencies:
"@babel/runtime" "^7.4.4"
"@material-ui/styles" "^4.10.0"
"@material-ui/system" "^4.9.14"
"@material-ui/styles" "^4.11.2"
"@material-ui/system" "^4.11.2"
"@material-ui/types" "^5.1.0"
"@material-ui/utils" "^4.10.2"
"@material-ui/utils" "^4.11.2"
"@types/react-transition-group" "^4.2.0"
clsx "^1.0.4"
hoist-non-react-statics "^3.3.2"
popper.js "1.16.1-lts"
prop-types "^15.7.2"
react-is "^16.8.0"
react-is "^16.8.0 || ^17.0.0"
react-transition-group "^4.4.0"

"@material-ui/icons@4.9.1":
version "4.9.1"
resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.9.1.tgz#fdeadf8cb3d89208945b33dbc50c7c616d0bd665"
integrity sha512-GBitL3oBWO0hzBhvA9KxqcowRUsA0qzwKkURyC8nppnC3fw54KPKZ+d4V1Eeg/UnDRSzDaI9nGCdel/eh9AQMg==
"@material-ui/icons@4.11.2":
version "4.11.2"
resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.2.tgz#b3a7353266519cd743b6461ae9fdfcb1b25eb4c5"
integrity sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==
dependencies:
"@babel/runtime" "^7.4.4"

Expand All @@ -2516,15 +2516,15 @@
prop-types "^15.7.2"
react-is "^16.8.0"

"@material-ui/styles@^4.10.0":
version "4.10.0"
resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz#2406dc23aa358217aa8cc772e6237bd7f0544071"
integrity sha512-XPwiVTpd3rlnbfrgtEJ1eJJdFCXZkHxy8TrdieaTvwxNYj42VnnCyFzxYeNW9Lhj4V1oD8YtQ6S5Gie7bZDf7Q==
"@material-ui/styles@^4.11.2":
version "4.11.2"
resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.2.tgz#e70558be3f41719e8c0d63c7a3c9ae163fdc84cb"
integrity sha512-xbItf8zkfD3FuGoD9f2vlcyPf9jTEtj9YTJoNNV+NMWaSAHXgrW6geqRoo/IwBuMjqpwqsZhct13e2nUyU9Ljw==
dependencies:
"@babel/runtime" "^7.4.4"
"@emotion/hash" "^0.8.0"
"@material-ui/types" "^5.1.0"
"@material-ui/utils" "^4.9.6"
"@material-ui/utils" "^4.11.2"
clsx "^1.0.4"
csstype "^2.5.2"
hoist-non-react-statics "^3.3.2"
Expand All @@ -2538,13 +2538,13 @@
jss-plugin-vendor-prefixer "^10.0.3"
prop-types "^15.7.2"

"@material-ui/system@^4.9.14":
version "4.9.14"
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f"
integrity sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w==
"@material-ui/system@^4.11.2":
version "4.11.2"
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.11.2.tgz#7f0a754bba3673ed5fdbfa02fe438096c104b1f6"
integrity sha512-BELFJEel5E+5DMiZb6XXT3peWRn6UixRvBtKwSxqntmD0+zwbbfCij6jtGwwdJhN1qX/aXrKu10zX31GBaeR7A==
dependencies:
"@babel/runtime" "^7.4.4"
"@material-ui/utils" "^4.9.6"
"@material-ui/utils" "^4.11.2"
csstype "^2.5.2"
prop-types "^15.7.2"

Expand All @@ -2553,7 +2553,7 @@
resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==

"@material-ui/utils@^4.10.2", "@material-ui/utils@^4.9.6":
"@material-ui/utils@^4.10.2":
version "4.10.2"
resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.10.2.tgz#3fd5470ca61b7341f1e0468ac8f29a70bf6df321"
integrity sha512-eg29v74P7W5r6a4tWWDAAfZldXIzfyO1am2fIsC39hdUUHm/33k6pGOKPbgDjg/U/4ifmgAePy/1OjkKN6rFRw==
Expand All @@ -2562,6 +2562,15 @@
prop-types "^15.7.2"
react-is "^16.8.0"

"@material-ui/utils@^4.11.2":
version "4.11.2"
resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a"
integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==
dependencies:
"@babel/runtime" "^7.4.4"
prop-types "^15.7.2"
react-is "^16.8.0 || ^17.0.0"

"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
Expand Down Expand Up @@ -12666,7 +12675,7 @@ react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==

react-is@^17.0.1:
"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
Expand Down

0 comments on commit 4a2045e

Please sign in to comment.