Skip to content

Commit

Permalink
Merge branch 'master' into feat/yarn-v4
Browse files Browse the repository at this point in the history
  • Loading branch information
timfish committed Jun 30, 2024
2 parents b03f32d + eeef359 commit 0553394
Show file tree
Hide file tree
Showing 4 changed files with 136 additions and 228 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@
"e2e": "node scripts/start.mjs e2e"
},
"dependencies": {
"@sentry/browser": "8.12.0",
"@sentry/core": "8.12.0",
"@sentry/node": "8.12.0",
"@sentry/types": "8.12.0",
"@sentry/utils": "8.12.0",
"@sentry/browser": "8.13.0",
"@sentry/core": "8.13.0",
"@sentry/node": "8.13.0",
"@sentry/types": "8.13.0",
"@sentry/utils": "8.13.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.12.0",
"@sentry-internal/typescript": "8.12.0",
"@sentry-internal/eslint-config-sdk": "8.13.0",
"@sentry-internal/typescript": "8.13.0",
"@types/busboy": "^0.2.3",
"@types/form-data": "^2.5.0",
"@types/koa": "^2.0.52",
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ interface ElectronRendererOptions extends BrowserOptions {
export function init<O extends ElectronRendererOptions>(
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_12_0: O) => void = browserInit,
originalInit: (if_you_get_a_typescript_error_ensure_sdks_use_version_v8_13_0: O) => void = browserInit,
): void {
// Ensure the browser SDK is only init'ed once.
if (window?.__SENTRY__RENDERER_INIT__) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/versions.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["15.5.7","16.2.8","17.4.11","18.3.15","19.1.9","20.3.12","21.4.4","22.3.27","23.3.13","24.8.8","25.9.8","26.6.10","27.3.11","28.3.3","29.4.2","30.1.2","31.1.0"]
["15.5.7","16.2.8","17.4.11","18.3.15","19.1.9","20.3.12","21.4.4","22.3.27","23.3.13","24.8.8","25.9.8","26.6.10","27.3.11","28.3.3","29.4.3","30.1.2","31.1.0"]
Loading

0 comments on commit 0553394

Please sign in to comment.