github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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
pull/7908/head
Pranav C 5 months ago
parent
6b7612770a b5b36f8e11
commit
27a21711cc
6 changed files with 27 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      packages/nc-gui/package.json
  2. 2
      packages/nc-lib-gui/package.json
  3. 2
      packages/nocodb-sdk/package.json
  4. 22
      packages/nocodb/package.json
  5. 20
      pnpm-lock.yaml
  6. 2
      scripts/pkg-executable/package.json

2
packages/nc-gui/package.json
Unescape View File

@ -75,7 +75,7 @@
"marked": "^4.3.0", "marked": "^4.3.0",
"monaco-editor": "^0.45.0", "monaco-editor": "^0.45.0",
"monaco-sql-languages": "^0.11.0", "monaco-sql-languages": "^0.11.0",
"nocodb-sdk": "workspace:^", "nocodb-sdk": "0.204.6",
"papaparse": "^5.4.1", "papaparse": "^5.4.1",
"parse-github-url": "^1.0.2", "parse-github-url": "^1.0.2",
"pinia": "^2.1.7", "pinia": "^2.1.7",

2
packages/nc-lib-gui/package.json
Unescape View File

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

2
packages/nocodb-sdk/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "nocodb-sdk", "name": "nocodb-sdk",
"version": "0.204.5", "version": "0.204.6",
"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",

22
packages/nocodb/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "nocodb", "name": "nocodb",
"version": "0.204.5", "version": "0.204.6",
"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.4", "@nestjs/common": "^10.3.3",
"@nestjs/config": "^3.1.1", "@nestjs/config": "^3.1.1",
"@nestjs/core": "^10.3.4", "@nestjs/core": "^10.3.3",
"@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.4", "@nestjs/platform-express": "^10.3.3",
"@nestjs/platform-socket.io": "^10.3.4", "@nestjs/platform-socket.io": "^10.3.3",
"@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.4", "@nestjs/websockets": "^10.3.3",
"@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.13", "@types/chai": "^4.3.12",
"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.8", "axios": "^1.6.7",
"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,12 +132,12 @@
"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.5", "nc-lib-gui": "0.204.6",
"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.3", "nestjs-throttler-storage-redis": "^0.4.2",
"nocodb-sdk": "workspace:^", "nocodb-sdk": "0.204.6",
"nodemailer": "^6.9.12", "nodemailer": "^6.9.12",
"object-hash": "^3.0.0", "object-hash": "^3.0.0",
"object-sizeof": "^2.6.4", "object-sizeof": "^2.6.4",

20
pnpm-lock.yaml
Unescape View File

@ -154,7 +154,7 @@ importers:
specifier: ^0.11.0 specifier: ^0.11.0
version: 0.11.0 version: 0.11.0
nocodb-sdk: nocodb-sdk:
specifier: workspace:^ specifier: 0.204.6
version: link:../nocodb-sdk version: link:../nocodb-sdk
papaparse: papaparse:
specifier: ^5.4.1 specifier: ^5.4.1
@ -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.5 specifier: 0.204.6
version: 0.204.5 version: 0.204.6
nc-plugin: nc-plugin:
specifier: ^0.1.3 specifier: ^0.1.3
version: 0.1.3 version: 0.1.3
@ -701,7 +701,7 @@ importers:
specifier: ^0.4.3 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: 0.204.6
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.23.9)(jest@29.7.0)(typescript@5.3.2) version: 29.1.2(@babel/core@7.23.7)(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.23.9)(jest@29.7.0)(typescript@5.3.2) version: 29.1.2(@babel/core@7.23.7)(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
@ -20252,8 +20252,8 @@ packages:
- supports-color - supports-color
dev: false dev: false
/nc-lib-gui@0.204.5: /nc-lib-gui@0.204.6:
resolution: {integrity: sha512-n9g9VIcVPadCCdEYpyyMMKBJ/INklLujXHuXe+PhQClN3Ktxcr3ozDENVbnGvCVLaadsImA5nbNlulIgXsJVaw==} resolution: {integrity: sha512-QjKfHKV5ziG5rF9LNIEcP1jTHKepBR/ADgFGe2WubxOvxCI7J0eWIsKZsHu8/wrmhtd2zAD6cNhN2dyBg6tCxA==}
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.23.9)(jest@29.7.0)(typescript@5.3.2): /ts-jest@29.1.2(@babel/core@7.23.7)(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.23.9 '@babel/core': 7.23.7
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)

2
scripts/pkg-executable/package.json
Unescape View File

@ -33,7 +33,7 @@
"nocodb": "0.204.5" "nocodb": "0.204.5"
}, },
"overrides": { "overrides": {
"sqlite3": "5.1.7" "sqlite3": "5.1.6"
}, },
"devDependencies": { "devDependencies": {
"@mapbox/node-pre-gyp": "^1.0.11" "@mapbox/node-pre-gyp": "^1.0.11"

Write Preview
Loading…
Cancel
Save