From 65d8b487f83f3aad6c68f41577fc8b52b0aa8683 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Thu, 3 Dec 2020 01:56:28 +0100 Subject: [PATCH] chore: upgrade to typescript 4.1 --- example/package.json | 2 +- package.json | 2 +- packages/bottom-tabs/package.json | 2 +- packages/core/package.json | 2 +- packages/core/src/types.tsx | 6 +++--- packages/devtools/package.json | 2 +- packages/drawer/package.json | 2 +- packages/material-bottom-tabs/package.json | 2 +- packages/material-top-tabs/package.json | 2 +- packages/native/package.json | 2 +- packages/native/src/useLinking.tsx | 2 +- packages/routers/package.json | 2 +- packages/routers/src/StackRouter.tsx | 8 ++++---- packages/routers/src/TabRouter.tsx | 4 ++-- packages/stack/package.json | 2 +- yarn.lock | 8 ++++---- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/example/package.json b/example/package.json index 6cadbfe5..2f66de56 100644 --- a/example/package.json +++ b/example/package.json @@ -58,6 +58,6 @@ "nodemon": "^2.0.6", "playwright": "^0.14.0", "serve": "^11.3.0", - "typescript": "^4.0.3" + "typescript": "^4.1.2" } } diff --git a/package.json b/package.json index c5b3a66b..8546caa1 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "lerna": "^3.22.1", "metro-react-native-babel-preset": "^0.63.0", "prettier": "^2.1.2", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "resolutions": { "react": "~16.13.1", diff --git a/packages/bottom-tabs/package.json b/packages/bottom-tabs/package.json index 7b151922..323b147f 100644 --- a/packages/bottom-tabs/package.json +++ b/packages/bottom-tabs/package.json @@ -51,7 +51,7 @@ "react-native": "~0.63.2", "react-native-safe-area-context": "3.1.4", "react-native-screens": "~2.10.1", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "@react-navigation/native": "^5.0.5", diff --git a/packages/core/package.json b/packages/core/package.json index 8b91713d..65eb915f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -50,7 +50,7 @@ "del-cli": "^3.0.1", "react": "~16.13.1", "react-test-renderer": "~16.13.1", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "react": "*" diff --git a/packages/core/src/types.tsx b/packages/core/src/types.tsx index 6005bdef..0f8ddb99 100644 --- a/packages/core/src/types.tsx +++ b/packages/core/src/types.tsx @@ -168,8 +168,8 @@ type NavigationHelpersCommon< */ navigate( ...args: undefined extends ParamList[RouteName] - ? [RouteName] | [RouteName, ParamList[RouteName]] - : [RouteName, ParamList[RouteName]] + ? [screen: RouteName] | [screen: RouteName, params: ParamList[RouteName]] + : [screen: RouteName, params: ParamList[RouteName]] ): void; /** @@ -178,7 +178,7 @@ type NavigationHelpersCommon< * @param route Object with `key` or `name` for the route to navigate to, and a `params` object. */ navigate( - route: + options: | { key: string; params?: ParamList[RouteName] } | { name: RouteName; key?: string; params: ParamList[RouteName] } ): void; diff --git a/packages/devtools/package.json b/packages/devtools/package.json index b18d35f1..865d5c08 100644 --- a/packages/devtools/package.json +++ b/packages/devtools/package.json @@ -47,7 +47,7 @@ "@types/react": "^16.9.53", "del-cli": "^3.0.1", "react": "~16.13.1", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "react": "*" diff --git a/packages/drawer/package.json b/packages/drawer/package.json index c0aa296d..7c12fbc5 100644 --- a/packages/drawer/package.json +++ b/packages/drawer/package.json @@ -57,7 +57,7 @@ "react-native-reanimated": "~1.13.0", "react-native-safe-area-context": "3.1.4", "react-native-screens": "~2.10.1", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "@react-navigation/native": "^5.0.5", diff --git a/packages/material-bottom-tabs/package.json b/packages/material-bottom-tabs/package.json index 326646e7..7080a7a6 100644 --- a/packages/material-bottom-tabs/package.json +++ b/packages/material-bottom-tabs/package.json @@ -53,7 +53,7 @@ "react-native": "~0.63.2", "react-native-paper": "^4.2.0", "react-native-vector-icons": "^7.0.0", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "@react-navigation/native": "^5.0.5", diff --git a/packages/material-top-tabs/package.json b/packages/material-top-tabs/package.json index e9faf441..73b40569 100644 --- a/packages/material-top-tabs/package.json +++ b/packages/material-top-tabs/package.json @@ -56,7 +56,7 @@ "react-native-gesture-handler": "~1.7.0", "react-native-reanimated": "~1.13.0", "react-native-tab-view": "^2.15.2", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "@react-navigation/native": "^5.0.5", diff --git a/packages/native/package.json b/packages/native/package.json index 99d44dc7..cd7928d6 100644 --- a/packages/native/package.json +++ b/packages/native/package.json @@ -52,7 +52,7 @@ "react": "~16.13.1", "react-dom": "^16.13.1", "react-native": "~0.63.2", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "react": "*", diff --git a/packages/native/src/useLinking.tsx b/packages/native/src/useLinking.tsx index 59d4bc18..be825a5c 100644 --- a/packages/native/src/useLinking.tsx +++ b/packages/native/src/useLinking.tsx @@ -134,7 +134,7 @@ const createMemoryHistory = () => { // - There's history to go back, `history.go` is called, and `popstate` fires // - `history.go` is called multiple times, we need to resolve on respective `popstate` // - No history to go back, but `history.go` was called, browser has no API to detect it - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { const done = (interrupted?: boolean) => { clearTimeout(timer); diff --git a/packages/routers/package.json b/packages/routers/package.json index 8d26a855..50bf4dce 100644 --- a/packages/routers/package.json +++ b/packages/routers/package.json @@ -42,7 +42,7 @@ "devDependencies": { "@react-native-community/bob": "^0.16.2", "del-cli": "^3.0.1", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "@react-native-community/bob": { "source": "src", diff --git a/packages/routers/src/StackRouter.tsx b/packages/routers/src/StackRouter.tsx index 0523bf95..4024b6aa 100644 --- a/packages/routers/src/StackRouter.tsx +++ b/packages/routers/src/StackRouter.tsx @@ -54,8 +54,8 @@ export type StackActionHelpers = { */ replace( ...args: undefined extends ParamList[RouteName] - ? [RouteName] | [RouteName, ParamList[RouteName]] - : [RouteName, ParamList[RouteName]] + ? [screen: RouteName] | [screen: RouteName, params: ParamList[RouteName]] + : [screen: RouteName, params: ParamList[RouteName]] ): void; /** @@ -66,8 +66,8 @@ export type StackActionHelpers = { */ push( ...args: undefined extends ParamList[RouteName] - ? [RouteName] | [RouteName, ParamList[RouteName]] - : [RouteName, ParamList[RouteName]] + ? [screen: RouteName] | [screen: RouteName, params: ParamList[RouteName]] + : [screen: RouteName, params: ParamList[RouteName]] ): void; /** diff --git a/packages/routers/src/TabRouter.tsx b/packages/routers/src/TabRouter.tsx index aa2c5b75..03d34281 100644 --- a/packages/routers/src/TabRouter.tsx +++ b/packages/routers/src/TabRouter.tsx @@ -51,8 +51,8 @@ export type TabActionHelpers = { */ jumpTo>( ...args: undefined extends ParamList[RouteName] - ? [RouteName] | [RouteName, ParamList[RouteName]] - : [RouteName, ParamList[RouteName]] + ? [screen: RouteName] | [screen: RouteName, params: ParamList[RouteName]] + : [screen: RouteName, params: ParamList[RouteName]] ): void; }; diff --git a/packages/stack/package.json b/packages/stack/package.json index 7c4eeda3..437fa01e 100644 --- a/packages/stack/package.json +++ b/packages/stack/package.json @@ -58,7 +58,7 @@ "react-native-gesture-handler": "~1.7.0", "react-native-safe-area-context": "3.1.4", "react-native-screens": "~2.10.1", - "typescript": "^4.0.3" + "typescript": "^4.1.2" }, "peerDependencies": { "@react-navigation/native": "^5.0.5", diff --git a/yarn.lock b/yarn.lock index a9316984..6884a158 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18396,10 +18396,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5" - integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg== +typescript@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9" + integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ== ua-parser-js@^0.7.18: version "0.7.22"