From a86d00493dacd32f51b588e02434cc66d1e43711 Mon Sep 17 00:00:00 2001
From: WX <42308734@qq.com>
Date: Sat, 16 Jul 2022 14:41:03 +0800
Subject: [PATCH] chore: update react-native0.66.4 to react-native0.69.1
---
HelloWorld/.flowconfig | 8 +-
HelloWorld/.gitattributes | 3 -
HelloWorld/.gitignore | 13 +-
HelloWorld/.prettierrc.js | 3 +-
HelloWorld/Gemfile | 6 +
HelloWorld/_bundle/config | 2 +
HelloWorld/_ruby-version | 1 +
.../android/app/src/debug/AndroidManifest.xml | 2 +-
.../com/helloworld/ReactNativeFlipper.java | 12 +-
.../android/app/src/main/AndroidManifest.xml | 9 +-
.../java/com/helloworld/MainActivity.java | 33 ++
.../java/com/helloworld/MainApplication.java | 13 +-
.../MainApplicationReactNativeHost.java | 116 ++++
.../components/MainComponentsRegistry.java | 36 ++
...ApplicationTurboModuleManagerDelegate.java | 48 ++
.../android/app/src/main/jni/Android.mk | 48 ++
.../jni/MainApplicationModuleProvider.cpp | 24 +
.../main/jni/MainApplicationModuleProvider.h | 16 +
...nApplicationTurboModuleManagerDelegate.cpp | 45 ++
...ainApplicationTurboModuleManagerDelegate.h | 38 ++
.../src/main/jni/MainComponentsRegistry.cpp | 61 ++
.../app/src/main/jni/MainComponentsRegistry.h | 32 ++
.../android/app/src/main/jni/OnLoad.cpp | 11 +
.../res/drawable/rn_edit_text_material.xml | 36 ++
.../app/src/main/res/values/strings.xml | 2 +-
.../app/src/main/res/values/styles.xml | 1 +
HelloWorld/android/build.gradle | 31 +-
HelloWorld/android/gradle.properties | 18 +-
.../android/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
HelloWorld/android/gradlew | 257 +++++----
HelloWorld/android/gradlew.bat | 178 +++---
HelloWorld/android/settings.gradle | 8 +
.../ios/HelloWorld.xcodeproj/project.pbxproj | 165 +++---
HelloWorld/ios/HelloWorld/AppDelegate.m | 62 --
HelloWorld/ios/HelloWorld/AppDelegate.mm | 133 +++++
.../AppIcon.appiconset/Contents.json | 45 +-
.../HelloWorld/LaunchScreen copy.storyboard | 47 ++
HelloWorld/ios/HelloWorld/main.m | 3 +-
.../ios/HelloWorldTests/HelloWorldTests.m | 27 +-
HelloWorld/ios/Podfile | 11 +-
HelloWorld/ios/Podfile.lock | 543 +++++++++---------
HelloWorld/ios/_xcode.env | 11 +
HelloWorld/metro.config.js | 2 +-
HelloWorld/package.json | 8 +-
template/template/Gemfile | 6 +
template/template/_bundle/config | 2 +
template/template/_flowconfig | 8 +-
template/template/_gitattributes | 3 -
template/template/_gitignore | 13 +-
template/template/_prettierrc.js | 3 +-
template/template/_ruby-version | 1 +
.../android/app/src/debug/AndroidManifest.xml | 2 +-
.../com/helloworld/ReactNativeFlipper.java | 12 +-
.../android/app/src/main/AndroidManifest.xml | 9 +-
.../java/com/helloworld/MainActivity.java | 33 ++
.../java/com/helloworld/MainApplication.java | 13 +-
.../MainApplicationReactNativeHost.java | 116 ++++
.../components/MainComponentsRegistry.java | 36 ++
...ApplicationTurboModuleManagerDelegate.java | 48 ++
.../android/app/src/main/jni/Android.mk | 48 ++
.../jni/MainApplicationModuleProvider.cpp | 24 +
.../main/jni/MainApplicationModuleProvider.h | 16 +
...nApplicationTurboModuleManagerDelegate.cpp | 45 ++
...ainApplicationTurboModuleManagerDelegate.h | 38 ++
.../src/main/jni/MainComponentsRegistry.cpp | 61 ++
.../app/src/main/jni/MainComponentsRegistry.h | 32 ++
.../android/app/src/main/jni/OnLoad.cpp | 11 +
.../res/drawable/rn_edit_text_material.xml | 36 ++
.../app/src/main/res/values/strings.xml | 2 +-
.../app/src/main/res/values/styles.xml | 1 +
template/template/android/build.gradle | 31 +-
template/template/android/gradle.properties | 18 +-
.../android/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
template/template/android/gradlew | 257 +++++----
template/template/android/settings.gradle | 8 +
.../ios/HelloWorld.xcodeproj/project.pbxproj | 165 +++---
.../template/ios/HelloWorld/AppDelegate.m | 62 --
.../template/ios/HelloWorld/AppDelegate.mm | 133 +++++
.../AppIcon.appiconset/Contents.json | 45 +-
.../HelloWorld/LaunchScreen copy.storyboard | 47 ++
template/template/ios/HelloWorld/main.m | 3 +-
.../ios/HelloWorldTests/HelloWorldTests.m | 27 +-
template/template/ios/Podfile | 11 +-
template/template/ios/Podfile.lock | 543 +++++++++---------
template/template/ios/_xcode.env | 11 +
template/template/metro.config.js | 2 +-
template/template/package.json | 8 +-
89 files changed, 2915 insertions(+), 1247 deletions(-)
delete mode 100644 HelloWorld/.gitattributes
create mode 100644 HelloWorld/Gemfile
create mode 100644 HelloWorld/_bundle/config
create mode 100644 HelloWorld/_ruby-version
create mode 100644 HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java
create mode 100644 HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java
create mode 100644 HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
create mode 100644 HelloWorld/android/app/src/main/jni/Android.mk
create mode 100644 HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.cpp
create mode 100644 HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.h
create mode 100644 HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
create mode 100644 HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
create mode 100644 HelloWorld/android/app/src/main/jni/MainComponentsRegistry.cpp
create mode 100644 HelloWorld/android/app/src/main/jni/MainComponentsRegistry.h
create mode 100644 HelloWorld/android/app/src/main/jni/OnLoad.cpp
create mode 100644 HelloWorld/android/app/src/main/res/drawable/rn_edit_text_material.xml
delete mode 100644 HelloWorld/ios/HelloWorld/AppDelegate.m
create mode 100644 HelloWorld/ios/HelloWorld/AppDelegate.mm
create mode 100644 HelloWorld/ios/HelloWorld/LaunchScreen copy.storyboard
create mode 100644 HelloWorld/ios/_xcode.env
create mode 100644 template/template/Gemfile
create mode 100644 template/template/_bundle/config
delete mode 100644 template/template/_gitattributes
create mode 100644 template/template/_ruby-version
create mode 100644 template/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java
create mode 100644 template/template/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java
create mode 100644 template/template/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
create mode 100644 template/template/android/app/src/main/jni/Android.mk
create mode 100644 template/template/android/app/src/main/jni/MainApplicationModuleProvider.cpp
create mode 100644 template/template/android/app/src/main/jni/MainApplicationModuleProvider.h
create mode 100644 template/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
create mode 100644 template/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
create mode 100644 template/template/android/app/src/main/jni/MainComponentsRegistry.cpp
create mode 100644 template/template/android/app/src/main/jni/MainComponentsRegistry.h
create mode 100644 template/template/android/app/src/main/jni/OnLoad.cpp
create mode 100644 template/template/android/app/src/main/res/drawable/rn_edit_text_material.xml
delete mode 100644 template/template/ios/HelloWorld/AppDelegate.m
create mode 100644 template/template/ios/HelloWorld/AppDelegate.mm
create mode 100644 template/template/ios/HelloWorld/LaunchScreen copy.storyboard
create mode 100644 template/template/ios/_xcode.env
diff --git a/HelloWorld/.flowconfig b/HelloWorld/.flowconfig
index 43dd26bc..74f3a75e 100644
--- a/HelloWorld/.flowconfig
+++ b/HelloWorld/.flowconfig
@@ -11,6 +11,8 @@ node_modules/react-native/Libraries/polyfills/.*
; Flow doesn't support platforms
.*/Libraries/Utilities/LoadingView.js
+.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
+
[untyped]
.*/node_modules/@react-native-community/cli/.*/.*
@@ -23,9 +25,6 @@ node_modules/react-native/flow/
[options]
emoji=true
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
exact_by_default=true
format.bracket_spacing=false
@@ -53,7 +52,6 @@ nonstrict-import=warn
deprecated-type=warn
unsafe-getters-setters=warn
unnecessary-invariant=warn
-signature-verification-failure=warn
[strict]
deprecated-type
@@ -65,4 +63,4 @@ untyped-import
untyped-type-import
[version]
-^0.158.0
+^0.176.3
diff --git a/HelloWorld/.gitattributes b/HelloWorld/.gitattributes
deleted file mode 100644
index 45a3dcb2..00000000
--- a/HelloWorld/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-# Windows files should use crlf line endings
-# https://help.github.com/articles/dealing-with-line-endings/
-*.bat text eol=crlf
diff --git a/HelloWorld/.gitignore b/HelloWorld/.gitignore
index ecc1e4ad..344481b2 100644
--- a/HelloWorld/.gitignore
+++ b/HelloWorld/.gitignore
@@ -20,6 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
+ios/.xcode.env.local
# Android/IntelliJ
#
@@ -49,12 +50,14 @@ buck-out/
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
# Bundle artifact
*.jsbundle
-# CocoaPods
-ios/Pods/
+# Ruby / CocoaPods
+/ios/Pods/
+/vendor/bundle/
diff --git a/HelloWorld/.prettierrc.js b/HelloWorld/.prettierrc.js
index 2c95e0c5..5f62afd3 100644
--- a/HelloWorld/.prettierrc.js
+++ b/HelloWorld/.prettierrc.js
@@ -1,6 +1,7 @@
module.exports = {
+ arrowParens: 'avoid',
+ bracketSameLine: true,
bracketSpacing: false,
- jsxBracketSameLine: true,
tabWidth: 2,
singleQuote: true,
trailingComma: 'all',
diff --git a/HelloWorld/Gemfile b/HelloWorld/Gemfile
new file mode 100644
index 00000000..5efda89f
--- /dev/null
+++ b/HelloWorld/Gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.5'
+
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'
diff --git a/HelloWorld/_bundle/config b/HelloWorld/_bundle/config
new file mode 100644
index 00000000..848943bb
--- /dev/null
+++ b/HelloWorld/_bundle/config
@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1
diff --git a/HelloWorld/_ruby-version b/HelloWorld/_ruby-version
new file mode 100644
index 00000000..a603bb50
--- /dev/null
+++ b/HelloWorld/_ruby-version
@@ -0,0 +1 @@
+2.7.5
diff --git a/HelloWorld/android/app/src/debug/AndroidManifest.xml b/HelloWorld/android/app/src/debug/AndroidManifest.xml
index b2f3ad9f..4b185bc1 100644
--- a/HelloWorld/android/app/src/debug/AndroidManifest.xml
+++ b/HelloWorld/android/app/src/debug/AndroidManifest.xml
@@ -8,6 +8,6 @@
android:usesCleartextTraffic="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
-
+
diff --git a/HelloWorld/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java b/HelloWorld/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java
index 8b7f0913..8f18993f 100644
--- a/HelloWorld/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java
+++ b/HelloWorld/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java
@@ -1,11 +1,10 @@
/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
*/
package com.helloworld;
-
import android.content.Context;
import com.facebook.flipper.android.AndroidFlipperClient;
import com.facebook.flipper.android.utils.FlipperUtils;
@@ -19,22 +18,20 @@
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceEventListener;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.network.NetworkingModule;
import okhttp3.OkHttpClient;
-
public class ReactNativeFlipper {
public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
if (FlipperUtils.shouldEnableFlipper(context)) {
final FlipperClient client = AndroidFlipperClient.getInstance(context);
-
client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
client.addPlugin(new ReactFlipperPlugin());
client.addPlugin(new DatabasesFlipperPlugin(context));
client.addPlugin(new SharedPreferencesFlipperPlugin(context));
client.addPlugin(CrashReporterPlugin.getInstance());
-
NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
NetworkingModule.setCustomClientBuilder(
new NetworkingModule.CustomClientBuilder() {
@@ -45,13 +42,12 @@ public void apply(OkHttpClient.Builder builder) {
});
client.addPlugin(networkFlipperPlugin);
client.start();
-
// Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
// Hence we run if after all native modules have been initialized
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
if (reactContext == null) {
reactInstanceManager.addReactInstanceEventListener(
- new ReactInstanceManager.ReactInstanceEventListener() {
+ new ReactInstanceEventListener() {
@Override
public void onReactContextInitialized(ReactContext reactContext) {
reactInstanceManager.removeReactInstanceEventListener(this);
@@ -69,4 +65,4 @@ public void run() {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/HelloWorld/android/app/src/main/AndroidManifest.xml b/HelloWorld/android/app/src/main/AndroidManifest.xml
index 1cae0aad..7ba57ca1 100644
--- a/HelloWorld/android/app/src/main/AndroidManifest.xml
+++ b/HelloWorld/android/app/src/main/AndroidManifest.xml
@@ -9,15 +9,14 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
- android:theme="@style/AppTheme"
- android:usesCleartextTraffic="true"
- >
+ android:theme="@style/AppTheme">
+ android:windowSoftInputMode="adjustResize"
+ android:exported="true">
diff --git a/HelloWorld/android/app/src/main/java/com/helloworld/MainActivity.java b/HelloWorld/android/app/src/main/java/com/helloworld/MainActivity.java
index c7106d57..405d80a8 100644
--- a/HelloWorld/android/app/src/main/java/com/helloworld/MainActivity.java
+++ b/HelloWorld/android/app/src/main/java/com/helloworld/MainActivity.java
@@ -1,6 +1,8 @@
package com.helloworld;
import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
public class MainActivity extends ReactActivity {
@@ -12,4 +14,35 @@ public class MainActivity extends ReactActivity {
protected String getMainComponentName() {
return "HelloWorld";
}
+
+ /**
+ * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
+ * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer
+ * (Paper).
+ */
+ @Override
+ protected ReactActivityDelegate createReactActivityDelegate() {
+ return new MainActivityDelegate(this, getMainComponentName());
+ }
+
+ public static class MainActivityDelegate extends ReactActivityDelegate {
+ public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
+ super(activity, mainComponentName);
+ }
+
+ @Override
+ protected ReactRootView createRootView() {
+ ReactRootView reactRootView = new ReactRootView(getContext());
+ // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+ reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
+ return reactRootView;
+ }
+
+ @Override
+ protected boolean isConcurrentRootEnabled() {
+ // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
+ // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
+ return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+ }
+ }
}
diff --git a/HelloWorld/android/app/src/main/java/com/helloworld/MainApplication.java b/HelloWorld/android/app/src/main/java/com/helloworld/MainApplication.java
index e55c37b9..eedd1929 100644
--- a/HelloWorld/android/app/src/main/java/com/helloworld/MainApplication.java
+++ b/HelloWorld/android/app/src/main/java/com/helloworld/MainApplication.java
@@ -7,7 +7,9 @@
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
+import com.facebook.react.config.ReactFeatureFlags;
import com.facebook.soloader.SoLoader;
+import com.helloworld.newarchitecture.MainApplicationReactNativeHost;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
@@ -35,14 +37,23 @@ protected String getJSMainModuleName() {
}
};
+ private final ReactNativeHost mNewArchitectureNativeHost =
+ new MainApplicationReactNativeHost(this);
+
@Override
public ReactNativeHost getReactNativeHost() {
- return mReactNativeHost;
+ if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+ return mNewArchitectureNativeHost;
+ } else {
+ return mReactNativeHost;
+ }
}
@Override
public void onCreate() {
super.onCreate();
+ // If you opted-in for the New Architecture, we enable the TurboModule system
+ ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
SoLoader.init(this, /* native exopackage */ false);
initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
}
diff --git a/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java b/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java
new file mode 100644
index 00000000..55473c3f
--- /dev/null
+++ b/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java
@@ -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.FabricJSIModuleProvider;
+import com.facebook.react.fabric.ReactNativeConfig;
+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.
+ *
+ * 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 getPackages() {
+ List 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 getJSIModules(
+ final ReactApplicationContext reactApplicationContext,
+ final JavaScriptContextHolder jsContext) {
+ final List 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 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,
+ ReactNativeConfig.DEFAULT_CONFIG,
+ viewManagerRegistry);
+ }
+ });
+ return specs;
+ }
+ };
+ }
+}
diff --git a/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java b/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java
new file mode 100644
index 00000000..c74d0cca
--- /dev/null
+++ b/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java
@@ -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).
+ *
+ * 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);
+ }
+}
diff --git a/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
new file mode 100644
index 00000000..8593b3bb
--- /dev/null
+++ b/HelloWorld/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
@@ -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).
+ *
+ *
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 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 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;
+ }
+ }
+}
diff --git a/HelloWorld/android/app/src/main/jni/Android.mk b/HelloWorld/android/app/src/main/jni/Android.mk
new file mode 100644
index 00000000..cda13912
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/Android.mk
@@ -0,0 +1,48 @@
+THIS_DIR := $(call my-dir)
+
+include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
+
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to include the following autogenerated makefile.
+# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
+include $(CLEAR_VARS)
+
+LOCAL_PATH := $(THIS_DIR)
+
+# You can customize the name of your application .so file here.
+LOCAL_MODULE := helloworld_appmodules
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to uncomment those lines to include the generated source
+# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
+#
+# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+
+# Here you should add any native library you wish to depend on.
+LOCAL_SHARED_LIBRARIES := \
+ libfabricjni \
+ libfbjni \
+ libfolly_runtime \
+ libglog \
+ libjsi \
+ libreact_codegen_rncore \
+ libreact_debug \
+ libreact_nativemodule_core \
+ libreact_render_componentregistry \
+ libreact_render_core \
+ libreact_render_debug \
+ libreact_render_graphics \
+ librrc_view \
+ libruntimeexecutor \
+ libturbomodulejsijni \
+ libyoga
+
+LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.cpp
new file mode 100644
index 00000000..0ac23cc6
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.cpp
@@ -0,0 +1,24 @@
+#include "MainApplicationModuleProvider.h"
+
+#include
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr MainApplicationModuleProvider(
+ const std::string moduleName,
+ const JavaTurboModule::InitParams ¶ms) {
+ // Here you can provide your own module provider for TurboModules coming from
+ // either your application or from external libraries. The approach to follow
+ // is similar to the following (for a library called `samplelibrary`:
+ //
+ // auto module = samplelibrary_ModuleProvider(moduleName, params);
+ // if (module != nullptr) {
+ // return module;
+ // }
+ // return rncore_ModuleProvider(moduleName, params);
+ return rncore_ModuleProvider(moduleName, params);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.h b/HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.h
new file mode 100644
index 00000000..0fa43fa6
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/MainApplicationModuleProvider.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include
+#include
+
+#include
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr MainApplicationModuleProvider(
+ const std::string moduleName,
+ const JavaTurboModule::InitParams ¶ms);
+
+} // namespace react
+} // namespace facebook
diff --git a/HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
new file mode 100644
index 00000000..dbbdc3d1
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
@@ -0,0 +1,45 @@
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainApplicationModuleProvider.h"
+
+namespace facebook {
+namespace react {
+
+jni::local_ref
+MainApplicationTurboModuleManagerDelegate::initHybrid(
+ jni::alias_ref) {
+ return makeCxxInstance();
+}
+
+void MainApplicationTurboModuleManagerDelegate::registerNatives() {
+ registerHybrid({
+ makeNativeMethod(
+ "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
+ makeNativeMethod(
+ "canCreateTurboModule",
+ MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
+ });
+}
+
+std::shared_ptr
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+ const std::string name,
+ const std::shared_ptr jsInvoker) {
+ // Not implemented yet: provide pure-C++ NativeModules here.
+ return nullptr;
+}
+
+std::shared_ptr
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+ const std::string name,
+ const JavaTurboModule::InitParams ¶ms) {
+ return MainApplicationModuleProvider(name, params);
+}
+
+bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
+ std::string name) {
+ return getTurboModule(name, nullptr) != nullptr ||
+ getTurboModule(name, {.moduleName = name}) != nullptr;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
new file mode 100644
index 00000000..25f27722
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
@@ -0,0 +1,38 @@
+#include
+#include
+
+#include
+#include
+
+namespace facebook {
+namespace react {
+
+class MainApplicationTurboModuleManagerDelegate
+ : public jni::HybridClass<
+ MainApplicationTurboModuleManagerDelegate,
+ TurboModuleManagerDelegate> {
+ public:
+ // Adapt it to the package you used for your Java class.
+ static constexpr auto kJavaDescriptor =
+ "Lcom/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
+
+ static jni::local_ref initHybrid(jni::alias_ref);
+
+ static void registerNatives();
+
+ std::shared_ptr getTurboModule(
+ const std::string name,
+ const std::shared_ptr jsInvoker) override;
+ std::shared_ptr getTurboModule(
+ const std::string name,
+ const JavaTurboModule::InitParams ¶ms) override;
+
+ /**
+ * Test-only method. Allows user to verify whether a TurboModule can be
+ * created by instances of this class.
+ */
+ bool canCreateTurboModule(std::string name);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/HelloWorld/android/app/src/main/jni/MainComponentsRegistry.cpp b/HelloWorld/android/app/src/main/jni/MainComponentsRegistry.cpp
new file mode 100644
index 00000000..8f7edffd
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/MainComponentsRegistry.cpp
@@ -0,0 +1,61 @@
+#include "MainComponentsRegistry.h"
+
+#include
+#include
+#include
+#include
+
+namespace facebook {
+namespace react {
+
+MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
+
+std::shared_ptr
+MainComponentsRegistry::sharedProviderRegistry() {
+ auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
+
+ // Custom Fabric Components go here. You can register custom
+ // components coming from your App or from 3rd party libraries here.
+ //
+ // providerRegistry->add(concreteComponentDescriptorProvider<
+ // AocViewerComponentDescriptor>());
+ return providerRegistry;
+}
+
+jni::local_ref
+MainComponentsRegistry::initHybrid(
+ jni::alias_ref,
+ ComponentFactory *delegate) {
+ auto instance = makeCxxInstance(delegate);
+
+ auto buildRegistryFunction =
+ [](EventDispatcher::Weak const &eventDispatcher,
+ ContextContainer::Shared const &contextContainer)
+ -> ComponentDescriptorRegistry::Shared {
+ auto registry = MainComponentsRegistry::sharedProviderRegistry()
+ ->createComponentDescriptorRegistry(
+ {eventDispatcher, contextContainer});
+
+ auto mutableRegistry =
+ std::const_pointer_cast(registry);
+
+ mutableRegistry->setFallbackComponentDescriptor(
+ std::make_shared(
+ ComponentDescriptorParameters{
+ eventDispatcher, contextContainer, nullptr}));
+
+ return registry;
+ };
+
+ delegate->buildRegistryFunction = buildRegistryFunction;
+ return instance;
+}
+
+void MainComponentsRegistry::registerNatives() {
+ registerHybrid({
+ makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
+ });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/HelloWorld/android/app/src/main/jni/MainComponentsRegistry.h b/HelloWorld/android/app/src/main/jni/MainComponentsRegistry.h
new file mode 100644
index 00000000..d61cbffa
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/MainComponentsRegistry.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include
+#include
+#include
+#include
+
+namespace facebook {
+namespace react {
+
+class MainComponentsRegistry
+ : public facebook::jni::HybridClass {
+ public:
+ // Adapt it to the package you used for your Java class.
+ constexpr static auto kJavaDescriptor =
+ "Lcom/helloworld/newarchitecture/components/MainComponentsRegistry;";
+
+ static void registerNatives();
+
+ MainComponentsRegistry(ComponentFactory *delegate);
+
+ private:
+ static std::shared_ptr
+ sharedProviderRegistry();
+
+ static jni::local_ref initHybrid(
+ jni::alias_ref,
+ ComponentFactory *delegate);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/HelloWorld/android/app/src/main/jni/OnLoad.cpp b/HelloWorld/android/app/src/main/jni/OnLoad.cpp
new file mode 100644
index 00000000..c569b6e8
--- /dev/null
+++ b/HelloWorld/android/app/src/main/jni/OnLoad.cpp
@@ -0,0 +1,11 @@
+#include
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainComponentsRegistry.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+ return facebook::jni::initialize(vm, [] {
+ facebook::react::MainApplicationTurboModuleManagerDelegate::
+ registerNatives();
+ facebook::react::MainComponentsRegistry::registerNatives();
+ });
+}
diff --git a/HelloWorld/android/app/src/main/res/drawable/rn_edit_text_material.xml b/HelloWorld/android/app/src/main/res/drawable/rn_edit_text_material.xml
new file mode 100644
index 00000000..f35d9962
--- /dev/null
+++ b/HelloWorld/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+