diff --git a/.github/ISSUE_TEMPLATE/bug-in-v1.md b/.github/ISSUE_TEMPLATE/bug-in-v1.md
index 4da7c4ec..f6307c9a 100644
--- a/.github/ISSUE_TEMPLATE/bug-in-v1.md
+++ b/.github/ISSUE_TEMPLATE/bug-in-v1.md
@@ -9,13 +9,13 @@ about: Report a bug in version 1 of the library
 Please make sure to check the following boxes before submitting an issue.\
 **Issues opened without using this template will be closed unless they have a good reason not to follow this template.**
 
-* [ ] All peer dependencies are installed: React, ReactDOM and Leaflet.
-* [ ] Using a supported version of React and ReactDOM (v15.x or v16.x).
-* [ ] Using the supported version of Leaflet (v1.3.x) and its corresponding CSS file is loaded.
-* [ ] Using the [latest stable version of React-Leaflet](https://github.com/PaulLeCam/react-leaflet/releases) - **not v2 beta**.
-* [ ] The issue has not already been reported.
-* [ ] Make sure you have followed the [quick start guide](http://leafletjs.com/examples/quick-start.html) for Leaflet.
-* [ ] Make sure you have fully read the [documentation](https://react-leaflet.js.org/docs/en/v1/intro.html) and that you understand the [limitations](https://react-leaflet.js.org/docs/en/v1/intro.html#limitations).
+- [ ] All peer dependencies are installed: React, ReactDOM and Leaflet.
+- [ ] Using a supported version of React and ReactDOM (v15.x or v16.x).
+- [ ] Using the supported version of Leaflet (v1.3.x) and its corresponding CSS file is loaded.
+- [ ] Using the [latest stable version of React-Leaflet](https://github.com/PaulLeCam/react-leaflet/releases) - **not v2 RC**.
+- [ ] The issue has not already been reported.
+- [ ] Make sure you have followed the [quick start guide](http://leafletjs.com/examples/quick-start.html) for Leaflet.
+- [ ] Make sure you have fully read the [documentation](https://react-leaflet.js.org/docs/en/v1/intro.html) and that you understand the [limitations](https://react-leaflet.js.org/docs/en/v1/intro.html#limitations).
 
 ### Expected behavior
 
diff --git a/.github/ISSUE_TEMPLATE/bug-in-v2.md b/.github/ISSUE_TEMPLATE/bug-in-v2.md
index 15cf5333..c113482f 100644
--- a/.github/ISSUE_TEMPLATE/bug-in-v2.md
+++ b/.github/ISSUE_TEMPLATE/bug-in-v2.md
@@ -1,6 +1,6 @@
 ---
 name: Bug in v2
-about: Report a bug in version 2 (beta) of the library
+about: Report a bug in version 2 (RC) of the library
 
 ---
 
@@ -9,13 +9,13 @@ about: Report a bug in version 2 (beta) of the library
 Please make sure to check the following boxes before submitting an issue.\
 **Issues opened without using this template will be closed unless they have a good reason not to follow this template.**
 
-* [ ] All peer dependencies are installed: React, ReactDOM and Leaflet.
-* [ ] Using a supported version of React and ReactDOM (v16.3.0 minimum).
-* [ ] Using the supported version of Leaflet (v1.3.x) and its corresponding CSS file is loaded.
-* [ ] Using the [latest v2 beta version of React-Leaflet](https://github.com/PaulLeCam/react-leaflet/releases) - **not v1**.
-* [ ] The issue has not already been reported.
-* [ ] Make sure you have followed the [quick start guide](http://leafletjs.com/examples/quick-start.html) for Leaflet.
-* [ ] Make sure you have fully read the [documentation](https://react-leaflet.js.org/docs/en/intro.html) and that you understand the [limitations](https://react-leaflet.js.org/docs/en/intro.html#limitations).
+- [ ] All peer dependencies are installed: React, ReactDOM and Leaflet.
+- [ ] Using a supported version of React and ReactDOM (v16.3.0 minimum).
+- [ ] Using the supported version of Leaflet (v1.3.x) and its corresponding CSS file is loaded.
+- [ ] Using the [latest v2 RC version of React-Leaflet](https://github.com/PaulLeCam/react-leaflet/releases) - **not v1**.
+- [ ] The issue has not already been reported.
+- [ ] Make sure you have followed the [quick start guide](http://leafletjs.com/examples/quick-start.html) for Leaflet.
+- [ ] Make sure you have fully read the [documentation](https://react-leaflet.js.org/docs/en/intro.html) and that you understand the [limitations](https://react-leaflet.js.org/docs/en/intro.html#limitations).
 
 ### Expected behavior
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88bed757..7fd0f217 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,52 +1,53 @@
-## master
+## v2.0.0-rc.1 (2018-06-10)
 
-* [website] Added `react-leaflet-nmscale` plugin ([PR #479](https://github.com/PaulLeCam/react-leaflet/pull/479) by _anajavi_).
+- [website] Added `react-leaflet-nmscale` plugin ([PR #479](https://github.com/PaulLeCam/react-leaflet/pull/479) by _anajavi_).
+- [website] Added 3 plugins ([PR #482](https://github.com/PaulLeCam/react-leaflet/pull/482) by _fullhdpixel_).
 
 ## v2.0.0-beta.1 (2018-05-26)
 
-* [BREAKING] Updated React dependency to v16.3.
-* [BREAKING] Replaced React context usage with new APIs introduced in React v16.3.
-* [BREAKING] Removed PropTypes.
-* [BREAKING] Dropped support for IE < 11.
-* [React Portals](https://reactjs.org/docs/portals.html) are now used to render the `DivOverlay` and therefore `Popup` and `Tooltip` components, enabling context propagation ([PR #475](https://github.com/PaulLeCam/react-leaflet/pull/475) by _hannesj_).
-* Replaced wrapping `div` elements with `Fragment`.
+- [BREAKING] Updated React dependency to v16.3.
+- [BREAKING] Replaced React context usage with new APIs introduced in React v16.3.
+- [BREAKING] Removed PropTypes.
+- [BREAKING] Dropped support for IE < 11.
+- [React Portals](https://reactjs.org/docs/portals.html) are now used to render the `DivOverlay` and therefore `Popup` and `Tooltip` components, enabling context propagation ([PR #475](https://github.com/PaulLeCam/react-leaflet/pull/475) by _hannesj_).
+- Replaced wrapping `div` elements with `Fragment`.
 
 ## v1.9.1 (2018-03-22)
 
-* Added check for open popup to rendering logic ([PR #464](https://github.com/PaulLeCam/react-leaflet/pull/464) by _olabalboa_).
-* [website] Added plugins ([PR #463](https://github.com/PaulLeCam/react-leaflet/pull/463) by _mhasbie_).
+- Added check for open popup to rendering logic ([PR #464](https://github.com/PaulLeCam/react-leaflet/pull/464) by _olabalboa_).
+- [website] Added plugins ([PR #463](https://github.com/PaulLeCam/react-leaflet/pull/463) by _mhasbie_).
 
 ## v1.9.0 (2018-03-14)
 
-* Fixed event listeners removal in `Map` ([PR #459](https://github.com/PaulLeCam/react-leaflet/pull/459) by _andersonveiga_).
-* Added support for dynamic handlers in `Map` ([PR #452](https://github.com/PaulLeCam/react-leaflet/pull/452) by _jonathanchrisp_).
-* Added `DivOverlay` component as base class for `Popup` and `Tooltip`, now supporting dynamic `className` prop.
-* [website] Updated Docusaurus, with added on-page navigation sidebar.
+- Fixed event listeners removal in `Map` ([PR #459](https://github.com/PaulLeCam/react-leaflet/pull/459) by _andersonveiga_).
+- Added support for dynamic handlers in `Map` ([PR #452](https://github.com/PaulLeCam/react-leaflet/pull/452) by _jonathanchrisp_).
+- Added `DivOverlay` component as base class for `Popup` and `Tooltip`, now supporting dynamic `className` prop.
+- [website] Updated Docusaurus, with added on-page navigation sidebar.
 
 ## v1.8.2 (2018-02-26)
 
-* Fixed `Map` unmounting when `preferCanvas` is set.
-* Added `es` folder to npm package ([PR #449](https://github.com/PaulLeCam/react-leaflet/pull/449) by _jonathanchrisp_).
-* [website] Fixed link in examples page.
-* [internal] Updated examples to webpack 4.
+- Fixed `Map` unmounting when `preferCanvas` is set.
+- Added `es` folder to npm package ([PR #449](https://github.com/PaulLeCam/react-leaflet/pull/449) by _jonathanchrisp_).
+- [website] Fixed link in examples page.
+- [internal] Updated examples to webpack 4.
 
 ## v1.8.1 (2018-02-21)
 
-* Fixed `Tooltip` component unmounting.
-* Updated Flow support for v0.66 ([PR #447](https://github.com/PaulLeCam/react-leaflet/pull/447) by _slek22_).
-* [website] Fixed typo ([PR #440](https://github.com/PaulLeCam/react-leaflet/pull/440) by _BartWaardenburg_).
-* [website] Added plugins ([PR #446](https://github.com/PaulLeCam/react-leaflet/pull/446) by _mhasbie_).
+- Fixed `Tooltip` component unmounting.
+- Updated Flow support for v0.66 ([PR #447](https://github.com/PaulLeCam/react-leaflet/pull/447) by _slek22_).
+- [website] Fixed typo ([PR #440](https://github.com/PaulLeCam/react-leaflet/pull/440) by _BartWaardenburg_).
+- [website] Added plugins ([PR #446](https://github.com/PaulLeCam/react-leaflet/pull/446) by _mhasbie_).
 
 ## v1.8.0 (2018-01-15)
 
 React-Leaflet now has a website! Check out [react-leaflet.js.org](https://react-leaflet.js.org/) to browse the documentation.\
 If you wish to help out improving the website, [this issue is a good starting point](https://github.com/PaulLeCam/react-leaflet/issues/434)!
 
-* Updated documentation and dependency to
+- Updated documentation and dependency to
   [Leaflet v1.3](http://leafletjs.com/2018/01/15/leaflet-1.3.0.html).
-* Added `HTMLImageElement` support to `ImageOverlay` (new in Leaflet v1.3).
-* [website] Setup using Docusaurus.
-* [website] Fixed links to examples ([PR #430](https://github.com/PaulLeCam/react-leaflet/pull/430) by _subelsky_).
+- Added `HTMLImageElement` support to `ImageOverlay` (new in Leaflet v1.3).
+- [website] Setup using Docusaurus.
+- [website] Fixed links to examples ([PR #430](https://github.com/PaulLeCam/react-leaflet/pull/430) by _subelsky_).
 
 ## v1.7.8 (2017-12-03)
 
@@ -59,8 +60,8 @@ More permissive support for the `className` prop of `Map`.
 
 ## v1.7.6 (2017-11-23)
 
-* Fixed supporting `Popup` children in `CircleMarker`.
-* Fixed updating multiple classes in the `className` prop of `Map`.
+- Fixed supporting `Popup` children in `CircleMarker`.
+- Fixed updating multiple classes in the `className` prop of `Map`.
 
 ## v1.7.5 (2017-11-20)
 
@@ -77,40 +78,29 @@ Fixed `Tooltip` teardown logic.
 
 ## v1.7.2 (2017-10-31)
 
-* Updated docs to use `https` for URLs
-  ([PR #403](https://github.com/PaulLeCam/react-leaflet/pull/403) by _sehaas_).
-* Fixed initial props in `WMSTileLayer`
-  ([PR #405](https://github.com/PaulLeCam/react-leaflet/pull/405) by
-  _markhepburn_).
-* Added tests for viewport and teardown logic in the `Map` component
-  ([PR #406](https://github.com/PaulLeCam/react-leaflet/pull/406) by _uxtx_).
+- Updated docs to use `https` for URLs ([PR #403](https://github.com/PaulLeCam/react-leaflet/pull/403) by _sehaas_).
+- Fixed initial props in `WMSTileLayer` ([PR #405](https://github.com/PaulLeCam/react-leaflet/pull/405) by _markhepburn_).
+- Added tests for viewport and teardown logic in the `Map` component ([PR #406](https://github.com/PaulLeCam/react-leaflet/pull/406) by _uxtx_).
 
 ## v1.7.1 (2017-10-09)
 
-* Added UMD build to CDNJS
-  ([PR #11863 in cdnjs/cdnjs](https://github.com/cdnjs/cdnjs/pull/11863) and
-  [#390](https://github.com/PaulLeCam/react-leaflet/pull/390) by _extend1994_).
-* Fixed setting the default pane for `Popup` and `Tooltip`
-  ([PR #394](https://github.com/PaulLeCam/react-leaflet/pull/394) by
-  _RichardWithnell_).
+- Added UMD build to CDNJS ([PR #11863 in cdnjs/cdnjs](https://github.com/cdnjs/cdnjs/pull/11863) and [#390](https://github.com/PaulLeCam/react-leaflet/pull/390) by _extend1994_).
+- Fixed setting the default pane for `Popup` and `Tooltip` ([PR #394](https://github.com/PaulLeCam/react-leaflet/pull/394) by _RichardWithnell_).
 
 ## v1.7.0 (2017-09-26)
 
-* [internal] Added support for building the library using node 6
-  ([PR #376](https://github.com/PaulLeCam/react-leaflet/pull/376) by _tusbar_).
-* Added support for React v16 as peer dependency.
+- [internal] Added support for building the library using node 6 ([PR #376](https://github.com/PaulLeCam/react-leaflet/pull/376) by _tusbar_).
+- Added support for React v16 as peer dependency.
 
 ## v1.6.6 (2017-09-05)
 
-* Fixed `Path` options.
-* Fixed `WMSTileLayer` options.
+- Fixed `Path` options.
+- Fixed `WMSTileLayer` options.
 
 ## v1.6.5 (2017-08-31)
 
-* [doc] Added `react-leaflet-sidebarv2` to the plugins documentation
-  ([PR #369](https://github.com/PaulLeCam/react-leaflet/pull/369) by
-  _markhepburn_).
-* Fixed Flow types in `Map` and `Popup`.
+- [doc] Added `react-leaflet-sidebarv2` to the plugins documentation ([PR #369](https://github.com/PaulLeCam/react-leaflet/pull/369) by _markhepburn_).
+- Fixed Flow types in `Map` and `Popup`.
 
 ## v1.6.4 (2017-08-24)
 
@@ -126,23 +116,18 @@ Added support for Flow types in CommonJS and ESM builds as Flow comments.
 
 ## v1.6.1 (2017-08-20)
 
-* Fixed `GridLayer` inheriting `maxZoom` and `minZoom` from `Map`.
-* Fixed regression introduced in v1.6.0 with `ScaleControl`.
+- Fixed `GridLayer` inheriting `maxZoom` and `minZoom` from `Map`.
+- Fixed regression introduced in v1.6.0 with `ScaleControl`.
 
 ## v1.6.0 (2017-08-20)
 
-* [internal] Updated build process
-  ([PR #359](https://github.com/PaulLeCam/react-leaflet/pull/359) by _tusbar_) -
-  see the [UPGRADING guide](UPGRADING.md) for more information if you're relying
-  on internals.
-* [internal] Fixed hot module reloading in examples
-  ([PR #360](https://github.com/PaulLeCam/react-leaflet/pull/360) by _tusbar_).
-* Updated Flow types to support Flow v0.53.
+- [internal] Updated build process ([PR #359](https://github.com/PaulLeCam/react-leaflet/pull/359) by _tusbar_) - see the [UPGRADING guide](UPGRADING.md) for more information if you're relying on internals.
+- [internal] Fixed hot module reloading in examples ([PR #360](https://github.com/PaulLeCam/react-leaflet/pull/360) by _tusbar_).
+- Updated Flow types to support Flow v0.53.
 
 ## v1.5.0 (2017-08-10)
 
-Updated documentation and dependency to
-[Leaflet v1.2](http://leafletjs.com/2017/08/08/leaflet-1.2.0.html).
+Updated documentation and dependency to [Leaflet v1.2](http://leafletjs.com/2017/08/08/leaflet-1.2.0.html).
 
 ## v1.4.1 (2017-07-25)
 
@@ -150,18 +135,13 @@ Fixed allowing a `zoom` value of `0` in `Map`.
 
 ## v1.4.0 (2017-06-28)
 
-This release now requires Leaflet v1.1+ as a peer dependency in order to add
-support for the
-[new features introduced by Leaflet in this release](http://leafletjs.com/2017/06/27/leaflet-1.1.0.html):
+This release now requires Leaflet v1.1+ as a peer dependency in order to add support for the [new features introduced by Leaflet in this release](http://leafletjs.com/2017/06/27/leaflet-1.1.0.html):
 
-* Added support for dynamic `zIndex` property to `ImageOverlay`.
-* Added
-  [`VideoOverlay` component](https://github.com/PaulLeCam/react-leaflet/blob/master/docs/Components.md#videooverlay).
-* Moved the `prop-types` dependency to `peerDependencies`.
+- Added support for dynamic `zIndex` property to `ImageOverlay`.
+- Added [`VideoOverlay` component](https://github.com/PaulLeCam/react-leaflet/blob/master/docs/Components.md#videooverlay).
+- Moved the `prop-types` dependency to `peerDependencies`.
 
-See the
-[relevant section of the upgrading guide](https://github.com/PaulLeCam/react-leaflet/blob/master/UPGRADING.md#v14)
-for more information.
+See the [relevant section of the upgrading guide](https://github.com/PaulLeCam/react-leaflet/blob/master/UPGRADING.md#v14) for more information.
 
 ## v1.3.1 (2017-06-20)
 
@@ -169,12 +149,10 @@ Fixed Popup auto-panning.
 
 ## v1.3.0 (2017-06-11)
 
-* Added `viewport` property to `Map`, as an alternative and complementary way to
-  manipulate the map's viewport.
-* Added `onViewportChange` and `onViewportChanged` callbacks to `Map` as a
-  simplified way to track the map's viewport changes.
-* Added `onClose` and `onOpen` callbacks to `Popup`.
-* Added `onClose` and `onOpen` callbacks to `Tooltip`.
+- Added `viewport` property to `Map`, as an alternative and complementary way to manipulate the map's viewport.
+- Added `onViewportChange` and `onViewportChanged` callbacks to `Map` as a simplified way to track the map's viewport changes.
+- Added `onClose` and `onOpen` callbacks to `Popup`.
+- Added `onClose` and `onOpen` callbacks to `Tooltip`.
 
 ## v1.2.2 (2017-06-07)
 
@@ -186,35 +164,24 @@ Removed leftover `console.log()` in `Polygon`.
 
 ## v1.2.0 (2017-05-24)
 
-* Added support for dynamic `bounds` property in `ImageOverlay`,
-  [PR #326](https://github.com/PaulLeCam/react-leaflet/pull/328) by _Gjum_.
-* Added `whenReady` property to `Map`, running the provided function according
-  to
-  [Leaflet's documentation](http://leafletjs.com/reference-1.0.3.html#map-whenready).
+- Added support for dynamic `bounds` property in `ImageOverlay`, [PR #326](https://github.com/PaulLeCam/react-leaflet/pull/328) by _Gjum_.
+- Added `whenReady` property to `Map`, running the provided function according to [Leaflet's documentation](http://leafletjs.com/reference-1.0.3.html#map-whenready).
 
 ## v1.1.7 (2017-05-20)
 
-* Fixed DOM leak when unmounting an unclosed popup,
-  [PR #326](https://github.com/PaulLeCam/react-leaflet/pull/326) by
-  _DirtyHairy_.
-* [doc] Updated Leaflet documentation links,
-  [PR #324](https://github.com/PaulLeCam/react-leaflet/pull/324) by
-  _Chris-Petty_.
-* [doc] Fixed "quick start" link,
-  [PR #321](https://github.com/PaulLeCam/react-leaflet/pull/321) by _mojo5000_.
-* [doc] Added react-leaflet-ant-path to the plugins documentation,
-  [PR #318](https://github.com/PaulLeCam/react-leaflet/pull/318) by
-  _rubenspgcavalcante_.
+- Fixed DOM leak when unmounting an unclosed popup, [PR #326](https://github.com/PaulLeCam/react-leaflet/pull/326) by _DirtyHairy_.
+- [doc] Updated Leaflet documentation links, [PR #324](https://github.com/PaulLeCam/react-leaflet/pull/324) by _Chris-Petty_.
+- [doc] Fixed "quick start" link, [PR #321](https://github.com/PaulLeCam/react-leaflet/pull/321) by _mojo5000_.
+- [doc] Added react-leaflet-ant-path to the plugins documentation, [PR #318](https://github.com/PaulLeCam/react-leaflet/pull/318) by _rubenspgcavalcante_.
 
 ## v1.1.6 (2017-04-10)
 
-* Added support for React v15.5, fixes PropTypes warning.
-* [internal] Use Prettier code formatting.
+- Added support for React v15.5, fixes PropTypes warning.
+- [internal] Use Prettier code formatting.
 
 ## v1.1.5 (2017-04-05)
 
-Filter falsy values as event handlers,
-[PR #308](https://github.com/PaulLeCam/react-leaflet/pull/308) by _awinograd_.
+Filter falsy values as event handlers, [PR #308](https://github.com/PaulLeCam/react-leaflet/pull/308) by _awinograd_.
 
 ## v1.1.4 (2017-03-22)
 
@@ -230,25 +197,16 @@ Make `GridLayer` inherit `maxZoom` and `minZoom` properties from `Map`.
 
 ## v1.1.1 (2017-03-06)
 
-* The UMD build is now created using Webpack 2.
-* Fixed supporting multiple children in `Marker`.
-* [internal] Updated Webpack to v2.
-* [internal] Small refactoring of the `Map` component.
-* [doc] Various improvements, including PRs
-  [#280](https://github.com/PaulLeCam/react-leaflet/pull/280) by _h4_,
-  [#282](https://github.com/PaulLeCam/react-leaflet/pull/282) by _cwalv_ and
-  [#283](https://github.com/PaulLeCam/react-leaflet/pull/283) by _YUzhva_.
+- The UMD build is now created using Webpack 2.
+- Fixed supporting multiple children in `Marker`.
+- [internal] Updated Webpack to v2.
+- [internal] Small refactoring of the `Map` component.
+- [doc] Various improvements, including PRs [#280](https://github.com/PaulLeCam/react-leaflet/pull/280) by _h4_, [#282](https://github.com/PaulLeCam/react-leaflet/pull/282) by _cwalv_ and [#283](https://github.com/PaulLeCam/react-leaflet/pull/283) by _YUzhva_.
 
 ## v1.1.0 (2017-01-11)
 
-* Added support for `Popup` and `Tooltip` children to `ImageOverlay`
-  [PR #270](https://github.com/PaulLeCam/react-leaflet/pull/270) by
-  _rjdestigter_.
-* Added `createLeafletElement()` and `updateLeafletElement()` methods to
-  simplify the abstraction between React's lifecycle hooks and Leaflet's APIs.
-  See the
-  [relevant section of the upgrading guide](https://github.com/PaulLeCam/react-leaflet/blob/master/UPGRADING.md#v11)
-  for more information.
+- Added support for `Popup` and `Tooltip` children to `ImageOverlay` [PR #270](https://github.com/PaulLeCam/react-leaflet/pull/270) by _rjdestigter_.
+- Added `createLeafletElement()` and `updateLeafletElement()` methods to simplify the abstraction between React's lifecycle hooks and Leaflet's APIs. See the [relevant section of the upgrading guide](https://github.com/PaulLeCam/react-leaflet/blob/master/UPGRADING.md#v11) for more information.
 
 ## v1.0.3 (2017-01-07)
 
@@ -260,50 +218,31 @@ Fixed binding events in `FeatureGroup`.
 
 ## v1.0.1 (2016-11-26)
 
-* Fixed updating `opacity` and `zIndex` in `WMSTileLayer`
-  ([PR #259 ](https://github.com/PaulLeCam/react-leaflet/pull/259) by
-  _YannickBochatay_).
-* [doc] Added link to plugins documentation in README
-  ([PR #258](https://github.com/PaulLeCam/react-leaflet/pull/258) by _jakehm_).
+- Fixed updating `opacity` and `zIndex` in `WMSTileLayer` ([PR #259 ](https://github.com/PaulLeCam/react-leaflet/pull/259) by _YannickBochatay_).
+- [doc] Added link to plugins documentation in README ([PR #258](https://github.com/PaulLeCam/react-leaflet/pull/258) by _jakehm_).
 
 ## v1.0.0 (2016-11-14)
 
 Changes from v0.12.3:
 
-* [BREAKING] Updated Leaflet dependency requirement to v1.0.0.
-* [BREAKING] Renamed `GeoJson` to `GeoJSON` to match Leaflet's change.
-* [BREAKING] Removed `MultiPolygon` and `MultiPolyline`, now supported by
-  `Polygon` and `Polyline` respectively.
-* [BREAKING] Removed `CanvasTileLayer`, replaced by `GridLayer`. See
-  [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#gridlayer).
-* [BREAKING] Removed `getLeafletElement()` method in `MapComponent` and
-  `MapControl`, deprecated since v0.12.0.
-* [BREAKING] Removed `setIconDefaultImagePath()` helper, set
-  `Leaflet.Icon.Default.imagePath` directly using Leaflet if you need.
-* `Leaflet.Icon.Default.imagePath` is no longer set by default, as per Leaflet
-  v1.0.0 it should be auto-detected.
-* The `Map` component no longer creates an unique ID for its container if none
-  is provided.
-* Added `useFlyTo: bool` property to `Map` to use `flyTo` instead of `setView`
-  and `flyToBounds` instead of `fitBounds` when changing the map's view or
-  bounds ([PR #148](https://github.com/PaulLeCam/react-leaflet/pull/192) by
-  _jgimbel_).
-* Added `GridLayer`.
-* Added `Pane` component introduced in Leaflet v1.
-  ([PR #227](https://github.com/PaulLeCam/react-leaflet/pull/227) by
-  _rjdestigter_).
-* Added `Tooltip` component introduced in Leaflet v1. See
-  [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#tooltip)
-  for usage.
-* Added support for IE9 and IE10
-  ([PR #235](https://github.com/PaulLeCam/react-leaflet/pull/235) by _dettier_).
-* Updated `WMSTileLayer` to support dynamic `url` and parameters.
-* [internal] Fixed Flow errors
-  ([PR #251](https://github.com/PaulLeCam/react-leaflet/pull/251) by
-  _joeyrosztoczy_).
-* [internal] Updated `MapLayer` to only create divs when necessary.
-* [internal] Removed `BaseTileLayer`, replaced by `GridLayer`.
-* [internal] Removed `bower.json` file.
+- [BREAKING] Updated Leaflet dependency requirement to v1.0.0.
+- [BREAKING] Renamed `GeoJson` to `GeoJSON` to match Leaflet's change.
+- [BREAKING] Removed `MultiPolygon` and `MultiPolyline`, now supported by `Polygon` and `Polyline` respectively.
+- [BREAKING] Removed `CanvasTileLayer`, replaced by `GridLayer`. See [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#gridlayer).
+- [BREAKING] Removed `getLeafletElement()` method in `MapComponent` and `MapControl`, deprecated since v0.12.0.
+- [BREAKING] Removed `setIconDefaultImagePath()` helper, set `Leaflet.Icon.Default.imagePath` directly using Leaflet if you need.
+- `Leaflet.Icon.Default.imagePath` is no longer set by default, as per Leaflet v1.0.0 it should be auto-detected.
+- The `Map` component no longer creates an unique ID for its container if none is provided.
+- Added `useFlyTo: bool` property to `Map` to use `flyTo` instead of `setView` and `flyToBounds` instead of `fitBounds` when changing the map's view or bounds ([PR #148](https://github.com/PaulLeCam/react-leaflet/pull/192) by _jgimbel_).
+- Added `GridLayer`.
+- Added `Pane` component introduced in Leaflet v1. ([PR #227](https://github.com/PaulLeCam/react-leaflet/pull/227) by _rjdestigter_).
+- Added `Tooltip` component introduced in Leaflet v1. See [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#tooltip) for usage.
+- Added support for IE9 and IE10 ([PR #235](https://github.com/PaulLeCam/react-leaflet/pull/235) by _dettier_).
+- Updated `WMSTileLayer` to support dynamic `url` and parameters.
+- [internal] Fixed Flow errors ([PR #251](https://github.com/PaulLeCam/react-leaflet/pull/251) by _joeyrosztoczy_).
+- [internal] Updated `MapLayer` to only create divs when necessary.
+- [internal] Removed `BaseTileLayer`, replaced by `GridLayer`.
+- [internal] Removed `bower.json` file.
 
 ## v1.0.0-rc.3 (2016-11-04)
 
@@ -311,20 +250,15 @@ Updated `WMSTileLayer` to support dynamic `url` property.
 
 ## v1.0.0-rc.2 (2016-10-20)
 
-* Added `Pane` component introduced in Leaflet v1.
-  ([PR #227](https://github.com/PaulLeCam/react-leaflet/pull/227) by
-  _rjdestigter_).
-* Added support for IE9 and IE10
-  ([PR #235](https://github.com/PaulLeCam/react-leaflet/pull/235) by _dettier_).
-* Updated `WMSTileLayer` to support dynamic parameters.
+- Added `Pane` component introduced in Leaflet v1. ([PR #227](https://github.com/PaulLeCam/react-leaflet/pull/227) by _rjdestigter_).
+- Added support for IE9 and IE10 ([PR #235](https://github.com/PaulLeCam/react-leaflet/pull/235) by _dettier_).
+- Updated `WMSTileLayer` to support dynamic parameters.
 
 ## v1.0.0-rc.1 (2016-09-28)
 
-* [BREAKING] Removed `setIconDefaultImagePath()` helper, set
-  `Leaflet.Icon.Default.imagePath` directly using Leaflet if you need.
-* Updated Leaflet dependency requirement to v1.0.0.
-* `Leaflet.Icon.Default.imagePath` is no longer set by default, as per Leaflet
-  v1.0.0 it should be auto-detected.
+- [BREAKING] Removed `setIconDefaultImagePath()` helper, set `Leaflet.Icon.Default.imagePath` directly using Leaflet if you need.
+- Updated Leaflet dependency requirement to v1.0.0.
+- `Leaflet.Icon.Default.imagePath` is no longer set by default, as per Leaflet v1.0.0 it should be auto-detected.
 
 ## v1.0.0-beta.3 (2016-08-26)
 
@@ -332,33 +266,22 @@ Fixed `Tooltip` removal handling.
 
 ## v1.0.0-beta.2 (2016-08-20)
 
-* Added `Tooltip` component introduced in Leaflet v1.0.0-rc.2. See
-  [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#tooltip)
-  for usage.
-* Updated Leaflet dependency to v1.0.0-rc.3.
-* Reverted basing components on `React.PureComponent`, they are now based on
-  `React.Component`.
+- Added `Tooltip` component introduced in Leaflet v1.0.0-rc.2. See [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#tooltip) for usage.
+- Updated Leaflet dependency to v1.0.0-rc.3.
+- Reverted basing components on `React.PureComponent`, they are now based on `React.Component`.
 
 ## v1.0.0-beta.1 (2016-07-30)
 
-* [BREAKING] Renamed `GeoJson` to `GeoJSON` to match Leaflet's change.
-* [BREAKING] Removed `MultiPolygon` and `MultiPolyline`, now supported by
-  `Polygon` and `Polyline` respectively.
-* [BREAKING] Removed `CanvasTileLayer`, replaced by `GridLayer`. See
-  [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#gridlayer).
-* [BREAKING] Removed `getLeafletElement()` method in `MapComponent` and
-  `MapControl`, deprecated since v0.12.0.
-* Removed `BaseTileLayer`, replaced by `GridLayer`.
-* Removed `bower.json` file.
-* The `Map` component no longer creates an unique ID for its container if none
-  is provided.
-* All components now extend from `React.PureComponent` instead of
-  `React.Component`, as such React v15.3.0+ is now required.
-* Added `GridLayer`.
-* Added `useFlyTo: bool` property to `Map` to use `flyTo` instead of `setView`
-  and `flyToBounds` instead of `fitBounds` when changing the map's view or
-  bounds ([PR #148](https://github.com/PaulLeCam/react-leaflet/pull/192) by
-  _jgimbel_).
+- [BREAKING] Renamed `GeoJson` to `GeoJSON` to match Leaflet's change.
+- [BREAKING] Removed `MultiPolygon` and `MultiPolyline`, now supported by `Polygon` and `Polyline` respectively.
+- [BREAKING] Removed `CanvasTileLayer`, replaced by `GridLayer`. See [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#gridlayer).
+- [BREAKING] Removed `getLeafletElement()` method in `MapComponent` and `MapControl`, deprecated since v0.12.0.
+- Removed `BaseTileLayer`, replaced by `GridLayer`.
+- Removed `bower.json` file.
+- The `Map` component no longer creates an unique ID for its container if none is provided.
+- All components now extend from `React.PureComponent` instead of `React.Component`, as such React v15.3.0+ is now required.
+- Added `GridLayer`.
+- Added `useFlyTo: bool` property to `Map` to use `flyTo` instead of `setView` and `flyToBounds` instead of `fitBounds` when changing the map's view or bounds ([PR #148](https://github.com/PaulLeCam/react-leaflet/pull/192) by _jgimbel_).
 
 ## v0.12.3 (2016-09-21)
 
@@ -366,27 +289,19 @@ Fixed events bindind in UMD build.
 
 ## v0.12.2 (2016-09-09)
 
-* Updated propTypes to allow polygons with holes in `MultiPolygon`
-  ([PR #218](https://github.com/PaulLeCam/react-leaflet/pull/218) by
-  _ernoaapa_).
-* Fixed badly named `ScaleControl` class.
+- Updated propTypes to allow polygons with holes in `MultiPolygon` ([PR #218](https://github.com/PaulLeCam/react-leaflet/pull/218) by _ernoaapa_).
+- Fixed badly named `ScaleControl` class.
 
 ## v0.12.1 (2016-07-08)
 
-* Fixed unmounting `LayersControl` when the `Map` is unmounting as well.
-* Added a [plugins](docs/Plugins.md) section to the [documentation](docs).
+- Fixed unmounting `LayersControl` when the `Map` is unmounting as well.
+- Added a [plugins](docs/Plugins.md) section to the [documentation](docs).
 
 ## v0.12.0 (2016-06-25)
 
-* [BREAKING] Moved Leaflet instances injection from props to
-  [context](https://facebook.github.io/react/docs/context.html). All components
-  provided by this lib should continue to work as expected, but custom
-  components need to be updated. Read the [UPGRADING](UPGRADING.md) file for
-  more information.
-* Deprecated `getLeafletElement()` method, simply use the `leafletElement`
-  property instead.
-* Documentation moved to the [docs](docs) folder and has been split into
-  different files for better readability.
+- [BREAKING] Moved Leaflet instances injection from props to [context](https://facebook.github.io/react/docs/context.html). All components provided by this lib should continue to work as expected, but custom components need to be updated. Read the [UPGRADING](UPGRADING.md) file for more information.
+- Deprecated `getLeafletElement()` method, simply use the `leafletElement` property instead.
+- Documentation moved to the [docs](docs) folder and has been split into different files for better readability.
 
 ## v0.11.7 (2016-06-14)
 
@@ -394,15 +309,13 @@ Fixed removing layers from `LayersControl`.
 
 ## v0.11.6 (2016-06-09)
 
-* Fixed allowing to set and update the `style` prop as a function in `GeoJson`.
-* [internal] Added
-  [lodash-webpack-plugin](https://github.com/lodash/lodash-webpack-plugin) to
-  reduce the size of the UMD build.
+- Fixed allowing to set and update the `style` prop as a function in `GeoJson`.
+- [internal] Added [lodash-webpack-plugin](https://github.com/lodash/lodash-webpack-plugin) to reduce the size of the UMD build.
 
 ## v0.11.5 (2016-05-14)
 
-* Fixed updating `boundsOptions` in the `Map` without updating `bounds`.
-* Fixed setting `opacity` and `zIndex` properties to `0` in tile layers.
+- Fixed updating `boundsOptions` in the `Map` without updating `bounds`.
+- Fixed setting `opacity` and `zIndex` properties to `0` in tile layers.
 
 ## v0.11.4 (2016-05-05)
 
@@ -410,8 +323,7 @@ Fixed `TileLayer` properties update.
 
 ## v0.11.3 (2016-04-28)
 
-Made the `draggable` property in `Marker` dynamic
-([PR #148](https://github.com/PaulLeCam/react-leaflet/pull/148) by _riolowry_).
+Made the `draggable` property in `Marker` dynamic ([PR #148](https://github.com/PaulLeCam/react-leaflet/pull/148) by _riolowry_).
 
 ## v0.11.2 (2016-04-25)
 
@@ -419,66 +331,43 @@ Fixed layer removal in `LayersControl`.
 
 ## v0.11.1 (2016-04-17)
 
-Fixed `map` property injection in `LayersControl`
-([PR #142](https://github.com/PaulLeCam/react-leaflet/pull/142) by _Dahlgren_).
+Fixed `map` property injection in `LayersControl` ([PR #142](https://github.com/PaulLeCam/react-leaflet/pull/142) by _Dahlgren_).
 
 ## v0.11.0 (2016-04-09)
 
-* [BREAKING] Added `layerContainer` property as a consistent replacement for
-  `map` or `layerGroup`
-  ([PR #132](https://github.com/PaulLeCam/react-leaflet/pull/132) by
-  _boromisp_). This is only breaking if you are creating custom components, as
-  you will need to make sure to also inject the `layerContainer` property to
-  children layers as you need to do with `map`.
-* Changed `LayersControl` to be based on components:
-  * Added `LayersControl.BaseLayer` container component to add a base layer to a
-    `LayersControl`.
-  * Added `LayersControl.Overlay` container component to add an overlay to a
-    `LayersControl`.
-  * `baseLayers` and `overlays` properties for `LayersControl` are still
-    supported but deprecated. Using either of them will make the `LayersControl`
-    behave the same way it does in versions < 0.11.
-* Deprecated `onLeaflet...` properties for events, simply use `on...`, ex
-  `onClick` instead of `onLeafletClick`.
-* Added warnings for deprecated features, the same way React does. Make sure to
-  address these warnings to ease the transition to future releases.
-* Added React v15.0.0 support as peer dependency.
-* [internal] Fixed `no-unused-vars` linting
-  ([PR #131](https://github.com/PaulLeCam/react-leaflet/pull/131) by
-  _boromisp_).
+- [BREAKING] Added `layerContainer` property as a consistent replacement for `map` or `layerGroup` ([PR #132](https://github.com/PaulLeCam/react-leaflet/pull/132) by _boromisp_). This is only breaking if you are creating custom components, as you will need to make sure to also inject the `layerContainer` property to children layers as you need to do with `map`.
+- Changed `LayersControl` to be based on components:
+  - Added `LayersControl.BaseLayer` container component to add a base layer to a `LayersControl`.
+  - Added `LayersControl.Overlay` container component to add an overlay to a `LayersControl`.
+  - `baseLayers` and `overlays` properties for `LayersControl` are still supported but deprecated. Using either of them will make the `LayersControl` behave the same way it does in versions < 0.11.
+- Deprecated `onLeaflet...` properties for events, simply use `on...`, ex `onClick` instead of `onLeafletClick`.
+- Added warnings for deprecated features, the same way React does. Make sure to address these warnings to ease the transition to future releases.
+- Added React v15.0.0 support as peer dependency.
+- [internal] Fixed `no-unused-vars` linting ([PR #131](https://github.com/PaulLeCam/react-leaflet/pull/131) by _boromisp_).
 
 ## v0.10.2 (2016-03-12)
 
-* Added `animate` optional property to `Map`
-  ([PR #126](https://github.com/PaulLeCam/react-leaflet/pull/126) by
-  _mariusandra_).
-* Added React v15.0.0-rc.1 support as peer dependency.
+- Added `animate` optional property to `Map` ([PR #126](https://github.com/PaulLeCam/react-leaflet/pull/126) by _mariusandra_).
+- Added React v15.0.0-rc.1 support as peer dependency.
 
 ## v0.10.1 (2016-02-22)
 
-* Added the popup container as source layer to `Popup` creation, fixes
-  [#113](https://github.com/PaulLeCam/react-leaflet/issues/113)
-  ([PR #112](https://github.com/PaulLeCam/react-leaflet/pull/112) by _amarant_).
-* [internal] Updated Lodash to v4.
+- Added the popup container as source layer to `Popup` creation, fixes [#113](https://github.com/PaulLeCam/react-leaflet/issues/113) ([PR #112](https://github.com/PaulLeCam/react-leaflet/pull/112) by _amarant_).
+- [internal] Updated Lodash to v4.
 
 ## v0.10.0 (2015-12-22)
 
-* Added `AttributionControl`, `LayersControl` and `ScaleControl`
-  ([PR #100](https://github.com/PaulLeCam/react-leaflet/pull/100) by
-  _jonboiser_).
-* Added example to render a list of custom Markers
-  ([PR #104](https://github.com/PaulLeCam/react-leaflet/pull/104) by _varya_).
-* [internal] Updated Babel to v6.
+- Added `AttributionControl`, `LayersControl` and `ScaleControl` ([PR #100](https://github.com/PaulLeCam/react-leaflet/pull/100) by _jonboiser_).
+- Added example to render a list of custom Markers ([PR #104](https://github.com/PaulLeCam/react-leaflet/pull/104) by _varya_).
+- [internal] Updated Babel to v6.
 
 ## v0.9.0 (2015-11-12)
 
-* Removed `PopupContainer` component, extended internally by other components.
-* `FeatureGroup` now expects its layers to be passed as children, like
-  `LayerGroup`.
-* Added `renderChildrenWithProps()` to `MapLayer`, used internally by the
-  library.
-* Added `MapControl` as base component for controls.
-* Added `ZoomControl`.
+- Removed `PopupContainer` component, extended internally by other components.
+- `FeatureGroup` now expects its layers to be passed as children, like `LayerGroup`.
+- Added `renderChildrenWithProps()` to `MapLayer`, used internally by the library.
+- Added `MapControl` as base component for controls.
+- Added `ZoomControl`.
 
 ## v0.8.1 (2015-10-21)
 
@@ -488,21 +377,16 @@ Fix `PropTypes` export.
 
 Changes from v0.7.0:
 
-* Updated React to v0.14.0.
-* Added ReactDOM v0.14.0 to peer dependencies.
-* `Popup` now renders its contents using `ReactDOM.render()` and therefore
-  supports dynamic children.
-* `Map` now supports dynamic `bounds` and `maxBounds` properties
-  ([#72](https://github.com/PaulLeCam/react-leaflet/pull/72)).
-* Added `LayerGroup` component
-  ([#58](https://github.com/PaulLeCam/react-leaflet/pull/58)).
+- Updated React to v0.14.0.
+- Added ReactDOM v0.14.0 to peer dependencies.
+- `Popup` now renders its contents using `ReactDOM.render()` and therefore supports dynamic children.
+- `Map` now supports dynamic `bounds` and `maxBounds` properties ([#72](https://github.com/PaulLeCam/react-leaflet/pull/72)).
+- Added `LayerGroup` component ([#58](https://github.com/PaulLeCam/react-leaflet/pull/58)).
 
 ## v0.8.0-rc.3 (2015-09-29)
 
-* Added `LayerGroup` component
-  ([#58](https://github.com/PaulLeCam/react-leaflet/pull/58)).
-* `Map` now supports dynamic `bounds` and `maxBounds` properties
-  ([#72](https://github.com/PaulLeCam/react-leaflet/pull/72)).
+- Added `LayerGroup` component ([#58](https://github.com/PaulLeCam/react-leaflet/pull/58)).
+- `Map` now supports dynamic `bounds` and `maxBounds` properties ([#72](https://github.com/PaulLeCam/react-leaflet/pull/72)).
 
 ## v0.8.0-rc.2 (2015-09-22)
 
@@ -510,20 +394,18 @@ Check if `Popup` content node exists before trying to unmount.
 
 ## v0.8.0-rc.1 (2015-09-16)
 
-* Updated React to v0.14.0-rc1.
-* Added ReactDOM v0.14.0-rc1 to peer dependencies.
-* `Popup` now renders its contents using `ReactDOM.render()` and therefore
-  supports dynamic children.
+- Updated React to v0.14.0-rc1.
+- Added ReactDOM v0.14.0-rc1 to peer dependencies.
+- `Popup` now renders its contents using `ReactDOM.render()` and therefore supports dynamic children.
 
 ## v0.7.0 (2015-09-08)
 
-* Updated Leaflet to v0.7.5.
-* Added `Path` base component for vector layers, handling dynamic
-  [Path options](http://leafletjs.com/reference.html#path-options) properties.
-* Added support for holes in `Polygon`.
-* [internal] Updated Jest to v0.5.
-* [internal] Updated Gulpfile to use Babel.
-* [internal] Added ESLint validation.
+- Updated Leaflet to v0.7.5.
+- Added `Path` base component for vector layers, handling dynamic [Path options](http://leafletjs.com/reference.html#path-options) properties.
+- Added support for holes in `Polygon`.
+- [internal] Updated Jest to v0.5.
+- [internal] Updated Gulpfile to use Babel.
+- [internal] Added ESLint validation.
 
 ## v0.6.2 (2015-06-14)
 
@@ -536,9 +418,8 @@ Fix `PopupContainer` export.
 
 ## v0.6.0 (2015-05-18)
 
-* Added `style` property on the `Map` component.
-* Replaced the `<noscript>` element in `PopupContainer` by a `<div>` to be
-  properly updated.
+- Added `style` property on the `Map` component.
+- Replaced the `<noscript>` element in `PopupContainer` by a `<div>` to be properly updated.
 
 ## v0.5.0 (2015-05-02)
 
@@ -546,8 +427,8 @@ Set `icon`, `zIndexOffset` and `opacity` properties as dynamic on `Marker`.
 
 ## v0.4.1 (2015-04-06)
 
-* Removed `getLeafletElement()` deprecation.
-* Updated Babel to v5.
+- Removed `getLeafletElement()` deprecation.
+- Updated Babel to v5.
 
 ## v0.4.0 (2015-03-28)
 
@@ -559,20 +440,10 @@ React v0.13.0.
 
 ## v0.4.0-beta.1 (2015-03-08)
 
-* Updated React dependency to v0.13.0-rc2:
-  * Components are defined as ES6 classes.
-  * Mixins are replaced by the base components `MapComponent`, `MapLayer`,
-    `BaseTileLayer` and `PopupContainer`. All components extend from these.
-  * The new
-    [`React.cloneElement()`](https://facebook.github.io/react/blog/2015/03/03/react-v0.13-rc2.html#react.cloneelement)
-    API is used instead of the deprecated `React.addons.cloneWithProps()` to
-    pass the `map` property to the components.
-  * The `map` property has been removed from the components `propTypes`
-    definition as it is dynamically injected to its children by the `Map`
-    component, React would
-    [now warn it is not set](https://facebook.github.io/react/blog/2015/02/24/streamlining-react-elements.html#solution-early-proptype-warnings).
-    It is still required by components to have access to the Leaflet object.
-* Events can now be set as `on{Event}` rather than `onLeaflet{Event}`, ex
-  `onClick` instead of `onLeafletClick`, as all events are proxied to Leaflet.
-* Deprecated `getLeafletElement()` method, simply use the `leafletElement`
-  property instead to access the Leaflet object created for a component.
+- Updated React dependency to v0.13.0-rc2:
+  - Components are defined as ES6 classes.
+  - Mixins are replaced by the base components `MapComponent`, `MapLayer`, `BaseTileLayer` and `PopupContainer`. All components extend from these.
+  - The new [`React.cloneElement()`](https://facebook.github.io/react/blog/2015/03/03/react-v0.13-rc2.html#react.cloneelement) API is used instead of the deprecated `React.addons.cloneWithProps()` to pass the `map` property to the components.
+  - The `map` property has been removed from the components `propTypes` definition as it is dynamically injected to its children by the `Map` component, React would [now warn it is not set](https://facebook.github.io/react/blog/2015/02/24/streamlining-react-elements.html#solution-early-proptype-warnings). It is still required by components to have access to the Leaflet object.
+- Events can now be set as `on{Event}` rather than `onLeaflet{Event}`, ex `onClick` instead of `onLeafletClick`, as all events are proxied to Leaflet.
+- Deprecated `getLeafletElement()` method, simply use the `leafletElement` property instead to access the Leaflet object created for a component.
diff --git a/README.md b/README.md
index d2ac21ea..1e88f893 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
 
 ⚛️ React components for 🍃 Leaflet maps.
 
-⚠️ The master branch contains the code for version 2 of the library, currently in beta. For the stable version, use the [v1 branch](https://github.com/PaulLeCam/react-leaflet/tree/v1).
+⚠️ The master branch contains the code for version 2 of the library, currently published in as release candidate. For the stable version, use the [v1 branch](https://github.com/PaulLeCam/react-leaflet/tree/v1).
 
 ## [Documentation](http://react-leaflet.js.org)
 
-* [Getting started](https://react-leaflet.js.org/docs/en/intro.html)
-* [API reference](https://react-leaflet.js.org/docs/en/context.html)
+- [Getting started](https://react-leaflet.js.org/docs/en/intro.html)
+- [API reference](https://react-leaflet.js.org/docs/en/context.html)
 
 ## Changes
 
@@ -19,9 +19,7 @@ See [CONTRIBUTING](CONTRIBUTING.md) file.
 
 ## Support
 
-Please **do not** use GitHub issues for support, but instead post your questions
-on [StackOverflow](https://stackoverflow.com/) using the
-[`react-leaflet` tag](https://stackoverflow.com/questions/tagged/react-leaflet).
+Please **do not** use GitHub issues for support, but instead post your questions on [StackOverflow](https://stackoverflow.com/) using the [`react-leaflet` tag](https://stackoverflow.com/questions/tagged/react-leaflet).
 
 ## License
 
diff --git a/UPGRADING.md b/UPGRADING.md
index c886c522..23ca378f 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -1,90 +1,60 @@
 # Upgrading
 
-## v2 (beta)
+## v2 (RC)
 
 This release requires [React v16.3.0+](https://reactjs.org/blog/2018/03/29/react-v-16-3.html) and brings breaking changes in the way the necessary context is propagated. Most third-party plugins and custom components will likely need to be updated in order to access the context.
 
 ## v1.8
 
-This release requires
-[Leaflet v1.3](http://leafletjs.com/2018/01/15/leaflet-1.3.0.html) as peer
-dependency.
+This release requires [Leaflet v1.3](http://leafletjs.com/2018/01/15/leaflet-1.3.0.html) as peer dependency.
 
 ## v1.6
 
 This release makes internal changes to the folders exposed:
 
-* The `src` folder is no longer exported in the npm package, the added `es` one
-  should be consumed instead if you want to support modules.
-* The `lib` and `dist` folders are no longer exported in the GitHub repository,
-  use the npm package instead if you need to access them.
+- The `src` folder is no longer exported in the npm package, the added `es` one should be consumed instead if you want to support modules.
+- The `lib` and `dist` folders are no longer exported in the GitHub repository, use the npm package instead if you need to access them.
 
 ## v1.5
 
-This release requires
-[Leaflet v1.2](http://leafletjs.com/2017/08/08/leaflet-1.2.0.html) as peer
-dependency.
+This release requires [Leaflet v1.2](http://leafletjs.com/2017/08/08/leaflet-1.2.0.html) as peer dependency.
 
 ## v1.4
 
-This release requires
-[Leaflet v1.1](http://leafletjs.com/2017/06/27/leaflet-1.1.0.html) in order to
-support the newly added features such as dynamic z-index in `ImageOverlay` and
-the `VideoOverlay` layer, exposed by React-Leaflet as a component.
+This release requires [Leaflet v1.1](http://leafletjs.com/2017/06/27/leaflet-1.1.0.html) in order to support the newly added features such as dynamic z-index in `ImageOverlay` and the `VideoOverlay` layer, exposed by React-Leaflet as a component.
 
-The `prop-types` package is now set as a peer dependency rather than a direct
-dependency, so you will need to add it to your application dependencies if not
-already set.
+The `prop-types` package is now set as a peer dependency rather than a direct dependency, so you will need to add it to your application dependencies if not already set.
 
 ## v1.1
 
-This release changes the way Leaflet elements are created and updated
-internally. If you are only using public APIs, nothing should change, however if
-you are extending or creating custom components, you should now use the added
-`createLeafletElement()` and `updateLeafletElement()` methods described in the
-[Extending](https://github.com/PaulLeCam/react-leaflet/blob/master/docs/Extending.md#extending)
-section of the documentation rather than overriding the lifecycle hooks
-directly.\
-See the [relevant commit](https://github.com/PaulLeCam/react-leaflet/commit/b42026f9dc93be45f0b8ffc6638a9d3824751091)
-for more details about the changes involved.
+This release changes the way Leaflet elements are created and updated internally. If you are only using public APIs, nothing should change, however if you are extending or creating custom components, you should now use the added `createLeafletElement()` and `updateLeafletElement()` methods described in the [Extending](https://github.com/PaulLeCam/react-leaflet/blob/master/docs/Extending.md#extending) section of the documentation rather than overriding the lifecycle hooks directly.\
+See the [relevant commit](https://github.com/PaulLeCam/react-leaflet/commit/b42026f9dc93be45f0b8ffc6638a9d3824751091) for more details about the changes involved.
 
 ## v1.0
 
-React-Leaflet v1 requires Leaflet v1.0.0 and therefore contains breaking changes
-from v0.12, based on Leaflet v0.7.\
+React-Leaflet v1 requires Leaflet v1.0.0 and therefore contains breaking changes from v0.12, based on Leaflet v0.7.\
 Make sure to update your Leaflet dependency to v1.0.0, as well as its CSS file.
 
-The following list includes breaking changes upgrading to React-Leaflet v1.0
-from v0.12, it may not be exhaustive:
+The following list includes breaking changes upgrading to React-Leaflet v1.0 from v0.12, it may not be exhaustive:
 
-* Renamed `GeoJson` to `GeoJSON` to match Leaflet's change.
-* Removed `MultiPolygon` and `MultiPolyline`, now supported by `Polygon` and
-  `Polyline` respectively.
-* Removed `CanvasTileLayer`, replaced by `GridLayer`. See
-  [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#gridlayer).
-* Removed `getLeafletElement()` method in `MapComponent` and `MapControl`,
-  deprecated since v0.12.0.
-* Removed `setIconDefaultImagePath()` helper, set
-  `Leaflet.Icon.Default.imagePath` directly using Leaflet if you need.
+- Renamed `GeoJson` to `GeoJSON` to match Leaflet's change.
+- Removed `MultiPolygon` and `MultiPolyline`, now supported by `Polygon` and `Polyline` respectively.
+- Removed `CanvasTileLayer`, replaced by `GridLayer`. See [Leaflet's documentation](http://leafletjs.com/reference-1.0.0.html#gridlayer).
+- Removed `getLeafletElement()` method in `MapComponent` and `MapControl`, deprecated since v0.12.0.
+- Removed `setIconDefaultImagePath()` helper, set `Leaflet.Icon.Default.imagePath` directly using Leaflet if you need.
 
 Read the [changelog](CHANGELOG.md) for more details about these changes.
 
 ## v0.12.0
 
-**Drop support for IE <= 10** as explained in
-[this comment](https://github.com/PaulLeCam/react-leaflet/issues/215#issuecomment-243996907).
+**Drop support for IE <= 10** as explained in [this comment](https://github.com/PaulLeCam/react-leaflet/issues/215#issuecomment-243996907).
 
-**Deprecated:** the `getLeafletElement()` method on components is deprecated,
-you can simply use the `leafletElement` property instead.
+**Deprecated:** the `getLeafletElement()` method on components is deprecated, you can simply use the `leafletElement` property instead.
 
-The major change in this version is the use of
-[context](https://facebook.github.io/react/docs/context.html) instead of props
-to pass Leaflet instances from components to their children.\
-If you are only using the components provided by React-Leaflet, everything should
-continue to work as before.
+The major change in this version is the use of [context](https://facebook.github.io/react/docs/context.html) instead of props to pass Leaflet instances from components to their children.\
+If you are only using the components provided by React-Leaflet, everything should continue to work as before.
 
-If you are using custom components, you may have to update your code to provide
-or access the `map`, `layerContainer` and `popupContainer` using context.\
+If you are using custom components, you may have to update your code to provide or access the `map`, `layerContainer` and `popupContainer` using context.\
 For example, using React-Leaflet < 0.12, you would need to do:
 
 ```js
diff --git a/docs/plugins.md b/docs/plugins.md
index 48c33034..ce28a122 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -17,9 +17,9 @@ open pull requests to update this list!
 | [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control) | unknown
 | [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3) | unknown
 | [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate) | unknown
+| [`react-leaflet-distance-marker`](https://www.npmjs.com/package/react-leaflet-distance-marker) | unknown
 | [`react-leaflet-div-icon`](https://www.npmjs.com/package/react-leaflet-div-icon) | unknown
 | [`react-leaflet-draggable-polyline`](https://www.npmjs.com/package/react-leaflet-draggable-polyline) | unknown
-| [`react-leaflet-distance-marker`](https://www.npmjs.com/package/react-leaflet-distance-marker) | unknown
 | [`react-leaflet-draw`](https://www.npmjs.com/package/react-leaflet-draw) | unknown
 | [`react-leaflet-easyprint`](https://www.npmjs.com/package/react-leaflet-easyprint) | unknown
 | [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown
diff --git a/package.json b/package.json
index b5dbccca..b716a8dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-leaflet",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-rc.1",
   "description": "React components for Leaflet maps",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -67,7 +67,7 @@
     "babel-loader": "^7.1.4",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-external-helpers": "^6.22.0",
-    "babel-plugin-lodash": "^3.3.2",
+    "babel-plugin-lodash": "^3.3.3",
     "babel-plugin-transform-proto-to-assign": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
@@ -75,30 +75,30 @@
     "cross-env": "^5.1.6",
     "eslint": "^4.19.1",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-flowtype": "^2.48.0",
+    "eslint-plugin-flowtype": "^2.49.3",
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-node": "^6.0.1",
     "eslint-plugin-prettier": "^2.6.0",
     "eslint-plugin-promise": "^3.8.0",
-    "eslint-plugin-react": "^7.8.2",
-    "flow-bin": "^0.73.0",
-    "flow-copy-source": "^1.3.0",
+    "eslint-plugin-react": "^7.9.1",
+    "flow-bin": "^0.74.0",
+    "flow-copy-source": "^2.0.0",
     "flow-typed": "^2.4.0",
     "jest": "^23.1.0",
     "leaflet": "^1.3.1",
-    "prettier": "^1.13.3",
+    "prettier": "^1.13.5",
     "prettier-eslint": "^8.8.1",
     "react": "^16.4.0",
     "react-dom": "^16.4.0",
     "rimraf": "^2.6.2",
-    "rollup": "^0.59.4",
+    "rollup": "^0.60.1",
     "rollup-plugin-babel": "^3.0.3",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-replace": "^2.0.0",
     "rollup-plugin-uglify": "^4.0.0",
-    "webpack": "^4.10.2",
-    "webpack-serve": "^1.0.2"
+    "webpack": "^4.12.0",
+    "webpack-serve": "^1.0.4"
   },
   "jest": {
     "collectCoverage": true,
diff --git a/src/Map.js b/src/Map.js
index 4114bac5..ab886538 100644
--- a/src/Map.js
+++ b/src/Map.js
@@ -30,8 +30,11 @@ const OTHER_PROPS = [
   'whenReady',
 ]
 
-const normalizeCenter = (pos: LatLng): [number, number] =>
-  Array.isArray(pos) ? [pos[0], pos[1]] : [pos.lat, pos.lon ? pos.lon : pos.lng]
+const normalizeCenter = (pos: LatLng): [number, number] => {
+  return Array.isArray(pos)
+    ? [pos[0], pos[1]]
+    : [pos.lat, pos.lon ? pos.lon : pos.lng]
+}
 
 type LeafletElement = LeafletMap
 
@@ -105,12 +108,6 @@ export default class Map extends MapComponent<LeafletElement, Props> {
 
   _updating: boolean = false
 
-  // TODO: check using this.props.className works as expected
-  // constructor(props: Props, context: Object) {
-  //   super(props, context)
-  //   this.className = props.className
-  // }
-
   createLeafletElement(props: Props): LeafletElement {
     const { viewport, ...options } = props
     if (viewport) {
diff --git a/src/utils/updateClassName.js b/src/utils/updateClassName.js
index 29aac84b..fa58d1a2 100644
--- a/src/utils/updateClassName.js
+++ b/src/utils/updateClassName.js
@@ -2,8 +2,9 @@
 
 import { DomUtil } from 'leaflet'
 
-const splitClassName = (className: string = ''): Array<string> =>
-  className.split(' ').filter(Boolean)
+const splitClassName = (className: string = ''): Array<string> => {
+  return className.split(' ').filter(Boolean)
+}
 
 export default (
   container: ?HTMLElement,
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index 98b9a33d..3b8ea19d 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -78,7 +78,7 @@ class HomeSplash extends React.Component {
             </Button>
           </PromoSection>
           <PromoSection>
-            <h2>v2 (beta):</h2>
+            <h2>v2 (release candidate):</h2>
             <Button href={docUrl('intro.html', this.props.language)}>
               Getting started
             </Button>
@@ -182,9 +182,7 @@ render(map, document.getElementById('map-container'))`}
         ▶️ this CodePen (v1 - stable)
       </a>{' '}
       or{' '}
-      <a href="https://codepen.io/PaulLeCam/pen/gzVmGw">
-        the v2 (beta) version
-      </a>.
+      <a href="https://codepen.io/PaulLeCam/pen/gzVmGw">the v2 (RC) version</a>.
     </p>
     <PromoSection>
       <Button href={docUrl('intro.html', props.language)}>Get started</Button>
diff --git a/website/versioned_docs/version-v2-beta/components.md b/website/versioned_docs/version-v2-rc/components.md
similarity index 99%
rename from website/versioned_docs/version-v2-beta/components.md
rename to website/versioned_docs/version-v2-rc/components.md
index 55f845ac..3297c504 100644
--- a/website/versioned_docs/version-v2-beta/components.md
+++ b/website/versioned_docs/version-v2-rc/components.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-components
+id: version-v2-rc-components
 title: Components
 original_id: components
 ---
diff --git a/website/versioned_docs/version-v2-beta/context.md b/website/versioned_docs/version-v2-rc/context.md
similarity index 97%
rename from website/versioned_docs/version-v2-beta/context.md
rename to website/versioned_docs/version-v2-rc/context.md
index a54cc2f4..0e53f641 100644
--- a/website/versioned_docs/version-v2-beta/context.md
+++ b/website/versioned_docs/version-v2-rc/context.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-context
+id: version-v2-rc-context
 title: Context
 original_id: context
 ---
diff --git a/website/versioned_docs/version-v2-beta/custom-components.md b/website/versioned_docs/version-v2-rc/custom-components.md
similarity index 97%
rename from website/versioned_docs/version-v2-beta/custom-components.md
rename to website/versioned_docs/version-v2-rc/custom-components.md
index f18e91e4..51db8b2d 100644
--- a/website/versioned_docs/version-v2-beta/custom-components.md
+++ b/website/versioned_docs/version-v2-rc/custom-components.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-custom-components
+id: version-v2-rc-custom-components
 title: Creating custom components
 original_id: custom-components
 ---
diff --git a/website/versioned_docs/version-v2-beta/events.md b/website/versioned_docs/version-v2-rc/events.md
similarity index 93%
rename from website/versioned_docs/version-v2-beta/events.md
rename to website/versioned_docs/version-v2-rc/events.md
index 99ad73af..b950240b 100644
--- a/website/versioned_docs/version-v2-beta/events.md
+++ b/website/versioned_docs/version-v2-rc/events.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-events
+id: version-v2-rc-events
 title: Events
 original_id: events
 ---
diff --git a/website/versioned_docs/version-v2-beta/examples.md b/website/versioned_docs/version-v2-rc/examples.md
similarity index 98%
rename from website/versioned_docs/version-v2-beta/examples.md
rename to website/versioned_docs/version-v2-rc/examples.md
index 1e70b17f..49542b68 100644
--- a/website/versioned_docs/version-v2-beta/examples.md
+++ b/website/versioned_docs/version-v2-rc/examples.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-examples
+id: version-v2-rc-examples
 title: Examples
 original_id: examples
 ---
diff --git a/website/versioned_docs/version-v2-beta/installation.md b/website/versioned_docs/version-v2-rc/installation.md
similarity index 97%
rename from website/versioned_docs/version-v2-beta/installation.md
rename to website/versioned_docs/version-v2-rc/installation.md
index cca4074e..f529eb33 100644
--- a/website/versioned_docs/version-v2-beta/installation.md
+++ b/website/versioned_docs/version-v2-rc/installation.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-installation
+id: version-v2-rc-installation
 title: Installation
 original_id: installation
 ---
diff --git a/website/versioned_docs/version-v2-beta/intro.md b/website/versioned_docs/version-v2-rc/intro.md
similarity index 99%
rename from website/versioned_docs/version-v2-beta/intro.md
rename to website/versioned_docs/version-v2-rc/intro.md
index 045a8958..0bd6670c 100644
--- a/website/versioned_docs/version-v2-beta/intro.md
+++ b/website/versioned_docs/version-v2-rc/intro.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-intro
+id: version-v2-rc-intro
 title: Introduction
 original_id: intro
 ---
diff --git a/website/versioned_docs/version-v2-beta/plugins.md b/website/versioned_docs/version-v2-rc/plugins.md
similarity index 88%
rename from website/versioned_docs/version-v2-beta/plugins.md
rename to website/versioned_docs/version-v2-rc/plugins.md
index 5e373f7c..5f814875 100644
--- a/website/versioned_docs/version-v2-beta/plugins.md
+++ b/website/versioned_docs/version-v2-rc/plugins.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-plugins
+id: version-v2-rc-plugins
 title: Third-party plugins
 original_id: plugins
 ---
@@ -18,13 +18,16 @@ open pull requests to update this list!
 | [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control) | unknown
 | [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3) | unknown
 | [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate) | unknown
+| [`react-leaflet-distance-marker`](https://www.npmjs.com/package/react-leaflet-distance-marker) | unknown
 | [`react-leaflet-div-icon`](https://www.npmjs.com/package/react-leaflet-div-icon) | unknown
 | [`react-leaflet-draggable-polyline`](https://www.npmjs.com/package/react-leaflet-draggable-polyline) | unknown
 | [`react-leaflet-draw`](https://www.npmjs.com/package/react-leaflet-draw) | unknown
 | [`react-leaflet-easyprint`](https://www.npmjs.com/package/react-leaflet-easyprint) | unknown
+| [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown
 | [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster) | unknown
 | [`react-leaflet-google`](https://www.npmjs.com/package/react-leaflet-google) | unknown
 | [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer) | unknown
+| [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control) | unknown
 | [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster) | unknown
 | [`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) | unknown
diff --git a/website/versioned_docs/version-v2-beta/setup.md b/website/versioned_docs/version-v2-rc/setup.md
similarity index 95%
rename from website/versioned_docs/version-v2-beta/setup.md
rename to website/versioned_docs/version-v2-rc/setup.md
index 2e378e8c..f6d1f23b 100644
--- a/website/versioned_docs/version-v2-beta/setup.md
+++ b/website/versioned_docs/version-v2-rc/setup.md
@@ -1,5 +1,5 @@
 ---
-id: version-v2-beta-setup
+id: version-v2-rc-setup
 title: Leaflet setup
 original_id: setup
 ---
diff --git a/website/versioned_sidebars/version-v2-beta-sidebars.json b/website/versioned_sidebars/version-v2-beta-sidebars.json
deleted file mode 100644
index 39452f05..00000000
--- a/website/versioned_sidebars/version-v2-beta-sidebars.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "version-v2-beta-docs": {
-    "Getting started": [
-      "version-v2-beta-intro",
-      "version-v2-beta-setup",
-      "version-v2-beta-installation",
-      "version-v2-beta-examples"
-    ],
-    "API": [
-      "version-v2-beta-context",
-      "version-v2-beta-events",
-      "version-v2-beta-components"
-    ],
-    "Guides": [
-      "version-v2-beta-custom-components",
-      "version-v2-beta-class-hierarchy"
-    ],
-    "Extra": [
-      "version-v2-beta-plugins"
-    ]
-  }
-}
diff --git a/website/versioned_sidebars/version-v2-rc-sidebars.json b/website/versioned_sidebars/version-v2-rc-sidebars.json
new file mode 100644
index 00000000..bb3f858f
--- /dev/null
+++ b/website/versioned_sidebars/version-v2-rc-sidebars.json
@@ -0,0 +1,20 @@
+{
+  "version-v2-rc-docs": {
+    "Getting started": [
+      "version-v2-rc-intro",
+      "version-v2-rc-setup",
+      "version-v2-rc-installation",
+      "version-v2-rc-examples"
+    ],
+    "API": [
+      "version-v2-rc-context",
+      "version-v2-rc-events",
+      "version-v2-rc-components"
+    ],
+    "Guides": [
+      "version-v2-rc-custom-components",
+      "version-v2-rc-class-hierarchy"
+    ],
+    "Extra": ["version-v2-rc-plugins"]
+  }
+}
diff --git a/website/versions.json b/website/versions.json
index 5cce8529..a254f3a1 100644
--- a/website/versions.json
+++ b/website/versions.json
@@ -1,4 +1,4 @@
 [
-  "v2-beta",
+  "v2-rc",
   "v1"
 ]
diff --git a/yarn.lock b/yarn.lock
index d79ed586..a60d2b78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -38,6 +38,13 @@
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
+"@babel/helper-module-imports@^7.0.0-beta.49":
+  version "7.0.0-beta.49"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.49.tgz#41d7d59891016c493432a46f7464446552890c75"
+  dependencies:
+    "@babel/types" "7.0.0-beta.49"
+    lodash "^4.17.5"
+
 "@babel/helper-split-export-declaration@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
@@ -92,6 +99,14 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
+"@babel/types@7.0.0-beta.49", "@babel/types@^7.0.0-beta.49":
+  version "7.0.0-beta.49"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.49.tgz#b7e3b1c3f4d4cfe11bdf8c89f1efd5e1617b87a6"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.5"
+    to-fast-properties "^2.0.0"
+
 "@shellscape/koa-send@^4.1.0":
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/@shellscape/koa-send/-/koa-send-4.1.3.tgz#1a7c8df21f63487e060b7bfd8ed82e1d3c4ae0b0"
@@ -116,132 +131,140 @@
   version "10.1.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.4.tgz#606651d3f8a8bec08b8cb262161aab9209f4a29d"
 
-"@webassemblyjs/ast@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.9.tgz#b2770182678691ab4949d593105c15d4074fedb6"
+"@webassemblyjs/ast@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.12.tgz#a9acbcb3f25333c4edfa1fdf3186b1ccf64e6664"
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.5.9"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.9"
-    "@webassemblyjs/wast-parser" "1.5.9"
+    "@webassemblyjs/helper-module-context" "1.5.12"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+    "@webassemblyjs/wast-parser" "1.5.12"
     debug "^3.1.0"
     mamacro "^0.0.3"
 
-"@webassemblyjs/floating-point-hex-parser@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.9.tgz#ee56243f6ba30781ff6f92fe7f1c377255219a7c"
+"@webassemblyjs/floating-point-hex-parser@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz#0f36044ffe9652468ce7ae5a08716a4eeff9cd9c"
 
-"@webassemblyjs/helper-api-error@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.9.tgz#c80e204afe1ae102c23b0357f1ec25aeb61022a2"
+"@webassemblyjs/helper-api-error@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz#05466833ff2f9d8953a1a327746e1d112ea62aaf"
 
-"@webassemblyjs/helper-buffer@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.9.tgz#90d99afcb0fdc1ee11bc403894f3ae37cd926a81"
+"@webassemblyjs/helper-buffer@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz#1f0de5aaabefef89aec314f7f970009cd159c73d"
   dependencies:
     debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.9.tgz#b56ac06a39c3e1cfefcc421ade1ee471a738a570"
+"@webassemblyjs/helper-code-frame@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz#3cdc1953093760d1c0f0caf745ccd62bdb6627c7"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.5.9"
+    "@webassemblyjs/wast-printer" "1.5.12"
 
-"@webassemblyjs/helper-fsm@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.9.tgz#8f996268eb07ee6728130a9e97fa3aac32772454"
+"@webassemblyjs/helper-fsm@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz#6bc1442b037f8e30f2e57b987cee5c806dd15027"
 
-"@webassemblyjs/helper-module-context@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.9.tgz#69e2eea310f755a0b750b84f8af59f890f2046ac"
+"@webassemblyjs/helper-module-context@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz#b5588ca78b33b8a0da75f9ab8c769a3707baa861"
+  dependencies:
+    debug "^3.1.0"
+    mamacro "^0.0.3"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.9.tgz#467ba0f9e4d0e4a48bf1c5107b9f4abe3ca1171a"
+"@webassemblyjs/helper-wasm-bytecode@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz#d12a3859db882a448891a866a05d0be63785b616"
 
-"@webassemblyjs/helper-wasm-section@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.9.tgz#aec9486ab5d56e3cb5252a7ed88777b6792ac624"
+"@webassemblyjs/helper-wasm-section@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz#ff9fe1507d368ad437e7969d25e8c1693dac1884"
   dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/helper-buffer" "1.5.9"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.9"
-    "@webassemblyjs/wasm-gen" "1.5.9"
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/helper-buffer" "1.5.12"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+    "@webassemblyjs/wasm-gen" "1.5.12"
     debug "^3.1.0"
 
-"@webassemblyjs/ieee754@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.9.tgz#846856ece040c7debd5b5645b319c26523613bcf"
+"@webassemblyjs/ieee754@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz#ee9574bc558888f13097ce3e7900dff234ea19a4"
   dependencies:
     ieee754 "^1.1.11"
 
-"@webassemblyjs/leb128@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.9.tgz#7249443a0fd7574a7e3c1c39532535c735390bbc"
+"@webassemblyjs/leb128@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.12.tgz#0308eec652765ee567d8a5fa108b4f0b25b458e1"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/wasm-edit@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.9.tgz#9b8e054b2d305a7e0528088571c95904bd73df48"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/helper-buffer" "1.5.9"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.9"
-    "@webassemblyjs/helper-wasm-section" "1.5.9"
-    "@webassemblyjs/wasm-gen" "1.5.9"
-    "@webassemblyjs/wasm-opt" "1.5.9"
-    "@webassemblyjs/wasm-parser" "1.5.9"
-    "@webassemblyjs/wast-printer" "1.5.9"
+"@webassemblyjs/utf8@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.12.tgz#d5916222ef314bf60d6806ed5ac045989bfd92ce"
+
+"@webassemblyjs/wasm-edit@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz#821c9358e644a166f2c910e5af1b46ce795a17aa"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/helper-buffer" "1.5.12"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+    "@webassemblyjs/helper-wasm-section" "1.5.12"
+    "@webassemblyjs/wasm-gen" "1.5.12"
+    "@webassemblyjs/wasm-opt" "1.5.12"
+    "@webassemblyjs/wasm-parser" "1.5.12"
+    "@webassemblyjs/wast-printer" "1.5.12"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.9.tgz#85e07c047fab917e06b18dee4d16342a2fd3c59c"
+"@webassemblyjs/wasm-gen@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz#0b7ccfdb93dab902cc0251014e2e18bae3139bcb"
   dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.9"
-    "@webassemblyjs/ieee754" "1.5.9"
-    "@webassemblyjs/leb128" "1.5.9"
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+    "@webassemblyjs/ieee754" "1.5.12"
+    "@webassemblyjs/leb128" "1.5.12"
+    "@webassemblyjs/utf8" "1.5.12"
 
-"@webassemblyjs/wasm-opt@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.9.tgz#ccac17c41a044c167bc95d3e8645cf889a137ce5"
+"@webassemblyjs/wasm-opt@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz#bd758a8bc670f585ff1ae85f84095a9e0229cbc9"
   dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/helper-buffer" "1.5.9"
-    "@webassemblyjs/wasm-gen" "1.5.9"
-    "@webassemblyjs/wasm-parser" "1.5.9"
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/helper-buffer" "1.5.12"
+    "@webassemblyjs/wasm-gen" "1.5.12"
+    "@webassemblyjs/wasm-parser" "1.5.12"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-parser@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.9.tgz#ddab84da4957b64aafbc61e4ab706cc667082f32"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/helper-api-error" "1.5.9"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.9"
-    "@webassemblyjs/ieee754" "1.5.9"
-    "@webassemblyjs/leb128" "1.5.9"
-    "@webassemblyjs/wasm-parser" "1.5.9"
-
-"@webassemblyjs/wast-parser@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.9.tgz#193d24ccf4742a5f8f1915936680ab2314011df2"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.9"
-    "@webassemblyjs/helper-api-error" "1.5.9"
-    "@webassemblyjs/helper-code-frame" "1.5.9"
-    "@webassemblyjs/helper-fsm" "1.5.9"
+"@webassemblyjs/wasm-parser@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz#7b10b4388ecf98bd7a22e702aa62ec2f46d0c75e"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/helper-api-error" "1.5.12"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+    "@webassemblyjs/ieee754" "1.5.12"
+    "@webassemblyjs/leb128" "1.5.12"
+    "@webassemblyjs/utf8" "1.5.12"
+
+"@webassemblyjs/wast-parser@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz#9cf5ae600ecae0640437b5d4de5dd6b6088d0d8b"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.12"
+    "@webassemblyjs/helper-api-error" "1.5.12"
+    "@webassemblyjs/helper-code-frame" "1.5.12"
+    "@webassemblyjs/helper-fsm" "1.5.12"
     long "^3.2.0"
     mamacro "^0.0.3"
 
-"@webassemblyjs/wast-printer@1.5.9":
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.9.tgz#16605d90a481c01a130b7c4edeb2bce503787eb4"
+"@webassemblyjs/wast-printer@1.5.12":
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz#563ca4d01b22d21640b2463dc5e3d7f7d9dac520"
   dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/wast-parser" "1.5.9"
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/wast-parser" "1.5.12"
     long "^3.2.0"
 
 "@webpack-contrib/config-loader@^1.1.1":
@@ -309,6 +332,10 @@ acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:
   version "5.5.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
 
+acorn@^5.6.2:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
+
 ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
@@ -707,13 +734,6 @@ babel-helper-hoist-variables@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-helper-module-imports@^7.0.0-beta.3:
-  version "7.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-module-imports/-/babel-helper-module-imports-7.0.0-beta.3.tgz#e15764e3af9c8e11810c09f78f498a2bdc71585a"
-  dependencies:
-    babel-types "7.0.0-beta.3"
-    lodash "^4.2.0"
-
 babel-helper-optimise-call-expression@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
@@ -807,14 +827,14 @@ babel-plugin-jest-hoist@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz#eaa11c964563aea9c21becef2bdf7853f7f3c148"
 
-babel-plugin-lodash@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.2.tgz#da3a5b49ba27447f54463f6c4fa81396ccdd463f"
+babel-plugin-lodash@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.3.tgz#d33436438dcc871f3481a3c3148e5b24e6b80676"
   dependencies:
-    babel-helper-module-imports "^7.0.0-beta.3"
-    babel-types "^6.26.0"
+    "@babel/helper-module-imports" "^7.0.0-beta.49"
+    "@babel/types" "^7.0.0-beta.49"
     glob "^7.1.1"
-    lodash "^4.17.4"
+    lodash "^4.17.10"
     require-package-name "^2.0.1"
 
 babel-plugin-syntax-async-functions@^6.8.0:
@@ -1290,14 +1310,6 @@ babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@7.0.0-beta.3:
-  version "7.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-7.0.0-beta.3.tgz#cd927ca70e0ae8ab05f4aab83778cfb3e6eb20b4"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
-
 babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
@@ -1693,9 +1705,11 @@ chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
-chrome-trace-event@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
+chrome-trace-event@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  dependencies:
+    tslib "^1.9.0"
 
 ci-info@^1.0.0:
   version "1.1.3"
@@ -2187,7 +2201,7 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.2, doctrine@^2.1.0:
+doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
@@ -2374,9 +2388,9 @@ eslint-module-utils@^2.2.0:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
-eslint-plugin-flowtype@^2.48.0:
-  version "2.48.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.48.0.tgz#e447dc27dcb99d68e2a705fd9c1046c32aae2ca1"
+eslint-plugin-flowtype@^2.49.3:
+  version "2.49.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.49.3.tgz#ccca6ee5ba2027eb3ed36bc2ec8c9a842feee841"
   dependencies:
     lodash "^4.17.10"
 
@@ -2415,14 +2429,14 @@ eslint-plugin-promise@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz#65ebf27a845e3c1e9d6f6a5622ddd3801694b621"
 
-eslint-plugin-react@^7.8.2:
-  version "7.8.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d"
+eslint-plugin-react@^7.9.1:
+  version "7.9.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.9.1.tgz#101aadd15e7c7b431ed025303ac7b421a8e3dc15"
   dependencies:
-    doctrine "^2.0.2"
-    has "^1.0.1"
+    doctrine "^2.1.0"
+    has "^1.0.2"
     jsx-ast-utils "^2.0.1"
-    prop-types "^15.6.0"
+    prop-types "^15.6.1"
 
 eslint-scope@^3.7.1, eslint-scope@~3.7.1:
   version "3.7.1"
@@ -2764,16 +2778,16 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
-flow-bin@^0.73.0:
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.73.0.tgz#da1b90a02b0ef9c439f068c2fc14968db83be425"
+flow-bin@^0.74.0:
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.74.0.tgz#8017bb00efb37cbe8d81fbb7f464038bde06adc9"
 
-flow-copy-source@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flow-copy-source/-/flow-copy-source-1.3.0.tgz#591b153f5c01e8fc566c64a97290ea9103b7f1ea"
+flow-copy-source@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/flow-copy-source/-/flow-copy-source-2.0.0.tgz#e0984a434fefb5995571d7a28cbff8c3cdda63fe"
   dependencies:
     chokidar "^2.0.0"
-    fs-extra "^5.0.0"
+    fs-extra "^6.0.1"
     glob "^7.0.0"
     kefir "^3.7.3"
     yargs "^11.0.0"
@@ -2856,6 +2870,14 @@ fs-extra@^5.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -3133,6 +3155,12 @@ has@^1.0.1:
   dependencies:
     function-bind "^1.0.2"
 
+has@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  dependencies:
+    function-bind "^1.1.1"
+
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
@@ -5169,7 +5197,11 @@ prettier-eslint@^8.8.1:
     typescript "^2.5.1"
     typescript-eslint-parser "^11.0.0"
 
-prettier@^1.13.3, prettier@^1.7.0:
+prettier@^1.13.5:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.5.tgz#7ae2076998c8edce79d63834e9b7b09fead6bfd0"
+
+prettier@^1.7.0:
   version "1.13.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.3.tgz#e74c09a7df6519d472ca6febaa37cf7addb48a20"
 
@@ -5217,7 +5249,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.6.0:
+prop-types@^15.6.0, prop-types@^15.6.1:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
@@ -5698,9 +5730,9 @@ rollup-pluginutils@^2.0.1:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.59.4:
-  version "0.59.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.59.4.tgz#6f80f7017c22667ff1bf3e62adf8624a44cc44aa"
+rollup@^0.60.1:
+  version "0.60.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.60.1.tgz#07cb66153f1541d5f7e82b8393b405c31647dae9"
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"
@@ -6286,6 +6318,10 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+tslib@^1.9.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -6621,9 +6657,9 @@ webpack-log@^1.0.1, webpack-log@^1.1.1, webpack-log@^1.1.2:
     loglevelnext "^1.0.1"
     uuid "^3.1.0"
 
-webpack-serve@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/webpack-serve/-/webpack-serve-1.0.2.tgz#cd7f040cac63300e8fff79f1d45aa2f3e5825492"
+webpack-serve@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/webpack-serve/-/webpack-serve-1.0.4.tgz#d1c83955926969ba195e5032f978da92ef07829c"
   dependencies:
     "@shellscape/koa-static" "^4.0.4"
     "@webpack-contrib/config-loader" "^1.1.1"
@@ -6657,19 +6693,20 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.10.2:
-  version "4.10.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.10.2.tgz#d6a4cc3e2fa748f96ca62a70f91eaaa939ef3858"
+webpack@^4.12.0:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.12.0.tgz#14758e035ae69747f68dd0edf3c5a572a82bdee9"
   dependencies:
-    "@webassemblyjs/ast" "1.5.9"
-    "@webassemblyjs/wasm-edit" "1.5.9"
-    "@webassemblyjs/wasm-opt" "1.5.9"
-    "@webassemblyjs/wasm-parser" "1.5.9"
-    acorn "^5.0.0"
+    "@webassemblyjs/ast" "1.5.12"
+    "@webassemblyjs/helper-module-context" "1.5.12"
+    "@webassemblyjs/wasm-edit" "1.5.12"
+    "@webassemblyjs/wasm-opt" "1.5.12"
+    "@webassemblyjs/wasm-parser" "1.5.12"
+    acorn "^5.6.2"
     acorn-dynamic-import "^3.0.0"
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
-    chrome-trace-event "^0.1.1"
+    chrome-trace-event "^1.0.0"
     enhanced-resolve "^4.0.0"
     eslint-scope "^3.7.1"
     json-parse-better-errors "^1.0.2"