Move TurboModuleManager init outside JSIModules guard
Summary:
TurboModuleManager used to be provided by a JSIModules package. In D26193053 (13f100f788
), we moved TurboModuleManager creation off JSIModules. However, we didn't move the creation outside the JSIModules guard. So, when there were no JSIModules registered, we simply wouldn't create the TurboModuleManager. This diff fixes that mistake.
Changelog: [Internal]
Reviewed By: mdvacca
Differential Revision: D26380674
fbshipit-source-id: 66939d11205b1d2eccd8c3b59ca4782e90645cd9
This commit is contained in:
Родитель
c37d49492b
Коммит
c76070412f
|
@ -1289,34 +1289,34 @@ public class ReactInstanceManager {
|
|||
|
||||
reactContext.initializeWithInstance(catalystInstance);
|
||||
|
||||
if (ReactFeatureFlags.useTurboModules && mTMMDelegateBuilder != null) {
|
||||
TurboModuleManagerDelegate tmmDelegate =
|
||||
mTMMDelegateBuilder
|
||||
.setPackages(mPackages)
|
||||
.setReactApplicationContext(reactContext)
|
||||
.build();
|
||||
|
||||
TurboModuleManager turboModuleManager =
|
||||
new TurboModuleManager(
|
||||
catalystInstance.getRuntimeExecutor(),
|
||||
tmmDelegate,
|
||||
catalystInstance.getJSCallInvokerHolder(),
|
||||
catalystInstance.getNativeCallInvokerHolder());
|
||||
|
||||
catalystInstance.setTurboModuleManager(turboModuleManager);
|
||||
|
||||
TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager;
|
||||
|
||||
// Eagerly initialize TurboModules
|
||||
for (String moduleName : registry.getEagerInitModuleNames()) {
|
||||
registry.getModule(moduleName);
|
||||
}
|
||||
}
|
||||
|
||||
if (mJSIModulePackage != null) {
|
||||
catalystInstance.addJSIModules(
|
||||
mJSIModulePackage.getJSIModules(
|
||||
reactContext, catalystInstance.getJavaScriptContextHolder()));
|
||||
|
||||
if (ReactFeatureFlags.useTurboModules && mTMMDelegateBuilder != null) {
|
||||
TurboModuleManagerDelegate tmmDelegate =
|
||||
mTMMDelegateBuilder
|
||||
.setPackages(mPackages)
|
||||
.setReactApplicationContext(reactContext)
|
||||
.build();
|
||||
|
||||
TurboModuleManager turboModuleManager =
|
||||
new TurboModuleManager(
|
||||
catalystInstance.getRuntimeExecutor(),
|
||||
tmmDelegate,
|
||||
catalystInstance.getJSCallInvokerHolder(),
|
||||
catalystInstance.getNativeCallInvokerHolder());
|
||||
|
||||
catalystInstance.setTurboModuleManager(turboModuleManager);
|
||||
|
||||
TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager;
|
||||
|
||||
// Eagerly initialize TurboModules
|
||||
for (String moduleName : registry.getEagerInitModuleNames()) {
|
||||
registry.getModule(moduleName);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ReactFeatureFlags.eagerInitializeFabric) {
|
||||
catalystInstance.getJSIModule(JSIModuleType.UIManager);
|
||||
|
|
Загрузка…
Ссылка в новой задаче