合并主线

This commit is contained in:
648540858
2022-06-27 14:40:07 +08:00
parent 26739237e2
commit 1d1f174852
6 changed files with 286 additions and 280 deletions

View File

@@ -50,7 +50,7 @@
"postcss-url": "^7.2.1",
"rimraf": "^2.6.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"shelljs": "^0.8.5",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.8",
"vue-loader": "^13.3.0",
@@ -11655,9 +11655,9 @@
}
},
"node_modules/shelljs": {
"version": "0.7.8",
"resolved": "https://registry.npm.taobao.org/shelljs/download/shelljs-0.7.8.tgz",
"integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
"version": "0.8.5",
"resolved": "https://registry.npmmirror.com/shelljs/-/shelljs-0.8.5.tgz",
"integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
"dev": true,
"dependencies": {
"glob": "^7.0.0",
@@ -11668,8 +11668,7 @@
"shjs": "bin/shjs"
},
"engines": {
"iojs": "*",
"node": ">=0.11.0"
"node": ">=4"
}
},
"node_modules/shellwords": {
@@ -24156,9 +24155,9 @@
"dev": true
},
"shelljs": {
"version": "0.7.8",
"resolved": "https://registry.npm.taobao.org/shelljs/download/shelljs-0.7.8.tgz",
"integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
"version": "0.8.5",
"resolved": "https://registry.npmmirror.com/shelljs/-/shelljs-0.8.5.tgz",
"integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
"dev": true,
"requires": {
"glob": "^7.0.0",