Merge remote-tracking branch 'upstream/main'

ruibaby · Feb 21, 2024 · b2814c8 · b2814c8
2 parents e6a2990 + 698bc30
commit b2814c8
Show file tree

Hide file tree

Showing 5 changed files with 408 additions and 444 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -59,7 +59,7 @@
     "@halo-dev/console-shared": "workspace:*",
     "@halo-dev/richtext-editor": "workspace:*",
     "@tanstack/vue-query": "^4.29.1",
-    "@tiptap/extension-character-count": "^2.1.16",
+    "@tiptap/extension-character-count": "^2.2.3",
     "@uppy/core": "^3.8.0",
     "@uppy/dashboard": "^3.7.1",
     "@uppy/drag-drop": "^3.0.3",
@@ -74,7 +74,7 @@
     "@vueuse/integrations": "^10.5.0",
     "@vueuse/router": "^10.3.0",
     "@vueuse/shared": "^10.3.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.7",
     "codemirror": "^6.0.1",
     "colorjs.io": "^0.4.3",
     "cropperjs": "^1.5.13",

diff --git a/ui/packages/api-client/package.json b/ui/packages/api-client/package.json
@@ -53,7 +53,7 @@
   "devDependencies": {
     "@openapitools/openapi-generator-cli": "^2.5.2",
     "@types/node": "^18.13.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.7",
     "bumpp": "^8.2.1",
     "typescript": "^4.9.5",
     "unbuild": "^0.7.6",

diff --git a/ui/packages/editor/package.json b/ui/packages/editor/package.json
@@ -41,44 +41,44 @@
   },
   "dependencies": {
     "@ckpack/vue-color": "^1.5.0",
-    "@tiptap/core": "^2.1.16",
-    "@tiptap/extension-blockquote": "^2.1.16",
-    "@tiptap/extension-bold": "^2.1.16",
-    "@tiptap/extension-bullet-list": "^2.1.16",
-    "@tiptap/extension-code": "^2.1.16",
-    "@tiptap/extension-code-block": "^2.1.16",
-    "@tiptap/extension-code-block-lowlight": "^2.1.16",
-    "@tiptap/extension-color": "^2.1.16",
-    "@tiptap/extension-document": "^2.1.16",
-    "@tiptap/extension-dropcursor": "^2.1.16",
-    "@tiptap/extension-gapcursor": "^2.1.16",
-    "@tiptap/extension-hard-break": "^2.1.16",
-    "@tiptap/extension-heading": "^2.1.16",
-    "@tiptap/extension-highlight": "^2.1.16",
-    "@tiptap/extension-history": "^2.1.16",
-    "@tiptap/extension-horizontal-rule": "^2.1.16",
-    "@tiptap/extension-image": "^2.1.16",
-    "@tiptap/extension-italic": "^2.1.16",
-    "@tiptap/extension-link": "^2.1.16",
-    "@tiptap/extension-list-item": "^2.1.16",
-    "@tiptap/extension-list-keymap": "^2.1.16",
-    "@tiptap/extension-ordered-list": "^2.1.16",
-    "@tiptap/extension-paragraph": "^2.1.16",
-    "@tiptap/extension-placeholder": "^2.1.16",
-    "@tiptap/extension-strike": "^2.1.16",
-    "@tiptap/extension-subscript": "^2.1.16",
-    "@tiptap/extension-superscript": "^2.1.16",
+    "@tiptap/core": "^2.2.3",
+    "@tiptap/extension-blockquote": "^2.2.3",
+    "@tiptap/extension-bold": "^2.2.3",
+    "@tiptap/extension-bullet-list": "^2.2.3",
+    "@tiptap/extension-code": "^2.2.3",
+    "@tiptap/extension-code-block": "^2.2.3",
+    "@tiptap/extension-code-block-lowlight": "^2.2.3",
+    "@tiptap/extension-color": "^2.2.3",
+    "@tiptap/extension-document": "^2.2.3",
+    "@tiptap/extension-dropcursor": "^2.2.3",
+    "@tiptap/extension-gapcursor": "^2.2.3",
+    "@tiptap/extension-hard-break": "^2.2.3",
+    "@tiptap/extension-heading": "^2.2.3",
+    "@tiptap/extension-highlight": "^2.2.3",
+    "@tiptap/extension-history": "^2.2.3",
+    "@tiptap/extension-horizontal-rule": "^2.2.3",
+    "@tiptap/extension-image": "^2.2.3",
+    "@tiptap/extension-italic": "^2.2.3",
+    "@tiptap/extension-link": "^2.2.3",
+    "@tiptap/extension-list-item": "^2.2.3",
+    "@tiptap/extension-list-keymap": "^2.2.3",
+    "@tiptap/extension-ordered-list": "^2.2.3",
+    "@tiptap/extension-paragraph": "^2.2.3",
+    "@tiptap/extension-placeholder": "^2.2.3",
+    "@tiptap/extension-strike": "^2.2.3",
+    "@tiptap/extension-subscript": "^2.2.3",
+    "@tiptap/extension-superscript": "^2.2.3",
     "@tiptap/extension-table": "2.2.0-rc.8",
-    "@tiptap/extension-table-row": "^2.1.16",
-    "@tiptap/extension-task-item": "^2.1.16",
-    "@tiptap/extension-task-list": "^2.1.16",
-    "@tiptap/extension-text": "^2.1.16",
-    "@tiptap/extension-text-align": "^2.1.16",
-    "@tiptap/extension-text-style": "^2.1.16",
-    "@tiptap/extension-underline": "^2.1.16",
-    "@tiptap/pm": "^2.1.16",
-    "@tiptap/suggestion": "^2.1.16",
-    "@tiptap/vue-3": "^2.1.16",
+    "@tiptap/extension-table-row": "^2.2.3",
+    "@tiptap/extension-task-item": "^2.2.3",
+    "@tiptap/extension-task-list": "^2.2.3",
+    "@tiptap/extension-text": "^2.2.3",
+    "@tiptap/extension-text-align": "^2.2.3",
+    "@tiptap/extension-text-style": "^2.2.3",
+    "@tiptap/extension-underline": "^2.2.3",
+    "@tiptap/pm": "^2.2.3",
+    "@tiptap/suggestion": "^2.2.3",
+    "@tiptap/vue-3": "^2.2.3",
     "floating-vue": "2.0.0-beta.24",
     "github-markdown-css": "^5.2.0",
     "highlight.js": "11.8.0",