Skip to content

Commit

Permalink
Post-release master to develop sync (#7862)
Browse files Browse the repository at this point in the history
* [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>
  • Loading branch information
3 people committed Mar 14, 2024
1 parent 2899d95 commit b0c1f1e
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion packages/nc-gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,4 @@
"vitest": "^1.2.2",
"windicss": "^3.5.6"
}
}
}
2 changes: 1 addition & 1 deletion packages/nc-lib-gui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nc-lib-gui",
"version": "0.204.4",
"version": "0.204.5",
"description": "NocoDB GUI",
"author": {
"name": "NocoDB",
Expand Down
2 changes: 1 addition & 1 deletion packages/nocodb-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nocodb-sdk",
"version": "0.204.4",
"version": "0.204.5",
"description": "NocoDB SDK",
"main": "build/main/index.js",
"typings": "build/main/index.d.ts",
Expand Down
13 changes: 9 additions & 4 deletions packages/nocodb-sdk/src/lib/Api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2147,6 +2147,8 @@ export interface ProjectReqType {
type?: 'database' | 'documentation' | 'dashboard';
/** List of Linked Database Base IDs (only used for Dashboard Projects so far) */
linked_db_project_ids?: string[];
/** Base Meta */
meta?: MetaType;
}

/**
Expand Down Expand Up @@ -2184,10 +2186,7 @@ export interface ProjectUpdateReqType {
* Model for Base User Request
*/
export interface ProjectUserReqType {
/**
* Base User Email
* @format email
*/
/** Base User Email */
email: string;
/** Base User Role */
roles:
Expand Down Expand Up @@ -7723,6 +7722,8 @@ export class Api<
sortArrJson?: string;
/** Used for multiple filter queries */
filterArrJson?: string;
/** Comma separated list of pks */
pks?: string;
},
params: RequestParams = {}
) =>
Expand Down Expand Up @@ -9214,6 +9215,8 @@ export class Api<
sortArrJson?: string;
/** Used for multiple filter queries */
filterArrJson?: string;
/** Comma separated list of pks */
pks?: string;
},
params: RequestParams = {}
) =>
Expand Down Expand Up @@ -11028,6 +11031,8 @@ export class Api<
sortArrJson?: string;
/** Used for multiple filter queries */
filterArrJson?: string;
/** Comma separated list of pks */
pks?: string;
},
params: RequestParams = {}
) =>
Expand Down
4 changes: 2 additions & 2 deletions packages/nocodb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.204.4",
"version": "0.204.5",
"description": "NocoDB Backend",
"main": "dist/bundle.js",
"author": {
Expand Down Expand Up @@ -132,7 +132,7 @@
"mysql2": "^3.9.2",
"nanoid": "^3.3.7",
"nc-help": "0.3.1",
"nc-lib-gui": "0.204.4",
"nc-lib-gui": "0.204.5",
"nc-plugin": "^0.1.3",
"ncp": "^2.0.0",
"nestjs-kafka": "^1.0.6",
Expand Down
17 changes: 9 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/pkg-executable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"nocodb": "0.204.4"
},
"overrides": {
"sqlite3": "5.1.7"
"sqlite3": "5.1.6"
},
"devDependencies": {
"@mapbox/node-pre-gyp": "^1.0.11"
Expand Down

0 comments on commit b0c1f1e

Please sign in to comment.