From 7ba5724385b2e634d7b16ea648232a7a394e12be Mon Sep 17 00:00:00 2001 From: Pranav C Date: Tue, 19 Mar 2024 20:09:05 +0530 Subject: [PATCH] Sync master with develop branch (#7909) * [create-pull-request] automated change Signed-off-by: GitHub * chore: downgrade sqlite version for executable Signed-off-by: Pranav C * [create-pull-request] automated change Signed-off-by: GitHub * chore: update sdk path Signed-off-by: Pranav C --------- Signed-off-by: GitHub Signed-off-by: Pranav C Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: pranavxc --- packages/nc-lib-gui/package.json | 4 ++-- packages/nocodb-sdk/package.json | 4 ++-- packages/nocodb/package.json | 20 ++++++++--------- pnpm-lock.yaml | 34 ++++++++++++++--------------- scripts/pkg-executable/package.json | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 2b7023e8d8..5131e2d43f 100644 --- 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" } -} \ No newline at end of file +} diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 1c0f909453..804d4d97fa 100644 --- 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 } -} \ No newline at end of file +} diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 1d7e1be0a8..4efdc0bb2c 100644 --- 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,22 +53,22 @@ "@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", @@ -76,7 +76,7 @@ "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,11 +132,11 @@ "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", + "nestjs-throttler-storage-redis": "^0.4.2", "nocodb-sdk": "workspace:^", "nodemailer": "^6.9.12", "object-hash": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 794ef8cd13..977d5e30d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -449,13 +449,13 @@ importers: specifier: ^10.0.1 version: 10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(bull@4.12.2) '@nestjs/common': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) '@nestjs/config': specifier: ^3.1.1 version: 3.1.1(@nestjs/common@10.3.4)(reflect-metadata@0.2.1) '@nestjs/core': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@nestjs/event-emitter': specifier: ^2.0.4 @@ -470,10 +470,10 @@ importers: specifier: ^10.0.3 version: 10.0.3(@nestjs/common@10.3.4)(passport@0.7.0) '@nestjs/platform-express': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) '@nestjs/platform-socket.io': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/websockets@10.3.4)(rxjs@7.8.1) '@nestjs/serve-static': specifier: ^4.0.1 @@ -482,7 +482,7 @@ importers: specifier: ^5.1.2 version: 5.1.2(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(reflect-metadata@0.2.1) '@nestjs/websockets': - specifier: ^10.3.4 + specifier: ^10.3.3 version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-socket.io@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@ntegral/nestjs-sentry': specifier: ^4.0.1 @@ -494,7 +494,7 @@ importers: specifier: ^0.3.3 version: 0.3.3 '@types/chai': - specifier: ^4.3.13 + specifier: ^4.3.12 version: 4.3.13 airtable: specifier: ^0.12.2 @@ -518,7 +518,7 @@ importers: specifier: ^2.1550.0 version: 2.1555.0 axios: - specifier: ^1.6.8 + specifier: ^1.6.7 version: 1.6.8(debug@4.3.4) bcryptjs: specifier: ^2.4.3 @@ -686,8 +686,8 @@ importers: specifier: 0.3.1 version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2) nc-lib-gui: - specifier: 0.204.5 - version: 0.204.5 + specifier: 0.204.6 + version: 0.204.6 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -698,7 +698,7 @@ importers: specifier: ^1.0.6 version: 1.0.6(debug@4.3.4)(kafkajs@2.2.4)(reflect-metadata@0.2.1) nestjs-throttler-storage-redis: - specifier: ^0.4.3 + specifier: ^0.4.2 version: 0.4.3(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1) nocodb-sdk: specifier: workspace:^ @@ -901,7 +901,7 @@ importers: version: 6.3.4 ts-jest: specifier: 29.1.2 - version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2) + version: 29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2) ts-loader: specifier: ^9.5.1 version: 9.5.1(typescript@5.3.2)(webpack@5.90.3) @@ -971,7 +971,7 @@ importers: version: 5.0.5 ts-jest: specifier: ^29.1.2 - version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2) + version: 29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2) tsc-alias: specifier: ^1.8.8 version: 1.8.8 @@ -14648,7 +14648,7 @@ packages: dependencies: escape-string-regexp: 1.0.5 eslint: 8.33.0 - ignore: 5.3.1 + ignore: 5.3.0 dev: true /eslint-plugin-eslint-comments@3.2.0(eslint@8.56.0): @@ -20252,8 +20252,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.204.5: - resolution: {integrity: sha512-n9g9VIcVPadCCdEYpyyMMKBJ/INklLujXHuXe+PhQClN3Ktxcr3ozDENVbnGvCVLaadsImA5nbNlulIgXsJVaw==} + /nc-lib-gui@0.204.6: + resolution: {integrity: sha512-QjKfHKV5ziG5rF9LNIEcP1jTHKepBR/ADgFGe2WubxOvxCI7J0eWIsKZsHu8/wrmhtd2zAD6cNhN2dyBg6tCxA==} dependencies: express: 4.18.3 transitivePeerDependencies: @@ -25006,7 +25006,7 @@ packages: engines: {node: '>=14.0.0'} dev: false - /ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2): + /ts-jest@29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -25027,7 +25027,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.23.9 + '@babel/core': 7.24.0 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 29.7.0(@types/node@20.11.29)(ts-node@10.9.2) diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json index ccde8a3a98..985897cc31 100644 --- 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"