From 0af507deb2a8b08a606b795d73c660d02ecb7f49 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 17:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
package.json | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index 031071f..f1cf4e4 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"build:prod": "vue-cli-service build --mode prod",
"build:test": "vue-cli-service build --mode test",
"electron:build": "vue-cli-service electron:build",
- "electron:serve": "vue-cli-service electron:serve" ,
+ "electron:serve": "vue-cli-service electron:serve",
"postinstall": "electron-builder install-app-deps",
"postuninstall": "electron-builder install-app-deps"
},
@@ -29,10 +29,10 @@
"axios": "^0.19.2",
"babel-polyfill": "^6.26.0",
"classlist-polyfill": "^1.2.0",
- "crypto-js": "^3.1.9-1",
"clipboard": "^2.0.11",
"codemirror": "^5.65.16",
"core-js": "^3.37.1",
+ "crypto-js": "^3.1.9-1",
"driver.js": "^0.9.8",
"dropzone": "^5.9.3",
"echarts": "^5.5.0",
@@ -41,9 +41,9 @@
"fs": "^0.0.1-security",
"fuse.js": "^6.6.2",
"husky": "^7.0.4",
- "mockjs": "^1.1.0",
"js-cookie": "2.2.0",
"jszip": "^3.10.1",
+ "mockjs": "^1.1.0",
"node-sass": "^6.0.1",
"normalize.css": "8.0.1",
"nprogress": "0.2.0",
@@ -62,17 +62,11 @@
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.19",
- "@vue/cli-plugin-eslint": "^4.5.19",
"@vue/cli-plugin-router": "^4.5.19",
"@vue/cli-plugin-vuex": "^4.5.19",
"@vue/cli-service": "^4.5.19",
- "@vue/eslint-config-standard": "^4.0.0",
- "babel-eslint": "^10.1.0",
"electron": "^13.0.0",
"electron-devtools-installer": "^3.1.0",
- "eslint": "^5.16.0",
- "eslint-plugin-vue": "^5.2.3",
- "node-sass": "^6.0.1",
"sass-loader": "^10.5.2",
"svg-sprite-loader": "4.1.6",
"vue-cli-plugin-electron-builder": "~2.1.1",
@@ -91,7 +85,6 @@
"license": "AGPL-3.0",
"lint-staged": {
"src/**/*.{js,vue}": [
- "eslint --fix",
"git add"
]
},
--
Gitblit v1.8.0