Merge branch 'master' into pre-release

# Conflicts: # packages/nc-lib-gui/package.json # packages/nocodb-sdk/package.json # packages/nocodb/package.json # pnpm-lock.yaml
nocodb · Mar 19, 2024 · 27a2171 · 27a2171
2 parents 6b76127 + b5b36f8
commit 27a2171
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
@@ -75,7 +75,7 @@
     "marked": "^4.3.0",
     "monaco-editor": "^0.45.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "workspace:^",
+    "nocodb-sdk": "0.204.6",
     "papaparse": "^5.4.1",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.7",

diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nc-lib-gui",
-  "version": "0.204.5",
+  "version": "0.204.6",
   "description": "NocoDB GUI",
   "author": {
     "name": "NocoDB",
@@ -29,4 +29,4 @@
   "dependencies": {
     "express": "^4.17.1"
   }
-}
+}
diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.204.5",
+  "version": "0.204.6",
   "description": "NocoDB SDK",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
@@ -73,4 +73,4 @@
   "prettier": {
     "singleQuote": true
   }
-}
+}
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.204.5",
+  "version": "0.204.6",
   "description": "NocoDB Backend",
   "main": "dist/bundle.js",
   "author": {
@@ -53,30 +53,30 @@
     "@graphql-tools/merge": "^6.2.17",
     "@jm18457/kafkajs-msk-iam-authentication-mechanism": "^3.1.2",
     "@nestjs/bull": "^10.0.1",
-    "@nestjs/common": "^10.3.4",
+    "@nestjs/common": "^10.3.3",
     "@nestjs/config": "^3.1.1",
-    "@nestjs/core": "^10.3.4",
+    "@nestjs/core": "^10.3.3",
     "@nestjs/event-emitter": "^2.0.4",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/mapped-types": "^2.0.5",
     "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-express": "^10.3.4",
-    "@nestjs/platform-socket.io": "^10.3.4",
+    "@nestjs/platform-express": "^10.3.3",
+    "@nestjs/platform-socket.io": "^10.3.3",
     "@nestjs/serve-static": "^4.0.1",
     "@nestjs/throttler": "^5.1.2",
-    "@nestjs/websockets": "^10.3.4",
+    "@nestjs/websockets": "^10.3.3",
     "@ntegral/nestjs-sentry": "^4.0.1",
     "@sentry/node": "^6.19.7",
     "@techpass/passport-openidconnect": "^0.3.3",
-    "@types/chai": "^4.3.13",
+    "@types/chai": "^4.3.12",
     "airtable": "^0.12.2",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "archiver": "^5.3.2",
     "auto-bind": "^4.0.0",
     "aws-kcl": "^2.2.5",
     "aws-sdk": "^2.1550.0",
-    "axios": "^1.6.8",
+    "axios": "^1.6.7",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.2",
     "boxen": "^5.1.2",
@@ -132,12 +132,12 @@
     "mysql2": "^3.9.2",
     "nanoid": "^3.3.7",
     "nc-help": "0.3.1",
-    "nc-lib-gui": "0.204.5",
+    "nc-lib-gui": "0.204.6",
     "nc-plugin": "^0.1.3",
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
-    "nestjs-throttler-storage-redis": "^0.4.3",
-    "nocodb-sdk": "workspace:^",
+    "nestjs-throttler-storage-redis": "^0.4.2",
+    "nocodb-sdk": "0.204.6",
     "nodemailer": "^6.9.12",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json
@@ -33,7 +33,7 @@
     "nocodb": "0.204.5"
   },
   "overrides": {
-    "sqlite3": "5.1.7"
+    "sqlite3": "5.1.6"
   },
   "devDependencies": {
     "@mapbox/node-pre-gyp": "^1.0.11"