Skip to content

Commit 615ac47

Browse files
danielgamagegiuseppeg
authored andcommitted
match comma-separated placeholders (#14)
1 parent 45ca18e commit 615ac47

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const sass = require('node-sass')
22

33
module.exports = (css, settings) => {
44
const cssWithPlaceholders = css
5-
.replace(/%%styled-jsx-placeholder-(\d+)%%(\w*\s*[);{])/g, (_, id, p1) =>
5+
.replace(/%%styled-jsx-placeholder-(\d+)%%(\w*\s*[),;{])/g, (_, id, p1) =>
66
`styled-jsx-placeholder-${id}-${p1}`
77
)
88
.replace(/%%styled-jsx-placeholder-(\d+)%%/g, (_, id) =>
@@ -14,7 +14,7 @@ module.exports = (css, settings) => {
1414
}, settings.sassOptions)).css.toString()
1515

1616
return preprocessed
17-
.replace(/styled-jsx-placeholder-(\d+)-(\w*\s*[);{])/g, (_, id, p1) =>
17+
.replace(/styled-jsx-placeholder-(\d+)-(\w*\s*[),;{])/g, (_, id, p1) =>
1818
`%%styled-jsx-placeholder-${id}%%${p1}`
1919
)
2020
.replace(/\/\*%%styled-jsx-placeholder-(\d+)%%\*\//g, (_, id) =>

test.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ describe('styled-jsx-plugin-sass', () => {
2828
)
2929
})
3030

31+
it("works with placeholders in css functions", () => {
32+
assert.equal(
33+
plugin('div { grid-template-columns: repeat(%%styled-jsx-placeholder-0%%, calc(%%styled-jsx-placeholder-1%%% - %%styled-jsx-placeholder-2%%px)); }', {}).trim(),
34+
cleanup(`
35+
div {
36+
grid-template-columns: repeat(%%styled-jsx-placeholder-0%%, calc(%%styled-jsx-placeholder-1%%% - %%styled-jsx-placeholder-2%%px)); }
37+
`)
38+
)
39+
})
40+
3141
it('works with placeholders', () => {
3242
assert.equal(
3343
plugin(`

0 commit comments

Comments
 (0)