diff --git a/packages/react-native/example/__tests__/App-test.tsx b/packages/react-native/example/__tests__/App-test.tsx new file mode 100644 index 00000000..17847669 --- /dev/null +++ b/packages/react-native/example/__tests__/App-test.tsx @@ -0,0 +1,14 @@ +/** + * @format + */ + +import 'react-native'; +import React from 'react'; +import App from '../App'; + +// Note: test renderer must be required after react-native. +import renderer from 'react-test-renderer'; + +it('renders correctly', () => { + renderer.create(); +}); diff --git a/packages/react-native/example/android/app/build.gradle b/packages/react-native/example/android/app/build.gradle index 374e4273..91d03036 100644 --- a/packages/react-native/example/android/app/build.gradle +++ b/packages/react-native/example/android/app/build.gradle @@ -1,82 +1,7 @@ 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: [] - * ] - */ project.ext.react = [ enableHermes: true, // clean and rebuild if changing diff --git a/packages/react-native/example/android/app/src/main/AndroidManifest.xml b/packages/react-native/example/android/app/src/main/AndroidManifest.xml index 9470de00..6c017d7c 100644 --- a/packages/react-native/example/android/app/src/main/AndroidManifest.xml +++ b/packages/react-native/example/android/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:theme="@style/AppTheme"> + android:showWhenLocked="true" + android:turnScreenOn="true" + /> diff --git a/packages/react-native/example/android/app/src/main/java/com/example/MainActivity.java b/packages/react-native/example/android/app/src/main/java/com/example/MainActivity.java index 40b4d8e9..9c362019 100644 --- a/packages/react-native/example/android/app/src/main/java/com/example/MainActivity.java +++ b/packages/react-native/example/android/app/src/main/java/com/example/MainActivity.java @@ -1,9 +1,9 @@ package com.example; +import io.invertase.notifee.NotifeeApiModule; import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; import com.facebook.react.ReactRootView; -import io.invertase.notifee.NotifeeApiModule; public class MainActivity extends ReactActivity { diff --git a/packages/react-native/example/android/app/src/main/java/com/example/MainApplication.java b/packages/react-native/example/android/app/src/main/java/com/example/MainApplication.java index 149ae368..61f1d429 100644 --- a/packages/react-native/example/android/app/src/main/java/com/example/MainApplication.java +++ b/packages/react-native/example/android/app/src/main/java/com/example/MainApplication.java @@ -2,7 +2,6 @@ import android.app.Application; import android.content.Context; -import com.example.newarchitecture.MainApplicationReactNativeHost; import com.facebook.react.PackageList; import com.facebook.react.ReactApplication; import com.facebook.react.ReactInstanceManager; @@ -10,6 +9,7 @@ import com.facebook.react.ReactPackage; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.soloader.SoLoader; +import com.example.newarchitecture.MainApplicationReactNativeHost; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/packages/react-native/example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java b/packages/react-native/example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java index 9716c7b1..68aea280 100644 --- a/packages/react-native/example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java +++ b/packages/react-native/example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java @@ -2,9 +2,6 @@ import android.app.Application; import androidx.annotation.NonNull; -import com.example.BuildConfig; -import com.example.newarchitecture.components.MainComponentsRegistry; -import com.example.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; import com.facebook.react.PackageList; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; @@ -22,6 +19,9 @@ import com.facebook.react.fabric.FabricJSIModuleProvider; import com.facebook.react.fabric.ReactNativeConfig; import com.facebook.react.uimanager.ViewManagerRegistry; +import com.example.BuildConfig; +import com.example.newarchitecture.components.MainComponentsRegistry; +import com.example.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; import java.util.ArrayList; import java.util.List; diff --git a/packages/react-native/example/ios/Podfile.lock b/packages/react-native/example/ios/Podfile.lock index 3e7118cb..0a0eca83 100644 --- a/packages/react-native/example/ios/Podfile.lock +++ b/packages/react-native/example/ios/Podfile.lock @@ -2,14 +2,14 @@ PODS: - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.70.4) - - FBReactNativeSpec (0.70.4): + - FBLazyVector (0.70.6) + - FBReactNativeSpec (0.70.6): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.4) - - RCTTypeSafety (= 0.70.4) - - React-Core (= 0.70.4) - - React-jsi (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) - Flipper (0.125.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) @@ -73,7 +73,7 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.70.4) + - hermes-engine (0.70.6) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): @@ -93,285 +93,285 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.70.4) - - RCTTypeSafety (0.70.4): - - FBLazyVector (= 0.70.4) - - RCTRequired (= 0.70.4) - - React-Core (= 0.70.4) - - React (0.70.4): - - React-Core (= 0.70.4) - - React-Core/DevSupport (= 0.70.4) - - React-Core/RCTWebSocket (= 0.70.4) - - React-RCTActionSheet (= 0.70.4) - - React-RCTAnimation (= 0.70.4) - - React-RCTBlob (= 0.70.4) - - React-RCTImage (= 0.70.4) - - React-RCTLinking (= 0.70.4) - - React-RCTNetwork (= 0.70.4) - - React-RCTSettings (= 0.70.4) - - React-RCTText (= 0.70.4) - - React-RCTVibration (= 0.70.4) - - React-bridging (0.70.4): + - RCTRequired (0.70.6) + - RCTTypeSafety (0.70.6): + - FBLazyVector (= 0.70.6) + - RCTRequired (= 0.70.6) + - React-Core (= 0.70.6) + - React (0.70.6): + - React-Core (= 0.70.6) + - React-Core/DevSupport (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-RCTActionSheet (= 0.70.6) + - React-RCTAnimation (= 0.70.6) + - React-RCTBlob (= 0.70.6) + - React-RCTImage (= 0.70.6) + - React-RCTLinking (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - React-RCTSettings (= 0.70.6) + - React-RCTText (= 0.70.6) + - React-RCTVibration (= 0.70.6) + - React-bridging (0.70.6): - RCT-Folly (= 2021.07.22.00) - - React-jsi (= 0.70.4) - - React-callinvoker (0.70.4) - - React-Codegen (0.70.4): - - FBReactNativeSpec (= 0.70.4) + - React-jsi (= 0.70.6) + - React-callinvoker (0.70.6) + - React-Codegen (0.70.6): + - FBReactNativeSpec (= 0.70.6) - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.4) - - RCTTypeSafety (= 0.70.4) - - React-Core (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-Core (0.70.4): + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-Core (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.4) - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/CoreModulesHeaders (0.70.4): + - React-Core/CoreModulesHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/Default (0.70.4): + - React-Core/Default (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/DevSupport (0.70.4): + - React-Core/DevSupport (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.4) - - React-Core/RCTWebSocket (= 0.70.4) - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-jsinspector (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-Core/Default (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTActionSheetHeaders (0.70.4): + - React-Core/RCTActionSheetHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTAnimationHeaders (0.70.4): + - React-Core/RCTAnimationHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTBlobHeaders (0.70.4): + - React-Core/RCTBlobHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTImageHeaders (0.70.4): + - React-Core/RCTImageHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTLinkingHeaders (0.70.4): + - React-Core/RCTLinkingHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTNetworkHeaders (0.70.4): + - React-Core/RCTNetworkHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTSettingsHeaders (0.70.4): + - React-Core/RCTSettingsHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTTextHeaders (0.70.4): + - React-Core/RCTTextHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTVibrationHeaders (0.70.4): + - React-Core/RCTVibrationHeaders (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTWebSocket (0.70.4): + - React-Core/RCTWebSocket (0.70.6): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.4) - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-perflogger (= 0.70.4) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-CoreModules (0.70.4): + - React-CoreModules (0.70.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4) - - React-Codegen (= 0.70.4) - - React-Core/CoreModulesHeaders (= 0.70.4) - - React-jsi (= 0.70.4) - - React-RCTImage (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-cxxreact (0.70.4): + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/CoreModulesHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTImage (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-cxxreact (0.70.6): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsinspector (= 0.70.4) - - React-logger (= 0.70.4) - - React-perflogger (= 0.70.4) - - React-runtimeexecutor (= 0.70.4) - - React-hermes (0.70.4): + - React-callinvoker (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-runtimeexecutor (= 0.70.6) + - React-hermes (0.70.6): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-jsiexecutor (= 0.70.4) - - React-jsinspector (= 0.70.4) - - React-perflogger (= 0.70.4) - - React-jsi (0.70.4): + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-jsi (0.70.6): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsi/Default (= 0.70.4) - - React-jsi/Default (0.70.4): + - React-jsi/Default (= 0.70.6) + - React-jsi/Default (0.70.6): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.70.4): + - React-jsiexecutor (0.70.6): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-perflogger (= 0.70.4) - - React-jsinspector (0.70.4) - - React-logger (0.70.4): + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-jsinspector (0.70.6) + - React-logger (0.70.6): - glog - - React-perflogger (0.70.4) - - React-RCTActionSheet (0.70.4): - - React-Core/RCTActionSheetHeaders (= 0.70.4) - - React-RCTAnimation (0.70.4): + - React-perflogger (0.70.6) + - React-RCTActionSheet (0.70.6): + - React-Core/RCTActionSheetHeaders (= 0.70.6) + - React-RCTAnimation (0.70.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4) - - React-Codegen (= 0.70.4) - - React-Core/RCTAnimationHeaders (= 0.70.4) - - React-jsi (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-RCTBlob (0.70.4): + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTAnimationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTBlob (0.70.6): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.4) - - React-Core/RCTBlobHeaders (= 0.70.4) - - React-Core/RCTWebSocket (= 0.70.4) - - React-jsi (= 0.70.4) - - React-RCTNetwork (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-RCTImage (0.70.4): + - React-Codegen (= 0.70.6) + - React-Core/RCTBlobHeaders (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTImage (0.70.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4) - - React-Codegen (= 0.70.4) - - React-Core/RCTImageHeaders (= 0.70.4) - - React-jsi (= 0.70.4) - - React-RCTNetwork (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-RCTLinking (0.70.4): - - React-Codegen (= 0.70.4) - - React-Core/RCTLinkingHeaders (= 0.70.4) - - React-jsi (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-RCTNetwork (0.70.4): + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTImageHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTLinking (0.70.6): + - React-Codegen (= 0.70.6) + - React-Core/RCTLinkingHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTNetwork (0.70.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4) - - React-Codegen (= 0.70.4) - - React-Core/RCTNetworkHeaders (= 0.70.4) - - React-jsi (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-RCTSettings (0.70.4): + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTNetworkHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTSettings (0.70.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4) - - React-Codegen (= 0.70.4) - - React-Core/RCTSettingsHeaders (= 0.70.4) - - React-jsi (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-RCTText (0.70.4): - - React-Core/RCTTextHeaders (= 0.70.4) - - React-RCTVibration (0.70.4): + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTSettingsHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTText (0.70.6): + - React-Core/RCTTextHeaders (= 0.70.6) + - React-RCTVibration (0.70.6): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.4) - - React-Core/RCTVibrationHeaders (= 0.70.4) - - React-jsi (= 0.70.4) - - ReactCommon/turbomodule/core (= 0.70.4) - - React-runtimeexecutor (0.70.4): - - React-jsi (= 0.70.4) - - ReactCommon/turbomodule/core (0.70.4): + - React-Codegen (= 0.70.6) + - React-Core/RCTVibrationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-runtimeexecutor (0.70.6): + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (0.70.6): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 0.70.4) - - React-callinvoker (= 0.70.4) - - React-Core (= 0.70.4) - - React-cxxreact (= 0.70.4) - - React-jsi (= 0.70.4) - - React-logger (= 0.70.4) - - React-perflogger (= 0.70.4) - - RNNotifee (7.0.4): + - React-bridging (= 0.70.6) + - React-callinvoker (= 0.70.6) + - React-Core (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) + - RNNotifee (7.5.0): - React-Core - - RNNotifee/NotifeeCore (= 7.0.4) - - RNNotifee/NotifeeCore (7.0.4): + - RNNotifee/NotifeeCore (= 7.5.0) + - RNNotifee/NotifeeCore (7.5.0): - React-Core - SocketRocket (0.6.0) - Yoga (1.14.0) @@ -534,8 +534,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 8a28262f61fbe40c04ce8677b8d835d97c18f1b3 - FBReactNativeSpec: b475991eb2d8da6a4ec32d09a8df31b0247fa87d + FBLazyVector: 48289402952f4f7a4e235de70a9a590aa0b79ef4 + FBReactNativeSpec: dd1186fd05255e3457baa2f4ca65e94c2cd1e3ac Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -547,39 +547,39 @@ SPEC CHECKSUMS: FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: 3623325e0d0676a45fbc544d72c57dd79fce7446 + hermes-engine: 2af7b7a59128f250adfd86f15aa1d5a2ecd39995 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda - RCTRequired: 49a2c4d4215580d8b24ed538ae01b6de20b43a76 - RCTTypeSafety: 55d538399fe8b51e5cd862e2ec2f9b135b07e783 - React: 413fd7d791365c2c5742b60493d3ab450ca1a210 - React-bridging: 8e577e404677d57daa0310db63e6a27328a57207 - React-callinvoker: d0ae2f0ea66bcf29a3e42a895428d2f01473d2ea - React-Codegen: 273200ed3b02d35fd1755aebe0eb3319b037d950 - React-Core: f42a10403076c1114f8c50f063ddafc9eea92fff - React-CoreModules: 1ed78c63dad96f40b123d4d4ca455e09ccd8aaed - React-cxxreact: 7d30af80adb5fe6a97646a06540c19e61736aa15 - React-hermes: 185ce251487bcb812c34ce33b1ab6412419b43a3 - React-jsi: 9b2b4ac1642b72bffcd74550f0caa0926b3f8a4d - React-jsiexecutor: 4a893fc8f683b91befcaf56c44ad8be4506b6828 - React-jsinspector: 1d5a9e84e419a57cabc23249aec3d837d1b03a80 - React-logger: f8071ad48248781d5afdb8a07f778758529d3019 - React-perflogger: 5e41b01b35d97cc1b0ea177181eb33b5c77623b6 - React-RCTActionSheet: 48949f30b24200c82f3dd27847513be34e06a3ae - React-RCTAnimation: 96af42c97966fcd53ed9c31bee6f969c770312b6 - React-RCTBlob: 22aa326a2b34eea3299a2274ce93e102f8383ed9 - React-RCTImage: 1df0dbdb53609778f68830ccdd07ff3b40812837 - React-RCTLinking: eef4732d9102a10174115a727588d199711e376c - React-RCTNetwork: 18716f00568ec203df2192d35f4a74d1d9b00675 - React-RCTSettings: 1dc8a5e5272cea1bad2f8d9b4e6bac91b846749b - React-RCTText: 17652c6294903677fb3d754b5955ac293347782c - React-RCTVibration: 0e247407238d3bd6b29d922d7b5de0404359431b - React-runtimeexecutor: 5407e26b5aaafa9b01a08e33653255f8247e7c31 - ReactCommon: abf3605a56f98b91671d0d1327addc4ffb87af77 - RNNotifee: dcb2593127f40945c4ee5fc09f61d71bbd00b9cf + RCTRequired: e1866f61af7049eb3d8e08e8b133abd38bc1ca7a + RCTTypeSafety: 27c2ac1b00609a432ced1ae701247593f07f901e + React: bb3e06418d2cc48a84f9666a576c7b38e89cd7db + React-bridging: 572502ec59c9de30309afdc4932e278214288913 + React-callinvoker: 6b708b79c69f3359d42f1abb4663f620dbd4dadf + React-Codegen: 74e1cd7cee692a8b983c18df3274b5e749de07c8 + React-Core: b587d0a624f9611b0e032505f3d6f25e8daa2bee + React-CoreModules: c6ff48b985e7aa622e82ca51c2c353c7803eb04e + React-cxxreact: ade3d9e63c599afdead3c35f8a8bd12b3da6730b + React-hermes: ed09ae33512bbb8d31b2411778f3af1a2eb681a1 + React-jsi: 5a3952e0c6d57460ad9ee2c905025b4c28f71087 + React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f + React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b + React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0 + React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595 + React-RCTActionSheet: 7316773acabb374642b926c19aef1c115df5c466 + React-RCTAnimation: 5341e288375451297057391227f691d9b2326c3d + React-RCTBlob: b0615fc2daf2b5684ade8fadcab659f16f6f0efa + React-RCTImage: 6487b9600f268ecedcaa86114d97954d31ad4750 + React-RCTLinking: c8018ae9ebfefcec3839d690d4725f8d15e4e4b3 + React-RCTNetwork: 8aa63578741e0fe1205c28d7d4b40dbfdabce8a8 + React-RCTSettings: d00c15ad369cd62242a4dfcc6f277912b4a84ed3 + React-RCTText: f532e5ca52681ecaecea452b3ad7a5b630f50d75 + React-RCTVibration: c75ceef7aa60a33b2d5731ebe5800ddde40cefc4 + React-runtimeexecutor: 15437b576139df27635400de0599d9844f1ab817 + ReactCommon: 349be31adeecffc7986a0de875d7fb0dcf4e251c + RNNotifee: 053c0ace9c73634709a0214fd9c436a5777a562f SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 1f02ef4ce4469aefc36167138441b27d988282b1 + Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: e9774a3132cc2072013fd07ec1ade8155544b823 diff --git a/packages/react-native/example/jestSetup.js b/packages/react-native/example/jestSetup.js index 034e5a05..e36a57df 100644 --- a/packages/react-native/example/jestSetup.js +++ b/packages/react-native/example/jestSetup.js @@ -3,4 +3,4 @@ import mock from '@notifee/react-native/jest-mock'; // To disable warning Animated: `useNativeDriver` is not supported because the native animated module is missing. jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper'); -jest.mock('@notifee/react-native', () => mock); +jest.mock('@notifee/react-native', () => mock); \ No newline at end of file diff --git a/packages/react-native/example/package.json b/packages/react-native/example/package.json index 68360efd..b09b5e29 100644 --- a/packages/react-native/example/package.json +++ b/packages/react-native/example/package.json @@ -12,14 +12,14 @@ }, "dependencies": { "@notifee/react-native": "file:../", - "react": "18.1.0", - "react-native": "0.70.4" + "react": "18.2.0", + "react-native": "0.71.4" }, "devDependencies": { "@babel/core": "^7.12.9", "@babel/runtime": "^7.12.5", "@react-native-community/eslint-config": "^3", - "@testing-library/react-native": "^11.5.0", + "@testing-library/react-native": "^11.5.4", "@tsconfig/react-native": "^2.0.2", "@types/jest": "^26.0.23", "@types/react": "^18.0.21", @@ -36,12 +36,6 @@ }, "jest": { "preset": "react-native", - "setupFiles": [ - "./jestSetup.js" - ], - "transformIgnorePatterns": [ - "node_modules/(?!(jest-)?@react-native|@notifee/react-native|react-native)" - ], "moduleFileExtensions": [ "ts", "tsx", diff --git a/packages/react-native/src/NotifeeApiModule.ts b/packages/react-native/src/NotifeeApiModule.ts index ebe8f6e1..b6f01051 100644 --- a/packages/react-native/src/NotifeeApiModule.ts +++ b/packages/react-native/src/NotifeeApiModule.ts @@ -492,6 +492,8 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod const subscriber = this.emitter.addListener( kReactNativeNotifeeNotificationEvent, + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore See https://github.com/facebook/react-native/pull/36462 ({ type, detail }) => { observer({ type, detail }); }, diff --git a/packages/react-native/src/NotifeeJSEventEmitter.ts b/packages/react-native/src/NotifeeJSEventEmitter.ts index cde67aa0..ee62334b 100644 --- a/packages/react-native/src/NotifeeJSEventEmitter.ts +++ b/packages/react-native/src/NotifeeJSEventEmitter.ts @@ -5,7 +5,8 @@ // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import EventEmitter from 'react-native/Libraries/vendor/emitter/EventEmitter'; -import { EventEmitter as EventEmitterInterface } from 'react-native'; -const emitter: EventEmitterInterface = new EventEmitter(); +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore See https://github.com/facebook/react-native/pull/36462 +const emitter = new EventEmitter(); export default emitter; diff --git a/packages/react-native/src/NotifeeNativeModule.ts b/packages/react-native/src/NotifeeNativeModule.ts index b981710d..a5f0b1aa 100644 --- a/packages/react-native/src/NotifeeNativeModule.ts +++ b/packages/react-native/src/NotifeeNativeModule.ts @@ -4,7 +4,6 @@ import NotifeeJSEventEmitter from './NotifeeJSEventEmitter'; import { - EventEmitter, EventSubscriptionVendor, NativeEventEmitter, NativeModules, @@ -36,7 +35,7 @@ export default class NotifeeNativeModule { } } - public get emitter(): EventEmitter { + public get emitter() { return NotifeeJSEventEmitter; }