Merge remote-tracking branch 'nyanpasu/main'

This commit is contained in:
wonfen
2023-11-22 06:48:30 +08:00
78 changed files with 4361 additions and 2559 deletions

View File

@@ -1,11 +1,11 @@
{
"name": "clash-verge",
"version": "1.3.9",
"version": "1.4.0",
"license": "GPL-3.0",
"scripts": {
"dev": "tauri dev",
"dev": "tauri dev -f default-meta",
"dev:diff": "tauri dev -f verge-dev",
"build": "tauri build",
"build": "tauri build -f default-meta",
"tauri": "tauri",
"web:dev": "vite",
"web:build": "tsc && vite build",
@@ -18,12 +18,13 @@
"prepare": "husky install"
},
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@juggle/resize-observer": "^3.4.0",
"@mui/icons-material": "^5.10.9",
"@mui/material": "^5.10.13",
"@mui/x-data-grid": "^5.17.11",
"@mui/icons-material": "^5.14.14",
"@mui/lab": "5.0.0-alpha.149",
"@mui/material": "^5.14.14",
"@mui/x-data-grid": "^6.16.3",
"@tauri-apps/api": "^1.3.0",
"ahooks": "^3.7.2",
"axios": "^1.1.3",
@@ -37,6 +38,7 @@
"react-hook-form": "^7.39.5",
"react-i18next": "^12.0.0",
"react-router-dom": "^6.4.3",
"react-transition-group": "^4.4.5",
"react-virtuoso": "^3.1.3",
"recoil": "^0.7.6",
"snarkdown": "^2.0.0",
@@ -49,8 +51,10 @@
"@types/js-cookie": "^3.0.2",
"@types/lodash": "^4.14.180",
"@types/lodash-es": "^4.17.7",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.0.11",
"@vitejs/plugin-react": "^2.0.1",
"@types/react-transition-group": "^4.4.9",
"@vitejs/plugin-react": "^4.1.0",
"adm-zip": "^0.5.9",
"cross-env": "^7.0.3",
"fs-extra": "^10.0.0",
@@ -61,9 +65,9 @@
"pretty-quick": "^3.1.3",
"sass": "^1.54.0",
"typescript": "^4.7.4",
"vite": "^3.2.5",
"vite": "^4.5.0",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-svgr": "^2.2.1"
"vite-plugin-svgr": "^4.1.0"
},
"prettier": {
"tabWidth": 2,