Skip to content

Commit

Permalink
Merge pull request #360 from xzyfer/feat/update-deps
Browse files Browse the repository at this point in the history
Update npm dependencies
  • Loading branch information
xzyfer committed Oct 25, 2015
2 parents 33a8a4f + ebd4892 commit 66083d7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
21 changes: 13 additions & 8 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ rules:
# Disallow warning comments
no-warning-comments:
- 1
- terms
- terms:
- todo
- fixme
location
- anywhere
location: anywhere

# Warns when variables are defined but never used
no-unused-vars: 1
Expand Down Expand Up @@ -114,7 +113,6 @@ rules:
space-after-keywords:
- 2
- always
- checkFunctionKeyword: true

# Enforces quoted property names
quote-props:
Expand Down Expand Up @@ -146,10 +144,17 @@ rules:
- 2
- single

# Enforces space inside of brackets (except property name)
space-in-brackets:
# Disallow or enforce spaces inside of curly braces in objects.
object-curly-spacing:
- 2
- always
- propertyName: false
singleValue: false

# Disallow or enforce spaces inside of brackets.
array-bracket-spacing:
- 2
- never

# Disallow or enforce spaces inside of computed properties.
computed-property-spacing:
- 2
- never
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ var gulpSass = function gulpSass(options, sync) {

filePush(result);
}
catch(error) {
catch (error) {
return errorM(error);
}
}
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
"dependencies": {
"gulp-util": "^3.0",
"node-sass": "^3.4.0",
"object-assign": "^2.0.0",
"through2": "^0.6.3",
"vinyl-sourcemaps-apply": "~0.1.1"
"object-assign": "^4.0.1",
"through2": "^2.0.0",
"vinyl-sourcemaps-apply": "^0.2.0"
},
"devDependencies": {
"autoprefixer-core": "^5.1.11",
"eslint": "^0.17.1",
"autoprefixer-core": "^5.0.0",
"eslint": "^1.6.0",
"globule": "^0.2.0",
"gulp": "^3.8.11",
"gulp-postcss": "^5.1.6",
"gulp-postcss": "^5.0.0",
"gulp-sourcemaps": "^1.5.2",
"gulp-tap": "^0.1.3",
"mocha": "^2.2.1",
"rimraf": "^2.4.3",
"should": "^5.2.0"
"should": "^7.1.0"
}
}

0 comments on commit 66083d7

Please sign in to comment.