From b52055a43a38d943e86ddb35e7763fbc94d46fa7 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 15 Nov 2023 17:11:37 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
package.json | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 505c898..5628a09 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
- "lint": "eslint --ext .js,.vue src",
+ "lint": "eslint . --ext .vue,.js,.ts,.jsx,.tsx --fix",
+ "lint-repair": "eslint --fix --ext .js --ext .vue client/",
"test:unit": "jest --clearCache && vue-cli-service test:unit",
"test:ci": "npm run lint && npm run test:unit",
"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
@@ -44,6 +45,7 @@
"open-docxtemplater-image-module": "^1.0.3",
"path-to-regexp": "2.4.0",
"pizzip": "^3.1.3",
+ "qs": "^6.11.2",
"tasksfile": "^5.1.1",
"three": "^0.132.2",
"vue": "2.6.10",
@@ -59,6 +61,7 @@
},
"devDependencies": {
"@babel/core": "7.0.0",
+ "@babel/eslint-parser": "^7.16.5",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/register": "7.0.0",
"@vue/cli-plugin-babel": "3.6.0",
@@ -72,10 +75,20 @@
"babel-jest": "23.6.0",
"chalk": "2.4.2",
"connect": "3.6.6",
- "eslint": "5.15.3",
- "eslint-plugin-vue": "^5.2.2",
+ "eslint": "^5.16.0",
+ "eslint-config-prettier": "^9.0.0",
+ "eslint-config-standard": "^10.2.1",
+ "eslint-friendly-formatter": "^3.0.0",
+ "eslint-loader": "^1.7.1",
+ "eslint-plugin-html": "^6.2.0",
+ "eslint-plugin-import": "^2.28.1",
+ "eslint-plugin-node": "^5.2.1",
+ "eslint-plugin-promise": "^3.8.0",
+ "eslint-plugin-standard": "^3.1.0",
+ "eslint-plugin-vue": "^5.2.3",
"html-webpack-plugin": "3.2.0",
"mockjs": "1.0.1-beta3",
+ "prettier": "3.0.3",
"runjs": "^4.3.2",
"sass-loader": "^7.1.0",
"script-ext-html-webpack-plugin": "2.1.3",
@@ -92,5 +105,9 @@
"browserslist": [
"> 1%",
"last 2 versions"
+ ],
+ "nohoist": [
+ "**/@vue/cli-plugin-eslint",
+ "**/@vue/cli-plugin-eslint/**"
]
}
--
Gitblit v1.8.0