Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Semigradsky committed May 15, 2017
1 parent f5d5734 commit 60db5cc
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 31 deletions.
10 changes: 0 additions & 10 deletions .eslintrc

This file was deleted.

35 changes: 35 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
root: true
extends: eslint:recommended

parserOptions:
ecmaVersion: 5

env:
commonjs: true

rules:
indent: [2, 2] # 2 spaces indentation
max-len: [2, 80, 4, { "ignoreStrings": true }]
quotes: [2, "single"]
semi: [2, "always"]
no-multiple-empty-lines: [2, {"max": 1}]

brace-style: [2, "1tbs"]
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}]
keyword-spacing: [2, {"before": true, "after": true}]
space-before-blocks: [2, "always"]
space-before-function-paren: [2, "never"]
space-in-parens: [2, "never"]
4 changes: 0 additions & 4 deletions .jscs.json

This file was deleted.

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ git:
depth: 2
language: node_js
node_js:
- '0.10'
- '0.12'
- '4'
- '6'
notifications:
email: false
after_script:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ version: '{build}'

environment:
matrix:
- nodejs_version: '0.10'
- nodejs_version: '0.12'
- nodejs_version: '4'
- nodejs_version: '6'

install:
- ps: Install-Product node $env:nodejs_version
Expand Down
8 changes: 5 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@ function parseGray(decl) {
rgb.push(alpha);
}
try {
return color(fn + '(' + rgb + ')').rgbString();
return color(fn + '(' + rgb + ')').rgb().string();
} catch (err) {
var message = err.message.replace(/rgba?\(.*\)/, 'gray(' + args + ')');
throw decl.error(message, errorContext);
throw decl.error(
'Unable to parse color from string "gray(' + args + ')"',
errorContext
);
}
});
}
Expand Down
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://github.com/shinnn"
},
"scripts": {
"pretest": "npm run eslint && npm run jscs",
"pretest": "npm run eslint",
"eslint": "eslint index.js test.js",
"jscs": "jscs index.js test.js",
"test": "node test.js | tap-spec",
Expand Down Expand Up @@ -37,18 +37,17 @@
"function"
],
"dependencies": {
"color": "^0.11.3",
"postcss": "^5.0.4",
"color": "^1.0.3",
"postcss": "^6.0.1",
"postcss-message-helpers": "^2.0.0",
"reduce-function-call": "^1.0.1"
"reduce-function-call": "^1.0.2"
},
"devDependencies": {
"eslint": "^0.10.2",
"istanbul": "^0.3.5",
"istanbul-coveralls": "^1.0.1",
"jscs": "^1.8.1",
"eslint": "^3.19.0",
"istanbul": "^0.4.5",
"istanbul-coveralls": "^1.0.3",
"npmpub": "^3.1.0",
"tap-spec": "^2.1.0",
"tape": "^3.0.3"
"tap-spec": "^4.1.1",
"tape": "^4.6.3"
}
}

0 comments on commit 60db5cc

Please sign in to comment.