From 020fd1ef20460a3ae5039606cfe75c391f8a4a3e Mon Sep 17 00:00:00 2001 From: apotdevin Date: Sun, 4 Jul 2021 15:38:47 +0200 Subject: [PATCH] chore: cleanup some deps --- package-lock.json | 173 +----------------- package.json | 11 +- server/schema/chain/resolvers.ts | 2 +- server/schema/health/helpers.ts | 2 +- server/schema/index.ts | 2 +- server/schema/transactions/resolvers.ts | 2 +- server/schema/widgets/resolvers/getInOut.ts | 2 +- src/components/animated/AnimatedNumber.tsx | 55 ------ src/context/ConfigContext.tsx | 2 +- src/layouts/navigation/nodeInfo/NodeInfo.tsx | 5 +- src/utils/chat.ts | 3 +- src/views/balance/PeerSelection.tsx | 3 +- src/views/channels/channels/Channels.tsx | 2 +- src/views/chat/ChatBox.tsx | 2 +- src/views/dashboard/widgets/helpers.tsx | 2 +- src/views/forwards/helpers.tsx | 2 +- .../home/reports/forwardReport/helpers.ts | 3 +- src/views/scores/NodeGraph.tsx | 2 +- src/views/scores/NodeInfo.tsx | 2 +- src/views/scores/NodeScores.tsx | 2 +- src/views/stats/FeeStats.tsx | 2 +- src/views/stats/FlowStats.tsx | 2 +- src/views/stats/TimeStats.tsx | 2 +- 23 files changed, 31 insertions(+), 254 deletions(-) delete mode 100644 src/components/animated/AnimatedNumber.tsx diff --git a/package-lock.json b/package-lock.json index b93b62a9..5cd3b89f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,7 @@ "requires": true, "packages": { "": { - "version": "0.12.19", + "version": "0.12.20", "license": "MIT", "dependencies": { "@apollo/client": "^3.3.20", @@ -42,10 +42,7 @@ "js-yaml": "^4.1.0", "jsonwebtoken": "^8.5.1", "ln-service": "^51.8.4", - "lodash.debounce": "^4.0.8", - "lodash.groupby": "^4.6.0", - "lodash.merge": "^4.6.2", - "lodash.omit": "^4.5.0", + "lodash": "^4.17.21", "next": "^11.0.0", "node-fetch": "^2.6.1", "numeral": "^2.0.6", @@ -71,7 +68,6 @@ "styled-react-modal": "^2.1.0", "styled-theming": "^2.2.0", "typescript": "^4.3.4", - "underscore": "^1.13.1", "uuid": "^8.3.2", "victory": "^35.8.6", "winston": "^3.3.3" @@ -100,10 +96,6 @@ "@types/js-cookie": "^2.2.6", "@types/js-yaml": "^4.0.1", "@types/jsonwebtoken": "^8.5.2", - "@types/lodash.groupby": "^4.6.6", - "@types/lodash.merge": "^4.6.6", - "@types/lodash.omit": "^4.5.6", - "@types/lodash.sortby": "^4.7.6", "@types/node": "^15.12.4", "@types/node-fetch": "^2.5.10", "@types/numeral": "^2.0.1", @@ -119,7 +111,6 @@ "@types/styled-components": "^5.1.10", "@types/styled-react-modal": "^1.2.0", "@types/styled-theming": "^2.2.5", - "@types/underscore": "^1.11.2", "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "^4.27.0", "@typescript-eslint/parser": "^4.27.0", @@ -373,7 +364,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz", "integrity": "sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -382,7 +372,6 @@ "version": "7.14.6", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz", "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==", - "dev": true, "dependencies": { "@babel/code-frame": "^7.14.5", "@babel/generator": "^7.14.5", @@ -443,7 +432,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", - "dev": true, "dependencies": { "@babel/compat-data": "^7.14.5", "@babel/helper-validator-option": "^7.14.5", @@ -535,7 +523,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz", "integrity": "sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==", - "dev": true, "dependencies": { "@babel/types": "^7.14.5" }, @@ -558,7 +545,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz", "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==", - "dev": true, "dependencies": { "@babel/helper-module-imports": "^7.14.5", "@babel/helper-replace-supers": "^7.14.5", @@ -577,7 +563,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz", "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==", - "dev": true, "dependencies": { "@babel/types": "^7.14.5" }, @@ -605,7 +590,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", - "dev": true, "dependencies": { "@babel/helper-member-expression-to-functions": "^7.14.5", "@babel/helper-optimise-call-expression": "^7.14.5", @@ -620,7 +604,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz", "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==", - "dev": true, "dependencies": { "@babel/types": "^7.14.5" }, @@ -660,7 +643,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -681,7 +663,6 @@ "version": "7.14.6", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz", "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==", - "dev": true, "dependencies": { "@babel/template": "^7.14.5", "@babel/traverse": "^7.14.5", @@ -5335,42 +5316,6 @@ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz", "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==" }, - "node_modules/@types/lodash.groupby": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@types/lodash.groupby/-/lodash.groupby-4.6.6.tgz", - "integrity": "sha512-kwg3T7Ia63KtDNoQQR8hKrLHCAgrH4I44l5uEMuA6JCbj7DiSccaV4tNV1vbjtAOpX990SolVthJCmBVtRVRgw==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, - "node_modules/@types/lodash.merge": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.6.tgz", - "integrity": "sha512-IB90krzMf7YpfgP3u/EvZEdXVvm4e3gJbUvh5ieuI+o+XqiNEt6fCzqNRaiLlPVScLI59RxIGZMQ3+Ko/DJ8vQ==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, - "node_modules/@types/lodash.omit": { - "version": "4.5.6", - "resolved": "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz", - "integrity": "sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, - "node_modules/@types/lodash.sortby": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/@types/lodash.sortby/-/lodash.sortby-4.7.6.tgz", - "integrity": "sha512-EnvAOmKvEg7gdYpYrS6+fVFPw5dL9rBnJi3vcKI7wqWQcLJVF/KRXK9dH29HjGNVvFUj0s9prRP3J8jEGnGKDw==", - "dev": true, - "dependencies": { - "@types/lodash": "*" - } - }, "node_modules/@types/long": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", @@ -5645,12 +5590,6 @@ "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz", "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==" }, - "node_modules/@types/underscore": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.2.tgz", - "integrity": "sha512-Ls2ylbo7++ITrWk2Yc3G/jijwSq5V3GT0tlgVXEl2kKYXY3ImrtmTCoE2uyTWFRI5owMBriloZFWbE1SXOsE7w==", - "dev": true - }, "node_modules/@types/uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz", @@ -12082,7 +12021,6 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -16734,7 +16672,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, "dependencies": { "minimist": "^1.2.5" }, @@ -18088,11 +18025,6 @@ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" - }, "node_modules/lodash.difference": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", @@ -18103,11 +18035,6 @@ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" }, - "node_modules/lodash.groupby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", - "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=" - }, "node_modules/lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -18152,12 +18079,8 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "node_modules/lodash.omit": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/lodash.once": { "version": "4.1.1", @@ -24604,11 +24527,6 @@ "node": ">=0.10.0" } }, - "node_modules/underscore": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" - }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -26338,14 +26256,12 @@ "@babel/compat-data": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz", - "integrity": "sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==", - "dev": true + "integrity": "sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==" }, "@babel/core": { "version": "7.14.6", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz", "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/generator": "^7.14.5", @@ -26396,7 +26312,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", - "dev": true, "requires": { "@babel/compat-data": "^7.14.5", "@babel/helper-validator-option": "^7.14.5", @@ -26467,7 +26382,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz", "integrity": "sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -26484,7 +26398,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz", "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==", - "dev": true, "requires": { "@babel/helper-module-imports": "^7.14.5", "@babel/helper-replace-supers": "^7.14.5", @@ -26500,7 +26413,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz", "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -26525,7 +26437,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", - "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.14.5", "@babel/helper-optimise-call-expression": "^7.14.5", @@ -26537,7 +26448,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz", "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -26567,8 +26477,7 @@ "@babel/helper-validator-option": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", - "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", - "dev": true + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==" }, "@babel/helper-wrap-function": { "version": "7.13.0", @@ -26586,7 +26495,6 @@ "version": "7.14.6", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz", "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==", - "dev": true, "requires": { "@babel/template": "^7.14.5", "@babel/traverse": "^7.14.5", @@ -30400,42 +30308,6 @@ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz", "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==" }, - "@types/lodash.groupby": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@types/lodash.groupby/-/lodash.groupby-4.6.6.tgz", - "integrity": "sha512-kwg3T7Ia63KtDNoQQR8hKrLHCAgrH4I44l5uEMuA6JCbj7DiSccaV4tNV1vbjtAOpX990SolVthJCmBVtRVRgw==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, - "@types/lodash.merge": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.6.tgz", - "integrity": "sha512-IB90krzMf7YpfgP3u/EvZEdXVvm4e3gJbUvh5ieuI+o+XqiNEt6fCzqNRaiLlPVScLI59RxIGZMQ3+Ko/DJ8vQ==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, - "@types/lodash.omit": { - "version": "4.5.6", - "resolved": "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz", - "integrity": "sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, - "@types/lodash.sortby": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/@types/lodash.sortby/-/lodash.sortby-4.7.6.tgz", - "integrity": "sha512-EnvAOmKvEg7gdYpYrS6+fVFPw5dL9rBnJi3vcKI7wqWQcLJVF/KRXK9dH29HjGNVvFUj0s9prRP3J8jEGnGKDw==", - "dev": true, - "requires": { - "@types/lodash": "*" - } - }, "@types/long": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", @@ -30708,12 +30580,6 @@ "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz", "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==" }, - "@types/underscore": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.2.tgz", - "integrity": "sha512-Ls2ylbo7++ITrWk2Yc3G/jijwSq5V3GT0tlgVXEl2kKYXY3ImrtmTCoE2uyTWFRI5owMBriloZFWbE1SXOsE7w==", - "dev": true - }, "@types/uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz", @@ -35862,8 +35728,7 @@ "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" }, "get-caller-file": { "version": "2.0.5", @@ -39377,7 +39242,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -40449,11 +40313,6 @@ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" - }, "lodash.difference": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", @@ -40464,11 +40323,6 @@ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" }, - "lodash.groupby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", - "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=" - }, "lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -40513,12 +40367,8 @@ "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "lodash.omit": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "lodash.once": { "version": "4.1.1", @@ -45584,11 +45434,6 @@ "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", "dev": true }, - "underscore": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" - }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", diff --git a/package.json b/package.json index d8a71c0a..3f8d9c1d 100644 --- a/package.json +++ b/package.json @@ -68,10 +68,7 @@ "js-yaml": "^4.1.0", "jsonwebtoken": "^8.5.1", "ln-service": "^51.8.4", - "lodash.debounce": "^4.0.8", - "lodash.groupby": "^4.6.0", - "lodash.merge": "^4.6.2", - "lodash.omit": "^4.5.0", + "lodash": "^4.17.21", "next": "^11.0.0", "node-fetch": "^2.6.1", "numeral": "^2.0.6", @@ -97,7 +94,6 @@ "styled-react-modal": "^2.1.0", "styled-theming": "^2.2.0", "typescript": "^4.3.4", - "underscore": "^1.13.1", "uuid": "^8.3.2", "victory": "^35.8.6", "winston": "^3.3.3" @@ -126,10 +122,6 @@ "@types/js-cookie": "^2.2.6", "@types/js-yaml": "^4.0.1", "@types/jsonwebtoken": "^8.5.2", - "@types/lodash.groupby": "^4.6.6", - "@types/lodash.merge": "^4.6.6", - "@types/lodash.omit": "^4.5.6", - "@types/lodash.sortby": "^4.7.6", "@types/node": "^15.12.4", "@types/node-fetch": "^2.5.10", "@types/numeral": "^2.0.1", @@ -145,7 +137,6 @@ "@types/styled-components": "^5.1.10", "@types/styled-react-modal": "^1.2.0", "@types/styled-theming": "^2.2.5", - "@types/underscore": "^1.11.2", "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "^4.27.0", "@typescript-eslint/parser": "^4.27.0", diff --git a/server/schema/chain/resolvers.ts b/server/schema/chain/resolvers.ts index a48cb1af..0c87d9c3 100644 --- a/server/schema/chain/resolvers.ts +++ b/server/schema/chain/resolvers.ts @@ -9,7 +9,7 @@ import { } from 'ln-service'; import { ContextType } from 'server/types/apiTypes'; import { requestLimiter } from 'server/helpers/rateLimiter'; -import { sortBy } from 'underscore'; +import { sortBy } from 'lodash'; import { to } from 'server/helpers/async'; import { GetChainBalanceType, diff --git a/server/schema/health/helpers.ts b/server/schema/health/helpers.ts index 50547164..8de6f0eb 100644 --- a/server/schema/health/helpers.ts +++ b/server/schema/health/helpers.ts @@ -1,4 +1,4 @@ -import { groupBy } from 'underscore'; +import { groupBy } from 'lodash'; import { ForwardType } from 'server/types/ln-service.types'; type GroupedObject = { diff --git a/server/schema/index.ts b/server/schema/index.ts index b4d1b6e8..5d9fbae8 100644 --- a/server/schema/index.ts +++ b/server/schema/index.ts @@ -1,4 +1,4 @@ -import merge from 'lodash.merge'; +import { merge } from 'lodash'; import { makeExecutableSchema } from 'graphql-tools'; import { nodeTypes } from './node/types'; import { nodeResolvers } from './node/resolvers'; diff --git a/server/schema/transactions/resolvers.ts b/server/schema/transactions/resolvers.ts index 4e2ea69c..c46b3f62 100644 --- a/server/schema/transactions/resolvers.ts +++ b/server/schema/transactions/resolvers.ts @@ -1,5 +1,5 @@ import { subDays } from 'date-fns'; -import { sortBy } from 'underscore'; +import { sortBy } from 'lodash'; import { ContextType } from 'server/types/apiTypes'; import { requestLimiter } from 'server/helpers/rateLimiter'; import { InvoiceType, PaymentType } from 'server/types/ln-service.types'; diff --git a/server/schema/widgets/resolvers/getInOut.ts b/server/schema/widgets/resolvers/getInOut.ts index 3fd35ae2..aa79fa2d 100644 --- a/server/schema/widgets/resolvers/getInOut.ts +++ b/server/schema/widgets/resolvers/getInOut.ts @@ -1,6 +1,6 @@ import { getInvoices, getPayments } from 'ln-service'; import { differenceInHours, differenceInCalendarDays } from 'date-fns'; -import { groupBy } from 'underscore'; +import { groupBy } from 'lodash'; import { ContextType } from 'server/types/apiTypes'; import { requestLimiter } from 'server/helpers/rateLimiter'; diff --git a/src/components/animated/AnimatedNumber.tsx b/src/components/animated/AnimatedNumber.tsx deleted file mode 100644 index 57cf541b..00000000 --- a/src/components/animated/AnimatedNumber.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import React from 'react'; -import { useSpring, animated } from 'react-spring'; -import { getValue } from '../../utils/helpers'; -import { useConfigState } from '../../context/ConfigContext'; -import { usePriceState } from '../../context/PriceContext'; - -type PriceProps = { - price: number; - symbol: string; - currency: string; -}; - -type AnimatedProps = { - amount?: number; -}; - -export const AnimatedNumber: React.FC = ({ amount = 0 }) => { - const { value } = useSpring({ - from: { value: 0 }, - value: amount, - }); - const { currency, displayValues, useSatWord } = useConfigState(); - const { fiat, prices, dontShow } = usePriceState(); - - if (!displayValues) { - return <>-; - } - - let priceProps: PriceProps = { - price: 0, - symbol: '', - currency: currency !== 'btc' && currency !== 'sat' ? 'sat' : currency, - }; - - if (currency === 'fiat' && prices && !dontShow) { - const current: { last: number; symbol: string } = prices[fiat] ?? { - last: 0, - symbol: '', - }; - - priceProps = { - price: current.last, - symbol: current.symbol, - currency, - }; - } - - return ( - - {value.interpolate(amount => - getValue({ useSatWord, amount: amount as number, ...priceProps }) - )} - - ); -}; diff --git a/src/context/ConfigContext.tsx b/src/context/ConfigContext.tsx index c86b2dd9..a2e62f97 100644 --- a/src/context/ConfigContext.tsx +++ b/src/context/ConfigContext.tsx @@ -1,7 +1,7 @@ import React, { createContext, useContext, useReducer, useEffect } from 'react'; import getConfig from 'next/config'; import Cookies from 'js-cookie'; -import omit from 'lodash.omit'; +import { omit } from 'lodash'; const themeTypes = ['dark', 'light', 'night']; const currencyTypes = ['sat', 'btc', 'fiat']; diff --git a/src/layouts/navigation/nodeInfo/NodeInfo.tsx b/src/layouts/navigation/nodeInfo/NodeInfo.tsx index 64ed9fbd..50717c4a 100644 --- a/src/layouts/navigation/nodeInfo/NodeInfo.tsx +++ b/src/layouts/navigation/nodeInfo/NodeInfo.tsx @@ -3,7 +3,6 @@ import { Zap, Anchor, Circle } from 'react-feather'; import ReactTooltip from 'react-tooltip'; import styled from 'styled-components'; import { getPrice, Price } from 'src/components/price/Price'; -import { AnimatedNumber } from 'src/components/animated/AnimatedNumber'; import { addEllipsis, renderLine } from 'src/components/generic/helpers'; import { useNodeInfo } from 'src/hooks/UseNodeInfo'; import { unSelectedNavButton } from '../../../styles/Themes'; @@ -117,7 +116,7 @@ export const NodeInfo = ({ isOpen, isBurger }: NodeInfoProps) => { {formatPCB} ) : ( - + )} @@ -132,7 +131,7 @@ export const NodeInfo = ({ isOpen, isBurger }: NodeInfoProps) => { {formatPB} ) : ( - + )} diff --git a/src/utils/chat.ts b/src/utils/chat.ts index b31f5b44..c4444b3a 100644 --- a/src/utils/chat.ts +++ b/src/utils/chat.ts @@ -1,5 +1,4 @@ -import groupBy from 'lodash.groupby'; -import { sortBy } from 'underscore'; +import { sortBy, groupBy } from 'lodash'; import { MessagesType } from 'src/graphql/types'; export const separateBySender = (chats: MessagesType[]) => { diff --git a/src/views/balance/PeerSelection.tsx b/src/views/balance/PeerSelection.tsx index f97b88be..fdb564b0 100644 --- a/src/views/balance/PeerSelection.tsx +++ b/src/views/balance/PeerSelection.tsx @@ -4,8 +4,7 @@ import { ChannelType } from 'src/graphql/types'; import { useGetChannelsQuery } from 'src/graphql/queries/__generated__/getChannels.generated'; import { ValueProp } from 'src/components/select'; import { SelectWithDecoAndValue } from 'src/components/select/SelectWithDeco'; -import sortBy from 'lodash.sortby'; -import groupBy from 'lodash.groupby'; +import { sortBy, groupBy } from 'lodash'; import { ChannelInfo } from './ChannelInfo'; type ChannelSelectProps = { diff --git a/src/views/channels/channels/Channels.tsx b/src/views/channels/channels/Channels.tsx index 6f2ab077..0990c1c1 100644 --- a/src/views/channels/channels/Channels.tsx +++ b/src/views/channels/channels/Channels.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef } from 'react'; import { toast } from 'react-toastify'; import { useGetChannelsQuery } from 'src/graphql/queries/__generated__/getChannels.generated'; import { useConfigState } from 'src/context/ConfigContext'; -import { sortBy } from 'underscore'; +import { sortBy } from 'lodash'; import { getPercent } from 'src/utils/helpers'; import { ChannelType } from 'src/graphql/types'; import { useRebalanceState } from 'src/context/RebalanceContext'; diff --git a/src/views/chat/ChatBox.tsx b/src/views/chat/ChatBox.tsx index 1bfe4bfa..2e0c0729 100644 --- a/src/views/chat/ChatBox.tsx +++ b/src/views/chat/ChatBox.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { sortBy } from 'underscore'; +import { sortBy } from 'lodash'; import { MessagesType } from 'src/graphql/types'; import { SentChatProps } from 'src/context/ChatContext'; import { diff --git a/src/views/dashboard/widgets/helpers.tsx b/src/views/dashboard/widgets/helpers.tsx index d7ada273..bdcbd69b 100644 --- a/src/views/dashboard/widgets/helpers.tsx +++ b/src/views/dashboard/widgets/helpers.tsx @@ -4,7 +4,7 @@ import { subDays, subHours, } from 'date-fns'; -import groupBy from 'lodash.groupby'; +import { groupBy } from 'lodash'; import { GetForwardsQuery } from 'src/graphql/queries/__generated__/getForwards.generated'; import { Transaction } from 'src/graphql/types'; import { defaultGrid } from 'src/utils/gridConstants'; diff --git a/src/views/forwards/helpers.tsx b/src/views/forwards/helpers.tsx index 86c2c138..4a18adb3 100644 --- a/src/views/forwards/helpers.tsx +++ b/src/views/forwards/helpers.tsx @@ -1,4 +1,4 @@ -import sortBy from 'lodash.sortby'; +import { sortBy } from 'lodash'; import { Forward } from 'src/graphql/types'; import { ReportType } from '../home/reports/forwardReport/ForwardReport'; diff --git a/src/views/home/reports/forwardReport/helpers.ts b/src/views/home/reports/forwardReport/helpers.ts index bb5cff49..1e83f924 100644 --- a/src/views/home/reports/forwardReport/helpers.ts +++ b/src/views/home/reports/forwardReport/helpers.ts @@ -1,6 +1,5 @@ import { differenceInCalendarDays, differenceInHours, subDays } from 'date-fns'; -import groupBy from 'lodash.groupby'; -import sortBy from 'lodash.sortby'; +import { sortBy, groupBy } from 'lodash'; import { GetClosedChannelsQuery } from 'src/graphql/queries/__generated__/getClosedChannels.generated'; import { Forward } from 'src/graphql/types'; diff --git a/src/views/scores/NodeGraph.tsx b/src/views/scores/NodeGraph.tsx index 1dee7b33..d5134a72 100644 --- a/src/views/scores/NodeGraph.tsx +++ b/src/views/scores/NodeGraph.tsx @@ -8,7 +8,7 @@ import { useGetBosNodeScoresQuery } from 'src/graphql/queries/__generated__/getB import { chartColors, mediaWidths, themeColors } from 'src/styles/Themes'; import { getErrorContent } from 'src/utils/error'; import styled from 'styled-components'; -import { isArray } from 'underscore'; +import { isArray } from 'lodash'; import { AreaGraph } from './AreaGraph'; const Wrapper = styled.div` diff --git a/src/views/scores/NodeInfo.tsx b/src/views/scores/NodeInfo.tsx index 3300507d..15cb482d 100644 --- a/src/views/scores/NodeInfo.tsx +++ b/src/views/scores/NodeInfo.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useRouter } from 'next/router'; import { useGetNodeQuery } from 'src/graphql/queries/__generated__/getNode.generated'; -import { isArray } from 'underscore'; +import { isArray } from 'lodash'; import { Card, CardWithTitle, diff --git a/src/views/scores/NodeScores.tsx b/src/views/scores/NodeScores.tsx index b040465e..3cfa1d1d 100644 --- a/src/views/scores/NodeScores.tsx +++ b/src/views/scores/NodeScores.tsx @@ -1,6 +1,6 @@ import React, { FC, useEffect } from 'react'; import { useRouter } from 'next/router'; -import { isArray } from 'underscore'; +import { isArray } from 'lodash'; import { Card, CardWithTitle, diff --git a/src/views/stats/FeeStats.tsx b/src/views/stats/FeeStats.tsx index a22e5154..ae41e6b6 100644 --- a/src/views/stats/FeeStats.tsx +++ b/src/views/stats/FeeStats.tsx @@ -7,7 +7,7 @@ import { ResponsiveLine, } from 'src/components/generic/Styled'; import { ChannelFeeHealth } from 'src/graphql/types'; -import { sortBy } from 'underscore'; +import { sortBy } from 'lodash'; import { renderLine } from 'src/components/generic/helpers'; import { useStatsDispatch } from './context'; import { ScoreLine, Clickable, WarningText } from './styles'; diff --git a/src/views/stats/FlowStats.tsx b/src/views/stats/FlowStats.tsx index bc331052..0f6e505a 100644 --- a/src/views/stats/FlowStats.tsx +++ b/src/views/stats/FlowStats.tsx @@ -7,7 +7,7 @@ import { Separation, ResponsiveLine, } from 'src/components/generic/Styled'; -import { sortBy } from 'underscore'; +import { sortBy } from 'lodash'; import { renderLine } from 'src/components/generic/helpers'; import { ChannelHealth } from 'src/graphql/types'; import { useStatsDispatch } from './context'; diff --git a/src/views/stats/TimeStats.tsx b/src/views/stats/TimeStats.tsx index 879dae47..2ab9d6b7 100644 --- a/src/views/stats/TimeStats.tsx +++ b/src/views/stats/TimeStats.tsx @@ -8,7 +8,7 @@ import { ResponsiveLine, } from 'src/components/generic/Styled'; import { ChannelTimeHealth } from 'src/graphql/types'; -import { sortBy } from 'underscore'; +import { sortBy } from 'lodash'; import { renderLine } from 'src/components/generic/helpers'; import { formatSeconds } from 'src/utils/helpers'; import { useStatsDispatch } from './context';