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.

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

[WIP] Try to upgrade to React 18 #1541

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ html(lang='en')
strong Javascript is disabled!
| Looks like you have JavaScript disabled in your browser. Please enable it to enjoy our service.

if opts.livereload
script( src="/webpack-dev-server.js" )

script.
if (window.CONFIG.analytics.google) {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"mousetrap": "~1.6.5",
"porter-stemmer": "~0.9.1",
"prop-types": "~15.8.1",
"react": "~17.0.2",
"react-dom": "~17.0.2",
"react": "~18.0.0",
"react-dom": "~18.0.0",
"react-dropzone-component": "~3.2.0",
"react-final-form-hooks": "~2.0.2",
"react-google-recaptcha": "~2.1.0",
Expand Down
5 changes: 4 additions & 1 deletion src/components/color-theme-setter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import { darkTheme as selectDarkTheme } from './select-utils';
export function ColorSchemeSetter() {
const darkTheme = useSelector(selectDarkTheme);

useEffect(() => document.documentElement.classList.toggle('dark-theme', darkTheme), [darkTheme]);
useEffect(
() => void document.documentElement.classList.toggle('dark-theme', darkTheme),
[darkTheme],
);

return (
<Helmet defer={false}>
Expand Down
5 changes: 2 additions & 3 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global CONFIG */
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Router, Route, IndexRoute, browserHistory, Redirect } from 'react-router';
import { Provider, useSelector } from 'react-redux';
import { syncHistoryWithStore } from 'react-router-redux';
Expand Down Expand Up @@ -362,11 +362,10 @@ function App() {
);
}

ReactDOM.render(
createRoot(document.querySelector('#app')).render(
<Provider store={store}>
<App />
</Provider>,
document.querySelector('#app'),
);

function checkPath(Component, checker) {
Expand Down
35 changes: 21 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11163,16 +11163,15 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:~17.0.2":
version: 17.0.2
resolution: "react-dom@npm:17.0.2"
"react-dom@npm:~18.0.0":
version: 18.0.0
resolution: "react-dom@npm:18.0.0"
dependencies:
loose-envify: ^1.1.0
object-assign: ^4.1.1
scheduler: ^0.20.2
scheduler: ^0.21.0
peerDependencies:
react: 17.0.2
checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c
react: ^18.0.0
checksum: dd0ba9f2f31dd728076c892a95b2f5a8dfe79136431b0289afb46eec39d0ca6b6f0f40a60fd8aa6ef702c98ce7c26100d3d4dbc35c7c9e87429cd04f84cb58bd
languageName: node
linkType: hard

Expand Down Expand Up @@ -11520,13 +11519,12 @@ __metadata:
languageName: node
linkType: hard

"react@npm:~17.0.2":
version: 17.0.2
resolution: "react@npm:17.0.2"
"react@npm:~18.0.0":
version: 18.0.0
resolution: "react@npm:18.0.0"
dependencies:
loose-envify: ^1.1.0
object-assign: ^4.1.1
checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b
checksum: 293020b96536b3c7113ee57ca5c990a3f25649d1751b1c7a3aabd16dff0691fe9f1eed1206616d0906d05933536052037340a0c8d0941ff870b0eb469a2f975b
languageName: node
linkType: hard

Expand Down Expand Up @@ -11614,8 +11612,8 @@ __metadata:
pug: ~3.0.2
pug-loader: ~2.4.0
querystring: ~0.2.1
react: ~17.0.2
react-dom: ~17.0.2
react: ~18.0.0
react-dom: ~18.0.0
react-dropzone-component: ~3.2.0
react-final-form-hooks: ~2.0.2
react-google-recaptcha: ~2.1.0
Expand Down Expand Up @@ -12317,6 +12315,15 @@ __metadata:
languageName: node
linkType: hard

"scheduler@npm:^0.21.0":
version: 0.21.0
resolution: "scheduler@npm:0.21.0"
dependencies:
loose-envify: ^1.1.0
checksum: 4f8285076041ed2c81acdd1faa987f1655fdbd30554bc667c1ea64743fc74fb3a04ca7d27454b3d678735df5a230137a3b84756061b43dc5796e80701b66d124
languageName: node
linkType: hard

"schema-utils@npm:^2.6.5":
version: 2.7.1
resolution: "schema-utils@npm:2.7.1"
Expand Down