diff --git a/tools/tsflower b/tools/tsflower index 62805397171..4310b2926eb 100755 --- a/tools/tsflower +++ b/tools/tsflower @@ -158,7 +158,7 @@ export * from './lib/typescript/src/index.js.flow';" apply_patches() { for p in "${patch_dir}"/*.patch; do - if ! patch "${patch_opts[@]}" -p1 <"${p}"; then + if ! patch "${patch_opts[@]}" -p0 <"${p}"; then echo >&2 "apply-patches: Failed at patch: ${p#"${rootdir}/"}" return 1 fi @@ -179,7 +179,7 @@ unapply_patches() local i p for (( i = ${#patches[@]} - 1; i >= 0; i-- )); do p="${patches[i]}" - if ! patch "${patch_opts[@]}" -p1 -R <"${p}"; then + if ! patch "${patch_opts[@]}" -p0 -R <"${p}"; then echo >&2 "unapply-patches: Failed at patch: ${p#"${rootdir}/"}" return 1 fi @@ -189,11 +189,35 @@ unapply_patches() write_patches() { local commit_range="${1:-upstream..tsflower}" + rm -f "${patch_dir}"/*.patch - git -c diff.noprefix=false \ + + local format_patch_config=( + # Print the paths verbatim, without added a/ and b/ prefixes. + # This makes it a bit simpler to jump to the file when seeing + # the patch in the terminal. (Corresponds to passing `-p0` to + # `patch` and `git am` when consuming the patches.) + -c diff.noprefix=true + + # Merge the context of hunks that nearly touch. (Can make + # diffs a bit more readable; more importantly, override user + # config with some consistent value for reproducibility.) + -c diff.interHunkContext=6 + ) + git "${format_patch_config[@]}" \ format-patch --quiet --zero-commit \ --no-thread --no-numbered --keep-subject \ -o "${patch_dir}" "${commit_range}" + + # `git format-patch` writes the Git version number at the end. + # For reproducibility, normalize that to an arbitrary (realistic) value. + perl -i -0pe ' + s< ^ # beginning of a line (with "m" flag below) + 2 \. .* # a 2.x version number (in case a future 3.x + # actually makes a difference here) + \n\n \Z # end of line, blank line, end of file + ><2.32.0\n\n>xm + ' "${patch_dir}"/*.patch } check_consistent() @@ -289,7 +313,7 @@ EOF git commit -am 'tsflower: Revert patches' git checkout --quiet -B "${branchname}" - git am --quiet --whitespace=nowarn --keep "${patch_dir}"/*.patch + git am --quiet --whitespace=nowarn -p0 --keep "${patch_dir}"/*.patch if [ -z "${shortcut}" ]; then git checkout --quiet "${basebranch}" diff --git a/types/patches/0001-format-Add-a-few-prettier-ignores-to-work-around-a-P.patch b/types/patches/0001-format-Add-a-few-prettier-ignores-to-work-around-a-P.patch index 26437ed835b..d98a413261c 100644 --- a/types/patches/0001-format-Add-a-few-prettier-ignores-to-work-around-a-P.patch +++ b/types/patches/0001-format-Add-a-few-prettier-ignores-to-work-around-a-P.patch @@ -12,10 +12,10 @@ Discussion with a reduced repro of the Prettier bug: .../routers/lib/typescript/src/TabRouter.js.flow | 1 + 3 files changed, 4 insertions(+) -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index 086c12609..b6145283b 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow +--- types/@react-navigation/core/lib/typescript/src/types.js.flow ++++ types/@react-navigation/core/lib/typescript/src/types.js.flow @@ -150,6 +150,7 @@ type NavigationHelpersCommon< State: NavigationState<> = NavigationState<>, > = { @@ -24,10 +24,10 @@ index 086c12609..b6145283b 100644 navigate>( ...args: $FlowFixMe /* undefined extends ParamList[RouteName] ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] */ /* tsflower-unimplemented: ConditionalType */ ): void, -diff --git a/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow b/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow index 179e34e09..3bd89b8ce 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow +--- types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow @@ -58,9 +58,11 @@ export type StackNavigationState = NavigationState>( ...args: $FlowFixMe /* undefined extends ParamList[RouteName] ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] */ /* tsflower-unimplemented: ConditionalType */ ): void, -diff --git a/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow b/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow index fd281a865..4fa8ed1ca 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow +--- types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow @@ -41,6 +41,7 @@ export type TabNavigationState = $Diff< }; @@ -53,5 +53,5 @@ index fd281a865..4fa8ed1ca 100644 ...args: $FlowFixMe /* undefined extends ParamList[RouteName] ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] */ /* tsflower-unimplemented: ConditionalType */ ): void, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0002-tsflower-rnsac-Fix-ReadOnlyArray-reference-to-litera.patch b/types/patches/0002-tsflower-rnsac-Fix-ReadOnlyArray-reference-to-litera.patch index a5011bbf001..d56a2575791 100644 --- a/types/patches/0002-tsflower-rnsac-Fix-ReadOnlyArray-reference-to-litera.patch +++ b/types/patches/0002-tsflower-rnsac-Fix-ReadOnlyArray-reference-to-litera.patch @@ -16,10 +16,10 @@ mechanism. types/react-native-safe-area-context/SafeArea.types.js.flow | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/types/react-native-safe-area-context/SafeArea.types.js.flow b/types/react-native-safe-area-context/SafeArea.types.js.flow +diff --git types/react-native-safe-area-context/SafeArea.types.js.flow types/react-native-safe-area-context/SafeArea.types.js.flow index f3c41af41..e31ab1a65 100644 ---- a/types/react-native-safe-area-context/SafeArea.types.js.flow -+++ b/types/react-native-safe-area-context/SafeArea.types.js.flow +--- types/react-native-safe-area-context/SafeArea.types.js.flow ++++ types/react-native-safe-area-context/SafeArea.types.js.flow @@ -9,7 +9,6 @@ import type { } from 'tsflower/subst/react-native'; @@ -37,5 +37,5 @@ index f3c41af41..e31ab1a65 100644 ... }; -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0003-upstream-rnav-ReadOnlyArray-on-NavigationState-prope.patch b/types/patches/0003-upstream-rnav-ReadOnlyArray-on-NavigationState-prope.patch index fec6d6a9f21..4c42fde281a 100644 --- a/types/patches/0003-upstream-rnav-ReadOnlyArray-on-NavigationState-prope.patch +++ b/types/patches/0003-upstream-rnav-ReadOnlyArray-on-NavigationState-prope.patch @@ -8,10 +8,10 @@ I believe this could be expressed upstream, with `readonly Foo[]`. .../routers/lib/typescript/src/types.js.flow | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/types/@react-navigation/routers/lib/typescript/src/types.js.flow b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/types.js.flow types/@react-navigation/routers/lib/typescript/src/types.js.flow index 574ad164b..65d187165 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +--- types/@react-navigation/routers/lib/typescript/src/types.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/types.js.flow @@ -12,9 +12,9 @@ type NavigationRoute> = Ro export type NavigationState = Readonly<{ key: string, @@ -26,5 +26,5 @@ index 574ad164b..65d187165 100644 stale: false, ... -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0004-upstream-rnav-ReadOnly-on-ResetState-as-param-of-res.patch b/types/patches/0004-upstream-rnav-ReadOnly-on-ResetState-as-param-of-res.patch index efc8f010765..8541ed0f833 100644 --- a/types/patches/0004-upstream-rnav-ReadOnly-on-ResetState-as-param-of-res.patch +++ b/types/patches/0004-upstream-rnav-ReadOnly-on-ResetState-as-param-of-res.patch @@ -7,10 +7,10 @@ Subject: [upstream] rnav: $ReadOnly on ResetState as param of reset() .../routers/lib/typescript/src/CommonActions.js.flow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow b/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow index 0976fd765..dcd559b0a 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow +--- types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow @@ -71,6 +71,6 @@ declare export function navigate( ): Action; @@ -20,5 +20,5 @@ index 0976fd765..dcd559b0a 100644 declare export function setParams(params: { ... }): Action; export {}; -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0005-upstream-rnav-Fix-type-parameter-defaults-that-don-t.patch b/types/patches/0005-upstream-rnav-Fix-type-parameter-defaults-that-don-t.patch index ddc5035f0ac..109da7ebcc8 100644 --- a/types/patches/0005-upstream-rnav-Fix-type-parameter-defaults-that-don-t.patch +++ b/types/patches/0005-upstream-rnav-Fix-type-parameter-defaults-that-don-t.patch @@ -24,10 +24,10 @@ case. For example, our `typesEquivalent` in src/generics.js. .../stack/lib/typescript/src/types.js.flow | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index b6145283b..e3dd9a0d0 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow +--- types/@react-navigation/core/lib/typescript/src/types.js.flow ++++ types/@react-navigation/core/lib/typescript/src/types.js.flow @@ -181,7 +181,7 @@ type NavigationHelpersCommon< export type NavigationHelpers< @@ -59,10 +59,10 @@ index b6145283b..e3dd9a0d0 100644 > = { render(): $tsflower_subst$React$JSX$Element, options: ScreenOptions, -diff --git a/types/@react-navigation/stack/lib/typescript/src/types.js.flow b/types/@react-navigation/stack/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/stack/lib/typescript/src/types.js.flow types/@react-navigation/stack/lib/typescript/src/types.js.flow index 946df1eb6..94ea2dee5 100644 ---- a/types/@react-navigation/stack/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/stack/lib/typescript/src/types.js.flow +--- types/@react-navigation/stack/lib/typescript/src/types.js.flow ++++ types/@react-navigation/stack/lib/typescript/src/types.js.flow @@ -43,7 +43,7 @@ export type StackNavigationHelpers = NavigationHelpers; export type StackNavigationProp< @@ -73,5 +73,5 @@ index 946df1eb6..94ea2dee5 100644 ParamList, RouteName, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0006-upstream-rnav-Fix-State-tparam-bound-in-NavigationPr.patch b/types/patches/0006-upstream-rnav-Fix-State-tparam-bound-in-NavigationPr.patch index ce41aee04ae..a399fcdb2d6 100644 --- a/types/patches/0006-upstream-rnav-Fix-State-tparam-bound-in-NavigationPr.patch +++ b/types/patches/0006-upstream-rnav-Fix-State-tparam-bound-in-NavigationPr.patch @@ -9,10 +9,10 @@ not some other. types/@react-navigation/core/lib/typescript/src/types.js.flow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index e3dd9a0d0..41f13ea18 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow +--- types/@react-navigation/core/lib/typescript/src/types.js.flow ++++ types/@react-navigation/core/lib/typescript/src/types.js.flow @@ -202,7 +202,7 @@ export type NavigationContainerProps = { export type NavigationProp< ParamList: ParamListBase, @@ -23,5 +23,5 @@ index e3dd9a0d0..41f13ea18 100644 EventMap: EventMapBase = EventMapBase, > = NavigationHelpersCommon & { -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0007-upstream-rnav-Covariant-indexers-in-create-Navigator.patch b/types/patches/0007-upstream-rnav-Covariant-indexers-in-create-Navigator.patch index d9635bfa0f8..9544bdcf7a6 100644 --- a/types/patches/0007-upstream-rnav-Covariant-indexers-in-create-Navigator.patch +++ b/types/patches/0007-upstream-rnav-Covariant-indexers-in-create-Navigator.patch @@ -12,10 +12,10 @@ Content-Transfer-Encoding: 8bit .../typescript/src/navigators/createStackNavigator.js.flow | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow b/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow +diff --git types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow index 69f6df9c8..29d53b3ff 100644 ---- a/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow -+++ b/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow +--- types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow ++++ types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow @@ -21,10 +21,10 @@ type Props = DefaultNavigatorOptions & MaterialTopTabNavigationConfig; declare function MaterialTopTabNavigator(Props): $tsflower_subst$React$JSX$Element; @@ -29,10 +29,10 @@ index 69f6df9c8..29d53b3ff 100644 MaterialTopTabNavigationOptions, MaterialTopTabNavigationEventMap, typeof MaterialTopTabNavigator, -diff --git a/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow b/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow +diff --git types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow index 7a17b58e6..1842836b1 100644 ---- a/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow -+++ b/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow +--- types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow ++++ types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow @@ -21,10 +21,10 @@ type Props = DefaultNavigatorOptions & StackNavigationConfig; declare function StackNavigator(Props): $tsflower_subst$React$JSX$Element; @@ -47,5 +47,5 @@ index 7a17b58e6..1842836b1 100644 StackNavigationEventMap, typeof StackNavigator, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0008-upstream-rnav-Covariant-indexer-in-ParamListBase.patch b/types/patches/0008-upstream-rnav-Covariant-indexer-in-ParamListBase.patch index cbca00c020e..51190aebd26 100644 --- a/types/patches/0008-upstream-rnav-Covariant-indexer-in-ParamListBase.patch +++ b/types/patches/0008-upstream-rnav-Covariant-indexer-in-ParamListBase.patch @@ -7,10 +7,10 @@ Subject: [upstream] rnav: Covariant indexer in ParamListBase .../@react-navigation/routers/lib/typescript/src/types.js.flow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/types/@react-navigation/routers/lib/typescript/src/types.js.flow b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/types.js.flow types/@react-navigation/routers/lib/typescript/src/types.js.flow index 65d187165..a194fa5fa 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +--- types/@react-navigation/routers/lib/typescript/src/types.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/types.js.flow @@ -70,7 +70,7 @@ export type Route = params: Readonly; }> */ /* tsflower-unimplemented: ConditionalType */; @@ -21,5 +21,5 @@ index 65d187165..a194fa5fa 100644 export type NavigationAction = Readonly<{ type: string, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0009-upstream-rnav-create-Navigator-type-surely-means-to-.patch b/types/patches/0009-upstream-rnav-create-Navigator-type-surely-means-to-.patch index 5ce9c792f31..aa64ad2f19c 100644 --- a/types/patches/0009-upstream-rnav-create-Navigator-type-surely-means-to-.patch +++ b/types/patches/0009-upstream-rnav-create-Navigator-type-surely-means-to-.patch @@ -13,10 +13,10 @@ Rather than to the upper bound on ParamList. .../lib/typescript/src/navigators/createStackNavigator.js.flow | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow b/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow +diff --git types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow index 29d53b3ff..def19204a 100644 ---- a/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow -+++ b/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow +--- types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow ++++ types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow @@ -24,7 +24,7 @@ declare var _default: < ParamList: { +[key: string]: { ... } | void }, >() => $tsflower_import_type$_$_40_react_2d_navigation_2f_native$TypedNavigator< @@ -26,10 +26,10 @@ index 29d53b3ff..def19204a 100644 MaterialTopTabNavigationOptions, MaterialTopTabNavigationEventMap, typeof MaterialTopTabNavigator, -diff --git a/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow b/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow +diff --git types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow index 1842836b1..3c2939d32 100644 ---- a/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow -+++ b/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow +--- types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow ++++ types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow @@ -24,7 +24,7 @@ declare var _default: < ParamList: { +[key: string]: { ... } | void }, >() => $tsflower_import_type$_$_40_react_2d_navigation_2f_native$TypedNavigator< @@ -40,5 +40,5 @@ index 1842836b1..3c2939d32 100644 StackNavigationEventMap, typeof StackNavigator, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0010-upstream-rnav-On-create-Navigator-cut-redundant-wron.patch b/types/patches/0010-upstream-rnav-On-create-Navigator-cut-redundant-wron.patch index 05f68f00300..770c8ad2ee3 100644 --- a/types/patches/0010-upstream-rnav-On-create-Navigator-cut-redundant-wron.patch +++ b/types/patches/0010-upstream-rnav-On-create-Navigator-cut-redundant-wron.patch @@ -20,10 +20,10 @@ so it has a chance of being right. .../typescript/src/navigators/createStackNavigator.js.flow | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) -diff --git a/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow b/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow +diff --git types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow index def19204a..2e5c9ffa6 100644 ---- a/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow -+++ b/types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow +--- types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow ++++ types/@react-navigation/material-top-tabs/lib/typescript/src/navigators/createMaterialTopTabNavigator.js.flow @@ -16,9 +16,7 @@ import { type MaterialTopTabNavigationEventMap, } from '../types'; @@ -35,10 +35,10 @@ index def19204a..2e5c9ffa6 100644 declare function MaterialTopTabNavigator(Props): $tsflower_subst$React$JSX$Element; declare var _default: < ParamList: { +[key: string]: { ... } | void }, -diff --git a/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow b/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow +diff --git types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow index 3c2939d32..f96ddf688 100644 ---- a/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow -+++ b/types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow +--- types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow ++++ types/@react-navigation/stack/lib/typescript/src/navigators/createStackNavigator.js.flow @@ -16,9 +16,9 @@ import { type StackNavigationEventMap, } from '../types'; @@ -53,5 +53,5 @@ index 3c2939d32..f96ddf688 100644 declare var _default: < ParamList: { +[key: string]: { ... } | void }, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0011-upstream-optional-rnav-Fix-NavigationRoute-to-supply.patch b/types/patches/0011-upstream-optional-rnav-Fix-NavigationRoute-to-supply.patch index 68abe8e33ad..2ab9217fb0d 100644 --- a/types/patches/0011-upstream-optional-rnav-Fix-NavigationRoute-to-supply.patch +++ b/types/patches/0011-upstream-optional-rnav-Fix-NavigationRoute-to-supply.patch @@ -11,10 +11,10 @@ that I hoped it might resolve.) .../@react-navigation/routers/lib/typescript/src/types.js.flow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/types/@react-navigation/routers/lib/typescript/src/types.js.flow b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/types.js.flow types/@react-navigation/routers/lib/typescript/src/types.js.flow index a194fa5fa..ea0e29c32 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +--- types/@react-navigation/routers/lib/typescript/src/types.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/types.js.flow @@ -7,7 +7,7 @@ export type CommonNavigationAction = CommonActions.Action; type NavigationRoute> = Route< Extract, @@ -25,5 +25,5 @@ index a194fa5fa..ea0e29c32 100644 export type NavigationState = Readonly<{ key: string, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0012-irreducible-rnav-Make-action-types-exact.patch b/types/patches/0012-irreducible-rnav-Make-action-types-exact.patch index e8b878fd1ce..55fefe75b20 100644 --- a/types/patches/0012-irreducible-rnav-Make-action-types-exact.patch +++ b/types/patches/0012-irreducible-rnav-Make-action-types-exact.patch @@ -14,10 +14,10 @@ this. (Maybe someday TypeScript will have exact object types.) .../routers/lib/typescript/src/StackRouter.js.flow | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) -diff --git a/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow b/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow index dcd559b0a..054215538 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow +--- types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/CommonActions.js.flow @@ -10,7 +10,7 @@ type ResetState = ... }); @@ -37,10 +37,10 @@ index dcd559b0a..054215538 100644 declare export function goBack(): Action; -diff --git a/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow b/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow index 3bd89b8ce..d7bdf0f5e 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow +--- types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow @@ -12,7 +12,7 @@ import { type ParamListBase, } from './types'; @@ -61,5 +61,5 @@ index 3bd89b8ce..d7bdf0f5e 100644 export type StackRouterOptions = DefaultRouterOptions<>; export type StackNavigationState = NavigationState & { -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0013-irreducible-rnav-Covariant-type-parameters-on-variou.patch b/types/patches/0013-irreducible-rnav-Covariant-type-parameters-on-variou.patch index e0af60b2602..fbecea55dd2 100644 --- a/types/patches/0013-irreducible-rnav-Covariant-type-parameters-on-variou.patch +++ b/types/patches/0013-irreducible-rnav-Covariant-type-parameters-on-variou.patch @@ -13,10 +13,10 @@ NavigationHelpersCommon, NavigationState, PartialState. .../stack/lib/typescript/src/types.js.flow | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) -diff --git a/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow b/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow index d3c2017d4..3bc615faa 100644 ---- a/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow +--- types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow ++++ types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow @@ -50,7 +50,7 @@ export type BottomTabNavigationHelpers = NavigationHelpers< TabActionHelpers; export type BottomTabNavigationProp< @@ -26,10 +26,10 @@ index d3c2017d4..3bc615faa 100644 > = NavigationProp< ParamList, RouteName, -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index 41f13ea18..ccdd92d43 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow +--- types/@react-navigation/core/lib/typescript/src/types.js.flow ++++ types/@react-navigation/core/lib/typescript/src/types.js.flow @@ -126,7 +126,7 @@ export type EventEmitter = { ... }; @@ -48,7 +48,7 @@ index 41f13ea18..ccdd92d43 100644 State: NavigationState<> = NavigationState<>, > = { dispatch(action: NavigationAction | ((state: State) => NavigationAction)): void, -@@ -200,8 +200,8 @@ export type NavigationContainerProps = { +@@ -200,19 +200,19 @@ export type NavigationContainerProps = { }; export type NavigationProp< @@ -59,7 +59,10 @@ index 41f13ea18..ccdd92d43 100644 State: NavigationState = NavigationState, ScreenOptions: { ... } = { ... }, EventMap: EventMapBase = EventMapBase, -@@ -212,7 +212,7 @@ export type NavigationProp< + > = NavigationHelpersCommon & { + setParams(params: Partial<$ElementType>): void, + setOptions(options: Partial): void, + ... } & EventConsumer> & PrivateValueStore; @@ -68,10 +71,10 @@ index 41f13ea18..ccdd92d43 100644 Extract, $ElementType, >; -diff --git a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow index cf53d769d..8d2ea317f 100644 ---- a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +--- types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow ++++ types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow @@ -42,7 +42,7 @@ export type MaterialTopTabNavigationHelpers = NavigationHelpers< TabActionHelpers; export type MaterialTopTabNavigationProp< @@ -81,10 +84,10 @@ index cf53d769d..8d2ea317f 100644 > = NavigationProp< ParamList, RouteName, -diff --git a/types/@react-navigation/routers/lib/typescript/src/types.js.flow b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/types.js.flow types/@react-navigation/routers/lib/typescript/src/types.js.flow index ea0e29c32..6a0de188b 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +--- types/@react-navigation/routers/lib/typescript/src/types.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/types.js.flow @@ -4,12 +4,12 @@ import type { Extract, Readonly, Partial } from 'tsflower/subst/lib'; import * as CommonActions from './CommonActions'; @@ -118,10 +121,10 @@ index ea0e29c32..6a0de188b 100644 key: string, name: RouteName, ... -diff --git a/types/@react-navigation/stack/lib/typescript/src/types.js.flow b/types/@react-navigation/stack/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/stack/lib/typescript/src/types.js.flow types/@react-navigation/stack/lib/typescript/src/types.js.flow index 94ea2dee5..da137e97a 100644 ---- a/types/@react-navigation/stack/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/stack/lib/typescript/src/types.js.flow +--- types/@react-navigation/stack/lib/typescript/src/types.js.flow ++++ types/@react-navigation/stack/lib/typescript/src/types.js.flow @@ -43,7 +43,7 @@ export type StackNavigationHelpers = NavigationHelpers; export type StackNavigationProp< @@ -132,5 +135,5 @@ index 94ea2dee5..da137e97a 100644 ParamList, RouteName, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0014-irreducible-rnav-EventMap-types-exact-and-covariant.patch b/types/patches/0014-irreducible-rnav-EventMap-types-exact-and-covariant.patch index 4040a165e26..565477e6439 100644 --- a/types/patches/0014-irreducible-rnav-EventMap-types-exact-and-covariant.patch +++ b/types/patches/0014-irreducible-rnav-EventMap-types-exact-and-covariant.patch @@ -13,10 +13,10 @@ subtypes of the latter's. .../stack/lib/typescript/src/types.js.flow | 15 ++++--- 4 files changed, 37 insertions(+), 47 deletions(-) -diff --git a/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow b/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow index 3bc615faa..ed9343057 100644 ---- a/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow +--- types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow ++++ types/@react-navigation/bottom-tabs/lib/typescript/src/types.js.flow @@ -32,15 +32,13 @@ import { type RouteProp, } from '@react-navigation/native'; @@ -38,10 +38,10 @@ index 3bc615faa..ed9343057 100644 export type LabelPosition = 'beside-icon' | 'below-icon'; export type BottomTabNavigationHelpers = NavigationHelpers< -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index ccdd92d43..1421d39dd 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow +--- types/@react-navigation/core/lib/typescript/src/types.js.flow ++++ types/@react-navigation/core/lib/typescript/src/types.js.flow @@ -45,24 +45,21 @@ export type DefaultNavigatorOptions< }; @@ -113,10 +113,10 @@ index ccdd92d43..1421d39dd 100644 export type NavigationContainerRef = NavigationHelpers & EventConsumer & { -diff --git a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow index 8d2ea317f..36bc57918 100644 ---- a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +--- types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow ++++ types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow @@ -23,17 +23,15 @@ import { type RouteProp, } from '@react-navigation/native'; @@ -142,10 +142,10 @@ index 8d2ea317f..36bc57918 100644 export type MaterialTopTabNavigationHelpers = NavigationHelpers< ParamListBase, -diff --git a/types/@react-navigation/stack/lib/typescript/src/types.js.flow b/types/@react-navigation/stack/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/stack/lib/typescript/src/types.js.flow types/@react-navigation/stack/lib/typescript/src/types.js.flow index da137e97a..fa014c506 100644 ---- a/types/@react-navigation/stack/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/stack/lib/typescript/src/types.js.flow +--- types/@react-navigation/stack/lib/typescript/src/types.js.flow ++++ types/@react-navigation/stack/lib/typescript/src/types.js.flow @@ -30,14 +30,13 @@ import { type RouteProp, } from '@react-navigation/native'; @@ -169,5 +169,5 @@ index da137e97a..fa014c506 100644 export type StackNavigationHelpers = NavigationHelpers & StackActionHelpers; -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0015-tsflower-rnav-Fix-a-parenthesization-of-intersection.patch b/types/patches/0015-tsflower-rnav-Fix-a-parenthesization-of-intersection.patch index 8ac6adef0a2..43770375226 100644 --- a/types/patches/0015-tsflower-rnav-Fix-a-parenthesization-of-intersection.patch +++ b/types/patches/0015-tsflower-rnav-Fix-a-parenthesization-of-intersection.patch @@ -11,10 +11,10 @@ So that's a TsFlower bug. Probably ultimately a Recast bug. .../core/lib/typescript/src/types.js.flow | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index 1421d39dd..cb0af945e 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow +--- types/@react-navigation/core/lib/typescript/src/types.js.flow ++++ types/@react-navigation/core/lib/typescript/src/types.js.flow @@ -268,32 +268,32 @@ export type RouteConfig< State: NavigationState<>, ScreenOptions: { ... }, @@ -81,5 +81,5 @@ index 1421d39dd..cb0af945e 100644 export type NavigationContainerEventMap = {| state: {| data: { state: NavigationState<> | PartialState> | void, ... } |}, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0016-tsflower-Handle-TS-reference-pragma-for-React-in-mat.patch b/types/patches/0016-tsflower-Handle-TS-reference-pragma-for-React-in-mat.patch index ae2540b306f..922e8bdd003 100644 --- a/types/patches/0016-tsflower-Handle-TS-reference-pragma-for-React-in-mat.patch +++ b/types/patches/0016-tsflower-Handle-TS-reference-pragma-for-React-in-mat.patch @@ -21,10 +21,10 @@ rewrite references like `React.ReactNode`. .../lib/typescript/src/types.js.flow | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow index 36bc57918..1c02714a5 100644 ---- a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +--- types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow ++++ types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow @@ -3,6 +3,7 @@ */ import type { Partial } from 'tsflower/subst/lib'; @@ -48,7 +48,7 @@ index 36bc57918..1c02714a5 100644 tabBarAccessibilityLabel?: string, tabBarTestID?: string, ... -@@ -88,7 +89,7 @@ export type MaterialTopTabDescriptorMap = { [key: string]: MaterialTopTabDescrip +@@ -88,30 +89,30 @@ export type MaterialTopTabDescriptorMap = { [key: string]: MaterialTopTabDescrip export type MaterialTopTabNavigationConfig = Partial< $Diff< @@ -57,7 +57,12 @@ index 36bc57918..1c02714a5 100644 {| navigationState: mixed, onIndexChange: mixed, -@@ -101,9 +102,9 @@ export type MaterialTopTabNavigationConfig = Partial< + onSwipeStart: mixed, + onSwipeEnd: mixed, + renderScene: mixed, + renderTabBar: mixed, + renderPager: mixed, + renderLazyPlaceholder: mixed, |}, >, > & { @@ -70,7 +75,7 @@ index 36bc57918..1c02714a5 100644 tabBarOptions?: MaterialTopTabBarOptions, tabBarPosition?: 'top' | 'bottom', ... -@@ -111,7 +112,7 @@ export type MaterialTopTabNavigationConfig = Partial< + }; export type MaterialTopTabBarOptions = Partial< $Diff< @@ -80,5 +85,5 @@ index 36bc57918..1c02714a5 100644 [key: | 'navigationState' -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0017-tsflower-Resolve-re-export-indirection-on-CommonActi.patch b/types/patches/0017-tsflower-Resolve-re-export-indirection-on-CommonActi.patch index 9849105e164..bcadab8bb38 100644 --- a/types/patches/0017-tsflower-Resolve-re-export-indirection-on-CommonActi.patch +++ b/types/patches/0017-tsflower-Resolve-re-export-indirection-on-CommonActi.patch @@ -33,10 +33,10 @@ imports for those. .../core/lib/typescript/src/getActionFromState.js.flow | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow b/types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow index cc5442458..3f2af62eb 100644 ---- a/types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow +--- types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow ++++ types/@react-navigation/core/lib/typescript/src/getActionFromState.js.flow @@ -1,11 +1,8 @@ /* @flow * @generated by TsFlower @@ -52,5 +52,5 @@ index cc5442458..3f2af62eb 100644 type Options = { -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0018-tsflower-Fix-import-type-of-classes.patch b/types/patches/0018-tsflower-Fix-import-type-of-classes.patch index 0ecac010eab..be626e9059d 100644 --- a/types/patches/0018-tsflower-Fix-import-type-of-classes.patch +++ b/types/patches/0018-tsflower-Fix-import-type-of-classes.patch @@ -42,10 +42,10 @@ value binding and doesn't also have a type binding.) .../material-top-tabs/lib/typescript/src/types.js.flow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow index 1c02714a5..0dd4c30b6 100644 ---- a/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow +--- types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow ++++ types/@react-navigation/material-top-tabs/lib/typescript/src/types.js.flow @@ -11,7 +11,7 @@ import type { } from 'tsflower/subst/react-native'; @@ -56,5 +56,5 @@ index 1c02714a5..0dd4c30b6 100644 import { type ParamListBase, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0019-tsflower-Better-substitution-for-React.ForwardRefExo.patch b/types/patches/0019-tsflower-Better-substitution-for-React.ForwardRefExo.patch index d1595ef56d7..af005431eb8 100644 --- a/types/patches/0019-tsflower-Better-substitution-for-React.ForwardRefExo.patch +++ b/types/patches/0019-tsflower-Better-substitution-for-React.ForwardRefExo.patch @@ -7,10 +7,10 @@ Subject: [tsflower] Better substitution for React.ForwardRefExoticComponent .../lib/typescript/src/NavigationContainer.js.flow | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -diff --git a/types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow b/types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow +diff --git types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow index fecf4f88b..ef52d077f 100644 ---- a/types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow -+++ b/types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow +--- types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow ++++ types/@react-navigation/native/lib/typescript/src/NavigationContainer.js.flow @@ -2,16 +2,21 @@ * @generated by TsFlower */ @@ -36,5 +36,5 @@ index fecf4f88b..ef52d077f 100644 theme?: Theme | void, linking?: LinkingOptions | void, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0020-tsflower-Manually-rewrite-Pick-from-TS-default-libra.patch b/types/patches/0020-tsflower-Manually-rewrite-Pick-from-TS-default-libra.patch index 0a9c7bad506..12e1f303a73 100644 --- a/types/patches/0020-tsflower-Manually-rewrite-Pick-from-TS-default-libra.patch +++ b/types/patches/0020-tsflower-Manually-rewrite-Pick-from-TS-default-libra.patch @@ -28,10 +28,10 @@ first argument? .../lib/typescript/src/TabRouter.js.flow | 35 +++++----- 5 files changed, 67 insertions(+), 154 deletions(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow b/types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow index 081a20a79..c07a899ba 100644 ---- a/types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow +--- types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow ++++ types/@react-navigation/core/lib/typescript/src/useNavigationBuilder.js.flow @@ -1,6 +1,7 @@ /* @flow * @generated by TsFlower @@ -55,11 +55,11 @@ index 081a20a79..c07a899ba 100644 >, ) => $tsflower_subst$React$JSX$Element, ... -diff --git a/types/@react-navigation/native/lib/typescript/src/useLinking.js.flow b/types/@react-navigation/native/lib/typescript/src/useLinking.js.flow +diff --git types/@react-navigation/native/lib/typescript/src/useLinking.js.flow types/@react-navigation/native/lib/typescript/src/useLinking.js.flow index 66bfb1f4d..19a797a4a 100644 ---- a/types/@react-navigation/native/lib/typescript/src/useLinking.js.flow -+++ b/types/@react-navigation/native/lib/typescript/src/useLinking.js.flow -@@ -16,33 +16,14 @@ declare export default function useLinking( +--- types/@react-navigation/native/lib/typescript/src/useLinking.js.flow ++++ types/@react-navigation/native/lib/typescript/src/useLinking.js.flow +@@ -16,70 +16,32 @@ declare export default function useLinking( ): { getInitialState: () => PromiseLike< | (Partial< @@ -101,7 +101,10 @@ index 66bfb1f4d..19a797a4a 100644 > & Readonly<{ stale?: true | void, -@@ -53,33 +34,14 @@ declare export default function useLinking( + routes: $tsflower_import_type$_$_40_react_2d_navigation_2f_core$PartialRoute< + $tsflower_import_type$_$_40_react_2d_navigation_2f_core$Route, + >[], + ... }> & { state?: | (Partial< @@ -143,11 +146,11 @@ index 66bfb1f4d..19a797a4a 100644 > & Readonly<{ stale?: true | void, -diff --git a/types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow b/types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow +diff --git types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow index 66bfb1f4d..19a797a4a 100644 ---- a/types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow -+++ b/types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow -@@ -16,33 +16,14 @@ declare export default function useLinking( +--- types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow ++++ types/@react-navigation/native/lib/typescript/src/useLinking.native.js.flow +@@ -16,70 +16,32 @@ declare export default function useLinking( ): { getInitialState: () => PromiseLike< | (Partial< @@ -189,7 +192,10 @@ index 66bfb1f4d..19a797a4a 100644 > & Readonly<{ stale?: true | void, -@@ -53,33 +34,14 @@ declare export default function useLinking( + routes: $tsflower_import_type$_$_40_react_2d_navigation_2f_core$PartialRoute< + $tsflower_import_type$_$_40_react_2d_navigation_2f_core$Route, + >[], + ... }> & { state?: | (Partial< @@ -231,10 +237,10 @@ index 66bfb1f4d..19a797a4a 100644 > & Readonly<{ stale?: true | void, -diff --git a/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow b/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow index d7bdf0f5e..cce94da4b 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow +--- types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/StackRouter.js.flow @@ -1,6 +1,7 @@ /* @flow * @generated by TsFlower @@ -290,10 +296,10 @@ index d7bdf0f5e..cce94da4b 100644 | void, source?: string | void, target?: string | void, -diff --git a/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow b/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow index 4fa8ed1ca..db3326e84 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow +--- types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/TabRouter.js.flow @@ -1,6 +1,7 @@ /* @flow * @generated by TsFlower @@ -344,5 +350,5 @@ index 4fa8ed1ca..db3326e84 100644 source?: string | void, target?: string | void, -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0021-tsflower-Substitute-for-React.ReactText.patch b/types/patches/0021-tsflower-Substitute-for-React.ReactText.patch index 8f45576f202..b6a7d7c5c50 100644 --- a/types/patches/0021-tsflower-Substitute-for-React.ReactText.patch +++ b/types/patches/0021-tsflower-Substitute-for-React.ReactText.patch @@ -7,10 +7,10 @@ Subject: [tsflower] Substitute for React.ReactText .../core/lib/typescript/src/checkSerializable.js.flow | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow b/types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow index 58e35d769..2c1a6e404 100644 ---- a/types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow +--- types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow ++++ types/@react-navigation/core/lib/typescript/src/checkSerializable.js.flow @@ -1,13 +1,13 @@ /* @flow * @generated by TsFlower @@ -28,5 +28,5 @@ index 58e35d769..2c1a6e404 100644 ... }; -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0022-adhoc-rnav-Manually-approximate-conditional-in-Route.patch b/types/patches/0022-adhoc-rnav-Manually-approximate-conditional-in-Route.patch index e7adc34b0c0..b0711878445 100644 --- a/types/patches/0022-adhoc-rnav-Manually-approximate-conditional-in-Route.patch +++ b/types/patches/0022-adhoc-rnav-Manually-approximate-conditional-in-Route.patch @@ -24,11 +24,11 @@ probably get annoying. .../routers/lib/typescript/src/types.js.flow | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/types/@react-navigation/routers/lib/typescript/src/types.js.flow b/types/@react-navigation/routers/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/routers/lib/typescript/src/types.js.flow types/@react-navigation/routers/lib/typescript/src/types.js.flow index 6a0de188b..2bef8a174 100644 ---- a/types/@react-navigation/routers/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/routers/lib/typescript/src/types.js.flow -@@ -56,9 +56,9 @@ export type PartialState<+State: NavigationState<>> = Partial< +--- types/@react-navigation/routers/lib/typescript/src/types.js.flow ++++ types/@react-navigation/routers/lib/typescript/src/types.js.flow +@@ -56,19 +56,19 @@ export type PartialState<+State: NavigationState<>> = Partial< export type Route<+RouteName: string, +Params: { ... } | void = { ... } | void> = $ReadOnly<{ key: string, name: RouteName, @@ -40,7 +40,9 @@ index 6a0de188b..2bef8a174 100644 /** * Params for this route * / -@@ -68,7 +68,7 @@ export type Route<+RouteName: string, +Params: { ... } | void = { ... } | void> + params?: Readonly; + }> : Readonly<{ + /** * Params for this route * / params: Readonly; @@ -50,5 +52,5 @@ index 6a0de188b..2bef8a174 100644 export type ParamListBase = { +[key: string]: { ... } | void }; -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0023-adhoc-rnav-Manually-approximate-conditionals-in-Even.patch b/types/patches/0023-adhoc-rnav-Manually-approximate-conditionals-in-Even.patch index dc9458e7541..72de901716e 100644 --- a/types/patches/0023-adhoc-rnav-Manually-approximate-conditionals-in-Even.patch +++ b/types/patches/0023-adhoc-rnav-Manually-approximate-conditionals-in-Even.patch @@ -15,11 +15,11 @@ them unconditionally. .../core/lib/typescript/src/types.js.flow | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index cb0af945e..4d918550e 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow -@@ -65,7 +65,11 @@ export type EventArg; -- -2.32.0 (Apple Git-132) +2.32.0 diff --git a/types/patches/0024-rnav-Fix-odd-initialRouteName-index-signature-error.patch b/types/patches/0024-rnav-Fix-odd-initialRouteName-index-signature-error.patch index e0d8e70344b..ee505d257ea 100644 --- a/types/patches/0024-rnav-Fix-odd-initialRouteName-index-signature-error.patch +++ b/types/patches/0024-rnav-Fix-odd-initialRouteName-index-signature-error.patch @@ -33,10 +33,10 @@ References: types/@react-navigation/core/lib/typescript/src/types.js.flow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/types/@react-navigation/core/lib/typescript/src/types.js.flow b/types/@react-navigation/core/lib/typescript/src/types.js.flow +diff --git types/@react-navigation/core/lib/typescript/src/types.js.flow types/@react-navigation/core/lib/typescript/src/types.js.flow index 4d918550e..58cf56a85 100644 ---- a/types/@react-navigation/core/lib/typescript/src/types.js.flow -+++ b/types/@react-navigation/core/lib/typescript/src/types.js.flow +--- types/@react-navigation/core/lib/typescript/src/types.js.flow ++++ types/@react-navigation/core/lib/typescript/src/types.js.flow @@ -24,7 +24,7 @@ import { export type DefaultNavigatorOptions< ScreenOptions: { ... }, @@ -47,5 +47,5 @@ index 4d918550e..58cf56a85 100644 screenOptions?: | ScreenOptions -- -2.32.0 (Apple Git-132) +2.32.0