Repository navigation
fix(v10/cloudflare): keep default exports intact when auto-instrumenting - #25732
Merged
Conversation
Backport of #25372. The vinext-specific tests in autoInstrument.test.ts are left out because vinext support (#25000) is not on v10. (cherry picked from commit 6b728c6) Co-Authored-By: Isaac Schlueter <[email protected]>
Contributor
size-limit report 📦
|
isaacs
marked this pull request as ready for review
October 25, 2026 22:36
isaacs
requested review from
andreiborza and
isaacs
and removed request for
a team
October 25, 2026 22:36
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 498856a. Configure here.
A comment between `export default` and the expression that contained the word `default` moved the overwrite past the keyword and produced invalid syntax.
…cking regex CodeQL flagged the comment-skipping regex as prone to exponential backtracking. A linear scan over whitespace and comments finds the same offset.
isaacs
added a commit
that referenced
this pull request
Oct 26, 2026
… the Vite transform (#25741) The transform found the end of the `export default` keywords with `lastIndexOf('default')` on the text before the expression. A comment in that span that contains the word `default`, such as `export default /* default handler */ { ... }`, moved the overwrite past the keyword and produced invalid syntax, so the Worker failed to start. The keyword is now found by matching `export`, then any whitespace or comments, then `default`, starting at the statement. Acorn only gives an `ExportDefaultDeclaration` when that sequence is there, so the match always succeeds. Cursor Bugbot found this on the v10 backport in #25732, which already has the same fix. Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com> Co-authored-by: Isaac Schlueter <[email protected]>
isaacs
approved these changes
Oct 26, 2026
isaacs
deleted the
backport/v10-25372-cloudflare-default-export-intact
branch
October 26, 2026 15:36
isaacs
added a commit
that referenced
this pull request
Oct 26, 2026
…transform (#25733) Backport of: #25663 Stacked on #25732 (backport of #25372), which is stacked on #25407. Once those merge, this retargets to `v10`. The cherry-pick applied cleanly and is identical to the original. <!-- junior-request-attribution:start --> via **Isaac Schlueter**. <!-- junior-request-attribution:end --> <!-- junior-session-footer:start --> <!-- junior-conversation-id:slack%3AD0CBUGS556X%3A1792966013.340469 --> -- [View Junior Session](https://junior-prod.sentry.dev/conversations/slack%3AD0CBUGS556X%3A1792966013.340469) [[Sentry]](https://sentry.sentry.io/explore/conversations/slack%3AD0CBUGS556X%3A1792966013.340469/?project=4510944073809921) <!-- junior-session-footer:end --> Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com> Co-authored-by: Isaac Schlueter <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of: #25372
Stacked on #25407 (backport of #25345), which touches the same transform. Once #25407 merges, this retargets to
v10.Differences to the original PR
packages/cloudflare/test/vite/autoInstrument.test.ts: the four vinext tests (wraps the entry with @sentry/nextjs/cloudflare …and siblings) are left out. They come from feat(cloudflare): Wrap vinext Worker entries with@sentry/nextjs/cloudflare#25000, which isn't on v10. The other expectation updates in that file apply unchanged.export defaultkeywords withlastIndexOf('default')on the text before the expression, so a comment likeexport default /* default handler */ { ... }moved the overwrite past the keyword and produced invalid syntax. The keyword is now found by skipping whitespace and comments afterexport.developstill has the original code and needs the same fix.via Junior system actor
event.--
View Junior Session [Sentry]