admin/beatconnect_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(app): bump react from 17 to 18 (#484)

Browse Source
This commit is contained in:
Yannis Petitot
2022-05-27 17:15:56 +02:00
committed by GitHub
parent 750e6accff
commit 125214d0f3
5 changed files with 87 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+4 -4
View File
@@ -118,12 +118,12 @@
"node-machine-id": "^1.1.12",
"osu-db-parser": "git+https://github.com/yadPe/osu-db-parser.git#6cc783f3a9270f730cd5038d03ada4a78634cd65",
"ps-node": "^0.1.6",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-jss": "^10.6.0",
"react-redux": "^7.2.3",
"react-redux": "^8.0.2",
"react-window": "^1.8.6",
"redux": "^4.0.5",
"redux": "^4.2.0",
"uleb128": "^1.0.1",
"underscore": "^1.13.0",
"universal-analytics": "^0.4.23"
src/App/Providers/AudioPlayer/Audioplayer.res
+4 -3
View File
@@ -196,9 +196,10 @@ let make = (~children) => {
Audio.oncanplay(audio, _e => setPlayingState(oldState => {...oldState, isPlaying: true}))
Audio.onvolumechange(audio, e =>
setPlayingState(oldState => {...oldState, volume: e.target.volume})
)
Audio.onvolumechange(audio, _ => {
let volume = Audio.getVolume(audio)
setPlayingState(oldState => {...oldState, volume: volume})
})
Audio.onerror(audio, _e => {
setPlayingState(oldState => {...oldState, isPlaying: false})
src/App/modules/Beatmaps/index.js
+3 -1
View File
@@ -64,7 +64,9 @@ const Beatmaps = ({ searchResults, classes, setHeaderContent, window }) => {
return () => setHeaderContent(null);
}, [setHeaderContent, theme]);
useEffect(() => saveLastScrollPosition(lastScrollPosition.current), []);
useEffect(() => {
saveLastScrollPosition(lastScrollPosition.current);
}, []);
// Some magic number are being invoked here please don't pay attention
const getColumnWidth = useCallback(() => (displayGrid ? gridWidth / columnCount - 4 : gridWidth - 8), [
src/App/root.js
+5 -3
View File
@@ -1,5 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Provider } from 'react-redux';
import App from '.';
import store from '../shared/store';
@@ -18,7 +18,10 @@ if (process.env.BEATCONNECT_CLIENT_MIRAGE === '1') {
dispatchOnResize();
document.body.style.margin = 0;
ReactDOM.render(
const container = document.getElementById('root');
const root = createRoot(container);
root.render(
<ErrorBoundary>
<HistoryProvider>
<ThemeProvider>
@@ -34,5 +37,4 @@ ReactDOM.render(
</ThemeProvider>
</HistoryProvider>
</ErrorBoundary>,
document.getElementById('root'),
);
yarn.lock
+71 -52
View File
@@ -1480,7 +1480,7 @@ __metadata:
languageName: node
linkType: hard
"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
version: 7.17.8
resolution: "@babel/runtime@npm:7.17.8"
dependencies:
@@ -1489,7 +1489,7 @@ __metadata:
languageName: node
linkType: hard
"@babel/runtime@npm:^7.13.10":
"@babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.13.10":
version: 7.18.3
resolution: "@babel/runtime@npm:7.18.3"
dependencies:
@@ -2492,7 +2492,7 @@ __metadata:
languageName: node
linkType: hard
"@types/hoist-non-react-statics@npm:^3.3.0":
"@types/hoist-non-react-statics@npm:^3.3.1":
version: 3.3.1
resolution: "@types/hoist-non-react-statics@npm:3.3.1"
dependencies:
@@ -2640,18 +2640,6 @@ __metadata:
languageName: node
linkType: hard
"@types/react-redux@npm:^7.1.20":
version: 7.1.23
resolution: "@types/react-redux@npm:7.1.23"
dependencies:
"@types/hoist-non-react-statics": ^3.3.0
"@types/react": "*"
hoist-non-react-statics: ^3.3.0
redux: ^4.0.0
checksum: aa4f499673a40ba0f1abb237b032663754d4ed9d23b935a7277aa9d14aee40510536adf54294d502426677e99c1b90bf60902dffcc90fa8b094d9e24452dc42c
languageName: node
linkType: hard
"@types/react@npm:*":
version: 17.0.43
resolution: "@types/react@npm:17.0.43"
@@ -2700,6 +2688,13 @@ __metadata:
languageName: node
linkType: hard
"@types/use-sync-external-store@npm:^0.0.3":
version: 0.0.3
resolution: "@types/use-sync-external-store@npm:0.0.3"
checksum: a8ed7cd96f04f8b0b7f6b3ac01f6dfa2395a85ac944cda14962cbf8b2e5a223612594a6f1a811e11f4ea1daa60e67b5c205eab1e6c2f987c054d81fcdf0b519c
languageName: node
linkType: hard
"@types/verror@npm:^1.10.3":
version: 1.10.5
resolution: "@types/verror@npm:1.10.5"
@@ -3980,13 +3975,13 @@ __metadata:
pnp-webpack-plugin: 1.2.1
prettier: ^1.18.2
ps-node: ^0.1.6
react: ^17.0.2
react: ^18.1.0
react-dev-utils: ^9.0.1
react-dom: ^17.0.2
react-dom: ^18.1.0
react-jss: ^10.6.0
react-redux: ^7.2.3
react-redux: ^8.0.2
react-window: ^1.8.6
redux: ^4.0.5
redux: ^4.2.0
rescript: 9.1.4
resolve: 1.17.0
semver: 6.0.0
@@ -12830,7 +12825,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
"prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.8.1":
version: 15.8.1
resolution: "prop-types@npm:15.8.1"
dependencies:
@@ -13097,16 +13092,15 @@ fsevents@^1.2.7:
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.1.0":
version: 18.1.0
resolution: "react-dom@npm:18.1.0"
dependencies:
loose-envify: ^1.1.0
object-assign: ^4.1.1
scheduler: ^0.20.2
scheduler: ^0.22.0
peerDependencies:
react: 17.0.2
checksum: 960a74ff6670766846a73097a599115963df1574833c59ca0c2fd909758ebe7a6214cd14f5e6aa63ce846d8f39fde7f3b80474ccfcfadc45dd7f3246364718c6
react: ^18.1.0
checksum: 40ab704328673a84ce71d6f462474ff0b731fb0852bbf264b337586b5147de7b0e7744107608d0d9c5c7259df66b3c8c8f8c7fb50abd08abca369a043dd64aad
languageName: node
linkType: hard
@@ -13124,13 +13118,20 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"react-is@npm:^17.0.1, react-is@npm:^17.0.2":
"react-is@npm:^17.0.1":
version: 17.0.2
resolution: "react-is@npm:17.0.2"
checksum: 3eff23f410d40ab9bc5177f147a92c7f42c356a21ecea340e0554566956d67e5e1ba56f26cc7fa22339ac3c7151744177bd6305eaa26d3cbf15f354358c9d9b6
languageName: node
linkType: hard
"react-is@npm:^18.0.0":
version: 18.1.0
resolution: "react-is@npm:18.1.0"
checksum: 456a0c4ab16cbb0ca6b977c8f8c23d8aa27af50c4a5a04cde6ae82edc4847c89f5373fe9229fb8fed232e2df04caae22b1e49ef60a0e43c9f73fa749c3818acd
languageName: node
linkType: hard
"react-jss@npm:^10.6.0":
version: 10.9.0
resolution: "react-jss@npm:10.9.0"
@@ -13152,24 +13153,35 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"react-redux@npm:^7.2.3":
version: 7.2.6
resolution: "react-redux@npm:7.2.6"
"react-redux@npm:^8.0.2":
version: 8.0.2
resolution: "react-redux@npm:8.0.2"
dependencies:
"@babel/runtime": ^7.15.4
"@types/react-redux": ^7.1.20
"@babel/runtime": ^7.12.1
"@types/hoist-non-react-statics": ^3.3.1
"@types/use-sync-external-store": ^0.0.3
hoist-non-react-statics: ^3.3.2
loose-envify: ^1.4.0
prop-types: ^15.7.2
react-is: ^17.0.2
react-is: ^18.0.0
use-sync-external-store: ^1.0.0
peerDependencies:
react: ^16.8.3 || ^17
"@types/react": ^16.8 || ^17.0 || ^18.0
"@types/react-dom": ^16.8 || ^17.0 || ^18.0
react: ^16.8 || ^17.0 || ^18.0
react-dom: ^16.8 || ^17.0 || ^18.0
react-native: ">=0.59"
redux: ^4
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-dom":
optional: true
react-dom:
optional: true
react-native:
optional: true
checksum: 32952c3fa1fbc12a28e93a6a116f320319c3d82ded71af053e7d405d760e96bccbc1d939ad06848ed6f088819d490f3180a31975c53ce23248934de906f2b27c
redux:
optional: true
checksum: be56813dde2318fa4c80b8e7396843981208bd63ed4bbb85d18e236391080c0ecf2405820080f706dbad54f7e6d85b78f2fad093039a8b21dcd32cda2363bb2b
languageName: node
linkType: hard
@@ -13186,13 +13198,12 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"react@npm:^17.0.2":
version: 17.0.2
resolution: "react@npm:17.0.2"
"react@npm:^18.1.0":
version: 18.1.0
resolution: "react@npm:18.1.0"
dependencies:
loose-envify: ^1.1.0
object-assign: ^4.1.1
checksum: 7d0dfebafe1d297503157abb2e9acdb49852185deb8700c16f4a6faad87642f84903ab18cfc16f40b9a0dfe97540f99834982ee953e6d48b39c41608dc3e4b29
checksum: c581a1b60cff0d1a09a476cd442b4f61fdf68f4c54b4a7b5af9687e5a2a34296d32f53d65c44610cdeab789359165364e275c82dd23cfd6ffe78c0021bbe74d0
languageName: node
linkType: hard
@@ -13337,12 +13348,12 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"redux@npm:^4.0.0, redux@npm:^4.0.5":
version: 4.1.2
resolution: "redux@npm:4.1.2"
"redux@npm:^4.2.0":
version: 4.2.0
resolution: "redux@npm:4.2.0"
dependencies:
"@babel/runtime": ^7.9.2
checksum: 39aba0fc41c0187cb46b38e52dcb9dc039b785cae772bad9c30cd1d24c67942739285fc013bf804d286aad3c660c1d74cdab5923e1c1535839c5f996d1491365
checksum: c84709d78a23ee0dd4b5e8295a5ded77de875c51ddc471a79ab8b73c3cff60ac259f8fd620b952c5ab062907d44dbcc94778d2539d4d572a55446d6a6f369c22
languageName: node
linkType: hard
@@ -13899,13 +13910,12 @@ resolve@^2.0.0-next.3:
languageName: node
linkType: hard
"scheduler@npm:^0.20.2":
version: 0.20.2
resolution: "scheduler@npm:0.20.2"
"scheduler@npm:^0.22.0":
version: 0.22.0
resolution: "scheduler@npm:0.22.0"
dependencies:
loose-envify: ^1.1.0
object-assign: ^4.1.1
checksum: 2ba121e53e8a438394598612ec9a8f465b39157042f912d2dd5956af643e0d45ec6937ae4eeb0a807d1945b209515263aed12fc3bca95c7a027ec2a54e76b399
checksum: 6d17ab2080e290a43eeaa63a9bc8c8af07bbb1daa1c62147858ce7ec6d23960c943f89fff04ae1c137bcb77189375cc09ea32db513cee9ff9d2b329b22bf389e
languageName: node
linkType: hard
@@ -15874,6 +15884,15 @@ typescript@^3.5.3:
languageName: node
linkType: hard
"use-sync-external-store@npm:^1.0.0":
version: 1.1.0
resolution: "use-sync-external-store@npm:1.1.0"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
checksum: f1078f7601315eeebb16e2672cf359071160ddfebd33281893ba913cf63b3c9b2a30559aa9fdddfbe8ec0dd8754a62edca533b3e860c53882e90fa0e16bdb38f
languageName: node
linkType: hard
"use@npm:^3.1.0":
version: 3.1.1
resolution: "use@npm:3.1.1"