Merge pull request #3 from ffrgb/develop

merge upstream
2018-08-06 22:27:57 +02:00 · 2018-08-06 22:27:57 +02:00 · 5d1d72d95d
commit 5d1d72d95d
parent 3c72e12c3a 8bf3498744
34 changed files with 334 additions and 342 deletions
--- a/.bithoundrc
+++ b/.bithoundrc
@ -1,26 +0,0 @@
-{
-  "dependencies": {
-    "mute": [
-    ],
-    "unused-ignores": [
-      "almond",
-      "d3-*",
-      "leaflet",
-      "moment",
-      "navigo",
-      "node-polyglot",
-      "promise-polyfill",
-      "rbush",
-      "requirejs",
-      "snabbdom"
-    ]
-  },
-  "critics": {
-    "wc": {
-      "limit": 5000
-    }
-  },
-  "ignore": [
-    "polyfill.js"
-  ]
-}
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,3 +1,9 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
 <!--- Provide a general summary of the issue in the Title above -->
 <!--- This template should help to improve the report, unneeded parts can be remvoed -->

@ -13,7 +19,7 @@
 <!--- Not obligatory, but suggest a fix/reason for the bug, -->
 <!--- or ideas how to implement the addition or change -->

-## Steps to Reproduce (for bugs)
+## Steps to Reproduce
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
 <!--- reproduce this bug. Include code to reproduce, if relevant -->
 1.
@ -31,3 +37,6 @@
 * Browser Name and version:
 * Operating System and version (desktop or mobile):
 * Link to your project:
+
+## Screenshots
+<!--- If applicable, add screenshots to help explain your problem. -->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!--- Provide a general summary of the issue in the Title above -->
+<!--- This template should help to improve the report, unneeded parts can be remvoed -->
+
+## Is your feature request related to a problem? Please describe.
+<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+## Describe the solution you'd like
+<!--- A clear and concise description of what you want to happen. -->
+
+## Describe alternatives you've considered
+<!--- A clear and concise description of any alternative solutions or features you've considered. -->
+
+## Additional context
+<!--- Add any other context or screenshots about the feature request here. -->
--- a/.travis.yml
+++ b/.travis.yml
@ -4,12 +4,11 @@ dist: trusty
 language: node_js

 node_js:
-  - "9"
+  - "10"

 os:
  - linux
-  - macosx
-  - windows
+  - osx

 matrix:
  include:
--- a/assets/faviconData.json
+++ b/assets/faviconData.json
@ -1 +1 @@
-{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/browserconfig.xml","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/favicon.ico","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/site.webmanifest"],"html_code":"<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"./apple-touch-icon.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"./favicon-32x32.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"./favicon-16x16.png\">\n<link rel=\"manifest\" href=\"./site.webmanifest\">\n<link rel=\"mask-icon\" href=\"./safari-pinned-tab.svg\" color=\"#dc0067\">\n<link rel=\"shortcut icon\" href=\"./favicon.ico\">\n<meta name=\"apple-mobile-web-app-title\" content=\"Meshviewer\">\n<meta name=\"application-name\" content=\"Meshviewer\">\n<meta name=\"msapplication-TileColor\" content=\"#dc0067\">\n<meta name=\"msapplication-TileImage\" content=\"./mstile-144x144.png\">\n<meta name=\"msapplication-config\" content=\"./browserconfig.xml\">\n<meta name=\"theme-color\" content=\"#dc0067\">","compression":"true","overlapping_markups":["link[rel=\"apple-touch-icon\"]","meta[name=\"apple-mobile-web-app-title\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","meta[name=\"msapplication-config\"]","meta[name=\"application-name\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]","link[rel=\"mask-icon\"]"]},"files_location":{"type":"path","path":"."},"preview_picture_url":"https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/favicon_preview.png","version":"0.16"}
+{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/browserconfig.xml","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/favicon.ico","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/package_files/site.webmanifest"],"html_code":"<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"./apple-touch-icon.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"./favicon-32x32.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"./favicon-16x16.png\">\n<link rel=\"manifest\" href=\"./site.webmanifest\">\n<link rel=\"mask-icon\" href=\"./safari-pinned-tab.svg\" color=\"#dc0067\">\n<link rel=\"shortcut icon\" href=\"./favicon.ico\">\n<meta name=\"apple-mobile-web-app-title\" content=\"<!-- inject:title --><!-- endinject -->\">\n<meta name=\"application-name\" content=\"<!-- inject:title --><!-- endinject -->\">\n<meta name=\"msapplication-TileColor\" content=\"#dc0067\">\n<meta name=\"msapplication-TileImage\" content=\"./mstile-144x144.png\">\n<meta name=\"msapplication-config\" content=\"./browserconfig.xml\">\n<meta name=\"theme-color\" content=\"#dc0067\">","compression":"true","overlapping_markups":["link[rel=\"apple-touch-icon\"]","meta[name=\"apple-mobile-web-app-title\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","meta[name=\"msapplication-config\"]","meta[name=\"application-name\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]","link[rel=\"mask-icon\"]"]},"files_location":{"type":"path","path":"."},"preview_picture_url":"https://realfavicongenerator.net/files/ed9ef5a59ae048602fb9a5b74436696e43a575ce/favicon_preview.png","version":"0.16"}
--- a/assets/icons/fonts/icon.ttf
+++ b/assets/icons/fonts/icon.ttf
--- a/assets/icons/fonts/icon.woff
+++ b/assets/icons/fonts/icon.woff
--- a/assets/icons/fonts/icon.woff2
+++ b/assets/icons/fonts/icon.woff2
--- a/assets/icons/fonts/meshviewer.ttf
+++ b/assets/icons/fonts/meshviewer.ttf
--- a/assets/icons/fonts/meshviewer.woff
+++ b/assets/icons/fonts/meshviewer.woff
--- a/assets/icons/fonts/meshviewer.woff2
+++ b/assets/icons/fonts/meshviewer.woff2
--- a/assets/icons/icon.scss
+++ b/assets/icons/icon.scss
@ -7,9 +7,9 @@ $cache-breaker: unique-id();
  font-family: 'ionicons';
  font-style: normal;
  font-weight: normal;
-  src: url('fonts/icon.woff2?rel=#{$cache-breaker}') format('woff2'),
-  url('fonts/icon.woff?rel=#{$cache-breaker}') format('woff'),
-  url('fonts/icon.ttf?rel=#{$cache-breaker}') format('truetype');
+  src: url('fonts/meshviewer.woff2?rel=#{$cache-breaker}') format('woff2'),
+  url('fonts/meshviewer.woff?rel=#{$cache-breaker}') format('woff'),
+  url('fonts/meshviewer.ttf?rel=#{$cache-breaker}') format('truetype');
 }

 [class^='ion-'],
@ -49,3 +49,5 @@ $cache-breaker: unique-id();
@include icon('arrow-resize', '\f264');
@include icon('arrow-left-c', '\f108');
@include icon('arrow-right-c', '\f10b');
+@include icon('full-enter', '\e901');
+@include icon('full-exit', '\e900');
--- a/config.default.js
+++ b/config.default.js
@ -6,6 +6,8 @@ module.exports = function () {
    'nodeZoom': 18,
    'labelZoom': 13,
    'clientZoom': 15,
+    'fullscreen': true,
+    'fullscreenFrame': true,
    'nodeAttr': [
      // value can be a node attribute (1 depth) or a a function in utils/node with prefix show
      {
--- a/gulp/config.js
+++ b/gulp/config.js
@ -13,6 +13,7 @@ module.exports = function () {
    clean: [build + '/*.map', build + '/vendor', build + '/main.css'],
    autoprefixer: ['> 1% in DE'],
    browsersync: {
+      open: false,
      server: {
        baseDir: build
      },
--- a/gulp/tasks/html.js
+++ b/gulp/tasks/html.js
@ -20,7 +20,10 @@ var stringify = function (obj) {
 module.exports = function (gulp, plugins, config, env) {
  return function html() {
    return gulp.src(env.production() ? config.build + '/*.html' : 'html/*.html')
+      .pipe(env.production(plugins.kyhInlineSource({ compress: false })))
+      .pipe(plugins.realFavicon.injectFaviconMarkups(JSON.parse(fs.readFileSync(config.faviconData)).favicon.html_code))
      .pipe(plugins.inject(gulp.src(['config.js']), {
+        removeTags: true,
        starttag: '<!-- inject:config -->',
        transform: function () {
          delete require.cache[require.resolve('../../config.default')];
@ -34,8 +37,16 @@ module.exports = function (gulp, plugins, config, env) {
            ';</script>';
        }
      }))
-      .pipe(env.production(plugins.kyhInlineSource({ compress: false })))
-      .pipe(plugins.realFavicon.injectFaviconMarkups(JSON.parse(fs.readFileSync(config.faviconData)).favicon.html_code))
+      .pipe(plugins.inject(gulp.src(['config.js']), {
+        removeTags: true,
+        starttag: '<!-- inject:title -->',
+        transform: function () {
+          delete require.cache[require.resolve('../../config.default')];
+          delete require.cache[require.resolve('../../config')];
+          var buildConfig = Object.assign({}, require('../../config.default')(), require('../../config')());
+          return buildConfig.siteName;
+        }
+      }))
      .pipe(plugins.cacheBust({
        type: 'timestamp'
      }))
--- a/html/index.html
+++ b/html/index.html
@ -5,8 +5,8 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
  <!--<meta name="image" content="https://regensburg.freifunk.net/meshviewer/apple-touch-icon.png">-->

-  <meta itemprop="name" content="Freifunk Meshviewer">
-  <meta name="description" itemprop="description" content="Freifunk Knotenkarte - Zeigt alle Knoten, Statistiken und Verbindungen auf Karte oder Topologie">
+  <meta itemprop="name" content="<!-- inject:title --><!-- endinject --> Meshviewer">
+  <meta name="description" itemprop="description" content="<!-- inject:title --><!-- endinject --> Knotenkarte - Zeigt alle Knoten, Statistiken und Verbindungen auf Karte oder Topologie">
  <!--Uncomment & adjust local urls-->
  <!--<meta itemprop="image" content="https://regensburg.freifunk.net/meshviewer/android-chrome-512x512.png">-->

@ -17,11 +17,11 @@
  <meta name="twitter:card" content="summary">
  <meta name="twitter:site" content="@freifunk">

-  <meta name="og:title" content="Freifunk Meshviewer">
-  <meta name="og:description" content="Freifunk Knotenkarte - Zeigt alle Knoten, Statistiken und Verbindungen auf Karte oder Topologie">
+  <meta name="og:title" content="<!-- inject:title --><!-- endinject -->">
+  <meta name="og:description" content="<!-- inject:title --><!-- endinject --> Knotenkarte - Zeigt alle Knoten, Statistiken und Verbindungen auf Karte oder Topologie">
  <!--<meta name="og:image" content="https://regensburg.freifunk.net/meshviewer/android-chrome-512x512.png">-->
  <!--<meta name="og:url" content="https://regensburg.freifunk.net/meshviewer/">-->
-  <meta name="og:site_name" content="Freifunk Meshviewer">
+  <meta name="og:site_name" content="<!-- inject:title --><!-- endinject -->">
  <meta name="og:type" content="website">

  <link rel="stylesheet" href="main.css" inline>
--- a/html/offline.html
+++ b/html/offline.html
@ -2,7 +2,7 @@
 <html>
 <head>
  <meta charset="utf-8">
-  <title>Freifunk Regensburg e.V. - Meshviewer</title>
+  <title><!-- inject:title --><!-- endinject --></title>
  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
  <link rel="stylesheet" href="main.css" inline>
 </head>
--- a/lib/datadistributor.js
+++ b/lib/datadistributor.js
@ -97,8 +97,7 @@ define(['filters/nodefilter'], function (NodeFilter) {
      setData: setData,
      addFilter: addFilter,
      removeFilter: removeFilter,
-      watchFilters: watchFilters,
-      refresh: refresh
+      watchFilters: watchFilters
    };
  };
 });
--- a/lib/gui.js
+++ b/lib/gui.js
@ -1,10 +1,10 @@
 define(['d3-interpolate', 'map', 'sidebar', 'tabs', 'container', 'legend',
  'linklist', 'nodelist', 'simplenodelist', 'infobox/main',
  'proportions', 'forcegraph', 'title', 'about', 'datadistributor',
-  'filters/filtergui', 'filters/hostname'],
+  'filters/filtergui', 'filters/hostname', 'helper'],
 function (d3Interpolate, Map, Sidebar, Tabs, Container, Legend, Linklist,
  Nodelist, SimpleNodelist, Infobox, Proportions, ForceGraph,
-  Title, About, DataDistributor, FilterGUI, HostnameFilter) {
+  Title, About, DataDistributor, FilterGUI, HostnameFilter, helper) {
  'use strict';

  return function (language) {
@ -77,6 +77,17 @@ function (d3Interpolate, Map, Sidebar, Tabs, Container, Legend, Linklist,

    buttons.appendChild(buttonToggle);

+    if (config.fullscreen || config.fullscreenFrame && window.frameElement) {
+      var buttonFullscreen = document.createElement('button');
+      buttonFullscreen.classList.add('ion-full-enter');
+      buttonFullscreen.setAttribute('aria-label', _.t('button.fullscreen'));
+      buttonFullscreen.onclick = function onclick() {
+        helper.fullscreen(buttonFullscreen);
+      };
+
+      buttons.appendChild(buttonFullscreen);
+    }
+
    var title = new Title();

    var header = new Container('header');
--- a/lib/infobox/node.js
+++ b/lib/infobox/node.js
@ -1,5 +1,5 @@
-define(['sorttable', 'snabbdom', 'd3-interpolate', 'moment', 'helper', 'utils/node'],
-  function (SortTable, V, d3Interpolate, moment, helper, nodef) {
+define(['sorttable', 'snabbdom', 'd3-interpolate', 'helper', 'utils/node'],
+  function (SortTable, V, d3Interpolate, helper, nodef) {
    'use strict';
    V = V.default;

--- a/lib/main.js
+++ b/lib/main.js
@ -20,8 +20,7 @@ define(['moment', 'utils/router', 'leaflet', 'gui', 'helper', 'utils/language'],
          node.lastseen = moment.utc(node.lastseen).local();
        });

-        var now = moment();
-        var age = moment(now).subtract(config.maxAge, 'days');
+        var age = moment().subtract(config.maxAge, 'days');

        var online = nodes.filter(function (d) {
          return d.is_online;
@ -58,7 +57,7 @@ define(['moment', 'utils/router', 'leaflet', 'gui', 'helper', 'utils/language'],
        });

        return {
-          now: now,
+          now: moment(),
          timestamp: moment.utc(timestamp).local(),
          nodes: {
            all: nodes,
--- a/lib/map.js
+++ b/lib/map.js
@ -27,8 +27,7 @@ define(['map/clientlayer', 'map/labellayer', 'map/button', 'leaflet', 'map/activ
        document.querySelector('.leaflet-control-layers').classList.add('leaflet-control-layers-expanded');
      }

-      function setActiveArea() {
-        setTimeout(function () {
+      function mapActiveArea() {
        map.setActiveArea({
          position: 'absolute',
          left: sidebar.getWidth() + 'px',
@ -36,20 +35,17 @@ define(['map/clientlayer', 'map/labellayer', 'map/button', 'leaflet', 'map/activ
          top: 0,
          bottom: 0
        });
-        }, 300);
+      }
+
+      function setActiveArea() {
+        setTimeout(mapActiveArea, 300);
      }

      var el = document.createElement('div');
      el.classList.add('map');

      map = L.map(el, options);
-      map.setActiveArea({
-        position: 'absolute',
-        left: sidebar.getWidth() + 'px',
-        right: 0,
-        top: 0,
-        bottom: 0
-      });
+      mapActiveArea();

      var now = new Date();
      config.mapLayers.forEach(function (item, i) {
@ -84,6 +80,12 @@ define(['map/clientlayer', 'map/labellayer', 'map/button', 'leaflet', 'map/activ
      map.on('dragend', saveView);
      map.on('contextmenu', contextMenuOpenLayerMenu);

+      if (config.geo) {
+        [].forEach.call(config.geo, function (geo) {
+          L.geoJSON(geo.json, geo.option).addTo(map);
+        });
+      }
+
      button.init();

      layerControl = L.control.layers(baseLayers, [], { position: 'bottomright' });
--- a/lib/map/labellayer.js
+++ b/lib/map/labellayer.js
@ -87,7 +87,7 @@ define(['leaflet', 'rbush', 'helper', 'moment'],
        m.on('click', function () {
          router.fullUrl({ node: d.node_id });
        });
-        m.bindTooltip(d.hostname);
+        m.bindTooltip(helper.escape(d.hostname));

        dict[d.node_id] = m;

@ -114,7 +114,7 @@ define(['leaflet', 'rbush', 'helper', 'moment'],
          line.setStyle(opts);
        };

-        line.bindTooltip(d.source.hostname + ' – ' + d.target.hostname +
+        line.bindTooltip(helper.escape(d.source.hostname + ' – ' + d.target.hostname) +
          '<br><strong>' + helper.showDistance(d) + ' / ' + helper.showTq(d.source_tq) + ' - ' + helper.showTq(d.target_tq) + '<br>' + d.type + '</strong>');

        line.on('click', function () {
--- a/lib/proportions.js
+++ b/lib/proportions.js
@ -60,7 +60,7 @@ define(['d3-interpolate', 'snabbdom', 'utils/version', 'filters/genericnode', 'h

          var filter = new Filter(_.t(name), d[2], d[0], d[3]);

-          var a = V.h('a', { props: { href: '#' }, on: { click: addFilter(filter) } }, d[0]);
+          var a = V.h('a', { on: { click: addFilter(filter) } }, d[0]);

          var th = V.h('th', a);
          var td = V.h('td', V.h('span', {
--- a/lib/utils/helper.js
+++ b/lib/utils/helper.js
@ -176,5 +176,31 @@ define({
      }
    }
    ctx.fill();
+  },
+  fullscreen: function fullscreen(btn) {
+    if (!document.fullscreenElement && !document.webkitFullscreenElement && !document.mozFullScreenElement) {
+      var fel = document.firstElementChild;
+      var func = fel.requestFullscreen
+        || fel.webkitRequestFullScreen
+        || fel.mozRequestFullScreen;
+      func.call(fel);
+      btn.classList.remove('ion-full-enter');
+      btn.classList.add('ion-full-exit');
+    } else {
+      func = document.exitFullscreen
+        || document.webkitExitFullscreen
+        || document.mozCancelFullScreen;
+      if (func) {
+        func.call(document);
+        btn.classList.remove('ion-full-exit');
+        btn.classList.add('ion-full-enter');
+      }
+    }
+  },
+  escape: function escape(string) {
+    return string.replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&#34;')
+      .replace(/'/g, '&#39;');
  }
 });
--- a/lib/utils/language.js
+++ b/lib/utils/language.js
@ -21,13 +21,8 @@ define(['polyglot', 'moment', 'helper'], function (Polyglot, moment, helper) {
      router.fullUrl({ lang: event.target.value }, false, true);
    }

-    function setLocale(lang) {
-      localStorage.setItem('language', getLocale(lang));
-      location.reload();
-    }
-
    function getLocale(input) {
-      var language = input || localStorage.getItem('language') || navigator.languages && navigator.languages[0] || navigator.language || navigator.userLanguage;
+      var language = input || navigator.languages && navigator.languages[0] || navigator.language;
      var locale = config.supportedLocale[0];
      config.supportedLocale.some(function (item) {
        if (language.indexOf(item) !== -1) {
@ -69,7 +64,6 @@ define(['polyglot', 'moment', 'helper'], function (Polyglot, moment, helper) {
    return {
      init: init,
      getLocale: getLocale,
-      setLocale: setLocale,
      languageSelect: languageSelect
    };
  };
--- a/lib/utils/router.js
+++ b/lib/utils/router.js
@ -54,7 +54,7 @@ define(['Navigo'], function (Navigo) {
      };

      if (lang && lang !== state.lang && lang === language.getLocale(lang)) {
-        language.setLocale(lang);
+        location.reload();
      }

      if (!init || viewValue && viewValue !== state.view) {
@ -82,10 +82,10 @@ define(['Navigo'], function (Navigo) {
      }
    }

-    var router = new Navigo(null, true);
+    var router = new Navigo(null, true, '#!');

    router
-      .on(/^\/?#?\/([\w]{2})?\/?(map|graph)?\/?([a-f\d]{12})?([a-f\d\-]{25})?\/?(?:(\d+)\/(-?[\d.]+)\/(-?[\d.]+))?$/, customRoute)
+      .on(/^\/?#?!?\/([\w]{2})?\/?(map|graph)?\/?([a-f\d]{12})?([a-f\d\-]{25})?\/?(?:(\d+)\/(-?[\d.]+)\/(-?[\d.]+))?$/, customRoute)
      .on({
        '*': function () {
          router.fullUrl();
@ -93,7 +93,7 @@ define(['Navigo'], function (Navigo) {
      });

    router.generateLink = function generateLink(data, full, deep) {
-      var result = '#';
+      var result = '#!';

      if (full) {
        data = Object.assign({}, state, data);
@ -119,7 +119,7 @@ define(['Navigo'], function (Navigo) {
    };

    router.getLang = function getLang() {
-      var lang = location.hash.match(/^\/?#\/([\w]{2})\//);
+      var lang = location.hash.match(/^\/?#!?\/([\w]{2})\//);
      if (lang) {
        state.lang = language.getLocale(lang[1]);
        return lang[1];
--- a/lib/utils/version.js
+++ b/lib/utils/version.js
@ -50,10 +50,7 @@ define(function () {
    var ca = a.split('');
    var cb = b.split('');
    var diff = this.findIndex(ca, function (c, index) {
-      if (cb[index] && c === cb[index]) {
-        return false;
-      }
-      return true;
+      return !(cb[index] && c === cb[index]);
    });
    if (diff === -1) {
      if (cb.length > ca.length) {
--- a/locale/de.json
+++ b/locale/de.json
@ -59,7 +59,8 @@
  "button": {
    "switchView": "Ansicht wechseln",
    "location": "Koordinaten wählen",
-    "tracking": "Lokalisierung"
+    "tracking": "Lokalisierung",
+    "fullscreen": "Vollbildmodus wechseln"
  },
  "momentjs": {
    "calendar": {
--- a/locale/en.json
+++ b/locale/en.json
@ -59,7 +59,8 @@
  "button": {
    "switchView": "Switch view",
    "location": "Pick coordinates",
-    "tracking": "Localisation"
+    "tracking": "Localisation",
+    "fullscreen": "Toggle fullscreen"
  },
  "momentjs": {
    "calendar": {
--- a/package.json
+++ b/package.json
@ -10,9 +10,9 @@
    "url": "https://github.com/ffrgb/meshviewer/issues"
  },
  "devDependencies": {
-    "babel-eslint": "^8.2.5",
+    "babel-eslint": "^8.2.6",
    "browser-sync": "^2.24.5",
-    "eslint": "^5.0.0",
+    "eslint": "^5.1.0",
    "eslint-config-airbnb-es5": "^1.2.0",
    "eslint-config-defaults": "^9.0.0",
    "eslint-plugin-react": "^7.10.0",
@ -21,7 +21,7 @@
    "gulp-cache-bust": "^1.3.0",
    "gulp-cli": "^2.0.1",
    "gulp-environments": "^0.1.2",
-    "gulp-eslint": "^4.0.2",
+    "gulp-eslint": "^5.0.0",
    "gulp-htmlmin": "^4.0.0",
    "gulp-inject": "^4.3.2",
    "gulp-jsonminify": "^1.1.0",
@ -48,10 +48,10 @@
    "d3-force": "^1.1.0",
    "d3-selection": "^1.3.0",
    "d3-zoom": "^1.7.1",
-    "leaflet": "^1.3.1",
+    "leaflet": "^1.3.3",
    "moment": "^2.22.2",
    "navigo": "^7.1.2",
-    "node-polyglot": "^2.2.2",
+    "node-polyglot": "2.2.2",
    "promise-polyfill": "^8.0.0",
    "rbush": "^2.0.2",
    "requirejs": "^2.3.5",
--- a/scss/modules/_proportion.scss
+++ b/scss/modules/_proportion.scss
@ -22,4 +22,8 @@
    min-width: 1.5em;
    padding: .25em .5em;
  }
+
+  a {
+    cursor: pointer;
+  }
 }
--- a/scss/night.scss
+++ b/scss/night.scss
@ -2,13 +2,17 @@
@import 'modules/variables';
@import 'custom/variables';

-$color-white: #111;
+$color-white: #1c1c13;
 $color-black: #fefefe;
 $color-map-background: #0d151c;

+$color-online: lighten($color-online, 25%);
+
 html {
  //@import 'modules/base';
-  body {
+  body,
+  textarea,
+  input {
    background: $color-white;
    color: lighten($color-black, 100);
  }
@ -18,6 +22,15 @@ html {
    border-bottom-color: lighten($color-white, 10%);
  }

+  a {
+    color: $color-online;
+    text-decoration: none;
+
+    &:focus {
+      color: darken($color-online, 15%);
+    }
+  }
+
  //@import 'modules/leaflet';
  .leaflet-container {
    background: $color-map-background;
--- a/yarn.lock
+++ b/yarn.lock
@ -79,13 +79,13 @@
    to-fast-properties "^2.0.0"

 "@gulp-sourcemaps/identity-map@1.X":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz#cfa23bc5840f9104ce32a65e74db7e7a974bbee1"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz#1e6fe5d8027b1f285dc0d31762f566bccd73d5a9"
  dependencies:
    acorn "^5.0.3"
    css "^2.2.1"
    normalize-path "^2.1.1"
-    source-map "^0.5.6"
+    source-map "^0.6.0"
    through2 "^2.0.3"

 "@gulp-sourcemaps/map-sources@1.X":
@ -134,10 +134,6 @@ ajv-keywords@^1.0.0:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"

-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
 ajv-keywords@^3.0.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
@ -149,7 +145,7 @@ ajv@^4.7.0, ajv@^4.9.1:
    co "^4.6.0"
    json-stable-stringify "^1.0.1"

-ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.1.0:
  version "5.5.2"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
  dependencies:
@ -159,8 +155,8 @@ ajv@^5.2.3, ajv@^5.3.0:
    json-schema-traverse "^0.3.0"

 ajv@^6.0.1, ajv@^6.5.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.1.tgz#88ebc1263c7133937d108b80c5572e64e1d9322d"
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
  dependencies:
    fast-deep-equal "^2.0.1"
    fast-json-stable-stringify "^2.0.0"
@ -448,21 +444,25 @@ atob@^2.1.1:
  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"

 autoprefixer@^8.0.0:
-  version "8.6.3"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.3.tgz#1d38a129e6a4582a565b6570d16f2d7d3de9cbf9"
+  version "8.6.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.5.tgz#343f3d193ed568b3208e00117a1b96eb691d4ee9"
  dependencies:
    browserslist "^3.2.8"
-    caniuse-lite "^1.0.30000856"
+    caniuse-lite "^1.0.30000864"
    normalize-range "^0.1.2"
    num2fraction "^1.2.2"
-    postcss "^6.0.22"
+    postcss "^6.0.23"
    postcss-value-parser "^3.2.3"

 aws-sign2@~0.6.0:
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"

-aws4@^1.2.1:
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.2.1, aws4@^1.6.0:
  version "1.7.0"
  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"

@ -473,7 +473,7 @@ axios@0.17.1:
    follow-redirects "^1.2.5"
    is-buffer "^1.1.5"

-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
  version "6.26.0"
  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
  dependencies:
@ -481,15 +481,15 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
    esutils "^2.0.2"
    js-tokens "^3.0.2"

-babel-eslint@^8.2.5:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.5.tgz#dc2331c259d36782aa189da510c43dedd5adc7a3"
+babel-eslint@^8.2.6:
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
  dependencies:
    "@babel/code-frame" "7.0.0-beta.44"
    "@babel/traverse" "7.0.0-beta.44"
    "@babel/types" "7.0.0-beta.44"
    babylon "7.0.0-beta.44"
-    eslint-scope "~3.7.1"
+    eslint-scope "3.7.1"
    eslint-visitor-keys "^1.0.0"

 babylon@7.0.0-beta.44:
@ -543,8 +543,8 @@ batch@0.6.1:
  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"

 bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
  dependencies:
    tweetnacl "^0.14.3"

@ -756,13 +756,9 @@ camelcase@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"

-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000856:
-  version "1.0.30000858"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000858.tgz#f6f203a9128bac507136de1cf6cfd966d2df027c"
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864:
+  version "1.0.30000865"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz#70026616e8afe6e1442f8bb4e1092987d81a2f25"

 caseless@~0.12.0:
  version "0.12.0"
@ -974,13 +970,17 @@ colors@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"

-combined-stream@^1.0.5, combined-stream@~1.0.5:
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
  dependencies:
    delayed-stream "~1.0.0"

-commander@2.15.x, commander@^2.2.0, commander@^2.8.1, commander@^2.9.0, commander@~2.15.0:
+commander@2.16.x, commander@^2.2.0, commander@^2.8.1, commander@~2.16.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
+
+commander@~2.15.0:
  version "2.15.1"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"

@ -1056,14 +1056,6 @@ cross-spawn@^3.0.0:
    lru-cache "^4.0.1"
    which "^1.2.9"

-cross-spawn@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^6.0.5:
  version "6.0.5"
  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@ -1475,8 +1467,8 @@ ee-first@1.1.1:
  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

 electron-to-chromium@^1.3.47:
-  version "1.3.50"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz#7438b76f92b41b919f3fbdd350fbd0757dacddf7"
+  version "1.3.52"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.52.tgz#d2d9f1270ba4a3b967b831c40ef71fb4d9ab5ce0"

 encodeurl@~1.0.1, encodeurl@~1.0.2:
  version "1.0.2"
@ -1662,7 +1654,7 @@ eslint-plugin-react@^7.10.0:
    jsx-ast-utils "^2.0.1"
    prop-types "^15.6.2"

-eslint-scope@^3.7.1, eslint-scope@~3.7.1:
+eslint-scope@3.7.1:
  version "3.7.1"
  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
  dependencies:
@ -1676,6 +1668,10 @@ eslint-scope@^4.0.0:
    esrecurse "^4.1.0"
    estraverse "^4.1.1"

+eslint-utils@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+
 eslint-visitor-keys@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
@ -1718,52 +1714,9 @@ eslint@^2.7.0:
    text-table "~0.2.0"
    user-home "^2.0.0"

-eslint@^4.0.0:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    regexpp "^1.0.1"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
-eslint@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.0.0.tgz#3576704f7377aca072da69c00862277c5fe57153"
+eslint@^5.0.1, eslint@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.1.0.tgz#2ed611f1ce163c0fb99e1e0cda5af8f662dff645"
  dependencies:
    ajv "^6.5.0"
    babel-code-frame "^6.26.0"
@ -1772,6 +1725,7 @@ eslint@^5.0.0:
    debug "^3.1.0"
    doctrine "^2.1.0"
    eslint-scope "^4.0.0"
+    eslint-utils "^1.3.1"
    eslint-visitor-keys "^1.0.0"
    espree "^4.0.0"
    esquery "^1.0.1"
@ -1779,7 +1733,7 @@ eslint@^5.0.0:
    file-entry-cache "^2.0.0"
    functional-red-black-tree "^1.0.1"
    glob "^7.1.2"
-    globals "^11.5.0"
+    globals "^11.7.0"
    ignore "^3.3.3"
    imurmurhash "^0.1.4"
    inquirer "^5.2.0"
@ -1804,7 +1758,7 @@ eslint@^5.0.0:
    table "^4.0.3"
    text-table "^0.2.0"

-espree@^3.1.6, espree@^3.5.4:
+espree@^3.1.6:
  version "3.5.4"
  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
  dependencies:
@ -1823,10 +1777,10 @@ esprima@^2.6.0:
  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"

 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"

-esquery@^1.0.0, esquery@^1.0.1:
+esquery@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
  dependencies:
@ -1932,11 +1886,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
    assign-symbols "^1.0.0"
    is-extendable "^1.0.1"

-extend@^3.0.0, extend@~3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"

-external-editor@^2.0.4, external-editor@^2.1.0:
+external-editor@^2.1.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
  dependencies:
@ -2113,8 +2067,8 @@ flush-write-stream@^1.0.2:
    readable-stream "^2.0.4"

 follow-redirects@^1.2.5:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.0.tgz#234f49cf770b7f35b40e790f636ceba0c3a0ab77"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.1.tgz#67a8f14f5a1f67f962c2c46469c79eaec0a90291"
  dependencies:
    debug "^3.1.0"

@ -2160,6 +2114,14 @@ form-data@~2.1.1:
    combined-stream "^1.0.5"
    mime-types "^2.1.12"

+form-data@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
 fragment-cache@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@ -2272,8 +2234,8 @@ generate-object-property@^1.1.0:
    is-property "^1.0.0"

 get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"

 get-stdin@^4.0.1:
  version "4.0.1"
@ -2388,7 +2350,7 @@ global-prefix@^1.0.1:
    is-windows "^1.0.1"
    which "^1.2.14"

-globals@^11.0.1, globals@^11.1.0, globals@^11.5.0:
+globals@^11.1.0, globals@^11.7.0:
  version "11.7.0"
  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"

@ -2503,13 +2465,13 @@ gulp-environments@^0.1.2:
    gulp-if "^2.0.1"
    yargs "^5.0.0"

-gulp-eslint@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-4.0.2.tgz#18a2a6768e4404cbf3e203239cb57474168fa606"
+gulp-eslint@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-5.0.0.tgz#2a2684095f774b2cf79310262078c56cc7a12b52"
  dependencies:
-    eslint "^4.0.0"
+    eslint "^5.0.1"
    fancy-log "^1.3.2"
-    plugin-error "^1.0.0"
+    plugin-error "^1.0.1"

 gulp-htmlmin@^4.0.0:
  version "4.0.0"
@ -2691,14 +2653,9 @@ har-schema@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"

-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"

 har-validator@~4.2.1:
  version "4.2.1"
@ -2707,6 +2664,13 @@ har-validator@~4.2.1:
    ajv "^4.9.1"
    har-schema "^1.0.5"

+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
 has-ansi@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@ -2798,20 +2762,20 @@ homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
    parse-passwd "^1.0.0"

 hosted-git-info@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"

 html-minifier@^3.0.3:
-  version "3.5.16"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.16.tgz#39f5aabaf78bdfc057fe67334226efd7f3851175"
+  version "3.5.19"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.19.tgz#ed53c4b7326fe507bc3a1adbcc3bbb56660a2ebd"
  dependencies:
    camel-case "3.0.x"
    clean-css "4.1.x"
-    commander "2.15.x"
+    commander "2.16.x"
    he "1.1.x"
    param-case "2.1.x"
    relateurl "0.2.x"
-    uglify-js "3.3.x"
+    uglify-js "3.4.x"

 htmlparser2@3.9.x, htmlparser2@^3.9.1:
  version "3.9.2"
@ -2858,6 +2822,14 @@ http-signature@~1.1.0:
    jsprim "^1.2.2"
    sshpk "^1.7.0"

+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 iconv-lite@0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.4:
  version "0.4.23"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@ -2940,25 +2912,6 @@ inquirer@^0.12.0:
    strip-ansi "^3.0.0"
    through "^2.3.6"

-inquirer@^3.0.6:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
@ -3031,8 +2984,8 @@ is-builtin-module@^1.0.0:
    builtin-modules "^1.0.0"

 is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"

 is-data-descriptor@^0.1.4:
  version "0.1.4"
@ -3126,7 +3079,7 @@ is-my-ip-valid@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"

-is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
+is-my-json-valid@^2.10.0:
  version "2.17.2"
  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
  dependencies:
@ -3162,12 +3115,6 @@ is-number@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"

-is-odd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
-  dependencies:
-    is-number "^4.0.0"
-
 is-path-cwd@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@ -3287,14 +3234,18 @@ isstream@~0.1.2:
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"

 js-base64@^2.1.8:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92"
+  version "2.4.8"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.8.tgz#57a9b130888f956834aa40c5b165ba59c758f033"

 js-tokens@^3.0.0, js-tokens@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"

-js-yaml@^3.11.0, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.9.1:
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+
+js-yaml@^3.11.0, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4:
  version "3.12.0"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
  dependencies:
@ -3432,9 +3383,9 @@ lead@^1.0.0:
  dependencies:
    flush-write-stream "^1.0.2"

-leaflet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e"
+leaflet@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.3.tgz#5c8f2fd50e4a41ead93ab850dcd9e058811da9b9"

 levn@^0.3.0, levn@~0.3.0:
  version "0.3.0"
@ -3643,10 +3594,10 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5,
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"

 loose-envify@^1.0.0, loose-envify@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
  dependencies:
-    js-tokens "^3.0.0"
+    js-tokens "^3.0.0 || ^4.0.0"

 loud-rejection@^1.0.0:
  version "1.6.0"
@ -3821,15 +3772,15 @@ micromatch@^3.0.4:
    snapdragon "^0.8.1"
    to-regex "^3.0.2"

-mime-db@~1.33.0:
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+mime-db@~1.35.0:
+  version "1.35.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"

 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  version "2.1.19"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
  dependencies:
-    mime-db "~1.33.0"
+    mime-db "~1.35.0"

 mime@1.4.1:
  version "1.4.1"
@ -3918,15 +3869,14 @@ nan@^2.10.0, nan@^2.9.2:
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"

 nanomatch@^1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
  dependencies:
    arr-diff "^4.0.0"
    array-unique "^0.3.2"
    define-property "^2.0.2"
    extend-shallow "^3.0.2"
    fragment-cache "^0.2.1"
-    is-odd "^2.0.0"
    is-windows "^1.0.2"
    kind-of "^6.0.2"
    object.pick "^1.3.0"
@ -3946,7 +3896,7 @@ navigo@^7.1.2:
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/navigo/-/navigo-7.1.2.tgz#f543098ae5cbc5763b926742b5047ffb68a187e2"

-needle@^2.2.0:
+needle@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
  dependencies:
@ -3989,7 +3939,7 @@ node-gyp@^3.3.1:
    tar "^2.0.0"
    which "1"

-node-polyglot@^2.2.2:
+node-polyglot@2.2.2:
  version "2.2.2"
  resolved "https://registry.yarnpkg.com/node-polyglot/-/node-polyglot-2.2.2.tgz#1a3f76d7392f836ea0823836ede817e6ea6ec26c"
  dependencies:
@ -3999,12 +3949,12 @@ node-polyglot@^2.2.2:
    warning "^3.0.0"

 node-pre-gyp@^0.10.0:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz#e8945c20ef6795a20aac2b44f036eb13cf5146e3"
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
  dependencies:
    detect-libc "^1.0.2"
    mkdirp "^0.5.1"
-    needle "^2.2.0"
+    needle "^2.2.1"
    nopt "^4.0.1"
    npm-packlist "^1.1.6"
    npmlog "^4.0.2"
@ -4021,8 +3971,8 @@ node-rest-client@^1.4.1:
    xml2js ">=0.2.4"

 node-sass@^4.8.3:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52"
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.2.tgz#5e63fe6bd0f2ae3ac9d6c14ede8620e2b8bdb437"
  dependencies:
    async-foreach "^0.1.3"
    chalk "^1.1.1"
@ -4039,7 +3989,7 @@ node-sass@^4.8.3:
    nan "^2.10.0"
    node-gyp "^3.3.1"
    npmlog "^4.0.0"
-    request "~2.79.0"
+    request "2.87.0"
    sass-graph "^2.2.4"
    stdout-stream "^1.4.0"
    "true-case-path" "^1.0.2"
@ -4116,7 +4066,7 @@ number-is-nan@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"

-oauth-sign@~0.8.1:
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
  version "0.8.2"
  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

@ -4381,6 +4331,10 @@ performance-now@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"

+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
 pify@^2.0.0, pify@^2.2.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@ -4405,7 +4359,7 @@ plugin-error@^0.1.2:
    arr-union "^2.0.1"
    extend-shallow "^1.1.2"

-plugin-error@^1.0.0, plugin-error@^1.0.1:
+plugin-error@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
  dependencies:
@ -4437,7 +4391,7 @@ postcss-value-parser@^3.2.3:
  version "3.3.0"
  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"

-postcss@^6.0.1, postcss@^6.0.22:
+postcss@^6.0.1, postcss@^6.0.23:
  version "6.0.23"
  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
  dependencies:
@ -4528,14 +4482,14 @@ qs@6.2.3:
  version "6.2.3"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"

-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-
 qs@~6.4.0:
  version "6.4.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"

+qs@~6.5.1:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+
 quickselect@^1.0.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"
@ -4690,7 +4644,7 @@ regexp.prototype.flags@^1.2.0:
  dependencies:
    define-properties "^1.1.2"

-regexpp@^1.0.1, regexpp@^1.1.0:
+regexpp@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"

@ -4747,6 +4701,31 @@ replace-homedir@^1.0.0:
    is-absolute "^1.0.0"
    remove-trailing-separator "^1.1.0"

+request@2.87.0:
+  version "2.87.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 "request@>=2.9.0 <2.82.0":
  version "2.81.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@ -4774,31 +4753,6 @@ replace-homedir@^1.0.0:
    tunnel-agent "^0.6.0"
    uuid "^3.0.0"

-request@~2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 require-directory@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@ -4909,16 +4863,6 @@ run-async@^2.2.0:
  dependencies:
    is-promise "^2.1.0"

-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-
 rx-lite@^3.1.2:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
@ -4933,7 +4877,7 @@ rxjs@^5.5.2:
  dependencies:
    symbol-observable "1.0.1"

-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"

@ -5247,7 +5191,7 @@ source-map@^0.4.2:
  dependencies:
    amdefine ">=0.0.4"

-source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"

@ -5490,17 +5434,6 @@ symbol-observable@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"

-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
-
 table@^3.7.8:
  version "3.8.3"
  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@ -5666,7 +5599,7 @@ to-through@^2.0.0:
  dependencies:
    through2 "^2.0.3"

-tough-cookie@~2.3.0:
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
  version "2.3.4"
  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
  dependencies:
@ -5700,10 +5633,6 @@ tunnel-agent@^0.6.0:
  dependencies:
    safe-buffer "^5.0.1"

-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@ -5729,11 +5658,11 @@ uglify-js@3.3.x:
    commander "~2.15.0"
    source-map "~0.6.1"

-uglify-js@^3.0.5:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.1.tgz#006da540dc25e9319d106a99a5ef1d24ae04ce60"
+uglify-js@3.4.x, uglify-js@^3.0.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.5.tgz#650889c0766cf0f6fd5346cea09cd212f544be69"
  dependencies:
-    commander "~2.15.0"
+    commander "~2.16.0"
    source-map "~0.6.1"

 ultron@~1.1.0:
@ -5832,10 +5761,8 @@ urix@^0.1.0:
  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"

 use@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
-  dependencies:
-    kind-of "^6.0.2"
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"

 user-home@^2.0.0:
  version "2.0.0"
@ -5861,9 +5788,9 @@ uuid@^2.0.1:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"

-uuid@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+uuid@^3.0.0, uuid@^3.1.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"

 v8flags@^3.0.1:
  version "3.1.1"