diff --git a/package.json b/package.json index dcdbe2089..a0af2c1d6 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "strip-ansi": "^6.0.1", "swc-node": "^1.0.0", "ts-jest": "^29.2.4", - "typescript": "^4.9.5", + "typescript": "^5.7.2", "typescript-eslint": "^8.18.1" }, "workspaces": [ diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json index a9c455783..28364beb1 100644 --- a/packages/cli/tsconfig.build.json +++ b/packages/cli/tsconfig.build.json @@ -9,7 +9,7 @@ "outDir": "./dist", "rootDir": "./src", "skipLibCheck": true, - "moduleResolution": "Node16" + "module": "NodeNext", }, "include": ["./src"], "exclude": [ diff --git a/packages/react/src/TransNoContext.tsx b/packages/react/src/TransNoContext.tsx index 863849158..0481307a9 100644 --- a/packages/react/src/TransNoContext.tsx +++ b/packages/react/src/TransNoContext.tsx @@ -1,4 +1,4 @@ -import React, { ComponentType } from "react" +import React, { ComponentType, ReactNode } from "react" import { formatElements } from "./format" import type { MessageOptions } from "@lingui/core" @@ -82,7 +82,7 @@ export function TransNoContext( } // react components, arrays, falsy values, all should be processed as JSX children - components[index] = <>{values[key]} + components[index] = <>{values[key] as ReactNode} values[key] = `<${index}/>` }) } diff --git a/yarn.lock b/yarn.lock index 13d0f16c9..831ceb7c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10863,7 +10863,7 @@ __metadata: strip-ansi: ^6.0.1 swc-node: ^1.0.0 ts-jest: ^29.2.4 - typescript: ^4.9.5 + typescript: ^5.7.2 typescript-eslint: ^8.18.1 languageName: unknown linkType: soft @@ -15783,7 +15783,7 @@ __metadata: languageName: unknown linkType: soft -"typescript@npm:4.9.5, typescript@npm:^4.9.5": +"typescript@npm:4.9.5": version: 4.9.5 resolution: "typescript@npm:4.9.5" bin: @@ -15803,7 +15803,17 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@4.9.5#~builtin, typescript@patch:typescript@^4.9.5#~builtin": +"typescript@npm:^5.7.2": + version: 5.7.2 + resolution: "typescript@npm:5.7.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: b55300c4cefee8ee380d14fa9359ccb41ff8b54c719f6bc49b424899d662a5ce62ece390ce769568c7f4d14af844085255e63788740084444eb12ef423b13433 + languageName: node + linkType: hard + +"typescript@patch:typescript@4.9.5#~builtin": version: 4.9.5 resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=23ec76" bin: @@ -15823,6 +15833,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@^5.7.2#~builtin": + version: 5.7.2 + resolution: "typescript@patch:typescript@npm%3A5.7.2#~builtin::version=5.7.2&hash=1f5320" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 803430c6da2ba73c25a21880d8d4f08a56d9d2444e6db2ea949ac4abceeece8e4a442b7b9b585db7d8a0b47ebda2060e45fe8ee8b8aca23e27ec1d4844987ee6 + languageName: node + linkType: hard + "ufo@npm:^1.1.2": version: 1.2.0 resolution: "ufo@npm:1.2.0"