Browse Source

Merge branch 'master' into develop

pull/7409/head
GitHub Nightly Merge Action 10 months ago
parent
commit
50b3ca54f0
  1. 2
      packages/nc-gui/package.json
  2. 2
      packages/nc-lib-gui/package.json
  3. 2
      packages/nocodb-sdk/package.json
  4. 14
      packages/nocodb-sdk/pnpm-lock.yaml
  5. 5
      packages/nocodb-sdk/src/lib/Api.ts
  6. 8
      packages/nocodb/package.json
  7. 12
      pnpm-lock.yaml

2
packages/nc-gui/package.json

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

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

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

2
packages/nocodb-sdk/package.json

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

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

@ -6,8 +6,8 @@ settings:
dependencies:
axios:
specifier: ^1.6.3
version: 1.6.3
specifier: ^1.6.5
version: 1.6.5
dayjs:
specifier: ^1.11.10
version: 1.11.10
@ -1388,10 +1388,10 @@ packages:
engines: {node: '>= 0.4'}
dev: true
/axios@1.6.3:
resolution: {integrity: sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==}
/axios@1.6.5:
resolution: {integrity: sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==}
dependencies:
follow-redirects: 1.15.3
follow-redirects: 1.15.4
form-data: 4.0.0
proxy-from-env: 1.1.0
transitivePeerDependencies:
@ -2414,8 +2414,8 @@ packages:
resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==}
dev: true
/follow-redirects@1.15.3:
resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==}
/follow-redirects@1.15.4:
resolution: {integrity: sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==}
engines: {node: '>=4.0'}
peerDependencies:
debug: '*'

5
packages/nocodb-sdk/src/lib/Api.ts

@ -1816,6 +1816,11 @@ export interface PaginatedType {
* @example 1
*/
page?: number;
/**
* The current offset and it will be present only when the page is not included
* @example 1
*/
offset?: number;
/**
* The number of pages
* @example 10

8
packages/nocodb/package.json

@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.203.2",
"version": "0.204.0",
"description": "NocoDB Backend",
"main": "dist/bundle.js",
"author": {
@ -132,12 +132,12 @@
"mysql2": "^3.6.5",
"nanoid": "^3.1.20",
"nc-help": "0.3.1",
"nc-lib-gui": "0.203.2",
"nc-lib-gui": "0.204.0",
"nc-plugin": "^0.1.3",
"ncp": "^2.0.0",
"nestjs-kafka": "^1.0.6",
"nestjs-throttler-storage-redis": "^0.3.3",
"nocodb-sdk": "workspace:^",
"nocodb-sdk": "0.204.0",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"object-sizeof": "^2.6.3",
@ -229,4 +229,4 @@
"coverageDirectory": "../coverage",
"testEnvironment": "node"
}
}
}

12
pnpm-lock.yaml

@ -139,7 +139,7 @@ importers:
specifier: ^0.11.0
version: 0.11.0
nocodb-sdk:
specifier: workspace:^
specifier: 0.204.0
version: link:../nocodb-sdk
papaparse:
specifier: ^5.4.1
@ -671,8 +671,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.203.2
version: 0.203.2
specifier: 0.204.0
version: 0.204.0
nc-plugin:
specifier: ^0.1.3
version: 0.1.3
@ -686,7 +686,7 @@ importers:
specifier: ^0.3.3
version: 0.3.3(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)(@nestjs/throttler@4.2.1)(ioredis@5.3.2)(reflect-metadata@0.1.14)
nocodb-sdk:
specifier: workspace:^
specifier: 0.204.0
version: link:../nocodb-sdk
nodemailer:
specifier: ^6.4.10
@ -20906,8 +20906,8 @@ packages:
- supports-color
dev: false
/nc-lib-gui@0.203.2:
resolution: {integrity: sha512-SOSzDJbeymW96DQB4yXmf/d+4rSAx0JzEGB6UG/wHL+awyQ5igcblTOfyELYhwckNqvqAkue3XSl0qXAoFFvsA==}
/nc-lib-gui@0.204.0:
resolution: {integrity: sha512-NVkgdBp1DlJ2mXhTS9SHHIa3BMYf2+qlVRRXlC0yZem2auqpMHqyRkSe/ReVMxpfE2zw/ciTEWqhEnL24ya6lw==}
dependencies:
express: 4.18.2
transitivePeerDependencies:

Loading…
Cancel
Save