diff --git a/package.json b/package.json index eebe961b..aa137b58 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "auto-launch": "^5.0.5", "axios": "^0.22.0", "blueimp-load-image": "^5.14.0", + "bufferutil": "^4.0.4", "deep-extend": "^0.6.0", "electron-context-menu": "^3.1.1", "electron-json-storage": "^4.5.0", @@ -87,7 +88,7 @@ "emoji-mart-vue": "^2.6.6", "i18next": "^21.2.0", "lodash": "^4.17.21", - "megalodon": "3.6.5", + "megalodon": "3.6.6", "minimist": "^1.2.5", "moment": "^2.29.1", "mousetrap": "^1.6.5", @@ -100,6 +101,7 @@ "system-font-families": "^0.4.1", "tunnel-agent": "^0.6.0", "unicode-emoji-json": "^0.2.1", + "utf-8-validate": "^5.0.6", "vue": "^2.6.14", "vue-awesome": "^4.3.1", "vue-click-outside": "^1.1.0", diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts index c5c98a97..661ee4dd 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts @@ -54,6 +54,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -89,6 +90,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts index e78a94e6..07c41a37 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts @@ -68,6 +68,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -102,6 +103,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts index 57bd9709..213f89d1 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts @@ -54,6 +54,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -88,6 +89,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts index 40e1ed62..2027ff76 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts @@ -53,6 +53,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -87,6 +88,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts index 3ad353f9..e65f105e 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts @@ -55,6 +55,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -90,6 +91,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts index ae93e44c..4e693506 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts @@ -53,6 +53,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -87,6 +88,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts index 420bb56d..08f43857 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts @@ -54,6 +54,7 @@ const status: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts index d291e941..90dc151c 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts @@ -76,6 +76,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -111,6 +112,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -146,6 +148,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status2, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts index eb68d8df..548831a0 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts @@ -53,6 +53,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -87,6 +88,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Search/Toots.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Search/Toots.spec.ts index ea6d5b3a..4eeb6e5f 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Search/Toots.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Search/Toots.spec.ts @@ -58,6 +58,7 @@ const status: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts index 1c31b9b4..4d9cece6 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts @@ -31,6 +31,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -65,6 +66,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -100,6 +102,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status1, content: '', + plain_content: null, created_at: '2019-03-31T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts index 551684c2..2c8f0d05 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts @@ -31,6 +31,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -65,6 +66,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -100,6 +102,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status1, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-31T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts index 2af2796d..e95bbdff 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts @@ -31,6 +31,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -65,6 +66,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -239,6 +241,7 @@ describe('TimelineSpace/Contents/Home', () => { in_reply_to_account_id: null, reblog: status1, content: '', + plain_content: null, created_at: '2019-03-31T21:40:32', emojis: [], replies_count: 0, @@ -314,6 +317,7 @@ describe('TimelineSpace/Contents/Home', () => { in_reply_to_account_id: null, reblog: status1, content: '', + plain_content: null, created_at: '2019-03-31T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts index 6a47df74..74b0157f 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts @@ -31,6 +31,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -65,6 +66,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -100,6 +102,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status1, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-31T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts index a2411913..636b6bf9 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts @@ -31,6 +31,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -65,6 +66,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -100,6 +102,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status1, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-31T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts index 811a5c1f..19c97dce 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts @@ -54,6 +54,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -89,6 +90,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -124,6 +126,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status2, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts index 81e8482f..3f41ede0 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts @@ -54,6 +54,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -89,6 +90,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -124,6 +126,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status2, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts index 2df67083..547e56ed 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts @@ -31,6 +31,7 @@ const status1: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'hoge', + plain_content: 'hoge', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -65,6 +66,7 @@ const status2: Entity.Status = { in_reply_to_account_id: null, reblog: null, content: 'fuga', + plain_content: 'fuga', created_at: '2019-03-26T21:40:32', emojis: [], replies_count: 0, @@ -100,6 +102,7 @@ const rebloggedStatus: Entity.Status = { in_reply_to_account_id: null, reblog: status1, content: '', + plain_content: null, created_at: '2019-03-31T21:40:32', emojis: [], replies_count: 0, diff --git a/yarn.lock b/yarn.lock index cd47772c..899e9015 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1687,10 +1687,10 @@ resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz#805c0612b3a0c124cf99f517364142946b74ba3b" integrity sha512-OjJdqx6QlbyZw9LShPwRW+Kmiegeg3eWNI41MQQKaG3vjdU2L9SRElntM51HmHBY1cu7izxQJ1lMYioQh3XMBg== -"@types/ws@^7.2.0": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.6.tgz#516cbfb818310f87b43940460e065eb912a4178d" - integrity sha512-Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ== +"@types/ws@^8.2.0": + version "8.2.0" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.0.tgz#75faefbe2328f3b833cb8dc640658328990d04f3" + integrity sha512-cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg== dependencies: "@types/node" "*" @@ -2065,6 +2065,13 @@ agent-base@6: dependencies: debug "4" +agent-base@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -3127,6 +3134,13 @@ buffer@^5.1.0: base64-js "^1.3.1" ieee754 "^1.1.13" +bufferutil@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.4.tgz#ab81373d313a6ead0d734e98c448c722734ae7bb" + integrity sha512-VNxjXUCrF3LvbLgwfkTb5LsFvk6pGIn7OBb9x+3o+iJ6mKw0JTUp4chBFc88hi1aspeZGeZG9jAIbpFYPQSLZw== + dependencies: + node-gyp-build "^4.2.0" + builder-util-runtime@8.7.6: version "8.7.6" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz#4b43c96db2bd494ced7694bcd7674934655e8324" @@ -8755,23 +8769,23 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -megalodon@3.6.5: - version "3.6.5" - resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-3.6.5.tgz#331f4520ee7b454350db8f7e7b0788229e7e5704" - integrity sha512-2zLbtlSrS43EYr/8MHyhTRe+41ftUF3gwfKOWcQ6st45wtHuKdjULl1dpOSaAow3SWavjZLW+PvECxa7o6g7Jg== +megalodon@3.6.6: + version "3.6.6" + resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-3.6.6.tgz#657da42e42777f619482c48c35e424525ec33427" + integrity sha512-jlpKF+bR7Jh1441iidWyqH98vULCUxDS2BLSPGCvySAKzP/+aUnXv57IC/CLMyfuYvleos8lhK7eL4eesh+huA== dependencies: "@types/oauth" "^0.9.0" - "@types/ws" "^7.2.0" + "@types/ws" "^8.2.0" axios "^0.21.0" dayjs "^1.10.4" form-data "^4.0.0" https-proxy-agent "^5.0.0" oauth "^0.9.15" object-assign-deep "^0.4.0" - socks-proxy-agent "^5.0.0" + socks-proxy-agent "^6.1.0" typescript "4.2.4" uuid "^8.0.0" - ws "^7.2.1" + ws "^8.2.2" memory-fs@^0.4.1: version "0.4.1" @@ -9167,6 +9181,11 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-gyp-build@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" + integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== + node-gyp@^7.1.0: version "7.1.2" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" @@ -11472,19 +11491,19 @@ sockjs@^0.3.21: uuid "^3.4.0" websocket-driver "^0.7.4" -socks-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" - integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== +socks-proxy-agent@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz#869cf2d7bd10fea96c7ad3111e81726855e285c3" + integrity sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg== dependencies: - agent-base "6" - debug "4" - socks "^2.3.3" + agent-base "^6.0.2" + debug "^4.3.1" + socks "^2.6.1" -socks@^2.3.3: - version "2.4.4" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.4.4.tgz#f1a3382e7814ae28c97bb82a38bc1ac24b21cca2" - integrity sha512-7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA== +socks@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" + integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== dependencies: ip "^1.1.5" smart-buffer "^4.1.0" @@ -12920,6 +12939,13 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== +utf-8-validate@^5.0.6: + version "5.0.6" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.6.tgz#e1b3e0a5cc8648a3b44c1799fbb170d1aaaffe80" + integrity sha512-hoY0gOf9EkCw+nimK21FVKHUIG1BMqSiRwxB/q3A9yKZOrOI99PP77BxmarDqWz6rG3vVYiBWfhG8z2Tl+7fZA== + dependencies: + node-gyp-build "^4.2.0" + utf8-byte-length@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" @@ -13533,11 +13559,16 @@ ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^7.2.1, ws@^7.4.5: +ws@^7.4.5: version "7.4.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== +ws@^8.2.2: + version "8.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.2.tgz#ca684330c6dd6076a737250ed81ac1606cb0a63e" + integrity sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw== + x-is-string@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"