From b6c0703ebb9c0432acf6b87e894d6a33949017cc Mon Sep 17 00:00:00 2001 From: Alex Hunt Date: Tue, 3 Oct 2023 11:56:51 -0400 Subject: [PATCH] Fix typings for ReactNativeVersion.js This is an eager cherry pick of #39784 for `0.73-stable`. --- .../react-native/Libraries/Core/ReactNativeVersionCheck.js | 3 +-- .../Libraries/Utilities/NativePlatformConstantsAndroid.js | 2 +- .../Libraries/Utilities/NativePlatformConstantsIOS.js | 2 +- packages/react-native/Libraries/Utilities/Platform.android.js | 2 +- packages/react-native/Libraries/Utilities/Platform.flow.js | 4 ++-- packages/react-native/Libraries/Utilities/Platform.ios.js | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/react-native/Libraries/Core/ReactNativeVersionCheck.js b/packages/react-native/Libraries/Core/ReactNativeVersionCheck.js index 8b41988696d6b5..b3c437ac45d76d 100644 --- a/packages/react-native/Libraries/Core/ReactNativeVersionCheck.js +++ b/packages/react-native/Libraries/Core/ReactNativeVersionCheck.js @@ -44,7 +44,6 @@ function _formatVersion( ): string { return ( `${version.major}.${version.minor}.${version.patch}` + - // eslint-disable-next-line eqeqeq - (version.prerelease != undefined ? `-${version.prerelease}` : '') + (version.prerelease != null ? `-${version.prerelease}` : '') ); } diff --git a/packages/react-native/Libraries/Utilities/NativePlatformConstantsAndroid.js b/packages/react-native/Libraries/Utilities/NativePlatformConstantsAndroid.js index 6eab28ff02f397..2d6e1faed90d7b 100644 --- a/packages/react-native/Libraries/Utilities/NativePlatformConstantsAndroid.js +++ b/packages/react-native/Libraries/Utilities/NativePlatformConstantsAndroid.js @@ -16,7 +16,7 @@ export type ReactNativeVersionAndroid = {| major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}; export type PlatformConstantsAndroid = {| diff --git a/packages/react-native/Libraries/Utilities/NativePlatformConstantsIOS.js b/packages/react-native/Libraries/Utilities/NativePlatformConstantsIOS.js index 1a2cf4ad5069a0..e8769b1eb42fe7 100644 --- a/packages/react-native/Libraries/Utilities/NativePlatformConstantsIOS.js +++ b/packages/react-native/Libraries/Utilities/NativePlatformConstantsIOS.js @@ -19,7 +19,7 @@ export type PlatformConstantsIOS = {| major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, forceTouchAvailable: boolean, osVersion: string, diff --git a/packages/react-native/Libraries/Utilities/Platform.android.js b/packages/react-native/Libraries/Utilities/Platform.android.js index 95210a315a256a..4a10f33ab0ec47 100644 --- a/packages/react-native/Libraries/Utilities/Platform.android.js +++ b/packages/react-native/Libraries/Utilities/Platform.android.js @@ -31,7 +31,7 @@ const Platform: PlatformType = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, Version: number, Release: string, diff --git a/packages/react-native/Libraries/Utilities/Platform.flow.js b/packages/react-native/Libraries/Utilities/Platform.flow.js index d4bc8147249e36..19f4a68f7bd4c8 100644 --- a/packages/react-native/Libraries/Utilities/Platform.flow.js +++ b/packages/react-native/Libraries/Utilities/Platform.flow.js @@ -32,7 +32,7 @@ type IOSPlatform = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, systemName: string, |}, @@ -60,7 +60,7 @@ type AndroidPlatform = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, Version: number, Release: string, diff --git a/packages/react-native/Libraries/Utilities/Platform.ios.js b/packages/react-native/Libraries/Utilities/Platform.ios.js index 53371634e7d9f7..7ea9cb4f244d8f 100644 --- a/packages/react-native/Libraries/Utilities/Platform.ios.js +++ b/packages/react-native/Libraries/Utilities/Platform.ios.js @@ -34,7 +34,7 @@ const Platform: PlatformType = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, systemName: string, |} {