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 | |
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')
-rw-r--r-- | packages/main/esbuild.config.js | 6 | ||||
-rw-r--r-- | packages/main/package.json | 17 | ||||
-rw-r--r-- | packages/preload/package.json | 12 | ||||
-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 | ||||
-rw-r--r-- | packages/service-preload/package.json | 2 | ||||
-rw-r--r-- | packages/service-shared/package.json | 2 | ||||
-rw-r--r-- | packages/shared/package.json | 6 | ||||
-rw-r--r-- | packages/test-utils/package.json | 4 |
10 files changed, 58 insertions, 51 deletions
diff --git a/packages/main/esbuild.config.js b/packages/main/esbuild.config.js index dddda75..ae8565d 100644 --- a/packages/main/esbuild.config.js +++ b/packages/main/esbuild.config.js | |||
@@ -13,11 +13,7 @@ const thisDir = fileUrlToDirname(import.meta.url); | |||
13 | const externalPackages = ['electron']; | 13 | const externalPackages = ['electron']; |
14 | 14 | ||
15 | if (process.env.MODE !== 'development') { | 15 | if (process.env.MODE !== 'development') { |
16 | externalPackages.push( | 16 | externalPackages.push('electron-devtools-installer', 'source-map-support'); |
17 | 'electron-devtools-installer', | ||
18 | 'mkdirp', | ||
19 | 'source-map-support', | ||
20 | ); | ||
21 | } | 17 | } |
22 | 18 | ||
23 | const gitInfo = getRepoInfo(); | 19 | const gitInfo = getRepoInfo(); |
diff --git a/packages/main/package.json b/packages/main/package.json index ab8155c..a746e31 100644 --- a/packages/main/package.json +++ b/packages/main/package.json | |||
@@ -11,31 +11,30 @@ | |||
11 | "@sophie/service-shared": "workspace:*", | 11 | "@sophie/service-shared": "workspace:*", |
12 | "@sophie/shared": "workspace:*", | 12 | "@sophie/shared": "workspace:*", |
13 | "chalk": "^5.0.1", | 13 | "chalk": "^5.0.1", |
14 | "electron": "^19.0.0-beta.3", | 14 | "electron": "^19.0.0-beta.4", |
15 | "i18next": "^21.6.16", | 15 | "i18next": "^21.7.1", |
16 | "lodash-es": "^4.17.21", | 16 | "lodash-es": "^4.17.21", |
17 | "loglevel": "^1.8.0", | 17 | "loglevel": "^1.8.0", |
18 | "loglevel-plugin-prefix": "^0.8.4", | 18 | "loglevel-plugin-prefix": "^0.8.4", |
19 | "mobx": "^6.5.0", | 19 | "mobx": "^6.5.0", |
20 | "mobx-state-tree": "^5.1.3", | 20 | "mobx-state-tree": "^5.1.4", |
21 | "nanoid": "^3.3.3", | 21 | "nanoid": "^3.3.4", |
22 | "slug": "^5.3.0" | 22 | "slug": "^5.3.0" |
23 | }, | 23 | }, |
24 | "devDependencies": { | 24 | "devDependencies": { |
25 | "@jest/globals": "^28.0.3", | 25 | "@jest/globals": "^28.1.0", |
26 | "@sophie/test-utils": "workspace:*", | 26 | "@sophie/test-utils": "workspace:*", |
27 | "@types/electron-devtools-installer": "^2.2.2", | 27 | "@types/electron-devtools-installer": "^2.2.2", |
28 | "@types/lodash-es": "^4.17.6", | 28 | "@types/lodash-es": "^4.17.6", |
29 | "@types/mkdirp": "^1", | 29 | "@types/mkdirp": "^1.0.2", |
30 | "@types/node": "^17.0.31", | 30 | "@types/node": "^17.0.31", |
31 | "@types/slug": "^5.0.3", | 31 | "@types/slug": "^5.0.3", |
32 | "@types/source-map-support": "^0.5.4", | 32 | "@types/source-map-support": "^0.5.4", |
33 | "electron-devtools-installer": "^3.2.0", | 33 | "electron-devtools-installer": "^3.2.0", |
34 | "esbuild": "^0.14.38", | 34 | "esbuild": "^0.14.38", |
35 | "git-repo-info": "^2.1.1", | 35 | "git-repo-info": "^2.1.1", |
36 | "jest": "^28.0.3", | 36 | "jest": "^28.1.0", |
37 | "jest-mock": "^28.0.2", | 37 | "jest-mock": "^28.1.0", |
38 | "mkdirp": "^1.0.4", | ||
39 | "source-map-support": "^0.5.21" | 38 | "source-map-support": "^0.5.21" |
40 | } | 39 | } |
41 | } | 40 | } |
diff --git a/packages/preload/package.json b/packages/preload/package.json index 516e455..813d618 100644 --- a/packages/preload/package.json +++ b/packages/preload/package.json | |||
@@ -10,17 +10,17 @@ | |||
10 | }, | 10 | }, |
11 | "dependencies": { | 11 | "dependencies": { |
12 | "@sophie/shared": "workspace:*", | 12 | "@sophie/shared": "workspace:*", |
13 | "electron": "^19.0.0-beta.3", | 13 | "electron": "^19.0.0-beta.4", |
14 | "i18next": "^21.6.16", | 14 | "i18next": "^21.7.1", |
15 | "loglevel": "^1.8.0", | 15 | "loglevel": "^1.8.0", |
16 | "mobx": "^6.5.0", | 16 | "mobx": "^6.5.0", |
17 | "mobx-state-tree": "^5.1.3" | 17 | "mobx-state-tree": "^5.1.4" |
18 | }, | 18 | }, |
19 | "devDependencies": { | 19 | "devDependencies": { |
20 | "@jest/globals": "^28.0.3", | 20 | "@jest/globals": "^28.1.0", |
21 | "@types/jest": "^27.5.0", | 21 | "@types/jest": "^27.5.0", |
22 | "jest": "^28.0.3", | 22 | "jest": "^28.1.0", |
23 | "jest-mock": "^28.0.2", | 23 | "jest-mock": "^28.1.0", |
24 | "jsdom": "^19.0.0" | 24 | "jsdom": "^19.0.0" |
25 | } | 25 | } |
26 | } | 26 | } |
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 | } | ||
diff --git a/packages/service-preload/package.json b/packages/service-preload/package.json index 6cbefb0..4344b7d 100644 --- a/packages/service-preload/package.json +++ b/packages/service-preload/package.json | |||
@@ -10,7 +10,7 @@ | |||
10 | "dependencies": { | 10 | "dependencies": { |
11 | "@sophie/service-inject": "workspace:*", | 11 | "@sophie/service-inject": "workspace:*", |
12 | "@sophie/service-shared": "workspace:*", | 12 | "@sophie/service-shared": "workspace:*", |
13 | "electron": "^19.0.0-beta.3" | 13 | "electron": "^19.0.0-beta.4" |
14 | }, | 14 | }, |
15 | "devDependencies": { | 15 | "devDependencies": { |
16 | "@types/color-string": "^1.5.2" | 16 | "@types/color-string": "^1.5.2" |
diff --git a/packages/service-shared/package.json b/packages/service-shared/package.json index 2bd47e9..75ee037 100644 --- a/packages/service-shared/package.json +++ b/packages/service-shared/package.json | |||
@@ -11,6 +11,6 @@ | |||
11 | "types": "yarn g:types" | 11 | "types": "yarn g:types" |
12 | }, | 12 | }, |
13 | "dependencies": { | 13 | "dependencies": { |
14 | "zod": "^3.14.4" | 14 | "zod": "^3.15.1" |
15 | } | 15 | } |
16 | } | 16 | } |
diff --git a/packages/shared/package.json b/packages/shared/package.json index 19b7bb2..db8a6e9 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json | |||
@@ -11,9 +11,9 @@ | |||
11 | "types": "yarn g:types" | 11 | "types": "yarn g:types" |
12 | }, | 12 | }, |
13 | "dependencies": { | 13 | "dependencies": { |
14 | "i18next": "^21.6.16", | 14 | "i18next": "^21.7.1", |
15 | "mobx": "^6.5.0", | 15 | "mobx": "^6.5.0", |
16 | "mobx-state-tree": "^5.1.3", | 16 | "mobx-state-tree": "^5.1.4", |
17 | "zod": "^3.14.4" | 17 | "zod": "^3.15.1" |
18 | } | 18 | } |
19 | } | 19 | } |
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index c6f4945..8f7bb0e 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json | |||
@@ -11,8 +11,8 @@ | |||
11 | }, | 11 | }, |
12 | "dependencies": { | 12 | "dependencies": { |
13 | "@types/jest": "^27.5.0", | 13 | "@types/jest": "^27.5.0", |
14 | "jest": "^28.0.3", | 14 | "jest": "^28.1.0", |
15 | "jest-each": "^28.0.2", | 15 | "jest-each": "^28.1.0", |
16 | "type-fest": "^2.12.2" | 16 | "type-fest": "^2.12.2" |
17 | } | 17 | } |
18 | } | 18 | } |