From c1bfe9fd04c66da6f86072f063c3539b061344b4 Mon Sep 17 00:00:00 2001 From: Maxime Thirouin Date: Wed, 3 Feb 2016 07:54:27 +0100 Subject: [PATCH] 5.0.1 --- .eslintrc | 39 --------------------------------------- .travis.yml | 7 +++++++ CHANGELOG.md | 5 +++++ index.js | 6 +++--- package.json | 14 +++++++++++--- test/index.js | 2 +- 6 files changed, 27 insertions(+), 46 deletions(-) delete mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 18d7c97..0000000 --- a/.eslintrc +++ /dev/null @@ -1,39 +0,0 @@ ---- -root: true -extends: eslint:recommended - -#ecmaFeatures: -# modules: true - -env: -# es6: true - browser: true - node: true - -rules: - indent: [2, 2] # 2 spaces indentation - max-len: [2, 80, 4] - quotes: [2, "double"] - semi: [2, "never"] - no-multiple-empty-lines: [2, {"max": 1}] - - brace-style: [2, "stroustrup"] - comma-dangle: [2, "always-multiline"] - comma-style: [2, "last"] - dot-location: [2, "property"] - - one-var: [2, "never"] -# no-var: [2] -# prefer-const: [2] - no-bitwise: [2] - - object-curly-spacing: [2, "never"] - array-bracket-spacing: [2, "never"] - computed-property-spacing: [2, "never"] - - space-unary-ops: [2, {"words": true, "nonwords": false}] - space-after-keywords: [2, "always"] - space-before-blocks: [2, "always"] - space-before-function-paren: [2, "never"] - space-in-parens: [2, "never"] - spaced-comment: [2, "always"] diff --git a/.travis.yml b/.travis.yml index 587bd3e..dd60f93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,8 @@ language: node_js + +node_js: + - 4 + - 5 + +matrix: + fast_finish: true diff --git a/CHANGELOG.md b/CHANGELOG.md index f83ce47..06051dd 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 5.0.1 - 2016-02-03 + +- Fixed: circular dependencies are properly detected +([#17](https://github.com/postcss/postcss-custom-media/pull/17)) + # 5.0.0 - 2015-08-25 - Removed: compatibility with postcss v4.x diff --git a/index.js b/index.js index 737035c..5531f75 100755 --- a/index.js +++ b/index.js @@ -84,7 +84,7 @@ function customMedia(options) { }) Object.keys(map).forEach(function(name) { - map[name].value = resolveValue(map[name], [name], map, result) + map[name].value = resolveValue(map[name], [ name ], map, result) map[name].resolved = true }) @@ -100,7 +100,7 @@ function customMedia(options) { result.warn( "Circular @custom-media definition for '" + name + "'. The entire rule has been removed from the output.", - {node: rule} + { node: rule } ) toRemove.push(rule) } @@ -110,7 +110,7 @@ function customMedia(options) { result.warn( "Missing @custom-media definition for '" + name + "'. The entire rule has been removed from the output.", - {node: rule} + { node: rule } ) toRemove.push(rule) }) diff --git a/package.json b/package.json index 2af41a5..a316688 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "postcss-custom-media", - "version": "5.0.0", + "version": "5.0.1", "description": "PostCSS plugin to transform W3C CSS Custom Media Queries to more compatible CSS", "keywords": [ "css", @@ -22,10 +22,18 @@ "postcss": "^5.0.0" }, "devDependencies": { - "eslint": "^1.0.0", + "eslint": "^1.10.3", + "eslint-config-i-am-meticulous": "^2.0.0", + "npmpub": "^3.0.1", "tape": "^4.0.0" }, "scripts": { - "test": "eslint . && tape test" + "lint": "eslint --fix .", + "tests": "tape test", + "test": "npm run lint && npm run tests", + "release": "npmpub" + }, + "eslintConfig": { + "extends": "eslint-config-i-am-meticulous/es5" } } diff --git a/test/index.js b/test/index.js index a11c177..55801e0 100755 --- a/test/index.js +++ b/test/index.js @@ -97,7 +97,7 @@ test("@custom-media", function(t) { t, "preserve", "should preserve custom media", - {preserve: true} + { preserve: true } ) compareFixtures(