diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-03-30 21:55:17 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-05-16 00:54:58 +0200 |
commit | 3248fed6e57b7986596e21197a9583b3770fac2a (patch) | |
tree | e417f4315d4f6d2a61109ab29aac0bcb487908bd /packages | |
parent | feat(renderer): Renderer translations (diff) | |
download | sophie-3248fed6e57b7986596e21197a9583b3770fac2a.tar.gz sophie-3248fed6e57b7986596e21197a9583b3770fac2a.tar.zst sophie-3248fed6e57b7986596e21197a9583b3770fac2a.zip |
chore(deps): Bump but keep from react 18 for now
We need mui and mobx-react-like support before we can upgrade.
See https://github.com/mobxjs/mobx/issues/2526 for discussion about the
ramifications of concurrent rendering for mobx.
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages')
-rw-r--r-- | packages/main/package.json | 16 | ||||
-rw-r--r-- | packages/preload/package.json | 4 | ||||
-rw-r--r-- | packages/renderer/package.json | 18 | ||||
-rw-r--r-- | packages/renderer/src/components/sidebar/ServiceSwitcher.tsx | 5 | ||||
-rw-r--r-- | packages/service-preload/package.json | 4 | ||||
-rw-r--r-- | packages/service-shared/package.json | 2 | ||||
-rw-r--r-- | packages/shared/package.json | 4 | ||||
-rw-r--r-- | packages/test-utils/package.json | 2 |
8 files changed, 30 insertions, 25 deletions
diff --git a/packages/main/package.json b/packages/main/package.json index 85f9b12..ca53b8a 100644 --- a/packages/main/package.json +++ b/packages/main/package.json | |||
@@ -10,21 +10,21 @@ | |||
10 | "dependencies": { | 10 | "dependencies": { |
11 | "@sophie/service-shared": "workspace:*", | 11 | "@sophie/service-shared": "workspace:*", |
12 | "@sophie/shared": "workspace:*", | 12 | "@sophie/shared": "workspace:*", |
13 | "chalk": "^5.0.0", | 13 | "chalk": "^5.0.1", |
14 | "deep-equal": "^2.0.5", | 14 | "deep-equal": "^2.0.5", |
15 | "electron": "17.1.0", | 15 | "electron": "17.3.1", |
16 | "fs-extra": "^10.0.1", | 16 | "fs-extra": "^10.0.1", |
17 | "i18next": "^21.6.14", | 17 | "i18next": "^21.6.14", |
18 | "json5": "^2.2.0", | 18 | "json5": "^2.2.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.4.1", | 22 | "mobx": "^6.5.0", |
23 | "mobx-state-tree": "^5.1.3", | 23 | "mobx-state-tree": "^5.1.3", |
24 | "ms": "^2.1.3", | 24 | "ms": "^2.1.3", |
25 | "nanoid": "^3.3.1", | 25 | "nanoid": "^3.3.2", |
26 | "os-name": "^5.0.1", | 26 | "os-name": "^5.0.1", |
27 | "slug": "^5.2.0" | 27 | "slug": "^5.3.0" |
28 | }, | 28 | }, |
29 | "devDependencies": { | 29 | "devDependencies": { |
30 | "@jest/globals": "^27.5.1", | 30 | "@jest/globals": "^27.5.1", |
@@ -33,11 +33,11 @@ | |||
33 | "@types/electron-devtools-installer": "^2.2.1", | 33 | "@types/electron-devtools-installer": "^2.2.1", |
34 | "@types/lodash-es": "^4.17.6", | 34 | "@types/lodash-es": "^4.17.6", |
35 | "@types/ms": "^0.7.31", | 35 | "@types/ms": "^0.7.31", |
36 | "@types/node": "^17.0.21", | 36 | "@types/node": "^17.0.23", |
37 | "@types/slug": "^5.0.3", | 37 | "@types/slug": "^5.0.3", |
38 | "@types/source-map-support": "^0.5.4", | 38 | "@types/source-map-support": "^0.5.4", |
39 | "electron-devtools-installer": "^3.2.0", | 39 | "electron-devtools-installer": "^3.2.0", |
40 | "esbuild": "^0.14.23", | 40 | "esbuild": "^0.14.29", |
41 | "git-repo-info": "^2.1.1", | 41 | "git-repo-info": "^2.1.1", |
42 | "jest": "^27.5.1", | 42 | "jest": "^27.5.1", |
43 | "jest-mock": "^27.5.1", | 43 | "jest-mock": "^27.5.1", |
diff --git a/packages/preload/package.json b/packages/preload/package.json index a8d73e8..536cfe5 100644 --- a/packages/preload/package.json +++ b/packages/preload/package.json | |||
@@ -10,10 +10,10 @@ | |||
10 | }, | 10 | }, |
11 | "dependencies": { | 11 | "dependencies": { |
12 | "@sophie/shared": "workspace:*", | 12 | "@sophie/shared": "workspace:*", |
13 | "electron": "17.1.0", | 13 | "electron": "17.3.1", |
14 | "i18next": "^21.6.14", | 14 | "i18next": "^21.6.14", |
15 | "loglevel": "^1.8.0", | 15 | "loglevel": "^1.8.0", |
16 | "mobx": "^6.4.1", | 16 | "mobx": "^6.5.0", |
17 | "mobx-state-tree": "^5.1.3" | 17 | "mobx-state-tree": "^5.1.3" |
18 | }, | 18 | }, |
19 | "devDependencies": { | 19 | "devDependencies": { |
diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 4f00a3f..4f990ae 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json | |||
@@ -8,17 +8,17 @@ | |||
8 | "typecheck:workspace": "yarn g:typecheck" | 8 | "typecheck:workspace": "yarn g:typecheck" |
9 | }, | 9 | }, |
10 | "dependencies": { | 10 | "dependencies": { |
11 | "@emotion/react": "^11.8.1", | 11 | "@emotion/react": "^11.8.2", |
12 | "@emotion/styled": "^11.8.1", | 12 | "@emotion/styled": "^11.8.1", |
13 | "@fontsource/roboto": "^4.5.3", | 13 | "@fontsource/roboto": "^4.5.5", |
14 | "@mui/icons-material": "^5.4.2", | 14 | "@mui/icons-material": "^5.5.1", |
15 | "@mui/material": "^5.4.3", | 15 | "@mui/material": "^5.5.3", |
16 | "@sophie/shared": "workspace:*", | 16 | "@sophie/shared": "workspace:*", |
17 | "i18next": "^21.6.14", | 17 | "i18next": "^21.6.14", |
18 | "lodash-es": "^4.17.21", | 18 | "lodash-es": "^4.17.21", |
19 | "loglevel": "^1.8.0", | 19 | "loglevel": "^1.8.0", |
20 | "loglevel-plugin-prefix": "^0.8.4", | 20 | "loglevel-plugin-prefix": "^0.8.4", |
21 | "mobx": "^6.4.1", | 21 | "mobx": "^6.5.0", |
22 | "mobx-react-lite": "^3.3.0", | 22 | "mobx-react-lite": "^3.3.0", |
23 | "mobx-state-tree": "^5.1.3", | 23 | "mobx-state-tree": "^5.1.3", |
24 | "react": "^17.0.2", | 24 | "react": "^17.0.2", |
@@ -29,14 +29,14 @@ | |||
29 | "@jest/globals": "^27.5.1", | 29 | "@jest/globals": "^27.5.1", |
30 | "@types/jest": "^27.4.1", | 30 | "@types/jest": "^27.4.1", |
31 | "@types/lodash-es": "^4.17.6", | 31 | "@types/lodash-es": "^4.17.6", |
32 | "@types/react": "^17.0.39", | 32 | "@types/react": "^17.0.43", |
33 | "@types/react-dom": "^17.0.11", | 33 | "@types/react-dom": "^17.0.14", |
34 | "@vitejs/plugin-react": "^1.2.0", | 34 | "@vitejs/plugin-react": "^1.3.0", |
35 | "jest": "^27.5.1", | 35 | "jest": "^27.5.1", |
36 | "jest-mock": "^27.5.1", | 36 | "jest-mock": "^27.5.1", |
37 | "jsdom": "^19.0.0", | 37 | "jsdom": "^19.0.0", |
38 | "mst-middlewares": "^5.1.3", | 38 | "mst-middlewares": "^5.1.3", |
39 | "remotedev": "^0.2.9", | 39 | "remotedev": "^0.2.9", |
40 | "vite": "^2.8.4" | 40 | "vite": "^2.9.0" |
41 | } | 41 | } |
42 | } | 42 | } |
diff --git a/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx b/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx index 010c716..60b8b98 100644 --- a/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx +++ b/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx | |||
@@ -95,7 +95,12 @@ function getServiceTitle(service: Service, t: TFunction) { | |||
95 | } | 95 | } |
96 | 96 | ||
97 | function ServiceSwitcher(): JSX.Element { | 97 | function ServiceSwitcher(): JSX.Element { |
98 | // This needs to be here even if we don't use any translations in this component, | ||
99 | // because the component must stay suspended until the translations are loaded. | ||
100 | // See: https://github.com/mui/material-ui/issues/14077 | ||
101 | // TODO Try and remove this once mui and mobx-react-lite have updated to react 18. | ||
98 | const { t } = useTranslation(); | 102 | const { t } = useTranslation(); |
103 | |||
99 | const { settings, services } = useStore(); | 104 | const { settings, services } = useStore(); |
100 | const { selectedService } = settings; | 105 | const { selectedService } = settings; |
101 | 106 | ||
diff --git a/packages/service-preload/package.json b/packages/service-preload/package.json index 2090cf9..296c598 100644 --- a/packages/service-preload/package.json +++ b/packages/service-preload/package.json | |||
@@ -10,9 +10,9 @@ | |||
10 | "dependencies": { | 10 | "dependencies": { |
11 | "@sophie/service-shared": "workspace:*", | 11 | "@sophie/service-shared": "workspace:*", |
12 | "color-string": "^1.9.0", | 12 | "color-string": "^1.9.0", |
13 | "electron": "17.1.0" | 13 | "electron": "17.3.1" |
14 | }, | 14 | }, |
15 | "devDependencies": { | 15 | "devDependencies": { |
16 | "@types/color-string": "^1" | 16 | "@types/color-string": "^1.5.2" |
17 | } | 17 | } |
18 | } | 18 | } |
diff --git a/packages/service-shared/package.json b/packages/service-shared/package.json index 83a9501..d42b631 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.12.0" | 14 | "zod": "^3.14.3" |
15 | } | 15 | } |
16 | } | 16 | } |
diff --git a/packages/shared/package.json b/packages/shared/package.json index d39d7ee..1730c25 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json | |||
@@ -12,8 +12,8 @@ | |||
12 | }, | 12 | }, |
13 | "dependencies": { | 13 | "dependencies": { |
14 | "i18next": "^21.6.14", | 14 | "i18next": "^21.6.14", |
15 | "mobx": "^6.4.1", | 15 | "mobx": "^6.5.0", |
16 | "mobx-state-tree": "^5.1.3", | 16 | "mobx-state-tree": "^5.1.3", |
17 | "zod": "^3.12.0" | 17 | "zod": "^3.14.3" |
18 | } | 18 | } |
19 | } | 19 | } |
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index e39e28a..adb6002 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json | |||
@@ -13,6 +13,6 @@ | |||
13 | "@types/jest": "^27.4.1", | 13 | "@types/jest": "^27.4.1", |
14 | "jest": "^27.5.1", | 14 | "jest": "^27.5.1", |
15 | "jest-each": "^27.5.1", | 15 | "jest-each": "^27.5.1", |
16 | "type-fest": "^2.12.0" | 16 | "type-fest": "^2.12.1" |
17 | } | 17 | } |
18 | } | 18 | } |