Merge branch 'master' of github.com:keplergl/kepler.gl

Author: RaymondDashWu

package.json

@@ -207,7 +207,6 @@
     "jsdom": "^16.2.1",
     "json-loader": "^0.5.4",
     "nyc": "^11.4.1",
-    "ocular-dev-tools": "^0.0.30",
     "prettier": "1.19.1",
     "progress-bar-webpack-plugin": "^1.9.3",
     "puppeteer": "^2.1.1",
@@ -219,7 +218,7 @@
     "sinon-stub-promise": "^4.0.0",
     "source-map-loader": "^0.2.1",
     "styled-components": "^4.1.3",
-    "tap-spec": "^4.1.1",
+    "tap-spec": "^5.0.0",
     "tape": "^4.9.2",
     "tape-catch": "^1.0.6",
     "typedoc-plugin-markdown": "^2.2.17",
@@ -234,6 +233,12 @@
     "webpack-hot-middleware": "^2.24.3",
     "webpack-stats-plugin": "^0.2.1"
   },
+  "resolutions": {
+    "lodash": "4.17.19",
+    "dot-prop": "5.1.1",
+    "minimist": "1.2.3",
+    "jpeg-js": "0.4.0"
+  },
   "peerDependencies": {
     "react": "^16.3",
     "react-dom": "^16.3",

website/package.json

@@ -45,15 +45,15 @@
     "babel-eslint": "^9.0.0",
     "babel-loader": "^8.0.0",
     "babel-plugin-module-resolver": "^3.0.0",
-    "eslint": "^3.0.0",
-    "eslint-config-prettier": "^2.4.0",
-    "eslint-config-uber-es2015": "^3.0.0",
-    "eslint-config-uber-jsx": "^3.0.0",
-    "eslint-plugin-babel": "^4.1.2",
-    "eslint-plugin-prettier": "^2.2.0",
-    "eslint-plugin-react": "^6.0.0",
+    "eslint": "^5.16.0",
+    "eslint-config-prettier": "^6.3.0",
+    "eslint-config-uber-es2015": "^3.1.2",
+    "eslint-config-uber-jsx": "^3.3.3",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-react": "^7.13.0",
     "file-loader": "^1.1.11",
-    "prettier": "^1.7.0",
+    "prettier": "1.19.1",
     "source-map-loader": "^0.2.1",
     "url-loader": "^0.5.9",
     "webpack": "^4.29.0",