8.0.9

jonathantneal · jonathantneal · commit 7b9b84ba61a6 · 2018-11-05T16:30:38.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes to PostCSS Custom Properties
 
+### 8.0.9 (November 5, 2018)
+
+- Fixed: Issue with duplicate custom property usage within a declaration
+
 ### 8.0.8 (October 2, 2018)
 
 - Fixed: Issue with nested fallbacks
diff --git a/lib/transform-value-ast.js b/lib/transform-value-ast.js
@@ -8,9 +8,11 @@ export default function transformValueAST(root, customProperties) {
 
 				if (name in customProperties) {
 					// conditionally replace a known custom property
-					child.replaceWith(...asClonedArrayWithBeforeSpacing(customProperties[name], child.raws.before));
+					const nodes = asClonedArrayWithBeforeSpacing(customProperties[name], child.raws.before);
 
-					retransformValueAST(root, customProperties, name);
+					child.replaceWith(...nodes);
+
+					retransformValueAST({ nodes }, customProperties, name);
 				} else if (fallbacks.length) {
 					// conditionally replace a custom property with a fallback
 					const index = root.nodes.indexOf(child);
@@ -24,7 +26,7 @@ export default function transformValueAST(root, customProperties) {
 			} else {
 				transformValueAST(child, customProperties);
 			}
-		})
+		});
 	}
 
 	return root;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-custom-properties",
-  "version": "8.0.8",
+  "version": "8.0.9",
   "description": "Use Custom Properties Queries in CSS",
   "author": "Jonathan Neal <jonathantneal@hotmail.com>",
   "contributors": [
@@ -37,11 +37,11 @@
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "babel-eslint": "^10.0.1",
-    "eslint": "^5.6.1",
+    "eslint": "^5.8.0",
     "eslint-config-dev": "^2.0.0",
     "postcss-tape": "^2.2.0",
     "pre-commit": "^1.2.2",
-    "rollup": "^0.66.2",
+    "rollup": "^0.67.0",
     "rollup-plugin-babel": "^4.0.3"
   },
   "eslintConfig": {
diff --git a/test/basic.css b/test/basic.css
@@ -42,3 +42,7 @@ html {
 .text--calc {
 	width: calc((100% - var(--xxx, 1px)) + var(--yyy, 10px));
 }
+
+.test--linear-gradient {
+	background-image: linear-gradient(to right, var(--color, transparent) 0%, var(--color, transparent) 100%);
+}
diff --git a/test/basic.expect.css b/test/basic.expect.css
@@ -49,3 +49,8 @@ html {
 	width: calc((100% - 1px) + 10px);
 	width: calc((100% - var(--xxx, 1px)) + var(--yyy, 10px));
 }
+
+.test--linear-gradient {
+	background-image: linear-gradient(to right, rgb(255, 0, 0) 0%, rgb(255, 0, 0) 100%);
+	background-image: linear-gradient(to right, var(--color, transparent) 0%, var(--color, transparent) 100%);
+}
diff --git a/test/basic.import-is-empty.expect.css b/test/basic.import-is-empty.expect.css
@@ -49,3 +49,8 @@ html {
 	width: calc((100% - 1px) + 10px);
 	width: calc((100% - var(--xxx, 1px)) + var(--yyy, 10px));
 }
+
+.test--linear-gradient {
+	background-image: linear-gradient(to right, rgb(255, 0, 0) 0%, rgb(255, 0, 0) 100%);
+	background-image: linear-gradient(to right, var(--color, transparent) 0%, var(--color, transparent) 100%);
+}
diff --git a/test/basic.import.expect.css b/test/basic.import.expect.css
@@ -50,3 +50,8 @@ html {
 	width: calc((100% - 1px) + 10px);
 	width: calc((100% - var(--xxx, 1px)) + var(--yyy, 10px));
 }
+
+.test--linear-gradient {
+	background-image: linear-gradient(to right, rgb(255, 0, 0) 0%, rgb(255, 0, 0) 100%);
+	background-image: linear-gradient(to right, var(--color, transparent) 0%, var(--color, transparent) 100%);
+}
diff --git a/test/basic.preserve.expect.css b/test/basic.preserve.expect.css
@@ -34,3 +34,7 @@
 .text--calc {
 	width: calc((100% - 1px) + 10px);
 }
+
+.test--linear-gradient {
+	background-image: linear-gradient(to right, rgb(255, 0, 0) 0%, rgb(255, 0, 0) 100%);
+}

Original file line number	Diff line number	Diff line change
`@@ -42,3 +42,7 @@ html {`
`42`	`42`	`.text--calc {`
`43`	`43`	`width: calc((100% - var(--xxx, 1px)) + var(--yyy, 10px));`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+.test--linear-gradient {`
	`47`	`+ background-image: linear-gradient(to right, var(--color, transparent) 0%, var(--color, transparent) 100%);`
	`48`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -49,3 +49,8 @@ html {`
`49`	`49`	`width: calc((100% - 1px) + 10px);`
`50`	`50`	`width: calc((100% - var(--xxx, 1px)) + var(--yyy, 10px));`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+.test--linear-gradient {`
	`54`	`+ background-image: linear-gradient(to right, rgb(255, 0, 0) 0%, rgb(255, 0, 0) 100%);`
	`55`	`+ background-image: linear-gradient(to right, var(--color, transparent) 0%, var(--color, transparent) 100%);`
	`56`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -50,3 +50,8 @@ html {`
`50`	`50`	`width: calc((100% - 1px) + 10px);`
`51`	`51`	`width: calc((100% - var(--xxx, 1px)) + var(--yyy, 10px));`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+.test--linear-gradient {`
	`55`	`+ background-image: linear-gradient(to right, rgb(255, 0, 0) 0%, rgb(255, 0, 0) 100%);`
	`56`	`+ background-image: linear-gradient(to right, var(--color, transparent) 0%, var(--color, transparent) 100%);`
	`57`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,7 @@`
`34`	`34`	`.text--calc {`
`35`	`35`	`width: calc((100% - 1px) + 10px);`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+.test--linear-gradient {`
	`39`	`+ background-image: linear-gradient(to right, rgb(255, 0, 0) 0%, rgb(255, 0, 0) 100%);`
	`40`	`+}`