Skip to content

feat!: update knex major and other dependencies #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhoncool merged 1 commit into from
Sep 19, 2024
Merged

feat!: update knex major and other dependencies #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .husky/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx commitlint -e
3 changes: 0 additions & 3 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx nano-staged
3,226 changes: 2,095 additions & 1,131 deletions examples/demo/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions examples/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@
"author": "Gravity UI Team",
"license": "MIT",
"devDependencies": {
"@gravity-ui/eslint-config": "^2.0.0",
"@gravity-ui/prettier-config": "^1.0.1",
"@gravity-ui/eslint-config": "^3.2.0",
"@gravity-ui/prettier-config": "^1.1.0",
"@gravity-ui/tsconfig": "^1.0.0",
"@types/node": "^18.16.16",
"eslint": "^8.41.0",
"husky": "^8.0.3",
"prettier": "^2.8.8",
"eslint": "^8.56.0",
"husky": "^9.1.6",
"prettier": "^3.3.3",
"tsc-watch": "^5.0.3",
"typescript": "^5.1.3"
"typescript": "^5.6.2"
},
"dependencies": {
"@gravity-ui/expresskit": "^0.3.0",
"@gravity-ui/nodekit": "^0.2.0",
"@gravity-ui/expresskit": "^1.4.0",
"@gravity-ui/nodekit": "^1.4.0",
"@gravity-ui/postgreskit": "file:../../",
"axios": "^0.21.4"
"axios": "^1.7.7",
"knex": "^3.1.0"
}
}
10 changes: 1 addition & 9 deletions lib/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Model} from 'objection';

import {defaultDispatcherOptions, defaultExLogger, defaultKnexOptions} from './constants';
import {PGDispatcher} from './dispatcher';
import type {ExLogger} from './types';
import type {BaseModel, ExLogger} from './types';

export interface CoreDBDispatcherOptions {
healthcheckInterval?: number;
Expand All @@ -20,14 +20,6 @@ export interface CoreDBConstructorArgs {
logger?: ExLogger;
}

declare class BaseModel extends Model {
static set db(value: PGDispatcher);
static get primary(): InstanceType<typeof PGDispatcher>['primary'];
get primary(): InstanceType<typeof PGDispatcher>['primary'];
static get replica(): InstanceType<typeof PGDispatcher>['replica'];
get replica(): InstanceType<typeof PGDispatcher>['replica'];
}

export function getModel(): typeof BaseModel {
let _db: PGDispatcher;

Expand Down
11 changes: 11 additions & 0 deletions lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import type {Model} from 'objection';
import type {PGDispatcher} from './dispatcher';

export interface PDOptions {
healthcheckInterval: number;
healthcheckTimeout: number;
Expand All @@ -19,3 +22,11 @@ export interface ExLogger {
info: ExInfoLogger;
error: ExErrorLogger;
}

export declare class BaseModel extends Model {
static set db(value: PGDispatcher);
static get primary(): InstanceType<typeof PGDispatcher>['primary'];
get primary(): InstanceType<typeof PGDispatcher>['primary'];
static get replica(): InstanceType<typeof PGDispatcher>['replica'];
get replica(): InstanceType<typeof PGDispatcher>['replica'];
}
Loading