beenull/Cosmos-Server
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Using lodash.merge instead of lodash

Browse source
This commit is contained in:
Kawanaao 2023-12-02 16:29:20 +02:00
parent 5d944aa660
commit 3fd3b755b8
No known key found for this signature in database
GPG key ID: 5B7A8DDCE861E7DC
8 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/src/pages/config/users/proxyman.jsx
View file

@ -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';

1
client/src/pages/dashboard/components/table.jsx
View file

@ -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';

1
client/src/pages/newInstall/newInstall.jsx
View file

@ -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 ||================================ //

1
client/src/pages/openid/openid-list.jsx
View file

@ -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';

2
client/src/themes/overrides/index.jsx
View file

@ -1,5 +1,5 @@
// third-party
import { merge } from 'lodash';
import merge from 'lodash.merge';
// project import
import Badge from './Badge';

33
package-lock.json generated
View file

@ -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",

14
package.json
View file

@ -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",

12
webpack.config.js
View file

@ -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: [