diff --git a/package-lock.json b/package-lock.json
index b640e104..55ff0c4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,16 +31,16 @@
}
},
"@babel/core": {
- "version": "7.11.1",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz",
- "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==",
+ "version": "7.11.4",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz",
+ "integrity": "sha512-5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.10.4",
- "@babel/generator": "^7.11.0",
+ "@babel/generator": "^7.11.4",
"@babel/helper-module-transforms": "^7.11.0",
"@babel/helpers": "^7.10.4",
- "@babel/parser": "^7.11.1",
+ "@babel/parser": "^7.11.4",
"@babel/template": "^7.10.4",
"@babel/traverse": "^7.11.0",
"@babel/types": "^7.11.0",
@@ -63,6 +63,17 @@
"@babel/highlight": "^7.10.4"
}
},
+ "@babel/generator": {
+ "version": "7.11.4",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz",
+ "integrity": "sha512-Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.11.0",
+ "jsesc": "^2.5.1",
+ "source-map": "^0.5.0"
+ }
+ },
"@babel/highlight": {
"version": "7.10.4",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -74,6 +85,12 @@
"js-tokens": "^4.0.0"
}
},
+ "@babel/parser": {
+ "version": "7.11.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz",
+ "integrity": "sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA==",
+ "dev": true
+ },
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1694,13 +1711,13 @@
}
},
"@jest/core": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.4.0.tgz",
- "integrity": "sha512-mpXm4OjWQbz7qbzGIiSqvfNZ1FxX6ywWgLtdSD2luPORt5zKPtqcdDnX7L8RdfMaj1znDBgN2+gB094ZIr7vnA==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.4.2.tgz",
+ "integrity": "sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==",
"dev": true,
"requires": {
"@jest/console": "^26.3.0",
- "@jest/reporters": "^26.4.0",
+ "@jest/reporters": "^26.4.1",
"@jest/test-result": "^26.3.0",
"@jest/transform": "^26.3.0",
"@jest/types": "^26.3.0",
@@ -1710,17 +1727,17 @@
"exit": "^0.1.2",
"graceful-fs": "^4.2.4",
"jest-changed-files": "^26.3.0",
- "jest-config": "^26.4.0",
+ "jest-config": "^26.4.2",
"jest-haste-map": "^26.3.0",
"jest-message-util": "^26.3.0",
"jest-regex-util": "^26.0.0",
"jest-resolve": "^26.4.0",
- "jest-resolve-dependencies": "^26.4.0",
- "jest-runner": "^26.4.0",
- "jest-runtime": "^26.4.0",
- "jest-snapshot": "^26.4.0",
+ "jest-resolve-dependencies": "^26.4.2",
+ "jest-runner": "^26.4.2",
+ "jest-runtime": "^26.4.2",
+ "jest-snapshot": "^26.4.2",
"jest-util": "^26.3.0",
- "jest-validate": "^26.4.0",
+ "jest-validate": "^26.4.2",
"jest-watcher": "^26.3.0",
"micromatch": "^4.0.2",
"p-each-series": "^2.1.0",
@@ -1881,20 +1898,20 @@
}
},
"@jest/globals": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.4.0.tgz",
- "integrity": "sha512-QKwoVAeL9d0xaEM9ebPvfc+bolN04F+o3zM2jswGDBiiNjCogZ3LvOaqumRdDyz6kLmbx+UhgMBAVuLunbXZ2A==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.4.2.tgz",
+ "integrity": "sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==",
"dev": true,
"requires": {
"@jest/environment": "^26.3.0",
"@jest/types": "^26.3.0",
- "expect": "^26.4.0"
+ "expect": "^26.4.2"
}
},
"@jest/reporters": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.0.tgz",
- "integrity": "sha512-14OPAAuYhgRBSNxAocVluX6ksdMdK/EuP9NmtBXU9g1uKaVBrPnohn/CVm6iMot1a9iU8BCxa5715YRf8FEg/A==",
+ "version": "26.4.1",
+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.1.tgz",
+ "integrity": "sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==",
"dev": true,
"requires": {
"@bcoe/v8-coverage": "^0.2.3",
@@ -1916,7 +1933,7 @@
"jest-resolve": "^26.4.0",
"jest-util": "^26.3.0",
"jest-worker": "^26.3.0",
- "node-notifier": "^7.0.0",
+ "node-notifier": "^8.0.0",
"slash": "^3.0.0",
"source-map": "^0.6.0",
"string-length": "^4.0.1",
@@ -2026,16 +2043,16 @@
}
},
"@jest/test-sequencer": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.0.tgz",
- "integrity": "sha512-9Z7lCShS7vERp+DRwIVNH/6sHMWwJK1DPnGCpGeVLGJJWJ4Y08sQI3vIKdmKHu2KmwlUBpRM+BFf7NlVUkl5XA==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz",
+ "integrity": "sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==",
"dev": true,
"requires": {
"@jest/test-result": "^26.3.0",
"graceful-fs": "^4.2.4",
"jest-haste-map": "^26.3.0",
- "jest-runner": "^26.4.0",
- "jest-runtime": "^26.4.0"
+ "jest-runner": "^26.4.2",
+ "jest-runtime": "^26.4.2"
},
"dependencies": {
"graceful-fs": {
@@ -5237,9 +5254,9 @@
}
},
"cli-spinners": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
- "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
+ "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
"dev": true
},
"cli-truncate": {
@@ -7366,9 +7383,9 @@
}
},
"electron-rebuild": {
- "version": "1.11.0",
- "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.11.0.tgz",
- "integrity": "sha512-cn6AqZBQBVtaEyj5jZW1/LOezZZ22PA1HvhEP7asvYPJ8PDF4i4UFt9be4i9T7xJKiSiomXvY5Fd+dSq3FXZxA==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-2.0.0.tgz",
+ "integrity": "sha512-A+acX+oU2g1ImoEuQGfsYWOGKCq757KyMN/INSVMiNvjqzE6tmZ4/xim6Q1Rca9aRhep+QdMVwoIVsp/jq0woQ==",
"dev": true,
"requires": {
"colors": "^1.3.3",
@@ -7376,7 +7393,7 @@
"detect-libc": "^1.0.3",
"fs-extra": "^8.1.0",
"node-abi": "^2.11.0",
- "node-gyp": "^6.0.1",
+ "node-gyp": "^7.1.0",
"ora": "^3.4.0",
"spawn-rx": "^3.0.0",
"yargs": "^14.2.0"
@@ -8355,15 +8372,15 @@
}
},
"expect": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-26.4.0.tgz",
- "integrity": "sha512-dbYDJhFcqQsamlos6nEwAMe+ahdckJBk5fmw1DYGLQGabGSlUuT+Fm2jHYw5119zG3uIhP+lCQbjJhFEdZMJtg==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-26.4.2.tgz",
+ "integrity": "sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
"ansi-styles": "^4.0.0",
"jest-get-type": "^26.3.0",
- "jest-matcher-utils": "^26.4.0",
+ "jest-matcher-utils": "^26.4.2",
"jest-message-util": "^26.3.0",
"jest-regex-util": "^26.0.0"
},
@@ -11011,14 +11028,14 @@
}
},
"jest": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest/-/jest-26.4.0.tgz",
- "integrity": "sha512-lNCOS+ckRHE1wFyVtQClBmbsOVuH2GWUTJMDL3vunp9DXcah+V8vfvVVApngClcdoc3rgZpqOfCNKLjxjj2l4g==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz",
+ "integrity": "sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==",
"dev": true,
"requires": {
- "@jest/core": "^26.4.0",
+ "@jest/core": "^26.4.2",
"import-local": "^3.0.2",
- "jest-cli": "^26.4.0"
+ "jest-cli": "^26.4.2"
},
"dependencies": {
"ansi-styles": {
@@ -11089,12 +11106,12 @@
}
},
"jest-cli": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.0.tgz",
- "integrity": "sha512-kw2Pr3V2x9/WzSDGsbz/MJBNlCoPMxMudrIavft4bqRlv5tASjU51tyO+1Os1LdW2dAnLQZYsxFUZ8oWPyssGQ==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.2.tgz",
+ "integrity": "sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==",
"dev": true,
"requires": {
- "@jest/core": "^26.4.0",
+ "@jest/core": "^26.4.2",
"@jest/test-result": "^26.3.0",
"@jest/types": "^26.3.0",
"chalk": "^4.0.0",
@@ -11102,9 +11119,9 @@
"graceful-fs": "^4.2.4",
"import-local": "^3.0.2",
"is-ci": "^2.0.0",
- "jest-config": "^26.4.0",
+ "jest-config": "^26.4.2",
"jest-util": "^26.3.0",
- "jest-validate": "^26.4.0",
+ "jest-validate": "^26.4.2",
"prompts": "^2.0.1",
"yargs": "^15.3.1"
}
@@ -11279,13 +11296,13 @@
}
},
"jest-config": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.4.0.tgz",
- "integrity": "sha512-MxsvrBug8YY+C4QcUBtmgnHyFeW7w3Ouk/w9eplCDN8VJGVyBEZFe8Lxzfp2pSqh0Dqurqv8Oik2YkbekGUlxg==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.4.2.tgz",
+ "integrity": "sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.4.0",
+ "@jest/test-sequencer": "^26.4.2",
"@jest/types": "^26.3.0",
"babel-jest": "^26.3.0",
"chalk": "^4.0.0",
@@ -11295,13 +11312,13 @@
"jest-environment-jsdom": "^26.3.0",
"jest-environment-node": "^26.3.0",
"jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.4.0",
+ "jest-jasmine2": "^26.4.2",
"jest-regex-util": "^26.0.0",
"jest-resolve": "^26.4.0",
"jest-util": "^26.3.0",
- "jest-validate": "^26.4.0",
+ "jest-validate": "^26.4.2",
"micromatch": "^4.0.2",
- "pretty-format": "^26.4.0"
+ "pretty-format": "^26.4.2"
},
"dependencies": {
"ansi-styles": {
@@ -11406,15 +11423,15 @@
}
},
"jest-diff": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.0.tgz",
- "integrity": "sha512-wwC38HlOW+iTq6j5tkj/ZamHn6/nrdcEOc/fKaVILNtN2NLWGdkfRaHWwfNYr5ehaLvuoG2LfCZIcWByVj0gjg==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.2.tgz",
+ "integrity": "sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
"diff-sequences": "^26.3.0",
"jest-get-type": "^26.3.0",
- "pretty-format": "^26.4.0"
+ "pretty-format": "^26.4.2"
},
"dependencies": {
"ansi-styles": {
@@ -11479,16 +11496,16 @@
}
},
"jest-each": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.4.0.tgz",
- "integrity": "sha512-+cyBh1ehs6thVT/bsZVG+WwmRn2ix4Q4noS9yLZgM10yGWPW12/TDvwuOV2VZXn1gi09/ZwJKJWql6YW1C9zNw==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.4.2.tgz",
+ "integrity": "sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
"chalk": "^4.0.0",
"jest-get-type": "^26.3.0",
"jest-util": "^26.3.0",
- "pretty-format": "^26.4.0"
+ "pretty-format": "^26.4.2"
},
"dependencies": {
"ansi-styles": {
@@ -11675,9 +11692,9 @@
}
},
"jest-jasmine2": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.0.tgz",
- "integrity": "sha512-cGBxwzDDKB09EPJ4pE69BMDv+2lO442IB1xQd+vL3cua2OKdeXQK6iDlQKoRX/iP0RgU5T8sn9yahLcx/+ox8Q==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz",
+ "integrity": "sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==",
"dev": true,
"requires": {
"@babel/traverse": "^7.1.0",
@@ -11688,15 +11705,15 @@
"@types/node": "*",
"chalk": "^4.0.0",
"co": "^4.6.0",
- "expect": "^26.4.0",
+ "expect": "^26.4.2",
"is-generator-fn": "^2.0.0",
- "jest-each": "^26.4.0",
- "jest-matcher-utils": "^26.4.0",
+ "jest-each": "^26.4.2",
+ "jest-matcher-utils": "^26.4.2",
"jest-message-util": "^26.3.0",
- "jest-runtime": "^26.4.0",
- "jest-snapshot": "^26.4.0",
+ "jest-runtime": "^26.4.2",
+ "jest-snapshot": "^26.4.2",
"jest-util": "^26.3.0",
- "pretty-format": "^26.4.0",
+ "pretty-format": "^26.4.2",
"throat": "^5.0.0"
},
"dependencies": {
@@ -11753,25 +11770,25 @@
}
},
"jest-leak-detector": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.0.tgz",
- "integrity": "sha512-7EXKKEKnAWUPyiVtGZzJflbPOtYUdlNoevNVOkAcPpdR8xWiYKPGNGA6sz25S+8YhZq3rmkQJYAh3/P0VnoRwA==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz",
+ "integrity": "sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==",
"dev": true,
"requires": {
"jest-get-type": "^26.3.0",
- "pretty-format": "^26.4.0"
+ "pretty-format": "^26.4.2"
}
},
"jest-matcher-utils": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.0.tgz",
- "integrity": "sha512-u+xdCdq+F262DH+PutJKXLGr2H5P3DImdJCir51PGSfi3TtbLQ5tbzKaN8BkXbiTIU6ayuAYBWTlU1nyckVdzA==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz",
+ "integrity": "sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
- "jest-diff": "^26.4.0",
+ "jest-diff": "^26.4.2",
"jest-get-type": "^26.3.0",
- "pretty-format": "^26.4.0"
+ "pretty-format": "^26.4.2"
},
"dependencies": {
"ansi-styles": {
@@ -12126,20 +12143,20 @@
}
},
"jest-resolve-dependencies": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.0.tgz",
- "integrity": "sha512-hznK/hlrlhu8hwdbieRdHFKmcV83GW8t30libt/v6j1L3IEzb8iN21SaWzV8KRAAK4ijiU0kuge0wnHn+0rytQ==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz",
+ "integrity": "sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
"jest-regex-util": "^26.0.0",
- "jest-snapshot": "^26.4.0"
+ "jest-snapshot": "^26.4.2"
}
},
"jest-runner": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.0.tgz",
- "integrity": "sha512-XF+tnUGolnPriu6Gg+HHWftspMjD5NkTV2mQppQnpZe39GcUangJ0al7aBGtA3GbVAcRd048DQiJPmsQRdugjw==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.2.tgz",
+ "integrity": "sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==",
"dev": true,
"requires": {
"@jest/console": "^26.3.0",
@@ -12151,13 +12168,13 @@
"emittery": "^0.7.1",
"exit": "^0.1.2",
"graceful-fs": "^4.2.4",
- "jest-config": "^26.4.0",
+ "jest-config": "^26.4.2",
"jest-docblock": "^26.0.0",
"jest-haste-map": "^26.3.0",
- "jest-leak-detector": "^26.4.0",
+ "jest-leak-detector": "^26.4.2",
"jest-message-util": "^26.3.0",
"jest-resolve": "^26.4.0",
- "jest-runtime": "^26.4.0",
+ "jest-runtime": "^26.4.2",
"jest-util": "^26.3.0",
"jest-worker": "^26.3.0",
"source-map-support": "^0.5.6",
@@ -12223,15 +12240,15 @@
}
},
"jest-runtime": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.0.tgz",
- "integrity": "sha512-1fjZgGpkyQBUTo59Vi19I4IcsBwzY6uwVFNjUmR06iIi3XRErkY28yimi4IUDRrofQErqcDEw2n3DF9WmQ6vEg==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.2.tgz",
+ "integrity": "sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==",
"dev": true,
"requires": {
"@jest/console": "^26.3.0",
"@jest/environment": "^26.3.0",
"@jest/fake-timers": "^26.3.0",
- "@jest/globals": "^26.4.0",
+ "@jest/globals": "^26.4.2",
"@jest/source-map": "^26.3.0",
"@jest/test-result": "^26.3.0",
"@jest/transform": "^26.3.0",
@@ -12242,15 +12259,15 @@
"exit": "^0.1.2",
"glob": "^7.1.3",
"graceful-fs": "^4.2.4",
- "jest-config": "^26.4.0",
+ "jest-config": "^26.4.2",
"jest-haste-map": "^26.3.0",
"jest-message-util": "^26.3.0",
"jest-mock": "^26.3.0",
"jest-regex-util": "^26.0.0",
"jest-resolve": "^26.4.0",
- "jest-snapshot": "^26.4.0",
+ "jest-snapshot": "^26.4.2",
"jest-util": "^26.3.0",
- "jest-validate": "^26.4.0",
+ "jest-validate": "^26.4.2",
"slash": "^3.0.0",
"strip-bom": "^4.0.0",
"yargs": "^15.3.1"
@@ -12339,25 +12356,25 @@
}
},
"jest-snapshot": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.0.tgz",
- "integrity": "sha512-vFGmNGWHMBomrlOpheTMoqihymovuH3GqfmaEIWoPpsxUXyxT3IlbxI5I4m2vg0uv3HUJYg5JoGrkgMzVsAwCg==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.2.tgz",
+ "integrity": "sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
"@jest/types": "^26.3.0",
"@types/prettier": "^2.0.0",
"chalk": "^4.0.0",
- "expect": "^26.4.0",
+ "expect": "^26.4.2",
"graceful-fs": "^4.2.4",
- "jest-diff": "^26.4.0",
+ "jest-diff": "^26.4.2",
"jest-get-type": "^26.3.0",
"jest-haste-map": "^26.3.0",
- "jest-matcher-utils": "^26.4.0",
+ "jest-matcher-utils": "^26.4.2",
"jest-message-util": "^26.3.0",
"jest-resolve": "^26.4.0",
"natural-compare": "^1.4.0",
- "pretty-format": "^26.4.0",
+ "pretty-format": "^26.4.2",
"semver": "^7.3.2"
},
"dependencies": {
@@ -12541,9 +12558,9 @@
}
},
"jest-validate": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.0.tgz",
- "integrity": "sha512-t56Z/FRMrLP6mpmje7/YgHy0wOzcuc6i3LBXz6kjmsUWYN62OuMdC86Vg9/dX59SvyitSqqegOrx+h7BkNXeaQ==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.2.tgz",
+ "integrity": "sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
@@ -12551,7 +12568,7 @@
"chalk": "^4.0.0",
"jest-get-type": "^26.3.0",
"leven": "^3.1.0",
- "pretty-format": "^26.4.0"
+ "pretty-format": "^26.4.2"
},
"dependencies": {
"ansi-styles": {
@@ -13840,9 +13857,9 @@
}
},
"node-abi": {
- "version": "2.18.0",
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz",
- "integrity": "sha512-yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw==",
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.0.tgz",
+ "integrity": "sha512-rpKqVe24p9GvMTgtqUXdLR1WQJBGVlkYPU10qHKv9/1i9V/k04MmFLVK2WcHBf1WKKY+ZsdvARPi8F4tfJ4opA==",
"dev": true,
"requires": {
"semver": "^5.4.1"
@@ -13876,33 +13893,23 @@
"dev": true
},
"node-gyp": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz",
- "integrity": "sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.0.tgz",
+ "integrity": "sha512-rjlHQlnl1dqiDZxZYiKqQdrjias7V+81OVR5PTzZioCBtWkNdrKy06M05HLKxy/pcKikKRCabeDRoZaEc6nIjw==",
"dev": true,
"requires": {
"env-paths": "^2.2.0",
"glob": "^7.1.4",
- "graceful-fs": "^4.2.2",
- "mkdirp": "^0.5.1",
- "nopt": "^4.0.1",
+ "graceful-fs": "^4.2.3",
+ "nopt": "^4.0.3",
"npmlog": "^4.1.2",
- "request": "^2.88.0",
+ "request": "^2.88.2",
"rimraf": "^2.6.3",
- "semver": "^5.7.1",
- "tar": "^4.4.12",
- "which": "^1.3.1"
+ "semver": "^7.3.2",
+ "tar": "^6.0.1",
+ "which": "^2.0.2"
},
"dependencies": {
- "fs-minipass": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
- "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
- "dev": true,
- "requires": {
- "minipass": "^2.6.0"
- }
- },
"glob": {
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -13923,44 +13930,57 @@
"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
"dev": true
},
- "minipass": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
- "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+ "request": {
+ "version": "2.88.2",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
"dev": true,
"requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
"safe-buffer": "^5.1.2",
- "yallist": "^3.0.0"
- }
- },
- "minizlib": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
- "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
- "dev": true,
- "requires": {
- "minipass": "^2.9.0"
+ "tough-cookie": "~2.5.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
}
},
"semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "7.3.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+ "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
"dev": true
},
- "tar": {
- "version": "4.4.13",
- "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
- "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+ "tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
"dev": true,
"requires": {
- "chownr": "^1.1.1",
- "fs-minipass": "^1.2.5",
- "minipass": "^2.8.6",
- "minizlib": "^1.2.1",
- "mkdirp": "^0.5.0",
- "safe-buffer": "^5.1.2",
- "yallist": "^3.0.3"
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
}
}
}
@@ -14098,9 +14118,9 @@
"dev": true
},
"node-notifier": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.2.tgz",
- "integrity": "sha512-ux+n4hPVETuTL8+daJXTOC6uKLgMsl1RYfFv7DKRzyvzBapqco0rZZ9g72ZN8VS6V+gvNYHYa/ofcCY8fkJWsA==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
+ "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
"dev": true,
"optional": true,
"requires": {
@@ -14108,7 +14128,7 @@
"is-wsl": "^2.2.0",
"semver": "^7.3.2",
"shellwords": "^0.1.1",
- "uuid": "^8.2.0",
+ "uuid": "^8.3.0",
"which": "^2.0.2"
},
"dependencies": {
@@ -15332,9 +15352,9 @@
}
},
"pretty-format": {
- "version": "26.4.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz",
- "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==",
+ "version": "26.4.2",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz",
+ "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
@@ -16311,9 +16331,9 @@
}
},
"rxjs": {
- "version": "6.5.5",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
- "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+ "version": "6.6.2",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
+ "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
@@ -18135,9 +18155,9 @@
}
},
"typescript": {
- "version": "3.9.7",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
- "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz",
+ "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==",
"dev": true
},
"underscore": {
@@ -18757,9 +18777,9 @@
"dev": true
},
"vue": {
- "version": "2.6.11",
- "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
- "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
+ "version": "2.6.12",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
+ "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
},
"vue-devtools": {
"version": "5.1.4",
@@ -18868,9 +18888,9 @@
}
},
"vue-template-compiler": {
- "version": "2.6.11",
- "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
- "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
+ "version": "2.6.12",
+ "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
+ "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
"dev": true,
"requires": {
"de-indent": "^1.0.2",
@@ -20129,9 +20149,9 @@
"integrity": "sha512-8ooE213CRLz2/5vNJNyrgx9ZZkefjo7rG8wumBnobMgkgb7RNAab36Db7mLlBXXpMNLVDQpoBPlOhWEYdSnFCw=="
},
"ytdl-core": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-3.2.1.tgz",
- "integrity": "sha512-e6vlLOc+yrdNGOqfbQvWuaI3XNx5Yp4sLGY2RPdP2gCiumhn1BDqrYjn1nUCze/LGZ8C3bFxEdUqKi2vS1aaXg==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-3.2.2.tgz",
+ "integrity": "sha512-DVE7uhk4WYB2Op742QQVGE/b9G7cr9kSB3ZDpDXmyRPhO55h9u8gwORlDIHWKucWVmCsdsdKzNP89QylpJEgiw==",
"requires": {
"html-entities": "^1.3.1",
"m3u8stream": "^0.7.1",
diff --git a/package.json b/package.json
index 728ba9d1..07ba7f3b 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"videojs-http-source-selector": "^1.1.6",
"videojs-replay": "^1.1.0",
"videojs-vtt-thumbnails": "0.0.13",
- "vue": "^2.6.11",
+ "vue": "^2.6.12",
"vue-electron": "^1.0.6",
"vue-i18n": "^8.21.0",
"vue-router": "^3.4.3",
@@ -43,13 +43,13 @@
"yt-channel-info": "^1.0.3",
"yt-trending-scraper": "^1.0.3",
"yt-xml2vtt": "^1.1.2",
- "ytdl-core": "^3.2.1",
+ "ytdl-core": "^3.2.2",
"ytpl": "^0.3.0",
"ytsr": "^0.1.21"
},
"description": "A private YouTube client",
"devDependencies": {
- "@babel/core": "^7.11.1",
+ "@babel/core": "^7.11.4",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
"@babel/preset-env": "^7.11.0",
@@ -66,7 +66,7 @@
"electron-builder": "^22.8.0",
"electron-builder-squirrel-windows": "^22.8.1",
"electron-debug": "^3.1.0",
- "electron-rebuild": "^1.11.0",
+ "electron-rebuild": "^2.0.0",
"eslint": "^7.7.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-standard": "^14.1.1",
@@ -79,9 +79,9 @@
"fast-glob": "^3.2.4",
"file-loader": "^6.0.0",
"html-webpack-plugin": "^4.3.0",
- "jest": "^26.4.0",
+ "jest": "^26.4.2",
"mini-css-extract-plugin": "^0.10.0",
- "node-abi": "^2.18.0",
+ "node-abi": "^2.19.0",
"node-loader": "^1.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.5",
@@ -89,13 +89,13 @@
"sass-loader": "^9.0.3",
"style-loader": "^1.2.1",
"tree-kill": "1.2.2",
- "typescript": "^3.9.7",
+ "typescript": "^4.0.2",
"url-loader": "^4.1.0",
"vue-devtools": "^5.1.4",
"vue-eslint-parser": "^7.1.0",
"vue-loader": "^15.9.3",
"vue-style-loader": "^4.1.2",
- "vue-template-compiler": "^2.6.11",
+ "vue-template-compiler": "^2.6.12",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0"
diff --git a/src/renderer/App.js b/src/renderer/App.js
index 9b24001d..c91c064d 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -3,8 +3,6 @@ import TopNav from './components/top-nav/top-nav.vue'
import SideNav from './components/side-nav/side-nav.vue'
import FtToast from './components/ft-toast/ft-toast.vue'
import $ from 'jquery'
-import yaml from 'js-yaml'
-import fs from 'fs'
let useElectron
let shell
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
index 7aa1611b..9c155c15 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.vue
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue
@@ -61,7 +61,7 @@
@click="getCommentReplies(index)"
>
{{ $t("Comments.View") }}
- Hide
+ {{ $t("Comments.Hide") }}
{{ comment.numReplies }}
{{ $t("Comments.Reply").toLowerCase() }}
{{ $t("Comments.Replies").toLowerCase() }}
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 72e4fa72..dd432154 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -226,7 +226,13 @@ export default Vue.extend({
this.videoPublished = new Date(result.videoDetails.publishDate.replace('-', '/')).getTime()
this.videoDescription =
result.player_response.videoDetails.shortDescription
- this.recommendedVideos = result.related_videos
+ this.recommendedVideos = result.related_videos.map((video) => {
+ video.videoId = video.id
+ video.authorId = video.ucid
+ video.viewCount = video.view_count
+ video.lengthSeconds = video.length_seconds
+ return video
+ })
this.videoLikeCount = result.videoDetails.likes
this.videoDislikeCount = result.videoDetails.dislikes
this.isLive = result.player_response.videoDetails.isLiveContent