Skip to content

Commit b2814c8

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents e6a2990 + 698bc30 commit b2814c8

File tree

5 files changed

+408
-444
lines changed

5 files changed

+408
-444
lines changed

ui/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@halo-dev/console-shared": "workspace:*",
6060
"@halo-dev/richtext-editor": "workspace:*",
6161
"@tanstack/vue-query": "^4.29.1",
62-
"@tiptap/extension-character-count": "^2.1.16",
62+
"@tiptap/extension-character-count": "^2.2.3",
6363
"@uppy/core": "^3.8.0",
6464
"@uppy/dashboard": "^3.7.1",
6565
"@uppy/drag-drop": "^3.0.3",
@@ -74,7 +74,7 @@
7474
"@vueuse/integrations": "^10.5.0",
7575
"@vueuse/router": "^10.3.0",
7676
"@vueuse/shared": "^10.3.0",
77-
"axios": "^0.27.2",
77+
"axios": "^1.6.7",
7878
"codemirror": "^6.0.1",
7979
"colorjs.io": "^0.4.3",
8080
"cropperjs": "^1.5.13",

ui/packages/api-client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"devDependencies": {
5454
"@openapitools/openapi-generator-cli": "^2.5.2",
5555
"@types/node": "^18.13.0",
56-
"axios": "^0.27.2",
56+
"axios": "^1.6.7",
5757
"bumpp": "^8.2.1",
5858
"typescript": "^4.9.5",
5959
"unbuild": "^0.7.6",

ui/packages/editor/package.json

+37-37
Original file line numberDiff line numberDiff line change
@@ -41,44 +41,44 @@
4141
},
4242
"dependencies": {
4343
"@ckpack/vue-color": "^1.5.0",
44-
"@tiptap/core": "^2.1.16",
45-
"@tiptap/extension-blockquote": "^2.1.16",
46-
"@tiptap/extension-bold": "^2.1.16",
47-
"@tiptap/extension-bullet-list": "^2.1.16",
48-
"@tiptap/extension-code": "^2.1.16",
49-
"@tiptap/extension-code-block": "^2.1.16",
50-
"@tiptap/extension-code-block-lowlight": "^2.1.16",
51-
"@tiptap/extension-color": "^2.1.16",
52-
"@tiptap/extension-document": "^2.1.16",
53-
"@tiptap/extension-dropcursor": "^2.1.16",
54-
"@tiptap/extension-gapcursor": "^2.1.16",
55-
"@tiptap/extension-hard-break": "^2.1.16",
56-
"@tiptap/extension-heading": "^2.1.16",
57-
"@tiptap/extension-highlight": "^2.1.16",
58-
"@tiptap/extension-history": "^2.1.16",
59-
"@tiptap/extension-horizontal-rule": "^2.1.16",
60-
"@tiptap/extension-image": "^2.1.16",
61-
"@tiptap/extension-italic": "^2.1.16",
62-
"@tiptap/extension-link": "^2.1.16",
63-
"@tiptap/extension-list-item": "^2.1.16",
64-
"@tiptap/extension-list-keymap": "^2.1.16",
65-
"@tiptap/extension-ordered-list": "^2.1.16",
66-
"@tiptap/extension-paragraph": "^2.1.16",
67-
"@tiptap/extension-placeholder": "^2.1.16",
68-
"@tiptap/extension-strike": "^2.1.16",
69-
"@tiptap/extension-subscript": "^2.1.16",
70-
"@tiptap/extension-superscript": "^2.1.16",
44+
"@tiptap/core": "^2.2.3",
45+
"@tiptap/extension-blockquote": "^2.2.3",
46+
"@tiptap/extension-bold": "^2.2.3",
47+
"@tiptap/extension-bullet-list": "^2.2.3",
48+
"@tiptap/extension-code": "^2.2.3",
49+
"@tiptap/extension-code-block": "^2.2.3",
50+
"@tiptap/extension-code-block-lowlight": "^2.2.3",
51+
"@tiptap/extension-color": "^2.2.3",
52+
"@tiptap/extension-document": "^2.2.3",
53+
"@tiptap/extension-dropcursor": "^2.2.3",
54+
"@tiptap/extension-gapcursor": "^2.2.3",
55+
"@tiptap/extension-hard-break": "^2.2.3",
56+
"@tiptap/extension-heading": "^2.2.3",
57+
"@tiptap/extension-highlight": "^2.2.3",
58+
"@tiptap/extension-history": "^2.2.3",
59+
"@tiptap/extension-horizontal-rule": "^2.2.3",
60+
"@tiptap/extension-image": "^2.2.3",
61+
"@tiptap/extension-italic": "^2.2.3",
62+
"@tiptap/extension-link": "^2.2.3",
63+
"@tiptap/extension-list-item": "^2.2.3",
64+
"@tiptap/extension-list-keymap": "^2.2.3",
65+
"@tiptap/extension-ordered-list": "^2.2.3",
66+
"@tiptap/extension-paragraph": "^2.2.3",
67+
"@tiptap/extension-placeholder": "^2.2.3",
68+
"@tiptap/extension-strike": "^2.2.3",
69+
"@tiptap/extension-subscript": "^2.2.3",
70+
"@tiptap/extension-superscript": "^2.2.3",
7171
"@tiptap/extension-table": "2.2.0-rc.8",
72-
"@tiptap/extension-table-row": "^2.1.16",
73-
"@tiptap/extension-task-item": "^2.1.16",
74-
"@tiptap/extension-task-list": "^2.1.16",
75-
"@tiptap/extension-text": "^2.1.16",
76-
"@tiptap/extension-text-align": "^2.1.16",
77-
"@tiptap/extension-text-style": "^2.1.16",
78-
"@tiptap/extension-underline": "^2.1.16",
79-
"@tiptap/pm": "^2.1.16",
80-
"@tiptap/suggestion": "^2.1.16",
81-
"@tiptap/vue-3": "^2.1.16",
72+
"@tiptap/extension-table-row": "^2.2.3",
73+
"@tiptap/extension-task-item": "^2.2.3",
74+
"@tiptap/extension-task-list": "^2.2.3",
75+
"@tiptap/extension-text": "^2.2.3",
76+
"@tiptap/extension-text-align": "^2.2.3",
77+
"@tiptap/extension-text-style": "^2.2.3",
78+
"@tiptap/extension-underline": "^2.2.3",
79+
"@tiptap/pm": "^2.2.3",
80+
"@tiptap/suggestion": "^2.2.3",
81+
"@tiptap/vue-3": "^2.2.3",
8282
"floating-vue": "2.0.0-beta.24",
8383
"github-markdown-css": "^5.2.0",
8484
"highlight.js": "11.8.0",

0 commit comments

Comments
 (0)