Merge pull request #308 from blackflux/dev

[Gally]: master <- dev
blackflux · Aug 4, 2019 · e66dc51 · e66dc51
2 parents 7f83c32 + d03b5c2
commit e66dc51
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 104 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,115 +1,42 @@
 {
   "root": true,
-  "extends": [
-    "airbnb-base",
-    "plugin:jasmine/recommended"
-  ],
+  "extends": ["airbnb-base", "plugin:jasmine/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
-      }
-    ],
+    "max-len": ["error", {"code": 120}],
     "mocha/no-exclusive-tests": "error",
-    "prefer-destructuring": [
-      "error",
-      {
-        "object": false,
-        "array": false
-      }
-    ],
-    "comma-dangle": [
-      "error",
-      "never"
-    ],
-    "indent": [
-      "error",
-      2,
-      {
-        "SwitchCase": 1
-      }
-    ],
-    "quotes": [
-      2,
-      "single",
-      {
-        "avoidEscape": true
-      }
-    ],
-    "linebreak-style": [
-      2,
-      "unix"
-    ],
-    "semi": [
-      2,
-      "always"
-    ],
+    "prefer-destructuring": ["error", {"object": false, "array": false}],
+    "comma-dangle": ["error", "never"],
+    "indent": ["error", 2, {"SwitchCase": 1}],
+    "quotes": [2, "single", {"avoidEscape": true}],
+    "linebreak-style": [2, "unix"],
+    "semi": [2, "always"],
     "no-unused-vars": [
       1,
-      {
-        "vars": "all",
-        "args": "none",
-        "ignoreRestSiblings": true
-      }
-    ],
-    "no-var": [
-      1
-    ],
-    "no-fallthrough": [
-      1
+      {"vars": "all", "args": "none", "ignoreRestSiblings": true}
     ],
+    "no-var": [1],
+    "no-fallthrough": [1],
     "spaced-comment": [
       "error",
       "always",
       {
-        "line": {
-          "exceptions": [
-            "-",
-            "+"
-          ],
-          "markers": [
-            "=",
-            "!"
-          ]
-        },
+        "line": {"exceptions": ["-", "+"], "markers": ["=", "!"]},
         "block": {
-          "exceptions": [
-            "-",
-            "+"
-          ],
-          "markers": [
-            "=",
-            "!",
-            ":",
-            "::"
-          ],
+          "exceptions": ["-", "+"],
+          "markers": ["=", "!", ":", "::"],
           "balanced": true
         }
       }
-    ]
-  },
-  "env": {
-    "es6": true,
-    "node": true,
-    "jasmine": true,
-    "mocha": true
-  },
-  "globals": {
-    "logger": true,
-    "log4js": true
+    ],
+    "@blackflux/rules/prevent-typeof-object": 1
   },
-  "plugins": [
-    "json",
-    "jasmine",
-    "mocha",
-    "markdown",
-    "@blackflux/rules"
-  ],
+  "env": {"es6": true, "node": true, "jasmine": true, "mocha": true},
+  "globals": {"logger": true, "log4js": true},
+  "plugins": ["json", "jasmine", "mocha", "markdown", "@blackflux/rules"],
   "parser": "babel-eslint"
 }
diff --git a/package.json b/package.json
@@ -38,15 +38,17 @@
   ],
   "author": "Lukas Siemon",
   "license": "MIT",
-  "bugs": {"url": "https://github.com/blackflux/smart-fs/issues"},
+  "bugs": {
+    "url": "https://github.com/blackflux/smart-fs/issues"
+  },
   "homepage": "https://github.com/blackflux/smart-fs#readme",
   "devDependencies": {
     "@babel/cli": "7.5.5",
     "@babel/core": "7.5.5",
     "@babel/plugin-proposal-object-rest-spread": "7.5.5",
     "@babel/register": "7.5.5",
     "@blackflux/eslint-plugin-rules": "1.1.0",
-    "@blackflux/robo-config-plugin": "2.2.3",
+    "@blackflux/robo-config-plugin": "2.3.0",
     "babel-eslint": "10.0.2",
     "chai": "4.2.0",
     "coveralls": "3.0.5",
@@ -65,23 +67,39 @@
     "statements": 100,
     "functions": 100,
     "branches": 100,
-    "include": ["**/*.js"],
-    "reporter": ["lcov", "text-summary"],
-    "require": ["@babel/register"],
+    "include": [
+      "**/*.js"
+    ],
+    "reporter": [
+      "lcov",
+      "text-summary"
+    ],
+    "require": [
+      "@babel/register"
+    ],
     "extension": [],
     "cache": true,
     "all": true,
     "babel": true,
-    "exclude": ["gardener.js", "node_modules/*", "coverage/*", "lib/*"]
+    "exclude": [
+      "gardener.js",
+      "node_modules/*",
+      "coverage/*",
+      "lib/*"
+    ]
   },
   "licenses": [
     {
       "type": "MIT",
       "url": "https://github.com/blackflux/smart-fs/blob/master/LICENSE"
     }
   ],
-  "engines": {"node": ">= 8.10"},
-  "files": ["lib"],
+  "engines": {
+    "node": ">= 8.10"
+  },
+  "files": [
+    "lib"
+  ],
   "dependencies": {
     "fs-extra": "8.1.0",
     "json-stringify-pretty-compact": "2.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -175,10 +175,10 @@
   dependencies:
     smart-fs "1.9.2"
 
-"@blackflux/robo-config-plugin@2.2.3":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.2.3.tgz#4631bbb52fc3c99546271eb5ed260193a3ef4bc1"
-  integrity sha512-GtKRclbd5nwI0jtfNryKmTw4jPTh9py2DfoMYZszQlM+yjhR0sNryRH00oZ7VSaKN52Y4Bw6nQZAXRKpVRKHhA==
+"@blackflux/robo-config-plugin@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.3.0.tgz#f3b587fd5b338f5ba83d5e75a5e0e0a36414f356"
+  integrity sha512-7Qj+93cqxM7tSIozk5jLwEEEoFvDYiQ86jqcTLpJInOQTuxxq/hP8WZKu0dqQ2HBUAencdQRddQjf7h1FAgTdA==
 
 "@hapi/address@2.x.x":
   version "2.0.0"