Merge pull request #7336 from nocodb/develop

package.json

@@ -46,7 +46,7 @@
   },
   "pnpm": {
     "overrides": {
-      "vue": "latest",
+      "vue": "3.3.13",
       "typescript": "latest"
     }
   }

packages/nc-gui/package.json

@@ -40,6 +40,13 @@
     "@ckpack/vue-color": "^1.5.0",
     "@iconify/vue": "^4.1.1",
     "@pinia/nuxt": "^0.4.11",
+    "@tiptap/extension-link": "2.0.4",
+    "@tiptap/extension-task-list": "2.0.4",
+    "@tiptap/extension-underline": "^2.1.13",
+    "@tiptap/html": "2.0.4",
+    "@tiptap/pm": "^2.1.13",
+    "@tiptap/starter-kit": "^2.1.13",
+    "@tiptap/vue-3": "2.0.4",
     "@vue-flow/additional-components": "^1.3.3",
     "@vue-flow/core": "^1.26.0",
     "@vuelidate/core": "^2.0.3",
@@ -63,9 +70,10 @@
     "leaflet": "^1.9.4",
     "leaflet.markercluster": "^1.5.3",
     "locale-codes": "^1.3.1",
+    "marked": "^4.3.0",
     "monaco-editor": "^0.33.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "0.203.1",
+    "nocodb-sdk": "workspace:^",
     "papaparse": "^5.4.1",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.7",
@@ -76,6 +84,7 @@
     "sortablejs": "^1.15.1",
     "splitpanes": "^3.1.5",
     "tinycolor2": "^1.4.2",
+    "turndown": "^7.1.2",
     "unique-names-generator": "^4.7.1",
     "v3-infinite-loading": "^1.2.2",
     "validator": "^13.7.0",
@@ -90,16 +99,7 @@
     "vue3-grid-layout-next": "^1.0.6",
     "vue3-text-clamp": "^0.1.2",
     "vuedraggable": "^4.1.0",
-    "xlsx": "^0.18.5",
+    "xlsx": "^0.18.5"
-    "@tiptap/extension-link": "2.0.4",
-    "@tiptap/extension-task-list": "2.0.4",
-    "@tiptap/extension-underline": "^2.1.13",
-    "@tiptap/html": "2.0.4",
-    "@tiptap/pm": "^2.1.13",
-    "@tiptap/starter-kit": "^2.1.13",
-    "marked": "^4.3.0",
-    "turndown": "^7.1.2",
-    "@tiptap/vue-3": "2.0.4"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.26.3",
@@ -138,9 +138,9 @@
     "@types/sortablejs": "^1.13.0",
     "@types/splitpanes": "^2.2.6",
     "@types/tinycolor2": "^1.4.6",
+    "@types/turndown": "^5.0.4",
     "@types/validator": "^13.11.7",
     "@types/vue-barcode-reader": "^0.0.3",
-    "@types/turndown": "^5.0.4",
     "@unocss/nuxt": "^0.51.13",
     "@vitest/ui": "^0.18.1",
     "@vue/compiler-sfc": "^3.3.13",

packages/nocodb/package.json

@@ -137,7 +137,7 @@
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.3.3",
-    "nocodb-sdk": "0.203.1",
+    "nocodb-sdk": "workspace:^",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.3",