feat(reactnative): Use dynamic node path resolution to reference RN S…

…AGP in app/build.gradle
getsentry · Oct 4, 2023 · d80d2d7 · d80d2d7
1 parent a91ad1a
commit d80d2d7
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 7 deletions.
diff --git a/src/react-native/gradle.ts b/src/react-native/gradle.ts
@@ -1,12 +1,12 @@
 import * as fs from 'fs';
 
 const applyFrom =
-  'apply from: "../../node_modules/@sentry/react-native/sentry.gradle"';
+  `apply from: new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute().text.trim(), "../sentry.gradle")`;
 
 export function doesAppBuildGradleIncludeRNSentryGradlePlugin(
   content: string,
 ): boolean {
-  return content.includes(applyFrom);
+  return content.includes('sentry.gradle');
 }
 
 export function addRNSentryGradlePlugin(content: string): string {
@@ -15,7 +15,7 @@ export function addRNSentryGradlePlugin(content: string): string {
 
 export function removeRNSentryGradlePlugin(content: string): string {
   return content.replace(
-    /^\s*apply from: ["']..\/..\/node_modules\/@sentry\/react-native\/sentry.gradle["'];?\s*?\r?\n/m,
+    /^\s*apply from:.*sentry\.gradle.*;?\s*?\r?\n/m,
     '',
   );
 }

diff --git a/test/react-native/gradle.test.ts b/test/react-native/gradle.test.ts
@@ -67,7 +67,7 @@ apply plugin: "io.sentry.android.gradle"
 sentry {
 }
 
-apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
+apply from: new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute().text.trim(), "../sentry.gradle")
 
 android {
     ndkVersion rootProject.ext.ndkVersion
@@ -115,7 +115,7 @@ android {
 `;
       const expectedOutput = `apply plugin: "com.android.application"
 
-apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
+apply from: new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute().text.trim(), "../sentry.gradle")
 android {
     ndkVersion rootProject.ext.ndkVersion
 
@@ -162,7 +162,7 @@ apply plugin: "io.sentry.android.gradle"
 sentry {
 }
 
-apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
+apply from: new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute().text.trim(), "../sentry.gradle")
 android {
     ndkVersion rootProject.ext.ndkVersion
 
@@ -213,7 +213,54 @@ android {
       expect(removeRNSentryGradlePlugin(input)).toBe(input);
     });
 
-    it('does remove RN SAGP', () => {
+    it('does remove RN SAGP referenced by node resolved path', () => {
+      const input = `apply plugin: "com.android.application"
+apply plugin: "io.sentry.android.gradle"
+
+sentry {
+}
+
+apply from: new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute().text.trim(), "../sentry.gradle")
+android {
+    ndkVersion rootProject.ext.ndkVersion
+
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    namespace "com.samplenewarchitecture"
+    defaultConfig {
+        applicationId "com.samplenewarchitecture"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+}
+`;
+      const output = `apply plugin: "com.android.application"
+apply plugin: "io.sentry.android.gradle"
+
+sentry {
+}
+android {
+    ndkVersion rootProject.ext.ndkVersion
+
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    namespace "com.samplenewarchitecture"
+    defaultConfig {
+        applicationId "com.samplenewarchitecture"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+}
+`;
+
+      expect(removeRNSentryGradlePlugin(input)).toBe(output);
+    });
+
+    it('does remove RN SAGP reference by relative path', () => {
       const input = `apply plugin: "com.android.application"
 apply plugin: "io.sentry.android.gradle"