merging upstream changes

andyfleming · Jan 10, 2020 · 5211382 · 5211382
2 parents 979d5e5 + 21493ee
commit 5211382
Show file tree

Hide file tree

Showing 9 changed files with 2,185 additions and 2,371 deletions.
diff --git a/packages/eslint-config-godaddy-es5/package.json b/packages/eslint-config-godaddy-es5/package.json
@@ -2,6 +2,7 @@
   "name": "eslint-config-godaddy-es5",
   "version": "3.1.0",
   "description": "ESLint config for consistent style in ES5 (Node & React) projects at GoDaddy.",
+  "license": "MIT",
   "scripts": {
     "lint": "eslint .",
     "pretest": "npm run --silent lint",
@@ -34,7 +35,6 @@
     "eslint-plugin-mocha": "^5.2.0",
     "eslint-plugin-react": "^7.11.1"
   },
-  "license": "MIT",
   "devDependencies": {
     "eslint": "^6.0.1",
     "eslint-config-godaddy-react": "^5.0.0",

diff --git a/packages/eslint-config-godaddy-flow/package-lock.json b/packages/eslint-config-godaddy-flow/package-lock.json
diff --git a/packages/eslint-config-godaddy-flow/package.json b/packages/eslint-config-godaddy-flow/package.json
@@ -2,6 +2,7 @@
   "name": "eslint-config-godaddy-flow",
   "version": "3.0.0",
   "description": "ESLint config for consistent style in node projects using Flow at GoDaddy.",
+  "license": "MIT",
   "scripts": {
     "lint": "eslint .",
     "pretest": "npm run --silent lint",
@@ -24,25 +25,17 @@
   "bin": {
     "eslint-godaddy-flow": "bin/eslint-godaddy-flow"
   },
-  "dependencies": {
-    "eslint-config-godaddy": "^4.0.0"
-  },
   "peerDependencies": {
-    "babel-eslint": ">=7.2.1 <11.0.0",
-    "eslint": "^6.1.0",
+    "eslint": ">=6.0.0"
+  },
+  "dependencies": {
+    "babel-eslint": "^10.0.3",
+    "eslint-config-godaddy": "^4.0.0",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-flowtype": "^4.2.0",
-    "eslint-plugin-json": "^1.4.0",
-    "eslint-plugin-mocha": "^5.3.0"
+    "eslint-plugin-flowtype": "^4.5.2"
   },
-  "license": "MIT",
   "devDependencies": {
-    "babel-eslint": "^10.0.2",
-    "eslint": "^6.1.0",
-    "eslint-find-rules": "^3.4.0",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-flowtype": "^4.2.0",
-    "eslint-plugin-json": "^1.4.0",
-    "eslint-plugin-mocha": "^5.3.0"
+    "eslint": "^6.7.1",
+    "eslint-find-rules": "^3.4.0"
   }
 }