Update package.json

package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "axios": "^0.18.1",
+<<<<<<< Updated upstream
     "core-js": "3.6.5",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
@@ -40,9 +41,33 @@
     "sass-loader": "8.0.2",
     "script-ext-html-webpack-plugin": "2.1.3",
     "serve-static": "1.13.2",
+=======
+    "core-js": "^3.6.5",
+    "element-ui": "^2.13.2",
+    "js-cookie": "^2.2.0",
+    "normalize.css": "^7.0.0",
+    "nprogress": "^0.2.0",
+    "path-browserify": "^1.0.1",
+    "path-to-regexp": "^2.4.0",
+    "vite-plugin-svg-icons": "^1.1.0",
+    "vue": "^2.6.10",
+    "vue-router": "^3.0.6",
+    "vuex": "^3.1.0"
+  },
+  "devDependencies": {
+    "@vue/compiler-sfc": "^3.2.26",
+    "autoprefixer": "^9.5.1",
+    "chalk": "^2.4.2",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "mockjs": "^1.0.1-beta3",
+    "runjs": "^4.3.2",
+    "sass": "^1.26.8",
+    "serve-static": "^1.13.2",
+>>>>>>> Stashed changes
     "vite": "^2.7.10",
     "vite-plugin-vue2": "^1.9.2",
-    "vue-template-compiler": "2.6.10"
+    "vue-template-compiler": "^2.6.10"
   },
   "browserslist": [
     "> 1%",