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

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

meta: Merge develop in master to resolve conflicts #15592

wants to merge 3 commits into from

Conversation

lforst
Copy link
Contributor

@lforst lforst commented Mar 5, 2025 •
edited
Loading

#15590 has merge conflicts

s1gr1d and others added 3 commits March 5, 2025 12:37
@s1gr1d
fix(vue): Attach Pinia state only once per event (#15588)
b656b66 
Each Pinia store will run through the event processor but the Pinia
state should only be attached once.

closes #15587
@billyvg
feat(replay): Bump rrweb to 2.34.0 (#15580)
fa6590b
Merge remote-tracking branch 'origin/master' into lforst-merge-develo…
b97a6e6 
…p-master
@lforst lforst requested a review from AbhiPrasad March 5, 2025 14:28
@lforst lforst marked this pull request as ready for review March 5, 2025 14:28
@lforst lforst requested a review from a team as a code owner March 5, 2025 14:28
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 5, 2025

⚠️ This PR is opened against master. You probably want to open it against develop.

@AbhiPrasad AbhiPrasad mentioned this pull request Mar 5, 2025
Merged
@AbhiPrasad
Copy link
Member

We want to do the opposite right? merge into develop from master

@lforst lforst closed this Mar 5, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 5, 2025

size-limit report 📦

Path Size % Change Change
@sentry/browser 23.13 KB added added
@sentry/browser - with treeshaking flags 22.92 KB added added
@sentry/browser (incl. Tracing) 36.2 KB added added
@sentry/browser (incl. Tracing, Replay) 73.38 KB added added
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags 66.79 KB added added
@sentry/browser (incl. Tracing, Replay with Canvas) 78 KB added added
@sentry/browser (incl. Tracing, Replay, Feedback) 89.91 KB added added
@sentry/browser (incl. Feedback) 39.66 KB added added
@sentry/browser (incl. sendFeedback) 27.76 KB added added
@sentry/browser (incl. FeedbackAsync) 32.54 KB added added
@sentry/react 24.95 KB added added
@sentry/react (incl. Tracing) 38.08 KB added added
@sentry/vue 27.38 KB added added
@sentry/vue (incl. Tracing) 37.89 KB added added
@sentry/svelte 23.17 KB added added
CDN Bundle 24.34 KB added added
CDN Bundle (incl. Tracing) 36.24 KB added added
CDN Bundle (incl. Tracing, Replay) 71.25 KB added added
CDN Bundle (incl. Tracing, Replay, Feedback) 76.41 KB added added
CDN Bundle - uncompressed 71.12 KB added added
CDN Bundle (incl. Tracing) - uncompressed 107.51 KB added added
CDN Bundle (incl. Tracing, Replay) - uncompressed 218.78 KB added added
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed 231.31 KB added added
@sentry/nextjs (client) 39.25 KB added added
@sentry/sveltekit (client) 36.61 KB added added
@sentry/node 142.14 KB added added
@sentry/node - without tracing 95.57 KB added added
@sentry/aws-serverless 119.92 KB added added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AbhiPrasad AbhiPrasad Awaiting requested review from AbhiPrasad

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lforst @AbhiPrasad @s1gr1d @billyvg