Skip to content

fix: add support for backticks (#8) #9

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
tujoworker merged 1 commit into from
Apr 11, 2025
Merged

fix: add support for backticks (#8) #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions __mocks__/Examples.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,25 @@ export const MockNoInlineWithComponent = () => {
)
}

export const MockNoInlineWithBackticks = () => {
return (
<ComponentBox data-test="id">
{() => {
const DemoComponent = () => {
const more = '456'
return `123${more}` + `789`
}

return (
<div>
<DemoComponent />
</div>
)
}}
</ComponentBox>
)
}

export const MockNoInlineWithText = () => {
return (
<ComponentBox data-test="id">
Expand Down
202 changes: 109 additions & 93 deletions __tests__/babelPluginReactLive.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,108 +16,124 @@ const pluginOptions = {
prettierPath,
}

it('babelPluginReactLive', async () => {
const babelFileResult = await transformFileAsync(targetFile, {
code: true,
presets: [
[
'@babel/preset-env',
{
modules: false,
targets: { firefox: '100' },
},
describe('transformFileAsync', () => {
it('should convert Examples.tsx with all exported examples', async () => {
const babelFileResult = await transformFileAsync(targetFile, {
code: true,
presets: [
[
'@babel/preset-env',
{
modules: false,
targets: { firefox: '100' },
},
],
],
],
plugins: [[babelPluginReactLive, pluginOptions]],
})
plugins: [[babelPluginReactLive, pluginOptions]],
})

const code = removeConsoleNinja(String(babelFileResult?.code))
const code = removeConsoleNinja(String(babelFileResult?.code))

const formattedCode = prettier.format(code, {
filepath: 'file.tsx',
semi: false,
})
const formattedCode = prettier.format(code, {
filepath: 'file.tsx',
semi: false,
})

expect(formattedCode).toMatchInlineSnapshot(`
"const ComponentBox = ({ children }) => children
export const MockNoInlineWithComponent = () => {
return (
<ComponentBox data-test="id" noInline>{\`const DemoComponent = () => {
return <>content</>
}
render(
<div>
<DemoComponent />
</div>
)
\`}</ComponentBox>
expect(formattedCode).toMatchInlineSnapshot(`
"const ComponentBox = ({ children }) => children
export const MockNoInlineWithComponent = () => {
return (
<ComponentBox data-test="id" noInline>{\`const DemoComponent = () => {
return <>content</>
}
render(
<div>
<DemoComponent />
</div>
)
}
export const MockNoInlineWithText = () => {
return (
<ComponentBox data-test="id" noInline>{\`render(<>content</>)
\`}</ComponentBox>
\`}</ComponentBox>
)
}
export const MockNoInlineWithBackticks = () => {
return (
<ComponentBox data-test="id" noInline>{\`const DemoComponent = () => {
const more = '456'
return \\\`123\\\${more}\\\` + \\\`789\\\`
}
render(
<div>
<DemoComponent />
</div>
)
}
export const MockOneChilds = () => {
return (
<ComponentBox data-test="id">{\`<div>content</div>
\`}</ComponentBox>
)
}
export const MockManyChilds = () => {
return (
<ComponentBox data-test="id">{\`
<div>content 1</div>
<div>content 2</div>
<div>content 3</div>
\`}</ComponentBox>
)
}
export const MockNoInlineWithText = () => {
return (
<ComponentBox data-test="id" noInline>{\`render(<>content</>)
\`}</ComponentBox>
)
}
export const MockOneChilds = () => {
return (
<ComponentBox data-test="id">{\`<div>content</div>
\`}</ComponentBox>
)
}
export const MockManyChilds = () => {
return (
<ComponentBox data-test="id">{\`
<div>content 1</div>
<div>content 2</div>
<div>content 3</div>

\`}</ComponentBox>
)
}
export const MockFragment = () => {
return (
<ComponentBox data-test="id">{\`<>
<span>content 1</span>
<span>content 2</span>
<span>content 3</span>
</>
\`}</ComponentBox>
)
}
export const MockText = () => {
return (
<ComponentBox data-test="id">{\`
text
{'text'}
<span>content</span>
text
{'text'}
\`}</ComponentBox>
)
}
export const MockFragment = () => {
return (
<ComponentBox data-test="id">{\`<>
<span>content 1</span>
<span>content 2</span>
<span>content 3</span>
</>
\`}</ComponentBox>
)
}
export const MockText = () => {
return (
<ComponentBox data-test="id">{\`
text
{'text'}
<span>content</span>
text
{'text'}

\`}</ComponentBox>
)
}
export const MockEvents = () => {
return (
<ComponentBox data-test="id">{\`<DemoComponent
onChange={(e) => {
// comment
console.log(e)
}}
onOpen={(e) => 'console.log(e)'}
onFocus={(e) => {
const cleaned = 'console.log(e)'
}}
/>
\`}</ComponentBox>
)
}
"
`)
\`}</ComponentBox>
)
}
export const MockEvents = () => {
return (
<ComponentBox data-test="id">{\`<DemoComponent
onChange={(e) => {
// comment
console.log(e)
}}
onOpen={(e) => 'console.log(e)'}
onFocus={(e) => {
const cleaned = 'console.log(e)'
}}
/>
\`}</ComponentBox>
)
}
"
`)

expect(formattedCode.match(/noInline/g)).toHaveLength(2)
expect(formattedCode.match(/\{`/g)).toHaveLength(7)
expect(formattedCode.match(/`\}/g)).toHaveLength(7)
expect(formattedCode.match(/noInline/g)).toHaveLength(3)
expect(formattedCode.match(/\{`/g)).toHaveLength(8)
expect(formattedCode.match(/`\}/g)).toHaveLength(8)
})
})

function removeConsoleNinja(code) {
Expand Down
11 changes: 8 additions & 3 deletions babelPluginReactLive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,21 @@ function babelPluginReactLive(babel, options) {
})

// Prettier adds a leading ;
// And we also escape `
code = code.replace(/^;/, '').replace(/`/g, '\\`')
code = code.replace(/^;/, '')

// Also escape backticks (`)
code = code.replace(/`/g, '\\`')

// Remove fragments we added in the first place
if (children.length > 1) {
code = code.replace(/^<>|<\/>$|^\s{2}/gm, '')
}

const raw = code.replace(/\$\{/g, '\\${')
const templateElement = t.templateElement({ raw, cooked: code }, true)

return t.jsxExpressionContainer(
t.templateLiteral([t.templateElement({ raw: code })], [])
t.templateLiteral([templateElement], [])
)
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"type": "git",
"url": "https://github.com/dnbexperience/eufemia.git"
},
"version": "1.4.2",
"version": "1.4.3",
"main": "babelPluginReactLive.js",
"scripts": {
"test": "jest",
Expand Down