From 982b486cae93ca44c21b8d1b579007f96a9c9de3 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:33:37 +0200 Subject: [PATCH 1/8] fix(ci): Handle package renames in JS updater script The previous fix updated the package names in the updater list but the workspace package.json still references the old @sentry-internal/* names, so yarn up can't find them. This adds a renames mechanism that rewrites package.json entries before running yarn up. Co-Authored-By: Claude Opus 4.6 --- scripts/update-javascript.sh | 6 ++++++ scripts/update-package-json.sh | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/scripts/update-javascript.sh b/scripts/update-javascript.sh index b41c832505..731e545d18 100755 --- a/scripts/update-javascript.sh +++ b/scripts/update-javascript.sh @@ -6,4 +6,10 @@ repo="https://github.com/getsentry/sentry-javascript.git" packages=('@sentry/browser' '@sentry/core' '@sentry/react' '@sentry/typescript') packages+=('@sentry/eslint-plugin-sdk') +# Packages renamed in sentry-javascript 10.58.0 (https://github.com/getsentry/sentry-javascript/pull/21371) +renames=( + '@sentry-internal/typescript:@sentry/typescript' + '@sentry-internal/eslint-plugin-sdk:@sentry/eslint-plugin-sdk' +) + . $(dirname "$0")/update-package-json.sh diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index d89cd70125..2cf8de8514 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -27,6 +27,18 @@ set-version) if [[ "$version" == "$tagPrefix"* ]]; then version="${version:${#tagPrefix}}" fi + + # Apply package renames (old:new) in package.json before upgrading + if [[ ${renames+x} && ${#renames[@]} -gt 0 ]]; then + for rename in "${renames[@]}"; do + oldPkg="${rename%%:*}" + newPkg="${rename##*:}" + find "${monorepoRoot}/packages" -name "package.json" -exec \ + sed -i.bak "s|\"${oldPkg}\"|\"${newPkg}\"|g" {} + + find "${monorepoRoot}/packages" -name "package.json.bak" -delete + done + fi + for i in ${!packages[@]}; do list+="${packages[$i]}@$version " done From 814a4fb2d26d8651783709777907866bb0feac90 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:35:00 +0200 Subject: [PATCH 2/8] tmp: trigger JS updater on this branch Co-Authored-By: Claude Opus 4.6 --- .github/workflows/update-deps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index a267f33c1d..9ef923b1b2 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -8,6 +8,7 @@ on: push: branches: - main + - antonis/fix-updater-package-renames jobs: android: From 8e1299d32d74917c04a57cfb2b004bdf8af56f64 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:37:55 +0200 Subject: [PATCH 3/8] fix(ci): Rename @sentry-internal/* packages to @sentry/* in package.json Rename the dependencies directly instead of adding rename logic to the updater script. The packages were renamed upstream in sentry-javascript 10.58.0. Co-Authored-By: Claude Opus 4.6 --- packages/core/.oxlintrc.json | 2 +- packages/core/package.json | 4 ++-- scripts/update-javascript.sh | 6 ------ scripts/update-package-json.sh | 11 ----------- yarn.lock | 36 +++++++++++++++++----------------- 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/packages/core/.oxlintrc.json b/packages/core/.oxlintrc.json index 75a3ae3759..69e1772967 100644 --- a/packages/core/.oxlintrc.json +++ b/packages/core/.oxlintrc.json @@ -4,7 +4,7 @@ "jsPlugins": [ { "name": "sdk", - "specifier": "@sentry-internal/eslint-plugin-sdk" + "specifier": "@sentry/eslint-plugin-sdk" } ], "categories": {}, diff --git a/packages/core/package.json b/packages/core/package.json index c22a75b2de..acb1bbe211 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -86,8 +86,8 @@ "@microsoft/api-extractor": "^7.58.7", "@mswjs/interceptors": "^0.25.15", "@react-native/babel-preset": "0.80.0", - "@sentry-internal/eslint-plugin-sdk": "10.57.0", - "@sentry-internal/typescript": "10.57.0", + "@sentry/eslint-plugin-sdk": "10.58.0", + "@sentry/typescript": "10.58.0", "@sentry/wizard": "6.12.0", "@testing-library/react-native": "^13.2.2", "@types/jest": "^29.5.13", diff --git a/scripts/update-javascript.sh b/scripts/update-javascript.sh index 731e545d18..b41c832505 100755 --- a/scripts/update-javascript.sh +++ b/scripts/update-javascript.sh @@ -6,10 +6,4 @@ repo="https://github.com/getsentry/sentry-javascript.git" packages=('@sentry/browser' '@sentry/core' '@sentry/react' '@sentry/typescript') packages+=('@sentry/eslint-plugin-sdk') -# Packages renamed in sentry-javascript 10.58.0 (https://github.com/getsentry/sentry-javascript/pull/21371) -renames=( - '@sentry-internal/typescript:@sentry/typescript' - '@sentry-internal/eslint-plugin-sdk:@sentry/eslint-plugin-sdk' -) - . $(dirname "$0")/update-package-json.sh diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index 2cf8de8514..0b5ac1abce 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -28,17 +28,6 @@ set-version) version="${version:${#tagPrefix}}" fi - # Apply package renames (old:new) in package.json before upgrading - if [[ ${renames+x} && ${#renames[@]} -gt 0 ]]; then - for rename in "${renames[@]}"; do - oldPkg="${rename%%:*}" - newPkg="${rename##*:}" - find "${monorepoRoot}/packages" -name "package.json" -exec \ - sed -i.bak "s|\"${oldPkg}\"|\"${newPkg}\"|g" {} + - find "${monorepoRoot}/packages" -name "package.json.bak" -delete - done - fi - for i in ${!packages[@]}; do list+="${packages[$i]}@$version " done diff --git a/yarn.lock b/yarn.lock index a80e529473..c0538515b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10653,13 +10653,6 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/eslint-plugin-sdk@npm:10.57.0": - version: 10.57.0 - resolution: "@sentry-internal/eslint-plugin-sdk@npm:10.57.0" - checksum: a2261fd210e440ef26ee5a35f4e91142ed4bb5a9cb6d3c753ce11f1fc99c9b0f038f681a888393d826b87fd47b434680a84dad743aee745d33f38d2d75944b4f - languageName: node - linkType: hard - "@sentry-internal/feedback@npm:10.57.0": version: 10.57.0 resolution: "@sentry-internal/feedback@npm:10.57.0" @@ -10689,15 +10682,6 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/typescript@npm:10.57.0": - version: 10.57.0 - resolution: "@sentry-internal/typescript@npm:10.57.0" - peerDependencies: - typescript: ~5.8.0 - checksum: 3c0870b4f26827ee9d105aedc1359f1d4ee62ab85802325fe46a93eef90232e9b47e6540ce01387f2c8c6bfc6e9acf365f19ffe362a3a79ad47d820d62e4bcb8 - languageName: node - linkType: hard - "@sentry/babel-plugin-component-annotate@npm:5.3.0": version: 5.3.0 resolution: "@sentry/babel-plugin-component-annotate@npm:5.3.0" @@ -10827,6 +10811,13 @@ __metadata: languageName: node linkType: hard +"@sentry/eslint-plugin-sdk@npm:10.58.0": + version: 10.58.0 + resolution: "@sentry/eslint-plugin-sdk@npm:10.58.0" + checksum: 0b4ddbca6daa1d458ddb239cef8054963349b3f2c149acd099d7068c75e6a31c5e0d85d6f6fae637c16a868f77ee0e39caa3767875e4c3c7739c46d93c6e169e + languageName: node + linkType: hard + "@sentry/expo-upload-sourcemaps@workspace:*, @sentry/expo-upload-sourcemaps@workspace:packages/expo-upload-sourcemaps": version: 0.0.0-use.local resolution: "@sentry/expo-upload-sourcemaps@workspace:packages/expo-upload-sourcemaps" @@ -10932,14 +10923,14 @@ __metadata: "@microsoft/api-extractor": ^7.58.7 "@mswjs/interceptors": ^0.25.15 "@react-native/babel-preset": 0.80.0 - "@sentry-internal/eslint-plugin-sdk": 10.57.0 - "@sentry-internal/typescript": 10.57.0 "@sentry/babel-plugin-component-annotate": 5.3.0 "@sentry/browser": 10.57.0 "@sentry/cli": 3.5.0 "@sentry/core": 10.57.0 + "@sentry/eslint-plugin-sdk": 10.58.0 "@sentry/expo-upload-sourcemaps": "workspace:*" "@sentry/react": 10.57.0 + "@sentry/typescript": 10.58.0 "@sentry/wizard": 6.12.0 "@testing-library/react-native": ^13.2.2 "@types/jest": ^29.5.13 @@ -10997,6 +10988,15 @@ __metadata: languageName: node linkType: hard +"@sentry/typescript@npm:10.58.0": + version: 10.58.0 + resolution: "@sentry/typescript@npm:10.58.0" + peerDependencies: + typescript: ~5.8.0 + checksum: a04992765b02a25c1616b9d7d92ee997fa463000a983b4ff47cfed48ed4cef41263f42ebe6a6a759956798a45a0a8068d1f5d831862cc20f836e17a79d5d06d3 + languageName: node + linkType: hard + "@sentry/wizard@npm:6.12.0": version: 6.12.0 resolution: "@sentry/wizard@npm:6.12.0" From ad7cd0645be8e167eb267dc569e9d86cb88efc32 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:38:47 +0200 Subject: [PATCH 4/8] chore: remove stray blank line in update-package-json.sh Co-Authored-By: Claude Opus 4.6 --- scripts/update-package-json.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index 0b5ac1abce..d89cd70125 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -27,7 +27,6 @@ set-version) if [[ "$version" == "$tagPrefix"* ]]; then version="${version:${#tagPrefix}}" fi - for i in ${!packages[@]}; do list+="${packages[$i]}@$version " done From b953d1555d51fdd2dfa35ed77a53429a6a4f7d28 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:42:01 +0200 Subject: [PATCH 5/8] fix(ci): Update @sentry-internal/typescript extends in tsconfig.build.json Co-Authored-By: Claude Opus 4.6 --- packages/core/tsconfig.build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json index 230722a185..48c3dec6e0 100644 --- a/packages/core/tsconfig.build.json +++ b/packages/core/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@sentry-internal/typescript/tsconfig.json", + "extends": "./node_modules/@sentry/typescript/tsconfig.json", "include": [ "./src/js/*.ts", "./src/js/*.tsx", From 0def8fd8ff4bf07b27495cfa9879ea73d5e3e516 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:43:41 +0200 Subject: [PATCH 6/8] fix(ci): Update @sentry-internal/typescript extends in tsconfig.build.tools.json Co-Authored-By: Claude Opus 4.6 --- packages/core/tsconfig.build.tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/tsconfig.build.tools.json b/packages/core/tsconfig.build.tools.json index ac86a9a64d..f50074dacf 100644 --- a/packages/core/tsconfig.build.tools.json +++ b/packages/core/tsconfig.build.tools.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@sentry-internal/typescript/tsconfig.json", + "extends": "./node_modules/@sentry/typescript/tsconfig.json", "include": ["./src/js/tools/**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { From 2d9ecb3e3f9e3b14ab2fd518ee9b83f945eb6b9f Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:45:52 +0200 Subject: [PATCH 7/8] test(core): Add @sentry/feedback test case for barrel import resolver Co-Authored-By: Claude Opus 4.6 --- packages/core/test/tools/metroconfig.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/test/tools/metroconfig.test.ts b/packages/core/test/tools/metroconfig.test.ts index e04d948c57..0bd5d264a5 100644 --- a/packages/core/test/tools/metroconfig.test.ts +++ b/packages/core/test/tools/metroconfig.test.ts @@ -720,6 +720,7 @@ describe('metroconfig', () => { const browserBarrelImports = [ { moduleName: './feedbackSync.js', shouldBeEmpty: true }, { moduleName: './feedbackAsync.js', shouldBeEmpty: true }, + { moduleName: '@sentry/feedback', shouldBeEmpty: true }, { moduleName: '@sentry-internal/feedback', shouldBeEmpty: true }, { moduleName: '@sentry-internal/replay', shouldBeEmpty: false }, { moduleName: '@sentry-internal/replay-canvas', shouldBeEmpty: false }, From e6e21af4508a584a79414451182fac4e9f677de8 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 16 Jun 2026 09:55:32 +0200 Subject: [PATCH 8/8] Revert "tmp: trigger JS updater on this branch" This reverts commit 814a4fb2d26d8651783709777907866bb0feac90. --- .github/workflows/update-deps.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 9ef923b1b2..a267f33c1d 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -8,7 +8,6 @@ on: push: branches: - main - - antonis/fix-updater-package-renames jobs: android: