From b3a9c1d4a3dca67d18bf7a50957e13c1e98c07fb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 25 Apr 2019 11:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=BE=9D=E8=B5=96=20+=20dart?=
 =?UTF-8?q?sass?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 93f980842897d398426bdf67204152311bae1c4c [formerly f0799584b13831ddba4142a93ab55216c51a320d] [formerly 93f980842897d398426bdf67204152311bae1c4c [formerly f0799584b13831ddba4142a93ab55216c51a320d] [formerly 93f980842897d398426bdf67204152311bae1c4c [formerly f0799584b13831ddba4142a93ab55216c51a320d] [formerly f0799584b13831ddba4142a93ab55216c51a320d [formerly 629ba2e9708fc2bfb003a085b5abcd06e246bf3d [formerly 05b1cdd9c9ee503759d8bb798948df59fe6bcedd]]]]]
Former-commit-id: 0ab568fc23eb70003d3d0711566075644e24f7ea
Former-commit-id: d583d94d755fbd3dd027163b416bca4fd368081f
Former-commit-id: 2bf9134a11e3cfcbbd7e53f9ffd88645cdd9dd23 [formerly d77acf9aeb26a0f4bdc0f646a75bd8a10b607710]
Former-commit-id: a22b9c1e5e2f8a711be86b20e1c4af27a6eacf5d
Former-commit-id: 4fc0df4fac16d71db13a6117a1def8665630c022
Former-commit-id: 26ac6bbaea165ae7fd4a2b8ba8d55dd472190077
Former-commit-id: f49c32f9d39e9d8b51b49607d06c65435662eb19
Former-commit-id: 3b642a01e36f932b5b5500ba6fb188d2edb93c18
---
 babel.config.js                  |  4 --
 package-lock.json.REMOVED.git-id |  2 +-
 package.json                     | 94 ++++++++++++++------------------
 3 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index eceb4cef..ba179669 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,9 +1,5 @@
 module.exports = {
   presets: [
     '@vue/app'
-  ],
-  plugins: [
-    // https://babeljs.io/docs/en/babel-plugin-transform-runtime/
-    '@babel/plugin-transform-runtime'
   ]
 }
diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
index f3f6c2ff..afb96d0c 100644
--- a/package-lock.json.REMOVED.git-id
+++ b/package-lock.json.REMOVED.git-id
@@ -1 +1 @@
-4bf0a6ad67e67ee39dd5594ca0e4d1965d5a2de6
\ No newline at end of file
+37a0bf8c45158e97c62ed1be6466ad1ad977e544
\ No newline at end of file
diff --git a/package.json b/package.json
index ef647820..05f0ed5c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "d2-admin",
   "version": "1.6.18",
-  "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
     "start": "npm run serve",
@@ -13,72 +12,63 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@babel/runtime": "^7.2.0",
     "@d2-admin/filters-dayjs": "^1.0.3",
-    "@d2-projects/d2-crud": "^2.0.3",
+    "@d2-projects/d2-crud": "^2.0.5",
     "@d2-projects/vue-table-export": "^1.0.1",
     "@d2-projects/vue-table-import": "^1.0.0",
-    "axios": "^0.17.1",
-    "better-scroll": "^1.12.1",
-    "clipboard-polyfill": "^2.4.1",
-    "countup.js": "^1.9.3",
-    "dayjs": "^1.6.7",
-    "echarts": "^4.1.0",
-    "element-ui": "^2.4.11",
+    "axios": "^0.18.0",
+    "better-scroll": "^1.15.2",
+    "clipboard-polyfill": "^2.8.0",
+    "core-js": "^2.6.5",
+    "countup.js": "^2.0.4",
+    "dayjs": "^1.8.12",
+    "echarts": "^4.2.1",
+    "element-ui": "^2.7.2",
     "flex.css": "^1.1.7",
-    "fuse.js": "^3.2.1",
-    "github-markdown-css": "^2.10.0",
-    "highlight.js": "^9.12.0",
-    "hotkeys-js": "^3.3.6",
+    "fuse.js": "^3.4.4",
+    "github-markdown-css": "^3.0.1",
+    "highlight.js": "^9.15.6",
+    "hotkeys-js": "^3.6.2",
     "js-cookie": "^2.2.0",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.11",
     "lowdb": "^1.0.0",
-    "marked": "^0.3.9",
+    "marked": "^0.6.2",
     "mockjs": "^1.0.1-beta3",
     "nprogress": "^0.2.0",
-    "qs": "^6.6.0",
-    "quill": "^1.3.4",
-    "screenfull": "^4.0.0",
+    "qs": "^6.7.0",
+    "quill": "^1.3.6",
+    "screenfull": "^4.2.0",
     "simplemde": "^1.11.2",
-    "ua-parser-js": "^0.7.18",
-    "v-charts": "^1.17.6",
-    "v-contextmenu": "^2.7.0",
-    "vue": "^2.5.17",
-    "vue-grid-layout": "^2.1.11",
-    "vue-i18n": "^7.4.2",
+    "ua-parser-js": "^0.7.19",
+    "v-charts": "^1.19.0",
+    "v-contextmenu": "^2.8.0",
+    "vue": "^2.6.10",
+    "vue-grid-layout": "^2.3.4",
+    "vue-i18n": "^8.10.0",
     "vue-json-tree-view": "^2.1.4",
-    "vue-router": "^3.0.1",
-    "vue-splitpane": "^1.0.2",
-    "vue-ueditor-wrap": "^1.5.0",
+    "vue-router": "^3.0.3",
+    "vue-splitpane": "^1.0.4",
+    "vue-ueditor-wrap": "^2.4.1",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
-    "@babel/plugin-transform-runtime": "^7.2.0",
     "@kazupon/vue-i18n-loader": "^0.3.0",
-    "@vue/cli-plugin-babel": "^3.0.0",
-    "@vue/cli-plugin-eslint": "^3.0.0",
-    "@vue/cli-plugin-unit-jest": "^3.2.3",
-    "@vue/cli-service": "^3.0.0",
-    "@vue/eslint-config-standard": "^3.0.0",
-    "@vue/test-utils": "^1.0.0-beta.28",
+    "@vue/cli-plugin-babel": "^3.6.0",
+    "@vue/cli-plugin-eslint": "^3.6.0",
+    "@vue/cli-plugin-unit-jest": "^3.6.0",
+    "@vue/cli-service": "^3.6.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/test-utils": "1.0.0-beta.29",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^23.0.1",
-    "lint-staged": "^7.2.0",
-    "node-sass": "^4.9.0",
-    "sass-loader": "^7.0.1",
-    "svg-sprite-loader": "^3.8.0",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^23.6.0",
+    "eslint": "^5.16.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "sass": "^1.18.0",
+    "sass-loader": "^7.1.0",
+    "svg-sprite-loader": "^4.1.3",
     "text-loader": "0.0.1",
-    "uglifyjs-webpack-plugin": "^2.1.1",
-    "vue-template-compiler": "^2.5.17"
-  },
-  "lint-staged": {
-    "*.js": [
-      "vue-cli-service lint",
-      "git add"
-    ],
-    "*.vue": [
-      "vue-cli-service lint",
-      "git add"
-    ]
+    "uglifyjs-webpack-plugin": "^2.1.2",
+    "vue-template-compiler": "^2.5.21"
   }
 }