Skip to content

Commit

Permalink
v2.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulLeCam committed Dec 14, 2019
1 parent 11b1df8 commit f327de0
Show file tree
Hide file tree
Showing 10 changed files with 1,576 additions and 1,429 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: false
language: node_js
node_js:
- 10
- 8
- 12
install:
- yarn install
- yarn flow:install
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
8 changes: 4 additions & 4 deletions example/components/custom-icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -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],
Expand Down
5 changes: 1 addition & 4 deletions example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
rel="stylesheet"
href="//cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css"
/>
<link
rel="stylesheet"
href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.5.1/leaflet.css"
/>
<link rel="stylesheet" href="//unpkg.com/leaflet@1.6.0/dist/leaflet.css" />
<style>
body {
padding-bottom: 30px;
Expand Down
8 changes: 4 additions & 4 deletions example/umd.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.5.1/leaflet.css"
href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.5.1/leaflet.js"></script>
<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
<script src="https://unpkg.com/@babel/standalone"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.8.6/umd/react.production.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.8.6/umd/react-dom.production.min.js"></script>
<script src="https://unpkg.com/react@16.12.0/umd/react.production.min.js"></script>
<script src="https://unpkg.com/react-dom@16.12.0/umd/react-dom.production.min.js"></script>
<script src="../dist/react-leaflet.min.js"></script>
<style>
body {
Expand Down
9 changes: 0 additions & 9 deletions example/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ module.exports = {
exclude: /node_modules/,
loader: 'babel-loader',
},
{
test: /\.(png|jpg|gif|svg)$/,
use: [
{
loader: 'file-loader',
options: {},
},
],
},
],
},
output: {
Expand Down
43 changes: 21 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"src/*"
],
"dependencies": {
"@babel/runtime": "^7.7.2",
"fast-deep-equal": "^2.0.1",
"@babel/runtime": "^7.7.6",
"fast-deep-equal": "^3.1.1",
"hoist-non-react-statics": "^3.3.1",
"warning": "^4.0.3"
},
Expand All @@ -60,32 +60,31 @@
"react-dom": "^16.8.0"
},
"devDependencies": {
"@babel/cli": "^7.7.0",
"@babel/core": "^7.7.2",
"@babel/plugin-proposal-class-properties": "^7.7.0",
"@babel/plugin-proposal-export-default-from": "^7.5.2",
"@babel/plugin-transform-proto-to-assign": "^7.5.5",
"@babel/plugin-transform-runtime": "^7.6.2",
"@babel/plugin-transform-strict-mode": "^7.2.0",
"@babel/preset-env": "^7.7.1",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.7.0",
"@babel/cli": "^7.7.5",
"@babel/core": "^7.7.5",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-transform-proto-to-assign": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.7.6",
"@babel/plugin-transform-strict-mode": "^7.7.4",
"@babel/preset-env": "^7.7.6",
"@babel/preset-flow": "^7.7.4",
"@babel/preset-react": "^7.7.4",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"babel-loader": "^8.0.6",
"babel-plugin-dev-expression": "^0.2.2",
"cross-env": "^6.0.3",
"eslint": "^6.6.0",
"eslint-config-prettier": "^6.6.0",
"eslint-plugin-flowtype": "^4.4.1",
"eslint-plugin-import": "^2.18.2",
"eslint": "^6.7.2",
"eslint-config-prettier": "^6.7.0",
"eslint-plugin-flowtype": "^4.5.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.16.0",
"file-loader": "^4.2.0",
"flow-bin": "^0.112.0",
"flow-copy-source": "^2.0.8",
"eslint-plugin-react": "^7.17.0",
"flow-bin": "^0.114.0",
"flow-copy-source": "^2.0.9",
"flow-typed": "^2.6.2",
"jest": "^24.9.0",
"leaflet": "^1.6.0",
Expand All @@ -94,12 +93,12 @@
"react": "^16.12.0",
"react-dom": "^16.12.0",
"rimraf": "^3.0.0",
"rollup": "^1.27.1",
"rollup": "^1.27.12",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-uglify": "^6.0.3",
"rollup-plugin-uglify": "^6.0.4",
"webpack": "^4.41.2",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0"
Expand Down
4 changes: 2 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"crowdin-download": "crowdin --config ../crowdin.yaml download -b master"
},
"dependencies": {
"highlight.js": "^9.16.2"
"highlight.js": "^9.17.1"
},
"devDependencies": {
"docusaurus": "~1.14.0"
"docusaurus": "~1.14.3"
}
}
Loading

0 comments on commit f327de0

Please sign in to comment.