Skip to content

Commit 28a88dd

Browse files
chore: minor identation and version bump for react-redux to v7 (needed for React 17))
1 parent 7717db2 commit 28a88dd

File tree

3 files changed

+49
-21
lines changed

3 files changed

+49
-21
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"react-bootstrap": "^0.33.1",
4949
"react-datetime": "^2.15.0",
5050
"react-dom": "^17.0.2",
51-
"react-redux": "^5.0.7",
51+
"react-redux": "^7.2.0",
5252
"react-rte-ref-fix": "^0.16.2",
5353
"react-test-renderer": "^17.0.2",
5454
"react-transition-group": "^1.2.1",
@@ -73,6 +73,7 @@
7373
"@emotion/core": "^10.0.17",
7474
"@emotion/styled": "^10.0.17",
7575
"@github/clipboard-copy-element": "^1.1.2",
76+
"@marsidev/react-turnstile": "^1.0.0",
7677
"@material-ui/core": "^4.11.4",
7778
"@material-ui/icons": "^4.11.2",
7879
"@material-ui/lab": "^4.0.0-alpha.61",
@@ -103,7 +104,6 @@
103104
"popper.js": "^1.14.3",
104105
"pure": "^2.85.0",
105106
"pwstrength-bootstrap": "^3.0.10",
106-
"@marsidev/react-turnstile": "^1.0.0",
107107
"react-otp-input": "^3.1.1",
108108
"react-password-strength-bar": "^0.4.0",
109109
"react-simplemde-editor": "^5.2.0",
@@ -114,4 +114,4 @@
114114
"yup": "^0.32.11"
115115
},
116116
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
117-
}
117+
}

resources/js/forgot_password/forgot_password.module.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
}
1515
}
1616

17-
.turnstile {
18-
margin-top: 10px;
19-
margin-bottom: 10px;
20-
text-align: center;
21-
}
17+
.turnstile {
18+
margin-top: 10px;
19+
margin-bottom: 10px;
20+
text-align: center;
21+
}
2222

2323
.forgot_password_container {
2424
border: solid 1px $border-color;

yarn.lock

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,11 @@
980980
dependencies:
981981
regenerator-runtime "^0.13.11"
982982

983+
"@babel/runtime@^7.9.2":
984+
version "7.29.2"
985+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.2.tgz#9a6e2d05f4b6692e1801cd4fb176ad823930ed5e"
986+
integrity sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==
987+
983988
"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
984989
version "7.20.7"
985990
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
@@ -1787,6 +1792,13 @@
17871792
dependencies:
17881793
"@types/node" "*"
17891794

1795+
"@types/hoist-non-react-statics@^3.3.0":
1796+
version "3.3.7"
1797+
resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz#306e3a3a73828522efa1341159da4846e7573a6c"
1798+
integrity sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==
1799+
dependencies:
1800+
hoist-non-react-statics "^3.3.0"
1801+
17901802
"@types/http-proxy@^1.17.8":
17911803
version "1.17.9"
17921804
resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
@@ -1897,6 +1909,16 @@
18971909
dependencies:
18981910
"@types/react" "*"
18991911

1912+
"@types/react-redux@^7.1.20":
1913+
version "7.1.34"
1914+
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.34.tgz#83613e1957c481521e6776beeac4fd506d11bd0e"
1915+
integrity sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==
1916+
dependencies:
1917+
"@types/hoist-non-react-statics" "^3.3.0"
1918+
"@types/react" "*"
1919+
hoist-non-react-statics "^3.3.0"
1920+
redux "^4.0.0"
1921+
19001922
"@types/react-transition-group@^4.2.0":
19011923
version "4.4.5"
19021924
resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416"
@@ -8264,7 +8286,7 @@ react-fit@^1.7.0:
82648286
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
82658287
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
82668288

8267-
react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0:
8289+
react-is@^16.13.1, react-is@^16.3.2, react-is@^16.7.0:
82688290
version "16.13.1"
82698291
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
82708292
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -8274,7 +8296,7 @@ react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0:
82748296
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
82758297
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
82768298

8277-
react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
8299+
react-lifecycles-compat@^3.0.4:
82788300
version "3.0.4"
82798301
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
82808302
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
@@ -8315,18 +8337,17 @@ react-prop-types@^0.4.0:
83158337
dependencies:
83168338
warning "^3.0.0"
83178339

8318-
react-redux@^5.0.7:
8319-
version "5.1.2"
8320-
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57"
8321-
integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==
8340+
react-redux@^7.2.0:
8341+
version "7.2.9"
8342+
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
8343+
integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
83228344
dependencies:
8323-
"@babel/runtime" "^7.1.2"
8324-
hoist-non-react-statics "^3.3.0"
8325-
invariant "^2.2.4"
8326-
loose-envify "^1.1.0"
8327-
prop-types "^15.6.1"
8328-
react-is "^16.6.0"
8329-
react-lifecycles-compat "^3.0.0"
8345+
"@babel/runtime" "^7.15.4"
8346+
"@types/react-redux" "^7.1.20"
8347+
hoist-non-react-statics "^3.3.2"
8348+
loose-envify "^1.4.0"
8349+
prop-types "^15.7.2"
8350+
react-is "^17.0.2"
83308351

83318352
react-rte-ref-fix@^0.16.2:
83328353
version "0.16.2"
@@ -8531,6 +8552,13 @@ redux@^3.7.2:
85318552
loose-envify "^1.1.0"
85328553
symbol-observable "^1.0.3"
85338554

8555+
redux@^4.0.0:
8556+
version "4.2.1"
8557+
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
8558+
integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
8559+
dependencies:
8560+
"@babel/runtime" "^7.9.2"
8561+
85348562
regenerate-unicode-properties@^10.1.0:
85358563
version "10.1.0"
85368564
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"

0 commit comments

Comments
 (0)