Skip to content
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

Jump to bottom

Upgrade typescript to 3.9 #18

Merged
merged 2 commits into from
May 13, 2020
Merged

Upgrade typescript to 3.9 #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc1efab
Upgrade typescript to 3.9
wschurman May 13, 2020
e9a3ddc
Merge branch 'master' into @wschurman/upgrade-ts
wschurman May 13, 2020
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: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"ts-mockito": "^2.5.0",
"typedoc": "^0.17.6",
"typedoc-plugin-lerna-packages": "^0.3.0",
"typescript": "^3.8.3",
"typescript": "^3.9.2",
"uuid": "^7.0.3"
},
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/entity-database-adapter-knex/src/PostgresEntityDatabaseAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDataba
.whereRaw('?? = ANY(?)', [tableField, tableValues as any[]]);
}

private applyQueryModifiersToQuery<T extends any>(
query: T,
private applyQueryModifiersToQuery(
query: Knex.QueryBuilder,
querySelectionModifiers: TableQuerySelectionModifiers
): T {
): Knex.QueryBuilder {
const { orderBy, offset, limit } = querySelectionModifiers;

let ret = query;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8579,10 +8579,10 @@ typedoc@^0.17.6:
shelljs "^0.8.4"
typedoc-default-themes "^0.10.1"

typescript@^3.8.3:
version "3.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
typescript@^3.9.2:
version "3.9.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.2.tgz#64e9c8e9be6ea583c54607677dd4680a1cf35db9"
integrity sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==

uglify-js@^3.1.4:
version "3.9.1"
Expand Down