From c10f35a8d2bb5638e890772e3182eb1dda2f0964 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 12 Aug 2018 23:51:02 +0800
Subject: [PATCH] cli3

Former-commit-id: ea0a7d31cc2ea3442f1abfc9c6c7f649cdb0be23 [formerly ea0a7d31cc2ea3442f1abfc9c6c7f649cdb0be23 [formerly ea0a7d31cc2ea3442f1abfc9c6c7f649cdb0be23 [formerly ea0a7d31cc2ea3442f1abfc9c6c7f649cdb0be23 [formerly 30c7fa9fd2add766029b5a6eaaa242171210a5ac [formerly a03ad6849161c0d059488417eaaeb1e50dc1917f]]]]]
Former-commit-id: 698a5221d50ddda489a4b9429e8533c585698672
Former-commit-id: 501de00971ee07e40e2dd97174d4f3248ee11691
Former-commit-id: 08d54bce0ab9e3c1056fa3018fa8893cb79d9bdb [formerly 4772615ee85e13e404f34cb585acbfc7716b0238]
Former-commit-id: fe67f7ac2564738472dda1dda5861ead072231a3
Former-commit-id: 5d120a4413fd0497f5af3fd126afad369e337380
Former-commit-id: f4a01ba6adb69f8758fb8a17e7201cd699f638ff
Former-commit-id: 93aceff06f4c4d4d9400d19ef54484820a8ddcbb
Former-commit-id: b2f7ba7df1b4e9889e1b7ef25eb3174c2bd55d0e
---
 .browserslistrc                  |  3 +++
 .eslintrc.js                     |  2 +-
 .gitignore                       |  5 +++--
 .postcssrc.js                    |  2 +-
 README.md                        |  0
 jest.config.js                   |  3 ++-
 package-lock.json.REMOVED.git-id |  1 +
 package.json                     | 33 ++++++++++++++++++++------------
 yarn.lock.REMOVED.git-id         |  1 +
 9 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 .browserslistrc
 mode change 100755 => 100644 README.md
 create mode 100644 package-lock.json.REMOVED.git-id
 create mode 100644 yarn.lock.REMOVED.git-id

diff --git a/.browserslistrc b/.browserslistrc
new file mode 100644
index 00000000..9dee6464
--- /dev/null
+++ b/.browserslistrc
@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8
diff --git a/.eslintrc.js b/.eslintrc.js
index a1fd69fc..98d04316 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -14,4 +14,4 @@ module.exports = {
   parserOptions: {
     parser: 'babel-eslint'
   }
-}
\ No newline at end of file
+}
diff --git a/.gitignore b/.gitignore
index 9492e423..6cbe21cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,6 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
-package-lock.json
-dev/design
\ No newline at end of file
+
+# d2admin
+dev/design
diff --git a/.postcssrc.js b/.postcssrc.js
index 100cc012..961986e2 100644
--- a/.postcssrc.js
+++ b/.postcssrc.js
@@ -2,4 +2,4 @@ module.exports = {
   plugins: {
     autoprefixer: {}
   }
-}
\ No newline at end of file
+}
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/jest.config.js b/jest.config.js
index 40186da6..d120a015 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -18,5 +18,6 @@ module.exports = {
   ],
   testMatch: [
     '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
-  ]
+  ],
+  testURL: 'http://localhost/'
 }
diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
new file mode 100644
index 00000000..bef2f46a
--- /dev/null
+++ b/package-lock.json.REMOVED.git-id
@@ -0,0 +1 @@
+e9a5d78d8afd3a4324ed65a0599cffb2c52368d3
\ No newline at end of file
diff --git a/package.json b/package.json
index a3f2c8ea..aafa1932 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "ua-parser-js": "^0.7.18",
     "v-charts": "^1.17.6",
     "v-contextmenu": "^2.7.0",
-    "vue": "^2.5.16",
+    "vue": "^2.5.17",
     "vue-grid-layout": "^2.1.11",
     "vue-i18n": "^7.4.2",
     "vue-json-tree-view": "^2.1.4",
@@ -49,23 +49,32 @@
   },
   "devDependencies": {
     "@kazupon/vue-i18n-loader": "^0.3.0",
-    "@vue/cli-plugin-babel": "^3.0.0-rc.4",
-    "@vue/cli-plugin-eslint": "^3.0.0-rc.4",
-    "@vue/cli-plugin-unit-jest": "^3.0.0-rc.4",
-    "@vue/cli-service": "^3.0.0-rc.4",
-    "@vue/eslint-config-standard": "^3.0.0-rc.4",
+    "@vue/cli-plugin-babel": "^3.0.0",
+    "@vue/cli-plugin-eslint": "^3.0.0",
+    "@vue/cli-plugin-unit-jest": "^3.0.0",
+    "@vue/cli-service": "^3.0.0",
+    "@vue/eslint-config-standard": "^3.0.0",
     "@vue/test-utils": "^1.0.0-beta.20",
     "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",
     "text-loader": "0.0.1",
-    "vue-template-compiler": "^2.5.16"
+    "vue-template-compiler": "^2.5.17"
   },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.js": [
+      "vue-cli-service lint",
+      "git add"
+    ],
+    "*.vue": [
+      "vue-cli-service lint",
+      "git add"
+    ]
+  }
 }
diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id
new file mode 100644
index 00000000..4ac33b6a
--- /dev/null
+++ b/yarn.lock.REMOVED.git-id
@@ -0,0 +1 @@
+af85eae29fbff0afbf131fe2a3fb043948dc48e3
\ No newline at end of file