diff options
author | MCMXC <16797721+mcmxcdev@users.noreply.github.com> | 2024-04-13 17:30:56 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-13 17:30:56 -0600 |
commit | e6a9a6416df7f56f12e85bce2f953bff3440a12d (patch) | |
tree | dc77839195213d989f81ee554e5e591bfd2596ee | |
parent | Add codespell support (config, GH action to detect new typos) + make it fix s... (diff) | |
download | ferdium-app-e6a9a6416df7f56f12e85bce2f953bff3440a12d.tar.gz ferdium-app-e6a9a6416df7f56f12e85bce2f953bff3440a12d.tar.zst ferdium-app-e6a9a6416df7f56f12e85bce2f953bff3440a12d.zip |
fix: process manager shows blank window (#1680)
- install `@syed_umair/electron-process-manager` dependency
- remove `@krisdages/electron-process-manager` dependency
- swap out usage of `openProcessManager` in `processManager.ts`
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | pnpm-lock.yaml | 61 | ||||
-rw-r--r-- | src/electron/ipc-api/processManager.ts | 2 |
3 files changed, 36 insertions, 29 deletions
diff --git a/package.json b/package.json index bfd8104ab..51edd9e71 100644 --- a/package.json +++ b/package.json | |||
@@ -66,7 +66,6 @@ | |||
66 | "@electron/remote": "2.1.2", | 66 | "@electron/remote": "2.1.2", |
67 | "@emotion/react": "11.11.4", | 67 | "@emotion/react": "11.11.4", |
68 | "@emotion/styled": "11.11.5", | 68 | "@emotion/styled": "11.11.5", |
69 | "@krisdages/electron-process-manager": "3.0.0", | ||
70 | "@mdi/js": "7.4.47", | 69 | "@mdi/js": "7.4.47", |
71 | "@mdi/react": "1.6.1", | 70 | "@mdi/react": "1.6.1", |
72 | "@mui/icons-material": "5.15.15", | 71 | "@mui/icons-material": "5.15.15", |
@@ -74,6 +73,7 @@ | |||
74 | "@octokit/core": "5.1.0", | 73 | "@octokit/core": "5.1.0", |
75 | "@sentry/electron": "4.14.0", | 74 | "@sentry/electron": "4.14.0", |
76 | "@superwf/mobx-react-router": "7.4.0", | 75 | "@superwf/mobx-react-router": "7.4.0", |
76 | "@syed_umair/electron-process-manager": "1.1.0", | ||
77 | "auto-launch": "5.0.6", | 77 | "auto-launch": "5.0.6", |
78 | "classnames": "2.5.1", | 78 | "classnames": "2.5.1", |
79 | "color": "4.2.3", | 79 | "color": "4.2.3", |
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b1daaa41..8c1b99f06 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml | |||
@@ -53,9 +53,6 @@ dependencies: | |||
53 | '@emotion/styled': | 53 | '@emotion/styled': |
54 | specifier: 11.11.5 | 54 | specifier: 11.11.5 |
55 | version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) | 55 | version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) |
56 | '@krisdages/electron-process-manager': | ||
57 | specifier: 3.0.0 | ||
58 | version: 3.0.0(@electron/remote@2.1.2)(electron@29.3.0)(rxjs@7.8.1) | ||
59 | '@mdi/js': | 56 | '@mdi/js': |
60 | specifier: 7.4.47 | 57 | specifier: 7.4.47 |
61 | version: 7.4.47 | 58 | version: 7.4.47 |
@@ -77,6 +74,9 @@ dependencies: | |||
77 | '@superwf/mobx-react-router': | 74 | '@superwf/mobx-react-router': |
78 | specifier: 7.4.0 | 75 | specifier: 7.4.0 |
79 | version: 7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.2) | 76 | version: 7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.2) |
77 | '@syed_umair/electron-process-manager': | ||
78 | specifier: 1.1.0 | ||
79 | version: 1.1.0(electron@29.3.0) | ||
80 | auto-launch: | 80 | auto-launch: |
81 | specifier: 5.0.6 | 81 | specifier: 5.0.6 |
82 | version: 5.0.6 | 82 | version: 5.0.6 |
@@ -2362,30 +2362,6 @@ packages: | |||
2362 | '@jridgewell/sourcemap-codec': 1.4.15 | 2362 | '@jridgewell/sourcemap-codec': 1.4.15 |
2363 | dev: true | 2363 | dev: true |
2364 | 2364 | ||
2365 | /@krisdages/electron-process-manager@3.0.0(@electron/remote@2.1.2)(electron@29.3.0)(rxjs@7.8.1): | ||
2366 | resolution: {integrity: sha512-Gs8McOVC6BVdfP4SeF+l5nx85eFooarm37K5mxs1PESI59a7oLwRf5Yd2tsZ6Ye14bCG0eTJGDv3yPuixBg3OQ==} | ||
2367 | peerDependencies: | ||
2368 | '@electron/remote': '>= 1.2.0' | ||
2369 | electron: '>= 10' | ||
2370 | rxjs: '>= 7' | ||
2371 | dependencies: | ||
2372 | '@electron/remote': 2.1.2(electron@29.3.0) | ||
2373 | electron: 29.3.0 | ||
2374 | electron-process-reporter: /@krisdages/electron-process-reporter@2.0.0-rxjs7-1.4.0(rxjs@7.8.1) | ||
2375 | rxjs: 7.8.1 | ||
2376 | dev: false | ||
2377 | |||
2378 | /@krisdages/electron-process-reporter@2.0.0-rxjs7-1.4.0(rxjs@7.8.1): | ||
2379 | resolution: {integrity: sha512-xcHTmzgMuKsdcP3X61FZ3XAw/5vc3LFgbumKKnswmV0P9k810MMBBeVt5GS9sTSrFju0NYGSBDjn3/X/I2UN/A==} | ||
2380 | peerDependencies: | ||
2381 | rxjs: '>= 7' | ||
2382 | dependencies: | ||
2383 | memoizee: 0.4.15 | ||
2384 | pidtree: 0.3.1 | ||
2385 | pidusage: 2.0.16 | ||
2386 | rxjs: 7.8.1 | ||
2387 | dev: false | ||
2388 | |||
2389 | /@kwsites/file-exists@1.1.1: | 2365 | /@kwsites/file-exists@1.1.1: |
2390 | resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==} | 2366 | resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==} |
2391 | dependencies: | 2367 | dependencies: |
@@ -2928,6 +2904,15 @@ packages: | |||
2928 | path-to-regexp: 6.2.2 | 2904 | path-to-regexp: 6.2.2 |
2929 | dev: false | 2905 | dev: false |
2930 | 2906 | ||
2907 | /@syed_umair/electron-process-manager@1.1.0(electron@29.3.0): | ||
2908 | resolution: {integrity: sha512-rbDJ1GQ51DcsP+354WpI/3xWOra1HH4cT1jA0maK8VJogn7s5BiMO2XkSBaCoeMCvTIIwx7Y6dgUHpfnL2M6wg==} | ||
2909 | peerDependencies: | ||
2910 | electron: '>=21' | ||
2911 | dependencies: | ||
2912 | electron: 29.3.0 | ||
2913 | electron-process-reporter: 1.4.0 | ||
2914 | dev: false | ||
2915 | |||
2931 | /@szmarczak/http-timer@4.0.6: | 2916 | /@szmarczak/http-timer@4.0.6: |
2932 | resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} | 2917 | resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} |
2933 | engines: {node: '>=10'} | 2918 | engines: {node: '>=10'} |
@@ -6059,6 +6044,15 @@ packages: | |||
6059 | resolution: {integrity: sha512-C2FQJuk8567P2a2loBNwl5c8kwOTQVMB0capgHtPI7zKwZG16X0UxG+sNYZExQfnJ0PA+ecECA/4LcXxQa2TCA==} | 6044 | resolution: {integrity: sha512-C2FQJuk8567P2a2loBNwl5c8kwOTQVMB0capgHtPI7zKwZG16X0UxG+sNYZExQfnJ0PA+ecECA/4LcXxQa2TCA==} |
6060 | dev: false | 6045 | dev: false |
6061 | 6046 | ||
6047 | /electron-process-reporter@1.4.0: | ||
6048 | resolution: {integrity: sha512-zI5IV7zplV2eHznNbeYtMwATVqXO+g9i2ChpurvGTvExA/rpi7BdSrp38bsTz5tjJLLTz9LmzeSt85uIZ051Qw==} | ||
6049 | dependencies: | ||
6050 | memoizee: 0.4.15 | ||
6051 | pidtree: 0.3.1 | ||
6052 | pidusage: 2.0.16 | ||
6053 | rxjs: 5.5.12 | ||
6054 | dev: false | ||
6055 | |||
6062 | /electron-publish@24.13.1: | 6056 | /electron-publish@24.13.1: |
6063 | resolution: {integrity: sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==} | 6057 | resolution: {integrity: sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==} |
6064 | dependencies: | 6058 | dependencies: |
@@ -12283,6 +12277,13 @@ packages: | |||
12283 | queue-microtask: 1.2.3 | 12277 | queue-microtask: 1.2.3 |
12284 | dev: true | 12278 | dev: true |
12285 | 12279 | ||
12280 | /rxjs@5.5.12: | ||
12281 | resolution: {integrity: sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==} | ||
12282 | engines: {npm: '>=2.0.0'} | ||
12283 | dependencies: | ||
12284 | symbol-observable: 1.0.1 | ||
12285 | dev: false | ||
12286 | |||
12286 | /rxjs@6.6.7: | 12287 | /rxjs@6.6.7: |
12287 | resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==} | 12288 | resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==} |
12288 | engines: {npm: '>=2.0.0'} | 12289 | engines: {npm: '>=2.0.0'} |
@@ -12294,6 +12295,7 @@ packages: | |||
12294 | resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} | 12295 | resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} |
12295 | dependencies: | 12296 | dependencies: |
12296 | tslib: 2.6.2 | 12297 | tslib: 2.6.2 |
12298 | dev: true | ||
12297 | 12299 | ||
12298 | /safe-array-concat@1.0.1: | 12300 | /safe-array-concat@1.0.1: |
12299 | resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==} | 12301 | resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==} |
@@ -13249,6 +13251,11 @@ packages: | |||
13249 | resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} | 13251 | resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} |
13250 | engines: {node: '>= 0.4'} | 13252 | engines: {node: '>= 0.4'} |
13251 | 13253 | ||
13254 | /symbol-observable@1.0.1: | ||
13255 | resolution: {integrity: sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==} | ||
13256 | engines: {node: '>=0.10.0'} | ||
13257 | dev: false | ||
13258 | |||
13252 | /symbol-observable@1.2.0: | 13259 | /symbol-observable@1.2.0: |
13253 | resolution: {integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==} | 13260 | resolution: {integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==} |
13254 | engines: {node: '>=0.10.0'} | 13261 | engines: {node: '>=0.10.0'} |
diff --git a/src/electron/ipc-api/processManager.ts b/src/electron/ipc-api/processManager.ts index 6e9069666..f76d67bc7 100644 --- a/src/electron/ipc-api/processManager.ts +++ b/src/electron/ipc-api/processManager.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { openProcessManager } from '@krisdages/electron-process-manager'; | 1 | import { openProcessManager } from '@syed_umair/electron-process-manager'; |
2 | import { ipcMain } from 'electron'; | 2 | import { ipcMain } from 'electron'; |
3 | 3 | ||
4 | export default () => { | 4 | export default () => { |