From 3fd3b755b8fc96b3dc6513ebe9d662356ec14010 Mon Sep 17 00:00:00 2001 From: Kawanaao Date: Sat, 2 Dec 2023 16:29:20 +0200 Subject: [PATCH] Using lodash.merge instead of lodash --- client/src/pages/config/users/proxyman.jsx | 1 - .../src/pages/dashboard/components/table.jsx | 1 - client/src/pages/newInstall/newInstall.jsx | 1 - client/src/pages/openid/openid-list.jsx | 1 - client/src/themes/overrides/index.jsx | 2 +- package-lock.json | 33 ++++++++++++++----- package.json | 14 ++++++-- webpack.config.js | 12 +++++-- 8 files changed, 48 insertions(+), 17 deletions(-) diff --git a/client/src/pages/config/users/proxyman.jsx b/client/src/pages/config/users/proxyman.jsx index 564cd04..d564230 100644 --- a/client/src/pages/config/users/proxyman.jsx +++ b/client/src/pages/config/users/proxyman.jsx @@ -31,7 +31,6 @@ import { EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'; import AnimateButton from '../../../components/@extended/AnimateButton'; import RestartModal from './restart'; import RouteManagement from '../routes/routeman'; -import { map } from 'lodash'; import { getFaviconURL, sanitizeRoute, ValidateRoute } from '../../../utils/routes'; import PrettyTableView from '../../../components/tableView/prettyTableView'; import HostChip from '../../../components/hostChip'; diff --git a/client/src/pages/dashboard/components/table.jsx b/client/src/pages/dashboard/components/table.jsx index 25555ba..5ffc4b3 100644 --- a/client/src/pages/dashboard/components/table.jsx +++ b/client/src/pages/dashboard/components/table.jsx @@ -35,7 +35,6 @@ import MainCard from '../../../components/MainCard'; import ReactApexChart from 'react-apexcharts'; import { object } from 'prop-types'; import { FormaterForMetric } from './utils'; -import { set } from 'lodash'; import { DownOutlined, UpOutlined } from '@ant-design/icons'; import PlotComponent from './plot'; diff --git a/client/src/pages/newInstall/newInstall.jsx b/client/src/pages/newInstall/newInstall.jsx index 1f0f2b5..432d487 100644 --- a/client/src/pages/newInstall/newInstall.jsx +++ b/client/src/pages/newInstall/newInstall.jsx @@ -18,7 +18,6 @@ import LogsInModal from '../../components/logsInModal'; import { CosmosCheckbox, CosmosInputPassword, CosmosInputText, CosmosSelect } from '../config/users/formShortcuts'; import AnimateButton from '../../components/@extended/AnimateButton'; import { Box } from '@mui/system'; -import { pull } from 'lodash'; import { isDomain, redirectTo, redirectToLocal } from '../../utils/indexs'; import { DnsChallengeComp } from '../../utils/dns-challenge-comp'; // ================================|| LOGIN ||================================ // diff --git a/client/src/pages/openid/openid-list.jsx b/client/src/pages/openid/openid-list.jsx index cb211b1..4c573a3 100644 --- a/client/src/pages/openid/openid-list.jsx +++ b/client/src/pages/openid/openid-list.jsx @@ -26,7 +26,6 @@ import { EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'; import AnimateButton from '../../components/@extended/AnimateButton'; import RestartModal from '../config/users/restart'; import RouteManagement from '../config/routes/routeman'; -import { map } from 'lodash'; import { getFaviconURL, sanitizeRoute, ValidateRoute } from '../../utils/routes'; import PrettyTableView from '../../components/tableView/prettyTableView'; import HostChip from '../../components/hostChip'; diff --git a/client/src/themes/overrides/index.jsx b/client/src/themes/overrides/index.jsx index d6d4f4a..b80f6b4 100644 --- a/client/src/themes/overrides/index.jsx +++ b/client/src/themes/overrides/index.jsx @@ -1,5 +1,5 @@ // third-party -import { merge } from 'lodash'; +import merge from 'lodash.merge'; // project import import Badge from './Badge'; diff --git a/package-lock.json b/package-lock.json index d02f4e9..4f20378 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "framer-motion": "^7.3.6", "history": "^5.3.0", "js-yaml": "^4.1.0", - "lodash": "^4.17.21", + "lodash.merge": "^4.6.2", "prop-types": "^15.8.1", "qrcode": "^1.5.3", "react": "^18.2.0", @@ -72,6 +72,7 @@ "@babel/preset-env": "^7.23.5", "@babel/preset-typescript": "^7.23.3", "@swc/core": "^1.3.100", + "@types/lodash.merge": "^4.6.9", "babel-loader": "^9.1.3", "babel-plugin-direct-import": "^1.0.0", "browserify-fs": "^1.0.0", @@ -110,7 +111,16 @@ "webpack-merge": "^5.10.0" }, "peerDependencies": { - "bn.js": ">= 4.12.0 =< 5.2.1" + "@mui/base": "^5.0.0-beta.3", + "bn.js": ">= 4.12.0 =< 5.2.1", + "isarray": ">= 0.0.1 =< 1.0.0", + "level-fix-range": ">= 1.0.2 =< 2.0.0", + "object-keys": ">= 0.2.0 =< 0.4.0", + "prr": ">= 0.0.0 =< 1.0.1", + "react-is": ">= 16.13.1 =< 18.2.0", + "safe-buffer": ">= 5.1.2 =< 5.2.1", + "string_decoder": ">= 0.10.31 =< 1.3.0", + "xtend": ">= 2.0.6 =< 3.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -3546,6 +3556,15 @@ "version": "4.14.195", "license": "MIT" }, + "node_modules/@types/lodash.merge": { + "version": "4.6.9", + "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz", + "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==", + "dev": true, + "dependencies": { + "@types/lodash": "*" + } + }, "node_modules/@types/node": { "version": "20.2.5", "license": "MIT" @@ -9552,7 +9571,6 @@ }, "node_modules/level-fix-range": { "version": "1.0.2", - "dev": true, "license": "MIT" }, "node_modules/level-hooks": { @@ -9770,8 +9788,8 @@ }, "node_modules/lodash.merge": { "version": "4.6.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, "node_modules/lodash.throttle": { "version": "4.1.1", @@ -11286,7 +11304,6 @@ }, "node_modules/prr": { "version": "1.0.1", - "dev": true, "license": "MIT" }, "node_modules/public-encrypt": { @@ -12605,7 +12622,6 @@ }, "node_modules/string_decoder": { "version": "1.3.0", - "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" @@ -13744,8 +13760,9 @@ }, "node_modules/webpack-cli": { "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, - "license": "MIT", "dependencies": { "@discoveryjs/json-ext": "^0.5.0", "@webpack-cli/configtest": "^2.1.1", diff --git a/package.json b/package.json index 9341189..3d41982 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "framer-motion": "^7.3.6", "history": "^5.3.0", "js-yaml": "^4.1.0", - "lodash": "^4.17.21", + "lodash.merge": "^4.6.2", "prop-types": "^15.8.1", "qrcode": "^1.5.3", "react": "^18.2.0", @@ -67,7 +67,16 @@ "yup": "^0.32.11" }, "peerDependencies": { - "bn.js": ">= 4.12.0 =< 5.2.1" + "@mui/base": "^5.0.0-beta.3", + "bn.js": ">= 4.12.0 =< 5.2.1", + "isarray": ">= 0.0.1 =< 1.0.0", + "level-fix-range": ">= 1.0.2 =< 2.0.0", + "object-keys": ">= 0.2.0 =< 0.4.0", + "prr": ">= 0.0.0 =< 1.0.1", + "react-is": ">= 16.13.1 =< 18.2.0", + "safe-buffer": ">= 5.1.2 =< 5.2.1", + "string_decoder": ">= 0.10.31 =< 1.3.0", + "xtend": ">= 2.0.6 =< 3.0.0" }, "overrides": { "react-lazyload": { @@ -119,6 +128,7 @@ "@babel/preset-env": "^7.23.5", "@babel/preset-typescript": "^7.23.3", "@swc/core": "^1.3.100", + "@types/lodash.merge": "^4.6.9", "babel-loader": "^9.1.3", "babel-plugin-direct-import": "^1.0.0", "browserify-fs": "^1.0.0", diff --git a/webpack.config.js b/webpack.config.js index 84259bc..841175d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ module.exports = { module: { rules: [ { - test: /\.(ts|tsx|js|jsx|mjs|cjs)$/, + test: /\.(ts|tsx|js|jsx|mjs|cjs)$/i, use: { loader: 'babel-loader', options: { @@ -52,7 +52,15 @@ module.exports = { 'util': require.resolve('util/'), }, alias: { - 'bn.js': require.resolve('bn.js') + 'bn.js': require.resolve('bn.js'), + 'isarray': require.resolve('isarray'), + 'level-fix-range': require.resolve('level-fix-range'), + 'object-keys': require.resolve('object-keys'), + 'prr': require.resolve('prr'), + 'react-is': require.resolve('react-is'), + 'safe-buffer': require.resolve('safe-buffer'), + 'string_decoder': require.resolve('string_decoder'), + 'xtend': require.resolve('xtend') } }, plugins: [