diff --git a/package.json b/package.json index 81d42185fd..0a3f216067 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "lint": "eslint --cache --quiet src", "lint-native": "swiftlint ./modules && ktlint ./modules", "lint-native:fix": "swiftlint --fix ./modules && ktlint --format ./modules", - "typecheck": "tsc --project ./tsconfig.check.json", + "typecheck": "tsgo --project ./tsconfig.check.json", "e2e:mock-server": "cd dev-env && yarn start", "e2e:build": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios", "e2e:build-android": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:android", @@ -263,6 +263,7 @@ "@types/psl": "^1.1.1", "@types/react": "^19.1.12", "@types/react-dom": "^19.1.9", + "@typescript/native-preview": "^7.0.0-dev.20260428.1", "babel-jest": "^29.7.0", "babel-plugin-module-resolver": "^5.0.2", "babel-plugin-react-compiler": "^19.1.0-rc.3", diff --git a/src/alf/fonts.ts b/src/alf/fonts.ts index 2ddc475bf5..da6ccee50d 100644 --- a/src/alf/fonts.ts +++ b/src/alf/fonts.ts @@ -1,4 +1,4 @@ -import {type TextStyle} from 'react-native' +import {type FontVariant, type TextStyle} from 'react-native' import {IS_ANDROID, IS_WEB} from '#/env' import {type Device, device} from '#/storage' @@ -81,10 +81,9 @@ export function applyFonts(style: TextStyle, fontFamily: 'system' | 'theme') { * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant} */ if (IS_WEB) { - // @ts-expect-error - web supports 'unicode' as a valid value for fontVariant style.fontVariant = (style.fontVariant || []).concat( 'no-contextual', - 'unicode', + 'unicode' as FontVariant, // web supports 'unicode' as a valid value for fontVariant ) } else { style.fontVariant = (style.fontVariant || []).concat('no-contextual') diff --git a/yarn.lock b/yarn.lock index edd987d5a8..d7f6ba9628 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5766,6 +5766,54 @@ "@typescript-eslint/types" "8.58.0" eslint-visitor-keys "^5.0.0" +"@typescript/native-preview-darwin-arm64@7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260428.1.tgz#bbfbc74270ac3b55ee6503860e6857b843df9a6a" + integrity sha512-Lll6WmXfgTEj1G3QBIoHlabQwUtJiyhlRgSLksa06QFL5BoA7V+Lu1waa9PtPNZbGsXLDMHodtk/bRQABKuPiw== + +"@typescript/native-preview-darwin-x64@7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260428.1.tgz#f0da11d99ec5723540d909f3c7bd575b7295d11a" + integrity sha512-WbsBNSHlo+4sGrTxDWdmI7r8x48tCtSCuKdmK62FvVOq58UWAs6sL13Z4Rev4ohLcGHdXC5E/8AIdpLPqDYQpw== + +"@typescript/native-preview-linux-arm64@7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260428.1.tgz#9876c59ede693d371d454123270eca3229c245e6" + integrity sha512-cgcBX/ZBMdepkamLT8g8jQdHe7DZS/s6zTZRof6mvcrnJHlMeUnKoC9UO8/c22IrUMV3n0XPh7R8FYjUP0ll+Q== + +"@typescript/native-preview-linux-arm@7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260428.1.tgz#c5b42a8791f04a4b198d36ffc87915ce90bf877c" + integrity sha512-/d/NnZFvEJU67L5mHh+cO3gsfwNCvJ9HGtxGq1KGz1VwTabOIcwLdpTpfsAR39WXzzfh9GJHL28n6GSGZInPow== + +"@typescript/native-preview-linux-x64@7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260428.1.tgz#76e063dcc4594e44de64d350b24e103574796327" + integrity sha512-4gJCE7wzenx1BH2Vtx2uKWUo8rFxnhGkxNEH1zxbYy/6ASwo+PnOPYmKHAzNE1C3yB5lzw71/vR5p5zyO57Y4A== + +"@typescript/native-preview-win32-arm64@7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260428.1.tgz#c30705a891580c6bec397253ebadb25370dc0e4b" + integrity sha512-yn6Rzbn62L4QTWrp0QgG8al6l/VG7PCPRdbE0vuGDSlKhInlC+Flo4QSc1qA8KHTbpHgl+nEsq9DymiitI4G4g== + +"@typescript/native-preview-win32-x64@7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260428.1.tgz#2de6534a6a40d7a51cc6a74232f7bf2c30ed2d70" + integrity sha512-T9z13mcMowXmwGjprA2FIR2EEdYZxgqH8+qk7dFZVBlo5vfk41AN/qJfAdN7IsAhEb640MJ8cMN/aiczweZKmA== + +"@typescript/native-preview@^7.0.0-dev.20260428.1": + version "7.0.0-dev.20260428.1" + resolved "https://registry.yarnpkg.com/@typescript/native-preview/-/native-preview-7.0.0-dev.20260428.1.tgz#64fe1239f1e3bce3b51ff1307b10a005b76af5e4" + integrity sha512-JiM4PYWDGs57TT0mV2KArmaW7BnTkk3XRid79NdG17tfvDbRyg4hBCpKI7vARiQPtxjKrHlxyzxOGDpv5W5T7Q== + optionalDependencies: + "@typescript/native-preview-darwin-arm64" "7.0.0-dev.20260428.1" + "@typescript/native-preview-darwin-x64" "7.0.0-dev.20260428.1" + "@typescript/native-preview-linux-arm" "7.0.0-dev.20260428.1" + "@typescript/native-preview-linux-arm64" "7.0.0-dev.20260428.1" + "@typescript/native-preview-linux-x64" "7.0.0-dev.20260428.1" + "@typescript/native-preview-win32-arm64" "7.0.0-dev.20260428.1" + "@typescript/native-preview-win32-x64" "7.0.0-dev.20260428.1" + "@ungap/structured-clone@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"