From c16a3ad1fabb93899d3bc0237012f701c52b415a Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Thu, 30 Jun 2022 16:44:38 +0200 Subject: [PATCH 1/6] Fix: Auto linking for RN >= 0.69 --- CHANGELOG.md | 4 ++++ react-native.config.js | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d540a872c6..000224f01e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +- Fix: Auto linking for RN >= 0.69 ([#2326](https://github.com/getsentry/sentry-react-native/pull/2326)) + ## 4.1.0 - Fix: Send DidBecomeActiveNotification when OOM enabled ([#2326](https://github.com/getsentry/sentry-react-native/pull/2326)) diff --git a/react-native.config.js b/react-native.config.js index f85fa01beb..19782b153f 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -1,18 +1,10 @@ module.exports = { dependency: { platforms: { - ios: { - sharedLibraries: ['libz'] - }, + ios: {}, android: { packageInstance: 'new 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' } } }; From 18f3ce003cabc7a3f2add63a09c1d96474353920 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Thu, 30 Jun 2022 16:45:08 +0200 Subject: [PATCH 2/6] fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 000224f01e..f7c759e68d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -- Fix: Auto linking for RN >= 0.69 ([#2326](https://github.com/getsentry/sentry-react-native/pull/2326)) +- Fix: Auto linking for RN >= 0.69 ([#2332](https://github.com/getsentry/sentry-react-native/pull/2332)) ## 4.1.0 From 0c0849789be632b34143ba817ba5b46c626c0c0a Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Fri, 1 Jul 2022 12:30:41 +0200 Subject: [PATCH 3/6] add import path --- react-native.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/react-native.config.js b/react-native.config.js index 19782b153f..d307073e1a 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -3,7 +3,8 @@ module.exports = { platforms: { ios: {}, android: { - packageInstance: 'new RNSentryPackage()' + packageInstance: 'new RNSentryPackage()', + packageImportPath: 'import io.sentry.react.RNSentryPackage;' } } } From d8bab235d17fad911aaba2fe5ec88910cce089a1 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Thu, 21 Jul 2022 08:59:38 +0200 Subject: [PATCH 4/6] fix changelog --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7cc5e948d..a3d01b9c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,7 +45,6 @@ fix: Solve reference to private cocoa SDK class #2369 - Bump JavaScript SDK to v7.5.1 ([#2342](https://github.com/getsentry/sentry-react-native/pull/2342), [#2350](https://github.com/getsentry/sentry-react-native/pull/2350)) - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#751) - [diff](https://github.com/getsentry/sentry-javascript/compare/7.3.1...7.5.1) ->>>>>>> main ## 4.1.0 From 05933ebd24d50a41f1f14adab1a7fce86e387e72 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Thu, 21 Jul 2022 09:07:42 +0200 Subject: [PATCH 5/6] update package json --- package.json | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 0767bf8067..cf4751c7aa 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@sentry/tracing": "7.7.0", "@sentry/types": "7.7.0", "@sentry/utils": "7.7.0", - "@sentry/wizard": "1.2.17" + "@sentry/wizard": "2.0.0" }, "devDependencies": { "@sentry-internal/eslint-config-sdk": "7.7.0", @@ -72,18 +72,12 @@ "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, From 5b763339ca6de9c222700051ff052c8276a5239d Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Thu, 21 Jul 2022 16:44:46 +0200 Subject: [PATCH 6/6] fix yarn lock --- yarn.lock | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index dbfbcddf27..e366bb0f76 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1173,16 +1173,18 @@ proxy-from-env "^1.1.0" which "^2.0.2" -"@sentry/cli@^1.52.4": - version "1.57.0" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.57.0.tgz#87237ec6b77cb7582f018b580e9bb9481a809baa" - integrity sha512-lgfSQMRVcf00IkHkmqY6L9pv1uOEKDKbEjFQu2qstjg3kycswo1prz60xORJVpfr4qXDzqbSsAKEBp4VKG+ilw== +"@sentry/cli@^1.72.0": + version "1.74.5" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.74.5.tgz#4a5c622913087c9ab6f82994da9a7526423779b8" + integrity sha512-Ze1ec306ZWHtrxKypOJ8nhtFqkrx2f/6bRH+DcJzEQ3bBePQ0ZnqJTTe4BBHADYBtxFIaUWzCZ6DquLz2Zv/sw== dependencies: https-proxy-agent "^5.0.0" mkdirp "^0.5.5" - node-fetch "^2.6.0" + node-fetch "^2.6.7" + npmlog "^4.1.2" progress "^2.0.3" proxy-from-env "^1.1.0" + which "^2.0.2" "@sentry/core@7.7.0": version "7.7.0" @@ -1255,12 +1257,12 @@ "@sentry/types" "7.7.0" tslib "^1.9.3" -"@sentry/wizard@1.2.17": - version "1.2.17" - resolved "https://registry.yarnpkg.com/@sentry/wizard/-/wizard-1.2.17.tgz#c3247b47129d002cfa45d7a2048d13dc6513457b" - integrity sha512-wXzjOZVDzh+1MhA9tpZXCKNTDusL2Dc298KGQkEkNefbW+OlYbsWwF7GAihLKUjYOSnKKZFzLIwbD+gxwxWxlw== +"@sentry/wizard@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sentry/wizard/-/wizard-2.0.0.tgz#94bd4d0eeaae67b9577bd1fe2688b2be9d1f77e9" + integrity sha512-v6rOlJE0bOGSuekd+LTitofObIXKxtrQW3pXG2mwFVPQ6wezpFpUd8D/5hLJntLSvon/vFkQu43WvU+0VNBR3Q== dependencies: - "@sentry/cli" "^1.52.4" + "@sentry/cli" "^1.72.0" chalk "^2.4.1" glob "^7.1.3" inquirer "^6.2.0"