Merge pull request #144 from GitScrum/milestone-0.0.27

Milestone 0.0.27

Author: Scrum

changelog.md

@@ -1,3 +1,33 @@
+<a name="0.0.27"></a>
+## 0.0.27 (2017-02-01)
+
+* 0.0.27 ([9aa8e49](https://github.com/gitscrum/postcss-at-rules-variables/commit/9aa8e49))
+* Update readme.md ([6157e25](https://github.com/gitscrum/postcss-at-rules-variables/commit/6157e25))
+* perf(index): add mixin, custom-media, close #141, close #143 ([0114b0d](https://github.com/gitscrum/postcss-at-rules-variables/commit/0114b0d)), closes [#141](https://github.com/gitscrum/postcss-at-rules-variables/issues/141) [#143](https://github.com/gitscrum/postcss-at-rules-variables/issues/143)
+* perf(index): update resolve values ([76b7e8e](https://github.com/gitscrum/postcss-at-rules-variables/commit/76b7e8e))
+* docs(readme): add mixin, custom-media ([3013665](https://github.com/gitscrum/postcss-at-rules-variables/commit/3013665))
+* chore(changelog): Update changelog ([0f5d1ac](https://github.com/gitscrum/postcss-at-rules-variables/commit/0f5d1ac))
+* chore(package): change es215 to env, close #120 ([1f1990f](https://github.com/gitscrum/postcss-at-rules-variables/commit/1f1990f)), closes [#120](https://github.com/gitscrum/postcss-at-rules-variables/issues/120)
+* chore(package): update babel-cli to version 6.22.2 ([2990abf](https://github.com/gitscrum/postcss-at-rules-variables/commit/2990abf))
+* chore(package): update babel-preset-babili to version 0.0.10 ([5fb8620](https://github.com/gitscrum/postcss-at-rules-variables/commit/5fb8620))
+* chore(package): update babel-preset-es2015 to version 6.22.0 ([6c5789f](https://github.com/gitscrum/postcss-at-rules-variables/commit/6c5789f))
+* chore(package): update clinton to version 0.10.0 ([d3f9efb](https://github.com/gitscrum/postcss-at-rules-variables/commit/d3f9efb))
+* chore(package): update clinton to version 0.11.0 ([7a30737](https://github.com/gitscrum/postcss-at-rules-variables/commit/7a30737))
+* chore(package): update depDev ([a204fa6](https://github.com/gitscrum/postcss-at-rules-variables/commit/a204fa6))
+* chore(package): update eslint to version 3.14.1 ([c868010](https://github.com/gitscrum/postcss-at-rules-variables/commit/c868010))
+* chore(package): update eslint-plugin-ava to version 4.0.1 ([e607fb0](https://github.com/gitscrum/postcss-at-rules-variables/commit/e607fb0))
+* chore(package): update eslint-plugin-babel to version 4.0.1 ([7a0bb50](https://github.com/gitscrum/postcss-at-rules-variables/commit/7a0bb50))
+* chore(package): update husky to version 0.12.0 ([3a41eff](https://github.com/gitscrum/postcss-at-rules-variables/commit/3a41eff))
+* chore(package): update husky to version 0.13.1 ([34e4053](https://github.com/gitscrum/postcss-at-rules-variables/commit/34e4053))
+* chore(package): update np to version 2.11.0 ([58a204e](https://github.com/gitscrum/postcss-at-rules-variables/commit/58a204e))
+* chore(package): update np to version 2.12.0 ([14ccc89](https://github.com/gitscrum/postcss-at-rules-variables/commit/14ccc89))
+* chore(package): update nyc to version 10.1.0 ([1a9bb12](https://github.com/gitscrum/postcss-at-rules-variables/commit/1a9bb12))
+* chore(package): update postcss to version 5.2.10 ([aebad93](https://github.com/gitscrum/postcss-at-rules-variables/commit/aebad93))
+* chore(package): update postcss to version 5.2.8 ([bcc0b07](https://github.com/gitscrum/postcss-at-rules-variables/commit/bcc0b07))
+* test(test): add test witch custom-media ([e56893b](https://github.com/gitscrum/postcss-at-rules-variables/commit/e56893b))
+
+
+
 <a name="0.0.26"></a>
 ## 0.0.26 (2016-12-02)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-at-rules-variables",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "PostCss plugin to use CSS Custom Properties in at-rule @each, @for, @if, @else ",
   "license": "MIT",
   "repository": "gitscrum/postcss-at-rules-variables",
@@ -48,32 +48,32 @@
     "property"
   ],
   "dependencies": {
-    "postcss": "^5.2.8"
+    "postcss": "^5.2.10"
   },
   "devDependencies": {
     "ava": "*",
-    "ava-codemods": "^0.3.0",
-    "babel-cli": "^6.10.1",
+    "ava-codemods": "^0.3.1",
+    "babel-cli": "^6.22.2",
     "babel-eslint": "^7.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-babili": "0.0.9",
-    "babel-preset-es2015": "^6.9.0",
-    "babel-register": "^6.9.0",
+    "babel-preset-babili": "0.0.10",
+    "babel-preset-env": "^1.1.8",
+    "babel-register": "^6.22.0",
     "clinton": "^0.11.0",
     "conventional-changelog-cli": "^1.2.0",
     "conventional-changelog-lint": "^1.1.0",
     "coveralls": "^2.11.9",
-    "eslint": "^3.9.0",
+    "eslint": "^3.14.1",
     "eslint-config-xo": "^0.17.0",
     "eslint-formatter-pretty": "^1.1.0",
-    "eslint-plugin-ava": "^4.0.0",
-    "eslint-plugin-babel": "^4.0.0",
+    "eslint-plugin-ava": "^4.0.1",
+    "eslint-plugin-babel": "^4.0.1",
     "eslint-plugin-markdown": "^1.0.0-beta.2",
     "eslint-plugin-require-path-exists": "^1.1.5",
     "eslint-plugin-xo": "^1.0.0",
-    "husky": "^0.12.0",
+    "husky": "^0.13.1",
     "np": "^2.12.0",
-    "nyc": "^10.0.0",
+    "nyc": "^10.1.0",
     "testen": "^1.8.2",
     "updtr": "^0.2.1"
   },
@@ -87,7 +87,14 @@
   },
   "babel": {
     "presets": [
-      "es2015",
+      [
+        "env",
+        {
+          "targets": {
+            "node": 4
+          }
+        }
+      ],
       "babili"
     ],
     "plugins": [

readme.md

@@ -146,7 +146,7 @@ h2 {
 #### `atRules`
 
 Type: `Array`  
-Default: `['for', 'if', 'else', 'each']`  
+Default: `['for', 'if', 'else', 'each', 'mixin', 'custom-media']`  
 Description: *The array used in all at-rules in your project*
 
 ## LICENSE

src/index.js

@@ -1,15 +1,11 @@
 import postcss from 'postcss';
 
 function hasVar(str) {
-	return str.indexOf('var(');
+	return str.includes('var(');
 }
 
 function resolveValue(value, maps) {
-	if (hasVar(value) === -1) {
-		return value;
-	}
-
-	return value.replace(/var\(--.*?\)/g, match => maps[match.slice(4, -1)] || match);
+	return hasVar(value) ? value.replace(/var\(--.*?\)/g, match => maps[match.slice(4, -1)] || match) : value;
 }
 
 function getProperty(nodes) {
@@ -30,7 +26,7 @@ function getProperty(nodes) {
 
 export default postcss.plugin('postcss-at-rules-variables', (options = {}) => {
 	options = {
-		atRules: [...new Set(['for', 'if', 'else', 'each', ...options.atRules || ''])]
+		atRules: [...new Set(['for', 'if', 'else', 'each', 'mixin', 'custom-media', ...options.atRules || ''])]
 	};
 
 	return nodes => {

test/test.js

@@ -53,3 +53,9 @@ test('it without variables', t => {
 	const value = ':root{ --red: red; } @if var(--green) { color: var(--green) }';
 	t.is(processing(value), expected);
 });
+
+test('should change for @custom-media', t => {
+	const expected = ':root{ --breakpoint-xs: 29.25em } @custom-media --viewport-xs (width > 29.25em)';
+	const value = ':root{ --breakpoint-xs: 29.25em } @custom-media --viewport-xs (width > var(--breakpoint-xs))';
+	t.is(processing(value, {atRules: ['custom-media']}), expected);
+});