diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-05-07 16:11:33 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-05-16 00:55:03 +0200 |
commit | 04030b93b8bb19adf899006815cc859698908feb (patch) | |
tree | 5e7193f6ca0dff61b7066bc5cc5cbf61a208394b /packages/renderer | |
parent | refactor: electron-builder config (diff) | |
download | sophie-04030b93b8bb19adf899006815cc859698908feb.tar.gz sophie-04030b93b8bb19adf899006815cc859698908feb.tar.zst sophie-04030b93b8bb19adf899006815cc859698908feb.zip |
chore(deps): bump to react 18
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages/renderer')
-rw-r--r-- | packages/renderer/package.json | 30 | ||||
-rw-r--r-- | packages/renderer/src/components/banner/NewWindowBanner.tsx | 20 | ||||
-rw-r--r-- | packages/renderer/src/index.tsx | 10 |
3 files changed, 36 insertions, 24 deletions
diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 6358009..2a83a1f 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json | |||
@@ -13,35 +13,35 @@ | |||
13 | "@emotion/styled": "^11.8.1", | 13 | "@emotion/styled": "^11.8.1", |
14 | "@fontsource/roboto": "^4.5.5", | 14 | "@fontsource/roboto": "^4.5.5", |
15 | "@mui/icons-material": "^5.6.2", | 15 | "@mui/icons-material": "^5.6.2", |
16 | "@mui/material": "^5.6.2", | 16 | "@mui/material": "^5.6.4", |
17 | "@sophie/shared": "workspace:*", | 17 | "@sophie/shared": "workspace:*", |
18 | "i18next": "^21.6.16", | 18 | "i18next": "^21.7.1", |
19 | "lodash-es": "^4.17.21", | 19 | "lodash-es": "^4.17.21", |
20 | "loglevel": "^1.8.0", | 20 | "loglevel": "^1.8.0", |
21 | "loglevel-plugin-prefix": "^0.8.4", | 21 | "loglevel-plugin-prefix": "^0.8.4", |
22 | "mobx": "^6.5.0", | 22 | "mobx": "^6.5.0", |
23 | "mobx-react-lite": "^3.3.0", | 23 | "mobx-react-lite": "^3.4.0", |
24 | "mobx-state-tree": "^5.1.3", | 24 | "mobx-state-tree": "^5.1.4", |
25 | "react": "^17.0.2", | 25 | "react": "^18.1.0", |
26 | "react-dom": "^17.0.2", | 26 | "react-dom": "^18.1.0", |
27 | "react-i18next": "^11.16.7", | 27 | "react-i18next": "^11.16.9", |
28 | "stylis": "^4.1.1", | 28 | "stylis": "^4.1.1", |
29 | "stylis-plugin-rtl": "^2.1.1" | 29 | "stylis-plugin-rtl": "^2.1.1" |
30 | }, | 30 | }, |
31 | "devDependencies": { | 31 | "devDependencies": { |
32 | "@jest/globals": "^28.0.3", | 32 | "@jest/globals": "^28.1.0", |
33 | "@types/jest": "^27.5.0", | 33 | "@types/jest": "^27.5.0", |
34 | "@types/lodash-es": "^4.17.6", | 34 | "@types/lodash-es": "^4.17.6", |
35 | "@types/react": "^17.0.44", | 35 | "@types/react": "^18.0.9", |
36 | "@types/react-dom": "^17.0.15", | 36 | "@types/react-dom": "^18.0.3", |
37 | "@types/stylis": "^4.0.2", | 37 | "@types/stylis": "^4.0.2", |
38 | "@vitejs/plugin-react": "^1.3.2", | 38 | "@vitejs/plugin-react": "^1.3.2", |
39 | "jest": "^28.0.3", | 39 | "jest": "^28.1.0", |
40 | "jest-environment-jsdom": "^28.0.2", | 40 | "jest-environment-jsdom": "^28.1.0", |
41 | "jest-mock": "^28.0.2", | 41 | "jest-mock": "^28.1.0", |
42 | "jsdom": "^19.0.0", | 42 | "jsdom": "^19.0.0", |
43 | "mst-middlewares": "^5.1.3", | 43 | "mst-middlewares": "^5.1.4", |
44 | "remotedev": "^0.2.9", | 44 | "remotedev": "^0.2.9", |
45 | "vite": "^2.9.7" | 45 | "vite": "^2.9.8" |
46 | } | 46 | } |
47 | } | 47 | } |
diff --git a/packages/renderer/src/components/banner/NewWindowBanner.tsx b/packages/renderer/src/components/banner/NewWindowBanner.tsx index 07fafda..685badf 100644 --- a/packages/renderer/src/components/banner/NewWindowBanner.tsx +++ b/packages/renderer/src/components/banner/NewWindowBanner.tsx | |||
@@ -96,14 +96,20 @@ function NewWindowBanner({ | |||
96 | } | 96 | } |
97 | > | 97 | > |
98 | {count === 1 ? ( | 98 | {count === 1 ? ( |
99 | <Trans i18nKey="messageSingleLink" t={t}> | 99 | <Trans |
100 | {{ name }} wants to open <strong>{{ url }}</strong> in a new window | 100 | i18nKey="messageSingleLink" |
101 | </Trans> | 101 | t={t} |
102 | components={[<strong>url</strong>]} | ||
103 | values={{ name, url }} | ||
104 | /> | ||
102 | ) : ( | 105 | ) : ( |
103 | <Trans i18nKey="messageMultipleLinks" count={count - 1} t={t}> | 106 | <Trans |
104 | {{ name }} wants to open <strong>{{ url }}</strong> and{' '} | 107 | i18nKey="messageMultipleLinks" |
105 | <strong>{{ count: count - 1 }}</strong> other links in new windows | 108 | count={count - 1} |
106 | </Trans> | 109 | t={t} |
110 | components={[<strong>url</strong>, <strong>count</strong>]} | ||
111 | values={{ name, url, count: count - 1 }} | ||
112 | /> | ||
107 | )} | 113 | )} |
108 | </NotificationBanner> | 114 | </NotificationBanner> |
109 | ); | 115 | ); |
diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx index 72a9ffd..726e00e 100644 --- a/packages/renderer/src/index.tsx +++ b/packages/renderer/src/index.tsx | |||
@@ -26,7 +26,7 @@ import CssBaseline from '@mui/material/CssBaseline'; | |||
26 | import { autorun } from 'mobx'; | 26 | import { autorun } from 'mobx'; |
27 | import { addDisposer } from 'mobx-state-tree'; | 27 | import { addDisposer } from 'mobx-state-tree'; |
28 | import React, { Suspense, lazy } from 'react'; | 28 | import React, { Suspense, lazy } from 'react'; |
29 | import { render } from 'react-dom'; | 29 | import { createRoot } from 'react-dom/client'; |
30 | 30 | ||
31 | import Loading from './components/Loading'; | 31 | import Loading from './components/Loading'; |
32 | import StoreProvider from './components/StoreProvider'; | 32 | import StoreProvider from './components/StoreProvider'; |
@@ -88,4 +88,10 @@ function Root(): JSX.Element { | |||
88 | ); | 88 | ); |
89 | } | 89 | } |
90 | 90 | ||
91 | render(<Root />, document.querySelector('#app')); | 91 | const rootElement = document.querySelector('#app'); |
92 | if (rootElement === null) { | ||
93 | log.error('Root element not found'); | ||
94 | } else { | ||
95 | const root = createRoot(rootElement); | ||
96 | root.render(<Root />); | ||
97 | } | ||