diff --git a/README.md b/README.md
index e35aa87..d1b11a7 100644
--- a/README.md
+++ b/README.md
@@ -181,3 +181,6 @@ Note: Adding *and upgrading* dependencies should only be done with prior conside
That's why `yarn.lock` exists and is version controlled.
To upgrade NPM dependencies, run `yarn upgrade` locally. Run `yarn outdated` to see pending upgrades.
+
+If you encounter error 'Could not detect abi for version X.X.X and runtime electron', try running
+`npx uuaw node-abi`
diff --git a/chat/preview/ImagePreview.vue b/chat/preview/ImagePreview.vue
index bc76f8f..642d373 100644
--- a/chat/preview/ImagePreview.vue
+++ b/chat/preview/ImagePreview.vue
@@ -57,7 +57,7 @@
CharacterPreviewHelper, RenderStyle
} from './helper';
- import {Point, WebviewTag} from 'electron';
+ import {Point} from 'electron';
import * as remote from '@electron/remote';
import Timer = NodeJS.Timer;
@@ -614,8 +614,8 @@
}
- getWebview(): WebviewTag {
- return this.$refs.imagePreviewExt as WebviewTag;
+ getWebview(): Electron.WebviewTag {
+ return this.$refs.imagePreviewExt as Electron.WebviewTag;
}
diff --git a/learn/dictionary/WordDefinition.vue b/learn/dictionary/WordDefinition.vue
index 637c55a..0c99d9e 100644
--- a/learn/dictionary/WordDefinition.vue
+++ b/learn/dictionary/WordDefinition.vue
@@ -16,7 +16,6 @@
</template>
<script lang="ts">
import Vue from 'vue';
-import { WebviewTag } from 'electron';
import { Component, Hook, Prop } from '@f-list/vue-ts';
import { EventBusEvent } from '../../chat/preview/event-bus';
@@ -93,8 +92,8 @@ export default class WordDefinition extends Vue {
}
- protected getWebview(): WebviewTag {
- return this.$refs.definitionPreview as WebviewTag;
+ protected getWebview(): Electron.WebviewTag {
+ return this.$refs.definitionPreview as Electron.WebviewTag;
}
diff --git a/package.json b/package.json
index afb26c9..2b791c0 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"description": "A heavily modded F-Chat 3.0 client for F-List",
"license": "MIT",
"devDependencies": {
- "@electron/remote": "^2.0.1",
+ "@electron/remote": "^2.0.8",
"@f-list/fork-ts-checker-webpack-plugin": "^3.1.1",
"@f-list/vue-ts": "^1.0.3",
"@fortawesome/fontawesome-free": "^5.15.1",
@@ -25,10 +25,10 @@
"copy-webpack-plugin": "^6.2.1",
"css-loader": "^5.0.0",
"date-fns": "^2.16.1",
- "electron": "^14.2.3",
+ "electron": "^17.1.2",
"electron-log": "^4.4.3",
"electron-packager": "^15.4.0",
- "electron-rebuild": "^3.2.5",
+ "electron-rebuild": "^3.2.7",
"extract-loader": "^5.1.0",
"file-loader": "^6.2.0",
"lodash": "^4.17.20",
diff --git a/yarn.lock b/yarn.lock
index bdf9fb1..9f48508 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -81,10 +81,26 @@
global-agent "^2.0.2"
global-tunnel-ng "^2.7.1"
-"@electron/remote@^2.0.1":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
- integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
+"@electron/get@^1.13.0":
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
+ integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
+ dependencies:
+ debug "^4.1.1"
+ env-paths "^2.2.0"
+ fs-extra "^8.1.0"
+ got "^9.6.0"
+ progress "^2.0.3"
+ semver "^6.2.0"
+ sumchecker "^3.0.1"
+ optionalDependencies:
+ global-agent "^3.0.0"
+ global-tunnel-ng "^2.7.1"
+
+"@electron/remote@^2.0.8":
+ version "2.0.8"
+ resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.8.tgz#85ff321f0490222993207106e2f720273bb1a5c3"
+ integrity sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==
"@f-list/fork-ts-checker-webpack-plugin@^3.1.1":
version "3.1.1"
@@ -1818,7 +1834,7 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -1986,11 +2002,6 @@ colorette@^1.2.2, colorette@^1.3.0:
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
-colors@^1.3.3:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
- integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
version "1.0.8"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2631,18 +2642,18 @@ electron-packager@^15.4.0:
semver "^7.1.3"
yargs-parser "^20.0.0"
-electron-rebuild@^3.2.5:
- version "3.2.5"
- resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.5.tgz#a9e82b4259aac33ad449f6959de68ded2c5679f8"
- integrity sha512-U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA==
+electron-rebuild@^3.2.7:
+ version "3.2.7"
+ resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.7.tgz#0f56c1cc99a6fec0a5b990532283c2a8c838c19b"
+ integrity sha512-WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==
dependencies:
"@malept/cross-spawn-promise" "^2.0.0"
- colors "^1.3.3"
+ chalk "^4.0.0"
debug "^4.1.1"
detect-libc "^1.0.3"
fs-extra "^10.0.0"
got "^11.7.0"
- lzma-native "^8.0.1"
+ lzma-native "^8.0.5"
node-abi "^3.0.0"
node-api-version "^0.1.4"
node-gyp "^8.4.0"
@@ -2683,12 +2694,12 @@ electron@^12.0.6:
"@types/node" "^14.6.2"
extract-zip "^1.0.3"
-electron@^14.2.3:
- version "14.2.3"
- resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.3.tgz#3facf572c57cefe8ce80154ad3e63f937784644b"
- integrity sha512-7wBqvzUKhK1tw544w3+F8J7NajnqURGC4pH3VFTiBHU5ayiI/oaTTXJxyFLZ54zsR7xwon/3dYEVjIm2i68+Zg==
+electron@^17.1.2:
+ version "17.1.2"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-17.1.2.tgz#b4e4a0df883d9a9854cf865efa2bb00b12d55b1d"
+ integrity sha512-hqKQaUIRWX5Y2eAD8FZINWD/e5TKdpkbBYbkcZmJS4Bd1PKQsaDVc9h5xoA8zZQkPymE9rss+swjRpAFurOPGQ==
dependencies:
- "@electron/get" "^1.0.1"
+ "@electron/get" "^1.13.0"
"@types/node" "^14.6.2"
extract-zip "^1.0.3"
@@ -3507,6 +3518,18 @@ global-agent@^2.0.2:
semver "^7.3.2"
serialize-error "^7.0.1"
+global-agent@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
+ integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
+ dependencies:
+ boolean "^3.0.1"
+ es6-error "^4.1.1"
+ matcher "^3.0.0"
+ roarr "^2.15.3"
+ semver "^7.3.2"
+ serialize-error "^7.0.1"
+
global-tunnel-ng@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
@@ -4578,10 +4601,10 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
-lzma-native@^8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.1.tgz#8569e2f88de461a9a2469ac9d8183637c387d682"
- integrity sha512-Ryr9X3yDVZhRYOxR8QhUBCNe6GdEfy9BvFDIFtUvEkocvSvnrYt9lRm6FR1z0eQn0QSMenrgrDIJRMgUf9zsKQ==
+lzma-native@^8.0.5:
+ version "8.0.6"
+ resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665"
+ integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==
dependencies:
node-addon-api "^3.1.0"
node-gyp-build "^4.2.1"
@@ -4990,9 +5013,9 @@ node-abi@^2.21.0:
semver "^5.4.1"
node-abi@^3.0.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248"
- integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw==
+ version "3.8.0"
+ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32"
+ integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==
dependencies:
semver "^7.3.5"