Skip to content

Commit 2e82032

Browse files
antonisclaude
andauthored
fix(ci): Handle @sentry-internal/* package renames in JS updater (#6295)
* 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 <noreply@anthropic.com> * tmp: trigger JS updater on this branch Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 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 <noreply@anthropic.com> * chore: remove stray blank line in update-package-json.sh Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(ci): Update @sentry-internal/typescript extends in tsconfig.build.json Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(ci): Update @sentry-internal/typescript extends in tsconfig.build.tools.json Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * test(core): Add @sentry/feedback test case for barrel import resolver Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Revert "tmp: trigger JS updater on this branch" This reverts commit 814a4fb. --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 071eab4 commit 2e82032

6 files changed

Lines changed: 24 additions & 23 deletions

File tree

packages/core/.oxlintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"jsPlugins": [
55
{
66
"name": "sdk",
7-
"specifier": "@sentry-internal/eslint-plugin-sdk"
7+
"specifier": "@sentry/eslint-plugin-sdk"
88
}
99
],
1010
"categories": {},

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
"@microsoft/api-extractor": "^7.58.7",
8787
"@mswjs/interceptors": "^0.25.15",
8888
"@react-native/babel-preset": "0.80.0",
89-
"@sentry-internal/eslint-plugin-sdk": "10.57.0",
90-
"@sentry-internal/typescript": "10.57.0",
89+
"@sentry/eslint-plugin-sdk": "10.58.0",
90+
"@sentry/typescript": "10.58.0",
9191
"@sentry/wizard": "6.12.0",
9292
"@testing-library/react-native": "^13.2.2",
9393
"@types/jest": "^29.5.13",

packages/core/test/tools/metroconfig.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,7 @@ describe('metroconfig', () => {
720720
const browserBarrelImports = [
721721
{ moduleName: './feedbackSync.js', shouldBeEmpty: true },
722722
{ moduleName: './feedbackAsync.js', shouldBeEmpty: true },
723+
{ moduleName: '@sentry/feedback', shouldBeEmpty: true },
723724
{ moduleName: '@sentry-internal/feedback', shouldBeEmpty: true },
724725
{ moduleName: '@sentry-internal/replay', shouldBeEmpty: false },
725726
{ moduleName: '@sentry-internal/replay-canvas', shouldBeEmpty: false },

packages/core/tsconfig.build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./node_modules/@sentry-internal/typescript/tsconfig.json",
2+
"extends": "./node_modules/@sentry/typescript/tsconfig.json",
33
"include": [
44
"./src/js/*.ts",
55
"./src/js/*.tsx",

packages/core/tsconfig.build.tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./node_modules/@sentry-internal/typescript/tsconfig.json",
2+
"extends": "./node_modules/@sentry/typescript/tsconfig.json",
33
"include": ["./src/js/tools/**/*.ts"],
44
"exclude": ["node_modules"],
55
"compilerOptions": {

yarn.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10653,13 +10653,6 @@ __metadata:
1065310653
languageName: node
1065410654
linkType: hard
1065510655

10656-
"@sentry-internal/eslint-plugin-sdk@npm:10.57.0":
10657-
version: 10.57.0
10658-
resolution: "@sentry-internal/eslint-plugin-sdk@npm:10.57.0"
10659-
checksum: a2261fd210e440ef26ee5a35f4e91142ed4bb5a9cb6d3c753ce11f1fc99c9b0f038f681a888393d826b87fd47b434680a84dad743aee745d33f38d2d75944b4f
10660-
languageName: node
10661-
linkType: hard
10662-
1066310656
"@sentry-internal/feedback@npm:10.57.0":
1066410657
version: 10.57.0
1066510658
resolution: "@sentry-internal/feedback@npm:10.57.0"
@@ -10689,15 +10682,6 @@ __metadata:
1068910682
languageName: node
1069010683
linkType: hard
1069110684

10692-
"@sentry-internal/typescript@npm:10.57.0":
10693-
version: 10.57.0
10694-
resolution: "@sentry-internal/typescript@npm:10.57.0"
10695-
peerDependencies:
10696-
typescript: ~5.8.0
10697-
checksum: 3c0870b4f26827ee9d105aedc1359f1d4ee62ab85802325fe46a93eef90232e9b47e6540ce01387f2c8c6bfc6e9acf365f19ffe362a3a79ad47d820d62e4bcb8
10698-
languageName: node
10699-
linkType: hard
10700-
1070110685
"@sentry/babel-plugin-component-annotate@npm:5.3.0":
1070210686
version: 5.3.0
1070310687
resolution: "@sentry/babel-plugin-component-annotate@npm:5.3.0"
@@ -10827,6 +10811,13 @@ __metadata:
1082710811
languageName: node
1082810812
linkType: hard
1082910813

10814+
"@sentry/eslint-plugin-sdk@npm:10.58.0":
10815+
version: 10.58.0
10816+
resolution: "@sentry/eslint-plugin-sdk@npm:10.58.0"
10817+
checksum: 0b4ddbca6daa1d458ddb239cef8054963349b3f2c149acd099d7068c75e6a31c5e0d85d6f6fae637c16a868f77ee0e39caa3767875e4c3c7739c46d93c6e169e
10818+
languageName: node
10819+
linkType: hard
10820+
1083010821
"@sentry/expo-upload-sourcemaps@workspace:*, @sentry/expo-upload-sourcemaps@workspace:packages/expo-upload-sourcemaps":
1083110822
version: 0.0.0-use.local
1083210823
resolution: "@sentry/expo-upload-sourcemaps@workspace:packages/expo-upload-sourcemaps"
@@ -10932,14 +10923,14 @@ __metadata:
1093210923
"@microsoft/api-extractor": ^7.58.7
1093310924
"@mswjs/interceptors": ^0.25.15
1093410925
"@react-native/babel-preset": 0.80.0
10935-
"@sentry-internal/eslint-plugin-sdk": 10.57.0
10936-
"@sentry-internal/typescript": 10.57.0
1093710926
"@sentry/babel-plugin-component-annotate": 5.3.0
1093810927
"@sentry/browser": 10.57.0
1093910928
"@sentry/cli": 3.5.0
1094010929
"@sentry/core": 10.57.0
10930+
"@sentry/eslint-plugin-sdk": 10.58.0
1094110931
"@sentry/expo-upload-sourcemaps": "workspace:*"
1094210932
"@sentry/react": 10.57.0
10933+
"@sentry/typescript": 10.58.0
1094310934
"@sentry/wizard": 6.12.0
1094410935
"@testing-library/react-native": ^13.2.2
1094510936
"@types/jest": ^29.5.13
@@ -10997,6 +10988,15 @@ __metadata:
1099710988
languageName: node
1099810989
linkType: hard
1099910990

10991+
"@sentry/typescript@npm:10.58.0":
10992+
version: 10.58.0
10993+
resolution: "@sentry/typescript@npm:10.58.0"
10994+
peerDependencies:
10995+
typescript: ~5.8.0
10996+
checksum: a04992765b02a25c1616b9d7d92ee997fa463000a983b4ff47cfed48ed4cef41263f42ebe6a6a759956798a45a0a8068d1f5d831862cc20f836e17a79d5d06d3
10997+
languageName: node
10998+
linkType: hard
10999+
1100011000
"@sentry/wizard@npm:6.12.0":
1100111001
version: 6.12.0
1100211002
resolution: "@sentry/wizard@npm:6.12.0"

0 commit comments

Comments
 (0)