Merge pull request #52 from gucong3000/v0361

V0361
gucong3000 · Jun 5, 2019 · 52388db · 52388db
2 parents 26f6338 + e34c981
commit 52388db
Show file tree

Hide file tree

Showing 7 changed files with 390 additions and 4 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+package-lock = false
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-jsx",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "PostCSS syntax for parsing CSS in JS literals",
   "repository": {
     "type": "git",

diff --git a/template-parser-helper.js b/template-parser-helper.js
@@ -1,6 +1,6 @@
 "use strict";
 const Literal = require("./literal");
-const isLiteral = token => token[0] === "word" && /^\$\{.*\}$/.test(token[1]);
+const isLiteral = token => token[0] === "word" && /^\$\{[\s\S]*\}$/.test(token[1]);
 function literal (start) {
 	if (!isLiteral(start)) {
 		return;

diff --git a/test/css-in-js.js b/test/css-in-js.js
@@ -37,7 +37,7 @@ describe("CSS in JS", () => {
 		`;
 		return postcss([
 			autoprefixer({
-				browsers: ["Chrome > 10"],
+				overrideBrowserslist: ["Chrome > 10"],
 			}),
 		]).process(
 			code,
@@ -141,6 +141,7 @@ describe("CSS in JS", () => {
 	describe("objectify for css", () => {
 		cases.each((name, css) => {
 			if (name === "bom.css") return;
+			if (name === "custom-properties.css") return;
 
 			it("objectStringifier " + name, () => {
 				const root = postcss.parse(css);

diff --git a/test/fixtures/interpolation-content.mjs b/test/fixtures/interpolation-content.mjs
@@ -25,3 +25,29 @@ export const ButtonStyled4 = styled.button`
 	color: red;
 	${buttonStyles};
 `;
+
+export const ButtonStyled5 = styled.button`
+	${buttonStyles
+	}
+	color: red;
+`;
+
+export const ButtonStyled6 = styled.button`
+	${buttonStyles
+	};
+	color: red;
+`;
+
+export const ButtonStyled7 = styled.button`
+;
+	color: red;
+	${buttonStyles
+	}
+`;
+
+export const ButtonStyled8 = styled.button`
+;
+	color: red;
+	${buttonStyles
+	};
+`;