Skip to content
This repository has been archived by the owner on Sep 19, 2019. It is now read-only.

Commit

Permalink
Merge pull request #542 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Aug 23, 2019
2 parents 561a95a + 765bf9b commit d911449
Show file tree
Hide file tree
Showing 3 changed files with 224 additions and 193 deletions.
15 changes: 7 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"root": true,
"extends": ["airbnb-base", "plugin:jasmine/recommended"],
"extends": ["airbnb-base", "plugin:mocha/recommended"],
"rules": {
"jasmine/expect-single-argument": 0,
"@blackflux/rules/jasmine-expect-two-arguments": 1,
"jasmine/new-line-before-expect": 0,
"@blackflux/rules/istanbul-prevent-ignore": 1,
"@blackflux/rules/kebab-case-enforce": 1,
"max-len": ["error", {"code": 120}],
Expand Down Expand Up @@ -34,10 +31,12 @@
}
],
"@blackflux/rules/prevent-typeof-object": 1,
"@blackflux/rules/enforce-optimal-require": 1
"mocha/no-mocha-arrows": 0,
"mocha/no-hooks-for-single-case": 0,
"import/no-useless-path-segments": [2, {"commonjs": true}]
},
"env": {"es6": true, "node": true, "jasmine": true, "mocha": true},
"globals": {"logger": true, "log4js": true},
"plugins": ["json", "jasmine", "mocha", "markdown", "@blackflux/rules"],
"env": {"es6": true, "node": true, "mocha": true},
"globals": {},
"plugins": ["json", "mocha", "markdown", "@blackflux/rules"],
"parser": "babel-eslint"
}
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,20 @@
"@babel/core": "7.5.5",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.5.5",
"@blackflux/eslint-plugin-rules": "1.3.5",
"@blackflux/robo-config-plugin": "2.5.9",
"@blackflux/eslint-plugin-rules": "1.3.7",
"@blackflux/robo-config-plugin": "2.5.11",
"babel-eslint": "10.0.2",
"chai": "4.2.0",
"coveralls": "3.0.6",
"eslint": "6.2.1",
"eslint-config-airbnb-base": "14.0.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jasmine": "2.10.1",
"eslint-plugin-json": "1.4.0",
"eslint-plugin-markdown": "1.0.0",
"eslint-plugin-mocha": "6.1.0",
"js-gardener": "2.0.76",
"js-gardener": "2.0.77",
"nyc": "14.1.1",
"semantic-release": "15.13.21"
"semantic-release": "15.13.24"
},
"licenses": [
{
Expand All @@ -73,7 +72,7 @@
"fast-safe-stringify": "2.0.6",
"lodash.get": "4.4.2",
"lodash.omit": "4.5.0",
"rollbar": "2.12.1"
"rollbar": "2.12.2"
},
"peerDependencies": {},
"nyc": {
Expand Down
Loading

0 comments on commit d911449

Please sign in to comment.