From 89e24f2ce59cc40b871078bacd40f703ca8c8309 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 1 Jul 2025 12:57:48 +0200 Subject: [PATCH 1/2] deps: Bump `@sentry/cli` to `^2.46.0` Also make it use `^` so we also get future updates as well. --- packages/bundler-plugin-core/package.json | 4 +- yarn.lock | 98 ++++++++++++----------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/packages/bundler-plugin-core/package.json b/packages/bundler-plugin-core/package.json index 726489a1..53980c27 100644 --- a/packages/bundler-plugin-core/package.json +++ b/packages/bundler-plugin-core/package.json @@ -53,8 +53,8 @@ }, "dependencies": { "@babel/core": "^7.18.5", - "@sentry/babel-plugin-component-annotate": "3.5.0", - "@sentry/cli": "2.42.2", + "@sentry/babel-plugin-component-annotate": "^3.5.0", + "@sentry/cli": "^2.46.0", "dotenv": "^16.3.1", "find-up": "^5.0.0", "glob": "^9.3.2", diff --git a/yarn.lock b/yarn.lock index 74fc835d..53bc2339 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,45 +2726,50 @@ "@sentry/utils" "7.50.0" tslib "^1.9.3" -"@sentry/cli-darwin@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.42.2.tgz#a32a4f226e717122b37d9969e8d4d0e14779f720" - integrity sha512-GtJSuxER7Vrp1IpxdUyRZzcckzMnb4N5KTW7sbTwUiwqARRo+wxS+gczYrS8tdgtmXs5XYhzhs+t4d52ITHMIg== - -"@sentry/cli-linux-arm64@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.42.2.tgz#1c06c83ff21f51ec23acf5be3b1f8c7553bf86b1" - integrity sha512-BOxzI7sgEU5Dhq3o4SblFXdE9zScpz6EXc5Zwr1UDZvzgXZGosUtKVc7d1LmkrHP8Q2o18HcDWtF3WvJRb5Zpw== - -"@sentry/cli-linux-arm@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.42.2.tgz#00cadc359ae3c051efb3e63873c033c61dbd1ca1" - integrity sha512-7udCw+YL9lwq+9eL3WLspvnuG+k5Icg92YE7zsteTzWLwgPVzaxeZD2f8hwhsu+wmL+jNqbpCRmktPteh3i2mg== - -"@sentry/cli-linux-i686@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.42.2.tgz#3b817b715dd806c20dfbffd539725ad8089c310a" - integrity sha512-Sw/dQp5ZPvKnq3/y7wIJyxTUJYPGoTX/YeMbDs8BzDlu9to2LWV3K3r7hE7W1Lpbaw4tSquUHiQjP5QHCOS7aQ== - -"@sentry/cli-linux-x64@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.42.2.tgz#ddf906bc3071cc79ce6e633eddcb76bb9068e688" - integrity sha512-mU4zUspAal6TIwlNLBV5oq6yYqiENnCWSxtSQVzWs0Jyq97wtqGNG9U+QrnwjJZ+ta/hvye9fvL2X25D/RxHQw== - -"@sentry/cli-win32-i686@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.42.2.tgz#9036085c7c6ce455ad45fda411c55ff39c06eb95" - integrity sha512-iHvFHPGqgJMNqXJoQpqttfsv2GI3cGodeTq4aoVLU/BT3+hXzbV0x1VpvvEhncJkDgDicJpFLM8sEPHb3b8abw== - -"@sentry/cli-win32-x64@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.42.2.tgz#7d6464b63f32c9f97fff428f246b1f039b402233" - integrity sha512-vPPGHjYoaGmfrU7xhfFxG7qlTBacroz5NdT+0FmDn6692D8IvpNXl1K+eV3Kag44ipJBBeR8g1HRJyx/F/9ACw== - -"@sentry/cli@2.42.2": - version "2.42.2" - resolved "https://registry.npmjs.org/@sentry/cli/-/cli-2.42.2.tgz#8173df4d057d600a9ef0cf1e9b42b0c6607b46e4" - integrity sha512-spb7S/RUumCGyiSTg8DlrCX4bivCNmU/A1hcfkwuciTFGu8l5CDc2I6jJWWZw8/0enDGxuj5XujgXvU5tr4bxg== +"@sentry/cli-darwin@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.46.0.tgz#e07ff66f03e8cb6e1988b7673ae5dbd6ff957b1d" + integrity sha512-5Ll+e5KAdIk9OYiZO8aifMBRNWmNyPjSqdjaHlBC1Qfh7pE3b1zyzoHlsUazG0bv0sNrSGea8e7kF5wIO1hvyg== + +"@sentry/cli-linux-arm64@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.46.0.tgz#d5b27e5813e7b3add65c9e3dbdd75a8bea4ef324" + integrity sha512-OEJN8yAjI9y5B4telyqzu27Hi3+S4T8VxZCqJz1+z2Mp0Q/MZ622AahVPpcrVq/5bxrnlZR16+lKh8L1QwNFPg== + +"@sentry/cli-linux-arm@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.46.0.tgz#d2a0f21cd208ef8e844bc5e565b337640d125441" + integrity sha512-WRrLNq/TEX/TNJkGqq6Ad0tGyapd5dwlxtsPbVBrIdryuL1mA7VCBoaHBr3kcwJLsgBHFH0lmkMee2ubNZZdkg== + +"@sentry/cli-linux-i686@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.46.0.tgz#73368ebe30236c8647caec420f717a7f45410f29" + integrity sha512-xko3/BVa4LX8EmRxVOCipV+PwfcK5Xs8lP6lgF+7NeuAHMNL4DqF6iV9rrN8gkGUHCUI9RXSve37uuZnFy55+Q== + +"@sentry/cli-linux-x64@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.46.0.tgz#49da3dfd873e0e72abef968e1c213b9397e5d70e" + integrity sha512-hJ1g5UEboYcOuRia96LxjJ0jhnmk8EWLDvlGnXLnYHkwy3ree/L7sNgdp/QsY8Z4j2PGO5f22Va+UDhSjhzlfQ== + +"@sentry/cli-win32-arm64@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.46.0.tgz#4e26b254d5283eb114ac916ac504283a30b2ecdb" + integrity sha512-mN7cpPoCv2VExFRGHt+IoK11yx4pM4ADZQGEso5BAUZ5duViXB2WrAXCLd8DrwMnP0OE978a7N8OtzsFqjkbNA== + +"@sentry/cli-win32-i686@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.46.0.tgz#72f7c0a611f17b7e5b34e2b47309d165195a8276" + integrity sha512-6F73AUE3lm71BISUO19OmlnkFD5WVe4/wA1YivtLZTc1RU3eUYJLYxhDfaH3P77+ycDppQ2yCgemLRaA4A8mNQ== + +"@sentry/cli-win32-x64@2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.46.0.tgz#8cfd438ec365b0ee925d9724a24b533b4cb75587" + integrity sha512-yuGVcfepnNL84LGA0GjHzdMIcOzMe0bjPhq/rwPsPN+zu11N+nPR2wV2Bum4U0eQdqYH3iAlMdL5/BEQfuLJww== + +"@sentry/cli@^2.46.0": + version "2.46.0" + resolved "https://registry.npmjs.org/@sentry/cli/-/cli-2.46.0.tgz#790864874ea04f804053aa85dc94501b2cc321bb" + integrity sha512-nqoPl7UCr446QFkylrsRrUXF51x8Z9dGquyf4jaQU+OzbOJMqclnYEvU6iwbwvaw3tu/2DnoZE/Og+Nq1h63sA== dependencies: https-proxy-agent "^5.0.0" node-fetch "^2.6.7" @@ -2772,13 +2777,14 @@ proxy-from-env "^1.1.0" which "^2.0.2" optionalDependencies: - "@sentry/cli-darwin" "2.42.2" - "@sentry/cli-linux-arm" "2.42.2" - "@sentry/cli-linux-arm64" "2.42.2" - "@sentry/cli-linux-i686" "2.42.2" - "@sentry/cli-linux-x64" "2.42.2" - "@sentry/cli-win32-i686" "2.42.2" - "@sentry/cli-win32-x64" "2.42.2" + "@sentry/cli-darwin" "2.46.0" + "@sentry/cli-linux-arm" "2.46.0" + "@sentry/cli-linux-arm64" "2.46.0" + "@sentry/cli-linux-i686" "2.46.0" + "@sentry/cli-linux-x64" "2.46.0" + "@sentry/cli-win32-arm64" "2.46.0" + "@sentry/cli-win32-i686" "2.46.0" + "@sentry/cli-win32-x64" "2.46.0" "@sentry/core@7.50.0": version "7.50.0" From fead536a70c24c4db38df93ecbda7c6d25234a92 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 1 Jul 2025 14:24:54 +0200 Subject: [PATCH 2/2] fix test to handle retries --- .../fixtures/errorhandling/error-no-handler.test.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/integration-tests/fixtures/errorhandling/error-no-handler.test.ts b/packages/integration-tests/fixtures/errorhandling/error-no-handler.test.ts index fd93a8cb..7aaaa82b 100644 --- a/packages/integration-tests/fixtures/errorhandling/error-no-handler.test.ts +++ b/packages/integration-tests/fixtures/errorhandling/error-no-handler.test.ts @@ -37,7 +37,12 @@ describe("Error throwing by default (no errorHandler)", () => { "doesn't throw when Sentry server responds with error code for %s", async (bundler) => { const buildProcess = spawn("yarn", ["ts-node", path.join(__dirname, `build-${bundler}.ts`)], { - env: { ...process.env, FAKE_SENTRY_PORT }, + env: { + ...process.env, + FAKE_SENTRY_PORT, + // only retry once to avoid the test from timing out due to retries + SENTRY_HTTP_MAX_RETRIES: "1", + }, stdio: "ignore", // <-- set to "inherit" to get build output. Deactivated to avoid spamming test logs. shell: true, });