Skip to content

Update feat/next-js branch #3366

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.

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

Merged
merged 35 commits into from
Apr 2, 2021
Merged

Conversation

rhcarvalho
Copy link
Contributor

This aims to keep the branch up-to-date by merging master onto it.

There was a merge conflict in yarn.lock, I am not sure I resolved it in the best way (I run yarn to re-generate the lock file). Still, there are just so many changes that I don't know are really required for the @sentry/nextjs SDK.

After merging master in, I noticed there are still several places to clean up before we can merge feat/next-js into master.
And there are a few small changes that we could merge into master without waiting for the @sentry/nextjs SDK to land, thus reducing the patch for adding the new SDK to a minimum.

lobsterkatie and others added 30 commits March 4, 2021 19:19
Clarified how the browser SDK is integrated with the other SDKs
…in (#3320)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update gatsby-node.js

* remove additional vercel fallbacks
* misc: 6.2.3 changelog

* add whitespace

I'm embarrassing myself
* ref: Add fast-path to fetchImpl

* fix: Cleanup after fetch impl detection
* fix: Add SentryRequestType to RateLimitingCategory mapping

* Update remaining tests
…#3347)

* ref(ember): Fix tests to be forward compatible with component changes

One of the frameworks provided components, link-to, had a change to it's internal name. It's not really relevant to the test, so normalizing the description should work across the version changes.
* ref(ember): Silence deprecation warnings in beta

We can deal with deprecations once they hit mainline, this should hopefully silence deprecations in the scenarios so we can see failures more easily and not spit out too many logs
Try to use the best of performance.timeOrigin or performance.timing.navigationStart as long as they are near the current time reported by Date.now.

The intention is to mitigate transactions that are reported with a huge time skew, particularly from Firefox.

This is trying to address the inconsistencies between browsers by always trying to use timeOrigin first, as long as its consistent with the current time, otherwise, use the navigationStart if its consistent with the current time, eventually fallback to date if all else fails.

We also remember what source is used for the time origin, so we can tag events and analyze later.

Co-authored-by: Rodolfo Carvalho <[email protected]>
Co-authored-by: Alberto Leal <[email protected]>
@rhcarvalho rhcarvalho requested a review from kamilogorek as a code owner April 2, 2021 13:02
@rhcarvalho rhcarvalho removed the request for review from kamilogorek April 2, 2021 13:03
@github-actions
Copy link
Contributor

github-actions bot commented Apr 2, 2021

size-limit report

Path Size
@sentry/browser - CDN Bundle (gzipped) 20.51 KB (+1.15% 🔺)
@sentry/browser - Webpack 21.37 KB (+0.89% 🔺)
@sentry/react - Webpack 21.41 KB (+0.89% 🔺)
@sentry/browser + @sentry/tracing - CDN Bundle (gzipped) 27.69 KB (+1.21% 🔺)

@rhcarvalho rhcarvalho merged commit dd5cf8c into feat/next-js Apr 2, 2021
@rhcarvalho rhcarvalho deleted the rhcarvalho/master-into-nextjs branch April 2, 2021 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.