fix: support parsing files with macros in codemod #7114
Merged
Conversation
This file contains 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
| @@ -225,6 +225,12 @@ import { style } from "@react-spectrum/s2/style" with { type: "macro" }; | |||
| })}>Test</RSPButton>" | |||
| `; | |||
|
|
|||
| exports[`Should leave existing style macros unaffected 1`] = ` | |||
| "import { style } from "@react-spectrum/s2/style" with { type: "macro" }; | |||
There was a problem hiding this comment.
where'd the import of TextField go?
There was a problem hiding this comment.
Good catch! Looks like that was an unrelated issue that came up when we renamed the package, but we didn't have any tests to catch it. Just needed to update:
- if (path.node.source.value === '@adobe/react-spectrum' || path.node.source.value.startsWith('@react-spectrum/')) {
+ if (path.node.source.value === '@adobe/react-spectrum' || (path.node.source.value.startsWith('@react-spectrum/') && path.node.source.value !== '@react-spectrum/s2')) {
devongovett
force-pushed
the
fix-codemod-macro-parsing
branch
from
2cccdf3
to
27e65b4
Compare
devongovett
approved these changes
Sep 30, 2024
snowystinger
approved these changes
Sep 30, 2024
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.
By updating the parser, we can now run codemods on files with the style macro already imported.
Also fixes an issue where existing s2 imports were being removed.
✅ Pull Request Checklist:
📝 Test Instructions:
🧢 Your Project: