Browse Source

Post-release : Sync master with develop branch (#7918)

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: downgrade sqlite version for executable

Signed-off-by: Pranav C <pranavxc@gmail.com>

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* Sync master with develop branch (#7909)

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: downgrade sqlite version for executable

Signed-off-by: Pranav C <pranavxc@gmail.com>

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>

---------

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Pranav C <pranavxc@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pranavxc <pranavxc@users.noreply.github.com>

* chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>

* chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>

---------

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Pranav C <pranavxc@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pranavxc <pranavxc@users.noreply.github.com>
pull/7922/head
Pranav C 8 months ago committed by GitHub
parent
commit
028a11a6aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      packages/nc-lib-gui/package.json
  2. 2
      packages/nocodb-sdk/package.json
  3. 14
      packages/nocodb-sdk/pnpm-lock.yaml
  4. 20
      packages/nocodb/package.json
  5. 24
      pnpm-lock.yaml

2
packages/nc-lib-gui/package.json

@ -1,6 +1,6 @@
{ {
"name": "nc-lib-gui", "name": "nc-lib-gui",
"version": "0.204.6", "version": "0.204.7",
"description": "NocoDB GUI", "description": "NocoDB GUI",
"author": { "author": {
"name": "NocoDB", "name": "NocoDB",

2
packages/nocodb-sdk/package.json

@ -1,6 +1,6 @@
{ {
"name": "nocodb-sdk", "name": "nocodb-sdk",
"version": "0.204.6", "version": "0.204.7",
"description": "NocoDB SDK", "description": "NocoDB SDK",
"main": "build/main/index.js", "main": "build/main/index.js",
"typings": "build/main/index.d.ts", "typings": "build/main/index.d.ts",

14
packages/nocodb-sdk/pnpm-lock.yaml

@ -6,8 +6,8 @@ settings:
dependencies: dependencies:
axios: axios:
specifier: ^1.6.7 specifier: ^1.6.8
version: 1.6.7 version: 1.6.8
dayjs: dayjs:
specifier: ^1.11.10 specifier: ^1.11.10
version: 1.11.10 version: 1.11.10
@ -1389,10 +1389,10 @@ packages:
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
dev: true dev: true
/axios@1.6.7: /axios@1.6.8:
resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} resolution: {integrity: sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==}
dependencies: dependencies:
follow-redirects: 1.15.4 follow-redirects: 1.15.6
form-data: 4.0.0 form-data: 4.0.0
proxy-from-env: 1.1.0 proxy-from-env: 1.1.0
transitivePeerDependencies: transitivePeerDependencies:
@ -2415,8 +2415,8 @@ packages:
resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==}
dev: true dev: true
/follow-redirects@1.15.4: /follow-redirects@1.15.6:
resolution: {integrity: sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==} resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
engines: {node: '>=4.0'} engines: {node: '>=4.0'}
peerDependencies: peerDependencies:
debug: '*' debug: '*'

20
packages/nocodb/package.json

@ -1,6 +1,6 @@
{ {
"name": "nocodb", "name": "nocodb",
"version": "0.204.6", "version": "0.204.7",
"description": "NocoDB Backend", "description": "NocoDB Backend",
"main": "dist/bundle.js", "main": "dist/bundle.js",
"author": { "author": {
@ -53,22 +53,22 @@
"@graphql-tools/merge": "^6.2.17", "@graphql-tools/merge": "^6.2.17",
"@jm18457/kafkajs-msk-iam-authentication-mechanism": "^3.1.2", "@jm18457/kafkajs-msk-iam-authentication-mechanism": "^3.1.2",
"@nestjs/bull": "^10.0.1", "@nestjs/bull": "^10.0.1",
"@nestjs/common": "^10.3.3", "@nestjs/common": "^10.3.4",
"@nestjs/config": "^3.1.1", "@nestjs/config": "^3.1.1",
"@nestjs/core": "^10.3.3", "@nestjs/core": "^10.3.4",
"@nestjs/event-emitter": "^2.0.4", "@nestjs/event-emitter": "^2.0.4",
"@nestjs/jwt": "^10.2.0", "@nestjs/jwt": "^10.2.0",
"@nestjs/mapped-types": "^2.0.5", "@nestjs/mapped-types": "^2.0.5",
"@nestjs/passport": "^10.0.3", "@nestjs/passport": "^10.0.3",
"@nestjs/platform-express": "^10.3.3", "@nestjs/platform-express": "^10.3.4",
"@nestjs/platform-socket.io": "^10.3.3", "@nestjs/platform-socket.io": "^10.3.4",
"@nestjs/serve-static": "^4.0.1", "@nestjs/serve-static": "^4.0.1",
"@nestjs/throttler": "^5.1.2", "@nestjs/throttler": "^5.1.2",
"@nestjs/websockets": "^10.3.3", "@nestjs/websockets": "^10.3.4",
"@ntegral/nestjs-sentry": "^4.0.1", "@ntegral/nestjs-sentry": "^4.0.1",
"@sentry/node": "^6.19.7", "@sentry/node": "^6.19.7",
"@techpass/passport-openidconnect": "^0.3.3", "@techpass/passport-openidconnect": "^0.3.3",
"@types/chai": "^4.3.12", "@types/chai": "^4.3.13",
"airtable": "^0.12.2", "airtable": "^0.12.2",
"ajv": "^8.12.0", "ajv": "^8.12.0",
"ajv-formats": "^2.1.1", "ajv-formats": "^2.1.1",
@ -76,7 +76,7 @@
"auto-bind": "^4.0.0", "auto-bind": "^4.0.0",
"aws-kcl": "^2.2.5", "aws-kcl": "^2.2.5",
"aws-sdk": "^2.1550.0", "aws-sdk": "^2.1550.0",
"axios": "^1.6.7", "axios": "^1.6.8",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"body-parser": "^1.20.2", "body-parser": "^1.20.2",
"boxen": "^5.1.2", "boxen": "^5.1.2",
@ -132,11 +132,11 @@
"mysql2": "^3.9.2", "mysql2": "^3.9.2",
"nanoid": "^3.3.7", "nanoid": "^3.3.7",
"nc-help": "0.3.1", "nc-help": "0.3.1",
"nc-lib-gui": "0.204.6", "nc-lib-gui": "0.204.5",
"nc-plugin": "^0.1.3", "nc-plugin": "^0.1.3",
"ncp": "^2.0.0", "ncp": "^2.0.0",
"nestjs-kafka": "^1.0.6", "nestjs-kafka": "^1.0.6",
"nestjs-throttler-storage-redis": "^0.4.2", "nestjs-throttler-storage-redis": "^0.4.3",
"nocodb-sdk": "workspace:^", "nocodb-sdk": "workspace:^",
"nodemailer": "^6.9.12", "nodemailer": "^6.9.12",
"object-hash": "^3.0.0", "object-hash": "^3.0.0",

24
pnpm-lock.yaml

@ -449,13 +449,13 @@ importers:
specifier: ^10.0.1 specifier: ^10.0.1
version: 10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(bull@4.12.2) version: 10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(bull@4.12.2)
'@nestjs/common': '@nestjs/common':
specifier: ^10.3.3 specifier: ^10.3.4
version: 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) version: 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/config': '@nestjs/config':
specifier: ^3.1.1 specifier: ^3.1.1
version: 3.1.1(@nestjs/common@10.3.4)(reflect-metadata@0.2.1) version: 3.1.1(@nestjs/common@10.3.4)(reflect-metadata@0.2.1)
'@nestjs/core': '@nestjs/core':
specifier: ^10.3.3 specifier: ^10.3.4
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) 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': '@nestjs/event-emitter':
specifier: ^2.0.4 specifier: ^2.0.4
@ -470,10 +470,10 @@ importers:
specifier: ^10.0.3 specifier: ^10.0.3
version: 10.0.3(@nestjs/common@10.3.4)(passport@0.7.0) version: 10.0.3(@nestjs/common@10.3.4)(passport@0.7.0)
'@nestjs/platform-express': '@nestjs/platform-express':
specifier: ^10.3.3 specifier: ^10.3.4
version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)
'@nestjs/platform-socket.io': '@nestjs/platform-socket.io':
specifier: ^10.3.3 specifier: ^10.3.4
version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/websockets@10.3.4)(rxjs@7.8.1) version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/websockets@10.3.4)(rxjs@7.8.1)
'@nestjs/serve-static': '@nestjs/serve-static':
specifier: ^4.0.1 specifier: ^4.0.1
@ -482,7 +482,7 @@ importers:
specifier: ^5.1.2 specifier: ^5.1.2
version: 5.1.2(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(reflect-metadata@0.2.1) version: 5.1.2(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(reflect-metadata@0.2.1)
'@nestjs/websockets': '@nestjs/websockets':
specifier: ^10.3.3 specifier: ^10.3.4
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) 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': '@ntegral/nestjs-sentry':
specifier: ^4.0.1 specifier: ^4.0.1
@ -494,7 +494,7 @@ importers:
specifier: ^0.3.3 specifier: ^0.3.3
version: 0.3.3 version: 0.3.3
'@types/chai': '@types/chai':
specifier: ^4.3.12 specifier: ^4.3.13
version: 4.3.13 version: 4.3.13
airtable: airtable:
specifier: ^0.12.2 specifier: ^0.12.2
@ -518,7 +518,7 @@ importers:
specifier: ^2.1550.0 specifier: ^2.1550.0
version: 2.1555.0 version: 2.1555.0
axios: axios:
specifier: ^1.6.7 specifier: ^1.6.8
version: 1.6.8(debug@4.3.4) version: 1.6.8(debug@4.3.4)
bcryptjs: bcryptjs:
specifier: ^2.4.3 specifier: ^2.4.3
@ -686,8 +686,8 @@ importers:
specifier: 0.3.1 specifier: 0.3.1
version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2) version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2)
nc-lib-gui: nc-lib-gui:
specifier: 0.204.6 specifier: 0.204.5
version: 0.204.6 version: 0.204.5
nc-plugin: nc-plugin:
specifier: ^0.1.3 specifier: ^0.1.3
version: 0.1.3 version: 0.1.3
@ -698,7 +698,7 @@ importers:
specifier: ^1.0.6 specifier: ^1.0.6
version: 1.0.6(debug@4.3.4)(kafkajs@2.2.4)(reflect-metadata@0.2.1) version: 1.0.6(debug@4.3.4)(kafkajs@2.2.4)(reflect-metadata@0.2.1)
nestjs-throttler-storage-redis: nestjs-throttler-storage-redis:
specifier: ^0.4.2 specifier: ^0.4.3
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) 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: nocodb-sdk:
specifier: workspace:^ specifier: workspace:^
@ -20252,8 +20252,8 @@ packages:
- supports-color - supports-color
dev: false dev: false
/nc-lib-gui@0.204.6: /nc-lib-gui@0.204.5:
resolution: {integrity: sha512-QjKfHKV5ziG5rF9LNIEcP1jTHKepBR/ADgFGe2WubxOvxCI7J0eWIsKZsHu8/wrmhtd2zAD6cNhN2dyBg6tCxA==} resolution: {integrity: sha512-n9g9VIcVPadCCdEYpyyMMKBJ/INklLujXHuXe+PhQClN3Ktxcr3ozDENVbnGvCVLaadsImA5nbNlulIgXsJVaw==}
dependencies: dependencies:
express: 4.18.3 express: 4.18.3
transitivePeerDependencies: transitivePeerDependencies:

Loading…
Cancel
Save