kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into canary

This commit is contained in:
Mr. Stallion 2023-05-21 21:01:51 -07:00
parent 3510d4741d cafca47184
commit 8afbf2fb05
3 changed files with 40 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.nvmrc
View File

@ -1 +1 @@
v14.19.1
v16.13.0

16
package.json
View File

@ -10,8 +10,8 @@
"@f-list/vue-ts": "^1.0.3",
"@fortawesome/fontawesome-free": "^5.15.1",
"@types/bluebird": "3.5.32",
"@types/lodash": "^4.14.164",
"@types/node": "^14.17.0",
"@types/lodash": "4.14.162",
"@types/node": "16.18.32",
"@types/node-fetch": "^3.0.3",
"@types/qs": "^6.9.5",
"@types/request-promise": "^4.1.46",
@ -24,7 +24,7 @@
"bootstrap": "^4.5.3",
"copy-webpack-plugin": "^6.2.1",
"css-loader": "^5.0.0",
"date-fns": "^2.16.1",
"date-fns": "2.29.3",
"electron": "^17.1.2",
"electron-log": "^4.4.3",
"electron-packager": "^15.4.0",
@ -49,16 +49,15 @@
"typescript": "^3.9.7",
"vue": "2.6.12",
"vue-input-tag": "^2.0.7",
"vue-loader": "^15.9.8",
"vue-loader": "15.9.8",
"vue-template-compiler": "2.6.12",
"webpack": "5.8.0"
},
"dependencies": {
"@cliqz/adblocker-electron": "~1.24.0",
"@cliqz/adblocker-electron": "1.26.3",
"jquery": "^3.6.0",
"keytar": "~7.8.0",
"node-fetch": "^3.2.10",
"vue-apexcharts": "^1.6.2"
"node-fetch": "3.0.0"
},
"optionalDependencies": {
"appdmg": "^0.6.0",
@ -70,7 +69,8 @@
"vue-class-component": "6.3.2",
"vue-loader": "15.9.8",
"vue-template-compiler": "2.6.12",
"@types/bluebird": "3.5.32"
"@types/bluebird": "3.5.32",
"@types/node": "16.18.32"
},
"scripts": {
"postinstall": "electron-rebuild --prebuild-tag-prefix=ignoreprebuilds -f -o keytar"

89
yarn.lock
View File

@ -23,13 +23,6 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
"@babel/runtime@^7.21.0":
version "7.21.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
dependencies:
regenerator-runtime "^0.13.11"
"@cliqz/adblocker-content@^1.26.5":
version "1.26.5"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.26.5.tgz#b8ed6198a8d06737a2dcc82c367e78f53540bdd0"
@ -37,20 +30,20 @@
dependencies:
"@cliqz/adblocker-extended-selectors" "^1.26.5"
"@cliqz/adblocker-electron-preload@^1.24.0":
"@cliqz/adblocker-electron-preload@^1.26.3":
version "1.26.5"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.26.5.tgz#5d3f028d4ee48be52449ac07342139fbfcb651b9"
integrity sha512-4XrfNyn493sUrXRpVW1Qg35SqNv7/BeaXPKVSbEUo9tEzNc5gDnLckWIb5uG204e0D6Xo+o6FUkvv1t8Smpv1g==
dependencies:
"@cliqz/adblocker-content" "^1.26.5"
"@cliqz/adblocker-electron@~1.24.0":
version "1.24.0"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.24.0.tgz#58261f5d8750afb5739e7f120be2f68820abaa86"
integrity sha512-bczhOICaQT7ZGY67tKuGStYb9FQ5NTpj73epLGpLp3Eu5nzMrMj8C9fl8suMfkQiQa7yZ2TFp60aVNidCh/dHQ==
"@cliqz/adblocker-electron@1.26.3":
version "1.26.3"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.26.3.tgz#b35e647ac9f2c25be63a8ead7b08d2beb5578431"
integrity sha512-nByABsFgJ+LsLubsMRYowaPcqqbUPN9WVPbDYefEE1oc1gJGwGK1i0S9WqKdUcGwFe7AnJml4oMAIkxz8Mmq4A==
dependencies:
"@cliqz/adblocker" "^1.24.0"
"@cliqz/adblocker-electron-preload" "^1.24.0"
"@cliqz/adblocker" "^1.26.3"
"@cliqz/adblocker-electron-preload" "^1.26.3"
tldts-experimental "^5.6.21"
"@cliqz/adblocker-extended-selectors@^1.26.5":
@ -58,7 +51,7 @@
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.26.5.tgz#f52efc753f0fc0e95fd1f42bf92f627ac49bf849"
integrity sha512-+81FOTJtWwk3t58XyXBotkdOp7uP9vNe6hyUQQY173Rt9X9tsErGkPW57hMP0OgVsYNIYg7/TXxHEabxTUQubw==
"@cliqz/adblocker@^1.24.0":
"@cliqz/adblocker@^1.26.3":
version "1.26.5"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.26.5.tgz#5de1dbcc2fd23fb69732fefb3f13f06b530dae6d"
integrity sha512-hbvkcfAQdpcREf+Jim9SXIp/M5p2g2YRB5Bd+g3zlTS+cJXvyk1Hvkj9fxHs37xytWfQMYevWyGko1ZlkOAbNA==
@ -447,10 +440,10 @@
dependencies:
"@types/node" "*"
"@types/lodash@^4.14.164":
version "4.14.194"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
"@types/lodash@4.14.162":
version "4.14.162"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.162.tgz#65d78c397e0d883f44afbf1f7ba9867022411470"
integrity sha512-alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig==
"@types/minimatch@*":
version "5.1.2"
@ -469,17 +462,7 @@
dependencies:
node-fetch "*"
"@types/node@*", "@types/node@>=10.0.0":
version "20.2.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.2.3.tgz#b31eb300610c3835ac008d690de6f87e28f9b878"
integrity sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw==
"@types/node@^14.17.0", "@types/node@^14.6.2":
version "14.18.47"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.47.tgz#89a56b05804d136cb99bf2f823bb00814a889aae"
integrity sha512-OuJi8bIng4wYHHA3YpKauL58dZrPxro3d0tabPHyiNF8rKfGKuVfr83oFlPLmKri1cX+Z3cJP39GXmnqkP11Gw==
"@types/node@^16.11.26":
"@types/node@*", "@types/node@16.18.32", "@types/node@>=10.0.0", "@types/node@^14.6.2", "@types/node@^16.11.26":
version "16.18.32"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.32.tgz#5b5becc5da76fc055b2a601c8a3adbf13891227e"
integrity sha512-zpnXe4dEz6PrWz9u7dqyRoq9VxwCvoXRPy/ewhmMa1CgEyVmtL1NJPQ2MX+4pf97vetquVKkpiMx0MwI8pjNOw==
@ -2416,17 +2399,20 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
data-uri-to-buffer@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
data-uri-to-buffer@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
date-fns@^2.16.1:
version "2.30.0"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
dependencies:
"@babel/runtime" "^7.21.0"
date-fns@2.29.3:
version "2.29.3"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
de-indent@^1.0.2:
version "1.0.2"
@ -5227,7 +5213,7 @@ node-domexception@^1.0.0:
resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
node-fetch@*, node-fetch@^3.2.10:
node-fetch@*:
version "3.3.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.1.tgz#b3eea7b54b3a48020e46f4f88b9c5a7430d20b2e"
integrity sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==
@ -5236,6 +5222,14 @@ node-fetch@*, node-fetch@^3.2.10:
fetch-blob "^3.1.4"
formdata-polyfill "^4.0.10"
node-fetch@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.0.0.tgz#79da7146a520036f2c5f644e4a26095f17e411ea"
integrity sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==
dependencies:
data-uri-to-buffer "^3.0.1"
fetch-blob "^3.1.2"
node-gyp-build@^4.2.1, node-gyp-build@^4.3.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
@ -6337,11 +6331,6 @@ regenerator-runtime@^0.11.0:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-runtime@^0.13.11:
version "0.13.11"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
regenerator-transform@^0.10.0:
version "0.10.1"
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
@ -7711,11 +7700,6 @@ verror@1.10.0:
core-util-is "1.0.2"
extsprintf "^1.2.0"
vue-apexcharts@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/vue-apexcharts/-/vue-apexcharts-1.6.2.tgz#0547826067f97e8ea67ca9423e524eb6669746ad"
integrity sha512-9HS3scJwWgKjmkcWIf+ndNDR0WytUJD8Ju0V2ZYcjYtlTLwJAf2SKUlBZaQTkDmwje/zMgulvZRi+MXmi+WkKw==
vue-class-component@6.3.2:
version "6.3.2"
resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.3.2.tgz#e6037e84d1df2af3bde4f455e50ca1b9eec02be6"
@ -7744,17 +7728,6 @@ vue-loader@15.9.8:
vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0"
vue-loader@^15.9.8:
version "15.10.1"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.1.tgz#c451c4cd05a911aae7b5dbbbc09fb913fb3cca18"
integrity sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==
dependencies:
"@vue/component-compiler-utils" "^3.1.0"
hash-sum "^1.0.2"
loader-utils "^1.1.0"
vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0"
vue-style-loader@^4.1.0:
version "4.1.3"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"