From c500ae457b9a87fc1e38749203b8175e9c1f4315 Mon Sep 17 00:00:00 2001 From: Alyssa Harvey Date: Thu, 12 Jan 2023 00:16:08 +0100 Subject: [PATCH 1/3] chore: upgrade fabric example to 0.71.0-rc.5 --- apps/fabric/.buckconfig | 6 - apps/fabric/.gitignore | 6 - apps/fabric/.ruby-version | 2 +- apps/fabric/Gemfile | 4 +- apps/fabric/Gemfile.lock | 100 ++ apps/fabric/android/app/_BUCK | 55 - apps/fabric/android/app/build.gradle | 275 +--- .../lottie/rnexample/ReactNativeFlipper.java | 6 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../lottie/rnexample/MainActivity.java | 39 +- .../lottie/rnexample/MainApplication.java | 65 +- .../MainApplicationReactNativeHost.java | 116 -- .../components/MainComponentsRegistry.java | 36 - ...ApplicationTurboModuleManagerDelegate.java | 48 - .../android/app/src/main/jni/CMakeLists.txt | 7 - .../jni/MainApplicationModuleProvider.cpp | 32 - .../main/jni/MainApplicationModuleProvider.h | 16 - ...nApplicationTurboModuleManagerDelegate.cpp | 45 - ...ainApplicationTurboModuleManagerDelegate.h | 38 - .../src/main/jni/MainComponentsRegistry.cpp | 65 - .../app/src/main/jni/MainComponentsRegistry.h | 32 - .../android/app/src/main/jni/OnLoad.cpp | 11 - .../lottie/rnexample/ReactNativeFlipper.java | 19 + apps/fabric/android/build.gradle | 44 +- apps/fabric/android/gradle.properties | 6 +- apps/fabric/android/settings.gradle | 7 - apps/fabric/ios/Podfile | 26 +- apps/fabric/ios/Podfile.lock | 1262 +++++++++-------- apps/fabric/ios/example/AppDelegate.h | 8 +- apps/fabric/ios/example/AppDelegate.mm | 121 +- apps/fabric/package.json | 8 +- apps/fabric/tsconfig.json | 27 +- yarn.lock | 1245 +++++++++++++++- 33 files changed, 2196 insertions(+), 1584 deletions(-) delete mode 100644 apps/fabric/.buckconfig create mode 100644 apps/fabric/Gemfile.lock delete mode 100644 apps/fabric/android/app/_BUCK delete mode 100644 apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java delete mode 100644 apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java delete mode 100644 apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java delete mode 100644 apps/fabric/android/app/src/main/jni/CMakeLists.txt delete mode 100644 apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.cpp delete mode 100644 apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.h delete mode 100644 apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp delete mode 100644 apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h delete mode 100644 apps/fabric/android/app/src/main/jni/MainComponentsRegistry.cpp delete mode 100644 apps/fabric/android/app/src/main/jni/MainComponentsRegistry.h delete mode 100644 apps/fabric/android/app/src/main/jni/OnLoad.cpp create mode 100644 apps/fabric/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java diff --git a/apps/fabric/.buckconfig b/apps/fabric/.buckconfig deleted file mode 100644 index 934256c..0000000 --- a/apps/fabric/.buckconfig +++ /dev/null @@ -1,6 +0,0 @@ - -[android] - target = Google Inc.:Google APIs:23 - -[maven_repositories] - central = https://repo1.maven.org/maven2 diff --git a/apps/fabric/.gitignore b/apps/fabric/.gitignore index 425fc1c..73a0e29 100644 --- a/apps/fabric/.gitignore +++ b/apps/fabric/.gitignore @@ -39,12 +39,6 @@ node_modules/ npm-debug.log yarn-error.log -# BUCK -buck-out/ -\.buckd/ -*.keystore -!debug.keystore - # fastlane # # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the diff --git a/apps/fabric/.ruby-version b/apps/fabric/.ruby-version index a603bb5..49cdd66 100644 --- a/apps/fabric/.ruby-version +++ b/apps/fabric/.ruby-version @@ -1 +1 @@ -2.7.5 +2.7.6 diff --git a/apps/fabric/Gemfile b/apps/fabric/Gemfile index 5efda89..567e598 100644 --- a/apps/fabric/Gemfile +++ b/apps/fabric/Gemfile @@ -1,6 +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' +ruby File.read(File.join(__dir__, '.ruby-version')).strip -gem 'cocoapods', '~> 1.11', '>= 1.11.2' +gem 'cocoapods', '~> 1.11', '>= 1.11.3' diff --git a/apps/fabric/Gemfile.lock b/apps/fabric/Gemfile.lock new file mode 100644 index 0000000..defcc68 --- /dev/null +++ b/apps/fabric/Gemfile.lock @@ -0,0 +1,100 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.5) + rexml + activesupport (6.1.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.1.0) + cocoapods (1.11.3) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.11.3) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.8.0) + nap (~> 1.0) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.3) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored2 (3.1.2) + concurrent-ruby (1.1.10) + escape (0.0.4) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.15.5) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + json (2.6.3) + minitest (5.17.0) + molinillo (0.8.0) + nanaimo (0.3.0) + nap (1.1.0) + netrc (0.11.0) + public_suffix (4.0.7) + rexml (3.2.5) + ruby-macho (2.5.1) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) + xcodeproj (1.22.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.6.6) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (~> 1.11, >= 1.11.3) + +RUBY VERSION + ruby 2.7.6p219 + +BUNDLED WITH + 2.4.3 diff --git a/apps/fabric/android/app/_BUCK b/apps/fabric/android/app/_BUCK deleted file mode 100644 index a2baa7c..0000000 --- a/apps/fabric/android/app/_BUCK +++ /dev/null @@ -1,55 +0,0 @@ -# To learn about Buck see [Docs](https://buckbuild.com/). -# To run your application with Buck: -# - install Buck -# - `npm start` - to start the packager -# - `cd android` -# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"` -# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck -# - `buck install -r android/app` - compile, install and run application -# - -load(":build_defs.bzl", "create_aar_targets", "create_jar_targets") - -lib_deps = [] - -create_aar_targets(glob(["libs/*.aar"])) - -create_jar_targets(glob(["libs/*.jar"])) - -android_library( - name = "all-libs", - exported_deps = lib_deps, -) - -android_library( - name = "app-code", - srcs = glob([ - "src/main/java/**/*.java", - ]), - deps = [ - ":all-libs", - ":build_config", - ":res", - ], -) - -android_build_config( - name = "build_config", - package = "com.airbnb.android.lottie.rnexample", -) - -android_resource( - name = "res", - package = "com.airbnb.android.lottie.rnexample", - res = "src/main/res", -) - -android_binary( - name = "app", - keystore = "//android/keystores:debug", - manifest = "src/main/AndroidManifest.xml", - package_type = "debug", - deps = [ - ":app-code", - ], -) \ No newline at end of file diff --git a/apps/fabric/android/app/build.gradle b/apps/fabric/android/app/build.gradle index ad46e7f..f21a924 100644 --- a/apps/fabric/android/app/build.gradle +++ b/apps/fabric/android/app/build.gradle @@ -1,128 +1,87 @@ apply plugin: "com.android.application" +apply plugin: "com.facebook.react" import com.android.build.OutputFile -import org.apache.tools.ant.taskdefs.condition.Os /** - * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets - * and bundleReleaseJsAndAssets). - * These basically call `react-native bundle` with the correct arguments during the Android build - * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the - * bundle directly from the development server. Below you can see all the possible configurations - * and their defaults. If you decide to add a configuration block, make sure to add it before the - * `apply from: "../../node_modules/react-native/react.gradle"` line. - * - * project.ext.react = [ - * // the name of the generated asset file containing your JS bundle - * bundleAssetName: "index.android.bundle", - * - * // the entry file for bundle generation. If none specified and - * // "index.android.js" exists, it will be used. Otherwise "index.js" is - * // default. Can be overridden with ENTRY_FILE environment variable. - * entryFile: "index.android.js", - * - * // https://reactnative.dev/docs/performance#enable-the-ram-format - * bundleCommand: "ram-bundle", - * - * // whether to bundle JS and assets in debug mode - * bundleInDebug: false, - * - * // whether to bundle JS and assets in release mode - * bundleInRelease: true, - * - * // whether to bundle JS and assets in another build variant (if configured). - * // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants - * // The configuration property can be in the following formats - * // 'bundleIn${productFlavor}${buildType}' - * // 'bundleIn${buildType}' - * // bundleInFreeDebug: true, - * // bundleInPaidRelease: true, - * // bundleInBeta: true, - * - * // whether to disable dev mode in custom build variants (by default only disabled in release) - * // for example: to disable dev mode in the staging build type (if configured) - * devDisabledInStaging: true, - * // The configuration property can be in the following formats - * // 'devDisabledIn${productFlavor}${buildType}' - * // 'devDisabledIn${buildType}' - * - * // the root of your project, i.e. where "package.json" lives - * root: "../../", - * - * // where to put the JS bundle asset in debug mode - * jsBundleDirDebug: "$buildDir/intermediates/assets/debug", - * - * // where to put the JS bundle asset in release mode - * jsBundleDirRelease: "$buildDir/intermediates/assets/release", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in debug mode - * resourcesDirDebug: "$buildDir/intermediates/res/merged/debug", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in release mode - * resourcesDirRelease: "$buildDir/intermediates/res/merged/release", - * - * // by default the gradle tasks are skipped if none of the JS files or assets change; this means - * // that we don't look at files in android/ or ios/ to determine whether the tasks are up to - * // date; if you have any other folders that you want to ignore for performance reasons (gradle - * // indexes the entire tree), add them here. Alternatively, if you have JS files in android/ - * // for example, you might want to remove it from here. - * inputExcludes: ["android/**", "ios/**"], - * - * // override which node gets called and with what additional arguments - * nodeExecutableAndArgs: ["node"], - * - * // supply additional arguments to the packager - * extraPackagerArgs: [] - * ] + * This is the configuration block to customize your React Native Android app. + * By default you don't need to apply any configuration, just uncomment the lines you need. */ - -project.ext.react = [ - enableHermes: true, // clean and rebuild if changing -] - -apply from: "../../node_modules/react-native/react.gradle" +react { + /* Folders */ + // The root of your project, i.e. where "package.json" lives. Default is '..' + // root = file("../") + // The folder where the react-native NPM package is. Default is ../node_modules/react-native + // reactNativeDir = file("../node-modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen + // codegenDir = file("../node-modules/react-native-codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js + // cliFile = file("../node_modules/react-native/cli.js") + + /* Variants */ + // The list of variants to that are debuggable. For those we're going to + // skip the bundling of the JS bundle and the assets. By default is just 'debug'. + // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. + // debuggableVariants = ["liteDebug", "prodDebug"] + + /* Bundling */ + // A list containing the node command and its flags. Default is just 'node'. + // nodeExecutableAndArgs = ["node"] + // + // The command to run when bundling. By default is 'bundle' + // bundleCommand = "ram-bundle" + // + // The path to the CLI configuration file. Default is empty. + // bundleConfig = file(../rn-cli.config.js) + // + // The name of the generated asset file containing your JS bundle + // bundleAssetName = "MyApplication.android.bundle" + // + // The entry file for bundle generation. Default is 'index.android.js' or 'index.js' + // entryFile = file("../js/MyApplication.android.js") + // + // A list of extra flags to pass to the 'bundle' commands. + // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle + // extraPackagerArgs = [] + + /* Hermes Commands */ + // The hermes compiler command to run. By default it is 'hermesc' + // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" + // + // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" + // hermesFlags = ["-O", "-output-source-map"] +} /** - * Set this to true to create two separate APKs instead of one: - * - An APK that only works on ARM devices - * - An APK that only works on x86 devices - * The advantage is the size of the APK is reduced by about 4MB. - * Upload all the APKs to the Play Store and people will download - * the correct one based on the CPU architecture of their device. + * Set this to true to create four separate APKs instead of one, + * one for each native architecture. This is useful if you don't + * use App Bundles (https://developer.android.com/guide/app-bundle/) + * and want to have separate APKs to upload to the Play Store. */ def enableSeparateBuildPerCPUArchitecture = false /** - * Run Proguard to shrink the Java bytecode in release builds. + * Set this to true to Run Proguard on Release builds to minify the Java bytecode. */ def enableProguardInReleaseBuilds = false /** - * The preferred build flavor of JavaScriptCore. + * The preferred build flavor of JavaScriptCore (JSC) * * For example, to use the international variant, you can use: * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` * * The international variant includes ICU i18n library and necessary data * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that - * give correct results when using with locales other than en-US. Note that + * give correct results when using with locales other than en-US. Note that * this variant is about 6MiB larger per architecture than default. */ def jscFlavor = 'org.webkit:android-jsc:+' /** - * Whether to enable the Hermes VM. - * - * This should be set on project.ext.react and that value will be read here. If it is not set - * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode - * and the benefits of using Hermes will therefore be sharply reduced. - */ -def enableHermes = project.ext.react.get("enableHermes", false); - -/** - * Architectures to build native code for. + * Private function to get the list of Native Architectures you want to build. + * This reads the value from reactNativeArchitectures in your gradle.properties + * file and works together with the --active-arch-only flag of react-native run-android. */ def reactNativeArchitectures() { def value = project.getProperties().get("reactNativeArchitectures") @@ -134,72 +93,13 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion + namespace "com.airbnb.android.lottie.rnexample" defaultConfig { applicationId "com.airbnb.android.lottie.rnexample" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" - buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() - - if (isNewArchitectureEnabled()) { - // We configure the CMake build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - arguments "-DPROJECT_BUILD_DIR=$buildDir", - "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", - "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", - "-DNODE_MODULES_DIR=$rootDir/../node_modules", - "-DANDROID_STL=c++_shared" - } - } - if (!enableSeparateBuildPerCPUArchitecture) { - ndk { - abiFilters (*reactNativeArchitectures()) - } - } - } - } - - if (isNewArchitectureEnabled()) { - // We configure the NDK build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - path "$projectDir/src/main/jni/CMakeLists.txt" - } - } - def reactAndroidProjectDir = project(':ReactAndroid').projectDir - def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - afterEvaluate { - // If you wish to add a custom TurboModule or component locally, - // you should uncomment this line. - // preBuild.dependsOn("generateCodegenArtifactsFromSchema") - preDebugBuild.dependsOn(packageReactNdkDebugLibs) - preReleaseBuild.dependsOn(packageReactNdkReleaseLibs) - - // Due to a bug inside AGP, we have to explicitly set a dependency - // between configureCMakeDebug* tasks and the preBuild tasks. - // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732 - configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild) - configureCMakeDebug.dependsOn(preDebugBuild) - reactNativeArchitectures().each { architecture -> - tasks.findByName("configureCMakeDebug[${architecture}]")?.configure { - dependsOn("preDebugBuild") - } - tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure { - dependsOn("preReleaseBuild") - } - } - } } splits { @@ -249,65 +149,22 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - - //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:+" // From node_modules + // The version of react-native is set by the React Native Gradle Plugin + implementation("com.facebook.react:react-android") - implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - - debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' - } + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' exclude group:'com.squareup.okhttp3', module:'okhttp' } - debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' - } - - if (enableHermes) { - //noinspection GradleDynamicVersion - implementation("com.facebook.react:hermes-engine:+") { // From node_modules - exclude group:'com.facebook.fbjni' - } + debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") + if (hermesEnabled.toBoolean()) { + implementation("com.facebook.react:hermes-android") } else { implementation jscFlavor } } -if (isNewArchitectureEnabled()) { - // If new architecture is enabled, we let you build RN from source - // Otherwise we fallback to a prebuilt .aar bundled in the NPM package. - // This will be applied to all the imported transtitive dependency. - configurations.all { - resolutionStrategy.dependencySubstitution { - substitute(module("com.facebook.react:react-native")) - .using(project(":ReactAndroid")) - .because("On New Architecture we're building React Native from source") - substitute(module("com.facebook.react:hermes-engine")) - .using(project(":ReactAndroid:hermes-engine")) - .because("On New Architecture we're building Hermes from source") - } - } -} - -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.implementation - into 'libs' -} - -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) - -def isNewArchitectureEnabled() { - // To opt-in for the New Architecture, you can either: - // - Set `newArchEnabled` to true inside the `gradle.properties` file - // - Invoke gradle with `-newArchEnabled=true` - // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` - return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" -} \ No newline at end of file +apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) \ No newline at end of file diff --git a/apps/fabric/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java b/apps/fabric/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java index 13a6492..a0b5196 100644 --- a/apps/fabric/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java +++ b/apps/fabric/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java @@ -17,7 +17,6 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; 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; @@ -25,13 +24,16 @@ import com.facebook.react.modules.network.NetworkingModule; import okhttp3.OkHttpClient; +/** + * Class responsible of loading Flipper inside your React Native application. This is the debug + * flavor of it. Here you can add your own plugins and customize the Flipper setup. + */ 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()); diff --git a/apps/fabric/android/app/src/main/AndroidManifest.xml b/apps/fabric/android/app/src/main/AndroidManifest.xml index 2c4cced..8af2453 100644 --- a/apps/fabric/android/app/src/main/AndroidManifest.xml +++ b/apps/fabric/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java index ffd671b..c55f79c 100644 --- a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java +++ b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java @@ -2,7 +2,8 @@ import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; -import com.facebook.react.ReactRootView; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactActivityDelegate; public class MainActivity extends ReactActivity { @@ -16,33 +17,19 @@ protected String getMainComponentName() { } /** - * 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). + * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link + * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React + * (aka React 18) with two boolean flags. */ @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; - } + return new DefaultReactActivityDelegate( + this, + getMainComponentName(), + // If you opted-in for the New Architecture, we enable the Fabric Renderer. + DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled + // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18). + DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled + ); } } \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java index cd9d9e5..6e7caa1 100644 --- a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java +++ b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java @@ -1,22 +1,19 @@ package com.airbnb.android.lottie.rnexample; import android.app.Application; -import android.content.Context; import com.facebook.react.PackageList; import com.facebook.react.ReactApplication; -import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; -import com.facebook.react.config.ReactFeatureFlags; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactNativeHost; import com.facebook.soloader.SoLoader; -import com.airbnb.android.lottie.rnexample.newarchitecture.MainApplicationReactNativeHost; -import java.lang.reflect.InvocationTargetException; import java.util.List; public class MainApplication extends Application implements ReactApplication { private final ReactNativeHost mReactNativeHost = - new ReactNativeHost(this) { + new DefaultReactNativeHost(this) { @Override public boolean getUseDeveloperSupport() { return BuildConfig.DEBUG; @@ -35,57 +32,31 @@ protected List getPackages() { protected String getJSMainModuleName() { return "index"; } - }; - private final ReactNativeHost mNewArchitectureNativeHost = - new MainApplicationReactNativeHost(this); + @Override + protected boolean isNewArchEnabled() { + return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + } + + @Override + protected Boolean isHermesEnabled() { + return BuildConfig.IS_HERMES_ENABLED; + } + }; @Override public ReactNativeHost getReactNativeHost() { - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - return mNewArchitectureNativeHost; - } else { - return mReactNativeHost; - } + 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()); - } - - /** - * Loads Flipper in React Native templates. Call this in the onCreate method with something like - * initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); - * - * @param context - * @param reactInstanceManager - */ - private static void initializeFlipper( - Context context, ReactInstanceManager reactInstanceManager) { - if (BuildConfig.DEBUG) { - try { - /* - We use reflection here to pick up the class that initializes Flipper, - since Flipper library is not available in release mode - */ - Class aClass = Class.forName("com.airbnb.android.lottie.rnexample.ReactNativeFlipper"); - aClass - .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class) - .invoke(null, context, reactInstanceManager); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + // If you opted-in for the New Architecture, we load the native entry point for this app. + DefaultNewArchitectureEntryPoint.load(); } + ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); } } \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java deleted file mode 100644 index 5296cb0..0000000 --- a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.airbnb.android.lottie.rnexample.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.airbnb.android.lottie.rnexample.BuildConfig; -import com.airbnb.android.lottie.rnexample.newarchitecture.components.MainComponentsRegistry; -import com.airbnb.android.lottie.rnexample.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; - } - }; - } -} \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java deleted file mode 100644 index 4b6d92d..0000000 --- a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.airbnb.android.lottie.rnexample.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); - } -} \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java deleted file mode 100644 index 2f85ec3..0000000 --- a/apps/fabric/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.airbnb.android.lottie.rnexample.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("example_appmodules"); - sIsSoLibraryLoaded = true; - } - } -} \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/CMakeLists.txt b/apps/fabric/android/app/src/main/jni/CMakeLists.txt deleted file mode 100644 index 027f351..0000000 --- a/apps/fabric/android/app/src/main/jni/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.13) - -# Define the library name here. -project(example_appmodules) - -# This file includes all the necessary to let you build your application with the New Architecture. -include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake) \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.cpp deleted file mode 100644 index d34a1e4..0000000 --- a/apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "MainApplicationModuleProvider.h" - -#include -#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); - - // Module providers autolinked by RN CLI - auto rncli_module = rncli_ModuleProvider(moduleName, params); - if (rncli_module != nullptr) { - return rncli_module; - } - - return rncore_ModuleProvider(moduleName, params); -} - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.h b/apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.h deleted file mode 100644 index 48f1d10..0000000 --- a/apps/fabric/android/app/src/main/jni/MainApplicationModuleProvider.h +++ /dev/null @@ -1,16 +0,0 @@ -#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 \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp deleted file mode 100644 index ae730d1..0000000 --- a/apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#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( - const std::string &name) { - return getTurboModule(name, nullptr) != nullptr || - getTurboModule(name, {.moduleName = name}) != nullptr; -} - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h deleted file mode 100644 index 6617ea4..0000000 --- a/apps/fabric/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -#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/airbnb/android/lottie/rnexample/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(const std::string &name); -}; - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/MainComponentsRegistry.cpp b/apps/fabric/android/app/src/main/jni/MainComponentsRegistry.cpp deleted file mode 100644 index 1f42510..0000000 --- a/apps/fabric/android/app/src/main/jni/MainComponentsRegistry.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "MainComponentsRegistry.h" - -#include -#include -#include -#include -#include - -namespace facebook { -namespace react { - -MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {} - -std::shared_ptr -MainComponentsRegistry::sharedProviderRegistry() { - auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry(); - - // Autolinked providers registered by RN CLI - rncli_registerProviders(providerRegistry); - - // 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 \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/MainComponentsRegistry.h b/apps/fabric/android/app/src/main/jni/MainComponentsRegistry.h deleted file mode 100644 index ca8182b..0000000 --- a/apps/fabric/android/app/src/main/jni/MainComponentsRegistry.h +++ /dev/null @@ -1,32 +0,0 @@ -#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/airbnb/android/lottie/rnexample/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 \ No newline at end of file diff --git a/apps/fabric/android/app/src/main/jni/OnLoad.cpp b/apps/fabric/android/app/src/main/jni/OnLoad.cpp deleted file mode 100644 index ae1ef00..0000000 --- a/apps/fabric/android/app/src/main/jni/OnLoad.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#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(); - }); -} \ No newline at end of file diff --git a/apps/fabric/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java b/apps/fabric/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java new file mode 100644 index 0000000..0ea0b37 --- /dev/null +++ b/apps/fabric/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java @@ -0,0 +1,19 @@ +/** + * 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.airbnb.android.lottie.rnexample; + +import android.content.Context; +import com.facebook.react.ReactInstanceManager; +/** + * Class responsible of loading Flipper inside your React Native application. This is the release + * flavor of it so it's empty as we don't want to load Flipper. + */ +public class ReactNativeFlipper { + public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { + // Do nothing as we don't want to initialize Flipper on Release. + } +} \ No newline at end of file diff --git a/apps/fabric/android/build.gradle b/apps/fabric/android/build.gradle index 8569fee..ba99262 100644 --- a/apps/fabric/android/build.gradle +++ b/apps/fabric/android/build.gradle @@ -2,50 +2,20 @@ buildscript { ext { - buildToolsVersion = "31.0.0" + buildToolsVersion = "33.0.0" minSdkVersion = 21 - compileSdkVersion = 31 - targetSdkVersion = 31 + compileSdkVersion = 33 + targetSdkVersion = 33 - if (System.properties['os.arch'] == "aarch64") { - // For M1 Users we need to use the NDK 24 which added support for aarch64 - ndkVersion = "24.0.8215888" - } else { - // Otherwise we default to the side-by-side NDK version from AGP. - ndkVersion = "21.4.7075529" - } + // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. + ndkVersion = "23.1.7779620" } repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.2.1") + classpath("com.android.tools.build:gradle:7.3.1") classpath("com.facebook.react:react-native-gradle-plugin") - classpath("de.undercouch:gradle-download-task:5.0.1") - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } -} - -allprojects { - repositories { - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url("$rootDir/../node_modules/react-native/android") - } - maven { - // Android JSC is installed from npm - url("$rootDir/../node_modules/jsc-android/dist") - } - mavenCentral { - // We don't want to fetch react-native from Maven Central as there are - // older versions over there. - content { - excludeGroup "com.facebook.react" - } - } - google() - maven { url 'https://www.jitpack.io' } - } -} +} \ No newline at end of file diff --git a/apps/fabric/android/gradle.properties b/apps/fabric/android/gradle.properties index 6675fa7..ff60552 100644 --- a/apps/fabric/android/gradle.properties +++ b/apps/fabric/android/gradle.properties @@ -37,4 +37,8 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # your application. You should enable this flag either if you want # to write custom TurboModules/Fabric components OR use libraries that # are providing them. -newArchEnabled=true \ No newline at end of file +newArchEnabled=true + +# Use this property to enable or disable the Hermes JS engine. +# If set to false, you will be using JSC instead. +hermesEnabled=true \ No newline at end of file diff --git a/apps/fabric/android/settings.gradle b/apps/fabric/android/settings.gradle index 0d021a9..d5ade3f 100644 --- a/apps/fabric/android/settings.gradle +++ b/apps/fabric/android/settings.gradle @@ -2,10 +2,3 @@ rootProject.name = 'lottie-react-native' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' includeBuild('../node_modules/react-native-gradle-plugin') - -if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { - include(":ReactAndroid") - project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') - include(":ReactAndroid:hermes-engine") - project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine') -} diff --git a/apps/fabric/ios/Podfile b/apps/fabric/ios/Podfile index 88245be..eb803d4 100644 --- a/apps/fabric/ios/Podfile +++ b/apps/fabric/ios/Podfile @@ -1,19 +1,35 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '12.4' -install! 'cocoapods', :deterministic_uuids => false +platform :ios, min_ios_version_supported +prepare_react_native_project! + +flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + +linkage = ENV['USE_FRAMEWORKS'] +if linkage != nil + Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green + use_frameworks! :linkage => linkage.to_sym +end target 'example' do config = use_native_modules! + # Flags change depending on the env values. + flags = get_default_flags() + use_react_native!( :path => config[:reactNativePath], # Hermes is now enabled by default. Disable by setting this flag to false. # Upcoming versions of React Native may rely on get_default_flags(), but # we make it explicit here to aid in the React Native upgrade process. - :hermes_enabled => true, - :fabric_enabled => true, + :hermes_enabled => flags[:hermes_enabled], + :fabric_enabled => flags[:fabric_enabled], + # Enables Flipper. + # + # Note that if you have use_frameworks! enabled, Flipper will not work and + # you should disable the next line. + :flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) @@ -32,4 +48,4 @@ target 'example' do ) __apply_Xcode_12_5_M1_post_install_workaround(installer) end -end +end \ No newline at end of file diff --git a/apps/fabric/ios/Podfile.lock b/apps/fabric/ios/Podfile.lock index 140deb4..36bb1a4 100644 --- a/apps/fabric/ios/Podfile.lock +++ b/apps/fabric/ios/Podfile.lock @@ -1,17 +1,81 @@ PODS: - boost (1.76.0) + - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.70.3) - - FBReactNativeSpec (0.70.3): + - FBLazyVector (0.71.0-rc.6) + - FBReactNativeSpec (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Core (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Core (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - Flipper (0.125.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (3.2.0.1) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.10): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.1100) + - Flipper-Glog (0.5.0.5) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.125.0): + - FlipperKit/Core (= 0.125.0) + - FlipperKit/Core (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.125.0) + - FlipperKit/FKPortForwarding (0.125.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.125.0) + - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.70.3) + - hermes-engine (0.71.0-rc.6): + - hermes-engine/Pre-built (= 0.71.0-rc.6) + - hermes-engine/Pre-built (0.71.0-rc.6) - libevent (2.1.12) - lottie-ios (3.5.0) - lottie-react-native (6.0.0-rc.1): @@ -23,6 +87,7 @@ PODS: - React-Codegen - React-Core - React-RCTFabric + - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -45,625 +110,664 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.70.3) - - RCTTypeSafety (0.70.3): - - FBLazyVector (= 0.70.3) - - RCTRequired (= 0.70.3) - - React-Core (= 0.70.3) - - React (0.70.3): - - React-Core (= 0.70.3) - - React-Core/DevSupport (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-RCTActionSheet (= 0.70.3) - - React-RCTAnimation (= 0.70.3) - - React-RCTBlob (= 0.70.3) - - React-RCTImage (= 0.70.3) - - React-RCTLinking (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - React-RCTSettings (= 0.70.3) - - React-RCTText (= 0.70.3) - - React-RCTVibration (= 0.70.3) - - React-bridging (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - React-jsi (= 0.70.3) - - React-callinvoker (0.70.3) - - React-Codegen (0.70.3): - - FBReactNativeSpec (= 0.70.3) - - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Core (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-rncore (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Core (0.70.3): + - RCTRequired (0.71.0-rc.6) + - RCTTypeSafety (0.71.0-rc.6): + - FBLazyVector (= 0.71.0-rc.6) + - RCTRequired (= 0.71.0-rc.6) + - React-Core (= 0.71.0-rc.6) + - React (0.71.0-rc.6): + - React-Core (= 0.71.0-rc.6) + - React-Core/DevSupport (= 0.71.0-rc.6) + - React-Core/RCTWebSocket (= 0.71.0-rc.6) + - React-RCTActionSheet (= 0.71.0-rc.6) + - React-RCTAnimation (= 0.71.0-rc.6) + - React-RCTBlob (= 0.71.0-rc.6) + - React-RCTImage (= 0.71.0-rc.6) + - React-RCTLinking (= 0.71.0-rc.6) + - React-RCTNetwork (= 0.71.0-rc.6) + - React-RCTSettings (= 0.71.0-rc.6) + - React-RCTText (= 0.71.0-rc.6) + - React-RCTVibration (= 0.71.0-rc.6) + - React-callinvoker (0.71.0-rc.6) + - React-Codegen (0.71.0-rc.6): + - FBReactNativeSpec + - hermes-engine + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - React-graphics + - React-jsi + - React-jsiexecutor + - React-rncore + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - React-Core (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-Core/Default (= 0.71.0-rc.6) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/CoreModulesHeaders (0.70.3): + - React-Core/CoreModulesHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/Default (0.70.3): + - React-Core/Default (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/DevSupport (0.70.3): + - React-Core/DevSupport (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-Core/Default (= 0.71.0-rc.6) + - React-Core/RCTWebSocket (= 0.71.0-rc.6) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-jsinspector (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTActionSheetHeaders (0.70.3): + - React-Core/RCTActionSheetHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTAnimationHeaders (0.70.3): + - React-Core/RCTAnimationHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTBlobHeaders (0.70.3): + - React-Core/RCTBlobHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTImageHeaders (0.70.3): + - React-Core/RCTImageHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTLinkingHeaders (0.70.3): + - React-Core/RCTLinkingHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTNetworkHeaders (0.70.3): + - React-Core/RCTNetworkHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTSettingsHeaders (0.70.3): + - React-Core/RCTSettingsHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTTextHeaders (0.70.3): + - React-Core/RCTTextHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTVibrationHeaders (0.70.3): + - React-Core/RCTVibrationHeaders (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-Core/RCTWebSocket (0.70.3): + - React-Core/RCTWebSocket (0.71.0-rc.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-Core/Default (= 0.71.0-rc.6) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) - Yoga - - React-CoreModules (0.70.3): + - React-CoreModules (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/CoreModulesHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTImage (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-cxxreact (0.70.3): + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Codegen (= 0.71.0-rc.6) + - React-Core/CoreModulesHeaders (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-RCTImage (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-cxxreact (0.71.0-rc.6): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-logger (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-runtimeexecutor (= 0.70.3) - - React-Fabric (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Fabric/animations (= 0.70.3) - - React-Fabric/attributedstring (= 0.70.3) - - React-Fabric/butter (= 0.70.3) - - React-Fabric/componentregistry (= 0.70.3) - - React-Fabric/componentregistrynative (= 0.70.3) - - React-Fabric/components (= 0.70.3) - - React-Fabric/config (= 0.70.3) - - React-Fabric/core (= 0.70.3) - - React-Fabric/debug_core (= 0.70.3) - - React-Fabric/debug_renderer (= 0.70.3) - - React-Fabric/imagemanager (= 0.70.3) - - React-Fabric/leakchecker (= 0.70.3) - - React-Fabric/mounting (= 0.70.3) - - React-Fabric/runtimescheduler (= 0.70.3) - - React-Fabric/scheduler (= 0.70.3) - - React-Fabric/telemetry (= 0.70.3) - - React-Fabric/templateprocessor (= 0.70.3) - - React-Fabric/textlayoutmanager (= 0.70.3) - - React-Fabric/uimanager (= 0.70.3) - - React-Fabric/utils (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/animations (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/attributedstring (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/butter (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/componentregistry (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/componentregistrynative (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Fabric/components/activityindicator (= 0.70.3) - - React-Fabric/components/image (= 0.70.3) - - React-Fabric/components/inputaccessory (= 0.70.3) - - React-Fabric/components/legacyviewmanagerinterop (= 0.70.3) - - React-Fabric/components/modal (= 0.70.3) - - React-Fabric/components/root (= 0.70.3) - - React-Fabric/components/safeareaview (= 0.70.3) - - React-Fabric/components/scrollview (= 0.70.3) - - React-Fabric/components/slider (= 0.70.3) - - React-Fabric/components/text (= 0.70.3) - - React-Fabric/components/textinput (= 0.70.3) - - React-Fabric/components/unimplementedview (= 0.70.3) - - React-Fabric/components/view (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/activityindicator (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/image (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/inputaccessory (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/legacyviewmanagerinterop (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/modal (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/root (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/safeareaview (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/scrollview (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/slider (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/text (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/textinput (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/unimplementedview (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/components/view (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) + - React-callinvoker (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsinspector (= 0.71.0-rc.6) + - React-logger (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) + - React-runtimeexecutor (= 0.71.0-rc.6) + - React-Fabric (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Fabric/animations (= 0.71.0-rc.6) + - React-Fabric/attributedstring (= 0.71.0-rc.6) + - React-Fabric/butter (= 0.71.0-rc.6) + - React-Fabric/componentregistry (= 0.71.0-rc.6) + - React-Fabric/componentregistrynative (= 0.71.0-rc.6) + - React-Fabric/components (= 0.71.0-rc.6) + - React-Fabric/config (= 0.71.0-rc.6) + - React-Fabric/core (= 0.71.0-rc.6) + - React-Fabric/debug_core (= 0.71.0-rc.6) + - React-Fabric/debug_renderer (= 0.71.0-rc.6) + - React-Fabric/imagemanager (= 0.71.0-rc.6) + - React-Fabric/leakchecker (= 0.71.0-rc.6) + - React-Fabric/mapbuffer (= 0.71.0-rc.6) + - React-Fabric/mounting (= 0.71.0-rc.6) + - React-Fabric/runtimescheduler (= 0.71.0-rc.6) + - React-Fabric/scheduler (= 0.71.0-rc.6) + - React-Fabric/telemetry (= 0.71.0-rc.6) + - React-Fabric/templateprocessor (= 0.71.0-rc.6) + - React-Fabric/textlayoutmanager (= 0.71.0-rc.6) + - React-Fabric/uimanager (= 0.71.0-rc.6) + - React-Fabric/utils (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/animations (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/attributedstring (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/butter (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/componentregistry (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/componentregistrynative (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Fabric/components/activityindicator (= 0.71.0-rc.6) + - React-Fabric/components/image (= 0.71.0-rc.6) + - React-Fabric/components/inputaccessory (= 0.71.0-rc.6) + - React-Fabric/components/legacyviewmanagerinterop (= 0.71.0-rc.6) + - React-Fabric/components/modal (= 0.71.0-rc.6) + - React-Fabric/components/root (= 0.71.0-rc.6) + - React-Fabric/components/safeareaview (= 0.71.0-rc.6) + - React-Fabric/components/scrollview (= 0.71.0-rc.6) + - React-Fabric/components/slider (= 0.71.0-rc.6) + - React-Fabric/components/text (= 0.71.0-rc.6) + - React-Fabric/components/textinput (= 0.71.0-rc.6) + - React-Fabric/components/unimplementedview (= 0.71.0-rc.6) + - React-Fabric/components/view (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/activityindicator (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/image (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/inputaccessory (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/legacyviewmanagerinterop (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/modal (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/root (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/safeareaview (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/scrollview (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/slider (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/text (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/textinput (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/unimplementedview (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/components/view (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) - Yoga - - React-Fabric/config (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/core (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/debug_core (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/debug_renderer (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/imagemanager (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-RCTImage (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/leakchecker (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/mounting (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/runtimescheduler (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/scheduler (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/telemetry (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/templateprocessor (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/textlayoutmanager (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) + - React-Fabric/config (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/core (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/debug_core (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/debug_renderer (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/imagemanager (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-RCTImage (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/leakchecker (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/mapbuffer (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/mounting (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/runtimescheduler (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/scheduler (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/telemetry (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/templateprocessor (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/textlayoutmanager (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) - React-Fabric/uimanager - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/uimanager (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Fabric/utils (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-graphics (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-graphics (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-hermes (0.70.3): + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/uimanager (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-Fabric/utils (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.0-rc.6) + - RCTTypeSafety (= 0.71.0-rc.6) + - React-graphics (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-graphics (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - React-Core/Default (= 0.71.0-rc.6) + - React-hermes (0.71.0-rc.6): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-jsi (0.70.3): + - React-cxxreact (= 0.71.0-rc.6) + - React-jsiexecutor (= 0.71.0-rc.6) + - React-jsinspector (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) + - React-jsi (0.71.0-rc.6): - boost (= 1.76.0) - DoubleConversion - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-jsi/Default (= 0.70.3) - - React-jsi/Default (0.70.3): - - boost (= 1.76.0) + - React-jsiexecutor (0.71.0-rc.6): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsi/Fabric (0.70.3): - - boost (= 1.76.0) - - DoubleConversion + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) + - React-jsinspector (0.71.0-rc.6) + - React-logger (0.71.0-rc.6): - glog + - React-perflogger (0.71.0-rc.6) + - React-RCTActionSheet (0.71.0-rc.6): + - React-Core/RCTActionSheetHeaders (= 0.71.0-rc.6) + - React-RCTAnimation (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.70.3): - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-jsinspector (0.70.3) - - React-logger (0.70.3): - - glog - - React-perflogger (0.70.3) - - React-RCTActionSheet (0.70.3): - - React-Core/RCTActionSheetHeaders (= 0.70.3) - - React-RCTAnimation (0.70.3): + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Codegen (= 0.71.0-rc.6) + - React-Core/RCTAnimationHeaders (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-RCTAppDelegate (0.71.0-rc.6): + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - React-graphics + - React-RCTFabric + - ReactCommon/turbomodule/core + - React-RCTBlob (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTAnimationHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTBlob (0.70.3): + - React-Codegen (= 0.71.0-rc.6) + - React-Core/RCTBlobHeaders (= 0.71.0-rc.6) + - React-Core/RCTWebSocket (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-RCTNetwork (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-RCTFabric (0.71.0-rc.6): + - RCT-Folly/Fabric (= 2021.07.22.00) + - React-Core (= 0.71.0-rc.6) + - React-Fabric (= 0.71.0-rc.6) + - React-RCTImage (= 0.71.0-rc.6) + - React-RCTImage (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.3) - - React-Core/RCTBlobHeaders (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTFabric (0.70.3): - - RCT-Folly/Fabric (= 2021.07.22.00) - - React-Core (= 0.70.3) - - React-Fabric (= 0.70.3) - - React-RCTImage (= 0.70.3) - - React-RCTImage (0.70.3): + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Codegen (= 0.71.0-rc.6) + - React-Core/RCTImageHeaders (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-RCTNetwork (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-RCTLinking (0.71.0-rc.6): + - React-Codegen (= 0.71.0-rc.6) + - React-Core/RCTLinkingHeaders (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-RCTNetwork (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTImageHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTLinking (0.70.3): - - React-Codegen (= 0.70.3) - - React-Core/RCTLinkingHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTNetwork (0.70.3): + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Codegen (= 0.71.0-rc.6) + - React-Core/RCTNetworkHeaders (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-RCTSettings (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTNetworkHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTSettings (0.70.3): + - RCTTypeSafety (= 0.71.0-rc.6) + - React-Codegen (= 0.71.0-rc.6) + - React-Core/RCTSettingsHeaders (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-RCTText (0.71.0-rc.6): + - React-Core/RCTTextHeaders (= 0.71.0-rc.6) + - React-RCTVibration (0.71.0-rc.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTSettingsHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTText (0.70.3): - - React-Core/RCTTextHeaders (= 0.70.3) - - React-RCTVibration (0.70.3): + - React-Codegen (= 0.71.0-rc.6) + - React-Core/RCTVibrationHeaders (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (= 0.71.0-rc.6) + - React-rncore (0.71.0-rc.6) + - React-runtimeexecutor (0.71.0-rc.6): + - React-jsi (= 0.71.0-rc.6) + - ReactCommon/turbomodule/bridging (0.71.0-rc.6): + - DoubleConversion + - glog - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.3) - - React-Core/RCTVibrationHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-rncore (0.70.3) - - React-runtimeexecutor (0.70.3): - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (0.70.3): + - React-callinvoker (= 0.71.0-rc.6) + - React-Core (= 0.71.0-rc.6) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-logger (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) + - ReactCommon/turbomodule/core (0.71.0-rc.6): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 0.70.3) - - React-callinvoker (= 0.70.3) - - React-Core (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-logger (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-callinvoker (= 0.71.0-rc.6) + - React-Core (= 0.71.0-rc.6) + - React-cxxreact (= 0.71.0-rc.6) + - React-jsi (= 0.71.0-rc.6) + - React-logger (= 0.71.0-rc.6) + - React-perflogger (= 0.71.0-rc.6) + - SocketRocket (0.6.0) - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (= 0.125.0) + - Flipper-Boost-iOSX (= 1.76.0.1.11) + - Flipper-DoubleConversion (= 3.2.0.1) + - Flipper-Fmt (= 7.1.7) + - Flipper-Folly (= 2.6.10) + - Flipper-Glog (= 0.5.0.5) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.125.0) + - FlipperKit/Core (= 0.125.0) + - FlipperKit/CppBridge (= 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) + - FlipperKit/FBDefines (= 0.125.0) + - FlipperKit/FKPortForwarding (= 0.125.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) + - FlipperKit/FlipperKitReactPlugin (= 0.125.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`) + - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) - libevent (~> 2.1.12) - lottie-react-native (from `../node_modules/lottie-react-native`) + - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) - - React-bridging (from `../node_modules/react-native/ReactCommon`) - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) + - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) @@ -671,13 +775,13 @@ DEPENDENCIES: - React-graphics (from `../node_modules/react-native/ReactCommon/react/renderer/graphics`) - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - - React-jsi/Fabric (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTAppDelegate (from `../node_modules/react-native/Libraries/AppDelegate`) - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - React-RCTFabric (from `../node_modules/react-native/React`) - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) @@ -693,9 +797,22 @@ DEPENDENCIES: SPEC REPOS: trunk: + - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit - fmt - libevent - lottie-ios + - OpenSSL-Universal + - SocketRocket + - YogaKit EXTERNAL SOURCES: boost: @@ -709,7 +826,7 @@ EXTERNAL SOURCES: glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" hermes-engine: - :podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec" + :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" lottie-react-native: :path: "../node_modules/lottie-react-native" RCT-Folly: @@ -720,8 +837,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/TypeSafety" React: :path: "../node_modules/react-native/" - React-bridging: - :path: "../node_modules/react-native/ReactCommon" React-callinvoker: :path: "../node_modules/react-native/ReactCommon/callinvoker" React-Codegen: @@ -752,6 +867,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/ActionSheetIOS" React-RCTAnimation: :path: "../node_modules/react-native/Libraries/NativeAnimation" + React-RCTAppDelegate: + :path: "../node_modules/react-native/Libraries/AppDelegate" React-RCTBlob: :path: "../node_modules/react-native/Libraries/Blob" React-RCTFabric: @@ -779,48 +896,61 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 3b313c3fb52b597f7a9b430798e6367d2b9f07e5 - FBReactNativeSpec: c0b39268611f0be970be1fb056527ffe1322c3fa + FBLazyVector: 06dfc1e29f55f9109f02412d5a38741fba2bb987 + FBReactNativeSpec: 7d2eebd6397a29eb92244a03a754ac4fee1ae149 + Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: bb344d89a0d14c2c91ad357480a79698bb80e186 + hermes-engine: ca3834c67d1729953a2645b89a59f38c47e94ab3 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: c55158d67d0629a260625cc2ded2052b829e3c3e lottie-react-native: 7bf794e0ee88accc91af65598efbbfacc2d5295f + OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda - RCTRequired: 5cf7e7d2f12699724b59f90350257a422eaa9492 - RCTTypeSafety: 3f3ead9673d1ab8bb1aea85b0894ab3220f8f06e - React: 30a333798d1fcf595e8a4108bbaa0f125a655f4a - React-bridging: 92396c03ab446756ddfb7a8e2baff3bcf19eec7d - React-callinvoker: bb66a41b41fa0b7c5f3cc626693a63c9ea0d6252 - React-Codegen: 5d4e760e2c16625f4c4b6cabb083c02ddfb9cd6b - React-Core: a689b4d1bd13e15915a05c9918c2b01df96cd811 - React-CoreModules: d262214db6b704b042bc5c0735b06c346a371d7f - React-cxxreact: 81d5bf256313bf96cb925eb0e654103291161a17 - React-Fabric: eae2bf0596c0f4938074df28fbd0338ca59a6f64 - React-graphics: fe9cb66bca543a35c603a041295b54a42436374c - React-hermes: 1c35cbfbdc7a888c3a1aa05e6d0ca004d92c923c - React-jsi: 7f99dc3055bec9a0eeb4230f8b6ac873514c8421 - React-jsiexecutor: 7e2e1772ef7b97168c880eeaf3749d8c145ffd6e - React-jsinspector: 0553c9fe7218e1f127be070bd5a4d2fc19fb8190 - React-logger: cffcc09e8aba8a3014be8d18da7f922802e9f19e - React-perflogger: 082b4293f0b3914ff41da35a6c06ac4490fcbcc8 - React-RCTActionSheet: 83da3030deb5dea54b398129f56540a44e64d3ae - React-RCTAnimation: bac3a4f4c0436554d9f7fbb1352a0cdcb1fb0f1c - React-RCTBlob: d2c8830ac6b4d55d5624469829fe6d0ef1d534d1 - React-RCTFabric: 68456988d831a0a464516afde1f242455c3891eb - React-RCTImage: 26ad032b09f90ae5d2283ec19f0c455c444c8189 - React-RCTLinking: 4a8d16586df11fff515a6c52ff51a02c47a20499 - React-RCTNetwork: 843fc75a70f0b5760de0bf59468585f41209bcf0 - React-RCTSettings: 54e59255f94462951b45f84c3f81aedc27cf8615 - React-RCTText: c32e2a60827bd232b2bc95941b9926ccf1c2be4c - React-RCTVibration: b9a58ffdd18446f43d493a4b0ecd603ee86be847 - React-rncore: 6b3bb462f9d8b23de012a44c838c610977125f31 - React-runtimeexecutor: e9b1f9310158a1e265bcdfdfd8c62d6174b947a2 - ReactCommon: 01064177e66d652192c661de899b1076da962fd9 - Yoga: 2ed968a4f060a92834227c036279f2736de0fce3 + RCTRequired: 05c40d27c173b93725808be7659ae63e5df20186 + RCTTypeSafety: a416712a532dd834267f38a6fb3d5c553380afa0 + React: 6144395a72dcc39ae49113a81dec5d0a2f6c9c8e + React-callinvoker: 22b31ca8aad7f34ea9a512233d16452e83e3dc86 + React-Codegen: 79c6d7af3db791d2c9a274274e4ea998af5d922d + React-Core: b67b43737798f57cf669a70f6707e7523d451169 + React-CoreModules: d0443d8e58b6a6455feff376a3081252b014d193 + React-cxxreact: b328838b13bc3bccf4a030f6c0b68aaac2a9e586 + React-Fabric: 99e58e0059f0a453c8fb8525f788a4e7748f264c + React-graphics: 492a1f8298b061523cabb58effbf79b679d0dcb6 + React-hermes: c4ad101e73dd079c7d7430eae56e818e19b4306f + React-jsi: 597bedc3bc8c67005475e227527a95df3561f9c6 + React-jsiexecutor: ec0b8103b17a90ed43254376fa428a082580159a + React-jsinspector: 2eb38418847382c20cd338045e16472ab25b9ef4 + React-logger: b878144c10732a2d017bb0bd6420e191cd8f4f50 + React-perflogger: 8b7945cc928ecbf6472009c9632a518df02ada36 + React-RCTActionSheet: 75190dc120e9d5575e17b3dc41a8781f3c36985f + React-RCTAnimation: 923e06ee256ed154b4c88ab4c1e5333c5e826a0c + React-RCTAppDelegate: 9dfb550a4018478a45b5ded5838cb1d59e21565b + React-RCTBlob: 3bb08646922af5d3c3db6a3bff06b32b341b5916 + React-RCTFabric: 0f27e9638cdb0782cd82886d54aa8699b6c8dd87 + React-RCTImage: e92b553d6339d98cbd84c750ac0bf55a6d96df06 + React-RCTLinking: 6f09b9bbff1a90ce4e407aa6e2dd666be8534253 + React-RCTNetwork: e3cec4488f158981e04a053c7f90157d775cad0d + React-RCTSettings: ab76f326204332e8e11b1e553c34dfda355a064d + React-RCTText: 1301ee6a216cfdb1ca62c97ea2cf4929482f484a + React-RCTVibration: 8951361514f545c0c305ddffa195c24076805ec0 + React-rncore: 84711acb1f07a2499a429b55f66e50435bc33e52 + React-runtimeexecutor: a31809467e1fcd920cdb626f9b8b67d3fad33b8f + ReactCommon: f82f2947d0af56d7a6c216f99040090c1f21e086 + SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + Yoga: e8c89763180f566ce5ac9b102d8d43586075859d + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 0646e68d072081a8f54ba98fb057e97e1a935e94 +PODFILE CHECKSUM: f5ecd2f98b6f47d935be3af402bc886c3fc65408 COCOAPODS: 1.11.3 diff --git a/apps/fabric/ios/example/AppDelegate.h b/apps/fabric/ios/example/AppDelegate.h index ef1de86..3713cad 100644 --- a/apps/fabric/ios/example/AppDelegate.h +++ b/apps/fabric/ios/example/AppDelegate.h @@ -1,8 +1,6 @@ -#import +#import #import -@interface AppDelegate : UIResponder +@interface AppDelegate : RCTAppDelegate -@property (nonatomic, strong) UIWindow *window; - -@end +@end \ No newline at end of file diff --git a/apps/fabric/ios/example/AppDelegate.mm b/apps/fabric/ios/example/AppDelegate.mm index 1a05b82..74a6f51 100644 --- a/apps/fabric/ios/example/AppDelegate.mm +++ b/apps/fabric/ios/example/AppDelegate.mm @@ -1,85 +1,13 @@ #import "AppDelegate.h" -#import #import -#import - -#import - -#if RCT_NEW_ARCH_ENABLED -#import -#import -#import -#import -#import -#import - -#import - -static NSString *const kRNConcurrentRoot = @"concurrentRoot"; - -@interface AppDelegate () { - RCTTurboModuleManager *_turboModuleManager; - RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; - std::shared_ptr _reactNativeConfig; - facebook::react::ContextContainer::Shared _contextContainer; -} -@end -#endif @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - RCTAppSetupPrepareApp(application); - - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; - -#if RCT_NEW_ARCH_ENABLED - _contextContainer = std::make_shared(); - _reactNativeConfig = std::make_shared(); - _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); - _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer]; - bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; -#endif - - NSDictionary *initProps = [self prepareInitialProps]; - UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"example", initProps); - - if (@available(iOS 13.0, *)) { - rootView.backgroundColor = [UIColor systemBackgroundColor]; - } else { - rootView.backgroundColor = [UIColor whiteColor]; - } - - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [UIViewController new]; - rootViewController.view = rootView; - self.window.rootViewController = rootViewController; - [self.window makeKeyAndVisible]; - return YES; -} - -/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. -/// -/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html -/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). -/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`. -- (BOOL)concurrentRootEnabled -{ - // Switch this bool to turn on and off the concurrent root - return true; -} - -- (NSDictionary *)prepareInitialProps -{ - NSMutableDictionary *initProps = [NSMutableDictionary new]; - -#ifdef RCT_NEW_ARCH_ENABLED - initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]); -#endif - - return initProps; + self.moduleName = @"example"; + return [super application:application didFinishLaunchingWithOptions:launchOptions]; } - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge @@ -91,43 +19,14 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge #endif } -#if RCT_NEW_ARCH_ENABLED - -#pragma mark - RCTCxxBridgeDelegate - -- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge -{ - _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge - delegate:self - jsInvoker:bridge.jsCallInvoker]; - return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager); -} - -#pragma mark RCTTurboModuleManagerDelegate - -- (Class)getModuleClassFromName:(const char *)name -{ - return RCTCoreModulesClassProvider(name); -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - jsInvoker:(std::shared_ptr)jsInvoker -{ - return nullptr; -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - initParams: - (const facebook::react::ObjCTurboModule::InitParams &)params -{ - return nullptr; -} - -- (id)getModuleInstanceFromClass:(Class)moduleClass +/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. +/// +/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html +/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). +/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`. +- (BOOL)concurrentRootEnabled { - return RCTAppSetupDefaultModuleFromClass(moduleClass); + return true; } -#endif - -@end +@end \ No newline at end of file diff --git a/apps/fabric/package.json b/apps/fabric/package.json index 36c5cea..cc07a5f 100644 --- a/apps/fabric/package.json +++ b/apps/fabric/package.json @@ -5,16 +5,18 @@ "scripts": { "android": "react-native run-android --active-arch-only", "ios": "cd ios && RCT_NEW_ARCH_ENABLED=1 pod install && cd .. && react-native run-ios", - "start": "react-native start" + "start": "react-native start", + "upgrade": "react-native upgrade" }, "dependencies": { "lottie-react-native": "workspace:*", - "react": "18.1.0", - "react-native": "0.70.3" + "react": "18.2.0", + "react-native": "0.71.0-rc.6" }, "devDependencies": { "@babel/core": "^7.19.3", "@babel/runtime": "^7.19.4", + "@tsconfig/react-native": "^2.0.3", "@types/react-native": "^0.70.4", "metro-react-native-babel-preset": "^0.72.3", "typescript": "^4.8.4" diff --git a/apps/fabric/tsconfig.json b/apps/fabric/tsconfig.json index 21040a9..45a6c70 100644 --- a/apps/fabric/tsconfig.json +++ b/apps/fabric/tsconfig.json @@ -1,26 +1,3 @@ { - "compilerOptions": { - "allowJs": false, - "allowUnreachableCode": false, - "allowUnusedLabels": false, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "jsx": "react-native", - "lib": ["dom", "esnext"], - "module": "esnext", - "moduleResolution": "node", - "noFallthroughCasesInSwitch": true, - "noImplicitReturns": true, - "noStrictGenericChecks": false, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noUncheckedIndexedAccess": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "strict": true, - "target": "esnext" - }, - "exclude": [ - "node_modules", - ] -} \ No newline at end of file + "extends": "@tsconfig/react-native/tsconfig.json" +} diff --git a/yarn.lock b/yarn.lock index bf65c7b..14d8619 100644 --- a/yarn.lock +++ b/yarn.lock @@ -85,7 +85,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.18.6": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.18.6": version: 7.18.6 resolution: "@babel/code-frame@npm:7.18.6" dependencies: @@ -101,6 +101,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.20.5": + version: 7.20.10 + resolution: "@babel/compat-data@npm:7.20.10" + checksum: 6ed6c1bb6fc03c225d63b8611788cd976107d1692402b560ebffbf1fa53e63705f8625bb12e12d17ce7f7af34e61e1ca96c77858aac6f57010045271466200c0 + languageName: node + linkType: hard + "@babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.18.5, @babel/core@npm:^7.19.3": version: 7.19.3 resolution: "@babel/core@npm:7.19.3" @@ -124,6 +131,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.20.0": + version: 7.20.12 + resolution: "@babel/core@npm:7.20.12" + dependencies: + "@ampproject/remapping": ^2.1.0 + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.20.7 + "@babel/helper-compilation-targets": ^7.20.7 + "@babel/helper-module-transforms": ^7.20.11 + "@babel/helpers": ^7.20.7 + "@babel/parser": ^7.20.7 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.12 + "@babel/types": ^7.20.7 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.2 + semver: ^6.3.0 + checksum: 62e6c3e2149a70b5c9729ef5f0d3e2e97e9dcde89fc039c8d8e3463d5d7ba9b29ee84d10faf79b61532ac1645aa62f2bd42338320617e6e3a8a4d8e2a27076e7 + languageName: node + linkType: hard + "@babel/eslint-parser@npm:^7.18.2": version: 7.19.1 resolution: "@babel/eslint-parser@npm:7.19.1" @@ -149,6 +179,17 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.20.0, @babel/generator@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/generator@npm:7.20.7" + dependencies: + "@babel/types": ^7.20.7 + "@jridgewell/gen-mapping": ^0.3.2 + jsesc: ^2.5.1 + checksum: 84b6983ffdb50c80c1c2e3f3c32617a7133d8effd1065f3e0f9bba188a7d54ab42a4dd5e42b61b843c65f9dd1aa870036ff0f848ebd42707aaa8a2b6d31d04f5 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-annotate-as-pure@npm:7.18.6" @@ -182,6 +223,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/helper-compilation-targets@npm:7.20.7" + dependencies: + "@babel/compat-data": ^7.20.5 + "@babel/helper-validator-option": ^7.18.6 + browserslist: ^4.21.3 + lru-cache: ^5.1.1 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 8c32c873ba86e2e1805b30e0807abd07188acbe00ebb97576f0b09061cc65007f1312b589eccb4349c5a8c7f8bb9f2ab199d41da7030bf103d9f347dcd3a3cf4 + languageName: node + linkType: hard + "@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.19.0": version: 7.19.0 resolution: "@babel/helper-create-class-features-plugin@npm:7.19.0" @@ -296,6 +352,22 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.20.11": + version: 7.20.11 + resolution: "@babel/helper-module-transforms@npm:7.20.11" + dependencies: + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-module-imports": ^7.18.6 + "@babel/helper-simple-access": ^7.20.2 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/helper-validator-identifier": ^7.19.1 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.10 + "@babel/types": ^7.20.7 + checksum: 29319ebafa693d48756c6ba0d871677bb0037e0da084fbe221a17c38d57093fc8aa38543c07d76e788266a937976e37ab4901971ca7f237c5ab45f524b9ecca0 + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" @@ -348,6 +420,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-simple-access@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/helper-simple-access@npm:7.20.2" + dependencies: + "@babel/types": ^7.20.2 + checksum: ad1e96ee2e5f654ffee2369a586e5e8d2722bf2d8b028a121b4c33ebae47253f64d420157b9f0a8927aea3a9e0f18c0103e74fdd531815cf3650a0a4adca11a1 + languageName: node + linkType: hard + "@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.18.9" @@ -410,6 +491,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/helpers@npm:7.20.7" + dependencies: + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.7 + "@babel/types": ^7.20.7 + checksum: 3fb10df3510ba7116a180d5fd983d0f558f7a65c3d599385dba991bff66b74174c88881bc12c2b3cf7284294fcac5b301ded49a8b0098bdf2ef61d0cad8010db + languageName: node + linkType: hard + "@babel/highlight@npm:^7.18.6": version: 7.18.6 resolution: "@babel/highlight@npm:7.18.6" @@ -430,6 +522,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.20.0, @babel/parser@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/parser@npm:7.20.7" + bin: + parser: ./bin/babel-parser.js + checksum: 25b5266e3bd4be837092685f6b7ef886f1308ff72659a24342eb646ae5014f61ed1771ce8fc20636c890fcae19304fc72c069564ca6075207b7fbf3f75367275 + languageName: node + linkType: hard + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6" @@ -721,7 +822,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-flow@npm:^7.0.0, @babel/plugin-syntax-flow@npm:^7.18.6, @babel/plugin-syntax-flow@npm:^7.2.0": +"@babel/plugin-syntax-flow@npm:^7.0.0, @babel/plugin-syntax-flow@npm:^7.18.0, @babel/plugin-syntax-flow@npm:^7.18.6, @babel/plugin-syntax-flow@npm:^7.2.0": version: 7.18.6 resolution: "@babel/plugin-syntax-flow@npm:7.18.6" dependencies: @@ -1534,6 +1635,17 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/template@npm:7.20.7" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + checksum: 2eb1a0ab8d415078776bceb3473d07ab746e6bb4c2f6ca46ee70efb284d75c4a32bb0cd6f4f4946dec9711f9c0780e8e5d64b743208deac6f8e9858afadc349e + languageName: node + linkType: hard + "@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.3, @babel/traverse@npm:^7.7.4": version: 7.19.4 resolution: "@babel/traverse@npm:7.19.4" @@ -1552,6 +1664,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.20.0, @babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.7": + version: 7.20.12 + resolution: "@babel/traverse@npm:7.20.12" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.20.7 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.19.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: d758b355ab4f1e87984524b67785fa23d74e8a45d2ceb8bcf4d5b2b0cd15ee160db5e68c7078808542805774ca3802e2eafb1b9638afa4cd7f9ecabd0ca7fd56 + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.3, @babel/types@npm:^7.19.4, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.19.4 resolution: "@babel/types@npm:7.19.4" @@ -1563,6 +1693,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/types@npm:7.20.7" + dependencies: + "@babel/helper-string-parser": ^7.19.4 + "@babel/helper-validator-identifier": ^7.19.1 + to-fast-properties: ^2.0.0 + checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^1.3.3": version: 1.3.3 resolution: "@eslint/eslintrc@npm:1.3.3" @@ -1637,6 +1778,50 @@ __metadata: languageName: node linkType: hard +"@jest/create-cache-key-function@npm:^29.2.1": + version: 29.3.1 + resolution: "@jest/create-cache-key-function@npm:29.3.1" + dependencies: + "@jest/types": ^29.3.1 + checksum: bd42cf62bd5fe6325125696057b53a312350496945987eeb35cd001acd4fd05e7b13b1697720aa05ab2ec427965667d10505188247d14025a385641964905f29 + languageName: node + linkType: hard + +"@jest/environment@npm:^29.3.1": + version: 29.3.1 + resolution: "@jest/environment@npm:29.3.1" + dependencies: + "@jest/fake-timers": ^29.3.1 + "@jest/types": ^29.3.1 + "@types/node": "*" + jest-mock: ^29.3.1 + checksum: 974102aba7cc80508f787bb5504dcc96e5392e0a7776a63dffbf54ddc2c77d52ef4a3c08ed2eedec91965befff873f70cd7c9ed56f62bb132dcdb821730e6076 + languageName: node + linkType: hard + +"@jest/fake-timers@npm:^29.3.1": + version: 29.3.1 + resolution: "@jest/fake-timers@npm:29.3.1" + dependencies: + "@jest/types": ^29.3.1 + "@sinonjs/fake-timers": ^9.1.2 + "@types/node": "*" + jest-message-util: ^29.3.1 + jest-mock: ^29.3.1 + jest-util: ^29.3.1 + checksum: b1dafa8cdc439ef428cd772c775f0b22703677f52615513eda11a104bbfc352d7ec69b1225db95d4ef2e1b4ef0f23e1a7d96de5313aeb0950f672e6548ae069d + languageName: node + linkType: hard + +"@jest/schemas@npm:^29.0.0": + version: 29.0.0 + resolution: "@jest/schemas@npm:29.0.0" + dependencies: + "@sinclair/typebox": ^0.24.1 + checksum: 41355c78f09eb1097e57a3c5d0ca11c9099e235e01ea5fa4e3953562a79a6a9296c1d300f1ba50ca75236048829e056b00685cd2f1ff8285e56fd2ce01249acb + languageName: node + linkType: hard + "@jest/types@npm:^26.6.2": version: 26.6.2 resolution: "@jest/types@npm:26.6.2" @@ -1663,6 +1848,20 @@ __metadata: languageName: node linkType: hard +"@jest/types@npm:^29.3.1": + version: 29.3.1 + resolution: "@jest/types@npm:29.3.1" + dependencies: + "@jest/schemas": ^29.0.0 + "@types/istanbul-lib-coverage": ^2.0.0 + "@types/istanbul-reports": ^3.0.0 + "@types/node": "*" + "@types/yargs": ^17.0.8 + chalk: ^4.0.0 + checksum: 6f9faf27507b845ff3839c1adc6dbd038d7046d03d37e84c9fc956f60718711a801a5094c7eeee6b39ccf42c0ab61347fdc0fa49ab493ae5a8efd2fd41228ee8 + languageName: node + linkType: hard + "@jridgewell/gen-mapping@npm:^0.1.0": version: 0.1.1 resolution: "@jridgewell/gen-mapping@npm:0.1.1" @@ -1673,7 +1872,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.3.2": +"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": version: 0.3.2 resolution: "@jridgewell/gen-mapping@npm:0.3.2" dependencies: @@ -1698,6 +1897,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/source-map@npm:^0.3.2": + version: 0.3.2 + resolution: "@jridgewell/source-map@npm:0.3.2" + dependencies: + "@jridgewell/gen-mapping": ^0.3.0 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482 + languageName: node + linkType: hard + "@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10": version: 1.4.14 resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" @@ -1828,6 +2037,18 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-clean@npm:^10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-clean@npm:10.0.0" + dependencies: + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + execa: ^1.0.0 + prompts: ^2.4.0 + checksum: dc73aa08ce9eb85017b79f9178452d604bede1af7e6ddb36f97fabbf9b54bb8b95084a67b8f2a0d2d256e03e2114780ca7d17107669c3035fc95cea3bf4771d4 + languageName: node + linkType: hard + "@react-native-community/cli-clean@npm:^9.1.0": version: 9.1.0 resolution: "@react-native-community/cli-clean@npm:9.1.0" @@ -1840,6 +2061,20 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-config@npm:^10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-config@npm:10.0.0" + dependencies: + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + cosmiconfig: ^5.1.0 + deepmerge: ^3.2.0 + glob: ^7.1.3 + joi: ^17.2.1 + checksum: ea2f7adca7573632e65806753c38546fbbfe36c5b387bea3d019314eb3921d1c04f56796a22c2a144bdb4961516e22be718415a503643e88fa114f2f3bfdd096 + languageName: node + linkType: hard + "@react-native-community/cli-config@npm:^9.1.0": version: 9.1.0 resolution: "@react-native-community/cli-config@npm:9.1.0" @@ -1853,6 +2088,15 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-debugger-ui@npm:^10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-debugger-ui@npm:10.0.0" + dependencies: + serve-static: ^1.13.1 + checksum: 519b395f9d0eabe8c774a6fd776b1e33d75627959768975b14af085a20e3833dc4457e84e7aaf8b48f192b92007055e2017651eb685f625f6d45ed6f6c467641 + languageName: node + linkType: hard + "@react-native-community/cli-debugger-ui@npm:^9.0.0": version: 9.0.0 resolution: "@react-native-community/cli-debugger-ui@npm:9.0.0" @@ -1862,6 +2106,30 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-doctor@npm:^10.0.0": + version: 10.1.0 + resolution: "@react-native-community/cli-doctor@npm:10.1.0" + dependencies: + "@react-native-community/cli-config": ^10.0.0 + "@react-native-community/cli-platform-ios": ^10.1.0 + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + command-exists: ^1.2.8 + envinfo: ^7.7.2 + execa: ^1.0.0 + hermes-profile-transformer: ^0.0.6 + ip: ^1.1.5 + node-stream-zip: ^1.9.1 + ora: ^5.4.1 + prompts: ^2.4.0 + semver: ^6.3.0 + strip-ansi: ^5.2.0 + sudo-prompt: ^9.0.0 + wcwidth: ^1.0.1 + checksum: 0f4d206ffa995ac5ee9bb379c09d66f4e308000e08eb03dd99cc777d43a6ff0523c3d3ccf612ec7754c35d685b4b7f0acf929a55c4e98904232a9b601be7ef49 + languageName: node + linkType: hard + "@react-native-community/cli-doctor@npm:^9.1.2": version: 9.1.2 resolution: "@react-native-community/cli-doctor@npm:9.1.2" @@ -1886,6 +2154,19 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-hermes@npm:^10.0.0": + version: 10.1.0 + resolution: "@react-native-community/cli-hermes@npm:10.1.0" + dependencies: + "@react-native-community/cli-platform-android": ^10.1.0 + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + hermes-profile-transformer: ^0.0.6 + ip: ^1.1.5 + checksum: 26f0ce58cd9e4b8ac0ed8bdf943e83a81b338adaa68fe47e1a5ef02e3a1727b0d712bcfe2c3d74bb56ab4aba60eda9a22f6fee7b01316ae8797b84fe82c2fe96 + languageName: node + linkType: hard + "@react-native-community/cli-hermes@npm:^9.1.0": version: 9.1.0 resolution: "@react-native-community/cli-hermes@npm:9.1.0" @@ -1899,6 +2180,19 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-platform-android@npm:10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-platform-android@npm:10.0.0" + dependencies: + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + execa: ^1.0.0 + glob: ^7.1.3 + logkitty: ^0.7.1 + checksum: 44e868aa99f6d23163a466c3aa42d9e0ffe1312b3259f78551fd0c0142e5f0f5963d7a820a1734981aa951a8c24e22f8a48ef67f29ef932301fed5b09ffa2950 + languageName: node + linkType: hard + "@react-native-community/cli-platform-android@npm:9.1.0, @react-native-community/cli-platform-android@npm:^9.0.0, @react-native-community/cli-platform-android@npm:^9.1.0": version: 9.1.0 resolution: "@react-native-community/cli-platform-android@npm:9.1.0" @@ -1914,6 +2208,32 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-platform-android@npm:^10.1.0": + version: 10.1.0 + resolution: "@react-native-community/cli-platform-android@npm:10.1.0" + dependencies: + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + execa: ^1.0.0 + glob: ^7.1.3 + logkitty: ^0.7.1 + checksum: 342fc3ab644675b968c6b977890287c68eb390456006a511458de5b5ea9ffd6ced5ba874087fdaeee593feced43a84f96a18cc5ceb0067912d448985b18ca10c + languageName: node + linkType: hard + +"@react-native-community/cli-platform-ios@npm:10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-platform-ios@npm:10.0.0" + dependencies: + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + execa: ^1.0.0 + glob: ^7.1.3 + ora: ^5.4.1 + checksum: 8fb6f57155a87c4e0abcaf531dff651dadc0acf483c91fc152570ebe1bf5c913f09252ff8926d9cb0754f951e96aa051a3b093eb3d0d7174c199a2d75cbc0803 + languageName: node + linkType: hard + "@react-native-community/cli-platform-ios@npm:9.1.2, @react-native-community/cli-platform-ios@npm:^9.0.0, @react-native-community/cli-platform-ios@npm:^9.1.2": version: 9.1.2 resolution: "@react-native-community/cli-platform-ios@npm:9.1.2" @@ -1927,6 +2247,38 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-platform-ios@npm:^10.1.0": + version: 10.1.0 + resolution: "@react-native-community/cli-platform-ios@npm:10.1.0" + dependencies: + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + execa: ^1.0.0 + glob: ^7.1.3 + ora: ^5.4.1 + checksum: eb96622bed7b354edd2b6ef6ef1fb4a9bcbf983c8dc46f4402df5b1ecd4e4ac2cd78d73077daf9fb37e8dbb413078ee283771927eaeb72519441845dd57eb5cc + languageName: node + linkType: hard + +"@react-native-community/cli-plugin-metro@npm:^10.0.0": + version: 10.1.0 + resolution: "@react-native-community/cli-plugin-metro@npm:10.1.0" + dependencies: + "@react-native-community/cli-server-api": ^10.0.0 + "@react-native-community/cli-tools": ^10.0.0 + chalk: ^4.1.2 + execa: ^1.0.0 + metro: 0.73.7 + metro-config: 0.73.7 + metro-core: 0.73.7 + metro-react-native-babel-transformer: 0.73.7 + metro-resolver: 0.73.7 + metro-runtime: 0.73.7 + readline: ^1.3.0 + checksum: c63002ac64eb580d63acebf517de0f9999b00ef394e8636a657a35d3e78b84dd73db8ad65608b276af937c22713844778ff350f4823914103ad35aeed539484f + languageName: node + linkType: hard + "@react-native-community/cli-plugin-metro@npm:^9.1.3": version: 9.1.3 resolution: "@react-native-community/cli-plugin-metro@npm:9.1.3" @@ -1945,6 +2297,23 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-server-api@npm:^10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-server-api@npm:10.0.0" + dependencies: + "@react-native-community/cli-debugger-ui": ^10.0.0 + "@react-native-community/cli-tools": ^10.0.0 + compression: ^1.7.1 + connect: ^3.6.5 + errorhandler: ^1.5.0 + nocache: ^3.0.1 + pretty-format: ^26.6.2 + serve-static: ^1.13.1 + ws: ^7.5.1 + checksum: 0055c5244da8cf8c5d0505000d8e34d5cc36ac511bceedce4015c3cf79d657f92aecd1f07fe67a188e84a583a254bc82249ed34df7dc21a494e636cb1691abc7 + languageName: node + linkType: hard + "@react-native-community/cli-server-api@npm:^9.1.0": version: 9.1.0 resolution: "@react-native-community/cli-server-api@npm:9.1.0" @@ -1962,6 +2331,23 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-tools@npm:^10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-tools@npm:10.0.0" + dependencies: + appdirsjs: ^1.2.4 + chalk: ^4.1.2 + find-up: ^5.0.0 + mime: ^2.4.1 + node-fetch: ^2.6.0 + open: ^6.2.0 + ora: ^5.4.1 + semver: ^6.3.0 + shell-quote: ^1.7.3 + checksum: c8e117a2c3ff44ae45dfe6f54cb5724c4f0389bfd6b8f587f7bb9cfd96aa89efb943de1cbf2fa8443a691cd7d28fc81c228cf40b86fb209600575e76d8c273e2 + languageName: node + linkType: hard + "@react-native-community/cli-tools@npm:^9.1.0": version: 9.1.0 resolution: "@react-native-community/cli-tools@npm:9.1.0" @@ -1979,6 +2365,15 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli-types@npm:^10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli-types@npm:10.0.0" + dependencies: + joi: ^17.2.1 + checksum: 6153088d6be1eeb05c9203a4fbed7f4a3761d989d461ad596c081316379775f1649a59a474adf660b1198c3b179dbe343392eb78b3fe7c6a0f400e53476f7fc1 + languageName: node + linkType: hard + "@react-native-community/cli-types@npm:^9.1.0": version: 9.1.0 resolution: "@react-native-community/cli-types@npm:9.1.0" @@ -1988,6 +2383,33 @@ __metadata: languageName: node linkType: hard +"@react-native-community/cli@npm:10.0.0": + version: 10.0.0 + resolution: "@react-native-community/cli@npm:10.0.0" + dependencies: + "@react-native-community/cli-clean": ^10.0.0 + "@react-native-community/cli-config": ^10.0.0 + "@react-native-community/cli-debugger-ui": ^10.0.0 + "@react-native-community/cli-doctor": ^10.0.0 + "@react-native-community/cli-hermes": ^10.0.0 + "@react-native-community/cli-plugin-metro": ^10.0.0 + "@react-native-community/cli-server-api": ^10.0.0 + "@react-native-community/cli-tools": ^10.0.0 + "@react-native-community/cli-types": ^10.0.0 + chalk: ^4.1.2 + commander: ^9.4.1 + execa: ^1.0.0 + find-up: ^4.1.0 + fs-extra: ^8.1.0 + graceful-fs: ^4.1.3 + prompts: ^2.4.0 + semver: ^6.3.0 + bin: + react-native: build/bin.js + checksum: 26326e070029c35ba07421beba86e275708f17e43d0c1e3e9fc53edd691135174079d7ebb7bc14b5bb79cb5b93b75ce8a36cc3acaaf2afa2f70ef664698b49a7 + languageName: node + linkType: hard + "@react-native-community/cli@npm:9.1.3, @react-native-community/cli@npm:^9.0.0": version: 9.1.3 resolution: "@react-native-community/cli@npm:9.1.3" @@ -2169,6 +2591,13 @@ __metadata: languageName: node linkType: hard +"@react-native/normalize-color@npm:*, @react-native/normalize-color@npm:2.1.0": + version: 2.1.0 + resolution: "@react-native/normalize-color@npm:2.1.0" + checksum: 8ccbd40b3c7629f1dc97b3e9aadd95fd3507fcf2e37535a6299a70436ab891c34cbdc4240b07380553d6e85dd909e23d5773b5be1da2906b026312e0b0768838 + languageName: node + linkType: hard + "@react-native/normalize-color@npm:2.0.0": version: 2.0.0 resolution: "@react-native/normalize-color@npm:2.0.0" @@ -2206,6 +2635,31 @@ __metadata: languageName: node linkType: hard +"@sinclair/typebox@npm:^0.24.1": + version: 0.24.51 + resolution: "@sinclair/typebox@npm:0.24.51" + checksum: fd0d855e748ef767eb19da1a60ed0ab928e91e0f358c1dd198d600762c0015440b15755e96d1176e2a0db7e09c6a64ed487828ee10dd0c3e22f61eb09c478cd0 + languageName: node + linkType: hard + +"@sinonjs/commons@npm:^1.7.0": + version: 1.8.6 + resolution: "@sinonjs/commons@npm:1.8.6" + dependencies: + type-detect: 4.0.8 + checksum: 7d3f8c1e85f30cd4e83594fc19b7a657f14d49eb8d95a30095631ce15e906c869e0eff96c5b93dffea7490c00418b07f54582ba49c6560feb2a8c34c0b16832d + languageName: node + linkType: hard + +"@sinonjs/fake-timers@npm:^9.1.2": + version: 9.1.2 + resolution: "@sinonjs/fake-timers@npm:9.1.2" + dependencies: + "@sinonjs/commons": ^1.7.0 + checksum: 7d3aef54e17c1073101cb64d953157c19d62a40e261a30923fa1ee337b049c5f29cc47b1f0c477880f42b5659848ba9ab897607ac8ea4acd5c30ddcfac57fca6 + languageName: node + linkType: hard + "@tootallnate/once@npm:2": version: 2.0.0 resolution: "@tootallnate/once@npm:2.0.0" @@ -2213,6 +2667,13 @@ __metadata: languageName: node linkType: hard +"@tsconfig/react-native@npm:^2.0.3": + version: 2.0.3 + resolution: "@tsconfig/react-native@npm:2.0.3" + checksum: 757edb4435a12d4ece9cf61c010df3dab771fbf6065c5b03445ecf440398df641d2859fc3ace3790a1f07eca990f54d16912fab59f144090871bf70612f47a80 + languageName: node + linkType: hard + "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0": version: 2.0.4 resolution: "@types/istanbul-lib-coverage@npm:2.0.4" @@ -2330,6 +2791,13 @@ __metadata: languageName: node linkType: hard +"@types/stack-utils@npm:^2.0.0": + version: 2.0.1 + resolution: "@types/stack-utils@npm:2.0.1" + checksum: 205fdbe3326b7046d7eaf5e494d8084f2659086a266f3f9cf00bccc549c8e36e407f88168ad4383c8b07099957ad669f75f2532ed4bc70be2b037330f7bae019 + languageName: node + linkType: hard + "@types/tunnel@npm:^0.0.3": version: 0.0.3 resolution: "@types/tunnel@npm:0.0.3" @@ -2364,6 +2832,15 @@ __metadata: languageName: node linkType: hard +"@types/yargs@npm:^17.0.8": + version: 17.0.19 + resolution: "@types/yargs@npm:17.0.19" + dependencies: + "@types/yargs-parser": "*" + checksum: 89a664ba6cef795a5b14a1b2cdc0e2a943cd654e61cc4286b6a704b944051bc30b0d7fec249dd2685cb6cfd17fdf0750d60ec69859aa5a5911c48a288284e842 + languageName: node + linkType: hard + "@typescript-eslint/eslint-plugin@npm:^5.20.0, @typescript-eslint/eslint-plugin@npm:^5.30.5, @typescript-eslint/eslint-plugin@npm:^5.40.0": version: 5.40.0 resolution: "@typescript-eslint/eslint-plugin@npm:5.40.0" @@ -2550,6 +3027,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.5.0": + version: 8.8.1 + resolution: "acorn@npm:8.8.1" + bin: + acorn: bin/acorn + checksum: 4079b67283b94935157698831967642f24a075c52ce3feaaaafe095776dfbe15d86a1b33b1e53860fc0d062ed6c83f4284a5c87c85b9ad51853a01173da6097f + languageName: node + linkType: hard + "acorn@npm:^8.8.0": version: 8.8.0 resolution: "acorn@npm:8.8.0" @@ -2716,6 +3202,13 @@ __metadata: languageName: node linkType: hard +"ansi-styles@npm:^5.0.0": + version: 5.2.0 + resolution: "ansi-styles@npm:5.2.0" + checksum: d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469 + languageName: node + linkType: hard + "ansi@npm:^0.3.0, ansi@npm:~0.3.1": version: 0.3.1 resolution: "ansi@npm:0.3.1" @@ -3927,7 +4420,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^2.9.0": +"commander@npm:^2.20.0, commander@npm:^2.9.0": version: 2.20.3 resolution: "commander@npm:2.20.3" checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e @@ -3941,6 +4434,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^9.4.1": + version: 9.5.0 + resolution: "commander@npm:9.5.0" + checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade + languageName: node + linkType: hard + "commander@npm:~2.14.1": version: 2.14.1 resolution: "commander@npm:2.14.1" @@ -4410,6 +4910,17 @@ __metadata: languageName: node linkType: hard +"deprecated-react-native-prop-types@npm:^3.0.1": + version: 3.0.1 + resolution: "deprecated-react-native-prop-types@npm:3.0.1" + dependencies: + "@react-native/normalize-color": "*" + invariant: "*" + prop-types: "*" + checksum: 6b02d6f29387cb39f3250f85675bfd8f0b7a312612bc2a637fdd96033eadc0391447d558262854db0b4c7280ee304f201ecd4b1126af123335c7cbddf5194151 + languageName: node + linkType: hard + "destroy@npm:1.2.0": version: 1.2.0 resolution: "destroy@npm:1.2.0" @@ -4746,6 +5257,13 @@ __metadata: languageName: node linkType: hard +"escape-string-regexp@npm:^2.0.0": + version: 2.0.0 + resolution: "escape-string-regexp@npm:2.0.0" + checksum: 9f8a2d5743677c16e85c810e3024d54f0c8dea6424fad3c79ef6666e81dd0846f7437f5e729dfcdac8981bc9e5294c39b4580814d114076b8d36318f46ae4395 + languageName: node + linkType: hard + "escape-string-regexp@npm:^4.0.0": version: 4.0.0 resolution: "escape-string-regexp@npm:4.0.0" @@ -5164,11 +5682,12 @@ __metadata: dependencies: "@babel/core": ^7.19.3 "@babel/runtime": ^7.19.4 + "@tsconfig/react-native": ^2.0.3 "@types/react-native": ^0.70.4 lottie-react-native: "workspace:*" metro-react-native-babel-preset: ^0.72.3 - react: 18.1.0 - react-native: 0.70.3 + react: 18.2.0 + react-native: 0.71.0-rc.6 typescript: ^4.8.4 languageName: unknown linkType: soft @@ -5348,6 +5867,13 @@ __metadata: languageName: node linkType: hard +"flow-parser@npm:^0.185.0": + version: 0.185.2 + resolution: "flow-parser@npm:0.185.2" + checksum: 6c8cee6ef2a2f0e5a5dd29698dfc493c8148263ce52b061804c812877ef68b1d0747d8f17256f2ed36e105550eab27a37377be32f1fed4b72c434dda6e0c053c + languageName: node + linkType: hard + "flush-write-stream@npm:^1.0.0": version: 1.1.1 resolution: "flush-write-stream@npm:1.1.1" @@ -5553,7 +6079,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^2.1.2": +"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2": version: 2.3.2 resolution: "fsevents@npm:2.3.2" dependencies: @@ -5563,7 +6089,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@^2.1.2#~builtin": +"fsevents@patch:fsevents@^2.1.2#~builtin, fsevents@patch:fsevents@^2.3.2#~builtin": version: 2.3.2 resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=18f3a7" dependencies: @@ -6510,7 +7036,7 @@ __metadata: languageName: node linkType: hard -"invariant@npm:^2.2.4": +"invariant@npm:*, invariant@npm:^2.2.4": version: 2.2.4 resolution: "invariant@npm:2.2.4" dependencies: @@ -7031,6 +7557,20 @@ __metadata: languageName: node linkType: hard +"jest-environment-node@npm:^29.2.1": + version: 29.3.1 + resolution: "jest-environment-node@npm:29.3.1" + dependencies: + "@jest/environment": ^29.3.1 + "@jest/fake-timers": ^29.3.1 + "@jest/types": ^29.3.1 + "@types/node": "*" + jest-mock: ^29.3.1 + jest-util: ^29.3.1 + checksum: 16d4854bd2d35501bd4862ca069baf27ce9f5fd7642fdcab9d2dab49acd28c082d0c8882bf2bb28ed7bbaada486da577c814c9688ddc62d1d9f74a954fde996a + languageName: node + linkType: hard + "jest-get-type@npm:^26.3.0": version: 26.3.0 resolution: "jest-get-type@npm:26.3.0" @@ -7038,6 +7578,34 @@ __metadata: languageName: node linkType: hard +"jest-message-util@npm:^29.3.1": + version: 29.3.1 + resolution: "jest-message-util@npm:29.3.1" + dependencies: + "@babel/code-frame": ^7.12.13 + "@jest/types": ^29.3.1 + "@types/stack-utils": ^2.0.0 + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + micromatch: ^4.0.4 + pretty-format: ^29.3.1 + slash: ^3.0.0 + stack-utils: ^2.0.3 + checksum: 15d0a2fca3919eb4570bbf575734780c4b9e22de6aae903c4531b346699f7deba834c6c86fe6e9a83ad17fac0f7935511cf16dce4d71a93a71ebb25f18a6e07b + languageName: node + linkType: hard + +"jest-mock@npm:^29.3.1": + version: 29.3.1 + resolution: "jest-mock@npm:29.3.1" + dependencies: + "@jest/types": ^29.3.1 + "@types/node": "*" + jest-util: ^29.3.1 + checksum: 9098852cb2866db4a1a59f9f7581741dfc572f648e9e574a1b187fd69f5f2f6190ad387ede21e139a8b80a6a1343ecc3d6751cd2ae1ae11d7ea9fa1950390fb2 + languageName: node + linkType: hard + "jest-regex-util@npm:^27.0.6": version: 27.5.1 resolution: "jest-regex-util@npm:27.5.1" @@ -7069,6 +7637,20 @@ __metadata: languageName: node linkType: hard +"jest-util@npm:^29.3.1": + version: 29.3.1 + resolution: "jest-util@npm:29.3.1" + dependencies: + "@jest/types": ^29.3.1 + "@types/node": "*" + chalk: ^4.0.0 + ci-info: ^3.2.0 + graceful-fs: ^4.2.9 + picomatch: ^2.2.3 + checksum: f67c60f062b94d21cb60e84b3b812d64b7bfa81fe980151de5c17a74eb666042d0134e2e756d099b7606a1fcf1d633824d2e58197d01d76dde1e2dc00dfcd413 + languageName: node + linkType: hard + "jest-validate@npm:^26.5.2": version: 26.6.2 resolution: "jest-validate@npm:26.6.2" @@ -7278,6 +7860,15 @@ __metadata: languageName: node linkType: hard +"json5@npm:^2.2.2": + version: 2.2.3 + resolution: "json5@npm:2.2.3" + bin: + json5: lib/cli.js + checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349 + languageName: node + linkType: hard + "jsonfile@npm:^2.1.0": version: 2.4.0 resolution: "jsonfile@npm:2.4.0" @@ -7767,6 +8358,15 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^5.1.1": + version: 5.1.1 + resolution: "lru-cache@npm:5.1.1" + dependencies: + yallist: ^3.0.2 + checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb + languageName: node + linkType: hard + "lru-cache@npm:^6.0.0": version: 6.0.0 resolution: "lru-cache@npm:6.0.0" @@ -7956,6 +8556,30 @@ __metadata: languageName: node linkType: hard +"metro-babel-transformer@npm:0.73.5": + version: 0.73.5 + resolution: "metro-babel-transformer@npm:0.73.5" + dependencies: + "@babel/core": ^7.14.0 + hermes-parser: 0.8.0 + metro-source-map: 0.73.5 + nullthrows: ^1.1.1 + checksum: 2166ed5b82fb52226e220890a8944cb4a6e2ab2e5a421d5f41abebc1919641b65b98a47ba7c7b33742607124b90da4d17ed6402f21882cc81a91dd9fb026e0ae + languageName: node + linkType: hard + +"metro-babel-transformer@npm:0.73.7": + version: 0.73.7 + resolution: "metro-babel-transformer@npm:0.73.7" + dependencies: + "@babel/core": ^7.20.0 + hermes-parser: 0.8.0 + metro-source-map: 0.73.7 + nullthrows: ^1.1.1 + checksum: 9b591af61ae33f6bc5197e1c2ac3dc4bc97fb02943861c43acfd41ac8020e116a2ff92263416b1a67a477dcfa2bd99a53d820c44b5333b15fc6c24daad2e14e3 + languageName: node + linkType: hard + "metro-cache-key@npm:0.72.3": version: 0.72.3 resolution: "metro-cache-key@npm:0.72.3" @@ -7963,6 +8587,13 @@ __metadata: languageName: node linkType: hard +"metro-cache-key@npm:0.73.7": + version: 0.73.7 + resolution: "metro-cache-key@npm:0.73.7" + checksum: 1975cd8ac00a0b4b8b188af1db33b81922e9559d13a0484e2991a6aee390b1e6e4db91d4724f1e84fcf8f095935aa86319c4a3a58be10202d135737d8f45eb4c + languageName: node + linkType: hard + "metro-cache@npm:0.72.3": version: 0.72.3 resolution: "metro-cache@npm:0.72.3" @@ -7973,6 +8604,16 @@ __metadata: languageName: node linkType: hard +"metro-cache@npm:0.73.7": + version: 0.73.7 + resolution: "metro-cache@npm:0.73.7" + dependencies: + metro-core: 0.73.7 + rimraf: ^3.0.2 + checksum: 457e88f4e935300881c010eaec2b99d2ddbc9f1dde54a54c2ab0965851d4f5ac7c4d5ed531ea6bc649c4da88ec3f0723aea3c786f04590a09ef0b905783bd362 + languageName: node + linkType: hard + "metro-config@npm:0.72.3": version: 0.72.3 resolution: "metro-config@npm:0.72.3" @@ -7987,6 +8628,20 @@ __metadata: languageName: node linkType: hard +"metro-config@npm:0.73.7": + version: 0.73.7 + resolution: "metro-config@npm:0.73.7" + dependencies: + cosmiconfig: ^5.0.5 + jest-validate: ^26.5.2 + metro: 0.73.7 + metro-cache: 0.73.7 + metro-core: 0.73.7 + metro-runtime: 0.73.7 + checksum: 9afb8ec854f0be9daaafcc4a0e9f200078ed3902b41d418bb76770cca9b3d94b6e5681069f5457aed7dbbeec774941b64da5027fc1cd6083698016e6719c138c + languageName: node + linkType: hard + "metro-core@npm:0.72.3": version: 0.72.3 resolution: "metro-core@npm:0.72.3" @@ -7997,6 +8652,16 @@ __metadata: languageName: node linkType: hard +"metro-core@npm:0.73.7": + version: 0.73.7 + resolution: "metro-core@npm:0.73.7" + dependencies: + lodash.throttle: ^4.1.1 + metro-resolver: 0.73.7 + checksum: 0578a698d321c3f12453ec9172bf4f3fd74cabd99cf360d731b9a9fd420a227d9702c280fe62882c021cb98dc7ec874482b5ee6a2ab8aa1101c553366c6f275e + languageName: node + linkType: hard + "metro-file-map@npm:0.72.3": version: 0.72.3 resolution: "metro-file-map@npm:0.72.3" @@ -8021,6 +8686,31 @@ __metadata: languageName: node linkType: hard +"metro-file-map@npm:0.73.7": + version: 0.73.7 + resolution: "metro-file-map@npm:0.73.7" + dependencies: + abort-controller: ^3.0.0 + anymatch: ^3.0.3 + debug: ^2.2.0 + fb-watchman: ^2.0.0 + fsevents: ^2.3.2 + graceful-fs: ^4.2.4 + invariant: ^2.2.4 + jest-regex-util: ^27.0.6 + jest-serializer: ^27.0.6 + jest-util: ^27.2.0 + jest-worker: ^27.2.0 + micromatch: ^4.0.4 + nullthrows: ^1.1.1 + walker: ^1.0.7 + dependenciesMeta: + fsevents: + optional: true + checksum: 073c054308ff1ee6fddc35c508e82a1fab478151310cf40a6bdc99079b4044eb9f0994d6063633b13461ddcea4e45234664ef81507328b5d5c95e15ac9eda063 + languageName: node + linkType: hard + "metro-hermes-compiler@npm:0.72.3": version: 0.72.3 resolution: "metro-hermes-compiler@npm:0.72.3" @@ -8028,6 +8718,13 @@ __metadata: languageName: node linkType: hard +"metro-hermes-compiler@npm:0.73.7": + version: 0.73.7 + resolution: "metro-hermes-compiler@npm:0.73.7" + checksum: 01af5cfc4b05032d4c2c45144fa7f10b1eeaa4fd7ca790daacfce53912b07428ed1fd7230322eb4e80e34982f15275ccd4d4184f7388690e6b5394d9c3d388c0 + languageName: node + linkType: hard + "metro-inspector-proxy@npm:0.72.3": version: 0.72.3 resolution: "metro-inspector-proxy@npm:0.72.3" @@ -8042,6 +8739,29 @@ __metadata: languageName: node linkType: hard +"metro-inspector-proxy@npm:0.73.7": + version: 0.73.7 + resolution: "metro-inspector-proxy@npm:0.73.7" + dependencies: + connect: ^3.6.5 + debug: ^2.2.0 + ws: ^7.5.1 + yargs: ^17.5.1 + bin: + metro-inspector-proxy: src/cli.js + checksum: 817c92cb9dfb0b0fedee2a0d463a63e2faba0205613c32af5cdfdd04fd9769516682dc4f6d35a8be9832a77e615997f28c478412fbfef3854a2b48ab62faa9fc + languageName: node + linkType: hard + +"metro-minify-terser@npm:0.73.7": + version: 0.73.7 + resolution: "metro-minify-terser@npm:0.73.7" + dependencies: + terser: ^5.15.0 + checksum: ae3b40bd2b935874502665ea9b7661d0424f2f5333ff1a10ee3408a1fd8e5a1a9ba2f9899b19d55ac86a431e6fa059fbb742a3e2dc3f3211abfcf2c68051eeb5 + languageName: node + linkType: hard + "metro-minify-uglify@npm:0.72.3": version: 0.72.3 resolution: "metro-minify-uglify@npm:0.72.3" @@ -8051,9 +8771,67 @@ __metadata: languageName: node linkType: hard -"metro-react-native-babel-preset@npm:0.72.1": - version: 0.72.1 - resolution: "metro-react-native-babel-preset@npm:0.72.1" +"metro-minify-uglify@npm:0.73.7": + version: 0.73.7 + resolution: "metro-minify-uglify@npm:0.73.7" + dependencies: + uglify-es: ^3.1.9 + checksum: ac38a01184f785bb0138db264437511f89040a8c27221fe7fbf19b55e5ec322e31c34f736a50bec234437ed787d8f2fe53dd00b0f10297026a67e545008852da + languageName: node + linkType: hard + +"metro-react-native-babel-preset@npm:0.72.1": + version: 0.72.1 + resolution: "metro-react-native-babel-preset@npm:0.72.1" + dependencies: + "@babel/core": ^7.14.0 + "@babel/plugin-proposal-async-generator-functions": ^7.0.0 + "@babel/plugin-proposal-class-properties": ^7.0.0 + "@babel/plugin-proposal-export-default-from": ^7.0.0 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.0.0 + "@babel/plugin-proposal-object-rest-spread": ^7.0.0 + "@babel/plugin-proposal-optional-catch-binding": ^7.0.0 + "@babel/plugin-proposal-optional-chaining": ^7.0.0 + "@babel/plugin-syntax-dynamic-import": ^7.0.0 + "@babel/plugin-syntax-export-default-from": ^7.0.0 + "@babel/plugin-syntax-flow": ^7.2.0 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.0.0 + "@babel/plugin-syntax-optional-chaining": ^7.0.0 + "@babel/plugin-transform-arrow-functions": ^7.0.0 + "@babel/plugin-transform-async-to-generator": ^7.0.0 + "@babel/plugin-transform-block-scoping": ^7.0.0 + "@babel/plugin-transform-classes": ^7.0.0 + "@babel/plugin-transform-computed-properties": ^7.0.0 + "@babel/plugin-transform-destructuring": ^7.0.0 + "@babel/plugin-transform-exponentiation-operator": ^7.0.0 + "@babel/plugin-transform-flow-strip-types": ^7.0.0 + "@babel/plugin-transform-function-name": ^7.0.0 + "@babel/plugin-transform-literals": ^7.0.0 + "@babel/plugin-transform-modules-commonjs": ^7.0.0 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.0.0 + "@babel/plugin-transform-parameters": ^7.0.0 + "@babel/plugin-transform-react-display-name": ^7.0.0 + "@babel/plugin-transform-react-jsx": ^7.0.0 + "@babel/plugin-transform-react-jsx-self": ^7.0.0 + "@babel/plugin-transform-react-jsx-source": ^7.0.0 + "@babel/plugin-transform-runtime": ^7.0.0 + "@babel/plugin-transform-shorthand-properties": ^7.0.0 + "@babel/plugin-transform-spread": ^7.0.0 + "@babel/plugin-transform-sticky-regex": ^7.0.0 + "@babel/plugin-transform-template-literals": ^7.0.0 + "@babel/plugin-transform-typescript": ^7.5.0 + "@babel/plugin-transform-unicode-regex": ^7.0.0 + "@babel/template": ^7.0.0 + react-refresh: ^0.4.0 + peerDependencies: + "@babel/core": "*" + checksum: 4454a939a1f19a228442f882f638f3e087c0d51efbb81c3ac32a21aae5c925b36342d4deeceb672b62a15ac4b175eaa69d44384329912e03ff89368ae0915748 + languageName: node + linkType: hard + +"metro-react-native-babel-preset@npm:0.72.3, metro-react-native-babel-preset@npm:^0.72.3": + version: 0.72.3 + resolution: "metro-react-native-babel-preset@npm:0.72.3" dependencies: "@babel/core": ^7.14.0 "@babel/plugin-proposal-async-generator-functions": ^7.0.0 @@ -8096,13 +8874,13 @@ __metadata: react-refresh: ^0.4.0 peerDependencies: "@babel/core": "*" - checksum: 4454a939a1f19a228442f882f638f3e087c0d51efbb81c3ac32a21aae5c925b36342d4deeceb672b62a15ac4b175eaa69d44384329912e03ff89368ae0915748 + checksum: 678595fe00c8f9b39517094dc90facc93d514d68b32bc4bb64b7c58b9ab72a36da80b0969da932ef52e4a8d8b223a8ebc731ca0e88e221fb4187db7a4d7e5e79 languageName: node linkType: hard -"metro-react-native-babel-preset@npm:0.72.3, metro-react-native-babel-preset@npm:^0.72.3": - version: 0.72.3 - resolution: "metro-react-native-babel-preset@npm:0.72.3" +"metro-react-native-babel-preset@npm:0.73.5": + version: 0.73.5 + resolution: "metro-react-native-babel-preset@npm:0.73.5" dependencies: "@babel/core": ^7.14.0 "@babel/plugin-proposal-async-generator-functions": ^7.0.0 @@ -8123,7 +8901,6 @@ __metadata: "@babel/plugin-transform-classes": ^7.0.0 "@babel/plugin-transform-computed-properties": ^7.0.0 "@babel/plugin-transform-destructuring": ^7.0.0 - "@babel/plugin-transform-exponentiation-operator": ^7.0.0 "@babel/plugin-transform-flow-strip-types": ^7.0.0 "@babel/plugin-transform-function-name": ^7.0.0 "@babel/plugin-transform-literals": ^7.0.0 @@ -8145,7 +8922,55 @@ __metadata: react-refresh: ^0.4.0 peerDependencies: "@babel/core": "*" - checksum: 678595fe00c8f9b39517094dc90facc93d514d68b32bc4bb64b7c58b9ab72a36da80b0969da932ef52e4a8d8b223a8ebc731ca0e88e221fb4187db7a4d7e5e79 + checksum: 10879ab87cf47569d1f4c2dd3b237ecd3de49701528df29c4781a9cc2753137f5e7659276b6808262a0eeb5850a8ad0bf651ed4c5743212b6df05d06103f8ecd + languageName: node + linkType: hard + +"metro-react-native-babel-preset@npm:0.73.7": + version: 0.73.7 + resolution: "metro-react-native-babel-preset@npm:0.73.7" + dependencies: + "@babel/core": ^7.20.0 + "@babel/plugin-proposal-async-generator-functions": ^7.0.0 + "@babel/plugin-proposal-class-properties": ^7.0.0 + "@babel/plugin-proposal-export-default-from": ^7.0.0 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.0.0 + "@babel/plugin-proposal-object-rest-spread": ^7.0.0 + "@babel/plugin-proposal-optional-catch-binding": ^7.0.0 + "@babel/plugin-proposal-optional-chaining": ^7.0.0 + "@babel/plugin-syntax-dynamic-import": ^7.0.0 + "@babel/plugin-syntax-export-default-from": ^7.0.0 + "@babel/plugin-syntax-flow": ^7.18.0 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.0.0 + "@babel/plugin-syntax-optional-chaining": ^7.0.0 + "@babel/plugin-transform-arrow-functions": ^7.0.0 + "@babel/plugin-transform-async-to-generator": ^7.0.0 + "@babel/plugin-transform-block-scoping": ^7.0.0 + "@babel/plugin-transform-classes": ^7.0.0 + "@babel/plugin-transform-computed-properties": ^7.0.0 + "@babel/plugin-transform-destructuring": ^7.0.0 + "@babel/plugin-transform-flow-strip-types": ^7.0.0 + "@babel/plugin-transform-function-name": ^7.0.0 + "@babel/plugin-transform-literals": ^7.0.0 + "@babel/plugin-transform-modules-commonjs": ^7.0.0 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.0.0 + "@babel/plugin-transform-parameters": ^7.0.0 + "@babel/plugin-transform-react-display-name": ^7.0.0 + "@babel/plugin-transform-react-jsx": ^7.0.0 + "@babel/plugin-transform-react-jsx-self": ^7.0.0 + "@babel/plugin-transform-react-jsx-source": ^7.0.0 + "@babel/plugin-transform-runtime": ^7.0.0 + "@babel/plugin-transform-shorthand-properties": ^7.0.0 + "@babel/plugin-transform-spread": ^7.0.0 + "@babel/plugin-transform-sticky-regex": ^7.0.0 + "@babel/plugin-transform-template-literals": ^7.0.0 + "@babel/plugin-transform-typescript": ^7.5.0 + "@babel/plugin-transform-unicode-regex": ^7.0.0 + "@babel/template": ^7.0.0 + react-refresh: ^0.4.0 + peerDependencies: + "@babel/core": "*" + checksum: 059fa87ed3890e9378c619d6b546387056637d78df82f11c29e4966ba915faa16f721d7e71f47dc98290b94a45d360d6e4ee7d71a6c2b952aa7f55f515b0a9d2 languageName: node linkType: hard @@ -8183,6 +9008,40 @@ __metadata: languageName: node linkType: hard +"metro-react-native-babel-transformer@npm:0.73.5": + version: 0.73.5 + resolution: "metro-react-native-babel-transformer@npm:0.73.5" + dependencies: + "@babel/core": ^7.14.0 + babel-preset-fbjs: ^3.4.0 + hermes-parser: 0.8.0 + metro-babel-transformer: 0.73.5 + metro-react-native-babel-preset: 0.73.5 + metro-source-map: 0.73.5 + nullthrows: ^1.1.1 + peerDependencies: + "@babel/core": "*" + checksum: 61c592f32644869b09611a0431c9036bec141f395fec9ec159644e1944442494f3802d242793b7cb46407e835ac92a10c1efc37fbd16fee36b0d9bf5e88952e2 + languageName: node + linkType: hard + +"metro-react-native-babel-transformer@npm:0.73.7": + version: 0.73.7 + resolution: "metro-react-native-babel-transformer@npm:0.73.7" + dependencies: + "@babel/core": ^7.20.0 + babel-preset-fbjs: ^3.4.0 + hermes-parser: 0.8.0 + metro-babel-transformer: 0.73.7 + metro-react-native-babel-preset: 0.73.7 + metro-source-map: 0.73.7 + nullthrows: ^1.1.1 + peerDependencies: + "@babel/core": "*" + checksum: 5d2e4cfcb8aa161aa167962658c5beef9c958ecc3ee1905292404df5ac4449a9b306179696315a5169c03174c460eaece5748aed3f7d9af8622271fec9288d84 + languageName: node + linkType: hard + "metro-resolver@npm:0.72.3": version: 0.72.3 resolution: "metro-resolver@npm:0.72.3" @@ -8192,6 +9051,15 @@ __metadata: languageName: node linkType: hard +"metro-resolver@npm:0.73.7": + version: 0.73.7 + resolution: "metro-resolver@npm:0.73.7" + dependencies: + absolute-path: ^0.0.0 + checksum: 97269385e4f6b4263e2af98409ecbbacec1637192c0fc4cac8165c5738079eec00b4724adf569c8a17d3624ec75dd8dee2d6ec6815ba54db1197c137b0094bf7 + languageName: node + linkType: hard + "metro-runtime@npm:0.72.1": version: 0.72.1 resolution: "metro-runtime@npm:0.72.1" @@ -8212,6 +9080,26 @@ __metadata: languageName: node linkType: hard +"metro-runtime@npm:0.73.5": + version: 0.73.5 + resolution: "metro-runtime@npm:0.73.5" + dependencies: + "@babel/runtime": ^7.0.0 + react-refresh: ^0.4.0 + checksum: 5dec531321ebe36cac02df9eb4a60e69f4d3147212b25e0afc90bd8771a873e5b1c807b25d360d9b6a0d3ad55fe96c45e19b14c3df5261825f942d3165588771 + languageName: node + linkType: hard + +"metro-runtime@npm:0.73.7": + version: 0.73.7 + resolution: "metro-runtime@npm:0.73.7" + dependencies: + "@babel/runtime": ^7.0.0 + react-refresh: ^0.4.0 + checksum: c9e269816fdf6a845ac774b5b3e263c70896c3df6931f336dc780189f12b779fe384bafa2b062809d1e3360a4aa0d720268328ac6fe58d969a0e8d3e06a78612 + languageName: node + linkType: hard + "metro-source-map@npm:0.72.1": version: 0.72.1 resolution: "metro-source-map@npm:0.72.1" @@ -8244,6 +9132,38 @@ __metadata: languageName: node linkType: hard +"metro-source-map@npm:0.73.5": + version: 0.73.5 + resolution: "metro-source-map@npm:0.73.5" + dependencies: + "@babel/traverse": ^7.14.0 + "@babel/types": ^7.20.0 + invariant: ^2.2.4 + metro-symbolicate: 0.73.5 + nullthrows: ^1.1.1 + ob1: 0.73.5 + source-map: ^0.5.6 + vlq: ^1.0.0 + checksum: 0434fb396e0ce3e25764a94879bf37639433ac252ac8f3a641f4b87b723c6998e01518c98015d7831ca5fb3bd8c569d03c739ed00fb87c25b4b157ad538f1286 + languageName: node + linkType: hard + +"metro-source-map@npm:0.73.7": + version: 0.73.7 + resolution: "metro-source-map@npm:0.73.7" + dependencies: + "@babel/traverse": ^7.20.0 + "@babel/types": ^7.20.0 + invariant: ^2.2.4 + metro-symbolicate: 0.73.7 + nullthrows: ^1.1.1 + ob1: 0.73.7 + source-map: ^0.5.6 + vlq: ^1.0.0 + checksum: d12366f95b1038f25ed1f685a948fcdc626886d946bb870f71231fff12a74600506a7ea49aa564a024cf691861b015780f017f9ca854a9d47fbfbff9ff821399 + languageName: node + linkType: hard + "metro-symbolicate@npm:0.72.1": version: 0.72.1 resolution: "metro-symbolicate@npm:0.72.1" @@ -8276,6 +9196,38 @@ __metadata: languageName: node linkType: hard +"metro-symbolicate@npm:0.73.5": + version: 0.73.5 + resolution: "metro-symbolicate@npm:0.73.5" + dependencies: + invariant: ^2.2.4 + metro-source-map: 0.73.5 + nullthrows: ^1.1.1 + source-map: ^0.5.6 + through2: ^2.0.1 + vlq: ^1.0.0 + bin: + metro-symbolicate: src/index.js + checksum: 11cbcce724c46644bd50348300cdb87016b9be536be2f35b47b4006fa58d37d53c61f87d71aad3b0f14ca08d7d959a4d16307385ee52c1bacb4c44f61c59cba5 + languageName: node + linkType: hard + +"metro-symbolicate@npm:0.73.7": + version: 0.73.7 + resolution: "metro-symbolicate@npm:0.73.7" + dependencies: + invariant: ^2.2.4 + metro-source-map: 0.73.7 + nullthrows: ^1.1.1 + source-map: ^0.5.6 + through2: ^2.0.1 + vlq: ^1.0.0 + bin: + metro-symbolicate: src/index.js + checksum: 0f87e150ecc44dc0b4630c626c8fe50a0445053f6b9000df821771349168ef7816e7e232298b9751ee7f2d6e51a4dc756da115fb3fdc23b1a3d6bb5e17487e07 + languageName: node + linkType: hard + "metro-transform-plugins@npm:0.72.3": version: 0.72.3 resolution: "metro-transform-plugins@npm:0.72.3" @@ -8289,6 +9241,19 @@ __metadata: languageName: node linkType: hard +"metro-transform-plugins@npm:0.73.7": + version: 0.73.7 + resolution: "metro-transform-plugins@npm:0.73.7" + dependencies: + "@babel/core": ^7.20.0 + "@babel/generator": ^7.20.0 + "@babel/template": ^7.0.0 + "@babel/traverse": ^7.20.0 + nullthrows: ^1.1.1 + checksum: a07638a021b3ee3a36714209ed835eb65990afcf123cd2108b1849a1411654798b2a8a69e7c7421cc6074545e73051ca2c0508d41b6007123ab782f238ba9327 + languageName: node + linkType: hard + "metro-transform-worker@npm:0.72.3": version: 0.72.3 resolution: "metro-transform-worker@npm:0.72.3" @@ -8310,6 +9275,27 @@ __metadata: languageName: node linkType: hard +"metro-transform-worker@npm:0.73.7": + version: 0.73.7 + resolution: "metro-transform-worker@npm:0.73.7" + dependencies: + "@babel/core": ^7.20.0 + "@babel/generator": ^7.20.0 + "@babel/parser": ^7.20.0 + "@babel/types": ^7.20.0 + babel-preset-fbjs: ^3.4.0 + metro: 0.73.7 + metro-babel-transformer: 0.73.7 + metro-cache: 0.73.7 + metro-cache-key: 0.73.7 + metro-hermes-compiler: 0.73.7 + metro-source-map: 0.73.7 + metro-transform-plugins: 0.73.7 + nullthrows: ^1.1.1 + checksum: b8f9712fa2705dde913a51500500e66486ff420560549d34cf0ac5343649ee07023686db71b9a030af36cacf20af85541513e57447311df2a3581e51f5310c6e + languageName: node + linkType: hard + "metro@npm:0.72.3": version: 0.72.3 resolution: "metro@npm:0.72.3" @@ -8370,6 +9356,66 @@ __metadata: languageName: node linkType: hard +"metro@npm:0.73.7": + version: 0.73.7 + resolution: "metro@npm:0.73.7" + dependencies: + "@babel/code-frame": ^7.0.0 + "@babel/core": ^7.20.0 + "@babel/generator": ^7.20.0 + "@babel/parser": ^7.20.0 + "@babel/template": ^7.0.0 + "@babel/traverse": ^7.20.0 + "@babel/types": ^7.20.0 + absolute-path: ^0.0.0 + accepts: ^1.3.7 + async: ^3.2.2 + chalk: ^4.0.0 + ci-info: ^2.0.0 + connect: ^3.6.5 + debug: ^2.2.0 + denodeify: ^1.2.1 + error-stack-parser: ^2.0.6 + graceful-fs: ^4.2.4 + hermes-parser: 0.8.0 + image-size: ^0.6.0 + invariant: ^2.2.4 + jest-worker: ^27.2.0 + lodash.throttle: ^4.1.1 + metro-babel-transformer: 0.73.7 + metro-cache: 0.73.7 + metro-cache-key: 0.73.7 + metro-config: 0.73.7 + metro-core: 0.73.7 + metro-file-map: 0.73.7 + metro-hermes-compiler: 0.73.7 + metro-inspector-proxy: 0.73.7 + metro-minify-terser: 0.73.7 + metro-minify-uglify: 0.73.7 + metro-react-native-babel-preset: 0.73.7 + metro-resolver: 0.73.7 + metro-runtime: 0.73.7 + metro-source-map: 0.73.7 + metro-symbolicate: 0.73.7 + metro-transform-plugins: 0.73.7 + metro-transform-worker: 0.73.7 + mime-types: ^2.1.27 + node-fetch: ^2.2.0 + nullthrows: ^1.1.1 + rimraf: ^3.0.2 + serialize-error: ^2.1.0 + source-map: ^0.5.6 + strip-ansi: ^6.0.0 + temp: 0.8.3 + throat: ^5.0.0 + ws: ^7.5.1 + yargs: ^17.5.1 + bin: + metro: src/cli.js + checksum: 69c73d180143e21907ea980d110659c75c0d13c7730129bf00adfe628784bb6d334809a2ab7fa5c66d2f704c3306e17f8b4aefa5310929cca3df7c3a3b5dafd6 + languageName: node + linkType: hard + "micromatch@npm:^3.1.10": version: 3.1.10 resolution: "micromatch@npm:3.1.10" @@ -9378,6 +10424,20 @@ __metadata: languageName: node linkType: hard +"ob1@npm:0.73.5": + version: 0.73.5 + resolution: "ob1@npm:0.73.5" + checksum: 1e7057ee45c39ab6b262040fd27898bf45c8d993029dfc849978c20bd9005d5aa64b455d94308006891c7be9062a45de19fc52a227bf345ceea4fed10c490278 + languageName: node + linkType: hard + +"ob1@npm:0.73.7": + version: 0.73.7 + resolution: "ob1@npm:0.73.7" + checksum: 47fb8d4ad6893cfa49a307242646c82edb6a3a1e405785a33de4330d2f70179811deef675388bf496b10099c0cdda139b198efce8810b5f5bc1159e6850bef16 + languageName: node + linkType: hard + "object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" @@ -10031,6 +11091,17 @@ __metadata: languageName: node linkType: hard +"pretty-format@npm:^29.3.1": + version: 29.3.1 + resolution: "pretty-format@npm:29.3.1" + dependencies: + "@jest/schemas": ^29.0.0 + ansi-styles: ^5.0.0 + react-is: ^18.0.0 + checksum: 9917a0bb859cd7a24a343363f70d5222402c86d10eb45bcc2f77b23a4e67586257390e959061aec22762a782fe6bafb59bf34eb94527bc2e5d211afdb287eb4e + languageName: node + linkType: hard + "process-nextick-args@npm:~1.0.6": version: 1.0.7 resolution: "process-nextick-args@npm:1.0.7" @@ -10088,6 +11159,15 @@ __metadata: languageName: node linkType: hard +"promise@npm:^8.3.0": + version: 8.3.0 + resolution: "promise@npm:8.3.0" + dependencies: + asap: ~2.0.6 + checksum: a69f0ddbddf78ffc529cffee7ad950d307347615970564b17988ce43fbe767af5c738a9439660b24a9a8cbea106c0dcbb6c2b20e23b7e96a8e89e5c2679e94d5 + languageName: node + linkType: hard + "prompts@npm:^2.4.0, prompts@npm:^2.4.1, prompts@npm:^2.4.2": version: 2.4.2 resolution: "prompts@npm:2.4.2" @@ -10107,7 +11187,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:^15.8.1": +"prop-types@npm:*, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -10283,7 +11363,17 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0": +"react-devtools-core@npm:^4.26.1": + version: 4.27.1 + resolution: "react-devtools-core@npm:4.27.1" + dependencies: + shell-quote: ^1.6.1 + ws: ^7 + checksum: 3c0b89942f5a8525fa16001470b4c9343974673643d2f642c93c631f823ee232418f9e3e6fe2cada4553c796cac909e77b0e51088daf6f7f9e0229046f829e51 + languageName: node + linkType: hard + +"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0": version: 18.2.0 resolution: "react-is@npm:18.2.0" checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e @@ -10349,6 +11439,18 @@ __metadata: languageName: node linkType: hard +"react-native-codegen@npm:^0.71.3": + version: 0.71.3 + resolution: "react-native-codegen@npm:0.71.3" + dependencies: + "@babel/parser": ^7.14.0 + flow-parser: ^0.185.0 + jscodeshift: ^0.13.1 + nullthrows: ^1.1.1 + checksum: 3cb65d0ed56b8b01e97ad202061a50ee3c5bd0deb5af19c99d3207eaca237c1316bbaec47299e220db7396724175dadb87f7573d1630b6d93c81d64c4884948c + languageName: node + linkType: hard + "react-native-dropdown-picker@npm:^5.4.2": version: 5.4.2 resolution: "react-native-dropdown-picker@npm:5.4.2" @@ -10366,6 +11468,13 @@ __metadata: languageName: node linkType: hard +"react-native-gradle-plugin@npm:^0.71.12": + version: 0.71.12 + resolution: "react-native-gradle-plugin@npm:0.71.12" + checksum: be45a84ed9b66f7bbdd5cba55ad16de370996476892a9ddb9ed14459b0c52276bcd1c0bfedbce0263d58c7b83db61c94dc1e358f07d743c499473ae6d1f899bb + languageName: node + linkType: hard + "react-native-windows@npm:0.70.3": version: 0.70.3 resolution: "react-native-windows@npm:0.70.3" @@ -10457,6 +11566,52 @@ __metadata: languageName: node linkType: hard +"react-native@npm:0.71.0-rc.6": + version: 0.71.0-rc.6 + resolution: "react-native@npm:0.71.0-rc.6" + dependencies: + "@jest/create-cache-key-function": ^29.2.1 + "@react-native-community/cli": 10.0.0 + "@react-native-community/cli-platform-android": 10.0.0 + "@react-native-community/cli-platform-ios": 10.0.0 + "@react-native/assets": 1.0.0 + "@react-native/normalize-color": 2.1.0 + "@react-native/polyfills": 2.0.0 + abort-controller: ^3.0.0 + anser: ^1.4.9 + base64-js: ^1.1.2 + deprecated-react-native-prop-types: ^3.0.1 + event-target-shim: ^5.0.1 + invariant: ^2.2.4 + jest-environment-node: ^29.2.1 + jsc-android: ^250230.2.1 + memoize-one: ^5.0.0 + metro-react-native-babel-transformer: 0.73.5 + metro-runtime: 0.73.5 + metro-source-map: 0.73.5 + mkdirp: ^0.5.1 + nullthrows: ^1.1.1 + pretty-format: ^26.5.2 + promise: ^8.3.0 + react-devtools-core: ^4.26.1 + react-native-codegen: ^0.71.3 + react-native-gradle-plugin: ^0.71.12 + react-refresh: ^0.4.0 + react-shallow-renderer: ^16.15.0 + regenerator-runtime: ^0.13.2 + scheduler: ^0.23.0 + stacktrace-parser: ^0.1.3 + use-sync-external-store: ^1.0.0 + whatwg-fetch: ^3.0.0 + ws: ^6.2.2 + peerDependencies: + react: 18.2.0 + bin: + react-native: cli.js + checksum: e2dcd542da8c890ef3d602c00ed152edaeb3d58958129ac4b1f3883c45b4dbd4db8d5641bf27e3e841d3488c9d29bbace5ac9bf55f77637d4f5da699f923cbd4 + languageName: node + linkType: hard + "react-refresh@npm:^0.4.0": version: 0.4.3 resolution: "react-refresh@npm:0.4.3" @@ -11161,6 +12316,15 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" + dependencies: + loose-envify: ^1.1.0 + checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a + languageName: node + linkType: hard + "semver-diff@npm:^2.0.0": version: 2.1.0 resolution: "semver-diff@npm:2.1.0" @@ -11557,7 +12721,7 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.19": +"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.19, source-map-support@npm:~0.5.20": version: 0.5.21 resolution: "source-map-support@npm:0.5.21" dependencies: @@ -11707,6 +12871,15 @@ __metadata: languageName: node linkType: hard +"stack-utils@npm:^2.0.3": + version: 2.0.6 + resolution: "stack-utils@npm:2.0.6" + dependencies: + escape-string-regexp: ^2.0.0 + checksum: 052bf4d25bbf5f78e06c1d5e67de2e088b06871fa04107ca8d3f0e9d9263326e2942c8bedee3545795fc77d787d443a538345eef74db2f8e35db3558c6f91ff7 + languageName: node + linkType: hard + "stackframe@npm:^1.3.4": version: 1.3.4 resolution: "stackframe@npm:1.3.4" @@ -12082,6 +13255,20 @@ __metadata: languageName: node linkType: hard +"terser@npm:^5.15.0": + version: 5.16.1 + resolution: "terser@npm:5.16.1" + dependencies: + "@jridgewell/source-map": ^0.3.2 + acorn: ^8.5.0 + commander: ^2.20.0 + source-map-support: ~0.5.20 + bin: + terser: bin/terser + checksum: cb524123504a2f0d9140c1e1a8628c83bba9cacc404c6aca79e2493a38dfdf21275617ba75b91006b3f1ff586e401ab31121160cd253699f334c6340ea2756f5 + languageName: node + linkType: hard + "text-table@npm:^0.2.0, text-table@npm:~0.2.0": version: 0.2.0 resolution: "text-table@npm:0.2.0" @@ -12299,6 +13486,13 @@ __metadata: languageName: node linkType: hard +"type-detect@npm:4.0.8": + version: 4.0.8 + resolution: "type-detect@npm:4.0.8" + checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15 + languageName: node + linkType: hard + "type-fest@npm:^0.20.2": version: 0.20.2 resolution: "type-fest@npm:0.20.2" @@ -12918,7 +14112,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:^6.1.4": +"ws@npm:^6.1.4, ws@npm:^6.2.2": version: 6.2.2 resolution: "ws@npm:6.2.2" dependencies: @@ -13033,6 +14227,13 @@ __metadata: languageName: node linkType: hard +"yallist@npm:^3.0.2": + version: 3.1.1 + resolution: "yallist@npm:3.1.1" + checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d + languageName: node + linkType: hard + "yallist@npm:^4.0.0": version: 4.0.0 resolution: "yallist@npm:4.0.0" From 1232721be31e9c40799b6587b19f5a359c60191e Mon Sep 17 00:00:00 2001 From: Alyssa Harvey Date: Thu, 12 Jan 2023 19:41:40 +0100 Subject: [PATCH 2/3] chore: upgrade fabric and paper example to 0.71.0 --- apps/fabric/package.json | 2 +- apps/paper/.buckconfig | 6 - apps/paper/.gitignore | 6 - apps/paper/.ruby-version | 2 +- apps/paper/Gemfile | 5 +- apps/paper/Gemfile.lock | 7 +- apps/paper/android/app/_BUCK | 55 -- apps/paper/android/app/build.gradle | 275 ++------ .../lottie/rnexample/ReactNativeFlipper.java | 8 +- .../android/app/src/main/AndroidManifest.xml | 5 +- .../lottie/rnexample/MainActivity.java | 45 +- .../lottie/rnexample/MainApplication.java | 100 ++- .../MainApplicationReactNativeHost.java | 116 ---- .../components/MainComponentsRegistry.java | 36 -- ...ApplicationTurboModuleManagerDelegate.java | 48 -- .../android/app/src/main/jni/CMakeLists.txt | 7 - .../jni/MainApplicationModuleProvider.cpp | 32 - .../main/jni/MainApplicationModuleProvider.h | 16 - ...nApplicationTurboModuleManagerDelegate.cpp | 45 -- ...ainApplicationTurboModuleManagerDelegate.h | 38 -- .../src/main/jni/MainComponentsRegistry.cpp | 65 -- .../app/src/main/jni/MainComponentsRegistry.h | 32 - .../paper/android/app/src/main/jni/OnLoad.cpp | 11 - .../lottie/rnexample/ReactNativeFlipper.java | 21 + apps/paper/android/build.gradle | 58 +- apps/paper/android/gradle.properties | 6 +- apps/paper/android/settings.gradle | 7 - apps/paper/babel.config.js | 3 + apps/paper/babel.config.json | 5 - apps/paper/ios/Podfile | 29 +- apps/paper/ios/Podfile.lock | 607 +++++++++++------- apps/paper/ios/example/AppDelegate.h | 8 +- apps/paper/ios/example/AppDelegate.mm | 121 +--- apps/paper/package.json | 4 +- yarn.lock | 14 +- 35 files changed, 585 insertions(+), 1260 deletions(-) delete mode 100644 apps/paper/.buckconfig delete mode 100644 apps/paper/android/app/_BUCK delete mode 100644 apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java delete mode 100644 apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java delete mode 100644 apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java delete mode 100644 apps/paper/android/app/src/main/jni/CMakeLists.txt delete mode 100644 apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.cpp delete mode 100644 apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.h delete mode 100644 apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp delete mode 100644 apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h delete mode 100644 apps/paper/android/app/src/main/jni/MainComponentsRegistry.cpp delete mode 100644 apps/paper/android/app/src/main/jni/MainComponentsRegistry.h delete mode 100644 apps/paper/android/app/src/main/jni/OnLoad.cpp create mode 100644 apps/paper/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java create mode 100644 apps/paper/babel.config.js delete mode 100644 apps/paper/babel.config.json diff --git a/apps/fabric/package.json b/apps/fabric/package.json index cc07a5f..f9caea4 100644 --- a/apps/fabric/package.json +++ b/apps/fabric/package.json @@ -11,7 +11,7 @@ "dependencies": { "lottie-react-native": "workspace:*", "react": "18.2.0", - "react-native": "0.71.0-rc.6" + "react-native": "0.71.0" }, "devDependencies": { "@babel/core": "^7.19.3", diff --git a/apps/paper/.buckconfig b/apps/paper/.buckconfig deleted file mode 100644 index 934256c..0000000 --- a/apps/paper/.buckconfig +++ /dev/null @@ -1,6 +0,0 @@ - -[android] - target = Google Inc.:Google APIs:23 - -[maven_repositories] - central = https://repo1.maven.org/maven2 diff --git a/apps/paper/.gitignore b/apps/paper/.gitignore index d68e74b..72c61d0 100644 --- a/apps/paper/.gitignore +++ b/apps/paper/.gitignore @@ -38,12 +38,6 @@ node_modules/ npm-debug.log yarn-error.log -# BUCK -buck-out/ -\.buckd/ -*.keystore -!debug.keystore - # fastlane # # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the diff --git a/apps/paper/.ruby-version b/apps/paper/.ruby-version index 460b6fd..5b013b9 100644 --- a/apps/paper/.ruby-version +++ b/apps/paper/.ruby-version @@ -1 +1 @@ -2.7.5 \ No newline at end of file +2.7.6 \ No newline at end of file diff --git a/apps/paper/Gemfile b/apps/paper/Gemfile index 7e69ee5..eab73ad 100644 --- a/apps/paper/Gemfile +++ b/apps/paper/Gemfile @@ -1,4 +1,5 @@ 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' +ruby File.read(File.join(__dir__, '.ruby-version')).strip + +gem 'cocoapods', '~> 1.11', '>= 1.11.3' diff --git a/apps/paper/Gemfile.lock b/apps/paper/Gemfile.lock index 398015c..1241c40 100644 --- a/apps/paper/Gemfile.lock +++ b/apps/paper/Gemfile.lock @@ -88,13 +88,14 @@ GEM zeitwerk (2.5.4) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 DEPENDENCIES - cocoapods (~> 1.11, >= 1.11.2) + cocoapods (~> 1.11, >= 1.11.3) RUBY VERSION - ruby 2.7.5p203 + ruby 2.7.6p219 BUNDLED WITH - 2.2.28 + 2.4.3 diff --git a/apps/paper/android/app/_BUCK b/apps/paper/android/app/_BUCK deleted file mode 100644 index a2baa7c..0000000 --- a/apps/paper/android/app/_BUCK +++ /dev/null @@ -1,55 +0,0 @@ -# To learn about Buck see [Docs](https://buckbuild.com/). -# To run your application with Buck: -# - install Buck -# - `npm start` - to start the packager -# - `cd android` -# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"` -# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck -# - `buck install -r android/app` - compile, install and run application -# - -load(":build_defs.bzl", "create_aar_targets", "create_jar_targets") - -lib_deps = [] - -create_aar_targets(glob(["libs/*.aar"])) - -create_jar_targets(glob(["libs/*.jar"])) - -android_library( - name = "all-libs", - exported_deps = lib_deps, -) - -android_library( - name = "app-code", - srcs = glob([ - "src/main/java/**/*.java", - ]), - deps = [ - ":all-libs", - ":build_config", - ":res", - ], -) - -android_build_config( - name = "build_config", - package = "com.airbnb.android.lottie.rnexample", -) - -android_resource( - name = "res", - package = "com.airbnb.android.lottie.rnexample", - res = "src/main/res", -) - -android_binary( - name = "app", - keystore = "//android/keystores:debug", - manifest = "src/main/AndroidManifest.xml", - package_type = "debug", - deps = [ - ":app-code", - ], -) \ No newline at end of file diff --git a/apps/paper/android/app/build.gradle b/apps/paper/android/app/build.gradle index ad46e7f..f21a924 100644 --- a/apps/paper/android/app/build.gradle +++ b/apps/paper/android/app/build.gradle @@ -1,128 +1,87 @@ apply plugin: "com.android.application" +apply plugin: "com.facebook.react" import com.android.build.OutputFile -import org.apache.tools.ant.taskdefs.condition.Os /** - * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets - * and bundleReleaseJsAndAssets). - * These basically call `react-native bundle` with the correct arguments during the Android build - * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the - * bundle directly from the development server. Below you can see all the possible configurations - * and their defaults. If you decide to add a configuration block, make sure to add it before the - * `apply from: "../../node_modules/react-native/react.gradle"` line. - * - * project.ext.react = [ - * // the name of the generated asset file containing your JS bundle - * bundleAssetName: "index.android.bundle", - * - * // the entry file for bundle generation. If none specified and - * // "index.android.js" exists, it will be used. Otherwise "index.js" is - * // default. Can be overridden with ENTRY_FILE environment variable. - * entryFile: "index.android.js", - * - * // https://reactnative.dev/docs/performance#enable-the-ram-format - * bundleCommand: "ram-bundle", - * - * // whether to bundle JS and assets in debug mode - * bundleInDebug: false, - * - * // whether to bundle JS and assets in release mode - * bundleInRelease: true, - * - * // whether to bundle JS and assets in another build variant (if configured). - * // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants - * // The configuration property can be in the following formats - * // 'bundleIn${productFlavor}${buildType}' - * // 'bundleIn${buildType}' - * // bundleInFreeDebug: true, - * // bundleInPaidRelease: true, - * // bundleInBeta: true, - * - * // whether to disable dev mode in custom build variants (by default only disabled in release) - * // for example: to disable dev mode in the staging build type (if configured) - * devDisabledInStaging: true, - * // The configuration property can be in the following formats - * // 'devDisabledIn${productFlavor}${buildType}' - * // 'devDisabledIn${buildType}' - * - * // the root of your project, i.e. where "package.json" lives - * root: "../../", - * - * // where to put the JS bundle asset in debug mode - * jsBundleDirDebug: "$buildDir/intermediates/assets/debug", - * - * // where to put the JS bundle asset in release mode - * jsBundleDirRelease: "$buildDir/intermediates/assets/release", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in debug mode - * resourcesDirDebug: "$buildDir/intermediates/res/merged/debug", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in release mode - * resourcesDirRelease: "$buildDir/intermediates/res/merged/release", - * - * // by default the gradle tasks are skipped if none of the JS files or assets change; this means - * // that we don't look at files in android/ or ios/ to determine whether the tasks are up to - * // date; if you have any other folders that you want to ignore for performance reasons (gradle - * // indexes the entire tree), add them here. Alternatively, if you have JS files in android/ - * // for example, you might want to remove it from here. - * inputExcludes: ["android/**", "ios/**"], - * - * // override which node gets called and with what additional arguments - * nodeExecutableAndArgs: ["node"], - * - * // supply additional arguments to the packager - * extraPackagerArgs: [] - * ] + * This is the configuration block to customize your React Native Android app. + * By default you don't need to apply any configuration, just uncomment the lines you need. */ - -project.ext.react = [ - enableHermes: true, // clean and rebuild if changing -] - -apply from: "../../node_modules/react-native/react.gradle" +react { + /* Folders */ + // The root of your project, i.e. where "package.json" lives. Default is '..' + // root = file("../") + // The folder where the react-native NPM package is. Default is ../node_modules/react-native + // reactNativeDir = file("../node-modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen + // codegenDir = file("../node-modules/react-native-codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js + // cliFile = file("../node_modules/react-native/cli.js") + + /* Variants */ + // The list of variants to that are debuggable. For those we're going to + // skip the bundling of the JS bundle and the assets. By default is just 'debug'. + // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. + // debuggableVariants = ["liteDebug", "prodDebug"] + + /* Bundling */ + // A list containing the node command and its flags. Default is just 'node'. + // nodeExecutableAndArgs = ["node"] + // + // The command to run when bundling. By default is 'bundle' + // bundleCommand = "ram-bundle" + // + // The path to the CLI configuration file. Default is empty. + // bundleConfig = file(../rn-cli.config.js) + // + // The name of the generated asset file containing your JS bundle + // bundleAssetName = "MyApplication.android.bundle" + // + // The entry file for bundle generation. Default is 'index.android.js' or 'index.js' + // entryFile = file("../js/MyApplication.android.js") + // + // A list of extra flags to pass to the 'bundle' commands. + // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle + // extraPackagerArgs = [] + + /* Hermes Commands */ + // The hermes compiler command to run. By default it is 'hermesc' + // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" + // + // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" + // hermesFlags = ["-O", "-output-source-map"] +} /** - * Set this to true to create two separate APKs instead of one: - * - An APK that only works on ARM devices - * - An APK that only works on x86 devices - * The advantage is the size of the APK is reduced by about 4MB. - * Upload all the APKs to the Play Store and people will download - * the correct one based on the CPU architecture of their device. + * Set this to true to create four separate APKs instead of one, + * one for each native architecture. This is useful if you don't + * use App Bundles (https://developer.android.com/guide/app-bundle/) + * and want to have separate APKs to upload to the Play Store. */ def enableSeparateBuildPerCPUArchitecture = false /** - * Run Proguard to shrink the Java bytecode in release builds. + * Set this to true to Run Proguard on Release builds to minify the Java bytecode. */ def enableProguardInReleaseBuilds = false /** - * The preferred build flavor of JavaScriptCore. + * The preferred build flavor of JavaScriptCore (JSC) * * For example, to use the international variant, you can use: * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` * * The international variant includes ICU i18n library and necessary data * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that - * give correct results when using with locales other than en-US. Note that + * give correct results when using with locales other than en-US. Note that * this variant is about 6MiB larger per architecture than default. */ def jscFlavor = 'org.webkit:android-jsc:+' /** - * Whether to enable the Hermes VM. - * - * This should be set on project.ext.react and that value will be read here. If it is not set - * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode - * and the benefits of using Hermes will therefore be sharply reduced. - */ -def enableHermes = project.ext.react.get("enableHermes", false); - -/** - * Architectures to build native code for. + * Private function to get the list of Native Architectures you want to build. + * This reads the value from reactNativeArchitectures in your gradle.properties + * file and works together with the --active-arch-only flag of react-native run-android. */ def reactNativeArchitectures() { def value = project.getProperties().get("reactNativeArchitectures") @@ -134,72 +93,13 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion + namespace "com.airbnb.android.lottie.rnexample" defaultConfig { applicationId "com.airbnb.android.lottie.rnexample" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" - buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() - - if (isNewArchitectureEnabled()) { - // We configure the CMake build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - arguments "-DPROJECT_BUILD_DIR=$buildDir", - "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", - "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", - "-DNODE_MODULES_DIR=$rootDir/../node_modules", - "-DANDROID_STL=c++_shared" - } - } - if (!enableSeparateBuildPerCPUArchitecture) { - ndk { - abiFilters (*reactNativeArchitectures()) - } - } - } - } - - if (isNewArchitectureEnabled()) { - // We configure the NDK build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - path "$projectDir/src/main/jni/CMakeLists.txt" - } - } - def reactAndroidProjectDir = project(':ReactAndroid').projectDir - def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - afterEvaluate { - // If you wish to add a custom TurboModule or component locally, - // you should uncomment this line. - // preBuild.dependsOn("generateCodegenArtifactsFromSchema") - preDebugBuild.dependsOn(packageReactNdkDebugLibs) - preReleaseBuild.dependsOn(packageReactNdkReleaseLibs) - - // Due to a bug inside AGP, we have to explicitly set a dependency - // between configureCMakeDebug* tasks and the preBuild tasks. - // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732 - configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild) - configureCMakeDebug.dependsOn(preDebugBuild) - reactNativeArchitectures().each { architecture -> - tasks.findByName("configureCMakeDebug[${architecture}]")?.configure { - dependsOn("preDebugBuild") - } - tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure { - dependsOn("preReleaseBuild") - } - } - } } splits { @@ -249,65 +149,22 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - - //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:+" // From node_modules + // The version of react-native is set by the React Native Gradle Plugin + implementation("com.facebook.react:react-android") - implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - - debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' - } + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' exclude group:'com.squareup.okhttp3', module:'okhttp' } - debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' - } - - if (enableHermes) { - //noinspection GradleDynamicVersion - implementation("com.facebook.react:hermes-engine:+") { // From node_modules - exclude group:'com.facebook.fbjni' - } + debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") + if (hermesEnabled.toBoolean()) { + implementation("com.facebook.react:hermes-android") } else { implementation jscFlavor } } -if (isNewArchitectureEnabled()) { - // If new architecture is enabled, we let you build RN from source - // Otherwise we fallback to a prebuilt .aar bundled in the NPM package. - // This will be applied to all the imported transtitive dependency. - configurations.all { - resolutionStrategy.dependencySubstitution { - substitute(module("com.facebook.react:react-native")) - .using(project(":ReactAndroid")) - .because("On New Architecture we're building React Native from source") - substitute(module("com.facebook.react:hermes-engine")) - .using(project(":ReactAndroid:hermes-engine")) - .because("On New Architecture we're building Hermes from source") - } - } -} - -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.implementation - into 'libs' -} - -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) - -def isNewArchitectureEnabled() { - // To opt-in for the New Architecture, you can either: - // - Set `newArchEnabled` to true inside the `gradle.properties` file - // - Invoke gradle with `-newArchEnabled=true` - // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` - return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" -} \ No newline at end of file +apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) \ No newline at end of file diff --git a/apps/paper/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java b/apps/paper/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java index 13a6492..37cd782 100644 --- a/apps/paper/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java +++ b/apps/paper/android/app/src/debug/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java @@ -17,7 +17,6 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; 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; @@ -25,13 +24,18 @@ import com.facebook.react.modules.network.NetworkingModule; import okhttp3.OkHttpClient; +/** + * Class responsible of loading Flipper inside your React Native application. + * This is the debug + * flavor of it. Here you can add your own plugins and customize the Flipper + * setup. + */ 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()); diff --git a/apps/paper/android/app/src/main/AndroidManifest.xml b/apps/paper/android/app/src/main/AndroidManifest.xml index 230f12b..377eced 100644 --- a/apps/paper/android/app/src/main/AndroidManifest.xml +++ b/apps/paper/android/app/src/main/AndroidManifest.xml @@ -1,7 +1,4 @@ - + diff --git a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java b/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java index ffd671b..3d3f2d8 100644 --- a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java +++ b/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainActivity.java @@ -2,12 +2,14 @@ import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; -import com.facebook.react.ReactRootView; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactActivityDelegate; public class MainActivity extends ReactActivity { /** - * Returns the name of the main component registered from JavaScript. This is used to schedule + * Returns the name of the main component registered from JavaScript. This is + * used to schedule * rendering of the component. */ @Override @@ -16,33 +18,22 @@ protected String getMainComponentName() { } /** - * 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). + * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util + * class {@link + * DefaultReactActivityDelegate} which allows you to easily enable Fabric and + * Concurrent React + * (aka React 18) with two boolean flags. */ @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; - } + return new DefaultReactActivityDelegate( + this, + getMainComponentName(), + // If you opted-in for the New Architecture, we enable the Fabric Renderer. + DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled + // If you opted-in for the New Architecture, we enable Concurrent React (i.e. + // React 18). + DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled + ); } } \ No newline at end of file diff --git a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java b/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java index cd9d9e5..f016d58 100644 --- a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java +++ b/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/MainApplication.java @@ -1,91 +1,63 @@ package com.airbnb.android.lottie.rnexample; import android.app.Application; -import android.content.Context; import com.facebook.react.PackageList; import com.facebook.react.ReactApplication; -import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; -import com.facebook.react.config.ReactFeatureFlags; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactNativeHost; import com.facebook.soloader.SoLoader; -import com.airbnb.android.lottie.rnexample.newarchitecture.MainApplicationReactNativeHost; -import java.lang.reflect.InvocationTargetException; import java.util.List; public class MainApplication extends Application implements ReactApplication { - private final ReactNativeHost mReactNativeHost = - new ReactNativeHost(this) { - @Override - public boolean getUseDeveloperSupport() { - return BuildConfig.DEBUG; - } + private final ReactNativeHost mReactNativeHost = new DefaultReactNativeHost(this) { + @Override + public boolean getUseDeveloperSupport() { + return BuildConfig.DEBUG; + } + + @Override + protected List getPackages() { + @SuppressWarnings("UnnecessaryLocalVariable") + List packages = new PackageList(this).getPackages(); + // Packages that cannot be autolinked yet can be added manually here, for + // example: + // packages.add(new MyReactNativePackage()); + return packages; + } - @Override - protected List getPackages() { - @SuppressWarnings("UnnecessaryLocalVariable") - List packages = new PackageList(this).getPackages(); - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - return packages; - } + @Override + protected String getJSMainModuleName() { + return "index"; + } - @Override - protected String getJSMainModuleName() { - return "index"; - } - }; + @Override + protected boolean isNewArchEnabled() { + return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + } - private final ReactNativeHost mNewArchitectureNativeHost = - new MainApplicationReactNativeHost(this); + @Override + protected Boolean isHermesEnabled() { + return BuildConfig.IS_HERMES_ENABLED; + } + }; @Override public ReactNativeHost getReactNativeHost() { - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - return mNewArchitectureNativeHost; - } else { - return mReactNativeHost; - } + 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()); - } - - /** - * Loads Flipper in React Native templates. Call this in the onCreate method with something like - * initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); - * - * @param context - * @param reactInstanceManager - */ - private static void initializeFlipper( - Context context, ReactInstanceManager reactInstanceManager) { - if (BuildConfig.DEBUG) { - try { - /* - We use reflection here to pick up the class that initializes Flipper, - since Flipper library is not available in release mode - */ - Class aClass = Class.forName("com.airbnb.android.lottie.rnexample.ReactNativeFlipper"); - aClass - .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class) - .invoke(null, context, reactInstanceManager); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + // If you opted-in for the New Architecture, we load the native entry point for + // this app. + DefaultNewArchitectureEntryPoint.load(); } + ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); } } \ No newline at end of file diff --git a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java b/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java deleted file mode 100644 index 5296cb0..0000000 --- a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/MainApplicationReactNativeHost.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.airbnb.android.lottie.rnexample.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.airbnb.android.lottie.rnexample.BuildConfig; -import com.airbnb.android.lottie.rnexample.newarchitecture.components.MainComponentsRegistry; -import com.airbnb.android.lottie.rnexample.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; - } - }; - } -} \ No newline at end of file diff --git a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java b/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java deleted file mode 100644 index 4b6d92d..0000000 --- a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/components/MainComponentsRegistry.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.airbnb.android.lottie.rnexample.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); - } -} \ No newline at end of file diff --git a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java deleted file mode 100644 index 2f85ec3..0000000 --- a/apps/paper/android/app/src/main/java/com/airbnb/android/lottie/rnexample/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.airbnb.android.lottie.rnexample.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("example_appmodules"); - sIsSoLibraryLoaded = true; - } - } -} \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/CMakeLists.txt b/apps/paper/android/app/src/main/jni/CMakeLists.txt deleted file mode 100644 index 027f351..0000000 --- a/apps/paper/android/app/src/main/jni/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.13) - -# Define the library name here. -project(example_appmodules) - -# This file includes all the necessary to let you build your application with the New Architecture. -include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake) \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.cpp deleted file mode 100644 index d34a1e4..0000000 --- a/apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "MainApplicationModuleProvider.h" - -#include -#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); - - // Module providers autolinked by RN CLI - auto rncli_module = rncli_ModuleProvider(moduleName, params); - if (rncli_module != nullptr) { - return rncli_module; - } - - return rncore_ModuleProvider(moduleName, params); -} - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.h b/apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.h deleted file mode 100644 index 48f1d10..0000000 --- a/apps/paper/android/app/src/main/jni/MainApplicationModuleProvider.h +++ /dev/null @@ -1,16 +0,0 @@ -#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 \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp deleted file mode 100644 index ae730d1..0000000 --- a/apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#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( - const std::string &name) { - return getTurboModule(name, nullptr) != nullptr || - getTurboModule(name, {.moduleName = name}) != nullptr; -} - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h deleted file mode 100644 index 6617ea4..0000000 --- a/apps/paper/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -#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/airbnb/android/lottie/rnexample/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(const std::string &name); -}; - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/MainComponentsRegistry.cpp b/apps/paper/android/app/src/main/jni/MainComponentsRegistry.cpp deleted file mode 100644 index 1f42510..0000000 --- a/apps/paper/android/app/src/main/jni/MainComponentsRegistry.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "MainComponentsRegistry.h" - -#include -#include -#include -#include -#include - -namespace facebook { -namespace react { - -MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {} - -std::shared_ptr -MainComponentsRegistry::sharedProviderRegistry() { - auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry(); - - // Autolinked providers registered by RN CLI - rncli_registerProviders(providerRegistry); - - // 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 \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/MainComponentsRegistry.h b/apps/paper/android/app/src/main/jni/MainComponentsRegistry.h deleted file mode 100644 index ca8182b..0000000 --- a/apps/paper/android/app/src/main/jni/MainComponentsRegistry.h +++ /dev/null @@ -1,32 +0,0 @@ -#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/airbnb/android/lottie/rnexample/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 \ No newline at end of file diff --git a/apps/paper/android/app/src/main/jni/OnLoad.cpp b/apps/paper/android/app/src/main/jni/OnLoad.cpp deleted file mode 100644 index ae1ef00..0000000 --- a/apps/paper/android/app/src/main/jni/OnLoad.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#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(); - }); -} \ No newline at end of file diff --git a/apps/paper/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java b/apps/paper/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java new file mode 100644 index 0000000..81790ba --- /dev/null +++ b/apps/paper/android/app/src/release/java/com/airbnb/android/lottie/rnexample/ReactNativeFlipper.java @@ -0,0 +1,21 @@ +/** + * 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.airbnb.android.lottie.rnexample; + +import android.content.Context; +import com.facebook.react.ReactInstanceManager; + +/** + * Class responsible of loading Flipper inside your React Native application. + * This is the release + * flavor of it so it's empty as we don't want to load Flipper. + */ +public class ReactNativeFlipper { + public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { + // Do nothing as we don't want to initialize Flipper on Release. + } +} \ No newline at end of file diff --git a/apps/paper/android/build.gradle b/apps/paper/android/build.gradle index c122d99..ba99262 100644 --- a/apps/paper/android/build.gradle +++ b/apps/paper/android/build.gradle @@ -1,49 +1,21 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + buildscript { - ext { - buildToolsVersion = "31.0.0" - minSdkVersion = 21 - compileSdkVersion = 31 - targetSdkVersion = 31 + ext { + buildToolsVersion = "33.0.0" + minSdkVersion = 21 + compileSdkVersion = 33 + targetSdkVersion = 33 - if (System.properties['os.arch'] == "aarch64") { - // For M1 Users we need to use the NDK 24 which added support for aarch64 - ndkVersion = "24.0.8215888" - } else { - // Otherwise we default to the side-by-side NDK version from AGP. - ndkVersion = "21.4.7075529" + // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. + ndkVersion = "23.1.7779620" } - } - - repositories { - google() - mavenCentral() - } - - dependencies { - classpath("com.android.tools.build:gradle:7.2.1") - classpath("com.facebook.react:react-native-gradle-plugin") - classpath("de.undercouch:gradle-download-task:5.0.1") - } -} - -allprojects { repositories { - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url("$rootDir/../node_modules/react-native/android") - } - maven { - // Android JSC is installed from npm - url("$rootDir/../node_modules/jsc-android/dist") - } - mavenCentral { - // We don't want to fetch react-native from Maven Central as there are - // older versions over there. - content { - excludeGroup "com.facebook.react" - } - } google() - maven { url 'https://www.jitpack.io' } + mavenCentral() + } + dependencies { + classpath("com.android.tools.build:gradle:7.3.1") + classpath("com.facebook.react:react-native-gradle-plugin") } -} +} \ No newline at end of file diff --git a/apps/paper/android/gradle.properties b/apps/paper/android/gradle.properties index 9fbae44..cc45099 100644 --- a/apps/paper/android/gradle.properties +++ b/apps/paper/android/gradle.properties @@ -37,4 +37,8 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # your application. You should enable this flag either if you want # to write custom TurboModules/Fabric components OR use libraries that # are providing them. -newArchEnabled=false \ No newline at end of file +newArchEnabled=false + +# Use this property to enable or disable the Hermes JS engine. +# If set to false, you will be using JSC instead. +hermesEnabled=true \ No newline at end of file diff --git a/apps/paper/android/settings.gradle b/apps/paper/android/settings.gradle index 0d021a9..d5ade3f 100644 --- a/apps/paper/android/settings.gradle +++ b/apps/paper/android/settings.gradle @@ -2,10 +2,3 @@ rootProject.name = 'lottie-react-native' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' includeBuild('../node_modules/react-native-gradle-plugin') - -if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { - include(":ReactAndroid") - project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') - include(":ReactAndroid:hermes-engine") - project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine') -} diff --git a/apps/paper/babel.config.js b/apps/paper/babel.config.js new file mode 100644 index 0000000..f842b77 --- /dev/null +++ b/apps/paper/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['module:metro-react-native-babel-preset'], +}; diff --git a/apps/paper/babel.config.json b/apps/paper/babel.config.json deleted file mode 100644 index 98736cc..0000000 --- a/apps/paper/babel.config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "presets": [ - "module:metro-react-native-babel-preset" - ] -} diff --git a/apps/paper/ios/Podfile b/apps/paper/ios/Podfile index edd8ea9..eb803d4 100644 --- a/apps/paper/ios/Podfile +++ b/apps/paper/ios/Podfile @@ -1,24 +1,35 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '12.4' -install! 'cocoapods', :deterministic_uuids => false +platform :ios, min_ios_version_supported +prepare_react_native_project! + +flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + +linkage = ENV['USE_FRAMEWORKS'] +if linkage != nil + Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green + use_frameworks! :linkage => linkage.to_sym +end target 'example' do config = use_native_modules! + # Flags change depending on the env values. + flags = get_default_flags() + use_react_native!( :path => config[:reactNativePath], # Hermes is now enabled by default. Disable by setting this flag to false. # Upcoming versions of React Native may rely on get_default_flags(), but # we make it explicit here to aid in the React Native upgrade process. - :hermes_enabled => true, - :fabric_enabled => false, + :hermes_enabled => flags[:hermes_enabled], + :fabric_enabled => flags[:fabric_enabled], # Enables Flipper. # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - :flipper_configuration => FlipperConfiguration.disabled, + :flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) @@ -28,12 +39,6 @@ target 'example' do # Pods for testing end - # Enables Flipper. - # - # Note that if you have use_frameworks! enabled, Flipper will not work and - # you should disable the next line. - # use_flipper!() - post_install do |installer| react_native_post_install( installer, @@ -43,4 +48,4 @@ target 'example' do ) __apply_Xcode_12_5_M1_post_install_workaround(installer) end -end +end \ No newline at end of file diff --git a/apps/paper/ios/Podfile.lock b/apps/paper/ios/Podfile.lock index 940cf09..70d05dd 100644 --- a/apps/paper/ios/Podfile.lock +++ b/apps/paper/ios/Podfile.lock @@ -1,22 +1,87 @@ PODS: - boost (1.76.0) + - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.70.3) - - FBReactNativeSpec (0.70.3): + - FBLazyVector (0.71.0) + - FBReactNativeSpec (0.71.0): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Core (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) + - RCTRequired (= 0.71.0) + - RCTTypeSafety (= 0.71.0) + - React-Core (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - Flipper (0.125.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (3.2.0.1) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.10): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.1100) + - Flipper-Glog (0.5.0.5) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.125.0): + - FlipperKit/Core (= 0.125.0) + - FlipperKit/Core (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.125.0) + - FlipperKit/FKPortForwarding (0.125.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.125.0) + - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.70.3) + - hermes-engine (0.71.0-rc.6): + - hermes-engine/Pre-built (= 0.71.0-rc.6) + - hermes-engine/Pre-built (0.71.0-rc.6) - libevent (2.1.12) - lottie-ios (3.5.0) - lottie-react-native (6.0.0-rc.1): - lottie-ios (~> 3.5.0) - React-Core + - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -34,304 +99,337 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.70.3) - - RCTTypeSafety (0.70.3): - - FBLazyVector (= 0.70.3) - - RCTRequired (= 0.70.3) - - React-Core (= 0.70.3) - - React (0.70.3): - - React-Core (= 0.70.3) - - React-Core/DevSupport (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-RCTActionSheet (= 0.70.3) - - React-RCTAnimation (= 0.70.3) - - React-RCTBlob (= 0.70.3) - - React-RCTImage (= 0.70.3) - - React-RCTLinking (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - React-RCTSettings (= 0.70.3) - - React-RCTText (= 0.70.3) - - React-RCTVibration (= 0.70.3) - - React-bridging (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - React-jsi (= 0.70.3) - - React-callinvoker (0.70.3) - - React-Codegen (0.70.3): - - FBReactNativeSpec (= 0.70.3) - - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Core (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Core (0.70.3): + - RCTRequired (0.71.0) + - RCTTypeSafety (0.71.0): + - FBLazyVector (= 0.71.0) + - RCTRequired (= 0.71.0) + - React-Core (= 0.71.0) + - React (0.71.0): + - React-Core (= 0.71.0) + - React-Core/DevSupport (= 0.71.0) + - React-Core/RCTWebSocket (= 0.71.0) + - React-RCTActionSheet (= 0.71.0) + - React-RCTAnimation (= 0.71.0) + - React-RCTBlob (= 0.71.0) + - React-RCTImage (= 0.71.0) + - React-RCTLinking (= 0.71.0) + - React-RCTNetwork (= 0.71.0) + - React-RCTSettings (= 0.71.0) + - React-RCTText (= 0.71.0) + - React-RCTVibration (= 0.71.0) + - React-callinvoker (0.71.0) + - React-Codegen (0.71.0): + - FBReactNativeSpec + - hermes-engine + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - React-jsi + - React-jsiexecutor + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - React-Core (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-Core/Default (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/CoreModulesHeaders (0.70.3): + - React-Core/CoreModulesHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/Default (0.70.3): + - React-Core/Default (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/DevSupport (0.70.3): + - React-Core/DevSupport (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-Core/Default (= 0.71.0) + - React-Core/RCTWebSocket (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-jsinspector (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTActionSheetHeaders (0.70.3): + - React-Core/RCTActionSheetHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTAnimationHeaders (0.70.3): + - React-Core/RCTAnimationHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTBlobHeaders (0.70.3): + - React-Core/RCTBlobHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTImageHeaders (0.70.3): + - React-Core/RCTImageHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTLinkingHeaders (0.70.3): + - React-Core/RCTLinkingHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTNetworkHeaders (0.70.3): + - React-Core/RCTNetworkHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTSettingsHeaders (0.70.3): + - React-Core/RCTSettingsHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTTextHeaders (0.70.3): + - React-Core/RCTTextHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTVibrationHeaders (0.70.3): + - React-Core/RCTVibrationHeaders (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTWebSocket (0.70.3): + - React-Core/RCTWebSocket (0.71.0): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-Core/Default (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-CoreModules (0.70.3): + - React-CoreModules (0.71.0): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/CoreModulesHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTImage (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-cxxreact (0.70.3): + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/CoreModulesHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - React-RCTImage (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-cxxreact (0.71.0): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-logger (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-runtimeexecutor (= 0.70.3) - - React-hermes (0.70.3): + - React-callinvoker (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsinspector (= 0.71.0) + - React-logger (= 0.71.0) + - React-perflogger (= 0.71.0) + - React-runtimeexecutor (= 0.71.0) + - React-hermes (0.71.0): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-jsi (0.70.3): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-jsi/Default (= 0.70.3) - - React-jsi/Default (0.70.3): + - React-cxxreact (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-jsinspector (= 0.71.0) + - React-perflogger (= 0.71.0) + - React-jsi (0.71.0): - boost (= 1.76.0) - DoubleConversion - glog + - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.70.3): + - React-jsiexecutor (0.71.0): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-jsinspector (0.70.3) - - React-logger (0.70.3): + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-perflogger (= 0.71.0) + - React-jsinspector (0.71.0) + - React-logger (0.71.0): - glog - react-native-slider (4.3.2): - React-Core - - React-perflogger (0.70.3) - - React-RCTActionSheet (0.70.3): - - React-Core/RCTActionSheetHeaders (= 0.70.3) - - React-RCTAnimation (0.70.3): + - React-perflogger (0.71.0) + - React-RCTActionSheet (0.71.0): + - React-Core/RCTActionSheetHeaders (= 0.71.0) + - React-RCTAnimation (0.71.0): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTAnimationHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTBlob (0.70.3): + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTAnimationHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTAppDelegate (0.71.0): + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - ReactCommon/turbomodule/core + - React-RCTBlob (0.71.0): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.3) - - React-Core/RCTBlobHeaders (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTImage (0.70.3): + - React-Codegen (= 0.71.0) + - React-Core/RCTBlobHeaders (= 0.71.0) + - React-Core/RCTWebSocket (= 0.71.0) + - React-jsi (= 0.71.0) + - React-RCTNetwork (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTImage (0.71.0): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTImageHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTLinking (0.70.3): - - React-Codegen (= 0.70.3) - - React-Core/RCTLinkingHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTNetwork (0.70.3): + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTImageHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - React-RCTNetwork (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTLinking (0.71.0): + - React-Codegen (= 0.71.0) + - React-Core/RCTLinkingHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTNetwork (0.71.0): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTNetworkHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTSettings (0.70.3): + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTNetworkHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTSettings (0.71.0): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTSettingsHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTText (0.70.3): - - React-Core/RCTTextHeaders (= 0.70.3) - - React-RCTVibration (0.70.3): + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTSettingsHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTText (0.71.0): + - React-Core/RCTTextHeaders (= 0.71.0) + - React-RCTVibration (0.71.0): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.3) - - React-Core/RCTVibrationHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-runtimeexecutor (0.70.3): - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (0.70.3): + - React-Codegen (= 0.71.0) + - React-Core/RCTVibrationHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-runtimeexecutor (0.71.0): + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/bridging (0.71.0): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 0.70.3) - - React-callinvoker (= 0.70.3) - - React-Core (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-logger (= 0.70.3) - - React-perflogger (= 0.70.3) + - React-callinvoker (= 0.71.0) + - React-Core (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-logger (= 0.71.0) + - React-perflogger (= 0.71.0) + - ReactCommon/turbomodule/core (0.71.0): + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 0.71.0) + - React-Core (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-logger (= 0.71.0) + - React-perflogger (= 0.71.0) - RNCPicker (2.4.8): - React-Core + - SocketRocket (0.6.0) - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (= 0.125.0) + - Flipper-Boost-iOSX (= 1.76.0.1.11) + - Flipper-DoubleConversion (= 3.2.0.1) + - Flipper-Fmt (= 7.1.7) + - Flipper-Folly (= 2.6.10) + - Flipper-Glog (= 0.5.0.5) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.125.0) + - FlipperKit/Core (= 0.125.0) + - FlipperKit/CppBridge (= 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) + - FlipperKit/FBDefines (= 0.125.0) + - FlipperKit/FKPortForwarding (= 0.125.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) + - FlipperKit/FlipperKitReactPlugin (= 0.125.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`) + - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) - libevent (~> 2.1.12) - lottie-react-native (from `../node_modules/lottie-react-native`) + - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) - - React-bridging (from `../node_modules/react-native/ReactCommon`) - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) + - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) @@ -344,6 +442,7 @@ DEPENDENCIES: - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTAppDelegate (from `../node_modules/react-native/Libraries/AppDelegate`) - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) @@ -358,9 +457,22 @@ DEPENDENCIES: SPEC REPOS: trunk: + - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit - fmt - libevent - lottie-ios + - OpenSSL-Universal + - SocketRocket + - YogaKit EXTERNAL SOURCES: boost: @@ -374,7 +486,7 @@ EXTERNAL SOURCES: glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" hermes-engine: - :podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec" + :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" lottie-react-native: :path: "../node_modules/lottie-react-native" RCT-Folly: @@ -385,8 +497,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/TypeSafety" React: :path: "../node_modules/react-native/" - React-bridging: - :path: "../node_modules/react-native/ReactCommon" React-callinvoker: :path: "../node_modules/react-native/ReactCommon/callinvoker" React-Codegen: @@ -415,6 +525,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/ActionSheetIOS" React-RCTAnimation: :path: "../node_modules/react-native/Libraries/NativeAnimation" + React-RCTAppDelegate: + :path: "../node_modules/react-native/Libraries/AppDelegate" React-RCTBlob: :path: "../node_modules/react-native/Libraries/Blob" React-RCTImage: @@ -440,46 +552,59 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 3b313c3fb52b597f7a9b430798e6367d2b9f07e5 - FBReactNativeSpec: 99a7ecb7e9665d96f2fea706b0844e2f3117f381 + FBLazyVector: 61839cba7a48c570b7ac3e1cd8a4d0948382202f + FBReactNativeSpec: 5a14398ccf5e27c1ca2d7109eb920594ce93c10d + Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: bb344d89a0d14c2c91ad357480a79698bb80e186 + hermes-engine: ca3834c67d1729953a2645b89a59f38c47e94ab3 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: c55158d67d0629a260625cc2ded2052b829e3c3e - lottie-react-native: 796829b95e904a38f250b0851cdc1a3d194806cd + lottie-react-native: 8acede38abe26c803d5328f144669475ff15321b + OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda - RCTRequired: 5cf7e7d2f12699724b59f90350257a422eaa9492 - RCTTypeSafety: 3f3ead9673d1ab8bb1aea85b0894ab3220f8f06e - React: 30a333798d1fcf595e8a4108bbaa0f125a655f4a - React-bridging: 92396c03ab446756ddfb7a8e2baff3bcf19eec7d - React-callinvoker: bb66a41b41fa0b7c5f3cc626693a63c9ea0d6252 - React-Codegen: a2a944a9688fae870be0a2ecdca37284034b25c2 - React-Core: a689b4d1bd13e15915a05c9918c2b01df96cd811 - React-CoreModules: d262214db6b704b042bc5c0735b06c346a371d7f - React-cxxreact: 81d5bf256313bf96cb925eb0e654103291161a17 - React-hermes: 1c35cbfbdc7a888c3a1aa05e6d0ca004d92c923c - React-jsi: 7f99dc3055bec9a0eeb4230f8b6ac873514c8421 - React-jsiexecutor: 7e2e1772ef7b97168c880eeaf3749d8c145ffd6e - React-jsinspector: 0553c9fe7218e1f127be070bd5a4d2fc19fb8190 - React-logger: cffcc09e8aba8a3014be8d18da7f922802e9f19e + RCTRequired: dea3e4163184ea57c50288c15c32c1529265c58f + RCTTypeSafety: a0834ab89159a346731e8aae55ad6e2cce61c327 + React: d877d055ff2137ca0325a4babdef3411e11f3cb7 + React-callinvoker: 77bd2701eee3acac154b11ec219e68d5a1f780ad + React-Codegen: bccc516adc1551ccfe04b0de27e345d38829b204 + React-Core: 4035f59e5bec8f3053583c6108d99c7516deb760 + React-CoreModules: b6a1f76423fea57a03e0d7a2f79d3b55cf193f2c + React-cxxreact: fe5f6ec8ae875bebc71309d1e8ef89bb966d61a6 + React-hermes: 3c8ea5e8f402db2a08b57051206d7f2ba9c75565 + React-jsi: dbf0f82c93bfd828fa05c50f2ee74dc81f711050 + React-jsiexecutor: 060dd495f1e2af3d87216f7ca8a94c55ec885b4f + React-jsinspector: 5061fcbec93fd672183dfb39cc2f65e55a0835db + React-logger: a6c0b3a807a8e81f6d7fea2e72660766f55daa50 react-native-slider: e540525ea731783850802b7af457d8551edb0711 - React-perflogger: 082b4293f0b3914ff41da35a6c06ac4490fcbcc8 - React-RCTActionSheet: 83da3030deb5dea54b398129f56540a44e64d3ae - React-RCTAnimation: bac3a4f4c0436554d9f7fbb1352a0cdcb1fb0f1c - React-RCTBlob: d2c8830ac6b4d55d5624469829fe6d0ef1d534d1 - React-RCTImage: 26ad032b09f90ae5d2283ec19f0c455c444c8189 - React-RCTLinking: 4a8d16586df11fff515a6c52ff51a02c47a20499 - React-RCTNetwork: 843fc75a70f0b5760de0bf59468585f41209bcf0 - React-RCTSettings: 54e59255f94462951b45f84c3f81aedc27cf8615 - React-RCTText: c32e2a60827bd232b2bc95941b9926ccf1c2be4c - React-RCTVibration: b9a58ffdd18446f43d493a4b0ecd603ee86be847 - React-runtimeexecutor: e9b1f9310158a1e265bcdfdfd8c62d6174b947a2 - ReactCommon: 01064177e66d652192c661de899b1076da962fd9 + React-perflogger: e5fc4149e9bbb972b8520277f3b23141faa47a36 + React-RCTActionSheet: 991de88216bf03ab9bb1d213d73c62ecbe64ade7 + React-RCTAnimation: b74e3d1bf5280891a573e447b487fa1db0713b5b + React-RCTAppDelegate: f52667f2dbc510f87b7988c5204e8764d50bf0c1 + React-RCTBlob: 6762787c01d5d8d18efed03764b0d58d3b79595a + React-RCTImage: 9ed7eba8dd192a49def2cad2ecaedee7e7e315b4 + React-RCTLinking: 0b58eed9af0645a161b80bf412b6b721e4585c66 + React-RCTNetwork: dc075b0eea00d8a98c928f011d9bc2458acc7092 + React-RCTSettings: 30fb3f498cfaf8a4bb47334ff9ffbe318ef78766 + React-RCTText: a631564e84a227fe24bae7c04446f36faea7fcf5 + React-RCTVibration: 55c91eccdbd435d7634efbe847086944389475b0 + React-runtimeexecutor: ac80782d9d76ba2b0f709f4de0c427fe33c352dc + ReactCommon: 20e38a9be5fe1341b5e422220877cc94034776ba RNCPicker: 0bf8ef8f7800524f32d2bb2a8bcadd53eda0ecd1 - Yoga: 2ed968a4f060a92834227c036279f2736de0fce3 + SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + Yoga: c618b544ff8bd8865cdca602f00cbcdb92fd6d31 + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 0ea53acb716184aca905e5f8d22796a05bc08695 +PODFILE CHECKSUM: f5ecd2f98b6f47d935be3af402bc886c3fc65408 COCOAPODS: 1.11.3 diff --git a/apps/paper/ios/example/AppDelegate.h b/apps/paper/ios/example/AppDelegate.h index ef1de86..3713cad 100644 --- a/apps/paper/ios/example/AppDelegate.h +++ b/apps/paper/ios/example/AppDelegate.h @@ -1,8 +1,6 @@ -#import +#import #import -@interface AppDelegate : UIResponder +@interface AppDelegate : RCTAppDelegate -@property (nonatomic, strong) UIWindow *window; - -@end +@end \ No newline at end of file diff --git a/apps/paper/ios/example/AppDelegate.mm b/apps/paper/ios/example/AppDelegate.mm index 1a05b82..74a6f51 100644 --- a/apps/paper/ios/example/AppDelegate.mm +++ b/apps/paper/ios/example/AppDelegate.mm @@ -1,85 +1,13 @@ #import "AppDelegate.h" -#import #import -#import - -#import - -#if RCT_NEW_ARCH_ENABLED -#import -#import -#import -#import -#import -#import - -#import - -static NSString *const kRNConcurrentRoot = @"concurrentRoot"; - -@interface AppDelegate () { - RCTTurboModuleManager *_turboModuleManager; - RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; - std::shared_ptr _reactNativeConfig; - facebook::react::ContextContainer::Shared _contextContainer; -} -@end -#endif @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - RCTAppSetupPrepareApp(application); - - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; - -#if RCT_NEW_ARCH_ENABLED - _contextContainer = std::make_shared(); - _reactNativeConfig = std::make_shared(); - _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); - _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer]; - bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; -#endif - - NSDictionary *initProps = [self prepareInitialProps]; - UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"example", initProps); - - if (@available(iOS 13.0, *)) { - rootView.backgroundColor = [UIColor systemBackgroundColor]; - } else { - rootView.backgroundColor = [UIColor whiteColor]; - } - - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [UIViewController new]; - rootViewController.view = rootView; - self.window.rootViewController = rootViewController; - [self.window makeKeyAndVisible]; - return YES; -} - -/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. -/// -/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html -/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). -/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`. -- (BOOL)concurrentRootEnabled -{ - // Switch this bool to turn on and off the concurrent root - return true; -} - -- (NSDictionary *)prepareInitialProps -{ - NSMutableDictionary *initProps = [NSMutableDictionary new]; - -#ifdef RCT_NEW_ARCH_ENABLED - initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]); -#endif - - return initProps; + self.moduleName = @"example"; + return [super application:application didFinishLaunchingWithOptions:launchOptions]; } - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge @@ -91,43 +19,14 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge #endif } -#if RCT_NEW_ARCH_ENABLED - -#pragma mark - RCTCxxBridgeDelegate - -- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge -{ - _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge - delegate:self - jsInvoker:bridge.jsCallInvoker]; - return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager); -} - -#pragma mark RCTTurboModuleManagerDelegate - -- (Class)getModuleClassFromName:(const char *)name -{ - return RCTCoreModulesClassProvider(name); -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - jsInvoker:(std::shared_ptr)jsInvoker -{ - return nullptr; -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - initParams: - (const facebook::react::ObjCTurboModule::InitParams &)params -{ - return nullptr; -} - -- (id)getModuleInstanceFromClass:(Class)moduleClass +/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. +/// +/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html +/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). +/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`. +- (BOOL)concurrentRootEnabled { - return RCTAppSetupDefaultModuleFromClass(moduleClass); + return true; } -#endif - -@end +@end \ No newline at end of file diff --git a/apps/paper/package.json b/apps/paper/package.json index 8871c8a..5057f70 100644 --- a/apps/paper/package.json +++ b/apps/paper/package.json @@ -16,8 +16,8 @@ "@react-native-community/slider": "^4.3.2", "@react-native-picker/picker": "^2.4.8", "lottie-react-native": "workspace:*", - "react": "18.1.0", - "react-native": "0.70.3", + "react": "18.2.0", + "react-native": "0.71.0", "react-native-dropdown-picker": "^5.4.2", "react-native-windows": "0.70.3" }, diff --git a/yarn.lock b/yarn.lock index 14d8619..f760e3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5687,7 +5687,7 @@ __metadata: lottie-react-native: "workspace:*" metro-react-native-babel-preset: ^0.72.3 react: 18.2.0 - react-native: 0.71.0-rc.6 + react-native: 0.71.0 typescript: ^4.8.4 languageName: unknown linkType: soft @@ -10838,8 +10838,8 @@ __metadata: eslint: ^8.25.0 lottie-react-native: "workspace:*" metro-react-native-babel-preset: ^0.72.3 - react: 18.1.0 - react-native: 0.70.3 + react: 18.2.0 + react-native: 0.71.0 react-native-dropdown-picker: ^5.4.2 react-native-windows: 0.70.3 languageName: unknown @@ -11566,9 +11566,9 @@ __metadata: languageName: node linkType: hard -"react-native@npm:0.71.0-rc.6": - version: 0.71.0-rc.6 - resolution: "react-native@npm:0.71.0-rc.6" +"react-native@npm:0.71.0": + version: 0.71.0 + resolution: "react-native@npm:0.71.0" dependencies: "@jest/create-cache-key-function": ^29.2.1 "@react-native-community/cli": 10.0.0 @@ -11608,7 +11608,7 @@ __metadata: react: 18.2.0 bin: react-native: cli.js - checksum: e2dcd542da8c890ef3d602c00ed152edaeb3d58958129ac4b1f3883c45b4dbd4db8d5641bf27e3e841d3488c9d29bbace5ac9bf55f77637d4f5da699f923cbd4 + checksum: c3a08dd0640d36be2da2a2ede1bce75161dd543f6f25824c8dcdd9314434f4567154bfbbc9239179a57098c1cf8303cea0c73699d856939b4333c684d5055940 languageName: node linkType: hard From 5a7244934645ad4c190e7d7da08f234ce4014488 Mon Sep 17 00:00:00 2001 From: Alyssa Harvey Date: Tue, 17 Jan 2023 12:42:24 +0100 Subject: [PATCH 3/3] chore!: remove react-native-windows BREAKING CHANGE: remove react-native-windows support on paper due to https://github.com/microsoft/react-native-windows/issues/1109 --- apps/paper/android/app/build.gradle | 6 +- apps/paper/package.json | 2 +- yarn.lock | 127 ++++++++++++++++++++++++---- 3 files changed, 113 insertions(+), 22 deletions(-) diff --git a/apps/paper/android/app/build.gradle b/apps/paper/android/app/build.gradle index f21a924..81741d1 100644 --- a/apps/paper/android/app/build.gradle +++ b/apps/paper/android/app/build.gradle @@ -12,9 +12,9 @@ react { // The root of your project, i.e. where "package.json" lives. Default is '..' // root = file("../") // The folder where the react-native NPM package is. Default is ../node_modules/react-native - // reactNativeDir = file("../node-modules/react-native") - // The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen - // codegenDir = file("../node-modules/react-native-codegen") + // reactNativeDir = file("../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen + // codegenDir = file("../node_modules/@react-native/codegen") // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js // cliFile = file("../node_modules/react-native/cli.js") diff --git a/apps/paper/package.json b/apps/paper/package.json index 5057f70..20ece88 100644 --- a/apps/paper/package.json +++ b/apps/paper/package.json @@ -19,7 +19,7 @@ "react": "18.2.0", "react-native": "0.71.0", "react-native-dropdown-picker": "^5.4.2", - "react-native-windows": "0.70.3" + "react-native-windows": "0.70.10" }, "devDependencies": { "@babel/core": "^7.19.3", diff --git a/yarn.lock b/yarn.lock index f760e3b..42cc608 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2469,11 +2469,9 @@ __metadata: linkType: hard "@react-native-community/slider@npm:^4.3.2": - version: 4.3.2 - resolution: "@react-native-community/slider@npm:4.3.2" - dependencies: - "@types/react-test-renderer": ^18.0.0 - checksum: 2f02c7df6c3609432efc5675e6e40574766c194e07d4baca8b11db0a80e085830aedb490478aaec239c57fafa99c55409ef7327d523d5002b7b53ba470232bdc + version: 4.4.0 + resolution: "@react-native-community/slider@npm:4.4.0" + checksum: 61d14a28d28221fea44f9a1e85363af8dbec27459131d26ef8c28a4fa01b8c3718bca6cfb0e7adb34847e2b513493f986f8403cb48425a8777dc8bead69271f8 languageName: node linkType: hard @@ -2517,6 +2515,36 @@ __metadata: languageName: node linkType: hard +"@react-native-windows/cli@npm:0.70.2": + version: 0.70.2 + resolution: "@react-native-windows/cli@npm:0.70.2" + dependencies: + "@react-native-windows/fs": 0.70.0 + "@react-native-windows/package-utils": 0.70.0 + "@react-native-windows/telemetry": 0.70.1 + "@typescript-eslint/eslint-plugin": ^5.20.0 + "@typescript-eslint/parser": ^5.20.0 + "@xmldom/xmldom": ^0.7.7 + chalk: ^4.1.0 + cli-spinners: ^2.2.0 + envinfo: ^7.5.0 + find-up: ^4.1.0 + glob: ^7.1.1 + lodash: ^4.17.15 + mustache: ^4.0.1 + ora: ^3.4.0 + prompts: ^2.4.1 + semver: ^7.3.2 + shelljs: ^0.8.4 + username: ^5.1.0 + uuid: ^3.3.2 + xml-formatter: ^2.4.0 + xml-parser: ^1.2.1 + xpath: ^0.0.27 + checksum: d33d1675e3cc75ef81d4fc60fbbd529a9feaa414e03927133a459180fc7579adc8b770d3e511c9f0ca6f7ff534cbf47b310dfe82590572c4c55c6f1df31389ff + languageName: node + linkType: hard + "@react-native-windows/find-repo-root@npm:0.70.0": version: 0.70.0 resolution: "@react-native-windows/find-repo-root@npm:0.70.0" @@ -2572,6 +2600,24 @@ __metadata: languageName: node linkType: hard +"@react-native-windows/telemetry@npm:0.70.1": + version: 0.70.1 + resolution: "@react-native-windows/telemetry@npm:0.70.1" + dependencies: + "@react-native-windows/fs": 0.70.0 + "@typescript-eslint/eslint-plugin": ^5.20.0 + "@typescript-eslint/parser": ^5.20.0 + "@xmldom/xmldom": ^0.7.7 + applicationinsights: ^2.3.1 + ci-info: ^3.2.0 + envinfo: ^7.8.1 + lodash: ^4.17.21 + os-locale: ^5.0.0 + xpath: ^0.0.27 + checksum: 67e68c5e55e54bb006d8962e22a8e2e9780b7fbfb35ddc9428e7c3d6b6fae85c150b09f2a569241f8a545cc2ec716c8f6846a1b04a2ef226dfb108d56a3ed117 + languageName: node + linkType: hard + "@react-native-windows/virtualized-list@npm:0.70.0": version: 0.70.0 resolution: "@react-native-windows/virtualized-list@npm:0.70.0" @@ -2755,15 +2801,6 @@ __metadata: languageName: node linkType: hard -"@types/react-test-renderer@npm:^18.0.0": - version: 18.0.0 - resolution: "@types/react-test-renderer@npm:18.0.0" - dependencies: - "@types/react": "*" - checksum: 6afc938a1d7618d88ab8793e251f0bd5981bf3f08c1b600f74df3f8800b92589ea534dc6dcb7c8d683893fcc740bf8d7843a42bf2dae59785cfe88f004bd7b0b - languageName: node - linkType: hard - "@types/react@npm:*, @types/react@npm:^18.0.21": version: 18.0.21 resolution: "@types/react@npm:18.0.21" @@ -2966,6 +3003,13 @@ __metadata: languageName: node linkType: hard +"@xmldom/xmldom@npm:^0.7.7": + version: 0.7.9 + resolution: "@xmldom/xmldom@npm:0.7.9" + checksum: 66e37b7800132f891b885b2eceeeebc53f60b69789da10276f1584256b963d79a28c7ae2071bc53a9cd842d9b03554c761b2701fe8036d6052f26bcd0ae8f2bb + languageName: node + linkType: hard + "JSONStream@npm:~1.3.1": version: 1.3.5 resolution: "JSONStream@npm:1.3.5" @@ -10841,7 +10885,7 @@ __metadata: react: 18.2.0 react-native: 0.71.0 react-native-dropdown-picker: ^5.4.2 - react-native-windows: 0.70.3 + react-native-windows: 0.70.10 languageName: unknown linkType: soft @@ -11452,12 +11496,12 @@ __metadata: linkType: hard "react-native-dropdown-picker@npm:^5.4.2": - version: 5.4.2 - resolution: "react-native-dropdown-picker@npm:5.4.2" + version: 5.4.4 + resolution: "react-native-dropdown-picker@npm:5.4.4" peerDependencies: react: "*" react-native: "*" - checksum: 7fb999219f74f727410786e2bd1dfafcdaa174039a1ac81af16feef9bcb62dbf865497ec23ad8a650c3020c21895f999262a1151fce59b14d14d1b696ca58551 + checksum: 6ab2a15b1992ad279b3ae391fa7fa2aded551edf96c059ee0f3f174e24466af132957bc921d4c61f805572ace86cf229756894435f372dfa441a954d43b34356 languageName: node linkType: hard @@ -11475,6 +11519,53 @@ __metadata: languageName: node linkType: hard +"react-native-windows@npm:0.70.10": + version: 0.70.10 + resolution: "react-native-windows@npm:0.70.10" + dependencies: + "@babel/runtime": ^7.0.0 + "@jest/create-cache-key-function": ^27.0.1 + "@react-native-community/cli": ^9.0.0 + "@react-native-community/cli-platform-android": ^9.0.0 + "@react-native-community/cli-platform-ios": ^9.0.0 + "@react-native-windows/cli": 0.70.2 + "@react-native-windows/virtualized-list": 0.70.0 + "@react-native/assets": 1.0.0 + "@react-native/normalize-color": 2.0.0 + "@react-native/polyfills": 2.0.0 + abort-controller: ^3.0.0 + anser: ^1.4.9 + base64-js: ^1.1.2 + event-target-shim: ^5.0.1 + invariant: ^2.2.4 + jsc-android: ^250230.2.1 + memoize-one: ^5.0.0 + metro-react-native-babel-transformer: 0.72.1 + metro-runtime: 0.72.1 + metro-source-map: 0.72.1 + mkdirp: ^0.5.1 + nullthrows: ^1.1.1 + pretty-format: ^26.5.2 + promise: ^8.0.3 + react-devtools-core: 4.24.0 + react-native-codegen: ^0.70.4 + react-native-gradle-plugin: ^0.70.2 + react-refresh: ^0.4.0 + react-shallow-renderer: ^16.15.0 + regenerator-runtime: ^0.13.2 + scheduler: ^0.22.0 + source-map-support: ^0.5.19 + stacktrace-parser: ^0.1.3 + use-sync-external-store: ^1.0.0 + whatwg-fetch: ^3.0.0 + ws: ^6.1.4 + peerDependencies: + react: 18.1.0 + react-native: ^0.70.0 + checksum: cdab0841aaa16d59325d614c70ab0a76b78fbd3ad512ed4017499aa7e1f8db056b087fea19c5bb3e7d59bd3b28dda4ab6dc4db08e2a490b35e642573020d3fdf + languageName: node + linkType: hard + "react-native-windows@npm:0.70.3": version: 0.70.3 resolution: "react-native-windows@npm:0.70.3"