-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Setup a
newArchEnabled property to Opt-in the New Architecture in t…
…he template (#32790) Summary: Pull Request resolved: #32790 As the name says, I've added a `newArchEnabled` property that can be used to toggle the New Architecture in the new app template. Users can use this to try the New Architecture in their project by either: * Set `newArchEnabled` to true inside the `gradle.properties` file * Invoke gradle with `-PnewArchEnabled=true` * Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` The Project property will also control if: * ReactNative dependency should be built from source or not. * The NDK should be enabled or not. Please note that this requires RN 0.68.x to run properly (it won't work with 0.67 RCs) or a Nightly version of React Native. Changelog: [Android] [Added] - Setup a `newArchEnabled` property to Opt-in the New Architecture in the template Reviewed By: ShikaSD Differential Revision: D33065373 fbshipit-source-id: 32085f5b071d6243936bafd91425b5b43e5b5101
- Loading branch information
1 parent
f142bfe
commit 8d652fb
Showing
19 changed files
with
599 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
...roid/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package com.helloworld.newarchitecture; | ||
|
|
||
| import android.app.Application; | ||
| import androidx.annotation.NonNull; | ||
| import com.facebook.react.PackageList; | ||
| import com.facebook.react.ReactInstanceManager; | ||
| import com.facebook.react.ReactNativeHost; | ||
| import com.facebook.react.ReactPackage; | ||
| import com.facebook.react.ReactPackageTurboModuleManagerDelegate; | ||
| import com.facebook.react.bridge.JSIModulePackage; | ||
| import com.facebook.react.bridge.JSIModuleProvider; | ||
| import com.facebook.react.bridge.JSIModuleSpec; | ||
| import com.facebook.react.bridge.JSIModuleType; | ||
| import com.facebook.react.bridge.JavaScriptContextHolder; | ||
| import com.facebook.react.bridge.ReactApplicationContext; | ||
| import com.facebook.react.bridge.UIManager; | ||
| import com.facebook.react.fabric.ComponentFactory; | ||
| import com.facebook.react.fabric.CoreComponentsRegistry; | ||
| import com.facebook.react.fabric.EmptyReactNativeConfig; | ||
| import com.facebook.react.fabric.FabricJSIModuleProvider; | ||
| import com.facebook.react.uimanager.ViewManagerRegistry; | ||
| import com.helloworld.BuildConfig; | ||
| import com.helloworld.newarchitecture.components.MainComponentsRegistry; | ||
| import com.helloworld.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both | ||
| * TurboModule delegates and the Fabric Renderer. | ||
| * | ||
| * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the | ||
| * `newArchEnabled` property). Is ignored otherwise. | ||
| */ | ||
| public class MainApplicationReactNativeHost extends ReactNativeHost { | ||
| public MainApplicationReactNativeHost(Application application) { | ||
| super(application); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean getUseDeveloperSupport() { | ||
| return BuildConfig.DEBUG; | ||
| } | ||
|
|
||
| @Override | ||
| protected List<ReactPackage> getPackages() { | ||
| List<ReactPackage> packages = new PackageList(this).getPackages(); | ||
| // Packages that cannot be autolinked yet can be added manually here, for example: | ||
| // packages.add(new MyReactNativePackage()); | ||
| // TurboModules must also be loaded here providing a valid TurboReactPackage implementation: | ||
| // packages.add(new TurboReactPackage() { ... }); | ||
| // If you have custom Fabric Components, their ViewManagers should also be loaded here | ||
| // inside a ReactPackage. | ||
| return packages; | ||
| } | ||
|
|
||
| @Override | ||
| protected String getJSMainModuleName() { | ||
| return "index"; | ||
| } | ||
|
|
||
| @NonNull | ||
| @Override | ||
| protected ReactPackageTurboModuleManagerDelegate.Builder | ||
| getReactPackageTurboModuleManagerDelegateBuilder() { | ||
| // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary | ||
| // for the new architecture and to use TurboModules correctly. | ||
| return new MainApplicationTurboModuleManagerDelegate.Builder(); | ||
| } | ||
|
|
||
| @Override | ||
| protected JSIModulePackage getJSIModulePackage() { | ||
| return new JSIModulePackage() { | ||
| @Override | ||
| public List<JSIModuleSpec> getJSIModules( | ||
| final ReactApplicationContext reactApplicationContext, | ||
| final JavaScriptContextHolder jsContext) { | ||
| final List<JSIModuleSpec> specs = new ArrayList<>(); | ||
|
|
||
| // Here we provide a new JSIModuleSpec that will be responsible of providing the | ||
| // custom Fabric Components. | ||
| specs.add( | ||
| new JSIModuleSpec() { | ||
| @Override | ||
| public JSIModuleType getJSIModuleType() { | ||
| return JSIModuleType.UIManager; | ||
| } | ||
|
|
||
| @Override | ||
| public JSIModuleProvider<UIManager> getJSIModuleProvider() { | ||
| final ComponentFactory componentFactory = new ComponentFactory(); | ||
| CoreComponentsRegistry.register(componentFactory); | ||
|
|
||
| // Here we register a Components Registry. | ||
| // The one that is generated with the template contains no components | ||
| // and just provides you the one from React Native core. | ||
| MainComponentsRegistry.register(componentFactory); | ||
|
|
||
| final ReactInstanceManager reactInstanceManager = getReactInstanceManager(); | ||
|
|
||
| ViewManagerRegistry viewManagerRegistry = | ||
| new ViewManagerRegistry( | ||
| reactInstanceManager.getOrCreateViewManagers(reactApplicationContext)); | ||
|
|
||
| return new FabricJSIModuleProvider( | ||
| reactApplicationContext, | ||
| componentFactory, | ||
| new EmptyReactNativeConfig(), | ||
| viewManagerRegistry); | ||
| } | ||
| }); | ||
| return specs; | ||
| } | ||
| }; | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
...d/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.helloworld.newarchitecture.components; | ||
|
|
||
| import com.facebook.jni.HybridData; | ||
| import com.facebook.proguard.annotations.DoNotStrip; | ||
| import com.facebook.react.fabric.ComponentFactory; | ||
| import com.facebook.soloader.SoLoader; | ||
|
|
||
| /** | ||
| * Class responsible to load the custom Fabric Components. This class has native methods and needs a | ||
| * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ | ||
| * folder for you). | ||
| * | ||
| * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the | ||
| * `newArchEnabled` property). Is ignored otherwise. | ||
| */ | ||
| @DoNotStrip | ||
| public class MainComponentsRegistry { | ||
| static { | ||
| SoLoader.loadLibrary("fabricjni"); | ||
| } | ||
|
|
||
| @DoNotStrip private final HybridData mHybridData; | ||
|
|
||
| @DoNotStrip | ||
| private native HybridData initHybrid(ComponentFactory componentFactory); | ||
|
|
||
| @DoNotStrip | ||
| private MainComponentsRegistry(ComponentFactory componentFactory) { | ||
| mHybridData = initHybrid(componentFactory); | ||
| } | ||
|
|
||
| @DoNotStrip | ||
| public static MainComponentsRegistry register(ComponentFactory componentFactory) { | ||
| return new MainComponentsRegistry(componentFactory); | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
...ava/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package com.helloworld.newarchitecture.modules; | ||
|
|
||
| import com.facebook.jni.HybridData; | ||
| import com.facebook.react.ReactPackage; | ||
| import com.facebook.react.ReactPackageTurboModuleManagerDelegate; | ||
| import com.facebook.react.bridge.ReactApplicationContext; | ||
| import com.facebook.soloader.SoLoader; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Class responsible to load the TurboModules. This class has native methods and needs a | ||
| * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ | ||
| * folder for you). | ||
| * | ||
| * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the | ||
| * `newArchEnabled` property). Is ignored otherwise. | ||
| */ | ||
| public class MainApplicationTurboModuleManagerDelegate | ||
| extends ReactPackageTurboModuleManagerDelegate { | ||
|
|
||
| private static volatile boolean sIsSoLibraryLoaded; | ||
|
|
||
| protected MainApplicationTurboModuleManagerDelegate( | ||
| ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) { | ||
| super(reactApplicationContext, packages); | ||
| } | ||
|
|
||
| protected native HybridData initHybrid(); | ||
|
|
||
| native boolean canCreateTurboModule(String moduleName); | ||
|
|
||
| public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder { | ||
| protected MainApplicationTurboModuleManagerDelegate build( | ||
| ReactApplicationContext context, List<ReactPackage> packages) { | ||
| return new MainApplicationTurboModuleManagerDelegate(context, packages); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected synchronized void maybeLoadOtherSoLibraries() { | ||
| if (!sIsSoLibraryLoaded) { | ||
| // If you change the name of your application .so file in the Android.mk file, | ||
| // make sure you update the name here as well. | ||
| SoLoader.loadLibrary("helloworld_appmodules"); | ||
| sIsSoLibraryLoaded = true; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.