chore: upgrade used node and pnpm version (#1433)

- upgrade node and pnpm version in `engines`, `volta` and `packageManager` config
- upgrade `@types/node` to v20
- remove `react-loader` overrides from `peerDependencyRules.allowedVersions`
- remove `@npmcli/move-file` 2.0.1 from `allowedDeprecatedVersions`
- update node image to 20.9.0 in `Dockerfile`
- update required system dependencies in `CONTRIBUTING.md`
- update node version to 20.9.0 in `.nvmrc`
- correct type definitions for `setInterval` usage in `WebviewCrashHandler` and `AppStore` necessary due to `@types/node` upgrade

8 files changed, 67 insertions, 61 deletions

diff --git a/.nvmrc b/.nvmrc
index 02c8b485e..f3f52b42d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18.18.0
+20.9.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ffda7acb9..97d464d5e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,8 +62,8 @@ Currently, these are the combinations of system dependencies that work for MacOS
 # Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
 $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
 {
-  "node": "18.18.0",
-  "pnpm": "8.7.6"
+  "node": "20.9.0",
+  "pnpm": "8.10.0"
 }
 ```
 
diff --git a/Dockerfile b/Dockerfile
index 0707a4771..806f10a2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture
 
-FROM docker.io/library/node:18.18.0-buster as builder
+FROM docker.io/library/node:20.9.0-buster as builder
 
 ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"
 
diff --git a/package.json b/package.json
index de30ee4cf..d1e55ce7d 100644
--- a/package.json
+++ b/package.json
@@ -13,15 +13,15 @@
   "repository": "https://github.com/ferdium/ferdium-app.git",
   "private": true,
   "engines": {
-    "node": "18.18.0",
-    "pnpm": "8.7.6"
+    "node": "20.9.0",
+    "pnpm": "8.10.0"
   },
   "engine-strict": true,
   "volta": {
-    "node": "18.18.0",
-    "pnpm": "8.7.6"
+    "node": "20.9.0",
+    "pnpm": "8.10.0"
   },
-  "packageManager": "pnpm@8.7.6",
+  "packageManager": "pnpm@8.10.0",
   "scripts": {
     "prepare": "is-ci || husky install",
     "start": "electron ./build",
@@ -146,7 +146,7 @@
     "@types/lodash": "4.14.198",
     "@types/minimist": "1.2.2",
     "@types/ms": "0.7.31",
-    "@types/node": "18.15.3",
+    "@types/node": "20.8.10",
     "@types/prop-types": "15.7.6",
     "@types/react": "18.2.22",
     "@types/react-color": "3.0.6",
@@ -205,8 +205,6 @@
         "esbuild-sass-plugin>esbuild": "^0.16.7",
         "react-electron-web-view>react": "^18.0.0",
         "react-electron-web-view>react-dom": "^18.0.0",
-        "react-loader>react": "^18.0.0",
-        "react-loader>react-dom": "^18.0.0",
         "react-sortable-hoc>react": "^18.0.0",
         "react-sortable-hoc>react-dom": "^18.0.0"
       }
@@ -218,7 +216,7 @@
       "har-validator": "5.1.5",
       "uuid": "3.4.0",
       "@sinonjs/fake-timers": "10.2.0",
-      "@npmcli/move-file": "1.1.2 || 2.0.1",
+      "@npmcli/move-file": "1.1.2",
       "source-map-resolve": "0.5.3",
       "source-map-url": "0.4.1",
       "resolve-url": "0.2.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 272b5b4ce..a7cb936a9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -304,8 +304,8 @@ devDependencies:
     specifier: 0.7.31
     version: 0.7.31
   '@types/node':
-    specifier: 18.15.3
-    version: 18.15.3
+    specifier: 20.8.10
+    version: 20.8.10
   '@types/prop-types':
     specifier: 15.7.6
     version: 15.7.6
@@ -422,7 +422,7 @@ devDependencies:
     version: 3.0.1
   jest:
     specifier: 29.7.0
-    version: 29.7.0(@types/node@18.15.3)(ts-node@10.9.1)
+    version: 29.7.0(@types/node@20.8.10)(ts-node@10.9.1)
   prettier:
     specifier: 3.0.3
     version: 3.0.3
@@ -440,7 +440,7 @@ devDependencies:
     version: 0.2.9
   ts-node:
     specifier: 10.9.1
-    version: 10.9.1(@types/node@18.15.3)(typescript@5.2.2)
+    version: 10.9.1(@types/node@20.8.10)(typescript@5.2.2)
   typescript:
     specifier: 5.2.2
     version: 5.2.2
@@ -1927,7 +1927,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       chalk: 4.1.2
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -1948,14 +1948,14 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.8.0
       exit: 0.1.2
       graceful-fs: 4.2.11
       jest-changed-files: 29.7.0
-      jest-config: 29.7.0(@types/node@18.15.3)(ts-node@10.9.1)
+      jest-config: 29.7.0(@types/node@20.8.10)(ts-node@10.9.1)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -1983,7 +1983,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       jest-mock: 29.7.0
     dev: true
 
@@ -2010,7 +2010,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.2.0
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -2043,7 +2043,7 @@ packages:
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.20
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -2131,7 +2131,7 @@ packages:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       '@types/yargs': 17.0.24
       chalk: 4.1.2
     dev: true
@@ -2808,7 +2808,7 @@ packages:
     dependencies:
       '@types/http-cache-semantics': 4.0.1
       '@types/keyv': 3.1.4
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       '@types/responselike': 1.0.0
 
   /@types/color-convert@2.0.0:
@@ -2837,19 +2837,19 @@ packages:
     resolution: {integrity: sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==}
     dependencies:
       '@types/jsonfile': 6.1.1
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
     dev: true
 
   /@types/fs-extra@9.0.13:
     resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
     dev: true
 
   /@types/graceful-fs@4.1.5:
     resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
     dev: true
 
   /@types/hoist-non-react-statics@3.3.1:
@@ -2896,13 +2896,13 @@ packages:
   /@types/jsonfile@6.1.1:
     resolution: {integrity: sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==}
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
     dev: true
 
   /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
 
   /@types/lodash@4.14.198:
     resolution: {integrity: sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg==}
@@ -2923,6 +2923,11 @@ packages:
     resolution: {integrity: sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g==}
     dev: true
 
+  /@types/node@20.8.10:
+    resolution: {integrity: sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==}
+    dependencies:
+      undici-types: 5.26.5
+
   /@types/normalize-package-data@2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
     dev: true
@@ -2935,7 +2940,7 @@ packages:
     resolution: {integrity: sha512-pTa9xUFQFM9WJGSWHajYNljD+DbVylE1q9IweK1LBhUYJdJ28YNU8j3KZ4Q1Qw+cSl4+QLLLOVmqNjhhvVO8fA==}
     requiresBuild: true
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       xmlbuilder: 15.1.1
     dev: true
     optional: true
@@ -2983,7 +2988,7 @@ packages:
   /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
 
   /@types/route-parser@0.1.4:
     resolution: {integrity: sha512-lwH3SeyKwCAwP7oUoJNryPDdbW3Bx5lrB6mhV5iebqzOJHIut6wlaSxpQR4Lsk6j7wC08pGenr/xE8I/A4J3Fg==}
@@ -3007,7 +3012,7 @@ packages:
   /@types/tar@6.1.6:
     resolution: {integrity: sha512-HQ06kiiDXz9uqtmE9ksQUn1ovcPr1gGV9EgaCWo6FGYKD0onNBCetBzL0kfcS8Kbj1EFxJWY9jL2W4ZvvtGI8Q==}
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       minipass: 4.2.8
     dev: true
 
@@ -3039,7 +3044,7 @@ packages:
     resolution: {integrity: sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==}
     requiresBuild: true
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
     optional: true
 
   /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@6.7.2)(eslint@8.49.0)(typescript@5.2.2):
@@ -5061,7 +5066,7 @@ packages:
     dev: true
     optional: true
 
-  /create-jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.1):
+  /create-jest@29.7.0(@types/node@20.8.10)(ts-node@10.9.1):
     resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -5070,7 +5075,7 @@ packages:
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@18.15.3)(ts-node@10.9.1)
+      jest-config: 29.7.0(@types/node@20.8.10)(ts-node@10.9.1)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -6190,7 +6195,7 @@ packages:
       '@typescript-eslint/eslint-plugin': 6.7.2(@typescript-eslint/parser@6.7.2)(eslint@8.49.0)(typescript@5.2.2)
       '@typescript-eslint/utils': 5.59.11(eslint@8.49.0)(typescript@5.2.2)
       eslint: 8.49.0
-      jest: 29.7.0(@types/node@18.15.3)(ts-node@10.9.1)
+      jest: 29.7.0(@types/node@20.8.10)(ts-node@10.9.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -8301,7 +8306,7 @@ packages:
       '@jest/expect': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       chalk: 4.1.2
       co: 4.6.0
       dedent: 1.5.1
@@ -8322,7 +8327,7 @@ packages:
       - supports-color
     dev: true
 
-  /jest-cli@29.7.0(@types/node@18.15.3)(ts-node@10.9.1):
+  /jest-cli@29.7.0(@types/node@20.8.10)(ts-node@10.9.1):
     resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -8336,10 +8341,10 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@18.15.3)(ts-node@10.9.1)
+      create-jest: 29.7.0(@types/node@20.8.10)(ts-node@10.9.1)
       exit: 0.1.2
       import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@18.15.3)(ts-node@10.9.1)
+      jest-config: 29.7.0(@types/node@20.8.10)(ts-node@10.9.1)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -8350,7 +8355,7 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config@29.7.0(@types/node@18.15.3)(ts-node@10.9.1):
+  /jest-config@29.7.0(@types/node@20.8.10)(ts-node@10.9.1):
     resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -8365,7 +8370,7 @@ packages:
       '@babel/core': 7.22.20
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       babel-jest: 29.7.0(@babel/core@7.22.20)
       chalk: 4.1.2
       ci-info: 3.8.0
@@ -8385,7 +8390,7 @@ packages:
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.9.1(@types/node@18.15.3)(typescript@5.2.2)
+      ts-node: 10.9.1(@types/node@20.8.10)(typescript@5.2.2)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -8426,7 +8431,7 @@ packages:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       jest-mock: 29.7.0
       jest-util: 29.7.0
     dev: true
@@ -8442,7 +8447,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.5
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -8493,7 +8498,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       jest-util: 29.7.0
     dev: true
 
@@ -8548,7 +8553,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -8579,7 +8584,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
@@ -8631,7 +8636,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -8656,7 +8661,7 @@ packages:
     dependencies:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -8668,13 +8673,13 @@ packages:
     resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 18.15.3
+      '@types/node': 20.8.10
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.1):
+  /jest@29.7.0(@types/node@20.8.10)(ts-node@10.9.1):
     resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -8687,7 +8692,7 @@ packages:
       '@jest/core': 29.7.0(ts-node@10.9.1)
       '@jest/types': 29.6.3
       import-local: 3.1.0
-      jest-cli: 29.7.0(@types/node@18.15.3)(ts-node@10.9.1)
+      jest-cli: 29.7.0(@types/node@20.8.10)(ts-node@10.9.1)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -12851,7 +12856,7 @@ packages:
       typescript: 5.2.2
     dev: true
 
-  /ts-node@10.9.1(@types/node@18.15.3)(typescript@5.2.2):
+  /ts-node@10.9.1(@types/node@20.4.7)(typescript@5.2.2):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -12870,7 +12875,7 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 18.15.3
+      '@types/node': 20.4.7
       acorn: 8.10.0
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -12882,7 +12887,7 @@ packages:
       yn: 3.1.1
     dev: true
 
-  /ts-node@10.9.1(@types/node@20.4.7)(typescript@5.2.2):
+  /ts-node@10.9.1(@types/node@20.8.10)(typescript@5.2.2):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -12901,7 +12906,7 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 20.4.7
+      '@types/node': 20.8.10
       acorn: 8.10.0
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -13103,6 +13108,9 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
+  /undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+
   /union-value@1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
diff --git a/recipes b/recipes
-Subproject 25794f73fc6051d146dcac9d4711ef748fbd417
+Subproject 64e26494686255797b59ca781d29c8f2ba2d514
diff --git a/src/components/services/content/WebviewCrashHandler.tsx b/src/components/services/content/WebviewCrashHandler.tsx
index e9b17e8aa..91c9cf927 100644
--- a/src/components/services/content/WebviewCrashHandler.tsx
+++ b/src/components/services/content/WebviewCrashHandler.tsx
@@ -36,7 +36,7 @@ interface IState {
 
 @observer
 class WebviewCrashHandler extends Component<IProps, IState> {
-  countdownInterval: NodeJS.Timer | undefined;
+  countdownInterval: NodeJS.Timeout | undefined;
 
   countdownIntervalTimeout = ms('1s');
 
@@ -58,7 +58,7 @@ class WebviewCrashHandler extends Component<IProps, IState> {
 
       if (this.state.countdown <= 0) {
         reload();
-        clearInterval(this.countdownInterval!);
+        clearInterval(this.countdownInterval);
       }
     }, this.countdownIntervalTimeout);
   }
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index df8c17c01..ab98ca89c 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -128,7 +128,7 @@ export default class AppStore extends TypedStore {
 
   dictionaries = [];
 
-  fetchDataInterval: null | NodeJS.Timer = null;
+  fetchDataInterval: NodeJS.Timeout | null = null;
 
   @observable downloads: Download[] = [];