From 17d2c8acb9b193f9af0bcd318abff324e29933b5 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 16 Dec 2023 13:57:04 -0800 Subject: [PATCH] Ensure Bridge and Bridgeless register native modules using the same order Summary: I've noticed that Bridge and Bridgeless initialize the list of ReactPackages using a different order, we are fixing it in this diff Reviewed By: philIip Differential Revision: D52145148 fbshipit-source-id: 6ad85bd0903f9beab455783e8deaf5c529b87a2e --- .../main/java/com/facebook/react/runtime/ReactInstance.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java index e5e36fe7709..5f33c9158b7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java @@ -208,11 +208,12 @@ final class ReactInstance { Systrace.beginSection( Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstance.initialize#initTurboModules"); - mReactPackages = new ArrayList<>(mDelegate.getReactPackages()); + mReactPackages = new ArrayList<>(); mReactPackages.add( new CoreReactPackage( bridgelessReactContext.getDevSupportManager(), bridgelessReactContext.getDefaultHardwareBackBtnHandler())); + mReactPackages.addAll(mDelegate.getReactPackages()); TurboModuleManagerDelegate turboModuleManagerDelegate = mDelegate