fix: declare support for 0.81

Author: tido64

example/App.tsx

@@ -10,8 +10,6 @@ import {
   useColorScheme,
   View,
 } from "react-native";
-// @ts-expect-error no type definitions available
-import { version as coreVersion } from "react-native/Libraries/Core/ReactNativeVersion";
 import { SafeAreaView } from "./SafeAreaView";
 
 declare global {
@@ -31,6 +29,14 @@ type FeatureProps =
       onValueChange?: (value: boolean) => void;
     };
 
+type ReactNativeVersion = {
+  major: number;
+  minor: number;
+  patch: number;
+  prerelease?: string;
+  getVersionString?: () => string;
+};
+
 // https://github.com/facebook/react-native/blob/0abd5d63e1c0c4708f81bd698e6d011fa75f01e5/packages/new-app-screen/src/Theme.js#L16-L33
 const COLORS = {
   light: {
@@ -51,6 +57,17 @@ const COLORS = {
   },
 };
 
+const ReactNativeVersion: ReactNativeVersion = (() => {
+  // https://github.com/facebook/react-native/commit/ec5638abd0e872be62b6ea5d8df9bed6335c2191
+  const { ReactNativeVersion } = require("react-native");
+  if (ReactNativeVersion) {
+    return ReactNativeVersion;
+  }
+
+  const { version } = require("react-native/Libraries/Core/ReactNativeVersion");
+  return version;
+})();
+
 function getHermesVersion(): string | undefined {
   const version =
     "HermesInternal" in global &&
@@ -66,7 +83,11 @@ function getHermesVersion(): string | undefined {
 }
 
 function getReactNativeVersion(): string {
-  const { major, minor, patch, prerelease } = coreVersion;
+  if (ReactNativeVersion.getVersionString) {
+    return ReactNativeVersion.getVersionString();
+  }
+
+  const { major, minor, patch, prerelease } = ReactNativeVersion;
   const version = `${major}.${minor}.${patch}`;
   return prerelease ? `${version}-${prerelease.replace("-", "\n")}` : version;
 }
@@ -76,7 +97,7 @@ function isBridgeless() {
 }
 
 function isConcurrentReactEnabled(props: AppProps, isFabric: boolean): boolean {
-  const { major, minor } = coreVersion;
+  const { major, minor } = ReactNativeVersion;
   const version = major * 10000 + minor;
   // As of 0.74, it won't be possible to opt-out:
   // https://github.com/facebook/react-native/commit/30d186c3683228d4fb7a42f804eb2fdfa7c8ac03

example/SafeAreaView.tsx

@@ -1,4 +1,5 @@
 import * as React from "react";
+import { View } from "react-native";
 import type { SafeAreaViewProps } from "react-native-safe-area-context";
 import {
   SafeAreaProvider,
@@ -7,9 +8,14 @@ import {
 } from "react-native-safe-area-context";
 
 export function SafeAreaView(props: SafeAreaViewProps) {
-  return (
-    <SafeAreaProvider initialMetrics={initialWindowMetrics}>
-      <SafeAreaViewInternal {...props} />
-    </SafeAreaProvider>
-  );
+  // TODO: `SafeAreaView` currently crashes in bridgeless mode
+  if ("RN$Bridgeless" in global && RN$Bridgeless === true) {
+    return <View {...props} />;
+  } else {
+    return (
+      <SafeAreaProvider initialMetrics={initialWindowMetrics}>
+        <SafeAreaViewInternal {...props} />
+      </SafeAreaProvider>
+    );
+  }
 }

example/package.json

@@ -33,7 +33,7 @@
     "@react-native-community/cli": "^15.0.1",
     "@react-native/babel-preset": "^0.78.0",
     "@react-native/metro-config": "^0.78.0",
-    "@rnx-kit/cli": "^0.18.7",
+    "@rnx-kit/cli": "^0.18.11",
     "@rnx-kit/metro-config": "^2.1.0",
     "@rnx-kit/polyfills": "^0.2.0",
     "@rnx-kit/tsconfig": "^2.0.0",

package.json

@@ -101,7 +101,7 @@
     "@callstack/react-native-visionos": "0.73 - 0.78",
     "@expo/config-plugins": ">=5.0",
     "react": "18.1 - 19.1",
-    "react-native": "0.70 - 0.80 || >=0.81.0-0 <0.81.0",
+    "react-native": "0.70 - 0.81 || >=0.82.0-0 <0.82.0",
     "react-native-macos": "^0.0.0-0 || 0.71 - 0.78",
     "react-native-windows": "^0.0.0-0 || 0.70 - 0.79"
   },

yarn.lock

@@ -3661,9 +3661,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rnx-kit/cli@npm:^0.18.7":
-  version: 0.18.10
-  resolution: "@rnx-kit/cli@npm:0.18.10"
+"@rnx-kit/cli@npm:^0.18.11":
+  version: 0.18.11
+  resolution: "@rnx-kit/cli@npm:0.18.11"
   dependencies:
     "@rnx-kit/align-deps": "npm:^3.1.0"
     "@rnx-kit/config": "npm:^0.7.0"
@@ -3675,7 +3675,7 @@ __metadata:
     "@rnx-kit/metro-serializer-esbuild": "npm:^0.2.1"
     "@rnx-kit/metro-service": "npm:^4.0.2"
     "@rnx-kit/third-party-notices": "npm:^2.0.0"
-    "@rnx-kit/tools-android": "npm:^0.2.0"
+    "@rnx-kit/tools-android": "npm:^0.2.1"
     "@rnx-kit/tools-apple": "npm:^0.2.1"
     "@rnx-kit/tools-filesystem": "npm:^0.1.0"
     "@rnx-kit/tools-language": "npm:^3.0.0"
@@ -3694,7 +3694,7 @@ __metadata:
       optional: true
   bin:
     rnx-cli: bin/rnx-cli.cjs
-  checksum: 10c0/b568d645374b7718966a9c9f11ca318de7bdbf1e2310397f163ddf93e3d9a457f9e3b63fc242ce9631de3ea925d830115720424ccc99a31ff5ed500ec8f8b3b2
+  checksum: 10c0/6d2fb5ab342290180cf74327e3e456b842e0b8213f14c98b85e6744deeb4872a304e028ee37fe95cf20a71adcd67e6ab4df5191cec7ea917edbff111fdc28966
   languageName: node
   linkType: hard
 
@@ -3888,12 +3888,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rnx-kit/tools-android@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "@rnx-kit/tools-android@npm:0.2.0"
+"@rnx-kit/tools-android@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "@rnx-kit/tools-android@npm:0.2.1"
   dependencies:
     "@rnx-kit/tools-shell": "npm:^0.2.0"
-  checksum: 10c0/112844ba10b8efdd6ba05d5a626aca1a0f319112a1ec54cdedf9d2c1c51ac424fe728575a6f457a2dbb5a1174b5e47d32a1afbd7feb08f05814ff1dc12c40f60
+  checksum: 10c0/63ec0ffb0325b3dd541b80052ad17401084132daa7812613057e445c0431741447046ea6356d237530167ce6383d51dfe56b82b5672aa83ce3523c027a941fcf
   languageName: node
   linkType: hard
 
@@ -3939,11 +3939,11 @@ __metadata:
   linkType: hard
 
 "@rnx-kit/tools-react-native@npm:^2.0.0, @rnx-kit/tools-react-native@npm:^2.0.3, @rnx-kit/tools-react-native@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@rnx-kit/tools-react-native@npm:2.1.0"
+  version: 2.2.0
+  resolution: "@rnx-kit/tools-react-native@npm:2.2.0"
   dependencies:
     "@rnx-kit/tools-node": "npm:^3.0.0"
-  checksum: 10c0/ac7bcaaf870463fe51cbd3f2aac631c41c085e00dd1809706ad33f498f1feba31cde611662d5ec55bd25b48ac367c8e5c4eead8749b6e6989b380b4cb6b9a161
+  checksum: 10c0/631eecefda6b2b53eccdd18656f24a5426625522b80e956504d2b37acbcdc1e98eddc692aec0833536e6fd1b285c4a5d75e27f23a16fdcb099fabae46013740d
   languageName: node
   linkType: hard
 
@@ -7766,7 +7766,7 @@ __metadata:
     "@react-native-webapis/web-storage": "npm:^0.4.1"
     "@react-native/babel-preset": "npm:^0.78.0"
     "@react-native/metro-config": "npm:^0.78.0"
-    "@rnx-kit/cli": "npm:^0.18.7"
+    "@rnx-kit/cli": "npm:^0.18.11"
     "@rnx-kit/metro-config": "npm:^2.1.0"
     "@rnx-kit/polyfills": "npm:^0.2.0"
     "@rnx-kit/tsconfig": "npm:^2.0.0"
@@ -12228,7 +12228,7 @@ __metadata:
     "@callstack/react-native-visionos": 0.73 - 0.78
     "@expo/config-plugins": ">=5.0"
     react: 18.1 - 19.1
-    react-native: 0.70 - 0.80 || >=0.81.0-0 <0.81.0
+    react-native: 0.70 - 0.81 || >=0.82.0-0 <0.82.0
     react-native-macos: ^0.0.0-0 || 0.71 - 0.78
     react-native-windows: ^0.0.0-0 || 0.70 - 0.79
   peerDependenciesMeta: