Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade: 清理和升级依赖 #396

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+29 −148
Draft

upgrade: 清理和升级依赖 #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
451b130
upgrade and clean deps
starknt Nov 15, 2024
b11649a
Merge branch 'master' into upgrade/part-2
starknt Nov 15, 2024
60bb3c9
upgrade deps
starknt Nov 15, 2024
21ae3a6
upgrade deps
starknt Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 4 additions & 54 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,67 +17,17 @@
"test": "mocha"
},
"dependencies": {
"spawn-sync": "^2.0.0",
"@docmirror/mitmproxy": "workspace:*",
"agentkeepalive": "^2.1.1",
"babel-preset-es2020": "^1.0.2",
"charset": "^1.0.0",
"child_process": "^1.0.2",
"colors": "^1.1.2",
"commander": "^2.9.0",
"debug": "^4.1.1",
"dns-over-http": "^0.2.0",
"dns-over-tls": "^0.0.8",
"fix-path": "^3.0.0",
"iconv-lite": "^0.4.13",
"is-browser": "^2.1.0",
"jschardet": "^1.4.1",
"json5": "^2.2.3",
"iconv-lite": "^0.6.3",
"lodash": "^4.17.20",
"log4js": "^6.3.0",
"lru-cache": "^6.0.0",
"mkdirp": "^0.5.1",
"node-cmd": "^3.0.0",
"node-forge": "^0.8.2",
"node-powershell": "^4.0.0",
"require-context": "^1.1.0",
"spawn-sync": "^2.0.0",
"through2": "^2.0.1",
"tunnel-agent": "^0.4.3",
"util": "^0.12.3",
"validator": "^13.1.17",
"winreg": "^1.2.4"
"winreg": "^1.2.5"
},
"devDependencies": {
"@vue/cli-plugin-eslint": "^4.5.0",
"@vue/eslint-config-standard": "^5.1.2",
"babel-eslint": "^10.1.0",
"chai": "^4.3.4",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2",
"mocha": "^8.2.1"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/essential",
"@vue/standard"
],
"parserOptions": {
"parser": "babel-eslint"
},
"rules": {}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
],
"gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e"
}
}
4 changes: 2 additions & 2 deletions packages/gui/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset',
],
'@vue/babel-preset-jsx'
]
}
59 changes: 14 additions & 45 deletions packages/gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,67 +25,36 @@
"@docmirror/mitmproxy": "workspace:*",
"@mihomo-party/sysproxy": "^2.0.4",
"@natmri/platform-napi": "^0.0.7",
"adm-zip": "^0.5.5",
"ant-design-vue": "^1.6.5",
"compressing": "^1.5.1",
"core-js": "^3.6.5",
"adm-zip": "^0.5.16",
"ant-design-vue": "^1.7.8",
"electron-baidu-tongji": "^1.0.5",
"electron-reload": "^1.5.0",
"electron-store": "^6.0.1",
"electron-sudo": "^4.0.12",
"electron-updater": "^4.3.5",
"es-abstract": "^1.17.7",
"extract-zip": "^2.0.1",
"iconv-lite": "^0.6.2",
"json5": "^2.2.3",
"lodash": "^4.17.20",
"log4js": "^6.3.0",
"request-progress": "^3.0.0",
"sass": "^1.27.1",
"sass-loader": "^10.0.4",
"vue": "^2.6.11",
"sass": "^1.81.0",
"sass-loader": "^16.0.3",
"vue": "^2.7.16",
"vue-json-editor-fix-cn": "^1.4.3",
"vue-router": "^3.4.8"
"vue-router": "^3.6.5"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.0",
"@vue/cli-plugin-eslint": "^4.5.0",
"@vue/cli-service": "^4.5.0",
"@vue/eslint-config-standard": "^5.1.2",
"babel-eslint": "^10.1.0",
"electron": "^17.4.11",
"@babel/plugin-syntax-jsx": "^7.25.9",
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
"@vue/babel-preset-jsx": "^1.4.0",
"@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-service": "^5.0.8",
"electron": "^19.1.9",
"electron-builder": "^25.0.6",
"electron-devtools-installer": "^3.1.0",
"electron-icon-builder": "^2.0.1",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2",
"json5-loader": "^4.0.1",
"vue-cli-plugin-electron-builder": "^2.1.1",
"vue-template-compiler": "^2.6.11"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/essential",
"@vue/standard"
],
"parserOptions": {
"parser": "babel-eslint"
},
"rules": {}
"vue-cli-plugin-electron-builder": "^2.1.1"
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
],
"__npminstall_done": false,
"gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e"
]
}
2 changes: 1 addition & 1 deletion packages/gui/src/view/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ body{
padding:5px;
border-bottom: #eee solid 1px;
height:60px;
background-image: url("/logo/logo-lang.svg");
background-image: url("../../public/logo/logo-lang.svg");
background-size: auto 50px;
background-repeat: no-repeat;
background-position: 5px center;
Expand Down
2 changes: 2 additions & 0 deletions packages/gui/vue.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ module.exports = {
},
pluginOptions: {
electronBuilder: {
// Ref: https://github.com/nklayman/vue-cli-plugin-electron-builder/issues/1891
customFileProtocol: './',
externals: [
'@mihomo-party/sysproxy',
'@mihomo-party/sysproxy-win32-ia32-msvc',
Expand Down
52 changes: 6 additions & 46 deletions packages/mitmproxy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,10 @@
"main": "src/index.js",
"scripts": {},
"dependencies": {
"agentkeepalive": "^2.1.1",
"axios": "^0.21.1",
"agentkeepalive": "^4.5.0",
"axios": "^1.7.7",
"baidu-aip-sdk": "^4.16.16",
"child_process": "^1.0.2",
"colors": "^1.1.2",
"commander": "^2.9.0",
"crypto-js": "^4.0.0",
"debug": "^4.1.1",
"dns-over-http": "^0.2.0",
"dns-over-tls": "^0.0.9",
"is-browser": "^2.1.0",
Expand All @@ -27,45 +23,9 @@
"log4js": "^6.3.0",
"lru-cache": "^6.0.0",
"mkdirp": "^0.5.1",
"node-cmd": "^3.0.0",
"node-forge": "^0.8.2",
"require-context": "^1.1.0",
"node-forge": "^1.3.1",
"stream-throttle": "^0.1.3",
"through2": "^2.0.1",
"tunnel-agent": "^0.4.3",
"util": "^0.12.3",
"validator": "^13.1.17"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.0",
"@vue/cli-plugin-eslint": "^4.5.0",
"@vue/eslint-config-standard": "^5.1.2",
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/essential",
"@vue/standard"
],
"parserOptions": {
"parser": "babel-eslint"
},
"rules": {}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
],
"gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e"
"through2": "^4.0.2",
"tunnel-agent": "^0.6.0"
}
}
Loading