Merge remote-tracking branch 'origin/main'

# Conflicts: # src/components/project/useProject.ts
crawlab-team · Jun 25, 2024 · a3a6a59 · a3a6a59
2 parents 88d0f55 + a410aae
commit a3a6a59
Show file tree

Hide file tree

Showing 81 changed files with 1,042 additions and 1,280 deletions.
diff --git a/index.html b/index.html
@@ -8,20 +8,18 @@
   <!--  <link href="font-awesome.min.css" rel="stylesheet">-->
   <title>Crawlab</title>
   <link href="css/style.css" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.css" rel="stylesheet">
 
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r128/three.min.js"></script>
   <script type="application/javascript" src="js/vue3-sfc-loader.js"></script>
-  <script type="application/javascript" src="js/login-canvas.js"></script>
   <script type="application/javascript" src="simplemde/simplemde.js"></script>
   <script type="application/javascript" src="https://buttons.github.io/buttons.js" async></script>
-
-  <link href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.css" rel="stylesheet">
-
   <script src="https://cdn.jsdelivr.net/npm/vue@^3.2"></script>
   <script src="https://cdn.jsdelivr.net/npm/vue-router@4.0.11"></script>
   <script src="https://cdn.jsdelivr.net/npm/vuex@^4.0.0-0"></script>
-
   <script src="/node_modules/element-plus/dist/index.full.min.js"></script>
   <script src="/node_modules/axios/dist/axios.min.js"></script>
+  <script type="application/javascript" src="js/login-canvas.js"></script>
 </head>
 <body>
 <noscript>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crawlab-ui",
-  "version": "0.6.3-8",
+  "version": "0.6.3-11",
   "private": false,
   "author": {
     "name": "Marvin Zhang",
@@ -61,55 +61,53 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@fortawesome/fontawesome-common-types": "^6.1.0",
-    "@fortawesome/fontawesome-svg-core": "^6.1.0",
-    "@fortawesome/free-brands-svg-icons": "^6.1.0",
-    "@fortawesome/free-regular-svg-icons": "^6.1.0",
-    "@fortawesome/free-solid-svg-icons": "^6.1.0",
-    "@fortawesome/vue-fontawesome": "^3.0.0-5",
-    "@popperjs/core": "^2.6.0",
-    "@types/echarts": "^4.9.8",
-    "@types/getos": "^3.0.1",
-    "@types/humanize-duration": "^3.25.0",
-    "@types/javascript-time-ago": "^2.0.3",
-    "@types/md5": "^2.2.1",
-    "@types/pinyin": "^2.8.2",
-    "@types/showdown": "^1.9.4",
-    "@types/simplemde": "^1.11.8",
-    "@types/url-join": "^4.0.1",
+    "@fortawesome/fontawesome-common-types": "^6.5.2",
+    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/free-brands-svg-icons": "^6.5.2",
+    "@fortawesome/free-regular-svg-icons": "^6.5.2",
+    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "@fortawesome/vue-fontawesome": "^3.0.8",
+    "@popperjs/core": "^2.11.8",
+    "@types/echarts": "^4.9.22",
+    "@types/getos": "^3.0.4",
+    "@types/humanize-duration": "^3.27.4",
+    "@types/javascript-time-ago": "^2.0.8",
+    "@types/md5": "^2.3.5",
+    "@types/pinyin": "^2.10.2",
+    "@types/showdown": "^2.0.6",
+    "@types/simplemde": "^1.11.11",
+    "@types/url-join": "^4.0.3",
     "async-validator": "^4.2.5",
     "atom-material-icons": "^3.0.0",
     "axios": "^1.7.2",
-    "core-js": "^3.6.5",
+    "core-js": "^3.37.1",
     "crawlab-vue3-dropzone": "3.0.3",
-    "cron-parser": "^3.5.0",
-    "cronstrue": "^1.114.0",
-    "dayjs": "^1.10.5",
-    "echarts": "^5.3.2",
-    "element-plus": "^2.7.5",
-    "file-selector": "^0.6.0",
+    "cron-parser": "^4.9.0",
+    "cronstrue": "^2.50.0",
+    "dayjs": "^1.11.11",
+    "echarts": "^5.5.0",
+    "element-plus": "^2.7.6",
     "font-awesome": "^4.7.0",
-    "humanize-duration": "^3.26.0",
-    "javascript-time-ago": "^2.3.13",
+    "humanize-duration": "^3.32.1",
+    "javascript-time-ago": "^2.5.10",
     "md5": "^2.3.0",
-    "monaco-editor": "^0.48.0",
+    "monaco-editor": "^0.50.0",
     "normalize.css": "^8.0.1",
     "os-name": "^5.0.1",
     "pinyin": "^2.10.2",
     "point-cluster": "^3.1.8",
-    "showdown": "^1.9.1",
+    "showdown": "^2.1.0",
     "simplemde": "^1.11.2",
     "url-join": "^4.0.1",
     "vue": "^3.3",
     "vue-clipboard3": "^2.0.0",
-    "vue-debounce": "^4.0.0",
     "vue-i18n": "9.13.1",
-    "vue-router": "4.0.11",
-    "vuex": "^4.0.0-0"
+    "vue-router": "4.4.0",
+    "vuex": "^4.1.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.6",
+    "@types/node": "^20.14.8",
     "@types/node-os-utils": "^1.3.4",
     "@vitejs/plugin-vue": "5.0.5",
     "@vue/cli-plugin-babel": "^5.0.8",