Skip to content

meta: Merge develop in master to resolve conflicts #15592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

meta: Merge develop in master to resolve conflicts #15592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b656b66
fix(vue): Attach Pinia state only once per event (#15588)
s1gr1d Mar 5, 2025
fa6590b
feat(replay): Bump rrweb to 2.34.0 (#15580)
billyvg Mar 5, 2025
b97a6e6
Merge remote-tracking branch 'origin/master' into lforst-merge-develo…
lforst Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-packages/browser-integration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@babel/preset-typescript": "^7.16.7",
"@playwright/test": "~1.50.0",
"@sentry-internal/rrweb": "2.33.0",
"@sentry-internal/rrweb": "2.34.0",
"@sentry/browser": "9.4.0",
"axios": "1.7.7",
"babel-loader": "^8.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/replay-canvas/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
"devDependencies": {
"@sentry-internal/rrweb": "2.33.0"
"@sentry-internal/rrweb": "2.34.0"
},
"dependencies": {
"@sentry-internal/replay": "9.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/replay-internal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
"devDependencies": {
"@babel/core": "^7.17.5",
"@sentry-internal/replay-worker": "9.4.0",
"@sentry-internal/rrweb": "2.33.0",
"@sentry-internal/rrweb-snapshot": "2.33.0",
"@sentry-internal/rrweb": "2.34.0",
"@sentry-internal/rrweb-snapshot": "2.34.0",
"fflate": "0.8.2",
"jest-matcher-utils": "^29.0.0",
"jsdom-worker": "^0.2.1"
Expand Down
21 changes: 14 additions & 7 deletions packages/vue/src/pinia.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,20 @@ export const createSentryPiniaPlugin: (options?: SentryPiniaPluginOptions) => Pi
const timestamp = new Date().toTimeString().split(' ')[0];
const filename = `pinia_state_all_stores_${timestamp}.json`;

hint.attachments = [
...(hint.attachments || []),
{
filename,
data: JSON.stringify(getAllStoreStates()),
},
];
// event processor runs for each pinia store - attachment should only be added once per event
const hasExistingPiniaStateAttachment = hint.attachments?.some(attachment =>
attachment.filename.startsWith('pinia_state_all_stores_'),
);

if (!hasExistingPiniaStateAttachment) {
hint.attachments = [
...(hint.attachments || []),
{
filename,
data: JSON.stringify(getAllStoreStates()),
},
];
}
} catch (_) {
// empty
}
Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6959,34 +6959,34 @@
detect-libc "^2.0.2"
node-abi "^3.61.0"

"@sentry-internal/rrdom@2.33.0":
version "2.33.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrdom/-/rrdom-2.33.0.tgz#16231b907e7d8a30d2c8a4de247bf87f272ded02"
integrity sha512-amTHYKq0u1FBC3lu6MM2Jnx04xIyDpsPcCJ8Pvi1sTyA/+mkDvGYXHWyjxVVWvhIOT6dVhuvWD82KW1gksrJcg==
"@sentry-internal/rrdom@2.34.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrdom/-/rrdom-2.34.0.tgz#fccc9fe211c3995d4200abafbe8d75b671961ee9"
integrity sha512-NFGNzI9iGYpJ1D7j8qLu4pFMGDMumQzM9/wMPQpmDQTCZYV25To5lxT7z5K1huPAIyh5NLW+hQlMx/hXxXwJ6w==
dependencies:
"@sentry-internal/rrweb-snapshot" "2.33.0"
"@sentry-internal/rrweb-snapshot" "2.34.0"

"@sentry-internal/rrweb-snapshot@2.33.0":
version "2.33.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-snapshot/-/rrweb-snapshot-2.33.0.tgz#2b984757bd44e1d89022875f79ae16162cea78a6"
integrity sha512-sDg+i4QQ/nq97S4dyzMG0kbcQDbhHWFaoT8UXDODle9HpfeyoKuLF9d+JcHRZq0PID3/EIsWztTKw/xk96H8wQ==
"@sentry-internal/rrweb-snapshot@2.34.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-snapshot/-/rrweb-snapshot-2.34.0.tgz#79c2049b6c887e3c128d5fa80d6f745a61dd0e68"
integrity sha512-9Tb8jwVufn5GLV0d/CTuoZWo2O06ZB+xWeTJdEkbtJ6PAmO/Q7GQI3uNIx0pfFEnXP+0Km8CKKxpwkEM0z2m6w==

"@sentry-internal/rrweb-types@2.33.0":
version "2.33.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-types/-/rrweb-types-2.33.0.tgz#10593725dac929a9e19b6071c516faff4c0a20d8"
integrity sha512-lxwBh+bqnKf2gOj2tX2fbgVk/njlNIQuM19FsRSqi+KIHY7F9RLEC/N7chtCMFbckex6kljKM4RIa4DfKLkHDA==
"@sentry-internal/rrweb-types@2.34.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-types/-/rrweb-types-2.34.0.tgz#32b853d93d1d9a1ae1888b17d84b24e674fadee0"
integrity sha512-6g5TN8YjqxrZOSQZGMLeZ2XYXdmqaKzPdIzKRySK+rKT/1fJE2gcefJEPDxiix0z/6/v5hGu/Ia8+wbJ7ACHwQ==
dependencies:
"@sentry-internal/rrweb-snapshot" "2.33.0"
"@sentry-internal/rrweb-snapshot" "2.34.0"
"@types/css-font-loading-module" "0.0.7"

"@sentry-internal/rrweb@2.33.0":
version "2.33.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb/-/rrweb-2.33.0.tgz#f1de2a7aca1a739acdfe91983b679c3bc3a448af"
integrity sha512-vjc+duxt3dxz6KVR6p+/kNl9AukMXmb7i6MMUZDn1TKfdeP9tGJprWl9fTkAmwkyQjm8VEWULs/3JK/u9dou5g==
"@sentry-internal/rrweb@2.34.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb/-/rrweb-2.34.0.tgz#a32945504f1ba2ba60f2ebd7a17d2df5e1aa010d"
integrity sha512-NAzpnMOvsIV8o6rEvJ7SDs/TwuHXSrRmuAYYedrOQyJoLq00HF+6wQGe6SAyXv/bkumXmQfjyJ6bv4XNtC4S6g==
dependencies:
"@sentry-internal/rrdom" "2.33.0"
"@sentry-internal/rrweb-snapshot" "2.33.0"
"@sentry-internal/rrweb-types" "2.33.0"
"@sentry-internal/rrdom" "2.34.0"
"@sentry-internal/rrweb-snapshot" "2.34.0"
"@sentry-internal/rrweb-types" "2.34.0"
"@types/css-font-loading-module" "0.0.7"
"@xstate/fsm" "^1.4.0"
base64-arraybuffer "^1.0.1"
Expand Down
Loading