diff --git a/.eslintignore b/.eslintignore index 298a2ddc22..3a9c0c57ba 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,8 +1,10 @@ # Ignore build generated dir dist -# Ignore sample folder +# Ignore standalone apps sample +sample-new-architecture +test/perf/TestApp* # Ignore dangerfile -dangerfile.js \ No newline at end of file +dangerfile.js diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index a26bbce710..ac6f63283c 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -14,7 +14,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 - + with: + node-version: 14 - uses: actions/cache@v3 id: cache with: @@ -42,12 +43,32 @@ jobs: - name: Lint run: yarn lint + job_lint_sample_new_arch: + name: Lint Sample + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/cache@v3 + id: cache + with: + path: sample-new-architecture/node_modules + key: ${{ runner.os }}-${{ github.sha }} + - name: Install Dependencies + if: steps.cache.outputs['cache-hit'] != 'true' + run: yarn install + working-directory: sample-new-architecture + - name: Lint Sample + run: yarn lint + working-directory: sample-new-architecture + job_build: name: Build runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 + with: + node-version: 14 - uses: actions/cache@v3 id: cache with: diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml new file mode 100644 index 0000000000..14acfc78de --- /dev/null +++ b/.github/workflows/codegen.yml @@ -0,0 +1,37 @@ +name: Codegen + +on: + push: + branches: + - main + - release/** + pull_request: + +jobs: + codegen: + runs-on: ubuntu-latest + strategy: + matrix: + platform: ["android"] # "ios" will be added after codegen is fixed + include: + - platform: android + command: | + cd sample-new-architecture/android + ./gradlew generateCodegenArtifactsFromSchema + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 14 + - uses: actions/cache@v3 + id: cache + with: + path: sample-new-architecture/node_modules + key: ${{ runner.os }}-${{ github.sha }} + - name: Install Dependencies + if: steps.cache.outputs['cache-hit'] != 'true' + run: | + cd sample-new-architecture + yarn install + - name: Codegen + run: ${{ matrix.command }} diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 11b828a504..96600bed87 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -140,3 +140,103 @@ jobs: path: | ./sample/*.log ./sample/*.png + + metrics: + runs-on: macos-latest + strategy: + # we want that the matrix keeps running, default is to cancel them if it fails. + fail-fast: false + matrix: + platform: ["ios", "android"] + include: + - platform: ios + name: iOS + appPlain: test/perf/test-app-plain.ipa + - platform: android + name: Android + appPlain: test/perf/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: "14" + - uses: actions/setup-java@v3 + with: + java-version: "11" + distribution: "adopt" + - name: Install Global Dependencies + run: yarn global add react-native-cli @sentry/cli yalc + - uses: actions/cache@v3 + id: deps-cache + with: + path: | + node_modules + test/perf/TestAppSentry/node_modules + key: ${{ github.workflow }}-${{ github.job }}-${{ hashFiles('yarn.lock', 'test/perf/TestAppSentry/yarn.lock') }} + - name: Install Dependencies + if: steps.deps-cache.outputs['cache-hit'] != 'true' + run: yarn install + - name: Build SDK + run: yarn build + - name: Package SDK + run: yalc publish + - uses: actions/setup-node@v3 + with: + node-version: "16" + - uses: actions/cache@v3 + id: app-plain-cache + with: + path: ${{ matrix.appPlain }} + key: ${{ github.workflow }}-${{ github.job }}-appplain-${{ hashFiles('test/perf/TestAppPlain/**') }} + - name: Build app plain + if: steps.app-plain-cache.outputs['cache-hit'] != 'true' + working-directory: ./test/perf/TestAppPlain + run: | + yarn install + cd ${{ matrix.platform }} + if [[ "${{ matrix.platform }}" == "android" ]]; then + ./gradlew assembleRelease + else + pod install + cd ../.. + fastlane build_perf_test_app_plain + fi + env: + APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }} + APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }} + APP_STORE_CONNECT_KEY: ${{ secrets.APP_STORE_CONNECT_KEY }} + FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }} + MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }} + - name: Build app with Sentry + working-directory: ./test/perf/TestAppSentry + run: | + yalc add @sentry/react-native + yarn install + cd ${{ matrix.platform }} + if [[ "${{ matrix.platform }}" == "android" ]]; then + ./gradlew assembleRelease + else + pod install + cd ../.. + fastlane build_perf_test_app_sentry + cd TestAppSentry + fi + # Remove after build so that the cache isn't invaldiated due to the changes in yarn.lock. + yarn remove @sentry/react-native + env: + APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }} + APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }} + APP_STORE_CONNECT_KEY: ${{ secrets.APP_STORE_CONNECT_KEY }} + FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }} + MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }} + - name: Collect apps metrics + uses: getsentry/action-app-sdk-overhead-metrics@v1 + with: + name: ${{ matrix.name }} + config: ./test/perf/metrics-${{ matrix.platform }}.yml + sauce-user: ${{ secrets.SAUCE_USERNAME }} + sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e7feb0184..e45ed0656c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,11 +8,14 @@ on: force: description: Force a release even when there are release-blockers (optional) required: false + merge_target: + description: Target branch to merge into. Uses the default branch as a fallback (optional) + required: false jobs: job_release: runs-on: ubuntu-latest - name: 'Release a new version' + name: "Release a new version" steps: - name: Check out current commit (${{ github.sha }}) uses: actions/checkout@v3 @@ -28,3 +31,4 @@ jobs: with: version: ${{ github.event.inputs.version }} force: ${{ github.event.inputs.force }} + merge_target: ${{ github.event.inputs.merge_target }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 0945718d8c..6f47880595 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ ## Unreleased +### Features + +- Send react native js engine, turbo module, fabric flags and component stack in Event contexts ([#2552](https://github.com/getsentry/sentry-react-native/pull/2552)) + +## 5.0.0-alpha.6 + +- Latest changes from 4.6.1 + +### Features + +- Add initial support for the RN New Architecture, backwards compatible RNSentry Turbo Module ([#2522](https://github.com/getsentry/sentry-react-native/pull/2522)) + +### Breaking changes + +- New ReactNativeTracingOptions idleTimeoutMs and finalTimeoutMs replacing idleTimeout and maxTransactionDuration respectively ([#2481](https://github.com/getsentry/sentry-react-native/pull/2481)) +- iOS min target 12.4, Android API min 21, min React Native version 0.70 ([#2522](https://github.com/getsentry/sentry-react-native/pull/2522)) + ### Dependencies - Bump Android SDK from v6.4.3 to v6.5.0 ([#2535](https://github.com/getsentry/sentry-react-native/pull/2535)) @@ -34,6 +51,24 @@ - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643) - [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3) +## 5.0.0-alpha.5 + +### Fixes + +- Make `configureScope` callback safe [#2510](https://github.com/getsentry/sentry-react-native/pull/2510) + +### Dependencies + +- Bump JavaScript SDK from v7.14.0 to v7.14.1 ([#2511](https://github.com/getsentry/sentry-react-native/pull/2511)) + - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7141) + - [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.0...7.14.1) +- Bump Cocoa SDK from v7.27.0 to v7.27.1 ([#2521](https://github.com/getsentry/sentry-react-native/pull/2521)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7271) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.0...7.27.1) +- Bump Android SDK from v6.4.2 to v6.4.3 ([#2520](https://github.com/getsentry/sentry-react-native/pull/2520)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643) + - [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3) + ## 4.6.0 ### Fixes @@ -58,6 +93,14 @@ - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7140) - [diff](https://github.com/getsentry/sentry-javascript/compare/7.13.0...7.14.0) +## 5.0.0-alpha.4 + +- Latest changes from 4.5.0 + +### Breaking changes + +- New ReactNativeTracingOptions idleTimeoutMs and finalTimeoutMs replacing idleTimeout and maxTransactionDuration respectively ([#2481](https://github.com/getsentry/sentry-react-native/pull/2481)) + ## 4.5.0 ### Features @@ -98,6 +141,16 @@ - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7251) - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.24.1...7.25.1) +## 5.0.0-alpha.3 + +- Latest changes from 4.3.x + +### Dependencies + +- Bump Wizard from v2.0.0 to v2.2.0 ([#2460](https://github.com/getsentry/sentry-react-native/pull/2460)) + - [changelog](https://github.com/getsentry/sentry-wizard/blob/master/CHANGELOG.md#v220) + - [diff](https://github.com/getsentry/sentry-wizard/compare/v2.0.0...v2.2.0) + ## 4.3.0 ### Features @@ -122,6 +175,16 @@ - ReactNativeTracing wrongly marks transactions as deadline_exceeded when it reaches the idleTimeout ([#2427](https://github.com/getsentry/sentry-react-native/pull/2427)) +## 5.0.0-alpha.2 + +- Latest changes from 4.2.x + +## 5.0.0-alpha.1 + +### Fixes + +- Auto linking for RN >= 0.69 ([#2332](https://github.com/getsentry/sentry-react-native/pull/2332)) + ## 4.2.3 ### Fixes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c6e4855f02..c521631ddc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,24 +42,44 @@ yarn test:watch Now we can go into the sample project, install and build it: ```sh -cd sample/ +cd sample-new-architecture/ yarn - -# Build iOS -cd ios -pod install -cd .. ``` -You can optionally start the Metro bundler if you want to control where it runs: +### Run the emulators (legacy-architecture): + +For android switch `newArchEnabled` to `false` in [android/gradle.properties](https://github.com/getsentry/sentry-react-native/blob/c95aa21497ca93aaaaf0b44d170dc39dc7bcf660/sample-new-architecture/android/gradle.properties#L40) ```sh -yarn start --reset-cache +yarn pod-install-legacy +yarn run-ios + +yarn run-android + +# Release builds +yarn pod-install-legacy-production +yarn run-ios --configuration Release + +yarn run-android --variant=release ``` -Run the emulators: +### Run the emulators (new-architecture): +```sh +yarn pod-install +yarn run-ios + +yarn run-android + +# Release builds +yarn pod-install-production +yarn run-ios --configuration Release + +yarn run-android --variant=release +``` + +### Optional +You can optionally start the Metro bundler if you want to control where it runs: ```sh -yarn react-native run-ios -yarn react-native run-android +yarn start --reset-cache ``` diff --git a/RNSentry.podspec b/RNSentry.podspec index 8ba4abaf3c..fa307de0de 100644 --- a/RNSentry.podspec +++ b/RNSentry.podspec @@ -1,6 +1,9 @@ require 'json' version = JSON.parse(File.read('package.json'))["version"] +folly_version = '2021.07.22.00' +folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' + Pod::Spec.new do |s| s.name = 'RNSentry' s.version = version @@ -10,15 +13,30 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/getsentry/sentry-react-native" s.source = { :git => 'https://github.com/getsentry/sentry-react-native.git', :tag => "#{s.version}"} - s.ios.deployment_target = "8.0" + s.ios.deployment_target = "12.4" s.osx.deployment_target = "10.10" - s.tvos.deployment_target = "9.0" + s.tvos.deployment_target = "12.4" s.preserve_paths = '*.js' s.dependency 'React-Core' s.dependency 'Sentry', '7.28.0' - s.source_files = 'ios/RNSentry.{h,m}' + s.source_files = 'ios/RNSentry.{h,mm}' s.public_header_files = 'ios/RNSentry.h' + + # This guard prevent to install the dependencies when we run `pod install` in the old architecture. + if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then + s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1" + s.pod_target_xcconfig = { + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + } + + s.dependency "React-Codegen" + s.dependency "RCT-Folly", folly_version + s.dependency "RCTRequired" + s.dependency "RCTTypeSafety" + s.dependency "ReactCommon/turbomodule/core" + end end diff --git a/android/build.gradle b/android/build.gradle index 6ceda97fb1..4b678e6141 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,13 +2,20 @@ def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } +def isNewArchitectureEnabled() { + return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" +} + apply plugin: 'com.android.library' +if (isNewArchitectureEnabled()) { + apply plugin: 'com.facebook.react' +} android { compileSdkVersion safeExtGet('compileSdkVersion', 31) defaultConfig { - minSdkVersion safeExtGet('minSdkVersion', 16) + minSdkVersion safeExtGet('minSdkVersion', 21) targetSdkVersion safeExtGet('targetSdkVersion', 31) versionCode 1 versionName "1.0" @@ -19,6 +26,17 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() + } + + sourceSets { + main { + if (isNewArchitectureEnabled()) { + java.srcDirs += ['src/newarch'] + } else { + java.srcDirs += ['src/oldarch'] + } + } } } diff --git a/android/src/main/java/io/sentry/react/RNSentryModule.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java similarity index 96% rename from android/src/main/java/io/sentry/react/RNSentryModule.java rename to android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index 0839526156..65641a961e 100644 --- a/android/src/main/java/io/sentry/react/RNSentryModule.java +++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -6,18 +6,16 @@ import android.content.pm.PackageManager; import android.util.SparseIntArray; +import androidx.annotation.Nullable; import androidx.core.app.FrameMetricsAggregator; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Promise; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactContextBaseJavaModule; -import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMapKeySetIterator; import com.facebook.react.bridge.WritableMap; -import com.facebook.react.module.annotations.ReactModule; import java.io.File; import java.io.FileOutputStream; @@ -45,13 +43,13 @@ import io.sentry.protocol.SentryPackage; import io.sentry.protocol.User; -@ReactModule(name = RNSentryModule.NAME) -public class RNSentryModule extends ReactContextBaseJavaModule { +public class RNSentryModuleImpl { public static final String NAME = "RNSentry"; private static final Logger logger = Logger.getLogger("react-native-sentry"); + private final ReactApplicationContext reactApplicationContext; private final PackageInfo packageInfo; private FrameMetricsAggregator frameMetricsAggregator = null; private boolean androidXAvailable; @@ -63,18 +61,20 @@ public class RNSentryModule extends ReactContextBaseJavaModule { // 16ms (slower than 60fps) to constitute slow frames. private static final int SLOW_FRAME_THRESHOLD = 16; - public RNSentryModule(ReactApplicationContext reactContext) { - super(reactContext); - packageInfo = getPackageInfo(reactContext); + public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) { + packageInfo = getPackageInfo(reactApplicationContext); + this.reactApplicationContext = reactApplicationContext; } - @Override - public String getName() { - return NAME; + private ReactApplicationContext getReactApplicationContext() { + return this.reactApplicationContext; } + private @Nullable + Activity getCurrentActivity() { + return this.reactApplicationContext.getCurrentActivity(); + } - @ReactMethod public void initNativeSdk(final ReadableMap rnOptions, Promise promise) { SentryAndroid.init(this.getReactApplicationContext(), options -> { if (rnOptions.hasKey("debug") && rnOptions.getBoolean("debug")) { @@ -166,12 +166,10 @@ public void initNativeSdk(final ReadableMap rnOptions, Promise promise) { promise.resolve(true); } - @ReactMethod public void crash() { throw new RuntimeException("TEST - Sentry Client Crash (only works in release mode)"); } - @ReactMethod public void fetchNativeRelease(Promise promise) { WritableMap release = Arguments.createMap(); release.putString("id", packageInfo.packageName); @@ -180,7 +178,6 @@ public void fetchNativeRelease(Promise promise) { promise.resolve(release); } - @ReactMethod public void fetchNativeAppStart(Promise promise) { final AppStartState appStartInstance = AppStartState.getInstance(); final Date appStartTime = appStartInstance.getAppStartTime(); @@ -212,7 +209,6 @@ public void fetchNativeAppStart(Promise promise) { /** * Returns frames metrics at the current point in time. */ - @ReactMethod public void fetchNativeFrames(Promise promise) { if (!isFrameMetricsAggregatorAvailable()) { promise.resolve(null); @@ -262,7 +258,6 @@ public void fetchNativeFrames(Promise promise) { } } - @ReactMethod public void captureEnvelope(ReadableArray rawBytes, ReadableMap options, Promise promise) { byte[] bytes = new byte[rawBytes.size()]; for (int i = 0; i < rawBytes.size(); i++) { @@ -296,7 +291,6 @@ private static PackageInfo getPackageInfo(Context ctx) { } } - @ReactMethod public void setUser(final ReadableMap user, final ReadableMap otherUserKeys) { Sentry.configureScope(scope -> { if (user == null && otherUserKeys == null) { @@ -343,7 +337,6 @@ public void setUser(final ReadableMap user, final ReadableMap otherUserKeys) { }); } - @ReactMethod public void addBreadcrumb(final ReadableMap breadcrumb) { Sentry.configureScope(scope -> { Breadcrumb breadcrumbInstance = new Breadcrumb(); @@ -383,7 +376,7 @@ public void addBreadcrumb(final ReadableMap breadcrumb) { if (breadcrumb.hasKey("data")) { final ReadableMap data = breadcrumb.getMap("data"); - for(final Map.Entry entry : data.toHashMap().entrySet()) { + for (final Map.Entry entry : data.toHashMap().entrySet()) { final Object value = entry.getValue(); // data is ConcurrentHashMap and can't have null values if (value != null) { @@ -396,21 +389,18 @@ public void addBreadcrumb(final ReadableMap breadcrumb) { }); } - @ReactMethod public void clearBreadcrumbs() { Sentry.configureScope(scope -> { scope.clearBreadcrumbs(); }); } - @ReactMethod public void setExtra(String key, String extra) { Sentry.configureScope(scope -> { scope.setExtra(key, extra); }); } - @ReactMethod public void setContext(final String key, final ReadableMap context) { if (key == null || context == null) { return; @@ -422,14 +412,12 @@ public void setContext(final String key, final ReadableMap context) { }); } - @ReactMethod public void setTag(String key, String value) { Sentry.configureScope(scope -> { scope.setTag(key, value); }); } - @ReactMethod public void closeNativeSdk(Promise promise) { Sentry.close(); @@ -438,7 +426,6 @@ public void closeNativeSdk(Promise promise) { promise.resolve(true); } - @ReactMethod public void enableNativeFramesTracking() { androidXAvailable = checkAndroidXAvailability(); @@ -464,7 +451,6 @@ public void enableNativeFramesTracking() { } } - @ReactMethod public void disableNativeFramesTracking() { if (isFrameMetricsAggregatorAvailable()) { frameMetricsAggregator.stop(); diff --git a/android/src/main/java/io/sentry/react/RNSentryPackage.java b/android/src/main/java/io/sentry/react/RNSentryPackage.java index 06cb394064..eb2fd90f29 100644 --- a/android/src/main/java/io/sentry/react/RNSentryPackage.java +++ b/android/src/main/java/io/sentry/react/RNSentryPackage.java @@ -1,30 +1,46 @@ package io.sentry.react; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import androidx.annotation.Nullable; + +import java.util.HashMap; +import java.util.Map; -import com.facebook.react.ReactPackage; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.uimanager.ViewManager; -import com.facebook.react.bridge.JavaScriptModule; +import com.facebook.react.module.model.ReactModuleInfo; +import com.facebook.react.module.model.ReactModuleInfoProvider; +import com.facebook.react.TurboReactPackage; -public class RNSentryPackage implements ReactPackage { - public RNSentryPackage() { - } +public class RNSentryPackage extends TurboReactPackage { - @Override - public List createNativeModules(ReactApplicationContext reactContext) { - return Arrays.asList(new RNSentryModule(reactContext)); + @Nullable + @Override + public NativeModule getModule(String name, ReactApplicationContext reactContext) { + if (name.equals(RNSentryModuleImpl.NAME)) { + return new RNSentryModule(reactContext); + } else { + return null; } + } - public List> createJSModules() { - return Collections.emptyList(); - } + @Override + public ReactModuleInfoProvider getReactModuleInfoProvider() { + return () -> { + final Map moduleInfos = new HashMap<>(); + boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + moduleInfos.put( + RNSentryModuleImpl.NAME, + new ReactModuleInfo( + RNSentryModuleImpl.NAME, + RNSentryModuleImpl.NAME, + false, // canOverrideExistingModule + false, // needsEagerInit + true, // hasConstants + false, // isCxxModule + isTurboModule // isTurboModule + )); + return moduleInfos; + }; + } - @Override - public List createViewManagers(ReactApplicationContext reactContext) { - return Collections.emptyList(); - } } diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java new file mode 100644 index 0000000000..cb442c5afc --- /dev/null +++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java @@ -0,0 +1,109 @@ +package io.sentry.react; + +import androidx.annotation.NonNull; + +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.bridge.Promise; + +public class RNSentryModule extends NativeRNSentrySpec { + + private final RNSentryModuleImpl impl; + + RNSentryModule(ReactApplicationContext reactContext) { + super(reactContext); + this.impl = new RNSentryModuleImpl(reactContext); + } + + @Override + @NonNull + public String getName() { + return RNSentryModuleImpl.NAME; + } + + @Override + public void initNativeSdk(final ReadableMap rnOptions, Promise promise) { + this.impl.initNativeSdk(rnOptions, promise); + } + + @Override + public void crash() { + this.impl.crash(); + } + + @Override + public void fetchNativeRelease(Promise promise) { + this.impl.fetchNativeRelease(promise); + } + + @Override + public void fetchNativeAppStart(Promise promise) { + this.impl.fetchNativeAppStart(promise); + } + + @Override + public void fetchNativeFrames(Promise promise) { + this.impl.fetchNativeFrames(promise); + } + + @Override + public void captureEnvelope(ReadableArray rawBytes, ReadableMap options, Promise promise) { + this.impl.captureEnvelope(rawBytes, options, promise); + } + + @Override + public void setUser(final ReadableMap user, final ReadableMap otherUserKeys) { + this.impl.setUser(user, otherUserKeys); + } + + @Override + public void addBreadcrumb(final ReadableMap breadcrumb) { + this.impl.addBreadcrumb(breadcrumb); + } + + @Override + public void clearBreadcrumbs() { + this.impl.clearBreadcrumbs(); + } + + @Override + public void setExtra(String key, String extra) { + this.impl.setExtra(key, extra); + } + + @Override + public void setContext(final String key, final ReadableMap context) { + this.impl.setContext(key, context); + } + + @Override + public void setTag(String key, String value) { + this.impl.setTag(key, value); + } + + @Override + public void closeNativeSdk(Promise promise) { + this.impl.closeNativeSdk(promise); + } + + @Override + public void enableNativeFramesTracking() { + this.impl.enableNativeFramesTracking(); + } + + @Override + public void disableNativeFramesTracking() { + this.impl.disableNativeFramesTracking(); + } + + @Override + public void fetchNativeDeviceContexts(Promise promise) { + // Not used on android + } + + @Override + public void fetchNativeSdkInfo(Promise promise) { + // Not used on android + } +} diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java new file mode 100644 index 0000000000..172a2dc3eb --- /dev/null +++ b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java @@ -0,0 +1,109 @@ +package io.sentry.react; + +import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.bridge.Promise; +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.bridge.ReactContext; +import com.facebook.react.bridge.ReactContextBaseJavaModule; +import com.facebook.react.bridge.ReactMethod; + +public class RNSentryModule extends ReactContextBaseJavaModule { + + private final RNSentryModuleImpl impl; + + RNSentryModule(ReactApplicationContext reactContext) { + super(reactContext); + this.impl = new RNSentryModuleImpl(reactContext); + } + + @Override + public String getName() { + return RNSentryModuleImpl.NAME; + } + + @ReactMethod + public void initNativeSdk(final ReadableMap rnOptions, Promise promise) { + this.impl.initNativeSdk(rnOptions, promise); + } + + @ReactMethod + public void crash() { + this.impl.crash(); + } + + @ReactMethod + public void fetchNativeRelease(Promise promise) { + this.impl.fetchNativeRelease(promise); + } + + @ReactMethod + public void fetchNativeAppStart(Promise promise) { + this.impl.fetchNativeAppStart(promise); + } + + @ReactMethod + public void fetchNativeFrames(Promise promise) { + this.impl.fetchNativeFrames(promise); + } + + @ReactMethod + public void captureEnvelope(ReadableArray rawBytes, ReadableMap options, Promise promise) { + this.impl.captureEnvelope(rawBytes, options, promise); + } + + @ReactMethod + public void setUser(final ReadableMap user, final ReadableMap otherUserKeys) { + this.impl.setUser(user, otherUserKeys); + } + + @ReactMethod + public void addBreadcrumb(final ReadableMap breadcrumb) { + this.impl.addBreadcrumb(breadcrumb); + } + + @ReactMethod + public void clearBreadcrumbs() { + this.impl.clearBreadcrumbs(); + } + + @ReactMethod + public void setExtra(String key, String extra) { + this.impl.setExtra(key, extra); + } + + @ReactMethod + public void setContext(final String key, final ReadableMap context) { + this.impl.setContext(key, context); + } + + @ReactMethod + public void setTag(String key, String value) { + this.impl.setTag(key, value); + } + + @ReactMethod + public void closeNativeSdk(Promise promise) { + this.impl.closeNativeSdk(promise); + } + + @ReactMethod + public void enableNativeFramesTracking() { + this.impl.enableNativeFramesTracking(); + } + + @ReactMethod + public void disableNativeFramesTracking() { + this.impl.disableNativeFramesTracking(); + } + + @ReactMethod + public void fetchNativeDeviceContexts(Promise promise) { + // Not used on android + } + + @ReactMethod + public void fetchNativeSdkInfo(Promise promise) { + // Not used on android + } +} diff --git a/ios/RNSentry.m b/ios/RNSentry.mm similarity index 96% rename from ios/RNSentry.m rename to ios/RNSentry.mm index 6cd9db26f4..65b2708515 100644 --- a/ios/RNSentry.m +++ b/ios/RNSentry.mm @@ -9,6 +9,11 @@ #import #import +// Thanks to this guard, we won't import this header when we build for the old architecture. +#ifdef RCT_NEW_ARCH_ENABLED +#import "RNSentrySpec.h" +#endif + @interface SentryTraceContext : NSObject - (nullable instancetype)initWithDict:(NSDictionary *)dictionary; @end @@ -39,7 +44,6 @@ + (BOOL)requiresMainQueueSetup { RCT_EXPORT_MODULE() - RCT_EXPORT_METHOD(initNativeSdk:(NSDictionary *_Nonnull)options resolve:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) @@ -411,4 +415,13 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event // the 'tracesSampleRate' or 'tracesSampler' option. } +// Thanks to this guard, we won't compile this code when we build for the old architecture. +#ifdef RCT_NEW_ARCH_ENABLED +- (std::shared_ptr)getTurboModule: + (const facebook::react::ObjCTurboModule::InitParams &)params +{ + return std::make_shared(params); +} +#endif + @end diff --git a/package.json b/package.json index 5d2be59211..2991053def 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@sentry/react-native", "homepage": "https://github.com/getsentry/sentry-react-native", "repository": "https://github.com/getsentry/sentry-react-native", - "version": "4.6.1", + "version": "5.0.0-alpha.6", "description": "Official Sentry SDK for react-native", "typings": "dist/js/index.d.ts", "types": "dist/js/index.d.ts", @@ -36,8 +36,8 @@ "When bumping make sure to update the version of react, i.e: https://github.com/facebook/react-native/blob/v0.56.0/package.json" ], "peerDependencies": { - "react": ">=16.4.1", - "react-native": ">=0.56.0" + "react": ">=17.0.0", + "react-native": ">=0.70.0" }, "dependencies": { "@sentry/browser": "7.15.0", @@ -48,50 +48,40 @@ "@sentry/react": "7.15.0", "@sentry/tracing": "7.15.0", "@sentry/types": "7.15.0", - "@sentry/utils": "7.15.0", - "@sentry/wizard": "1.2.17" + "@sentry/utils": "7.15.0" }, "devDependencies": { "@sentry-internal/eslint-config-sdk": "7.15.0", "@sentry-internal/eslint-plugin-sdk": "7.15.0", "@sentry/typescript": "^5.20.1", + "@sentry/wizard": "2.2.0", "@types/jest": "^26.0.15", - "@types/react": "^16.9.49", - "@types/react-native": "^0.66.11", + "@types/react": "^18", + "@types/react-native": "^0.70.0", "babel-jest": "^26.1.0", "eslint": "^7.6.0", "eslint-plugin-react": "^7.20.6", "eslint-plugin-react-native": "^3.8.1", "jest": "^24.9.0", "prettier": "^2.0.5", - "react": ">=16.4.1", - "react-native": ">=0.56.0", + "react": "^18", + "react-native": "^0.70.0", "replace-in-file": "^6.0.0", "rimraf": "^3.0.0", "ts-jest": "^24.3.0", "typescript": "3.8.3" }, "rnpm": { - "commands": { - "postlink": "node node_modules/@sentry/wizard/dist/bin.js -i reactNative -p ios android", - "postunlink": "node node_modules/@sentry/wizard/dist/bin.js -i reactNative -p ios android --uninstall" - }, + "commands": {}, "android": { - "packageInstance": "new RNSentryPackage()" + "packageInstance": "new RNSentryPackage()", + "packageImportPath": "import io.sentry.react.RNSentryPackage;" }, - "ios": { - "sharedLibraries": [ - "libz" - ] - } + "ios": {} }, "jest": { "collectCoverage": true, "preset": "react-native", - "transform": { - "^.+\\.(tsx)$": "/node_modules/react-native/jest/preprocessor.js", - "^.+\\.(ts|tsx)$": "ts-jest" - }, "globals": { "__DEV__": true, "ts-jest": { @@ -111,5 +101,13 @@ "testMatch": [ "**/*.test.(ts|tsx)" ] + }, + "codegenConfig": { + "name": "RNSentrySpec", + "type": "modules", + "jsSrcsDir": "src", + "android": { + "javaPackageName": "io.sentry.react" + } } } diff --git a/react-native.config.js b/react-native.config.js index f85fa01beb..d307073e1a 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -1,18 +1,11 @@ module.exports = { dependency: { platforms: { - ios: { - sharedLibraries: ['libz'] - }, + ios: {}, android: { - packageInstance: 'new RNSentryPackage()' + packageInstance: 'new RNSentryPackage()', + packageImportPath: 'import io.sentry.react.RNSentryPackage;' } - }, - hooks: { - postlink: - 'node node_modules/@sentry/wizard/dist/bin.js -i reactNative -p ios android', - postunlink: - 'node node_modules/@sentry/wizard/dist/bin.js -i reactNative -p ios android --uninstall' } } }; diff --git a/sample-new-architecture/.buckconfig b/sample-new-architecture/.buckconfig new file mode 100644 index 0000000000..934256cb29 --- /dev/null +++ b/sample-new-architecture/.buckconfig @@ -0,0 +1,6 @@ + +[android] + target = Google Inc.:Google APIs:23 + +[maven_repositories] + central = https://repo1.maven.org/maven2 diff --git a/sample-new-architecture/.eslintrc.js b/sample-new-architecture/.eslintrc.js new file mode 100644 index 0000000000..3d4d370fc5 --- /dev/null +++ b/sample-new-architecture/.eslintrc.js @@ -0,0 +1,17 @@ +module.exports = { + root: true, + extends: '@react-native-community', + parser: '@typescript-eslint/parser', + plugins: ['@typescript-eslint'], + overrides: [ + { + files: ['*.ts', '*.tsx'], + rules: { + '@typescript-eslint/no-shadow': ['error'], + 'no-shadow': 'off', + 'no-undef': 'off', + quotes: [2, 'single', { avoidEscape: true }], + }, + }, + ], +}; diff --git a/sample-new-architecture/.gitignore b/sample-new-architecture/.gitignore new file mode 100644 index 0000000000..2423126f72 --- /dev/null +++ b/sample-new-architecture/.gitignore @@ -0,0 +1,64 @@ +# OSX +# +.DS_Store + +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +ios/.xcode.env.local + +# Android/IntelliJ +# +build/ +.idea +.gradle +local.properties +*.iml +*.hprof +.cxx/ + +# node.js +# +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 +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/ + +**/fastlane/report.xml +**/fastlane/Preview.html +**/fastlane/screenshots +**/fastlane/test_output + +# Bundle artifact +*.jsbundle + +# Ruby / CocoaPods +/ios/Pods/ +/vendor/bundle/ diff --git a/sample-new-architecture/.prettierrc.js b/sample-new-architecture/.prettierrc.js new file mode 100644 index 0000000000..2ae7b381ed --- /dev/null +++ b/sample-new-architecture/.prettierrc.js @@ -0,0 +1,7 @@ +module.exports = { + arrowParens: 'avoid', + bracketSameLine: true, + bracketSpacing: true, + singleQuote: true, + trailingComma: 'all', +}; diff --git a/sample-new-architecture/.watchmanconfig b/sample-new-architecture/.watchmanconfig new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/sample-new-architecture/.watchmanconfig @@ -0,0 +1 @@ +{} diff --git a/sample-new-architecture/Gemfile b/sample-new-architecture/Gemfile new file mode 100644 index 0000000000..99d5919539 --- /dev/null +++ b/sample-new-architecture/Gemfile @@ -0,0 +1,6 @@ +source 'https://rubygems.org' + +# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version +ruby '2.7.6' + +gem 'cocoapods', '~> 1.11', '>= 1.11.2' diff --git a/sample-new-architecture/Gemfile.lock b/sample-new-architecture/Gemfile.lock new file mode 100644 index 0000000000..51bf55aa63 --- /dev/null +++ b/sample-new-architecture/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.15.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.2) + minitest (5.16.3) + 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.1) + +PLATFORMS + arm64-darwin-21 + +DEPENDENCIES + cocoapods (~> 1.11, >= 1.11.2) + +RUBY VERSION + ruby 2.7.6p219 + +BUNDLED WITH + 2.3.11 diff --git a/sample-new-architecture/__tests__/App-test.tsx b/sample-new-architecture/__tests__/App-test.tsx new file mode 100644 index 0000000000..827cbb6696 --- /dev/null +++ b/sample-new-architecture/__tests__/App-test.tsx @@ -0,0 +1,13 @@ +/** + * @format + */ + +import 'react-native'; +import React from 'react'; + +// Note: test renderer must be required after react-native. +import renderer from 'react-test-renderer'; + +it('dummy test', () => { + renderer.create(
); +}); diff --git a/sample-new-architecture/_bundle/config b/sample-new-architecture/_bundle/config new file mode 100644 index 0000000000..848943bb52 --- /dev/null +++ b/sample-new-architecture/_bundle/config @@ -0,0 +1,2 @@ +BUNDLE_PATH: "vendor/bundle" +BUNDLE_FORCE_RUBY_PLATFORM: 1 diff --git a/sample-new-architecture/_node-version b/sample-new-architecture/_node-version new file mode 100644 index 0000000000..8351c19397 --- /dev/null +++ b/sample-new-architecture/_node-version @@ -0,0 +1 @@ +14 diff --git a/sample-new-architecture/_ruby-version b/sample-new-architecture/_ruby-version new file mode 100644 index 0000000000..49cdd668e1 --- /dev/null +++ b/sample-new-architecture/_ruby-version @@ -0,0 +1 @@ +2.7.6 diff --git a/sample-new-architecture/android/app/_BUCK b/sample-new-architecture/android/app/_BUCK new file mode 100644 index 0000000000..bb06f87121 --- /dev/null +++ b/sample-new-architecture/android/app/_BUCK @@ -0,0 +1,55 @@ +# 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.samplenewarchitecture", +) + +android_resource( + name = "res", + package = "com.samplenewarchitecture", + res = "src/main/res", +) + +android_binary( + name = "app", + keystore = "//android/keystores:debug", + manifest = "src/main/AndroidManifest.xml", + package_type = "debug", + deps = [ + ":app-code", + ], +) diff --git a/sample-new-architecture/android/app/build.gradle b/sample-new-architecture/android/app/build.gradle new file mode 100644 index 0000000000..172e693e21 --- /dev/null +++ b/sample-new-architecture/android/app/build.gradle @@ -0,0 +1,324 @@ +apply plugin: "com.android.application" + +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 +] + +apply from: "../../node_modules/react-native/react.gradle" +apply from: "../../../sentry.gradle" + +/** + * 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. + */ +def enableSeparateBuildPerCPUArchitecture = false + +/** + * Run Proguard to shrink the Java bytecode in release builds. + */ +def enableProguardInReleaseBuilds = false + +/** + * The preferred build flavor of JavaScriptCore. + * + * 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 + * 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. + */ +def reactNativeArchitectures() { + def value = project.getProperties().get("reactNativeArchitectures") + return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] +} + +android { + ndkVersion rootProject.ext.ndkVersion + + compileSdkVersion rootProject.ext.compileSdkVersion + + defaultConfig { + applicationId "com.samplenewarchitecture" + 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 { + abi { + reset() + enable enableSeparateBuildPerCPUArchitecture + universalApk false // If true, also generate a universal APK + include (*reactNativeArchitectures()) + } + } + signingConfigs { + debug { + storeFile file('debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + } + buildTypes { + debug { + signingConfig signingConfigs.debug + } + release { + // Caution! In production, you need to generate your own keystore file. + // see https://reactnative.dev/docs/signed-apk-android. + signingConfig signingConfigs.debug + minifyEnabled enableProguardInReleaseBuilds + proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" + } + } + + sourceSets.main { + java { + // RNSentry. + srcDirs += [ + "../../android/app/src/main", + ] + } + } + + // applicationVariants are e.g. debug, release + applicationVariants.all { variant -> + variant.outputs.each { output -> + // For each separate APK per architecture, set a unique version code as described here: + // https://developer.android.com/studio/build/configure-apk-splits.html + // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. + def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] + def abi = output.getFilter(OutputFile.ABI) + if (abi != null) { // null for the universal-debug, universal-release variants + output.versionCodeOverride = + defaultConfig.versionCode * 1000 + versionCodes.get(abi) + } + + } + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + + //noinspection GradleDynamicVersion + implementation "com.facebook.react:react-native:+" // From node_modules + + implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" + implementation project(path: ':sentry_react-native') + + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { + exclude group:'com.facebook.fbjni' + } + + 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' + } + } 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" +} diff --git a/sample-new-architecture/android/app/build_defs.bzl b/sample-new-architecture/android/app/build_defs.bzl new file mode 100644 index 0000000000..fff270f8d1 --- /dev/null +++ b/sample-new-architecture/android/app/build_defs.bzl @@ -0,0 +1,19 @@ +"""Helper definitions to glob .aar and .jar targets""" + +def create_aar_targets(aarfiles): + for aarfile in aarfiles: + name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")] + lib_deps.append(":" + name) + android_prebuilt_aar( + name = name, + aar = aarfile, + ) + +def create_jar_targets(jarfiles): + for jarfile in jarfiles: + name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")] + lib_deps.append(":" + name) + prebuilt_jar( + name = name, + binary_jar = jarfile, + ) diff --git a/sample-new-architecture/android/app/debug.keystore b/sample-new-architecture/android/app/debug.keystore new file mode 100644 index 0000000000..364e105ed3 Binary files /dev/null and b/sample-new-architecture/android/app/debug.keystore differ diff --git a/sample-new-architecture/android/app/proguard-rules.pro b/sample-new-architecture/android/app/proguard-rules.pro new file mode 100644 index 0000000000..11b025724a --- /dev/null +++ b/sample-new-architecture/android/app/proguard-rules.pro @@ -0,0 +1,10 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: diff --git a/sample-new-architecture/android/app/src/debug/AndroidManifest.xml b/sample-new-architecture/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000000..4b185bc159 --- /dev/null +++ b/sample-new-architecture/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sample-new-architecture/android/app/src/debug/java/com/samplenewarchitecture/ReactNativeFlipper.java b/sample-new-architecture/android/app/src/debug/java/com/samplenewarchitecture/ReactNativeFlipper.java new file mode 100644 index 0000000000..64df06e65b --- /dev/null +++ b/sample-new-architecture/android/app/src/debug/java/com/samplenewarchitecture/ReactNativeFlipper.java @@ -0,0 +1,73 @@ +/** + * 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.samplenewarchitecture; + +import android.content.Context; +import com.facebook.flipper.android.AndroidFlipperClient; +import com.facebook.flipper.android.utils.FlipperUtils; +import com.facebook.flipper.core.FlipperClient; +import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin; +import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin; +import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin; +import com.facebook.flipper.plugins.inspector.DescriptorMapping; +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; +import com.facebook.react.bridge.ReactContext; +import com.facebook.react.modules.network.NetworkingModule; +import okhttp3.OkHttpClient; + +public class ReactNativeFlipper { + public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { + if (FlipperUtils.shouldEnableFlipper(context)) { + final FlipperClient client = AndroidFlipperClient.getInstance(context); + + client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults())); + client.addPlugin(new ReactFlipperPlugin()); + client.addPlugin(new DatabasesFlipperPlugin(context)); + client.addPlugin(new SharedPreferencesFlipperPlugin(context)); + client.addPlugin(CrashReporterPlugin.getInstance()); + + NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin(); + NetworkingModule.setCustomClientBuilder( + new NetworkingModule.CustomClientBuilder() { + @Override + public void apply(OkHttpClient.Builder builder) { + builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin)); + } + }); + client.addPlugin(networkFlipperPlugin); + client.start(); + + // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized + // Hence we run if after all native modules have been initialized + ReactContext reactContext = reactInstanceManager.getCurrentReactContext(); + if (reactContext == null) { + reactInstanceManager.addReactInstanceEventListener( + new ReactInstanceEventListener() { + @Override + public void onReactContextInitialized(ReactContext reactContext) { + reactInstanceManager.removeReactInstanceEventListener(this); + reactContext.runOnNativeModulesQueueThread( + new Runnable() { + @Override + public void run() { + client.addPlugin(new FrescoFlipperPlugin()); + } + }); + } + }); + } else { + client.addPlugin(new FrescoFlipperPlugin()); + } + } + } +} diff --git a/sample-new-architecture/android/app/src/main/AndroidManifest.xml b/sample-new-architecture/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..ba9f274480 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + diff --git a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainActivity.java b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainActivity.java new file mode 100644 index 0000000000..d8e9f2895f --- /dev/null +++ b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainActivity.java @@ -0,0 +1,54 @@ +package com.samplenewarchitecture; + +import android.os.Bundle; +import com.facebook.react.ReactActivity; +import com.facebook.react.ReactActivityDelegate; +import com.facebook.react.ReactRootView; + +public class MainActivity extends ReactActivity { + + /** + * Returns the name of the main component registered from JavaScript. This is used to schedule + * rendering of the component. + */ + @Override + protected String getMainComponentName() { + return "sampleNewArchitecture"; + } + + /** + * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and + * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer + * (Paper). + */ + @Override + protected ReactActivityDelegate createReactActivityDelegate() { + return new MainActivityDelegate(this, getMainComponentName()); + } + + public static class MainActivityDelegate extends ReactActivityDelegate { + public MainActivityDelegate(ReactActivity activity, String mainComponentName) { + super(activity, mainComponentName); + } + + @Override + protected ReactRootView createRootView() { + ReactRootView reactRootView = new ReactRootView(getContext()); + // If you opted-in for the New Architecture, we enable the Fabric Renderer. + reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED); + return reactRootView; + } + + @Override + protected boolean isConcurrentRootEnabled() { + // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18). + // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html + return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + } + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(null); + } +} diff --git a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java new file mode 100644 index 0000000000..f086074bc5 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java @@ -0,0 +1,100 @@ +package com.samplenewarchitecture; + +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.soloader.SoLoader; +import com.samplenewarchitecture.newarchitecture.MainApplicationReactNativeHost; +import java.lang.reflect.InvocationTargetException; +import java.util.List; + +import io.sentry.react.RNSentryPackage; + +public class MainApplication extends Application implements ReactApplication { + + private final ReactNativeHost mReactNativeHost = + new ReactNativeHost(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()); + for (ReactPackage pkg : packages) { + if (pkg instanceof RNSentryPackage) { + return packages; + } + } + + packages.add(new RNSentryPackage()); + return packages; + } + + @Override + protected String getJSMainModuleName() { + return "index"; + } + }; + + private final ReactNativeHost mNewArchitectureNativeHost = + new MainApplicationReactNativeHost(this); + + @Override + public ReactNativeHost getReactNativeHost() { + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + return mNewArchitectureNativeHost; + } else { + return mReactNativeHost; + } + } + + @Override + public void onCreate() { + super.onCreate(); + // If you opted-in for the New Architecture, we enable the TurboModule system + ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + SoLoader.init(this, /* native exopackage */ false); + initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); + } + + /** + * 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.samplenewarchitecture.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(); + } + } + } +} diff --git a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/MainApplicationReactNativeHost.java b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/MainApplicationReactNativeHost.java new file mode 100644 index 0000000000..3b107dcf43 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/MainApplicationReactNativeHost.java @@ -0,0 +1,124 @@ +package com.samplenewarchitecture.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.samplenewarchitecture.BuildConfig; +import com.samplenewarchitecture.newarchitecture.components.MainComponentsRegistry; +import com.samplenewarchitecture.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; +import java.util.ArrayList; +import java.util.List; + +import io.sentry.react.RNSentryPackage; + +/** + * 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. + for (ReactPackage pkg : packages) { + if (pkg instanceof RNSentryPackage) { + return packages; + } + } + packages.add(new RNSentryPackage()); + return packages; + } + + @Override + protected String getJSMainModuleName() { + return "index"; + } + + @NonNull + @Override + protected ReactPackageTurboModuleManagerDelegate.Builder + getReactPackageTurboModuleManagerDelegateBuilder() { + // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary + // for the new architecture and to use TurboModules correctly. + return new MainApplicationTurboModuleManagerDelegate.Builder(); + } + + @Override + protected JSIModulePackage getJSIModulePackage() { + return new JSIModulePackage() { + @Override + public List getJSIModules( + final ReactApplicationContext reactApplicationContext, + final JavaScriptContextHolder jsContext) { + final List specs = new ArrayList<>(); + + // Here we provide a new JSIModuleSpec that will be responsible of providing the + // custom Fabric Components. + specs.add( + new JSIModuleSpec() { + @Override + public JSIModuleType getJSIModuleType() { + return JSIModuleType.UIManager; + } + + @Override + public JSIModuleProvider getJSIModuleProvider() { + final ComponentFactory componentFactory = new ComponentFactory(); + CoreComponentsRegistry.register(componentFactory); + + // Here we register a Components Registry. + // The one that is generated with the template contains no components + // and just provides you the one from React Native core. + MainComponentsRegistry.register(componentFactory); + + final ReactInstanceManager reactInstanceManager = getReactInstanceManager(); + + ViewManagerRegistry viewManagerRegistry = + new ViewManagerRegistry( + reactInstanceManager.getOrCreateViewManagers(reactApplicationContext)); + + return new FabricJSIModuleProvider( + reactApplicationContext, + componentFactory, + ReactNativeConfig.DEFAULT_CONFIG, + viewManagerRegistry); + } + }); + return specs; + } + }; + } +} diff --git a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/components/MainComponentsRegistry.java b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/components/MainComponentsRegistry.java new file mode 100644 index 0000000000..e4e294306e --- /dev/null +++ b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/components/MainComponentsRegistry.java @@ -0,0 +1,36 @@ +package com.samplenewarchitecture.newarchitecture.components; + +import com.facebook.jni.HybridData; +import com.facebook.proguard.annotations.DoNotStrip; +import com.facebook.react.fabric.ComponentFactory; +import com.facebook.soloader.SoLoader; + +/** + * Class responsible to load the custom Fabric Components. This class has native methods and needs a + * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ + * folder for you). + * + *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the + * `newArchEnabled` property). Is ignored otherwise. + */ +@DoNotStrip +public class MainComponentsRegistry { + static { + SoLoader.loadLibrary("fabricjni"); + } + + @DoNotStrip private final HybridData mHybridData; + + @DoNotStrip + private native HybridData initHybrid(ComponentFactory componentFactory); + + @DoNotStrip + private MainComponentsRegistry(ComponentFactory componentFactory) { + mHybridData = initHybrid(componentFactory); + } + + @DoNotStrip + public static MainComponentsRegistry register(ComponentFactory componentFactory) { + return new MainComponentsRegistry(componentFactory); + } +} diff --git a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java new file mode 100644 index 0000000000..7406f8d7ed --- /dev/null +++ b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java @@ -0,0 +1,48 @@ +package com.samplenewarchitecture.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("samplenewarchitecture_appmodules"); + sIsSoLibraryLoaded = true; + } + } +} diff --git a/sample-new-architecture/android/app/src/main/jni/CMakeLists.txt b/sample-new-architecture/android/app/src/main/jni/CMakeLists.txt new file mode 100644 index 0000000000..702d7f14bd --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 3.13) + +# Define the library name here. +project(samplenewarchitecture_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) + +# Manual linking should be done after the build as otherwise +# it fails on linking a library that is not build byt the application +add_subdirectory(${NODE_MODULES_DIR}/../../android/build/generated/source/codegen/jni/ rnsentry_build) + +# sample-new-architecture needs to link against the rn_sentry turbo module +target_link_libraries(${CMAKE_PROJECT_NAME} + react_codegen_RNSentrySpec) diff --git a/sample-new-architecture/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/sample-new-architecture/android/app/src/main/jni/MainApplicationModuleProvider.cpp new file mode 100644 index 0000000000..d57183b668 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/MainApplicationModuleProvider.cpp @@ -0,0 +1,39 @@ +#include "MainApplicationModuleProvider.h" + +#include +#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; + } + + auto rnsentry_module = RNSentrySpec_ModuleProvider(moduleName, params); + if (rnsentry_module != nullptr) + { + return rnsentry_module; + } + + return rncore_ModuleProvider(moduleName, params); +} + +} // namespace react +} // namespace facebook diff --git a/sample-new-architecture/android/app/src/main/jni/MainApplicationModuleProvider.h b/sample-new-architecture/android/app/src/main/jni/MainApplicationModuleProvider.h new file mode 100644 index 0000000000..b38ccf53fd --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/MainApplicationModuleProvider.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include + +#include + +namespace facebook { +namespace react { + +std::shared_ptr MainApplicationModuleProvider( + const std::string &moduleName, + const JavaTurboModule::InitParams ¶ms); + +} // namespace react +} // namespace facebook diff --git a/sample-new-architecture/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/sample-new-architecture/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp new file mode 100644 index 0000000000..5fd688c509 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp @@ -0,0 +1,45 @@ +#include "MainApplicationTurboModuleManagerDelegate.h" +#include "MainApplicationModuleProvider.h" + +namespace facebook { +namespace react { + +jni::local_ref +MainApplicationTurboModuleManagerDelegate::initHybrid( + jni::alias_ref) { + return makeCxxInstance(); +} + +void MainApplicationTurboModuleManagerDelegate::registerNatives() { + registerHybrid({ + makeNativeMethod( + "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid), + makeNativeMethod( + "canCreateTurboModule", + MainApplicationTurboModuleManagerDelegate::canCreateTurboModule), + }); +} + +std::shared_ptr +MainApplicationTurboModuleManagerDelegate::getTurboModule( + const std::string &name, + const std::shared_ptr &jsInvoker) { + // Not implemented yet: provide pure-C++ NativeModules here. + return nullptr; +} + +std::shared_ptr +MainApplicationTurboModuleManagerDelegate::getTurboModule( + const std::string &name, + const JavaTurboModule::InitParams ¶ms) { + return MainApplicationModuleProvider(name, params); +} + +bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule( + const std::string &name) { + return getTurboModule(name, nullptr) != nullptr || + getTurboModule(name, {.moduleName = name}) != nullptr; +} + +} // namespace react +} // namespace facebook diff --git a/sample-new-architecture/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/sample-new-architecture/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h new file mode 100644 index 0000000000..8c6ab5c303 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h @@ -0,0 +1,38 @@ +#include +#include + +#include +#include + +namespace facebook { +namespace react { + +class MainApplicationTurboModuleManagerDelegate + : public jni::HybridClass< + MainApplicationTurboModuleManagerDelegate, + TurboModuleManagerDelegate> { + public: + // Adapt it to the package you used for your Java class. + static constexpr auto kJavaDescriptor = + "Lcom/samplenewarchitecture/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 diff --git a/sample-new-architecture/android/app/src/main/jni/MainComponentsRegistry.cpp b/sample-new-architecture/android/app/src/main/jni/MainComponentsRegistry.cpp new file mode 100644 index 0000000000..54f598a486 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/MainComponentsRegistry.cpp @@ -0,0 +1,65 @@ +#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 diff --git a/sample-new-architecture/android/app/src/main/jni/MainComponentsRegistry.h b/sample-new-architecture/android/app/src/main/jni/MainComponentsRegistry.h new file mode 100644 index 0000000000..2ee57ea04c --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/MainComponentsRegistry.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include +#include +#include + +namespace facebook { +namespace react { + +class MainComponentsRegistry + : public facebook::jni::HybridClass { + public: + // Adapt it to the package you used for your Java class. + constexpr static auto kJavaDescriptor = + "Lcom/samplenewarchitecture/newarchitecture/components/MainComponentsRegistry;"; + + static void registerNatives(); + + MainComponentsRegistry(ComponentFactory *delegate); + + private: + static std::shared_ptr + sharedProviderRegistry(); + + static jni::local_ref initHybrid( + jni::alias_ref, + ComponentFactory *delegate); +}; + +} // namespace react +} // namespace facebook diff --git a/sample-new-architecture/android/app/src/main/jni/OnLoad.cpp b/sample-new-architecture/android/app/src/main/jni/OnLoad.cpp new file mode 100644 index 0000000000..c569b6e865 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/jni/OnLoad.cpp @@ -0,0 +1,11 @@ +#include +#include "MainApplicationTurboModuleManagerDelegate.h" +#include "MainComponentsRegistry.h" + +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { + return facebook::jni::initialize(vm, [] { + facebook::react::MainApplicationTurboModuleManagerDelegate:: + registerNatives(); + facebook::react::MainComponentsRegistry::registerNatives(); + }); +} diff --git a/sample-new-architecture/android/app/src/main/res/drawable/rn_edit_text_material.xml b/sample-new-architecture/android/app/src/main/res/drawable/rn_edit_text_material.xml new file mode 100644 index 0000000000..f35d996202 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/sample-new-architecture/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000..a2f5908281 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/sample-new-architecture/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000..1b52399808 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/sample-new-architecture/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000..ff10afd6e1 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/sample-new-architecture/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000000..115a4c768a Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample-new-architecture/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000..dcd3cd8083 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/sample-new-architecture/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..459ca609d3 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample-new-architecture/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000..8ca12fe024 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/sample-new-architecture/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..8e19b410a1 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample-new-architecture/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000..b824ebdd48 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/sample-new-architecture/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/sample-new-architecture/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..4c19a13c23 Binary files /dev/null and b/sample-new-architecture/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/sample-new-architecture/android/app/src/main/res/values/strings.xml b/sample-new-architecture/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..08f35f8875 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + sampleNewArchitecture + diff --git a/sample-new-architecture/android/app/src/main/res/values/styles.xml b/sample-new-architecture/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000..7ba83a2ad5 --- /dev/null +++ b/sample-new-architecture/android/app/src/main/res/values/styles.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/sample-new-architecture/android/build.gradle b/sample-new-architecture/android/build.gradle new file mode 100644 index 0000000000..8569fee3a7 --- /dev/null +++ b/sample-new-architecture/android/build.gradle @@ -0,0 +1,51 @@ +// 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 + + 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" + } + } + 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") + // 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' } + } +} diff --git a/sample-new-architecture/android/gradle.properties b/sample-new-architecture/android/gradle.properties new file mode 100644 index 0000000000..aad9fe4755 --- /dev/null +++ b/sample-new-architecture/android/gradle.properties @@ -0,0 +1,40 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true + +# Version of flipper SDK to use with React Native +FLIPPER_VERSION=0.164.0 + +# Use this property to specify which architecture you want to build. +# You can also override it from the CLI using +# ./gradlew -PreactNativeArchitectures=x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 + +# Use this property to enable support to the new architecture. +# This will allow you to use TurboModules and the Fabric render in +# 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 diff --git a/sample-new-architecture/android/gradle/wrapper/gradle-wrapper.jar b/sample-new-architecture/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..41d9927a4d Binary files /dev/null and b/sample-new-architecture/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sample-new-architecture/android/gradle/wrapper/gradle-wrapper.properties b/sample-new-architecture/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..8fad3f5a98 --- /dev/null +++ b/sample-new-architecture/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/sample-new-architecture/android/gradlew b/sample-new-architecture/android/gradlew new file mode 100755 index 0000000000..1b6c787337 --- /dev/null +++ b/sample-new-architecture/android/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/sample-new-architecture/android/gradlew.bat b/sample-new-architecture/android/gradlew.bat new file mode 100644 index 0000000000..ac1b06f938 --- /dev/null +++ b/sample-new-architecture/android/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/sample-new-architecture/android/sentry.properties b/sample-new-architecture/android/sentry.properties new file mode 100644 index 0000000000..0cdf170157 --- /dev/null +++ b/sample-new-architecture/android/sentry.properties @@ -0,0 +1,4 @@ +#defaults.url=https://sentry.io/ +defaults.org=sentry-sdks +defaults.project=sentry-react-native +#auth.token= diff --git a/sample-new-architecture/android/settings.gradle b/sample-new-architecture/android/settings.gradle new file mode 100644 index 0000000000..4dae1167ac --- /dev/null +++ b/sample-new-architecture/android/settings.gradle @@ -0,0 +1,13 @@ +rootProject.name = 'sampleNewArchitecture' +apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) +include ':app' +include ':sentry_react-native' +project(':sentry_react-native').projectDir = new File(rootProject.projectDir, '../../android') +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/sample-new-architecture/app.json b/sample-new-architecture/app.json new file mode 100644 index 0000000000..9f112deabc --- /dev/null +++ b/sample-new-architecture/app.json @@ -0,0 +1,4 @@ +{ + "name": "sampleNewArchitecture", + "displayName": "sampleNewArchitecture" +} diff --git a/sample-new-architecture/babel.config.js b/sample-new-architecture/babel.config.js new file mode 100644 index 0000000000..232253cc31 --- /dev/null +++ b/sample-new-architecture/babel.config.js @@ -0,0 +1,13 @@ +module.exports = { + presets: ['module:metro-react-native-babel-preset'], + plugins: [ + [ + 'module-resolver', + { + alias: { + '@sentry/react-native': '../dist/js', + }, + }, + ], + ], +}; diff --git a/sample-new-architecture/index.js b/sample-new-architecture/index.js new file mode 100644 index 0000000000..e1dd8be539 --- /dev/null +++ b/sample-new-architecture/index.js @@ -0,0 +1,10 @@ +/** + * @format + */ + +import { AppRegistry } from 'react-native'; + +import App from './src/App'; +import { name as appName } from './app.json'; + +AppRegistry.registerComponent(appName, () => App); diff --git a/sample-new-architecture/ios/Podfile b/sample-new-architecture/ios/Podfile new file mode 100644 index 0000000000..843c46aa1e --- /dev/null +++ b/sample-new-architecture/ios/Podfile @@ -0,0 +1,47 @@ +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 + +target 'sampleNewArchitecture' 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 => 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.enabled(["Debug"], { 'Flipper' => '0.166.0' }), + # An absolute path to your application root. + :app_path => "#{Pod::Config.instance.installation_root}/.." + ) + + if !ENV['TEST'] + pod 'RNSentry', :path => '../../RNSentry.podspec' + end + + target 'sampleNewArchitectureTests' do + inherit! :complete + # Pods for testing + end + + post_install do |installer| + react_native_post_install( + installer, + # Set `mac_catalyst_enabled` to `true` in order to apply patches + # necessary for Mac Catalyst builds + :mac_catalyst_enabled => false + ) + __apply_Xcode_12_5_M1_post_install_workaround(installer) + end +end diff --git a/sample-new-architecture/ios/_xcode.env b/sample-new-architecture/ios/_xcode.env new file mode 100644 index 0000000000..3d5782c715 --- /dev/null +++ b/sample-new-architecture/ios/_xcode.env @@ -0,0 +1,11 @@ +# This `.xcode.env` file is versioned and is used to source the environment +# used when running script phases inside Xcode. +# To customize your local environment, you can create an `.xcode.env.local` +# file that is not versioned. + +# NODE_BINARY variable contains the PATH to the node executable. +# +# Customize the NODE_BINARY variable here. +# For example, to use nvm with brew, add the following line +# . "$(brew --prefix nvm)/nvm.sh" --no-use +export NODE_BINARY=$(command -v node) diff --git a/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..4f86570a3f --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj @@ -0,0 +1,717 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 00E356F31AD99517003FC87E /* sampleNewArchitectureTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* sampleNewArchitectureTests.m */; }; + 0C80B921A6F3F58F76C31292 /* libPods-sampleNewArchitecture.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-sampleNewArchitecture.a */; }; + 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; + 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; + 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 7699B88040F8A987B510C191 /* libPods-sampleNewArchitecture-sampleNewArchitectureTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-sampleNewArchitecture-sampleNewArchitectureTests.a */; }; + 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 13B07F861A680F5B00A75B9A; + remoteInfo = sampleNewArchitecture; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 00E356EE1AD99517003FC87E /* sampleNewArchitectureTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sampleNewArchitectureTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 00E356F21AD99517003FC87E /* sampleNewArchitectureTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = sampleNewArchitectureTests.m; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* sampleNewArchitecture.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sampleNewArchitecture.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = sampleNewArchitecture/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = sampleNewArchitecture/AppDelegate.mm; sourceTree = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = sampleNewArchitecture/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = sampleNewArchitecture/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = sampleNewArchitecture/main.m; sourceTree = ""; }; + 19F6CBCC0A4E27FBF8BF4A61 /* libPods-sampleNewArchitecture-sampleNewArchitectureTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sampleNewArchitecture-sampleNewArchitectureTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B4392A12AC88292D35C810B /* Pods-sampleNewArchitecture.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleNewArchitecture.debug.xcconfig"; path = "Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture.debug.xcconfig"; sourceTree = ""; }; + 5709B34CF0A7D63546082F79 /* Pods-sampleNewArchitecture.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleNewArchitecture.release.xcconfig"; path = "Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture.release.xcconfig"; sourceTree = ""; }; + 5B7EB9410499542E8C5724F5 /* Pods-sampleNewArchitecture-sampleNewArchitectureTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleNewArchitecture-sampleNewArchitectureTests.debug.xcconfig"; path = "Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests.debug.xcconfig"; sourceTree = ""; }; + 5DCACB8F33CDC322A6C60F78 /* libPods-sampleNewArchitecture.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sampleNewArchitecture.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = sampleNewArchitecture/LaunchScreen.storyboard; sourceTree = ""; }; + 89C6BE57DB24E9ADA2F236DE /* Pods-sampleNewArchitecture-sampleNewArchitectureTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sampleNewArchitecture-sampleNewArchitectureTests.release.xcconfig"; path = "Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests.release.xcconfig"; sourceTree = ""; }; + ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 00E356EB1AD99517003FC87E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7699B88040F8A987B510C191 /* libPods-sampleNewArchitecture-sampleNewArchitectureTests.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 13B07F8C1A680F5B00A75B9A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 0C80B921A6F3F58F76C31292 /* libPods-sampleNewArchitecture.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 00E356EF1AD99517003FC87E /* sampleNewArchitectureTests */ = { + isa = PBXGroup; + children = ( + 00E356F21AD99517003FC87E /* sampleNewArchitectureTests.m */, + 00E356F01AD99517003FC87E /* Supporting Files */, + ); + path = sampleNewArchitectureTests; + sourceTree = ""; + }; + 00E356F01AD99517003FC87E /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 00E356F11AD99517003FC87E /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 13B07FAE1A68108700A75B9A /* sampleNewArchitecture */ = { + isa = PBXGroup; + children = ( + 13B07FAF1A68108700A75B9A /* AppDelegate.h */, + 13B07FB01A68108700A75B9A /* AppDelegate.mm */, + 13B07FB51A68108700A75B9A /* Images.xcassets */, + 13B07FB61A68108700A75B9A /* Info.plist */, + 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */, + 13B07FB71A68108700A75B9A /* main.m */, + ); + name = sampleNewArchitecture; + sourceTree = ""; + }; + 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { + isa = PBXGroup; + children = ( + ED297162215061F000B7C4FE /* JavaScriptCore.framework */, + 5DCACB8F33CDC322A6C60F78 /* libPods-sampleNewArchitecture.a */, + 19F6CBCC0A4E27FBF8BF4A61 /* libPods-sampleNewArchitecture-sampleNewArchitectureTests.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + 832341AE1AAA6A7D00B99B32 /* Libraries */ = { + isa = PBXGroup; + children = ( + ); + name = Libraries; + sourceTree = ""; + }; + 83CBB9F61A601CBA00E9B192 = { + isa = PBXGroup; + children = ( + 13B07FAE1A68108700A75B9A /* sampleNewArchitecture */, + 832341AE1AAA6A7D00B99B32 /* Libraries */, + 00E356EF1AD99517003FC87E /* sampleNewArchitectureTests */, + 83CBBA001A601CBA00E9B192 /* Products */, + 2D16E6871FA4F8E400B85C8A /* Frameworks */, + BBD78D7AC51CEA395F1C20DB /* Pods */, + ); + indentWidth = 2; + sourceTree = ""; + tabWidth = 2; + usesTabs = 0; + }; + 83CBBA001A601CBA00E9B192 /* Products */ = { + isa = PBXGroup; + children = ( + 13B07F961A680F5B00A75B9A /* sampleNewArchitecture.app */, + 00E356EE1AD99517003FC87E /* sampleNewArchitectureTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + BBD78D7AC51CEA395F1C20DB /* Pods */ = { + isa = PBXGroup; + children = ( + 3B4392A12AC88292D35C810B /* Pods-sampleNewArchitecture.debug.xcconfig */, + 5709B34CF0A7D63546082F79 /* Pods-sampleNewArchitecture.release.xcconfig */, + 5B7EB9410499542E8C5724F5 /* Pods-sampleNewArchitecture-sampleNewArchitectureTests.debug.xcconfig */, + 89C6BE57DB24E9ADA2F236DE /* Pods-sampleNewArchitecture-sampleNewArchitectureTests.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 00E356ED1AD99517003FC87E /* sampleNewArchitectureTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "sampleNewArchitectureTests" */; + buildPhases = ( + A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */, + 00E356EA1AD99517003FC87E /* Sources */, + 00E356EB1AD99517003FC87E /* Frameworks */, + 00E356EC1AD99517003FC87E /* Resources */, + C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */, + F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + 00E356F51AD99517003FC87E /* PBXTargetDependency */, + ); + name = sampleNewArchitectureTests; + productName = sampleNewArchitectureTests; + productReference = 00E356EE1AD99517003FC87E /* sampleNewArchitectureTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 13B07F861A680F5B00A75B9A /* sampleNewArchitecture */ = { + isa = PBXNativeTarget; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "sampleNewArchitecture" */; + buildPhases = ( + C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */, + FD10A7F022414F080027D42C /* Start Packager */, + 13B07F871A680F5B00A75B9A /* Sources */, + 13B07F8C1A680F5B00A75B9A /* Frameworks */, + 13B07F8E1A680F5B00A75B9A /* Resources */, + 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, + 00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */, + E235C05ADACE081382539298 /* [CP] Copy Pods Resources */, + 8152B8B60F6641B996EA3E8F /* Upload Debug Symbols to Sentry */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = sampleNewArchitecture; + productName = sampleNewArchitecture; + productReference = 13B07F961A680F5B00A75B9A /* sampleNewArchitecture.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 83CBB9F71A601CBA00E9B192 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1210; + TargetAttributes = { + 00E356ED1AD99517003FC87E = { + CreatedOnToolsVersion = 6.2; + TestTargetID = 13B07F861A680F5B00A75B9A; + }; + 13B07F861A680F5B00A75B9A = { + LastSwiftMigration = 1120; + }; + }; + }; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "sampleNewArchitecture" */; + compatibilityVersion = "Xcode 12.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 83CBB9F61A601CBA00E9B192; + productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 13B07F861A680F5B00A75B9A /* sampleNewArchitecture */, + 00E356ED1AD99517003FC87E /* sampleNewArchitectureTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 00E356EC1AD99517003FC87E /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 13B07F8E1A680F5B00A75B9A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, + 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/.xcode.env.local", + "$(SRCROOT)/.xcode.env", + ); + name = "Bundle React Native code and images"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "export SENTRY_PROPERTIES=sentry.properties\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $DERIVED_FILE_DIR/main.jsbundle.map\"\nset -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT \\\"../../node_modules/@sentry/cli/bin/sentry-cli react-native xcode $REACT_NATIVE_XCODE\\\"\"\n"; + }; + 00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 8152B8B60F6641B996EA3E8F /* Upload Debug Symbols to Sentry */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Upload Debug Symbols to Sentry"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "export SENTRY_PROPERTIES=sentry.properties\n../../node_modules/@sentry/cli/bin/sentry-cli upload-dsym"; + }; + A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-sampleNewArchitecture-sampleNewArchitectureTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-sampleNewArchitecture-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture/Pods-sampleNewArchitecture-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sampleNewArchitecture-sampleNewArchitectureTests/Pods-sampleNewArchitecture-sampleNewArchitectureTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + FD10A7F022414F080027D42C /* Start Packager */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Start Packager"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 00E356EA1AD99517003FC87E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 00E356F31AD99517003FC87E /* sampleNewArchitectureTests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 13B07F871A680F5B00A75B9A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */, + 13B07FC11A68108700A75B9A /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 13B07F861A680F5B00A75B9A /* sampleNewArchitecture */; + targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 00E356F61AD99517003FC87E /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-sampleNewArchitecture-sampleNewArchitectureTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = sampleNewArchitectureTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "-ObjC", + "-lc++", + "$(inherited)", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/sampleNewArchitecture.app/sampleNewArchitecture"; + }; + name = Debug; + }; + 00E356F71AD99517003FC87E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-sampleNewArchitecture-sampleNewArchitectureTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + COPY_PHASE_STRIP = NO; + INFOPLIST_FILE = sampleNewArchitectureTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "-ObjC", + "-lc++", + "$(inherited)", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/sampleNewArchitecture.app/sampleNewArchitecture"; + }; + name = Release; + }; + 13B07F941A680F5B00A75B9A /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-sampleNewArchitecture.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = 1; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = sampleNewArchitecture/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-lc++", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = sampleNewArchitecture; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 13B07F951A680F5B00A75B9A /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-sampleNewArchitecture.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = 1; + INFOPLIST_FILE = sampleNewArchitecture/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-lc++", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = sampleNewArchitecture; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; + 83CBBA201A601CBA00E9B192 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "\"$(SDKROOT)/usr/lib/swift\"", + "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", + "\"$(inherited)\"", + ); + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-DFOLLY_NO_CONFIG", + "-DFOLLY_MOBILE=1", + "-DFOLLY_USE_LIBCPP=1", + ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 83CBBA211A601CBA00E9B192 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "\"$(SDKROOT)/usr/lib/swift\"", + "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", + "\"$(inherited)\"", + ); + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-DFOLLY_NO_CONFIG", + "-DFOLLY_MOBILE=1", + "-DFOLLY_USE_LIBCPP=1", + ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "sampleNewArchitectureTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 00E356F61AD99517003FC87E /* Debug */, + 00E356F71AD99517003FC87E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "sampleNewArchitecture" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 13B07F941A680F5B00A75B9A /* Debug */, + 13B07F951A680F5B00A75B9A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "sampleNewArchitecture" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 83CBBA201A601CBA00E9B192 /* Debug */, + 83CBBA211A601CBA00E9B192 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */; +} diff --git a/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/xcshareddata/xcschemes/sampleNewArchitecture.xcscheme b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/xcshareddata/xcschemes/sampleNewArchitecture.xcscheme new file mode 100644 index 0000000000..6fc2200769 --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/xcshareddata/xcschemes/sampleNewArchitecture.xcscheme @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample-new-architecture/ios/sampleNewArchitecture.xcworkspace/contents.xcworkspacedata b/sample-new-architecture/ios/sampleNewArchitecture.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..3f7d3abbdb --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/sample-new-architecture/ios/sampleNewArchitecture.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/sample-new-architecture/ios/sampleNewArchitecture.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/sample-new-architecture/ios/sampleNewArchitecture/AppDelegate.h b/sample-new-architecture/ios/sampleNewArchitecture/AppDelegate.h new file mode 100644 index 0000000000..ef1de86a2a --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture/AppDelegate.h @@ -0,0 +1,8 @@ +#import +#import + +@interface AppDelegate : UIResponder + +@property (nonatomic, strong) UIWindow *window; + +@end diff --git a/sample-new-architecture/ios/sampleNewArchitecture/AppDelegate.mm b/sample-new-architecture/ios/sampleNewArchitecture/AppDelegate.mm new file mode 100644 index 0000000000..1fe732ff6f --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture/AppDelegate.mm @@ -0,0 +1,133 @@ +#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, @"sampleNewArchitecture", 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; +} + +- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge +{ +#if DEBUG + return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"]; +#else + return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; +#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 +{ + return RCTAppSetupDefaultModuleFromClass(moduleClass); +} + +#endif + +@end diff --git a/sample-new-architecture/ios/sampleNewArchitecture/Images.xcassets/AppIcon.appiconset/Contents.json b/sample-new-architecture/ios/sampleNewArchitecture/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..81213230de --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,53 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/sample-new-architecture/ios/sampleNewArchitecture/Images.xcassets/Contents.json b/sample-new-architecture/ios/sampleNewArchitecture/Images.xcassets/Contents.json new file mode 100644 index 0000000000..2d92bd53fd --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/sample-new-architecture/ios/sampleNewArchitecture/Info.plist b/sample-new-architecture/ios/sampleNewArchitecture/Info.plist new file mode 100644 index 0000000000..e0fec87667 --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture/Info.plist @@ -0,0 +1,55 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + sampleNewArchitecture + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSExceptionDomains + + localhost + + NSExceptionAllowsInsecureHTTPLoads + + + + + NSLocationWhenInUseUsageDescription + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/sample-new-architecture/ios/sampleNewArchitecture/LaunchScreen.storyboard b/sample-new-architecture/ios/sampleNewArchitecture/LaunchScreen.storyboard new file mode 100644 index 0000000000..0d7778254d --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture/LaunchScreen.storyboard @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample-new-architecture/ios/sampleNewArchitecture/main.m b/sample-new-architecture/ios/sampleNewArchitecture/main.m new file mode 100644 index 0000000000..d645c7246c --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitecture/main.m @@ -0,0 +1,10 @@ +#import + +#import "AppDelegate.h" + +int main(int argc, char *argv[]) +{ + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/sample-new-architecture/ios/sampleNewArchitectureTests/Info.plist b/sample-new-architecture/ios/sampleNewArchitectureTests/Info.plist new file mode 100644 index 0000000000..ba72822e87 --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitectureTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/sample-new-architecture/ios/sampleNewArchitectureTests/sampleNewArchitectureTests.m b/sample-new-architecture/ios/sampleNewArchitectureTests/sampleNewArchitectureTests.m new file mode 100644 index 0000000000..bad9e2311b --- /dev/null +++ b/sample-new-architecture/ios/sampleNewArchitectureTests/sampleNewArchitectureTests.m @@ -0,0 +1,66 @@ +#import +#import + +#import +#import + +#define TIMEOUT_SECONDS 600 +#define TEXT_TO_LOOK_FOR @"Welcome to React" + +@interface sampleNewArchitectureTests : XCTestCase + +@end + +@implementation sampleNewArchitectureTests + +- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL (^)(UIView *view))test +{ + if (test(view)) { + return YES; + } + for (UIView *subview in [view subviews]) { + if ([self findSubviewInView:subview matching:test]) { + return YES; + } + } + return NO; +} + +- (void)testRendersWelcomeScreen +{ + UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController]; + NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS]; + BOOL foundElement = NO; + + __block NSString *redboxError = nil; +#ifdef DEBUG + RCTSetLogFunction( + ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) { + if (level >= RCTLogLevelError) { + redboxError = message; + } + }); +#endif + + while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) { + [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; + [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; + + foundElement = [self findSubviewInView:vc.view + matching:^BOOL(UIView *view) { + if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) { + return YES; + } + return NO; + }]; + } + +#ifdef DEBUG + RCTSetLogFunction(RCTDefaultLogFunction); +#endif + + XCTAssertNil(redboxError, @"RedBox error: %@", redboxError); + XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS); +} + +@end diff --git a/sample-new-architecture/ios/sentry.properties b/sample-new-architecture/ios/sentry.properties new file mode 100644 index 0000000000..0cdf170157 --- /dev/null +++ b/sample-new-architecture/ios/sentry.properties @@ -0,0 +1,4 @@ +#defaults.url=https://sentry.io/ +defaults.org=sentry-sdks +defaults.project=sentry-react-native +#auth.token= diff --git a/sample-new-architecture/metro.config.js b/sample-new-architecture/metro.config.js new file mode 100644 index 0000000000..fee6c0859a --- /dev/null +++ b/sample-new-architecture/metro.config.js @@ -0,0 +1,47 @@ +/** + * Metro configuration for React Native + * https://github.com/facebook/react-native + * + * @format + */ + +const path = require('path'); +const blacklist = require('metro-config/src/defaults/exclusionList'); + +const parentDir = path.resolve(__dirname, '..'); + +module.exports = { + projectRoot: __dirname, + watchFolders: [path.resolve(__dirname, 'node_modules'), parentDir], + resolver: { + blacklistRE: blacklist([ + new RegExp(`${parentDir}/node_modules/react-native/.*`), + ]), + extraNodeModules: new Proxy( + { + /* + As the parent dir node_modules is blacklisted as you can see above. So it won't be able + to find react-native to build the code from the parent folder, + so we'll have to redirect it to use the react-native inside sample's node_modules. + */ + 'react-native': path.resolve(__dirname, 'node_modules/react-native'), + }, + { + get: (target, name) => { + if (target.hasOwnProperty(name)) { + return target[name]; + } + return path.join(process.cwd(), `node_modules/${name}`); + }, + }, + ), + }, + transformer: { + getTransformOptions: async () => ({ + transform: { + experimentalImportSupport: false, + inlineRequires: true, + }, + }), + }, +}; diff --git a/sample-new-architecture/mocks/fileMock.js b/sample-new-architecture/mocks/fileMock.js new file mode 100644 index 0000000000..08d725cd4e --- /dev/null +++ b/sample-new-architecture/mocks/fileMock.js @@ -0,0 +1 @@ +export default ''; diff --git a/sample-new-architecture/package.json b/sample-new-architecture/package.json new file mode 100644 index 0000000000..48efd686f4 --- /dev/null +++ b/sample-new-architecture/package.json @@ -0,0 +1,61 @@ +{ + "name": "sample-new-architecture", + "version": "0.0.1", + "private": true, + "scripts": { + "android": "react-native run-android", + "ios": "react-native run-ios", + "start": "react-native start", + "test": "jest", + "lint": "eslint . --ext .js,.jsx,.ts,.tsx", + "pod-install": "cd ios; RCT_NEW_ARCH_ENABLED=1 bundle exec pod install; cd ..", + "pod-install-production": "cd ios; PRODUCTION=1 RCT_NEW_ARCH_ENABLED=1 bundle exec pod install; cd ..", + "pod-install-legacy": "cd ios; bundle exec pod install; cd ..", + "pod-install-legacy-production": "cd ios; PRODUCTION=1 bundle exec pod install; cd .." + }, + "dependencies": { + "react": "18.1.0", + "react-native": "0.70.1", + "@react-navigation/native": "^6.0.13", + "@react-navigation/stack": "^6.3.2", + "react-redux": "^8.0.4", + "redux": "^4.2.0", + "react-native-gesture-handler": "^2.7.0", + "react-native-safe-area-context": "^4.4.1", + "react-native-screens": "^3.18.1" + }, + "devDependencies": { + "@babel/core": "^7.12.9", + "@babel/preset-env": "^7", + "@babel/runtime": "^7.12.5", + "@react-native-community/eslint-config": "^2.0.0", + "@tsconfig/react-native": "^2.0.2", + "@types/jest": "^26.0.23", + "@types/react-native": "^0.70.0", + "@types/react-test-renderer": "^18.0.0", + "@typescript-eslint/eslint-plugin": "^5.37.0", + "@typescript-eslint/parser": "^5.37.0", + "babel-jest": "^26.6.3", + "babel-plugin-module-resolver": "^4.1.0", + "eslint": "^7.32.0", + "jest": "^26.6.3", + "metro-react-native-babel-preset": "^0.72.1", + "react-test-renderer": "18.1.0", + "typescript": "^4.8.3" + }, + "jest": { + "preset": "react-native", + "moduleFileExtensions": [ + "ts", + "tsx", + "js", + "jsx", + "json", + "node" + ], + "moduleNameMapper": { + "\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/mocks/fileMock.js", + "\\.(css|less)$": "/mocks/fileMock.js" + } + } +} diff --git a/sample-new-architecture/react-native.config.js b/sample-new-architecture/react-native.config.js new file mode 100644 index 0000000000..c6c1a74e55 --- /dev/null +++ b/sample-new-architecture/react-native.config.js @@ -0,0 +1,10 @@ +// Without this config the codegen fails +// because it can find @sentry/react-native +// in the dependencies +module.exports = { + dependencies: { + RNSentry: { + root: '../', + }, + }, +}; diff --git a/sample-new-architecture/src/App.tsx b/sample-new-architecture/src/App.tsx new file mode 100644 index 0000000000..eee46f1ff6 --- /dev/null +++ b/sample-new-architecture/src/App.tsx @@ -0,0 +1,97 @@ +import React from 'react'; +import { + NavigationContainer, + NavigationContainerRef, +} from '@react-navigation/native'; +import { createStackNavigator } from '@react-navigation/stack'; + +// Import the Sentry React Native SDK +import * as Sentry from '@sentry/react-native'; + +import { SENTRY_INTERNAL_DSN } from './dsn'; +import HomeScreen from './Screens/HomeScreen'; +import TrackerScreen from './Screens/TrackerScreen'; +import ManualTrackerScreen from './Screens/ManualTrackerScreen'; +import PerformanceTimingScreen from './Screens/PerformanceTimingScreen'; +import ReduxScreen from './Screens/ReduxScreen'; +import { Provider } from 'react-redux'; +import { store } from './reduxApp'; + +const reactNavigationInstrumentation = + new Sentry.ReactNavigationInstrumentation({ + routeChangeTimeoutMs: 500, // How long it will wait for the route change to complete. Default is 1000ms + }); + +Sentry.init({ + // Replace the example DSN below with your own DSN: + dsn: SENTRY_INTERNAL_DSN, + debug: true, + beforeSend: (event, hint) => { + console.log('Event beforeSend:', event, 'hint:', hint); + return event; + }, + // This will be called with a boolean `didCallNativeInit` when the native SDK has been contacted. + onReady: ({ didCallNativeInit }) => { + console.log('onReady called with didCallNativeInit:', didCallNativeInit); + }, + integrations(integrations) { + integrations.push( + new Sentry.ReactNativeTracing({ + // The time to wait in ms until the transaction will be finished, For testing, default is 1000 ms + idleTimeout: 5000, + routingInstrumentation: reactNavigationInstrumentation, + tracingOrigins: ['localhost', /^\//, /^https:\/\//], + beforeNavigate: (context: Sentry.ReactNavigationTransactionContext) => { + // Example of not sending a transaction for the screen with the name "Manual Tracker" + if (context.data.route.name === 'ManualTracker') { + context.sampled = false; + } + + return context; + }, + }), + ); + return integrations.filter(i => i.name !== 'Dedupe'); + }, + enableAutoSessionTracking: true, + // For testing, session close when 5 seconds (instead of the default 30) in the background. + sessionTrackingIntervalMillis: 5000, + // This will capture ALL TRACES and likely use up all your quota + tracesSampleRate: 1.0, + attachStacktrace: true, + // Sets the `release` and `dist` on Sentry events. Make sure this matches EXACTLY with the values on your sourcemaps + // otherwise they will not work. + // release: 'myapp@1.2.3+1', + // dist: `1`, +}); + +const Stack = createStackNavigator(); + +const App = () => { + const navigation = React.useRef>(null); + + return ( + + { + reactNavigationInstrumentation.registerNavigationContainer( + navigation, + ); + }}> + + + + + + + + + + ); +}; + +export default Sentry.wrap(App); diff --git a/sample-new-architecture/src/Screens/HomeScreen.tsx b/sample-new-architecture/src/Screens/HomeScreen.tsx new file mode 100644 index 0000000000..d4438c96c0 --- /dev/null +++ b/sample-new-architecture/src/Screens/HomeScreen.tsx @@ -0,0 +1,205 @@ +import React from 'react'; +import { + StatusBar, + ScrollView, + Text, + Button as NativeButton, + View, + ButtonProps, + StyleSheet, +} from 'react-native'; + +import * as Sentry from '@sentry/react-native'; + +import { setScopeProperties } from '../setScopeProperties'; +import { StackNavigationProp } from '@react-navigation/stack'; +import { CommonActions } from '@react-navigation/native'; +import { UserFeedbackModal } from '../components/UserFeedbackModal'; + +interface Props { + navigation: StackNavigationProp; +} + +const HomeScreen = (props: Props) => { + // Show bad code inside error boundary to trigger it. + const [showBadCode, setShowBadCode] = React.useState(false); + const [isFeedbackVisible, setFeedbackVisible] = React.useState(false); + + const onPressPerformanceTiming = () => { + // Navigate with a reset action just to test + props.navigation.dispatch( + CommonActions.reset({ + index: 1, + routes: [ + { name: 'Home' }, + { + name: 'PerformanceTiming', + params: { someParam: 'hello' }, + }, + ], + }), + ); + }; + + return ( + <> + + + Hey there! +