From 2e5b122f2303d93584c4d8eaf6cfc8db3502e893 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 9 Aug 2023 23:30:01 -0700 Subject: [PATCH] Rename jSMainModulePath -> jsMainModulePath (#38908) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38908 Rename jSMainModulePath -> jsMainModulePath changelog: [internal] internal Reviewed By: rshest Differential Revision: D48051753 fbshipit-source-id: af20a18ec6a01de7db6484b7a7a2e3b2b3353396 --- .../main/java/com/facebook/react/bridgeless/ReactHost.java | 2 +- .../java/com/facebook/react/bridgeless/ReactHostDelegate.kt | 4 ++-- .../com/facebook/react/defaults/DefaultReactHostDelegate.kt | 2 +- .../com/facebook/react/bridgeless/ReactHostDelegateTest.kt | 4 ++-- .../com/facebook/react/uiapp/RNTesterReactHostDelegate.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java index 08db446c7d3..d5f65c6c87f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java @@ -169,7 +169,7 @@ public class ReactHost implements ReactHostInterface { if (DEV) { mDevSupportManager = new BridgelessDevSupportManager( - ReactHost.this, mContext, mReactHostDelegate.getJSMainModulePath()); + ReactHost.this, mContext, mReactHostDelegate.getJsMainModulePath()); } else { mDevSupportManager = new DisabledDevSupportManager(); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt index 1a409a98aab..f476465513e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt @@ -27,7 +27,7 @@ interface ReactHostDelegate { * paths are relative to the root folder the packager is serving files from. Examples: * `index.android` or `subdirectory/index.android` */ - val jSMainModulePath: String + val jsMainModulePath: String /** * Object that holds a native C++ references that allow host applications to install C++ objects @@ -64,7 +64,7 @@ interface ReactHostDelegate { @UnstableReactNativeAPI class ReactHostDelegateBase( - override val jSMainModulePath: String, + override val jsMainModulePath: String, override val jSBundleLoader: JSBundleLoader, override val jSEngineInstance: JSEngineInstance, override val turboModuleManagerDelegateBuilder: diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt index f789bdd03ac..cff03673ace 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt @@ -40,7 +40,7 @@ import com.facebook.react.turbomodule.core.TurboModuleManager @DoNotStrip @UnstableReactNativeAPI class DefaultReactHostDelegate( - override val jSMainModulePath: String, + override val jsMainModulePath: String, override val jSBundleLoader: JSBundleLoader, override val reactPackages: List = emptyList(), override val jSEngineInstance: JSEngineInstance = HermesInstance(), diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt index fc89a8fc46e..9ab26db5fcf 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt @@ -38,11 +38,11 @@ class ReactHostDelegateTest { val jsMainModulePathMocked = "mockedJSMainModulePath" val delegate = DefaultReactHostDelegate( - jSMainModulePath = jsMainModulePathMocked, + jsMainModulePath = jsMainModulePathMocked, jSBundleLoader = jsBundleLoader, jSEngineInstance = hermesInstance, turboModuleManagerDelegateBuilder = turboModuleManagerDelegateBuilderMock) - assertThat(delegate.jSMainModulePath).isEqualTo(jsMainModulePathMocked) + assertThat(delegate.jsMainModulePath).isEqualTo(jsMainModulePathMocked) } } diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java index ef3eb92712d..38ae4cddaaf 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java @@ -57,7 +57,7 @@ public class RNTesterReactHostDelegate implements ReactHostDelegate { } @Override - public String getJSMainModulePath() { + public String getJsMainModulePath() { return "js/RNTesterApp.android"; }