Skip to content

Commit f21735e

Browse files
Lms24Lms24
committed
fix(react-router): Ensure source map upload fails if Sentry CLI fails
1 parent 8f4d56f commit f21735e

File tree

3 files changed

+130
-4
lines changed

3 files changed

+130
-4
lines changed

‎packages/react-router/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@opentelemetry/instrumentation": "^0.203.0",
4040
"@opentelemetry/semantic-conventions": "^1.34.0",
4141
"@sentry/browser": "10.0.0",
42-
"@sentry/cli": "^2.46.0",
42+
"@sentry/cli": "^2.50.2",
4343
"@sentry/core": "10.0.0",
4444
"@sentry/node": "10.0.0",
4545
"@sentry/react": "10.0.0",

‎packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ export const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteCo
5959
if (sourceMapsUploadOptions?.enabled ?? (true && viteConfig.build.sourcemap !== false)) {
6060
// inject debugIds
6161
try {
62-
await cliInstance.execute(['sourcemaps', 'inject', reactRouterConfig.buildDirectory], debug);
62+
await cliInstance.execute(
63+
['sourcemaps', 'inject', reactRouterConfig.buildDirectory],
64+
// @ts-expect-error - 'rejectOnError' is not yet exported as a type from @sentry/cli. It is valid though.
65+
// TODO: update to @sentry/[email protected] once the fix is released: https://github.com/getsentry/sentry-cli/pull/2628
66+
debug ? 'rejectOnError' : false,
67+
);
6368
} catch (error) {
6469
// eslint-disable-next-line no-console
6570
console.error('[Sentry] Could not inject debug ids', error);
@@ -73,6 +78,7 @@ export const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteCo
7378
paths: [reactRouterConfig.buildDirectory],
7479
},
7580
],
81+
live: 'rejectOnError',
7682
});
7783
} catch (error) {
7884
// eslint-disable-next-line no-console

‎yarn.lock

Lines changed: 122 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6924,7 +6924,7 @@
69246924
mitt "^3.0.0"
69256925

69266926
"@sentry-internal/test-utils@link:dev-packages/test-utils":
6927-
version "9.40.0"
6927+
version "10.0.0"
69286928
dependencies:
69296929
express "^4.21.1"
69306930

@@ -6947,47 +6947,147 @@
69476947
magic-string "0.30.8"
69486948
unplugin "1.0.1"
69496949

6950+
"@sentry/[email protected]":
6951+
version "2.49.0"
6952+
resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.49.0.tgz#290657e5840b360cb8ca25c8a78f8c0f15c66b03"
6953+
integrity sha512-bgowyDeFuXbjkGq1ZKqcWhmzgfBe7oKIXYWJOOps4+32QfG+YsrdNnottHS01td3bzrJq0QnHj8H12fA81DqrA==
6954+
69506955
"@sentry/[email protected]":
69516956
version "2.50.0"
69526957
resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.50.0.tgz#0fec0ece84afe37b33464ccd514367fc95d507f3"
69536958
integrity sha512-Aj+cLBZ0dCw+pdUxvJ1U71PnKh2YjvpzLN9h1ZTe8UI3FqmkKkSH/J8mN/5qmR7qUHjDcm2l+wfgVUaaP8CWbA==
69546959

6960+
"@sentry/[email protected]":
6961+
version "2.50.2"
6962+
resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.50.2.tgz#fcf924fcc02cfa54748ff07a380334e533635c74"
6963+
integrity sha512-0Pjpl0vQqKhwuZm19z6AlEF+ds3fJg1KWabv8WzGaSc/fwxMEwjFwOZj+IxWBJPV578cXXNvB39vYjjpCH8j7A==
6964+
6965+
"@sentry/[email protected]":
6966+
version "2.49.0"
6967+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.49.0.tgz#a732004d7131f7e7b44f6a64abdccc36efb35d52"
6968+
integrity sha512-dqxsDUd76aDm03fUwUOs5BR7RHLpSb2EH/B1hlWm0mFvo9uY907XxW9wDFx/qDpCdmpC0aF+lF/lOBOrG9B5Fg==
6969+
69556970
"@sentry/[email protected]":
69566971
version "2.50.0"
69576972
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.50.0.tgz#bbafacf82766d45ff05434cd7cabbda7005d1efd"
69586973
integrity sha512-p6hIh4Bb87qBfEz9w5dxEPAohIKcw68qoy5VUTx+cCanO8uXNWWsT78xtUNFRscW9zc6MxQMSITTWaCEIKvxRA==
69596974

6975+
"@sentry/[email protected]":
6976+
version "2.50.2"
6977+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.50.2.tgz#ac9e6dba42095832bac8084abab4b86fdd2956f3"
6978+
integrity sha512-03Cj215M3IdoHAwevCxm5oOm9WICFpuLR05DQnODFCeIUsGvE1pZsc+Gm0Ky/ZArq2PlShBJTpbHvXbCUka+0w==
6979+
6980+
"@sentry/[email protected]":
6981+
version "2.49.0"
6982+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.49.0.tgz#73719561510df3369e05e9a4898b4e43b8753e4c"
6983+
integrity sha512-RBDIjIGmNsFw+a6vAt6m3D7ROKsMEB9i3u+UuIRxk0/DyHTcfVWxnK/ScPXGILM6PxQ2XOBfOKad0mmiDHBzZA==
6984+
69606985
"@sentry/[email protected]":
69616986
version "2.50.0"
69626987
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.50.0.tgz#e1fed09b94c508db9de5353d8305828b0a3551e9"
69636988
integrity sha512-SGPAFwOY2of2C+RUBJcxMN2JXikVFEk8ypYOsQTEvV/48cLejcO/O2mHIj/YKgIkrfn3t7LlqdK6g75lkz+F8Q==
69646989

6990+
"@sentry/[email protected]":
6991+
version "2.50.2"
6992+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.50.2.tgz#835acd53ca83f6be9fc0d3d85a3cd4c694051bce"
6993+
integrity sha512-jzFwg9AeeuFAFtoCcyaDEPG05TU02uOy1nAX09c1g7FtsyQlPcbhI94JQGmnPzdRjjDmORtwIUiVZQrVTkDM7w==
6994+
6995+
"@sentry/[email protected]":
6996+
version "2.49.0"
6997+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.49.0.tgz#8d1bb1378251a3aa995cc4b56bd352fa12a84b66"
6998+
integrity sha512-gDAd5/vJbEhd4Waud0Cd8ZRqLEagDlOvWwNH3KB694EiHJUwzRSiTA1YUVMYGI8Z9UyEA1sKxARwm2Trv99BxA==
6999+
69657000
"@sentry/[email protected]":
69667001
version "2.50.0"
69677002
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.50.0.tgz#95f0eb65bdde4c33e492830ae4ac207b60494f8e"
69687003
integrity sha512-umhGmbiCUG7MvjTm8lXFmFxQjyTVtYakilBwPTVzRELmNKxxhfKRxwSSA+hUKetAUzNd8fJx8K7yqdw+qRA7Pg==
69697004

7005+
"@sentry/[email protected]":
7006+
version "2.50.2"
7007+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.50.2.tgz#72f0e4bc1c515754aa11225efce711a24fb53524"
7008+
integrity sha512-J+POvB34uVyHbIYF++Bc/OCLw+gqKW0H/y/mY7rRZCiocgpk266M4NtsOBl6bEaurMx1D+BCIEjr4nc01I/rqA==
7009+
7010+
"@sentry/[email protected]":
7011+
version "2.49.0"
7012+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.49.0.tgz#7bf58fb7005c89fdde4e1262d5ed35e23065aceb"
7013+
integrity sha512-mbohGvPNhHjUciYNXzkt9TYUebTmxeAp9v9JfLSb/Soz6fubKwEHhpRJuz1zASxVWIR4PuqkePchqN5zhcLC0A==
7014+
69707015
"@sentry/[email protected]":
69717016
version "2.50.0"
69727017
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.50.0.tgz#5266b6b8660e6b72688331b7c702e9d1ca6413ed"
69737018
integrity sha512-ugIIx9+wUmguxOUe9ZVacvdCffZwqtFSKwpJ06Nqes0XfL4ZER4Qlq3/miCZ8m150C4xK5ym/QCwB41ffBqI4g==
69747019

7020+
"@sentry/[email protected]":
7021+
version "2.50.2"
7022+
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.50.2.tgz#d06f8ffd65871b1373a0d2228ab254d9456a615c"
7023+
integrity sha512-81yQVRLj8rnuHoYcrM7QbOw8ubA3weiMdPtTxTim1s6WExmPgnPTKxLCr9xzxGJxFdYo3xIOhtf5JFpUX/3j4A==
7024+
7025+
"@sentry/[email protected]":
7026+
version "2.49.0"
7027+
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.49.0.tgz#2bf6dd911acbe3ddb02eec0afb4301bb8fb25b53"
7028+
integrity sha512-3zwvsp61EPpSuGpGdXY4JelVJmNEjoj4vn5m6EFoOtk7OUI5/VFqqR4wchjy9Hjm3Eh6MB5K+KTKXs4W2p18ng==
7029+
69757030
"@sentry/[email protected]":
69767031
version "2.50.0"
69777032
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.50.0.tgz#663d75fea42b853940c6faacf7ee76a16b449654"
69787033
integrity sha512-fMyBSKLrVHY9944t8oTpul+6osyQeuN8GGGP3diDxGQpynYL+vhcHZIpXFRH398+3kedG/IFoY7EwGgIEqWzmw==
69797034

7035+
"@sentry/[email protected]":
7036+
version "2.50.2"
7037+
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.50.2.tgz#4bd7a140367c17f77d621903cfe0914232108657"
7038+
integrity sha512-QjentLGvpibgiZlmlV9ifZyxV73lnGH6pFZWU5wLeRiaYKxWtNrrHpVs+HiWlRhkwQ0mG1/S40PGNgJ20DJ3gA==
7039+
7040+
"@sentry/[email protected]":
7041+
version "2.49.0"
7042+
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.49.0.tgz#32e31472ae6c5f69e538a4061d651937fcb8f14a"
7043+
integrity sha512-2oWaNl6z0BaOCAjM1Jxequfgjod3XO6wothxow4kA8e9+43JLhgarSdpwJPgQjcVyxjygwQ3/jKPdUFh0qNOmg==
7044+
69807045
"@sentry/[email protected]":
69817046
version "2.50.0"
69827047
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.50.0.tgz#96813ca970f35a839d7f817534ac556bc1df1567"
69837048
integrity sha512-VbC+l2Y2kB7Lsun2c8t7ZGwmljmXnyncZLW9PjdEyJSTAJ9GnEnSvyFSPXNLV/eHJnfQffzU7QTjU8vkQ7XMYg==
69847049

7050+
"@sentry/[email protected]":
7051+
version "2.50.2"
7052+
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.50.2.tgz#1eb997cf780c396446cdd8e63c6d4309894465e8"
7053+
integrity sha512-UkBIIzkQkQ1UkjQX8kHm/+e7IxnEhK6CdgSjFyNlxkwALjDWHJjMztevqAPz3kv4LdM6q1MxpQ/mOqXICNhEGg==
7054+
7055+
"@sentry/[email protected]":
7056+
version "2.49.0"
7057+
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.49.0.tgz#86aab38cb41f885914d7c99ceaab7b6ce52c72c6"
7058+
integrity sha512-dR4ulyrA6ZT7x7cg4Rwm0tcHf4TZz5QO6t1W1jX6uJ9n/U0bOSqSFZHNf/RryiUzQE1g8LBthOYyKGMkET6T8w==
7059+
69857060
"@sentry/[email protected]":
69867061
version "2.50.0"
69877062
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.50.0.tgz#9f644efed8cb75943078a0ca4e414fa21dda6280"
69887063
integrity sha512-nMktyF93NtQUOViAAKHpHSWACOGjOkKjiewi4pD6W3sWllFiPPyt15XoyApqWwnICDRQu2DI5vnil4ck6/k7mw==
69897064

6990-
"@sentry/cli@^2.46.0", "@sentry/cli@^2.49.0", "@sentry/cli@^2.50.0":
7065+
"@sentry/[email protected]":
7066+
version "2.50.2"
7067+
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.50.2.tgz#1d0c106125b6dc87f3a598ac02519c699f17a6c0"
7068+
integrity sha512-tE27pu1sRRub1Jpmemykv3QHddBcyUk39Fsvv+n4NDpQyMgsyVPcboxBZyby44F0jkpI/q3bUH2tfCB1TYDNLg==
7069+
7070+
"@sentry/cli@^2.49.0":
7071+
version "2.49.0"
7072+
resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.49.0.tgz#a8332ae38e9f92a0da3d939bdbce119e63450e99"
7073+
integrity sha512-99IKax3yjOaPlWJh3rAJC/R6hdmZZJ2B3ACVP8CpOYE+JzGGLyir1fvTzrdFKFLPLOq2lGC3RqWuKqU7PJUTZQ==
7074+
dependencies:
7075+
https-proxy-agent "^5.0.0"
7076+
node-fetch "^2.6.7"
7077+
progress "^2.0.3"
7078+
proxy-from-env "^1.1.0"
7079+
which "^2.0.2"
7080+
optionalDependencies:
7081+
"@sentry/cli-darwin" "2.49.0"
7082+
"@sentry/cli-linux-arm" "2.49.0"
7083+
"@sentry/cli-linux-arm64" "2.49.0"
7084+
"@sentry/cli-linux-i686" "2.49.0"
7085+
"@sentry/cli-linux-x64" "2.49.0"
7086+
"@sentry/cli-win32-arm64" "2.49.0"
7087+
"@sentry/cli-win32-i686" "2.49.0"
7088+
"@sentry/cli-win32-x64" "2.49.0"
7089+
7090+
"@sentry/cli@^2.50.0":
69917091
version "2.50.0"
69927092
resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.50.0.tgz#7e2298bea9a2bb50126bfb24116ae98199bc1f6f"
69937093
integrity sha512-OHRRQPUNjBpzOT6arNhxXQ71DKs5jSziCfDzmEGwAs+K8J/I1QxnvJkto88HbXE54oiWhSEJwL0pvcowFXyVbA==
@@ -7007,6 +7107,26 @@
70077107
"@sentry/cli-win32-i686" "2.50.0"
70087108
"@sentry/cli-win32-x64" "2.50.0"
70097109

7110+
"@sentry/cli@^2.50.2":
7111+
version "2.50.2"
7112+
resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.50.2.tgz#9fb90f2ae6648fc0104f0ca7f528d2e19ee0ecae"
7113+
integrity sha512-m1L9shxutF3WHSyNld6Y1vMPoXfEyQhoRh1V3SYSdl+4AB40U+zr2sRzFa2OPm7XP4zYNaWuuuHLkY/iHITs8Q==
7114+
dependencies:
7115+
https-proxy-agent "^5.0.0"
7116+
node-fetch "^2.6.7"
7117+
progress "^2.0.3"
7118+
proxy-from-env "^1.1.0"
7119+
which "^2.0.2"
7120+
optionalDependencies:
7121+
"@sentry/cli-darwin" "2.50.2"
7122+
"@sentry/cli-linux-arm" "2.50.2"
7123+
"@sentry/cli-linux-arm64" "2.50.2"
7124+
"@sentry/cli-linux-i686" "2.50.2"
7125+
"@sentry/cli-linux-x64" "2.50.2"
7126+
"@sentry/cli-win32-arm64" "2.50.2"
7127+
"@sentry/cli-win32-i686" "2.50.2"
7128+
"@sentry/cli-win32-x64" "2.50.2"
7129+
70107130
"@sentry/rollup-plugin@^4.0.0":
70117131
version "4.0.0"
70127132
resolved "https://registry.yarnpkg.com/@sentry/rollup-plugin/-/rollup-plugin-4.0.0.tgz#746112b23333d39b3cd1f0e285ca242dd753de67"

0 commit comments

Comments
 (0)