chore: fix lib build

README.md

@@ -23,7 +23,7 @@ Rive React Native 2.0
 ## Installation
 
 ```sh
-npm install react-native-rive react-native-nitro-modules
+npm install rive-app/rive-nitro-react-native react-native-nitro-modules
 ```
 
 > `react-native-nitro-modules` is required as this library relies on [Nitro Modules](https://nitro.margelo.com/).

react_native_rive.podspec → RNRive.podspec

@@ -31,7 +31,7 @@ end
 Pod::UI.puts "react-native-rive: Rive iOS SDK #{rive_ios_version}"
 
 Pod::Spec.new do |s|
-  s.name         = "react_native_rive"
+  s.name         = "RNRive"
   s.version      = package["version"]
   s.summary      = package["description"]
   s.homepage     = package["homepage"]
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.public_header_files = ['ios/RCTSwiftLog.h']
-  load 'nitrogen/generated/ios/react_native_rive+autolinking.rb'
+  load 'nitrogen/generated/ios/RNRive+autolinking.rb'
   add_nitrogen_files(s)
 
   s.dependency "RiveRuntime", rive_ios_version

example/ios/Podfile.lock

@@ -1687,32 +1687,6 @@ PODS:
     - React-debug
     - React-hermes
     - React-jsi (= 0.79.2)
-  - react_native_rive (0.1.0):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - NitroModules
-    - RCT-Folly (= 2024.11.18.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-hermes
-    - React-ImageManager
-    - React-jsi
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-renderercss
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - RiveRuntime (= 6.12.0)
-    - Yoga
   - ReactAppDependencyProvider (0.79.2):
     - ReactCodegen
   - ReactCodegen (0.79.2):
@@ -1829,6 +1803,32 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
+  - RNRive (0.1.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - NitroModules
+    - RCT-Folly (= 2024.11.18.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - RiveRuntime (= 6.12.0)
+    - Yoga
   - SocketRocket (0.7.1)
   - Yoga (0.0.0)
 
@@ -1903,12 +1903,12 @@ DEPENDENCIES:
   - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
   - React-timing (from `../node_modules/react-native/ReactCommon/react/timing`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
-  - react_native_rive (from `../..`)
   - ReactAppDependencyProvider (from `build/generated/ios`)
   - ReactCodegen (from `build/generated/ios`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
+  - RNRive (from `../..`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -2054,8 +2054,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/timing"
   React-utils:
     :path: "../node_modules/react-native/ReactCommon/react/utils"
-  react_native_rive:
-    :path: "../.."
   ReactAppDependencyProvider:
     :path: build/generated/ios
   ReactCodegen:
@@ -2066,6 +2064,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-picker/picker"
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
+  RNRive:
+    :path: "../.."
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -2138,13 +2138,13 @@ SPEC CHECKSUMS:
   React-runtimescheduler: e917ab17ae08c204af1ebf8f669b7e411b0220c8
   React-timing: a90f4654cbda9c628614f9bee68967f1768bd6a5
   React-utils: 51c4e71608b8133fecc9a15801d244ae7bdf3758
-  react_native_rive: a6e6aa9ef2826c95aeaa7e40619a04f3887c8ac7
   ReactAppDependencyProvider: d5dcc564f129632276bd3184e60f053fcd574d6b
   ReactCodegen: fda99a79c866370190e162083a35602fdc314e5d
   ReactCommon: 4d0da92a5eb8da86c08e3ec34bd23ab439fb2461
   RiveRuntime: 8d819993126145fbf5a73089e7634b14b9aa577f
   RNCPicker: 83c74db2de8274d8a8f3e18d91dea174a708f8c4
   RNGestureHandler: bff91bb5ab5688265c70f74180ef718b94f33fe3
+  RNRive: 6ced82b0b2ff90cbb87813849e9c05761d038119
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: 9f110fc4b7aa538663cba3c14cbb1c335f43c13f
 

example/src/pages/ManyViewModels.tsx

@@ -64,7 +64,7 @@ function BindModeSelector({
 
 function getDataBindValue(
   mode: BindModeOption,
-  greenInstance: ViewModelInstance | null
+  greenInstance: ViewModelInstance | undefined
 ) {
   if (mode === 'none') return DataBindMode.None;
   if (mode === 'auto') return DataBindMode.Auto;
@@ -80,14 +80,14 @@ export default function ManyViewModels() {
 
   // Create a ViewModelInstance for "green" to demonstrate instance binding
   const greenInstance = useMemo(() => {
-    if (!riveFile) return null;
+    if (!riveFile) return undefined;
     try {
       const viewModel = riveFile.defaultArtboardViewModel();
-      if (!viewModel) return null;
+      if (!viewModel) return undefined;
       return viewModel.createInstanceByName('green');
     } catch (e) {
       console.error('Failed to create green instance:', e);
-      return null;
+      return undefined;
     }
   }, [riveFile]);
 

expo-example/package.json

@@ -35,7 +35,6 @@
     "react-native-gesture-handler": "~2.28.0",
     "react-native-nitro-modules": "^0.31.3",
     "react-native-reanimated": "~4.1.1",
-    "react-native-rive": "*",
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",
     "react-native-web": "~0.21.0",

nitro.json

@@ -2,7 +2,7 @@
   "$schema": "https://nitro.margelo.com/nitro.schema.json",
   "cxxNamespace": ["rive"],
   "ios": {
-    "iosModuleName": "react_native_rive"
+    "iosModuleName": "RNRive"
   },
   "android": {
     "androidNamespace": ["rive"],