Skip to content
This repository was archived by the owner on May 14, 2021. It is now read-only.

Commit b0e2bd1

Browse files
committed
Fixed #55
1 parent 85d24af commit b0e2bd1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/utils/tagged-template-literal.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,23 @@ const hasInterpolations = node => !node.quasi.quasis[0].tail
1414
/**
1515
* Merges the interpolations in a parsed tagged template literals with the strings
1616
*/
17+
// Used for making sure our dummy mixins are all unique
18+
let count = 0
1719
const interleave = (quasis, expressions) => {
1820
let css = ''
1921
for (let i = 0, l = expressions.length; i < l; i += 1) {
2022
const prevText = quasis[i].value.raw
2123
const nextText = quasis[i + 1].value.raw
22-
const expression = expressions[i]
2324

2425
css += prevText
2526
if (isLastLineWhitespaceOnly(prevText) && !isEmptyOrSpaceOnly(prevText)) {
26-
css += `-styled-mixin: ${expression.name}`
27+
css += `-styled-mixin${count}: dummyValue`
28+
count += 1
2729
if (nextText.charAt(0) !== ';') {
2830
css += ';'
2931
}
3032
} else {
31-
css += `$${expression.name}`
33+
css += '$dummyValue'
3234
}
3335
}
3436
css += quasis[quasis.length - 1].value.raw

test/utils.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('utils', () => {
3535
}
3636
]
3737
expect(interleave(quasis, expressions)).toEqual(
38-
'\n display: block;\n color: $color;\n background: blue;\n'
38+
'\n display: block;\n color: $dummyValue;\n background: blue;\n'
3939
)
4040
})
4141
})

0 commit comments

Comments
 (0)