Просмотр исходного кода

merge: resolve vue.config.js conflict

boss 2 недель назад
Родитель
Сommit
3e5837b147
3 измененных файлов с 12 добавлено и 11 удалено
  1. 1 0
      .nvmrc
  2. 2 0
      build/empty.js
  3. 9 11
      package.json

+ 1 - 0
.nvmrc

@@ -0,0 +1 @@
+16

+ 2 - 0
build/empty.js

@@ -0,0 +1,2 @@
+// Webpack 4 placeholder for Node.js built-in modules used by cloud SDKs in browser builds.
+module.exports = {}

+ 9 - 11
package.json

@@ -54,11 +54,13 @@
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.1",
     "jsencrypt": "3.0.0-rc.1",
-    "moment": "^2.30.1",
     "monaco-editor": "^0.55.1",
     "nprogress": "0.2.0",
-    "qrcode": "^1.5.4",
+    "fullcalendar": "3.10.2",
+    "qrcode": "1.5.4",
+    "qrcode.vue": "1.7.0",
     "qrcodejs2": "0.0.2",
+    "vue-full-calendar": "2.8.1-0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
@@ -68,7 +70,6 @@
     "vue-baidu-map": "^0.21.22",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
-    "vue-full-calendar": "^2.8.1-0",
     "vue-jsonp": "^2.0.0",
     "vue-meta": "^2.4.0",
     "vue-mobile-calendar": "^3.3.0",
@@ -79,8 +80,8 @@
     "wangeditor": "^4.7.5"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
+    "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@vue/cli-plugin-babel": "4.4.6",
     "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",
@@ -89,16 +90,13 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
-    "fullcalendar": "^3.10.5",
-    "html-webpack-plugin": "^5.6.7",
     "lint-staged": "10.5.3",
-    "qrcode.vue": "^1.7.0",
+    "sass": "1.32.13",
     "runjs": "4.4.2",
-    "sass": "^1.77.0",
     "sass-loader": "8.0.2",
+    "stylus": "0.54.8",
+    "stylus-loader": "3.0.2",
     "script-ext-html-webpack-plugin": "2.1.5",
-    "stylus": "^0.54.7",
-    "stylus-loader": "^3.0.2",
     "svg-sprite-loader": "5.1.1",
     "vue-template-compiler": "2.6.12",
     "webpack": "^4.46.0",