fix(cloudflare): skip regex literals when rewriting top-level returns in frontmatter - #17698
Open
lazerg wants to merge 1 commit into
Open
fix(cloudflare): skip regex literals when rewriting top-level returns in frontmatter#17698lazerg wants to merge 1 commit into
lazerg wants to merge 1 commit into
Conversation
🦋 Changeset detectedLatest commit: eec3bd6 The changes in this PR will be included in the next version bump. This PR includes changesets to release 44 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
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.
Changes
.astrofiles rewrite top-levelreturntothrowso esbuild/Rolldown accept the frontmatter as an ES module. They found thosereturnkeywords with a single regex whose skip group covered strings, template literals and comments, but not regex literals. A quote inside a regex literal, as invalue.replace(/"/g, """), was then read as an opening string delimiter, so quote pairing stayed off by one for the rest of the frontmatter and every later top-levelreturnwas left alone. Vite reportedFailed to run dependency scanplus oneTop-level return cannot be used inside an ECMAScript moduleper survivingreturn, and only on a coldnode_modules/.vite, which made it look intermittent.replaceTopLevelReturnsnow scans the frontmatter character by character instead. It skips strings, template literals, line and block comments, and regex literals, and only rewrites areturnfound in code. A/is treated as the start of a regex literal only when the preceding token allows an expression there, so division is left alone.src/utils/frontmatter.ts, since the esbuild and Rolldown plugins each carried their own copy of the same tokenizer and the same bug.Closes #17697
Testing
Added
test/frontmatter-returns.test.tscovering the reported case along with division, character classes, member access, strings and comments. The regex-literal case fails onmainand passes here. The existingtop-level-returnintegration test still passes.Docs
No docs needed, this only fixes the dependency scan for frontmatter that was already valid.