Browse Source

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>
pull/7912/head
Pranav C 8 months ago
parent
commit
6fa953708f
  1. 2
      packages/nc-lib-gui/package.json
  2. 2
      packages/nocodb-sdk/package.json
  3. 2
      packages/nocodb/package.json
  4. 36
      pnpm-lock.yaml

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

@ -29,4 +29,4 @@
"dependencies": { "dependencies": {
"express": "^4.17.1" "express": "^4.17.1"
} }
} }

2
packages/nocodb-sdk/package.json

@ -73,4 +73,4 @@
"prettier": { "prettier": {
"singleQuote": true "singleQuote": true
} }
} }

2
packages/nocodb/package.json

@ -229,4 +229,4 @@
"coverageDirectory": "../coverage", "coverageDirectory": "../coverage",
"testEnvironment": "node" "testEnvironment": "node"
} }
} }

36
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.7 specifier: 0.204.5
version: 0.204.7 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,10 +698,10 @@ 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: 0.204.7 specifier: workspace:^
version: link:../nocodb-sdk version: link:../nocodb-sdk
nodemailer: nodemailer:
specifier: ^6.9.12 specifier: ^6.9.12
@ -901,7 +901,7 @@ importers:
version: 6.3.4 version: 6.3.4
ts-jest: ts-jest:
specifier: 29.1.2 specifier: 29.1.2
version: 29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2) version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2)
ts-loader: ts-loader:
specifier: ^9.5.1 specifier: ^9.5.1
version: 9.5.1(typescript@5.3.2)(webpack@5.90.3) version: 9.5.1(typescript@5.3.2)(webpack@5.90.3)
@ -971,7 +971,7 @@ importers:
version: 5.0.5 version: 5.0.5
ts-jest: ts-jest:
specifier: ^29.1.2 specifier: ^29.1.2
version: 29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2) version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2)
tsc-alias: tsc-alias:
specifier: ^1.8.8 specifier: ^1.8.8
version: 1.8.8 version: 1.8.8
@ -14648,7 +14648,7 @@ packages:
dependencies: dependencies:
escape-string-regexp: 1.0.5 escape-string-regexp: 1.0.5
eslint: 8.33.0 eslint: 8.33.0
ignore: 5.3.0 ignore: 5.3.1
dev: true dev: true
/eslint-plugin-eslint-comments@3.2.0(eslint@8.56.0): /eslint-plugin-eslint-comments@3.2.0(eslint@8.56.0):
@ -20252,8 +20252,8 @@ packages:
- supports-color - supports-color
dev: false dev: false
/nc-lib-gui@0.204.7: /nc-lib-gui@0.204.5:
resolution: {integrity: sha512-Lh6iV/Mq1Oy5pkLbt+3cGpyJLV7VVIURtFd3SwE8nxTslg/0lnWRat874IAHUXTybISdF5e+HU9Kdf/+m6L45A==} resolution: {integrity: sha512-n9g9VIcVPadCCdEYpyyMMKBJ/INklLujXHuXe+PhQClN3Ktxcr3ozDENVbnGvCVLaadsImA5nbNlulIgXsJVaw==}
dependencies: dependencies:
express: 4.18.3 express: 4.18.3
transitivePeerDependencies: transitivePeerDependencies:
@ -25006,7 +25006,7 @@ packages:
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
dev: false dev: false
/ts-jest@29.1.2(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.3.2): /ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2):
resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==}
engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}
hasBin: true hasBin: true
@ -25027,7 +25027,7 @@ packages:
esbuild: esbuild:
optional: true optional: true
dependencies: dependencies:
'@babel/core': 7.24.0 '@babel/core': 7.23.9
bs-logger: 0.2.6 bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0 fast-json-stable-stringify: 2.1.0
jest: 29.7.0(@types/node@20.11.29)(ts-node@10.9.2) jest: 29.7.0(@types/node@20.11.29)(ts-node@10.9.2)

Loading…
Cancel
Save