Skip to content

Commit

Permalink
chore(typescript): Upgrade to 5.3
Browse files Browse the repository at this point in the history
Co-Authored-By: Carol Soliman <[email protected]>
Co-Authored-By: Florian Wendelborn <[email protected]>
  • Loading branch information
3 people committed Jan 15, 2024
1 parent 9cf2028 commit 74f7ef9
Show file tree
Hide file tree
Showing 4 changed files with 154 additions and 130 deletions.
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
"url": "https://github.com/carsoli"
}
],
"dependencies": {
"typescript": "4.3"
},
"devDependencies": {
"@babel/core": "7.15.5",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
Expand All @@ -57,9 +54,9 @@
"@babel/preset-env": "^7.15.4",
"@babel/preset-typescript": "^7.15.0",
"@types/jest": "^27.0.1",
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"@vue/eslint-config-typescript": "^11.0.2",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^1.1.2",
"autoprefixer": "^9.8.5",
"babel-core": "^6.26.3",
Expand Down Expand Up @@ -93,6 +90,7 @@
"stylelint-csstree-validator": "^3.0.0",
"stylelint-prettier": "^3.0.0",
"ts-jest": "^27.0.5",
"typescript": "^5.3",
"unimported": "^1.19.0",
"vue": "^2.6.11",
"vue-jest": "^3.0.7",
Expand Down
5 changes: 4 additions & 1 deletion packages/kotti-ui/source/kotti-field/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ export namespace KottiField {
])
export type Result = z.output<typeof resultSchema>

export const functionSchema = z.function(z.tuple([z.any()]), resultSchema)
export const functionSchema = z
.function()
.args(z.any())
.returns(resultSchema)
export type Function = z.output<typeof functionSchema>
}

Expand Down
2 changes: 2 additions & 0 deletions packages/kotti-ui/source/kotti-i18n/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ import { DeepPartial } from './types'
export const fixDeepMerge = <T extends Record<string, unknown>>(
x: DeepPartial<T>,
y: DeepPartial<T>,
// @ts-expect-error deepmerge's parameters are typed with Partial<T>,
// which is not compatible with DeepPartial<T>
): T => deepmerge<T>(x, y)
Loading

0 comments on commit 74f7ef9

Please sign in to comment.