v2.7.0

PaulLeCam · May 6, 2020 · ee56ffd · ee56ffd
1 parent f84e6bc
commit ee56ffd
Show file tree

Hide file tree

Showing 13 changed files with 1,170 additions and 1,045 deletions.
diff --git a/.babelrc b/.babelrc
@@ -23,7 +23,7 @@
         "@babel/preset-flow",
         "@babel/preset-react"
       ],
-      "plugins": [["@babel/plugin-transform-runtime", { "version": "^7.9.2" }]]
+      "plugins": [["@babel/plugin-transform-runtime", { "version": "^7.9.6" }]]
     },
     "rollup": {
       "presets": [
@@ -40,7 +40,7 @@
         "@babel/preset-flow",
         "@babel/preset-react"
       ],
-      "plugins": [["@babel/plugin-transform-runtime", { "version": "^7.9.2" }]]
+      "plugins": [["@babel/plugin-transform-runtime", { "version": "^7.9.6" }]]
     },
     "jsnext": {
       "presets": [
@@ -61,7 +61,7 @@
       "plugins": [
         [
           "@babel/plugin-transform-runtime",
-          { "useESModules": true, "version": "^7.9.2" }
+          { "useESModules": true, "version": "^7.9.6" }
         ]
       ]
     }

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -12,7 +12,7 @@
   ],
   "parser": "babel-eslint",
   "parserOptions": {
-    "ecmaVersion": 2018,
+    "ecmaVersion": 2020,
     "jsx": true,
     "sourceType": "module"
   },
@@ -35,7 +35,7 @@
   "settings": {
     "react": {
       "version": "16.8",
-      "flowVersion": "0.98"
+      "flowVersion": "0.123"
     }
   }
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - 10
+  - 14
   - 12
 install:
   - yarn install

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
-## master
+## v2.7.0 (2020-05-06)
 
-[website] Bump Leaflet docs links to v1.6.0 ([PR #686](https://github.com/PaulLeCam/react-leaflet/pull/686) by _moondef_).
+- Added `viewBox` and `preserveAspectRatio` props to `SVGOverlay` component ([PR #704](https://github.com/PaulLeCam/react-leaflet/pull/704) by _spectras_).
+- [website] Bump Leaflet docs links to v1.6.0 ([PR #686](https://github.com/PaulLeCam/react-leaflet/pull/686) by _moondef_).
+- [website] Set react-leaflet-markercluster v2 support ([PR #693](https://github.com/PaulLeCam/react-leaflet/pull/693) by _yuzhva_).
+- [website] Added react-leaflet-kml plugin ([PR #707](https://github.com/PaulLeCam/react-leaflet/pull/707) by _aviklai_).
 
 ## v2.6.3 (2020-03-13)
 

diff --git a/__mocks__/leaflet.js b/__mocks__/leaflet.js
@@ -1,6 +1,6 @@
 /* global jest, module, require */
 
-const L = require.requireActual('leaflet')
+const L = require('leaflet')
 const LeafletMock = jest.genMockFromModule('leaflet')
 
 class ControlMock extends LeafletMock.Control {
@@ -19,7 +19,7 @@ class ControlMock extends LeafletMock.Control {
   }
 }
 
-const controlMock = options => new ControlMock(options)
+const controlMock = (options) => new ControlMock(options)
 
 class LayersControlMock extends ControlMock {
   constructor(baseLayers = [], overlays = [], options) {

diff --git a/docs/components.md b/docs/components.md
@@ -354,9 +354,11 @@ properties.
 **Dynamic properties**
 
 - `bounds: bounds` (required)
+- `attribution: string` (optional)
 - `opacity: number` (optional)
+- `preserveAspectRatio: string` (optional)
+- `viewBox: string` (optional)
 - `zIndex: number` (optional)
-- `attribution: string` (optional)
 
 ## Other Layers
 

diff --git a/docs/plugins.md b/docs/plugins.md
@@ -44,7 +44,7 @@ open pull requests to update this list!
 | [`react-leaflet-kml`](https://www.npmjs.com/package/react-leaflet-kml)                                           | **yes**            |
 | [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control)                     | **no**             |
 | [`react-leaflet-magnifying-glass`](https://www.npmjs.com/package/react-leaflet-magnifying-glass)                 | **yes**            |
-| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster)                       | **yes**          |
+| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster)                       | **yes**            |
 | [`react-leaflet-marker-layer`](https://www.npmjs.com/package/react-leaflet-marker-layer)                         | unknown            |
 | [`react-leaflet-measure`](https://www.npmjs.com/package/react-leaflet-measure)                                   | **yes**            |
 | [`react-leaflet-nmscale`](https://www.npmjs.com/package/@marfle/react-leaflet-nmscale)                           | **yes**            |

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-leaflet",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "description": "React components for Leaflet maps",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -61,45 +61,45 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.9.0",
+    "@babel/core": "^7.9.6",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-export-default-from": "^7.8.3",
     "@babel/plugin-transform-proto-to-assign": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.9.6",
     "@babel/plugin-transform-strict-mode": "^7.8.3",
-    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-env": "^7.9.6",
     "@babel/preset-flow": "^7.9.0",
-    "@babel/preset-react": "^7.9.1",
+    "@babel/preset-react": "^7.9.4",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^25.1.0",
+    "babel-jest": "^26.0.1",
     "babel-loader": "^8.1.0",
     "babel-plugin-dev-expression": "^0.2.2",
     "cross-env": "^7.0.2",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
-    "eslint-plugin-flowtype": "^4.6.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-flowtype": "^4.7.0",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-react": "^7.19.0",
-    "flow-bin": "^0.121.0",
+    "flow-bin": "^0.123.0",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.1.0",
-    "jest": "^25.1.0",
+    "jest": "^26.0.1",
     "leaflet": "^1.6.0",
-    "prettier": "^2.0.1",
+    "prettier": "^2.0.5",
     "prettier-eslint": "^9.0.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.1.0",
+    "rollup": "^2.7.6",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-uglify": "^6.0.4",
-    "webpack": "^4.42.0",
+    "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.10.3"
   },

diff --git a/website/package.json b/website/package.json
@@ -12,7 +12,7 @@
     "crowdin-download": "crowdin --config ../crowdin.yaml download -b master"
   },
   "dependencies": {
-    "highlight.js": "^9.18.1"
+    "highlight.js": "^10.0.2"
   },
   "devDependencies": {
     "docusaurus": "~1.14.4"

diff --git a/website/versioned_docs/version-v2/components.md b/website/versioned_docs/version-v2/components.md
@@ -355,9 +355,11 @@ properties.
 **Dynamic properties**
 
 - `bounds: bounds` (required)
+- `attribution: string` (optional)
 - `opacity: number` (optional)
+- `preserveAspectRatio: string` (optional)
+- `viewBox: string` (optional)
 - `zIndex: number` (optional)
-- `attribution: string` (optional)
 
 ## Other Layers
 

diff --git a/website/versioned_docs/version-v2/plugins.md b/website/versioned_docs/version-v2/plugins.md
@@ -42,9 +42,10 @@ open pull requests to update this list!
 | [`react-leaflet-google-layer`](https://www.npmjs.com/package/react-leaflet-google-layer)                         | **yes**            |
 | [`react-leaflet-google-v2`](https://www.npmjs.com/package/react-leaflet-google-v2)                               | **yes**            |
 | [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer)                       | **yes**            |
+| [`react-leaflet-kml`](https://www.npmjs.com/package/react-leaflet-kml)                                           | **yes**            |
 | [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control)                     | **no**             |
 | [`react-leaflet-magnifying-glass`](https://www.npmjs.com/package/react-leaflet-magnifying-glass)                 | **yes**            |
-| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster)                       | unknown            |
+| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster)                       | **yes**            |
 | [`react-leaflet-marker-layer`](https://www.npmjs.com/package/react-leaflet-marker-layer)                         | unknown            |
 | [`react-leaflet-measure`](https://www.npmjs.com/package/react-leaflet-measure)                                   | **yes**            |
 | [`react-leaflet-nmscale`](https://www.npmjs.com/package/@marfle/react-leaflet-nmscale)                           | **yes**            |

diff --git a/website/yarn.lock b/website/yarn.lock
@@ -3156,16 +3156,16 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
+highlight.js@^10.0.2:
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.0.2.tgz#d2c732544f8f68bceaf0cefb4b0575bce8eddbee"
+  integrity sha512-2gMT2MHU6/2OjAlnaOE2LFdr9dwviDN3Q2lSw7Ois3/5uTtahbgYTkr4EPoY828ps+2eQWiixPTF8+phU6Ofkg==
+
 highlight.js@^9.16.2:
   version "9.16.2"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
   integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
 
-highlight.js@^9.18.1:
-  version "9.18.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
-  integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
-
 hosted-git-info@^2.1.4:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"