From f327de0b774832825d93743bed9ae9caf8f67b92 Mon Sep 17 00:00:00 2001 From: Paul Le Cam Date: Sat, 14 Dec 2019 11:06:50 +0100 Subject: [PATCH] v2.6.1 --- .travis.yml | 2 +- CHANGELOG.md | 4 + example/components/custom-icons.js | 8 +- example/index.html | 5 +- example/umd.html | 8 +- example/webpack.config.js | 9 - package.json | 43 +- website/package.json | 4 +- website/yarn.lock | 1335 ++++++++++++----------- yarn.lock | 1587 +++++++++++++++------------- 10 files changed, 1576 insertions(+), 1429 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2d3eb02..a4cf7f0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: node_js node_js: - 10 - - 8 + - 12 install: - yarn install - yarn flow:install diff --git a/CHANGELOG.md b/CHANGELOG.md index bc416249..25059c37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.6.1 (2019-12-14) + +Fixed catching falsy values in `utils/pick` ([PR #649](https://github.com/PaulLeCam/react-leaflet/pull/649) by _CaptainLexington_). + ## v2.6.0 (2019-11-18) - Updated Leaflet dependency to v1.6. diff --git a/example/components/custom-icons.js b/example/components/custom-icons.js index be5797b4..4c551db2 100644 --- a/example/components/custom-icons.js +++ b/example/components/custom-icons.js @@ -11,8 +11,8 @@ type State = { } export const pointerIcon = new L.Icon({ - iconUrl: require('../assets/pointerIcon.svg'), - iconRetinaUrl: require('../assets/pointerIcon.svg'), + iconUrl: '../assets/pointerIcon.svg', + iconRetinaUrl: '../assets/pointerIcon.svg', iconAnchor: [5, 55], popupAnchor: [10, -44], iconSize: [25, 55], @@ -22,8 +22,8 @@ export const pointerIcon = new L.Icon({ }) export const suitcasePoint = new L.Icon({ - iconUrl: require('../assets/suitcaseIcon.svg'), - iconRetinaUrl: require('../assets/suitcaseIcon.svg'), + iconUrl: '../assets/suitcaseIcon.svg', + iconRetinaUrl: '../assets/suitcaseIcon.svg', iconAnchor: [20, 40], popupAnchor: [0, -35], iconSize: [40, 40], diff --git a/example/index.html b/example/index.html index f525cac3..b488d570 100644 --- a/example/index.html +++ b/example/index.html @@ -7,10 +7,7 @@ rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" /> - +