Skip to content

Commit

Permalink
Merge branch 'post-install' into dependencies-badge
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonLab committed Oct 24, 2016
2 parents 016a1e9 + f488e7a commit dd8c5ee
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"coverage": "node_modules/.bin/istanbul cover tape test/index.js",
"lint": "bin/cmd.js .",
"lint:fix": "bin/cmd.js . --fix",
"postinstall": "ln -sf $(pwd)/.eslintrc.js $(pwd)/../../.eslintrc.js"
"postinstall": "ln -sf \"$(pwd)\"/.eslintrc.js \"$(pwd)\"/../../.eslintrc.js"
},
"devDependencies": {
"istanbul": "^0.4.5",
Expand All @@ -25,4 +25,4 @@
"shouston3",
"SimonLab"
]
}
}
3 changes: 2 additions & 1 deletion rules/stylistic_issues.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,6 @@ module.exports = {
beforeColon: false, afterColon: true, mode: 'strict'
}], // https://github.com/dwyl/goodparts/issues/198
'no-restricted-syntax': 0, // https://github.com/dwyl/goodparts/issues/111
'no-continue': 2 // https://github.com/dwyl/goodparts/issues/162
'no-continue': 2, // https://github.com/dwyl/goodparts/issues/162,
'func-name-matching': 2 // https://github.com/dwyl/goodparts/issues/256
};
4 changes: 4 additions & 0 deletions test/fixtures/stylistic_issues.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,5 +295,9 @@ module.exports = {
'key-spacing': {
fail: ['var obj = {key : 42};'],
pass: ['var obj = {key: 42};']
},
'func-name-matching': {
fail: ['var bar = function foo () {return 42;};'],
pass: ['var bar = function bar () {return 42;};']
}
};

0 comments on commit dd8c5ee

Please sign in to comment.