fix(extract): escape special regex characters used in file-based routing systems#1984
Merged
Merged
Conversation
…ing systems when files are passed in options
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
size-limit report 📦
|
timofei-iatsenko
approved these changes
Jul 29, 2024
Collaborator
timofei-iatsenko
left a comment
There was a problem hiding this comment.
LGTM, thanks for your work!
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.
Description
We recently migrated to TanStack Router, which uses file-based routing with several file naming conventions. The
lingui extract --watchcommand stopped working on any routes with these special characters. However,lingui extractcontinued to work.Debugging revealed that
--watchsetsoptions.files, and these paths are formed into a regular expression. If any of these paths contains a character with special regex meaning, like$, thenpathswon't be correctly filtered.To fix this, I created a new utility that escapes characters allowed in file paths, but with special regex meaning. I'm not sure if I captured all possible characters used in file-based routing conventions, or if I over specified too many.
I added tests for both the utility itself and the extractor's
collectfunction. If you removemakePathRegexSafefromcollect, you should see components C, D, and E removed from the snapshot because the extractor fails to handle them.Types of changes
Checklist