Browse Source

Post-release master to develop sync (#7862)

* [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>

* 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/7865/head
Pranav C 8 months ago committed by GitHub
parent
commit
b0c1f1e1c7
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. 13
      packages/nocodb-sdk/src/lib/Api.ts
  4. 4
      packages/nocodb/package.json
  5. 17
      pnpm-lock.yaml
  6. 2
      scripts/pkg-executable/package.json

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

@ -1,6 +1,6 @@
{ {
"name": "nc-lib-gui", "name": "nc-lib-gui",
"version": "0.204.4", "version": "0.204.5",
"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.4", "version": "0.204.5",
"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",

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

@ -2147,6 +2147,8 @@ export interface ProjectReqType {
type?: 'database' | 'documentation' | 'dashboard'; type?: 'database' | 'documentation' | 'dashboard';
/** List of Linked Database Base IDs (only used for Dashboard Projects so far) */ /** List of Linked Database Base IDs (only used for Dashboard Projects so far) */
linked_db_project_ids?: string[]; linked_db_project_ids?: string[];
/** Base Meta */
meta?: MetaType;
} }
/** /**
@ -2184,10 +2186,7 @@ export interface ProjectUpdateReqType {
* Model for Base User Request * Model for Base User Request
*/ */
export interface ProjectUserReqType { export interface ProjectUserReqType {
/** /** Base User Email */
* Base User Email
* @format email
*/
email: string; email: string;
/** Base User Role */ /** Base User Role */
roles: roles:
@ -7723,6 +7722,8 @@ export class Api<
sortArrJson?: string; sortArrJson?: string;
/** Used for multiple filter queries */ /** Used for multiple filter queries */
filterArrJson?: string; filterArrJson?: string;
/** Comma separated list of pks */
pks?: string;
}, },
params: RequestParams = {} params: RequestParams = {}
) => ) =>
@ -9214,6 +9215,8 @@ export class Api<
sortArrJson?: string; sortArrJson?: string;
/** Used for multiple filter queries */ /** Used for multiple filter queries */
filterArrJson?: string; filterArrJson?: string;
/** Comma separated list of pks */
pks?: string;
}, },
params: RequestParams = {} params: RequestParams = {}
) => ) =>
@ -11028,6 +11031,8 @@ export class Api<
sortArrJson?: string; sortArrJson?: string;
/** Used for multiple filter queries */ /** Used for multiple filter queries */
filterArrJson?: string; filterArrJson?: string;
/** Comma separated list of pks */
pks?: string;
}, },
params: RequestParams = {} params: RequestParams = {}
) => ) =>

4
packages/nocodb/package.json

@ -1,6 +1,6 @@
{ {
"name": "nocodb", "name": "nocodb",
"version": "0.204.4", "version": "0.204.5",
"description": "NocoDB Backend", "description": "NocoDB Backend",
"main": "dist/bundle.js", "main": "dist/bundle.js",
"author": { "author": {
@ -132,7 +132,7 @@
"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.4", "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",

17
pnpm-lock.yaml

@ -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.4 specifier: 0.204.5
version: 0.204.4 version: 0.204.5
nc-plugin: nc-plugin:
specifier: ^0.1.3 specifier: ^0.1.3
version: 0.1.3 version: 0.1.3
@ -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
@ -17311,6 +17311,7 @@ packages:
/ip@2.0.1: /ip@2.0.1:
resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==} resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==}
requiresBuild: true
/ipaddr.js@1.9.1: /ipaddr.js@1.9.1:
resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
@ -20256,8 +20257,8 @@ packages:
- supports-color - supports-color
dev: false dev: false
/nc-lib-gui@0.204.4: /nc-lib-gui@0.204.5:
resolution: {integrity: sha512-zLTGOpx3s9bPOa5AxHxDflfYdo08OaiYCvgvLnT9+XZSBDw+xCt/HBcvOQQ8TjjNYbg3KISdEkNDeiIt33pLNA==} resolution: {integrity: sha512-n9g9VIcVPadCCdEYpyyMMKBJ/INklLujXHuXe+PhQClN3Ktxcr3ozDENVbnGvCVLaadsImA5nbNlulIgXsJVaw==}
dependencies: dependencies:
express: 4.18.3 express: 4.18.3
transitivePeerDependencies: transitivePeerDependencies:
@ -25009,7 +25010,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
@ -25030,7 +25031,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.25)(ts-node@10.9.2) jest: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)

2
scripts/pkg-executable/package.json

@ -33,7 +33,7 @@
"nocodb": "0.204.4" "nocodb": "0.204.4"
}, },
"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"

Loading…
Cancel
Save