Merge branch 'm3' into m2

mi11er-net · Jul 31, 2018 · dc95aa8 · dc95aa8
2 parents b77c392 + 2cf4f1d
commit dc95aa8
Show file tree

Hide file tree

Showing 2 changed files with 156 additions and 52 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,12 +52,12 @@
     "@semantic-release/git": "7.0.1",
     "commitizen": "2.10.1",
     "cz-conventional-changelog": "2.1.0",
-    "eslint": "5.1.0",
+    "eslint": "5.2.0",
     "eslint-index": "1.5.0",
     "eslint-plugin-import": "2.13.0",
     "eslint-plugin-jsx-a11y": "6.1.1",
     "eslint-plugin-no-unsafe-innerhtml": "1.0.16",
-    "eslint-plugin-node": "6.0.1",
+    "eslint-plugin-node": "7.0.1",
     "eslint-plugin-optimize-regex": "1.1.5",
     "eslint-plugin-react": "7.10.0",
     "eslint-plugin-scanjs-rules": "0.2.1",
@@ -67,15 +67,15 @@
     "npm-run-all": "4.1.3",
     "prettier": "1.14.0",
     "pretty-quick": "1.6.0",
-    "semantic-release": "15.8.1",
+    "semantic-release": "15.9.2",
     "sort-package-json": "1.15.0"
   },
   "peerDependencies": {
     "eslint": "^4.19.1 || ^5.0.0",
     "eslint-plugin-import": "^2.10.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-no-unsafe-innerhtml": "^1.0.16",
-    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-node": "^6.0.1 || ^7.0.0",
     "eslint-plugin-optimize-regex": "^1.1.5",
     "eslint-plugin-react": "^7.7.0",
     "eslint-plugin-scanjs-rules": "^0.2.1",