diff --git a/packages/react-native/Libraries/Utilities/Platform.android.js b/packages/react-native/Libraries/Utilities/Platform.android.js index e2cfdf8aa64..756fd50dcf6 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.d.ts b/packages/react-native/Libraries/Utilities/Platform.d.ts index 82246df0ffb..7f7dc61c104 100644 --- a/packages/react-native/Libraries/Utilities/Platform.d.ts +++ b/packages/react-native/Libraries/Utilities/Platform.d.ts @@ -24,7 +24,7 @@ type PlatformConstants = { major: number; minor: number; patch: number; - prerelease?: number | null | undefined; + prerelease?: string | null | undefined; }; }; interface PlatformStatic { diff --git a/packages/react-native/Libraries/Utilities/Platform.flow.js b/packages/react-native/Libraries/Utilities/Platform.flow.js index cfd7bbc71f8..b8a12d86524 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, isMacCatalyst?: boolean, @@ -65,7 +65,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 1fa1b83ab44..a26a50f7946 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, isMacCatalyst?: boolean, diff --git a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap index 2ea05e0ad30..7e45f5932d2 100644 --- a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap +++ b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap @@ -8741,7 +8741,7 @@ type IOSPlatform = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, systemName: string, isMacCatalyst?: boolean, @@ -8765,7 +8765,7 @@ type AndroidPlatform = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, Version: number, Release: string, diff --git a/packages/react-native/React/Base/RCTVersion.m b/packages/react-native/React/Base/RCTVersion.m index 69ce4f75320..5e18b567a8a 100644 --- a/packages/react-native/React/Base/RCTVersion.m +++ b/packages/react-native/React/Base/RCTVersion.m @@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void) RCTVersionMajor: @(1000), RCTVersionMinor: @(0), RCTVersionPatch: @(0), - RCTVersionPrerelease: [NSNull null], + RCTVersionPrerelease: @"alpha.0", }; }); return __rnVersion; diff --git a/packages/react-native/React/CoreModules/RCTPlatform.mm b/packages/react-native/React/CoreModules/RCTPlatform.mm index f357100b71e..ec8a5f3220e 100644 --- a/packages/react-native/React/CoreModules/RCTPlatform.mm +++ b/packages/react-native/React/CoreModules/RCTPlatform.mm @@ -78,9 +78,7 @@ RCT_EXPORT_MODULE(PlatformConstants) {.minor = [versions[@"minor"] doubleValue], .major = [versions[@"major"] doubleValue], .patch = [versions[@"patch"] doubleValue], - .prerelease = [versions[@"prerelease"] isKindOfClass:[NSNull class]] - ? std::optional{} - : [versions[@"prerelease"] doubleValue]}), + .prerelease = [versions[@"prerelease"] isKindOfClass:[NSNull class]] ? nullptr : versions[@"prerelease"]}), #if TARGET_OS_MACCATALYST .isMacCatalyst = true, #else diff --git a/packages/react-native/React/DevSupport/RCTInspectorUtils.mm b/packages/react-native/React/DevSupport/RCTInspectorUtils.mm index 70a4facb09b..099bc32b689 100644 --- a/packages/react-native/React/DevSupport/RCTInspectorUtils.mm +++ b/packages/react-native/React/DevSupport/RCTInspectorUtils.mm @@ -27,14 +27,13 @@ metadata.appIdentifier = [[NSBundle mainBundle] bundleIdentifier]; metadata.platform = RCTPlatformName; metadata.deviceName = [device name]; - metadata.reactNativeVersion = - [NSString stringWithFormat:@"%i.%i.%i%@", - [version[@"major"] intValue], - [version[@"minor"] intValue], - [version[@"patch"] intValue], - [version[@"prerelease"] isKindOfClass:[NSNull class]] - ? @"" - : [@"-" stringByAppendingString:[version[@"prerelease"] stringValue]]]; + metadata.reactNativeVersion = [NSString stringWithFormat:@"%i.%i.%i%@", + [version[@"major"] intValue], + [version[@"minor"] intValue], + [version[@"patch"] intValue], + [version[@"prerelease"] isKindOfClass:[NSNull class]] + ? @"" + : [@"-" stringByAppendingString:version[@"prerelease"]]]; return metadata; } diff --git a/packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js b/packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js index eb9e86100f4..c68afa54f50 100644 --- a/packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js +++ b/packages/react-native/src/private/specs/modules/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/src/private/specs/modules/NativePlatformConstantsIOS.js b/packages/react-native/src/private/specs/modules/NativePlatformConstantsIOS.js index b65cfc96b33..f35b991b2e5 100644 --- a/packages/react-native/src/private/specs/modules/NativePlatformConstantsIOS.js +++ b/packages/react-native/src/private/specs/modules/NativePlatformConstantsIOS.js @@ -19,7 +19,7 @@ export type PlatformConstantsIOS = {| major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, forceTouchAvailable: boolean, osVersion: string,