chore: merge master

package.json

@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "@antv/g2": "^3.5.9",
-    "@antv/gatsby-theme-antv": "0.10.43",
+    "@antv/gatsby-theme-antv": "^0.10.59",
     "@babel/cli": "^7.6.4",
     "@babel/core": "^7.6.4",
     "@babel/plugin-proposal-decorators": "^7.6.0",
@@ -32,7 +32,7 @@
     "@types/enzyme-adapter-react-16": "^1.0.3",
     "@types/gl": "^4.1.0",
     "@types/jest": "^24.0.18",
-    "@types/node": "^13.11.1",
+    "@types/node": "13.11.1",
     "@types/storybook__react": "^4.0.2",
     "@types/supercluster": "^5.0.1",
     "awesome-typescript-loader": "^5.2.1",
@@ -86,9 +86,9 @@
     "postcss-url": "^8.0.0",
     "prettier": "^1.19.1",
     "raw-loader": "^1.0.0",
-    "react": "^16.8.6",
+    "react": "^16.13.1",
     "react-docgen-typescript-loader": "^3.1.0",
-    "react-dom": "^16.12.0",
+    "react-dom": "^16.13.1",
     "react-i18next": "^11.0.1",
     "rimraf": "^2.6.2",
     "rollup": "^1.27.14",
@@ -115,6 +115,7 @@
     "tslint-plugin-prettier": "^1.3.0",
     "tslint-react": "^3.6.0",
     "typescript": "^3.7.0-beta",
+    "@turf/turf": "^5.1.6",
     "webpack": "^4.17.1",
     "webpack-cli": "^3.1.0",
     "webpack-dev-server": "^3.1.7",
@@ -183,9 +184,5 @@
   "tnpm": {
     "mode": "yarn"
   },
-  "version": "0.0.0",
-  "dependencies": {
-    "@turf/turf": "^5.1.6",
-    "gatsby-cli": "2.11.0"
-  }
+  "version": "0.0.0"
 }

packages/draw/package.json

@@ -36,15 +36,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.7.7",
+    "@antv/l7": "^2.1.15",
     "@turf/circle": "^6.0.1",
     "@turf/distance": "^6.0.1",
     "@turf/helpers": "^6.1.4",
     "@turf/midpoint": "^5.1.5",
     "lodash": "^4.6.2"
   },
-  "peerDependencies": {
-    "@antv/l7": "^2.1.15"
-  },
   "bugs": {
     "url": "https://github.com/antvis/L7/issues"
   },