Merge branch 'master' into readme-refactor

Author: MadLittleMods

CHANGELOG.md

@@ -1,24 +1,31 @@
 
+
+# v0.5.2 - 2016-8-24
+
+ - Fix [#42](https://github.com/MadLittleMods/postcss-css-variables/issues/42) where `opts.preserve` was not working inside at-rules
+    - Thank you to [@muftiev](github.com/muftiev) for the [contribution](https://github.com/MadLittleMods/postcss-css-variables/pull/43)
+
+
 # v0.5.1 - 2015-10-24
 
  - Fix [postcss/postcss#611](https://github.com/postcss/postcss/issues/611) where we were trying to remove the root node on clean up
  - Improved test setup
 
 # v0.5.0 - 2015-9-12
 
- - Upgrade to PostCSS v5. Fix #20
+ - Upgrade to PostCSS v5. Fix [#20](https://github.com/MadLittleMods/postcss-css-variables/issues/20)
 
 # v0.4.0 - 2015-7-2
 
- - Fix #15
+ - Fix [#15](https://github.com/MadLittleMods/postcss-css-variables/issues/15)
  	 - Remove slowness from cloning the `root` with `node.clone().removeAll()`. Now using `./lib/shallow-clone-node.js` to avoid cloning children which will get removed right after.
- 	 - Thank you to @ddprrt for bringing up the slowness issue in this article, [PostCSS misconceptions](https://medium.com/@ddprrt/postcss-misconceptions-faf5dc5038df).
+ 	 - Thank you to [@ddprrt](https://github.com/ddprrt) for bringing up the slowness issue in this article, [PostCSS misconceptions](https://medium.com/@ddprrt/postcss-misconceptions-faf5dc5038df).
 
 
 
 # v0.3.9 - 2015-6-29
 
- - Remove `opts` global leak. Fix #13
+ - Remove `opts` global leak. Fix [#13](https://github.com/MadLittleMods/postcss-css-variables/issues/13)
 
 
 # v0.3.8 - 2015-5-28
@@ -27,12 +34,12 @@
 
 # v0.3.7 - 2015-5-27
 
- - Fix #7: Support for child combinator
+ - Fix [#7](https://github.com/MadLittleMods/postcss-css-variables/issues/7): Support for child combinator
  - Added tests for child-combinator/direct-descendant coverage
 
 # v0.3.6 - 2015-5-21
 
- - Fix #6. Variable usage in comma separated selector to use proper scope
+ - Fix [#6](https://github.com/MadLittleMods/postcss-css-variables/issues/6). Variable usage in comma separated selector to use proper scope
 
 # v0.3.5 - 2015-5-12
 
@@ -51,7 +58,7 @@
 # v0.3.1 - 2015-5-5
 
  - Large overhaul of code to make it more robust on proper scope resolution.
- - Fix #2
+ - Fix [#2]](https://github.com/MadLittleMods/postcss-css-variables/issues/2)
 
 # v0.2.3 - 2015-5-4
 

lib/resolve-decl.js

@@ -94,12 +94,15 @@ function resolveDecl(decl, map, /*optional*/shouldPreserve, /*optional*/logResol
 	eachMapItemDependencyOfDecl(valueResults.variablesUsed, map, decl, function(mimicDecl, mapItem) {
 		var ruleClone = shallowCloneNode(decl.parent);
 		var declClone = decl.clone();
-		// No mangle resolve
-		declClone.value = _logResolveValueResult(resolveValue(mimicDecl, map, true)).value;
-
 		// Add the declaration to our new rule
 		ruleClone.append(declClone);
 
+		if(shouldPreserve === true) {
+			declClone.cloneAfter();
+		}
+
+		// No mangle resolve
+		declClone.value = _logResolveValueResult(resolveValue(mimicDecl, map, true)).value;
 
 		if(mapItem.isUnderAtRule) {
 			// Create the clean atRule for which we place the declaration under

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-css-variables",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "PostCSS plugin to transform CSS Custom Properties(CSS variables) syntax into a static representation",
   "keywords": [
     "postcss",

test/fixtures/preserve-variables-in-media.css

@@ -0,0 +1,13 @@
+:root {
+    --width: 100px;
+}
+
+@media (max-width: 1000px) {
+    :root {
+        --width: 200px;
+    }
+}
+
+.box {
+    width: var(--width);
+}

test/fixtures/preserve-variables-in-media.expected.css

@@ -0,0 +1,22 @@
+:root {
+    --width: 100px;
+}
+
+@media (max-width: 1000px) {
+    :root {
+        --width: 200px;
+    }
+}
+
+.box {
+    width: 100px;
+    width: var(--width);
+}
+
+@media (max-width: 1000px) {
+
+    .box {
+        width: 200px;
+        width: var(--width);
+    }
+}

test/test.js

@@ -169,6 +169,12 @@ describe('postcss-css-variables', function() {
 			{ preserve: true }
 		);
 
+		test(
+			'preserves variables in @media when `preserve` is `true`',
+			'preserve-variables-in-media',
+			{ preserve: true }
+		);
+
 		test(
 			'preserves computed value when `preserve` is `\'computed\'`',
 			'preserve-computed',