Skip to content

Ensure transforms are only applied to top level components #1133

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.

Sign up for GitHub

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 2 commits into from
Aug 31, 2022
Merged

Ensure transforms are only applied to top level components #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af5f395
Ensure transforms are only applied to top level components
zephraph Aug 31, 2022
d748c0a
Remove unneeded declarations
zephraph Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions libs/babel-transform-react-display-name/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,14 @@ module.exports = function ({ types: t }) {

if (!isExpressionFn) return

// Should only apply to top level components
const parentStatement = componentFn.getStatementParent()
if (!t.isProgram(parentStatement.parent)) {
return
}

const declarator = componentFn.findParent((path) => t.isVariableDeclarator(path))
if (declarator) {
const parentStatement = componentFn.getStatementParent()
const name = declarator.node.id.name
parentStatement.insertAfter(genDisplayName(path, name))
return
Expand All @@ -66,11 +71,10 @@ module.exports = function ({ types: t }) {
t.isAssignmentExpression(path)
)
if (assignmentExpression) {
const parentStatement = componentFn.getStatementParent()
const leftHandSide = assignmentExpression.node.left

// Only want to do this step for top level components
if (!t.isProgram(parentStatement.parent) || !t.isMemberExpression(leftHandSide)) {
// Don't add display names to nested member expressions
if (!t.isMemberExpression(leftHandSide)) {
return
}

Expand Down
23 changes: 23 additions & 0 deletions libs/babel-transform-react-display-name/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,29 @@ describe('classed template tag literals', () => {
})
})

describe('cases that should not be transformed', () => {
it('should not transform a non-top level JSX function', () => {
const result = transform`
export function f() {
const nestedComponent = () => <div/>
}
`

expect(result).toMatchInlineSnapshot(`
"\\"use strict\\";

Object.defineProperty(exports, \\"__esModule\\", {
value: true
});
exports.f = f;

function f() {
const nestedComponent = () => /*#__PURE__*/React.createElement(\\"div\\", null);
}"
`)
})
})

/**
* Helper to streamline babel transforms
*/
Expand Down