From 56b43d0a37ec52b718b32b00c63eb88f2e2744f3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 26 二月 2021 09:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
package.json | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/package.json b/package.json
index 26a7e11..ba42def 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,11 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
- "build": "vue-cli-service build",
+ "serve-test": "vue-cli-service serve --mode test",
+ "serve-production": "vue-cli-service serve --mode production",
+ "build": "vue-cli-service build --mode development",
+ "build-test": "vue-cli-service build --mode test",
+ "build-production": "vue-cli-service build --mode production",
"lint": "vue-cli-service lint"
},
"dependencies": {
@@ -16,8 +20,8 @@
"element-ui": "^2.14.1",
"jquery": "^3.5.1",
"js-cookie": "^2.2.0",
- "leaflet": "^1.7.1",
- "leaflet-canvas-marker": "^0.2.0",
+ "leaflet": "^1.6.0",
+ "leaflet-canvas-markers": "^1.0.6",
"leaflet.markercluster": "^1.4.1",
"lodash": "^4.17.10",
"nprogress": "^0.2.0",
@@ -32,30 +36,22 @@
"@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",
"babel-loader": "^8.2.2",
"cache-loader": "^4.1.0",
"css-loader": "^5.0.1",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.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",
+ "mockjs": "^1.1.0",
"less": "^3.13.0",
"less-loader": "^7.1.0",
"vue-loader": "^15.9.5",
"vue-template-compiler": "^2.6.11"
- },
- "eslintConfig": {
- "root": true,
- "env": {
- "node": true
- },
- "extends": [
- "plugin:vue/essential",
- "eslint:recommended"
- ],
- "parserOptions": {
- "parser": "babel-eslint"
- },
- "rules": {}
},
"browserslist": [
"> 1%",
--
Gitblit v1.8.0