Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages

Author: MadLittleMods

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+# v0.5.1 - 2015-10-24
+
+ - Fix postcss/postcss#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
@@ -40,7 +45,7 @@
 
 # v0.3.3 - 2015-5-11
 
- - Add support for last piece of combinator chain in selector resolution matching. 
+ - Add support for last piece of combinator chain in selector resolution matching.
  	 - `.foo + .bar` can match variables declared in `.bar`
 
 # v0.3.1 - 2015-5-5
@@ -65,4 +70,4 @@
 
 # v0.1.0 - 2015-4-29
 
- - First release
+ - First release

README.md

@@ -8,7 +8,6 @@ CSS variables or CSS Custom Properties limited subset polyfill/shim.
 
 We strive for the most complete transformation but we/no plugin can achieve true complete parity according to the [specification](http://dev.w3.org/csswg/css-variables/) because of the DOM cascade unknowns.
 
-## Latest Version: v0.5.0
 ### [Changelog](https://github.com/MadLittleMods/postcss-css-variables/blob/master/CHANGELOG.md)
 
 ### Install
@@ -281,7 +280,7 @@ A custom property can be declared multiple times.
 ### `preserve` (default: `false`)
 
 Allows you to preserve custom properties & var() usage in output.
-Allowed values: 
+Allowed values:
  - `false`: Removes `--var` declarations and replaces `var()` with their resolved/computed values.
  - `true`: Keeps `var()` declarations in the output and has the computed value as a fallback declaration. Also keeps computed `--var` declarations
  - `'computed'`: Keeps computed `--var` declarations in the output. Handy to make them available to your JavaScript.
@@ -292,7 +291,7 @@ Define an object map of variables in JavaScript that will be declared at the `:r
 
 Can be a simple key-value pair or an object with a `value` property and an optional `isImportant` bool property
 
-The object keys are automatically prefixed with `--` (according to CSS custom property syntax) if you do not provide it. 
+The object keys are automatically prefixed with `--` (according to CSS custom property syntax) if you do not provide it.
 
 
 ```
@@ -337,4 +336,4 @@ Run once:
 
 Run whenever you want to test:
 
-`npm run test`
+`npm run test`

index.js

@@ -34,15 +34,23 @@ function eachCssVariableDeclaration(css, cb) {
 
 
 
-function cleanUpNode(currentNodeToRemove) {
-	// If we removed all of the declarations in the rule(making it empty), then just remove it
-	var currentNodeToPossiblyCleanUp = currentNodeToRemove;
-	while(currentNodeToPossiblyCleanUp && currentNodeToPossiblyCleanUp.nodes.length <= 0) {
-		var nodeToRemove = currentNodeToPossiblyCleanUp;
-		// Get a reference to it before we remove and lose reference to the child after removing it
-		currentNodeToPossiblyCleanUp = currentNodeToPossiblyCleanUp.parent;
-
-		nodeToRemove.remove();
+function cleanUpNode(node) {
+	// If we removed all of the declarations in the rule(making it empty),
+	// then just remove it
+	var nodeToPossiblyCleanUp = node;
+	while(nodeToPossiblyCleanUp && nodeToPossiblyCleanUp.nodes.length <= 0) {
+		var nodeToRemove = nodeToPossiblyCleanUp.type !== 'root' ? nodeToPossiblyCleanUp : null;
+
+		if(nodeToRemove) {
+			// Get a reference to it before we remove
+			// and lose reference to the child after removing it
+			nodeToPossiblyCleanUp = nodeToRemove.parent;
+
+			nodeToRemove.remove();
+		}
+		else {
+			nodeToPossiblyCleanUp = null;
+		}
 	}
 }
 

package.json

@@ -1,11 +1,11 @@
 {
   "name": "postcss-css-variables",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "PostCSS plugin to transform CSS Custom Properties(CSS variables) syntax into a static representation",
   "keywords": [
     "postcss",
     "css",
-    "postcssplugin"
+    "postcss-plugin"
   ],
   "author": "Eric Eastwood <contact@ericeastwood.com> (http://ericeastwood.com/)",
   "license": "MIT",