Skip to content

Commit 250446b

Browse files
littleboarxlittleboarx
authored
fix: update typescript version and fix type error (#1277)
* fix: update typescript version and fix type error * fix: update typescript version and fix type error * fix test error and update Snapshot due to the vue version update
1 parent a1d7259 commit 250446b

22 files changed

+344
-298
lines changed

‎package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
"@types/node": "^16.18.8",
8181
"@typescript-eslint/eslint-plugin": "^5.46.0",
8282
"@typescript-eslint/parser": "^5.46.0",
83-
"@vue/server-renderer": "^3.2.4",
8483
"algoliasearch": "^4.9.0",
8584
"api-docs-gen": "^0.4.0",
8685
"brotli": "^1.3.2",
@@ -133,14 +132,14 @@
133132
"textlint-rule-write-good": "^2.0.0",
134133
"trash-cli": "^5.0.0",
135134
"ts-jest": "^26.5.4",
136-
"typescript": "4.2.3",
135+
"typescript": "^4.9.4",
137136
"vitepress": "^1.0.0-alpha.4",
138-
"vue": "^3.2.4",
137+
"vue": "^3.2.45",
139138
"vue-i18n": "workspace:*"
140139
},
141140
"peerDependencies": {
142141
"@microsoft/api-extractor": "7.15.2",
143-
"typescript": "4.2.3"
142+
"typescript": "^4.9.4"
144143
},
145144
"engines": {
146145
"node": ">= 14"
@@ -182,7 +181,7 @@
182181
"packageManager": "[email protected]",
183182
"pnpm": {
184183
"overrides": {
185-
"vue": "3.2.20",
184+
"vue": "3.2.45",
186185
"vite": "2.6.14"
187186
}
188187
}

‎packages/core-base/src/context.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export type LocaleMessageType<T, Message = string> = T extends string
6161
? LocaleMessageDictionary<P, Message>
6262
: T extends (...args: infer Arguments) => any
6363
? (...args: Arguments) => ReturnType<T>
64-
: T extends Record<string, any>
64+
: T extends Record<string, unknown>
6565
? LocaleMessageDictionary<T, Message>
6666
: T extends Array<T>
6767
? { [K in keyof T]: T[K] }
@@ -107,7 +107,7 @@ export type MessageCompiler<Message = string> = (
107107
// prettier-ignore
108108
export interface CoreOptions<
109109
Message = string,
110-
Schema extends
110+
Schema extends
111111
{
112112
message?: unknown
113113
datetime?: unknown

‎packages/core-base/src/datetime.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ export interface DateTimeOptions<Key = string, Locales = Locale>
109109
*/
110110

111111
export function datetime<
112-
Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
112+
Context extends CoreContext<Message, {}, {}, {}>,
113113
Message = string
114114
>(
115115
context: Context,
116116
value: number | string | Date
117117
): string | number | Intl.DateTimeFormatPart[]
118118

119119
export function datetime<
120-
Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
120+
Context extends CoreContext<Message, {}, {}, {}>,
121121
Value extends number | string | Date = number,
122122
Key extends string = string,
123123
ResourceKeys extends PickupFormatKeys<
@@ -134,7 +134,7 @@ export function datetime<
134134
): string | number | Intl.DateTimeFormatPart[]
135135

136136
export function datetime<
137-
Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
137+
Context extends CoreContext<Message, {}, {}, {}>,
138138
Value extends number | string | Date = number,
139139
Key extends string = string,
140140
ResourceKeys extends PickupFormatKeys<
@@ -152,7 +152,7 @@ export function datetime<
152152
): string | number | Intl.DateTimeFormatPart[]
153153

154154
export function datetime<
155-
Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
155+
Context extends CoreContext<Message, {}, {}, {}>,
156156
Value extends number | string | Date = number,
157157
Key extends string = string,
158158
ResourceKeys extends PickupFormatKeys<
@@ -170,7 +170,7 @@ export function datetime<
170170
): string | number | Intl.DateTimeFormatPart[]
171171

172172
export function datetime<
173-
Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
173+
Context extends CoreContext<Message, {}, {}, {}>,
174174
Value extends number | string | Date = number,
175175
Key extends string = string,
176176
ResourceKeys extends PickupFormatKeys<
@@ -190,7 +190,7 @@ export function datetime<
190190

191191
// implementation of `datetime` function
192192
export function datetime<
193-
Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
193+
Context extends CoreContext<Message, {}, {}, {}>,
194194
Message = string
195195
>(
196196
context: Context,

‎packages/core-base/src/number.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ export interface NumberOptions<Key = string, Locales = Locale>
107107
*/
108108

109109
export function number<
110-
Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
110+
Context extends CoreContext<Message, {}, {}, {}>,
111111
Message = string
112112
>(context: Context, value: number): string | number | Intl.NumberFormatPart[]
113113

114114
export function number<
115-
Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
115+
Context extends CoreContext<Message, {}, {}, {}>,
116116
Value extends number = number,
117117
Key extends string = string,
118118
ResourceKeys extends PickupFormatKeys<
@@ -129,7 +129,7 @@ export function number<
129129
): string | number | Intl.NumberFormatPart[]
130130

131131
export function number<
132-
Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
132+
Context extends CoreContext<Message, {}, {}, {}>,
133133
Value extends number = number,
134134
Key extends string = string,
135135
ResourceKeys extends PickupFormatKeys<
@@ -147,7 +147,7 @@ export function number<
147147
): string | number | Intl.NumberFormatPart[]
148148

149149
export function number<
150-
Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
150+
Context extends CoreContext<Message, {}, {}, {}>,
151151
Value extends number = number,
152152
Key extends string = string,
153153
ResourceKeys extends PickupFormatKeys<
@@ -165,7 +165,7 @@ export function number<
165165
): string | number | Intl.NumberFormatPart[]
166166

167167
export function number<
168-
Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
168+
Context extends CoreContext<Message, {}, {}, {}>,
169169
Value extends number = number,
170170
Key extends string = string,
171171
ResourceKeys extends PickupFormatKeys<
@@ -185,7 +185,7 @@ export function number<
185185

186186
// implementation of `number` function
187187
export function number<
188-
Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
188+
Context extends CoreContext<Message, {}, {}, {}>,
189189
Message = string
190190
>(
191191
context: Context,

‎packages/core-base/src/runtime.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function pluralDefault(choice: number, choicesLength: number): number {
136136
return choice ? Math.min(choice, 2) : 0
137137
}
138138

139-
function getPluralIndex<T>(options: MessageContextOptions<T>): number {
139+
function getPluralIndex<T, N>(options: MessageContextOptions<T, N>): number {
140140
// prettier-ignore
141141
const index = isNumber(options.pluralIndex)
142142
? options.pluralIndex
@@ -164,7 +164,6 @@ export function createMessageContext<T = string, N = {}>(
164164
options: MessageContextOptions<T, N> = {}
165165
): MessageContext<T> {
166166
const locale = options.locale
167-
168167
const pluralIndex = getPluralIndex(options)
169168
const pluralRule =
170169
isObject(options.pluralRules) &&

‎packages/core-base/src/translate.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ export interface TranslateOptions<Locales = Locale> {
158158
*/
159159

160160
export function translate<
161-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
161+
Context extends CoreContext<Message>,
162162
Key extends string = string,
163163
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
164164
Context['messages']
@@ -170,7 +170,7 @@ export function translate<
170170
): MessageType<Message> | number
171171

172172
export function translate<
173-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
173+
Context extends CoreContext<Message, {}, {}, {}>,
174174
Key extends string = string,
175175
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
176176
Context['messages']
@@ -183,7 +183,7 @@ export function translate<
183183
): MessageType<Message> | number
184184

185185
export function translate<
186-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
186+
Context extends CoreContext<Message, {}, {}, {}>,
187187
Key extends string = string,
188188
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
189189
Context['messages']
@@ -197,7 +197,7 @@ export function translate<
197197
): MessageType<Message> | number
198198

199199
export function translate<
200-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
200+
Context extends CoreContext<Message, {}, {}, {}>,
201201
Key extends string = string,
202202
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
203203
Context['messages']
@@ -210,7 +210,7 @@ export function translate<
210210
): MessageType<Message> | number
211211

212212
export function translate<
213-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
213+
Context extends CoreContext<Message, {}, {}, {}>,
214214
Key extends string = string,
215215
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
216216
Context['messages']
@@ -224,7 +224,7 @@ export function translate<
224224
): MessageType<Message> | number
225225

226226
export function translate<
227-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
227+
Context extends CoreContext<Message, {}, {}, {}>,
228228
Key extends string = string,
229229
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
230230
Context['messages']
@@ -237,7 +237,7 @@ export function translate<
237237
): MessageType<Message> | number
238238

239239
export function translate<
240-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
240+
Context extends CoreContext<Message, {}, {}, {}>,
241241
Key extends string = string,
242242
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
243243
Context['messages']
@@ -251,7 +251,7 @@ export function translate<
251251
): MessageType<Message> | number
252252

253253
export function translate<
254-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
254+
Context extends CoreContext<Message, {}, {}, {}>,
255255
Key extends string = string,
256256
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
257257
Context['messages']
@@ -265,7 +265,7 @@ export function translate<
265265
): MessageType<Message> | number
266266

267267
export function translate<
268-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
268+
Context extends CoreContext<Message, {}, {}, {}>,
269269
Key extends string = string,
270270
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
271271
Context['messages']
@@ -279,7 +279,7 @@ export function translate<
279279
): MessageType<Message> | number
280280

281281
export function translate<
282-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
282+
Context extends CoreContext<Message, {}, {}, {}>,
283283
Key extends string = string,
284284
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
285285
Context['messages']
@@ -292,7 +292,7 @@ export function translate<
292292
): MessageType<Message> | number
293293

294294
export function translate<
295-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
295+
Context extends CoreContext<Message, {}, {}, {}>,
296296
Key extends string = string,
297297
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
298298
Context['messages']
@@ -306,7 +306,7 @@ export function translate<
306306
): MessageType<Message> | number
307307

308308
export function translate<
309-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
309+
Context extends CoreContext<Message, {}, {}, {}>,
310310
Key extends string = string,
311311
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
312312
Context['messages']
@@ -320,7 +320,7 @@ export function translate<
320320
): MessageType<Message> | number
321321

322322
export function translate<
323-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
323+
Context extends CoreContext<Message, {}, {}, {}>,
324324
Key extends string = string,
325325
ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
326326
Context['messages']
@@ -335,7 +335,7 @@ export function translate<
335335

336336
// implementation of `translate` function
337337
export function translate<
338-
Context extends CoreContext<Message, Context['messages'], {}, {}>,
338+
Context extends CoreContext<Message, {}, {}, {}>,
339339
Message = string
340340
>(context: Context, ...args: unknown[]): MessageType<Message> | number {
341341
const {

‎packages/shared/src/utils.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@ export let measure: (
1414

1515
if (__DEV__) {
1616
const perf = inBrowser && window.performance
17+
1718
if (
1819
perf &&
1920
perf.mark &&
2021
perf.measure &&
2122
perf.clearMarks &&
23+
// @ts-ignore browser compat
2224
perf.clearMeasures
2325
) {
24-
mark = (tag: string): void => perf.mark(tag)
26+
mark = (tag: string): void => {
27+
perf.mark(tag)
28+
}
2529
measure = (name: string, startTag: string, endTag: string): void => {
2630
perf.measure(name, startTag, endTag)
2731
perf.clearMarks(startTag)

‎packages/vue-i18n-core/src/components/DatetimeFormat.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ export const DatetimeFormat = /* #__PURE__*/ /*defineComponent */ {
5757
setup(props: any, context: any): any {
5858
const i18n =
5959
props.i18n ||
60-
(useI18n({ useScope: 'parent', __useComponent: true }) as Composer &
61-
ComposerInternal)
60+
(useI18n({
61+
useScope: 'parent',
62+
__useComponent: true
63+
}) as unknown as Composer & ComposerInternal)
6264

6365
return renderFormatter<
6466
FormattableProps<number | Date, Intl.DateTimeFormatOptions>,

‎packages/vue-i18n-core/src/components/NumberFormat.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ export const NumberFormat = /* #__PURE__*/ /* defineComponent */ {
5656
setup(props: any, context: any): any {
5757
const i18n =
5858
props.i18n ||
59-
(useI18n({ useScope: 'parent', __useComponent: true }) as Composer &
60-
ComposerInternal)
59+
(useI18n({
60+
useScope: 'parent',
61+
__useComponent: true
62+
}) as unknown as Composer & ComposerInternal)
6163

6264
return renderFormatter<
6365
FormattableProps<number, Intl.NumberFormatOptions>,

‎packages/vue-i18n-core/src/components/Translation.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const Translation = /* #__PURE__*/ /* defineComponent */ {
105105
(useI18n({
106106
useScope: props.scope as 'global' | 'parent',
107107
__useComponent: true
108-
}) as Composer & ComposerInternal)
108+
}) as unknown as Composer & ComposerInternal)
109109

110110
return (): VNodeChild => {
111111
const keys = Object.keys(slots).filter(key => key !== '_')

0 commit comments

Comments
 (0)