diff --git a/package-lock.json b/package-lock.json
index 177b05f9..f325beb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1694,13 +1694,13 @@
}
},
"@jest/core": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.3.0.tgz",
- "integrity": "sha512-WAAqGMpc+U+GS0oSr/ikI1JdRyPQyTZSVOr1xjnVcfvfUTZCK+wGoN0Cb7dm7HVdpbMQr/NvtM6vBVChctmzHA==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.4.0.tgz",
+ "integrity": "sha512-mpXm4OjWQbz7qbzGIiSqvfNZ1FxX6ywWgLtdSD2luPORt5zKPtqcdDnX7L8RdfMaj1znDBgN2+gB094ZIr7vnA==",
"dev": true,
"requires": {
"@jest/console": "^26.3.0",
- "@jest/reporters": "^26.3.0",
+ "@jest/reporters": "^26.4.0",
"@jest/test-result": "^26.3.0",
"@jest/transform": "^26.3.0",
"@jest/types": "^26.3.0",
@@ -1710,17 +1710,17 @@
"exit": "^0.1.2",
"graceful-fs": "^4.2.4",
"jest-changed-files": "^26.3.0",
- "jest-config": "^26.3.0",
+ "jest-config": "^26.4.0",
"jest-haste-map": "^26.3.0",
"jest-message-util": "^26.3.0",
"jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.3.0",
- "jest-resolve-dependencies": "^26.3.0",
- "jest-runner": "^26.3.0",
- "jest-runtime": "^26.3.0",
- "jest-snapshot": "^26.3.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-util": "^26.3.0",
- "jest-validate": "^26.3.0",
+ "jest-validate": "^26.4.0",
"jest-watcher": "^26.3.0",
"micromatch": "^4.0.2",
"p-each-series": "^2.1.0",
@@ -1881,20 +1881,20 @@
}
},
"@jest/globals": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.3.0.tgz",
- "integrity": "sha512-oPe30VG9zor2U3Ev7khCM2LkjO3D+mgAv6s5D3Ed0sxfELxoRZwR8d1VgYWVQljcpumMwe9tDrKNuzgVjbEt7g==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.4.0.tgz",
+ "integrity": "sha512-QKwoVAeL9d0xaEM9ebPvfc+bolN04F+o3zM2jswGDBiiNjCogZ3LvOaqumRdDyz6kLmbx+UhgMBAVuLunbXZ2A==",
"dev": true,
"requires": {
"@jest/environment": "^26.3.0",
"@jest/types": "^26.3.0",
- "expect": "^26.3.0"
+ "expect": "^26.4.0"
}
},
"@jest/reporters": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.3.0.tgz",
- "integrity": "sha512-MfLJOUPxhGb3sRT/wFjHXd6gyVQ1Fb1XxbEwY+gqdDBpg3pq5qAB5eiBUvcTheFRHmhu3gOv3UZ/gtxmqGBA+Q==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.0.tgz",
+ "integrity": "sha512-14OPAAuYhgRBSNxAocVluX6ksdMdK/EuP9NmtBXU9g1uKaVBrPnohn/CVm6iMot1a9iU8BCxa5715YRf8FEg/A==",
"dev": true,
"requires": {
"@bcoe/v8-coverage": "^0.2.3",
@@ -1913,7 +1913,7 @@
"istanbul-lib-source-maps": "^4.0.0",
"istanbul-reports": "^3.0.2",
"jest-haste-map": "^26.3.0",
- "jest-resolve": "^26.3.0",
+ "jest-resolve": "^26.4.0",
"jest-util": "^26.3.0",
"jest-worker": "^26.3.0",
"node-notifier": "^7.0.0",
@@ -2026,16 +2026,16 @@
}
},
"@jest/test-sequencer": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.3.0.tgz",
- "integrity": "sha512-G7TA0Z85uj5l1m9UKZ/nXbArn0y+MeLKbojNLDHgjb1PpNNFDAOO6FJhk9We34m/hadcciMcJFnxV94dV2TX+w==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.0.tgz",
+ "integrity": "sha512-9Z7lCShS7vERp+DRwIVNH/6sHMWwJK1DPnGCpGeVLGJJWJ4Y08sQI3vIKdmKHu2KmwlUBpRM+BFf7NlVUkl5XA==",
"dev": true,
"requires": {
"@jest/test-result": "^26.3.0",
"graceful-fs": "^4.2.4",
"jest-haste-map": "^26.3.0",
- "jest-runner": "^26.3.0",
- "jest-runtime": "^26.3.0"
+ "jest-runner": "^26.4.0",
+ "jest-runtime": "^26.4.0"
},
"dependencies": {
"graceful-fs": {
@@ -2590,12 +2590,12 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.0.tgz",
- "integrity": "sha512-UD6b4p0/hSe1xdTvRCENSx7iQ+KR6ourlZFfYuPC7FlXEzdHuLPrEmuxZ23b2zW96KJX9Z3w05GE/wNOiEzrVg==",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.1.tgz",
+ "integrity": "sha512-XIr+Mfv7i4paEdBf0JFdIl9/tVxyj+rlilWIfZ97Be0lZ7hPvUbS5iHt9Glc8kRI53dsr0PcAEudbf8rO2wGgg==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "3.9.0",
+ "@typescript-eslint/experimental-utils": "3.9.1",
"debug": "^4.1.1",
"functional-red-black-tree": "^1.0.1",
"regexpp": "^3.0.0",
@@ -2627,45 +2627,45 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.0.tgz",
- "integrity": "sha512-/vSHUDYizSOhrOJdjYxPNGfb4a3ibO8zd4nUKo/QBFOmxosT3cVUV7KIg8Dwi6TXlr667G7YPqFK9+VSZOorNA==",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.1.tgz",
+ "integrity": "sha512-lkiZ8iBBaYoyEKhCkkw4SAeatXyBq9Ece5bZXdLe1LWBUwTszGbmbiqmQbwWA8cSYDnjWXp9eDbXpf9Sn0hLAg==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.3",
- "@typescript-eslint/types": "3.9.0",
- "@typescript-eslint/typescript-estree": "3.9.0",
+ "@typescript-eslint/types": "3.9.1",
+ "@typescript-eslint/typescript-estree": "3.9.1",
"eslint-scope": "^5.0.0",
"eslint-utils": "^2.0.0"
}
},
"@typescript-eslint/parser": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.9.0.tgz",
- "integrity": "sha512-rDHOKb6uW2jZkHQniUQVZkixQrfsZGUCNWWbKWep4A5hGhN5dLHMUCNAWnC4tXRlHedXkTDptIpxs6e4Pz8UfA==",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.9.1.tgz",
+ "integrity": "sha512-y5QvPFUn4Vl4qM40lI+pNWhTcOWtpZAJ8pOEQ21fTTW4xTJkRplMjMRje7LYTXqVKKX9GJhcyweMz2+W1J5bMg==",
"dev": true,
"requires": {
"@types/eslint-visitor-keys": "^1.0.0",
- "@typescript-eslint/experimental-utils": "3.9.0",
- "@typescript-eslint/types": "3.9.0",
- "@typescript-eslint/typescript-estree": "3.9.0",
+ "@typescript-eslint/experimental-utils": "3.9.1",
+ "@typescript-eslint/types": "3.9.1",
+ "@typescript-eslint/typescript-estree": "3.9.1",
"eslint-visitor-keys": "^1.1.0"
}
},
"@typescript-eslint/types": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.9.0.tgz",
- "integrity": "sha512-rb6LDr+dk9RVVXO/NJE8dT1pGlso3voNdEIN8ugm4CWM5w5GimbThCMiMl4da1t5u3YwPWEwOnKAULCZgBtBHg==",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.9.1.tgz",
+ "integrity": "sha512-15JcTlNQE1BsYy5NBhctnEhEoctjXOjOK+Q+rk8ugC+WXU9rAcS2BYhoh6X4rOaXJEpIYDl+p7ix+A5U0BqPTw==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.9.0.tgz",
- "integrity": "sha512-N+158NKgN4rOmWVfvKOMoMFV5n8XxAliaKkArm/sOypzQ0bUL8MSnOEBW3VFIeffb/K5ce/cAV0yYhR7U4ALAA==",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.9.1.tgz",
+ "integrity": "sha512-IqM0gfGxOmIKPhiHW/iyAEXwSVqMmR2wJ9uXHNdFpqVvPaQ3dWg302vW127sBpAiqM9SfHhyS40NKLsoMpN2KA==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "3.9.0",
- "@typescript-eslint/visitor-keys": "3.9.0",
+ "@typescript-eslint/types": "3.9.1",
+ "@typescript-eslint/visitor-keys": "3.9.1",
"debug": "^4.1.1",
"glob": "^7.1.6",
"is-glob": "^4.0.1",
@@ -2721,9 +2721,9 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.0.tgz",
- "integrity": "sha512-O1qeoGqDbu0EZUC/MZ6F1WHTIzcBVhGqDj3LhTnj65WUA548RXVxUHbYhAW9bZWfb2rnX9QsbbP5nmeJ5Z4+ng==",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.1.tgz",
+ "integrity": "sha512-zxdtUjeoSh+prCpogswMwVUJfEFmCOjdzK9rpNjNBfm6EyPt99x3RrJoBOGZO23FCt0WPKUCOL5mb/9D5LjdwQ==",
"dev": true,
"requires": {
"eslint-visitor-keys": "^1.1.0"
@@ -2979,9 +2979,9 @@
"dev": true
},
"abab": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
- "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
+ "integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
"dev": true
},
"abbrev": {
@@ -3007,9 +3007,9 @@
"dev": true
},
"acorn": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
- "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.1.tgz",
+ "integrity": "sha512-dmKn4pqZ29iQl2Pvze1zTrps2luvls2PBY//neO2WJ0s10B3AxJXshN+Ph7B4GrhfGhHXrl4dnUwyNNXQcnWGQ==",
"dev": true
},
"acorn-globals": {
@@ -3020,6 +3020,14 @@
"requires": {
"acorn": "^7.1.1",
"acorn-walk": "^7.1.1"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+ "dev": true
+ }
}
},
"acorn-jsx": {
@@ -7705,9 +7713,9 @@
}
},
"eslint": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz",
- "integrity": "sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==",
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz",
+ "integrity": "sha512-1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
@@ -7749,9 +7757,9 @@
},
"dependencies": {
"ajv": {
- "version": "6.12.3",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
- "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+ "version": "6.12.4",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+ "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -8181,6 +8189,12 @@
"eslint-visitor-keys": "^1.3.0"
},
"dependencies": {
+ "acorn": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+ "dev": true
+ },
"eslint-visitor-keys": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -8341,15 +8355,15 @@
}
},
"expect": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-26.3.0.tgz",
- "integrity": "sha512-3tC0dpPgkTGkycM9H+mMjzIhm8I3ZAOV+y1Cj3xmF9iKxDeHBCAB64hf1OY//bMzQ/AftfodNy2pQWMKpTIV8Q==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-26.4.0.tgz",
+ "integrity": "sha512-dbYDJhFcqQsamlos6nEwAMe+ahdckJBk5fmw1DYGLQGabGSlUuT+Fm2jHYw5119zG3uIhP+lCQbjJhFEdZMJtg==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
"ansi-styles": "^4.0.0",
"jest-get-type": "^26.3.0",
- "jest-matcher-utils": "^26.3.0",
+ "jest-matcher-utils": "^26.4.0",
"jest-message-util": "^26.3.0",
"jest-regex-util": "^26.0.0"
},
@@ -10645,9 +10659,9 @@
}
},
"is-docker": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
- "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+ "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
"dev": true,
"optional": true
},
@@ -10997,14 +11011,14 @@
}
},
"jest": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest/-/jest-26.3.0.tgz",
- "integrity": "sha512-LFCry7NS6bTa4BUGUHC+NvZ3B9WG7Jv8F+Lb96dAJFM23LMwSsL5RiJcw9S+nejsh8lS1VxHq+RSH4Xa9tujpA==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-26.4.0.tgz",
+ "integrity": "sha512-lNCOS+ckRHE1wFyVtQClBmbsOVuH2GWUTJMDL3vunp9DXcah+V8vfvVVApngClcdoc3rgZpqOfCNKLjxjj2l4g==",
"dev": true,
"requires": {
- "@jest/core": "^26.3.0",
+ "@jest/core": "^26.4.0",
"import-local": "^3.0.2",
- "jest-cli": "^26.3.0"
+ "jest-cli": "^26.4.0"
},
"dependencies": {
"ansi-styles": {
@@ -11075,12 +11089,12 @@
}
},
"jest-cli": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.3.0.tgz",
- "integrity": "sha512-vrlDluEjnNTJNpmw+lJ1Dvjhc+2o7QG0dG8n+iDu3NaoQ9OzqNeZsZZ0a9KP7SdtD5BXgvGSpCWTlLH5SqtxcA==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.0.tgz",
+ "integrity": "sha512-kw2Pr3V2x9/WzSDGsbz/MJBNlCoPMxMudrIavft4bqRlv5tASjU51tyO+1Os1LdW2dAnLQZYsxFUZ8oWPyssGQ==",
"dev": true,
"requires": {
- "@jest/core": "^26.3.0",
+ "@jest/core": "^26.4.0",
"@jest/test-result": "^26.3.0",
"@jest/types": "^26.3.0",
"chalk": "^4.0.0",
@@ -11088,9 +11102,9 @@
"graceful-fs": "^4.2.4",
"import-local": "^3.0.2",
"is-ci": "^2.0.0",
- "jest-config": "^26.3.0",
+ "jest-config": "^26.4.0",
"jest-util": "^26.3.0",
- "jest-validate": "^26.3.0",
+ "jest-validate": "^26.4.0",
"prompts": "^2.0.1",
"yargs": "^15.3.1"
}
@@ -11194,9 +11208,9 @@
}
},
"get-stream": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
- "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
"dev": true,
"requires": {
"pump": "^3.0.0"
@@ -11224,9 +11238,9 @@
}
},
"onetime": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
- "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
"dev": true,
"requires": {
"mimic-fn": "^2.1.0"
@@ -11265,13 +11279,13 @@
}
},
"jest-config": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.3.0.tgz",
- "integrity": "sha512-xzvmhKYOXOc/JjGabUUXoi7Nxu6QpY5zJxND85wdqFrdP7raJT5wqlrVJbp6Bv4Sj1e83Z8bkxjsZCpwPASaPw==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.4.0.tgz",
+ "integrity": "sha512-MxsvrBug8YY+C4QcUBtmgnHyFeW7w3Ouk/w9eplCDN8VJGVyBEZFe8Lxzfp2pSqh0Dqurqv8Oik2YkbekGUlxg==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.3.0",
+ "@jest/test-sequencer": "^26.4.0",
"@jest/types": "^26.3.0",
"babel-jest": "^26.3.0",
"chalk": "^4.0.0",
@@ -11281,13 +11295,13 @@
"jest-environment-jsdom": "^26.3.0",
"jest-environment-node": "^26.3.0",
"jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.3.0",
+ "jest-jasmine2": "^26.4.0",
"jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.3.0",
+ "jest-resolve": "^26.4.0",
"jest-util": "^26.3.0",
- "jest-validate": "^26.3.0",
+ "jest-validate": "^26.4.0",
"micromatch": "^4.0.2",
- "pretty-format": "^26.3.0"
+ "pretty-format": "^26.4.0"
},
"dependencies": {
"ansi-styles": {
@@ -11392,15 +11406,15 @@
}
},
"jest-diff": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.3.0.tgz",
- "integrity": "sha512-q5OZAtnr5CbHzrhjANzc3wvROk7+rcjCUI5uqM4cjOjtscNKfbJKBs3YhsWWhsdsIZzI3gc6wOpm49r6S61beg==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.0.tgz",
+ "integrity": "sha512-wwC38HlOW+iTq6j5tkj/ZamHn6/nrdcEOc/fKaVILNtN2NLWGdkfRaHWwfNYr5ehaLvuoG2LfCZIcWByVj0gjg==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
"diff-sequences": "^26.3.0",
"jest-get-type": "^26.3.0",
- "pretty-format": "^26.3.0"
+ "pretty-format": "^26.4.0"
},
"dependencies": {
"ansi-styles": {
@@ -11465,16 +11479,16 @@
}
},
"jest-each": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.3.0.tgz",
- "integrity": "sha512-OSAnLv0Eo/sDVhV0ifT2u6Q4aYUBoZ97R4k9cQshUFLTco0iRDbViJiW3Y6ySZjW95Tb83/xMYCppBih/7sW/A==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.4.0.tgz",
+ "integrity": "sha512-+cyBh1ehs6thVT/bsZVG+WwmRn2ix4Q4noS9yLZgM10yGWPW12/TDvwuOV2VZXn1gi09/ZwJKJWql6YW1C9zNw==",
"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.3.0"
+ "pretty-format": "^26.4.0"
},
"dependencies": {
"ansi-styles": {
@@ -11661,9 +11675,9 @@
}
},
"jest-jasmine2": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.3.0.tgz",
- "integrity": "sha512-ZPkkA2XfH/fcLOp0SjeR4uDrMoNFilcwxLHORpjfMrcU0BFHNNRaF3DnslCdmewzqaERqtmHpYo8jj34RT+m2g==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.0.tgz",
+ "integrity": "sha512-cGBxwzDDKB09EPJ4pE69BMDv+2lO442IB1xQd+vL3cua2OKdeXQK6iDlQKoRX/iP0RgU5T8sn9yahLcx/+ox8Q==",
"dev": true,
"requires": {
"@babel/traverse": "^7.1.0",
@@ -11674,15 +11688,15 @@
"@types/node": "*",
"chalk": "^4.0.0",
"co": "^4.6.0",
- "expect": "^26.3.0",
+ "expect": "^26.4.0",
"is-generator-fn": "^2.0.0",
- "jest-each": "^26.3.0",
- "jest-matcher-utils": "^26.3.0",
+ "jest-each": "^26.4.0",
+ "jest-matcher-utils": "^26.4.0",
"jest-message-util": "^26.3.0",
- "jest-runtime": "^26.3.0",
- "jest-snapshot": "^26.3.0",
+ "jest-runtime": "^26.4.0",
+ "jest-snapshot": "^26.4.0",
"jest-util": "^26.3.0",
- "pretty-format": "^26.3.0",
+ "pretty-format": "^26.4.0",
"throat": "^5.0.0"
},
"dependencies": {
@@ -11739,25 +11753,25 @@
}
},
"jest-leak-detector": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.3.0.tgz",
- "integrity": "sha512-8C2Bur0S6n2xgW5kx22bDbe+Jjz9sM7/abr7DRQ48ww6q4w7vVzEpDEZiY7KatjTHtUloLTAqwTXEXg+tuETTg==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.0.tgz",
+ "integrity": "sha512-7EXKKEKnAWUPyiVtGZzJflbPOtYUdlNoevNVOkAcPpdR8xWiYKPGNGA6sz25S+8YhZq3rmkQJYAh3/P0VnoRwA==",
"dev": true,
"requires": {
"jest-get-type": "^26.3.0",
- "pretty-format": "^26.3.0"
+ "pretty-format": "^26.4.0"
}
},
"jest-matcher-utils": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.3.0.tgz",
- "integrity": "sha512-M5ZRSp6qpyzZyrLwXD2Sop7xaxm6qu/mKvqWU+BOSPTa4Y0ZEoKUYBzus/emg6kaVt7Ov9xMDLLZR1SrC8FxCw==",
+ "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==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
- "jest-diff": "^26.3.0",
+ "jest-diff": "^26.4.0",
"jest-get-type": "^26.3.0",
- "pretty-format": "^26.3.0"
+ "pretty-format": "^26.4.0"
},
"dependencies": {
"ansi-styles": {
@@ -11952,9 +11966,9 @@
"dev": true
},
"jest-resolve": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.3.0.tgz",
- "integrity": "sha512-+oKVWDkXjdZ4Xciuxv+M5e5v/Z3RLjrKIzen9tq3IO6HpzsLf9Mk3rET5du1uU8iVUCvz4/1PmjzNF50Uc7l2A==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz",
+ "integrity": "sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
@@ -12112,20 +12126,20 @@
}
},
"jest-resolve-dependencies": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.3.0.tgz",
- "integrity": "sha512-j5rZ2BUh8vVjJZ7bpgCre0t6mbFLm5BWfVhYb1H35A3nbPN3kepzMqkMnKXPhwyLIVwn25uYkv6LHc2/Xa1sGw==",
+ "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==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
"jest-regex-util": "^26.0.0",
- "jest-snapshot": "^26.3.0"
+ "jest-snapshot": "^26.4.0"
}
},
"jest-runner": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.3.0.tgz",
- "integrity": "sha512-eiPKgbhTM4q6A7RBh4qzKf6hwFDJMfqoFJubFvWSrHdZUsvSiBWYDqQI+FUXDFxDAOn/AfZjKURACAH3fUDjwA==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.0.tgz",
+ "integrity": "sha512-XF+tnUGolnPriu6Gg+HHWftspMjD5NkTV2mQppQnpZe39GcUangJ0al7aBGtA3GbVAcRd048DQiJPmsQRdugjw==",
"dev": true,
"requires": {
"@jest/console": "^26.3.0",
@@ -12137,13 +12151,13 @@
"emittery": "^0.7.1",
"exit": "^0.1.2",
"graceful-fs": "^4.2.4",
- "jest-config": "^26.3.0",
+ "jest-config": "^26.4.0",
"jest-docblock": "^26.0.0",
"jest-haste-map": "^26.3.0",
- "jest-leak-detector": "^26.3.0",
+ "jest-leak-detector": "^26.4.0",
"jest-message-util": "^26.3.0",
- "jest-resolve": "^26.3.0",
- "jest-runtime": "^26.3.0",
+ "jest-resolve": "^26.4.0",
+ "jest-runtime": "^26.4.0",
"jest-util": "^26.3.0",
"jest-worker": "^26.3.0",
"source-map-support": "^0.5.6",
@@ -12209,15 +12223,15 @@
}
},
"jest-runtime": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.3.0.tgz",
- "integrity": "sha512-cqCz+S76qwZcPnddkLCjuNw9O8/lB+i1odjz2hpvpDogXLp0qSMs+Slh1gBjB5V4feUyBHav/550Mr3FeTdmnA==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.0.tgz",
+ "integrity": "sha512-1fjZgGpkyQBUTo59Vi19I4IcsBwzY6uwVFNjUmR06iIi3XRErkY28yimi4IUDRrofQErqcDEw2n3DF9WmQ6vEg==",
"dev": true,
"requires": {
"@jest/console": "^26.3.0",
"@jest/environment": "^26.3.0",
"@jest/fake-timers": "^26.3.0",
- "@jest/globals": "^26.3.0",
+ "@jest/globals": "^26.4.0",
"@jest/source-map": "^26.3.0",
"@jest/test-result": "^26.3.0",
"@jest/transform": "^26.3.0",
@@ -12228,15 +12242,15 @@
"exit": "^0.1.2",
"glob": "^7.1.3",
"graceful-fs": "^4.2.4",
- "jest-config": "^26.3.0",
+ "jest-config": "^26.4.0",
"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.3.0",
- "jest-snapshot": "^26.3.0",
+ "jest-resolve": "^26.4.0",
+ "jest-snapshot": "^26.4.0",
"jest-util": "^26.3.0",
- "jest-validate": "^26.3.0",
+ "jest-validate": "^26.4.0",
"slash": "^3.0.0",
"strip-bom": "^4.0.0",
"yargs": "^15.3.1"
@@ -12325,25 +12339,25 @@
}
},
"jest-snapshot": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.3.0.tgz",
- "integrity": "sha512-tHVUIeOTN/0SZN2ZjBZHzPG5txs/6uEQx2mwjxIT7QRE7pddPLd8jktXthyIz6bV+3GKetWXSV4YAoPUQwrfMA==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.0.tgz",
+ "integrity": "sha512-vFGmNGWHMBomrlOpheTMoqihymovuH3GqfmaEIWoPpsxUXyxT3IlbxI5I4m2vg0uv3HUJYg5JoGrkgMzVsAwCg==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
"@jest/types": "^26.3.0",
"@types/prettier": "^2.0.0",
"chalk": "^4.0.0",
- "expect": "^26.3.0",
+ "expect": "^26.4.0",
"graceful-fs": "^4.2.4",
- "jest-diff": "^26.3.0",
+ "jest-diff": "^26.4.0",
"jest-get-type": "^26.3.0",
"jest-haste-map": "^26.3.0",
- "jest-matcher-utils": "^26.3.0",
+ "jest-matcher-utils": "^26.4.0",
"jest-message-util": "^26.3.0",
- "jest-resolve": "^26.3.0",
+ "jest-resolve": "^26.4.0",
"natural-compare": "^1.4.0",
- "pretty-format": "^26.3.0",
+ "pretty-format": "^26.4.0",
"semver": "^7.3.2"
},
"dependencies": {
@@ -12527,9 +12541,9 @@
}
},
"jest-validate": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.3.0.tgz",
- "integrity": "sha512-oIJWqkIdgh1Q1O7ku4kDGkQoFKUOtZyDMbfYs4DsBi6r+FDY37xKTyZ30nM8F6yGZfB72qc7XB+3qKRgokwoXg==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.0.tgz",
+ "integrity": "sha512-t56Z/FRMrLP6mpmje7/YgHy0wOzcuc6i3LBXz6kjmsUWYN62OuMdC86Vg9/dX59SvyitSqqegOrx+h7BkNXeaQ==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
@@ -12537,7 +12551,7 @@
"chalk": "^4.0.0",
"jest-get-type": "^26.3.0",
"leven": "^3.1.0",
- "pretty-format": "^26.3.0"
+ "pretty-format": "^26.4.0"
},
"dependencies": {
"ansi-styles": {
@@ -12769,6 +12783,12 @@
"xml-name-validator": "^3.0.0"
},
"dependencies": {
+ "acorn": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+ "dev": true
+ },
"request": {
"version": "2.88.2",
"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
@@ -15312,9 +15332,9 @@
}
},
"pretty-format": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.3.0.tgz",
- "integrity": "sha512-24kRw4C2Ok8+SHquydTZZCZPF2fvANI7rChGs8sNu784+1Jkq5jVFMvNAJSLuLy6XUcP3Fnw+SscLIQag/CG8Q==",
+ "version": "26.4.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz",
+ "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==",
"dev": true,
"requires": {
"@jest/types": "^26.3.0",
@@ -17643,9 +17663,9 @@
},
"dependencies": {
"ajv": {
- "version": "6.12.3",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
- "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+ "version": "6.12.4",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+ "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -18784,6 +18804,14 @@
"acorn": "^7.1.1",
"acorn-jsx": "^5.2.0",
"eslint-visitor-keys": "^1.1.0"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+ "dev": true
+ }
}
},
"lodash": {
@@ -18807,9 +18835,9 @@
"dev": true
},
"vue-i18n": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
- "integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg=="
+ "version": "8.21.0",
+ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.21.0.tgz",
+ "integrity": "sha512-pKBq6Kg5hNacFHMFgPbpYsFlDIMRu4Ew/tpvTWns14CZoCxt7B3tmSNdrLruGMMivnJu1rhhRqsQqT6YwHkuQQ=="
},
"vue-loader": {
"version": "15.9.3",
@@ -20096,9 +20124,9 @@
}
},
"yt-xml2vtt": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/yt-xml2vtt/-/yt-xml2vtt-1.1.1.tgz",
- "integrity": "sha512-QaUtiou3v0InIC0zPJEQIEv3cLJA5yHWiAyWJBk1Am1dECg4WIbYoa79C+YVX/PGlge2hXPIZ7TBL1khl9tPOw=="
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/yt-xml2vtt/-/yt-xml2vtt-1.1.2.tgz",
+ "integrity": "sha512-8ooE213CRLz2/5vNJNyrgx9ZZkefjo7rG8wumBnobMgkgb7RNAab36Db7mLlBXXpMNLVDQpoBPlOhWEYdSnFCw=="
},
"ytdl-core": {
"version": "3.2.1",
@@ -20112,9 +20140,9 @@
}
},
"ytpl": {
- "version": "0.2.4",
- "resolved": "https://registry.npmjs.org/ytpl/-/ytpl-0.2.4.tgz",
- "integrity": "sha512-ExjaGdNucs9mjWZ+6BT4c/LV0B2NmLv0gcLoX9DnY2Qfq1fWAEYZQ1PE3E820BVlPcX5mF39guNXeFk/APT9ew==",
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/ytpl/-/ytpl-0.3.0.tgz",
+ "integrity": "sha512-O4OLvZQoTKYnjzUurT8dV8+MrPUcv9hito3gH98J6fY2GwEWscGcd7w7JJT0dgb3v3iBGryssYTSRLLj3oIPnA==",
"requires": {
"html-entities": "^1.1.3"
}
diff --git a/package.json b/package.json
index c7e4b17a..4a37f81b 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
"videojs-vtt-thumbnails": "0.0.13",
"vue": "^2.6.11",
"vue-electron": "^1.0.6",
- "vue-i18n": "^8.20.0",
+ "vue-i18n": "^8.21.0",
"vue-router": "^3.4.3",
"vuex": "^3.5.1",
"xml2json": "^0.12.0",
@@ -42,9 +42,9 @@
"youtube-suggest": "^1.1.0",
"yt-channel-info": "^1.0.3",
"yt-trending-scraper": "^1.0.3",
- "yt-xml2vtt": "^1.1.1",
+ "yt-xml2vtt": "^1.1.2",
"ytdl-core": "^3.2.1",
- "ytpl": "^0.2.4",
+ "ytpl": "^0.3.0",
"ytsr": "^0.1.21"
},
"description": "A private YouTube client",
@@ -54,9 +54,9 @@
"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
"@babel/preset-env": "^7.11.0",
"@babel/preset-typescript": "^7.10.4",
- "@typescript-eslint/eslint-plugin": "^3.9.0",
- "@typescript-eslint/parser": "^3.9.0",
- "acorn": "^7.4.0",
+ "@typescript-eslint/eslint-plugin": "^3.9.1",
+ "@typescript-eslint/parser": "^3.9.1",
+ "acorn": "^8.0.1",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"copy-webpack-plugin": "^6.0.3",
@@ -67,7 +67,7 @@
"electron-builder-squirrel-windows": "^22.8.1",
"electron-debug": "^3.1.0",
"electron-rebuild": "^1.11.0",
- "eslint": "^7.6.0",
+ "eslint": "^7.7.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0",
@@ -79,7 +79,7 @@
"fast-glob": "^3.2.4",
"file-loader": "^6.0.0",
"html-webpack-plugin": "^4.3.0",
- "jest": "^26.3.0",
+ "jest": "^26.4.0",
"mini-css-extract-plugin": "^0.10.0",
"node-abi": "^2.18.0",
"node-loader": "^1.0.1",
diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue
index 98a86c9f..e7222f42 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.vue
+++ b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -81,9 +81,8 @@
v-if="!isLive && !hideViews"
class="viewCount"
>• {{ parsedViewCount }}
- {{ $t("Video.Views").toLowerCase() }}
- {{ $t("Video.View") }}
- {{ $t("Video.Views").toLowerCase() }}
+ {{ $t("Video.View") }}
+ {{ $t("Video.Views").toLowerCase() }}