Skip to content

Commit 39ca0e3

Browse files
Tomekmularczykgiuseppeg
authored andcommitted
fix placeholders with css !important flag (#16)
1 parent 77c4f64 commit 39ca0e3

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const path = require('path')
33

44
module.exports = (css, settings) => {
55
const cssWithPlaceholders = css
6-
.replace(/%%styled-jsx-placeholder-(\d+)%%(\w*\s*[),;{])/g, (_, id, p1) =>
6+
.replace(/%%styled-jsx-placeholder-(\d+)%%(\w*\s*[),;!{])/g, (_, id, p1) =>
77
`styled-jsx-placeholder-${id}-${p1}`
88
)
99
.replace(/%%styled-jsx-placeholder-(\d+)%%/g, (_, id) =>
@@ -22,7 +22,7 @@ module.exports = (css, settings) => {
2222
}, settings.sassOptions, { includePaths })).css.toString()
2323

2424
return preprocessed
25-
.replace(/styled-jsx-placeholder-(\d+)-(\w*\s*[),;{])/g, (_, id, p1) =>
25+
.replace(/styled-jsx-placeholder-(\d+)-(\w*\s*[),;!{])/g, (_, id, p1) =>
2626
`%%styled-jsx-placeholder-${id}%%${p1}`
2727
)
2828
.replace(/\/\*%%styled-jsx-placeholder-(\d+)%%\*\//g, (_, id) =>

test.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,21 @@ describe('styled-jsx-plugin-sass', () => {
4343
it('works with placeholders', () => {
4444
assert.equal(
4545
plugin(`
46-
p { img { display: block } color: %%styled-jsx-placeholder-0%%; border-bottom: 1px solid %%styled-jsx-placeholder-0%%; }
46+
p {
47+
img { display: block } color: %%styled-jsx-placeholder-0%%; border-bottom: 1px solid %%styled-jsx-placeholder-1%%;
48+
em { color: %%styled-jsx-placeholder-2%% !important; }
49+
}
4750
%%styled-jsx-placeholder-1%%`,
4851
{}
4952
).trim(),
5053
cleanup(`
5154
p {
5255
color: %%styled-jsx-placeholder-0%%;
53-
border-bottom: 1px solid %%styled-jsx-placeholder-0%%; }
56+
border-bottom: 1px solid %%styled-jsx-placeholder-1%%; }
5457
p img {
5558
display: block; }
59+
p em {
60+
color: %%styled-jsx-placeholder-2%% !important; }
5661
5762
%%styled-jsx-placeholder-1%%
5863
`)

0 commit comments

Comments
 (0)