Skip to content

Commit 4e0b75f

Browse files
authored
Merge pull request #74 from suitcss/update-packages
Update packages
2 parents 3ca90c0 + 67e2fce commit 4e0b75f

File tree

12 files changed

+5197
-26
lines changed

12 files changed

+5197
-26
lines changed

.eslintrc

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
11
{
2-
"extends": "airbnb/legacy",
2+
"extends": "airbnb-base",
33
"env": {
44
"es6": true
55
},
66
"globals": {
7-
"Promise": true
7+
"Promise": true,
8+
"document": true
89
},
910
"rules": {
10-
"vars-on-top": 0,
11-
"no-console": 0,
1211
"comma-dangle": [2, "never"],
13-
"max-len": 0,
1412
"func-names": 0,
15-
"one-var": [2, { "uninitialized": "always", "initialized": "never" }],
13+
"global-require": 0,
14+
"max-len": 0,
15+
"no-console": 0,
1616
"no-param-reassign": [0],
1717
"no-use-before-define": [2, "nofunc"],
18-
"space-before-function-paren": 0,
1918
"object-curly-spacing": 0,
20-
"global-require": 0
19+
"one-var": [2, { "uninitialized": "always", "initialized": "never" }],
20+
"space-before-function-paren": 0,
21+
"vars-on-top": 0,
22+
23+
"import/no-dynamic-require": 0,
24+
25+
// Disable until using node 4 as base
26+
"no-var": 0,
27+
"prefer-arrow-callback": 0,
28+
"object-shorthand": 0,
29+
"prefer-template": 0
2130
}
2231
}

.travis.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: node_js
2-
sudo: false
2+
sudo: required
33
node_js:
44
- "4"
55
- "5"
@@ -8,7 +8,14 @@ addons:
88
apt:
99
packages:
1010
- xvfb
11+
before_install:
12+
- curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
13+
- echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
14+
- sudo apt-get update && sudo apt-get install yarn
15+
cache:
16+
directories:
17+
- $HOME/.yarn-cache
1118
install:
1219
- export DISPLAY=':99.0'
1320
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
14-
- npm install
21+
- yarn

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
### HEAD
22

3+
* Update `fs-extra` to `2.0.0`
4+
* Update `postcss-apply` to `0.5.0`
5+
* Update `postcss-color-function` to `3.0.0`
6+
* Update `postcss-reporter` to `3.0.0`
7+
* Update `stylelint-config-suitcss` to `10.0.0`
8+
* Update `devDependencies` to latest
9+
310
### 3.0.1 (Decemeber 09, 2016)
411

512
* Fix: Allow `--importRoot` to override root config option [#70](https://github.com/suitcss/preprocessor/pull/70)

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ deploy: off
1212

1313
install:
1414
- ps: Install-Product node $env:nodejs_version
15-
- npm install
15+
- yarn
1616

1717
test_script:
1818
- node --version

bin/suitcss

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
var fs = require('fs-extra');
44
var assign = require('object-assign-deep');
5-
var exists = fs.existsSync;
65
var logger = require('./logger');
76
var suitcss = require('..');
87
var path = require('path');
9-
var resolve = path.resolve;
108
var program = require('commander');
119
var read = require('read-file-stdin');
1210
var chokidar = require('chokidar');
11+
12+
var exists = fs.existsSync;
13+
var resolve = path.resolve;
1314
var writeFileSync = fs.outputFileSync;
1415

1516
/**

package.json

+15-13
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,35 @@
1616
"colors": "~1.1.2",
1717
"commander": "~2.9.0",
1818
"cssnano": "^3.3.2",
19-
"fs-extra": "^0.26.2",
19+
"fs-extra": "^2.0.0",
2020
"lodash.difference": "^4.0.2",
2121
"lodash.isempty": "^4.1.1",
2222
"object-assign-deep": "0.0.4",
2323
"pad-component": "0.0.1",
2424
"postcss": "^5.0.12",
25-
"postcss-apply": "^0.4.0",
25+
"postcss-apply": "^0.5.0",
2626
"postcss-autoreset": "^1.2.0",
2727
"postcss-bem-linter": "^2.3.0",
2828
"postcss-calc": "^5.0.0",
29-
"postcss-color-function": "^2.0.1",
29+
"postcss-color-function": "^3.0.0",
3030
"postcss-custom-media": "^5.0.0",
3131
"postcss-custom-properties": "^5.0.0",
3232
"postcss-easy-import": "^1.0.1",
33-
"postcss-reporter": "^2.0.0",
33+
"postcss-reporter": "^3.0.0",
3434
"read-file-stdin": "^0.2.1",
3535
"stylelint": "^7.2.0",
36-
"stylelint-config-suitcss": "^8.0.0"
36+
"stylelint-config-suitcss": "^10.0.0"
3737
},
3838
"devDependencies": {
39-
"browserify": "^13.1.0",
40-
"browserify-css": "^0.9.2",
39+
"browserify": "^14.1.0",
40+
"browserify-css": "^0.10.0",
4141
"chai": "^3.4.1",
42-
"chai-as-promised": "^5.2.0",
42+
"chai-as-promised": "^6.0.0",
4343
"computed-style": "^0.3.0",
44-
"eslint": "^3.5.0",
45-
"eslint-config-airbnb": "^11.1.0",
46-
"mocha": "^2.3.4",
44+
"eslint": "^3.16.1",
45+
"eslint-config-airbnb-base": "^11.1.0",
46+
"eslint-plugin-import": "^2.2.0",
47+
"mocha": "^3.2.0",
4748
"postcss-property-lookup": "^1.1.4",
4849
"rewire": "^2.5.1",
4950
"sinon": "^1.17.2",
@@ -52,10 +53,11 @@
5253
"tape-run": "^2.1.4"
5354
},
5455
"scripts": {
55-
"test": "npm run mocha && npm run test:encapsulation && npm run lint",
56+
"test": "npm run mocha && npm run test:encapsulation",
5657
"test:encapsulation": "browserify -t [ browserify-css --autoInject=false ] test/encapsulation/browser.js | tape-run",
5758
"mocha": "mocha test/index.js --reporter spec --slow 400 --timeout 8000",
58-
"lint": "eslint lib/*.js test/**/*.js bin/suitcss",
59+
"posttest": "npm run lint",
60+
"lint": "eslint lib test bin/suitcss",
5961
"watch": "npm run mocha -- --watch"
6062
},
6163
"keywords": [

test/cli.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var chai = require('chai');
22
var child = require('child_process');
33
var util = require('./util');
4+
45
var exec = child.exec;
56
var expect = chai.expect;
67

test/encapsulation/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var chai = require('chai');
22
var chaiAsPromised = require('chai-as-promised');
33
var suitcss = require('../../lib');
44
var util = require('../util');
5+
56
var expect = chai.expect;
67

78
chai.use(chaiAsPromised);

test/linting.js

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var chai = require('chai');
22
var chaiAsPromised = require('chai-as-promised');
33
var suitcss = require('../lib');
44
var util = require('./util');
5+
56
var expect = chai.expect;
67

78
chai.use(chaiAsPromised);

test/node.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var chai = require('chai');
22
var suitcss = require('../lib');
33
var util = require('./util');
4+
45
var expect = chai.expect;
56

67
describe('node API', function() {

test/options.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var sinon = require('sinon');
22
var rewire = require('rewire');
33
var chai = require('chai');
4+
45
var suitcss = rewire('../lib');
56
var expect = chai.expect;
67

0 commit comments

Comments
 (0)