From 69333d2d7398f758843e8011fa7a9d13f2db9a47 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Wed, 8 Jan 2025 22:29:49 +0100 Subject: [PATCH] feat: Update JavaScript SDKs to v8.48.0 (#1046) --- .github/workflows/build.yml | 4 +- package.json | 10 +- src/renderer/sdk.ts | 2 +- test/e2e/test-apps/anr/anr-main/event.json | 9 ++ test/e2e/test-apps/anr/anr-main/recipe.yml | 2 +- test/e2e/test-apps/anr/anr-main/src/main.js | 2 + yarn.lock | 120 ++++++++++---------- 7 files changed, 80 insertions(+), 69 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73e2f11a..c73bf3f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: # we want that the matrix keeps running, default is to cancel all if one fails. fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-22.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -73,7 +73,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-22.04, windows-latest, macos-latest] electron: ${{ fromJson(needs.build.outputs.matrix) }} env: ELECTRON_VERSION: ${{ matrix.electron }} diff --git a/package.json b/package.json index a24ca817..58ca8da3 100644 --- a/package.json +++ b/package.json @@ -60,16 +60,16 @@ "e2e": "xvfb-maybe vitest run --root=./test/e2e --silent=false --disable-console-intercept" }, "dependencies": { - "@sentry/browser": "8.47.0", - "@sentry/core": "8.47.0", - "@sentry/node": "8.47.0", + "@sentry/browser": "8.48.0", + "@sentry/core": "8.48.0", + "@sentry/node": "8.48.0", "deepmerge": "4.3.1" }, "devDependencies": { "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-typescript": "^11.1.6", - "@sentry-internal/eslint-config-sdk": "8.47.0", - "@sentry-internal/typescript": "8.47.0", + "@sentry-internal/eslint-config-sdk": "8.48.0", + "@sentry-internal/typescript": "8.48.0", "@types/busboy": "^1.5.4", "@types/form-data": "^2.5.0", "@types/koa": "^2.0.52", diff --git a/src/renderer/sdk.ts b/src/renderer/sdk.ts index adf1d481..39d8cce4 100644 --- a/src/renderer/sdk.ts +++ b/src/renderer/sdk.ts @@ -50,7 +50,7 @@ interface ElectronRendererOptions extends Omit( options: ElectronRendererOptions & O = {} as ElectronRendererOptions & O, // This parameter name ensures that TypeScript error messages contain a hint for fixing SDK version mismatches - originalInit: (if_you_get_a_typescript_error_ensure_sdks_use_version_v8_47_0: O) => void = browserInit, + originalInit: (if_you_get_a_typescript_error_ensure_sdks_use_version_v8_48_0: O) => void = browserInit, ): void { // Ensure the browser SDK is only init'ed once. if (window?.__SENTRY__RENDERER_INIT__) { diff --git a/test/e2e/test-apps/anr/anr-main/event.json b/test/e2e/test-apps/anr/anr-main/event.json index 7305ef1a..dd5fc3f3 100644 --- a/test/e2e/test-apps/anr/anr-main/event.json +++ b/test/e2e/test-apps/anr/anr-main/event.json @@ -74,6 +74,15 @@ } ] }, + "debug_meta": { + "images": [ + { + "type": "sourcemap", + "code_file": "app:///src/main.mjs", + "debug_id": "aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaa" + } + ] + }, "level": "error", "platform": "node", "tags": { diff --git a/test/e2e/test-apps/anr/anr-main/recipe.yml b/test/e2e/test-apps/anr/anr-main/recipe.yml index 17b7ad18..fa6c31a8 100644 --- a/test/e2e/test-apps/anr/anr-main/recipe.yml +++ b/test/e2e/test-apps/anr/anr-main/recipe.yml @@ -1,4 +1,4 @@ description: ANR Main Event category: ANR command: yarn -condition: version.major >= 22 +condition: version.major >= 28 diff --git a/test/e2e/test-apps/anr/anr-main/src/main.js b/test/e2e/test-apps/anr/anr-main/src/main.js index 81f65bb3..c0b06e1d 100644 --- a/test/e2e/test-apps/anr/anr-main/src/main.js +++ b/test/e2e/test-apps/anr/anr-main/src/main.js @@ -3,6 +3,8 @@ const crypto = require('crypto'); const { app } = require('electron'); const { init, anrIntegration } = require('@sentry/electron/main'); +global._sentryDebugIds = { [new Error().stack]: 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaa' }; + init({ dsn: '__DSN__', debug: true, diff --git a/yarn.lock b/yarn.lock index 5a6adbf8..214ae286 100644 --- a/yarn.lock +++ b/yarn.lock @@ -729,20 +729,20 @@ resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g== -"@sentry-internal/browser-utils@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.47.0.tgz#39f2766a1bbdffc2d211e2f61f8ed8c258245b3d" - integrity sha512-vOXzYzHTKkahTLDzWWIA4EiVCQ+Gk+7xGWUlNcR2ZiEPBqYZVb5MjsUozAcc7syrSUy6WicyFjcomZ3rlCVQhg== +"@sentry-internal/browser-utils@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.48.0.tgz#320713e29566929894de42d54152064ec19cc9b3" + integrity sha512-pLtu0Fa1Ou0v3M1OEO1MB1EONJVmXEGtoTwFRCO1RPQI2ulmkG6BikINClFG5IBpoYKZ33WkEXuM6U5xh+pdZg== dependencies: - "@sentry/core" "8.47.0" + "@sentry/core" "8.48.0" -"@sentry-internal/eslint-config-sdk@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-config-sdk/-/eslint-config-sdk-8.47.0.tgz#b66b086f009ca96936d2922b1b2224e76c526399" - integrity sha512-8ZsAAEOdswnPot6vtlvzWpWj2gwODKCJNTkv9PY7n305RkimjI0EM95UP+FNXEUTlT7iZHabMlt+owZiTKhd0Q== +"@sentry-internal/eslint-config-sdk@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-config-sdk/-/eslint-config-sdk-8.48.0.tgz#df995d5028e0e0a9c81bf4c2c626b9a185589fb6" + integrity sha512-GY4cBxyPdqw34K2m+mWXvNQDKl+k3AfYhclIGv059u8dx6OMtWtToPRbX3fZImP2ZDTz5pZoZIqKWz2a7SE6pw== dependencies: - "@sentry-internal/eslint-plugin-sdk" "8.47.0" - "@sentry-internal/typescript" "8.47.0" + "@sentry-internal/eslint-plugin-sdk" "8.48.0" + "@sentry-internal/typescript" "8.48.0" "@typescript-eslint/eslint-plugin" "^5.48.0" "@typescript-eslint/parser" "^5.48.0" eslint-config-prettier "^6.11.0" @@ -752,59 +752,59 @@ eslint-plugin-jsdoc "^30.0.3" eslint-plugin-simple-import-sort "^5.0.3" -"@sentry-internal/eslint-plugin-sdk@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-plugin-sdk/-/eslint-plugin-sdk-8.47.0.tgz#136efcd1e5ba19c940b6cabc98c074f1170789e7" - integrity sha512-ckjzxuZoOTVMHrEPqfPivGd1F2CPnyU0hOV29EqPOyBEgM1dQOAmCntDL9szQy3sngfQBgC/bRZkHzP3nrm3eA== +"@sentry-internal/eslint-plugin-sdk@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-plugin-sdk/-/eslint-plugin-sdk-8.48.0.tgz#2afed53d2d26a58fd3d0dd09182a4666102cb9df" + integrity sha512-8yeT/UAHGIKif8Sf/p1xzAtHGoqwXw7YdYgsYbxwuiWDkSsCANTZG9tijyvUsmlIgy8G4ausyX/S4oH1IFJewA== -"@sentry-internal/feedback@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.47.0.tgz#22bceac03b61ab8509e79c0875fb140f214b7c4f" - integrity sha512-IAiIemTQIalxAOYhUENs9bZ8pMNgJnX3uQSuY7v0gknEqClOGpGkG04X/cxCmtJUj1acZ9ShTGDxoh55a+ggAQ== +"@sentry-internal/feedback@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.48.0.tgz#92d2301b0e7379716efae6c05bc4a4740687921a" + integrity sha512-6PwcJNHVPg0EfZxmN+XxVOClfQpv7MBAweV8t9i5l7VFr8sM/7wPNSeU/cG7iK19Ug9ZEkBpzMOe3G4GXJ5bpw== dependencies: - "@sentry/core" "8.47.0" + "@sentry/core" "8.48.0" -"@sentry-internal/replay-canvas@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.47.0.tgz#5bbd04c81235b2bf627aa216185ae1993d2102c4" - integrity sha512-M4W9UGouEeELbGbP3QsXLDVtGiQSZoWJlKwqMWyqdQgZuLoKw0S33+60t6teLVMhuQZR0UI9VJTF5coiXysnnA== +"@sentry-internal/replay-canvas@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.48.0.tgz#f88282b0594751407ca3016d0a63b133c2e37ac3" + integrity sha512-LdivLfBXXB9us1aAc6XaL7/L2Ob4vi3C/fEOXElehg3qHjX6q6pewiv5wBvVXGX1NfZTRvu+X11k6TZoxKsezw== dependencies: - "@sentry-internal/replay" "8.47.0" - "@sentry/core" "8.47.0" + "@sentry-internal/replay" "8.48.0" + "@sentry/core" "8.48.0" -"@sentry-internal/replay@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.47.0.tgz#4f7bd359df2de25d919a378295cab67dfa05a406" - integrity sha512-G/S40ZBORj0HSMLw/uVC6YDEPN/dqVk901vf4VYfml686DEhJrZesfAfp5SydJumQ0NKZQrdtvny+BWnlI5H1w== +"@sentry-internal/replay@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.48.0.tgz#2cc802178f6b0185581b61058f2541b9f3384a8b" + integrity sha512-csILVupc5RkrsTrncuUTGmlB56FQSFjXPYWG8I8yBTGlXEJ+o8oTuF6+55R4vbw3EIzBveXWi4kEBbnQlXW/eg== dependencies: - "@sentry-internal/browser-utils" "8.47.0" - "@sentry/core" "8.47.0" + "@sentry-internal/browser-utils" "8.48.0" + "@sentry/core" "8.48.0" -"@sentry-internal/typescript@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/typescript/-/typescript-8.47.0.tgz#acd2319f412fbffeaf13731dfcd98cf4b39c4d8d" - integrity sha512-fLty4cnrQkihjTsqkbY5FXT67i+EN8QD12QjV/PSR3YA0ExzfGIr/Hujf71AbDK+Y5qMWieKIAd84t8/cCjElA== +"@sentry-internal/typescript@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/typescript/-/typescript-8.48.0.tgz#af0480301a686cb8d4f9283da3e6465e62901156" + integrity sha512-i3FGdGgSxeRE9wZOYQX4NEANVdUgTAtebrbgKS4zr5C9GHaepNeq+1hTcjzJ/Xi1ICzN1hLIlQZYTGdX39eOsw== -"@sentry/browser@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.47.0.tgz#fe0b6b65c0394f54438d6704039adeaec214ce18" - integrity sha512-K6BzHisykmbFy/wORtGyfsAlw7ShevLALzu3ReZZZ18dVubO1bjSNjkZQU9MJD5Jcb9oLwkq89n3N9XIBfvdRA== +"@sentry/browser@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.48.0.tgz#bdd7793ddd3ae7a65d595066bde93fbb63ce8b9d" + integrity sha512-fuuVULB5/1vI8NoIwXwR3xwhJJqk+y4RdSdajExGF7nnUDBpwUJyXsmYJnOkBO+oLeEs58xaCpotCKiPUNnE3g== dependencies: - "@sentry-internal/browser-utils" "8.47.0" - "@sentry-internal/feedback" "8.47.0" - "@sentry-internal/replay" "8.47.0" - "@sentry-internal/replay-canvas" "8.47.0" - "@sentry/core" "8.47.0" + "@sentry-internal/browser-utils" "8.48.0" + "@sentry-internal/feedback" "8.48.0" + "@sentry-internal/replay" "8.48.0" + "@sentry-internal/replay-canvas" "8.48.0" + "@sentry/core" "8.48.0" -"@sentry/core@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.47.0.tgz#e811444552f7a91b5de573875a318a6cd4e802f8" - integrity sha512-iSEJZMe3DOcqBFZQAqgA3NB2lCWBc4Gv5x/SCri/TVg96wAlss4VrUunSI2Mp0J4jJ5nJcJ2ChqHSBAU48k3FA== +"@sentry/core@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.48.0.tgz#3bb8d06305f0ec7c873453844687deafdeab168b" + integrity sha512-VGwYgTfLpvJ5LRO5A+qWo1gpo6SfqaGXL9TOzVgBucAdpzbrYHpZ87sEarDVq/4275uk1b0S293/mfsskFczyw== -"@sentry/node@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.47.0.tgz#52fc68a9f169327cfbf8de0e050111cb96d96689" - integrity sha512-tMzeU3KkmDi2OVvSu+Ah5pwoi7srsSyc1DovBbRQU96RFf/lOFzGe9JERa1MyDUqqLH95NqnPTNsa4Amb8/Vxg== +"@sentry/node@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.48.0.tgz#d4d1374431028af7663a06bf7268bf40a9bf1fa0" + integrity sha512-pnprAuUOc8cxnJdZA09hutHXNsbQZoDgzf3zPyXMNx0ewB/RviFMOgfe7ViX1mIB/oVrcFenXBgO5uvTd7JwPg== dependencies: "@opentelemetry/api" "^1.9.0" "@opentelemetry/context-async-hooks" "^1.29.0" @@ -838,16 +838,16 @@ "@opentelemetry/sdk-trace-base" "^1.29.0" "@opentelemetry/semantic-conventions" "^1.28.0" "@prisma/instrumentation" "5.22.0" - "@sentry/core" "8.47.0" - "@sentry/opentelemetry" "8.47.0" + "@sentry/core" "8.48.0" + "@sentry/opentelemetry" "8.48.0" import-in-the-middle "^1.11.2" -"@sentry/opentelemetry@8.47.0": - version "8.47.0" - resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.47.0.tgz#f62658ef2985ef780a2a1ffc84c06f4d1749d82f" - integrity sha512-wunyBIUPeY6Kx3SFhOQqOPs+hyRADO5bztpo8aZ3N3xfzhefSTOdrgUroKvHx1DvoQO6MAlykcuUFps3yfaqmg== +"@sentry/opentelemetry@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.48.0.tgz#718e7942724d64ffe8e901941b0e4050fa07780b" + integrity sha512-1JLXgmIvD3T7xn9ypwWW0V3GirNy4BN2fOUbZau/nUX/Jj5DttSoPn7x7xTaPSpfaA24PiP93zXmJEfZvCk00Q== dependencies: - "@sentry/core" "8.47.0" + "@sentry/core" "8.48.0" "@sinclair/typebox@^0.27.8": version "0.27.8"