replace file-loader with babel-plugin-inline-react-svg

fixes #299
2024-12-29 05:10:05 +02:00 · 2017-03-01 18:57:50 +00:00 · 2017-03-01 18:57:50 +00:00 · 62bd05ffb8
commit 62bd05ffb8
parent 3b1e116453
13 changed files with 361 additions and 365 deletions
--- a/frontend/.babelrc
+++ b/frontend/.babelrc
@ -11,6 +11,9 @@
    }]
  ],
  "plugins": [
+    ["inline-react-svg", {
+      "ignorePattern": "assets/fonts"
+    }],
    "transform-class-properties",
    ["transform-object-rest-spread", {
      "useBuiltIns": true
--- a/frontend/package.json
+++ b/frontend/package.json
@ -22,7 +22,6 @@
  "dependencies": {
    "@tomgco/joyent-portal-ui": "alpha",
    "constant-case": "^2.0.0",
-    "css-loader": "^0.26.1",
    "force-array": "^3.1.0",
    "hapi": "^16.1.0",
    "inert": "^4.1.0",
@ -45,18 +44,15 @@
    "react-select": "^1.0.0-rc.3",
    "reduce-reducers": "^0.1.2",
    "redux": "^3.6.0",
-    "redux-actions": "^1.2.1",
+    "redux-actions": "^1.2.2",
    "redux-batched-actions": "^0.1.5",
    "redux-form": "^6.5.0",
    "redux-logger": "^2.8.1",
    "redux-promise-middleware": "^4.2.0",
    "redux-thunk": "^2.2.0",
-    "require-hacker": "^2.1.4",
    "reselect": "^2.5.4",
-    "style-loader": "^0.13.1",
-    "styled-components": "^1.4.3",
-    "understood": "^1.0.1",
-    "url-loader": "^0.5.7"
+    "styled-components": "^1.4.4",
+    "understood": "^1.0.1"
  },
  "devDependencies": {
    "ava": "^0.18.2",
@ -76,25 +72,26 @@
    "babel-plugin-transform-react-jsx-source": "^6.22.0",
    "babel-plugin-transform-runtime": "^6.23.0",
    "babel-plugin-webpack-alias": "^2.1.2",
-    "babel-plugin-webpack-loaders": "^0.8.0",
-    "babel-preset-env": "^1.1.8",
+    "babel-plugin-webpack-loaders": "^0.9.0",
+    "babel-preset-env": "^1.1.10",
    "babel-preset-react": "^6.23.0",
    "babel-register": "^6.23.0",
    "case-sensitive-paths-webpack-plugin": "^1.1.4",
+    "css-loader": "^0.26.2",
    "enzyme": "^2.7.1",
    "eslint": "^3.16.1",
-    "eslint-config-react-app": "^0.5.1",
+    "eslint-config-react-app": "^0.5.2",
    "eslint-config-semistandard": "^7.0.0",
-    "eslint-config-standard": "^6.2.1",
+    "eslint-config-standard": "^7.0.0",
    "eslint-loader": "^1.6.3",
-    "eslint-plugin-babel": "^4.0.1",
+    "eslint-plugin-babel": "^4.1.0",
    "eslint-plugin-flowtype": "^2.30.0",
    "eslint-plugin-import": "^2.2.0",
    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-promise": "^3.4.2",
+    "eslint-plugin-promise": "^3.5.0",
    "eslint-plugin-react": "^6.10.0",
    "eslint-plugin-standard": "^2.0.1",
-    "file-loader": "^0.10.0",
+    "file-loader": "^0.10.1",
    "jsdom": "^9.11.0",
    "json-loader": "^0.5.4",
    "ncp": "^2.0.0",
@ -102,15 +99,17 @@
    "nyc": "^10.1.2",
    "pre-commit": "^1.2.2",
    "react-addons-test-utils": "^15.4.2",
-    "react-dev-utils": "^0.5.0",
+    "react-dev-utils": "^0.5.1",
    "redux-ava": "^2.2.0",
+    "require-hacker": "^2.1.4",
    "simple-mock": "^0.7.3",
    "stylelint": "^7.9.0",
    "stylelint-config-standard": "^16.0.0",
    "stylelint-processor-styled-components": "^0.0.4",
+    "style-loader": "^0.13.2",
    "tap-xunit": "^1.7.0",
    "thenify": "^3.2.1",
-    "url-loader": "^0.5.7",
+    "url-loader": "^0.5.8",
    "webpack": "^2.2.1",
    "webpack-dev-server": "^2.4.1",
    "webpack-manifest-plugin": "^1.1.0",
--- a/frontend/src/components/header/index.js
+++ b/frontend/src/components/header/index.js
@ -5,7 +5,7 @@ import styled from 'styled-components';
 import Column from '@ui/components/column';
 import Avatar from '@ui/components/avatar';
 import { remcalc } from '@ui/shared/functions';
-import logo from '@resources/logo.svg';
+import Logo from '../../resources/logo.svg';
 import PropTypes from '@root/prop-types';
 import Row from '@ui/components/row';
 import Tooltip from '@ui/components/tooltip';
@ -21,7 +21,7 @@ const StyledHeader = styled.header`
  padding: 0 ${remcalc(18)};
 `;

-const StyledLogo = styled.img`
+const StyledLogo = styled(Logo)`
  padding-top: ${remcalc(12)};
 `;

@ -76,14 +76,12 @@ const arrowPosition = {
  right: '10%'
 };

-const Header = (props) => {
-
-  const {
-    account,
-    handleToggle,
-    tooltip
-  } = props;
-
+const Header = ({
+  account,
+  handleToggle,
+  tooltip,
+  ...props
+}) => {
  const handleToggleClick = (ev) => {
    ev.preventDefault();
    handleToggle(!tooltip);
@ -115,11 +113,12 @@ const Header = (props) => {
      name='application-header'
      onBlur={handleHideToggle}
      onFocus={handleHideToggle}
+      {...props}
    >
      <Row>
        <Column lg={10} xs={8}>
          <Link to='/'>
-            <StyledLogo alt='Joyent' src={logo} />
+            <StyledLogo />
          </Link>
        </Column>
        <Column lg={2} xs={4}>
--- a/frontend/src/resources/logo.svg
+++ b/frontend/src/resources/logo.svg
@ -1,2 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="nav" xmlns="http://www.w3.org/2000/svg" width="133.5" height="36" viewBox="0 0 106.78 29.01"><defs><style>.cls-1{fill:#464646;fill-rule:evenodd;}</style></defs><title>logo</title><path class="cls-1" d="M112.32,36.78a5.3,5.3,0,0,0,3.31,1.32c2.1,0,2.65-1.27,2.65-2.94V20.54h2.28V32.46c0,1,0,2.16-.06,3.2C120.38,38.43,119,40,115.72,40a6.43,6.43,0,0,1-4.55-1.64ZM134,32.61c0-3.46-1-5.88-3.8-5.88s-4,2.3-4,5.42c0,2.85.58,6.22,3.86,6.22C132.77,38.37,134,35.75,134,32.61ZM130.32,25c2,0,5.91.63,5.91,7.14,0,5.62-2.79,8-6.39,8s-5.91-2.48-5.91-7.66C123.93,26.47,127.47,25,130.32,25ZM150,39.12V25.38h-2.19V34a3.23,3.23,0,0,1-3.51,3.37c-3.05,0-3.25-1.67-3.25-3.86V25.38h-2.25v8.7c0,3.28,1.59,4.47,4,4.72-1.41.92-3.17,2.59-3.17,4.93s1.41,3.63,4.35,3.63a5.24,5.24,0,0,0,5.62-4.26A18.85,18.85,0,0,0,150,39.12Zm-5.76,6.51c2.62,0,3.54-2.28,3.54-5.41V37.7c-3.46,1.44-6,3-6,5.73C141.84,44.85,142.68,45.63,144.26,45.63ZM159.3,25c-4.38,0-6.68,3.51-6.68,7.78s1.9,7.35,6.4,7.35a7.47,7.47,0,0,0,4.7-1.64L162.85,37a5.92,5.92,0,0,1-3.69,1.33c-3.05,0-4.21-2.48-4.32-4.84,0.23,0,.46,0,0.75,0,2.79,0,7.92-.69,7.92-5C163.51,26.41,162,25,159.3,25Zm-0.11,1.67c-3.08,0-4.26,2.91-4.35,5.19,0.17,0,.35,0,0.58,0,2,0,6-.46,6-3.05A2.06,2.06,0,0,0,159.19,26.64Zm9.53,13V30.3a3.84,3.84,0,0,1,3.89-3.54c2.42,0,2.88,1.73,2.88,3.86v9.07h2.25V29.93c0-3.28-1.61-5-4.58-5a5.48,5.48,0,0,0-4.64,2.48l-0.26-2.07h-1.93l0.14,2.16V39.69h2.25Zm12.33-20v16.1c0,2.1.12,4.32,3.95,4.32a6.09,6.09,0,0,0,3.26-1l-0.66-1.5a4.19,4.19,0,0,1-2.19.69c-1.35,0-2.1-.6-2.1-2.51V27.31h4.09V25.38H183.3v-5.7h-2.25ZM97.58,41.21A11.43,11.43,0,1,0,86.15,29.78,11.43,11.43,0,0,0,97.58,41.21Zm-2-17.55A0.43,0.43,0,0,1,96,23.22h3.21a0.43,0.43,0,0,1,.43.43v4.09h4.09a0.43,0.43,0,0,1,.43.43v3.21a0.43,0.43,0,0,1-.43.43H99.62V35.9a0.43,0.43,0,0,1-.43.43H96a0.43,0.43,0,0,1-.43-0.43V31.81H91.46A0.43,0.43,0,0,1,91,31.38V28.17a0.43,0.43,0,0,1,.43-0.43h4.09V23.65ZM190,21a1.46,1.46,0,1,0,1.46-1.45A1.45,1.45,0,0,0,190,21Zm0.26,0a1.2,1.2,0,1,1,1.2,1.25A1.2,1.2,0,0,1,190.27,21Zm0.63,0.85h0.26V21.11h0.28l0.46,0.73h0.28l-0.49-.75a0.44,0.44,0,0,0,.45-0.46,0.48,0.48,0,0,0-.59-0.49h-0.66v1.7Zm0.26-1.48h0.35c0.18,0,.37,0,0.37.26s-0.21.28-.45,0.28h-0.28V20.36Z" transform="translate(-86.15 -18.34)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" id="nav" width="133.5" height="36" viewBox="0 0 106.78 29.01">
+    <title>logo</title>
+    <path fill="#464646" fill-rule="evenodd" d="M112.32,36.78a5.3,5.3,0,0,0,3.31,1.32c2.1,0,2.65-1.27,2.65-2.94V20.54h2.28V32.46c0,1,0,2.16-.06,3.2C120.38,38.43,119,40,115.72,40a6.43,6.43,0,0,1-4.55-1.64ZM134,32.61c0-3.46-1-5.88-3.8-5.88s-4,2.3-4,5.42c0,2.85.58,6.22,3.86,6.22C132.77,38.37,134,35.75,134,32.61ZM130.32,25c2,0,5.91.63,5.91,7.14,0,5.62-2.79,8-6.39,8s-5.91-2.48-5.91-7.66C123.93,26.47,127.47,25,130.32,25ZM150,39.12V25.38h-2.19V34a3.23,3.23,0,0,1-3.51,3.37c-3.05,0-3.25-1.67-3.25-3.86V25.38h-2.25v8.7c0,3.28,1.59,4.47,4,4.72-1.41.92-3.17,2.59-3.17,4.93s1.41,3.63,4.35,3.63a5.24,5.24,0,0,0,5.62-4.26A18.85,18.85,0,0,0,150,39.12Zm-5.76,6.51c2.62,0,3.54-2.28,3.54-5.41V37.7c-3.46,1.44-6,3-6,5.73C141.84,44.85,142.68,45.63,144.26,45.63ZM159.3,25c-4.38,0-6.68,3.51-6.68,7.78s1.9,7.35,6.4,7.35a7.47,7.47,0,0,0,4.7-1.64L162.85,37a5.92,5.92,0,0,1-3.69,1.33c-3.05,0-4.21-2.48-4.32-4.84,0.23,0,.46,0,0.75,0,2.79,0,7.92-.69,7.92-5C163.51,26.41,162,25,159.3,25Zm-0.11,1.67c-3.08,0-4.26,2.91-4.35,5.19,0.17,0,.35,0,0.58,0,2,0,6-.46,6-3.05A2.06,2.06,0,0,0,159.19,26.64Zm9.53,13V30.3a3.84,3.84,0,0,1,3.89-3.54c2.42,0,2.88,1.73,2.88,3.86v9.07h2.25V29.93c0-3.28-1.61-5-4.58-5a5.48,5.48,0,0,0-4.64,2.48l-0.26-2.07h-1.93l0.14,2.16V39.69h2.25Zm12.33-20v16.1c0,2.1.12,4.32,3.95,4.32a6.09,6.09,0,0,0,3.26-1l-0.66-1.5a4.19,4.19,0,0,1-2.19.69c-1.35,0-2.1-.6-2.1-2.51V27.31h4.09V25.38H183.3v-5.7h-2.25ZM97.58,41.21A11.43,11.43,0,1,0,86.15,29.78,11.43,11.43,0,0,0,97.58,41.21Zm-2-17.55A0.43,0.43,0,0,1,96,23.22h3.21a0.43,0.43,0,0,1,.43.43v4.09h4.09a0.43,0.43,0,0,1,.43.43v3.21a0.43,0.43,0,0,1-.43.43H99.62V35.9a0.43,0.43,0,0,1-.43.43H96a0.43,0.43,0,0,1-.43-0.43V31.81H91.46A0.43,0.43,0,0,1,91,31.38V28.17a0.43,0.43,0,0,1,.43-0.43h4.09V23.65ZM190,21a1.46,1.46,0,1,0,1.46-1.45A1.45,1.45,0,0,0,190,21Zm0.26,0a1.2,1.2,0,1,1,1.2,1.25A1.2,1.2,0,0,1,190.27,21Zm0.63,0.85h0.26V21.11h0.28l0.46,0.73h0.28l-0.49-.75a0.44,0.44,0,0,0,.45-0.46,0.48,0.48,0,0,0-.59-0.49h-0.66v1.7Zm0.26-1.48h0.35c0.18,0,.37,0,0.37.26s-0.21.28-.45,0.28h-0.28V20.36Z" transform="translate(-86.15 -18.34)"/>
+</svg>
--- a/frontend/webpack/base.js
+++ b/frontend/webpack/base.js
@ -69,23 +69,10 @@ module.exports = {
        FRONTEND,
        UI
      ],
-    }, {
-      test: /\.svg/,
-      loader: 'file-loader',
-      exclude: [
-        /node_modules/,
-        path.join(UI, 'assets', 'fonts')
-      ],
-      include: [
-        FRONTEND,
-        UI
-      ]
    }, {
      test: /\.(eot|svg|ttf|woff|woff2)$/,
      loader: 'file-loader',
-      include: [
-        path.join(UI, 'assets', 'fonts')
-      ]
+      include: path.join(UI, 'assets', 'fonts')
    }, {
      test: /\.css$/,
      loader: 'style-loader!css-loader'
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@ -33,8 +33,8 @@
    esutils "^2.0.2"

 "@tomgco/joyent-portal-ui@alpha":
-  version "0.0.1-842"
-  resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-842.tgz#ecbc0476412b9c4884527e7b47a4a1b27061d097"
+  version "0.0.1-893"
+  resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-893.tgz#f727080f54162bbb8495dbea6046c6a0b9b88267"
  dependencies:
    build-array "^1.0.0"
    camel-case "^3.0.0"
@ -56,7 +56,7 @@
    react "^15.4.2"
    react-broadcast "^0.1.2"
    react-dom "^15.4.2"
-    react-redux "^5.0.2"
+    react-redux "^5.0.3"
    react-router-dom "4.0.0-beta.4"
    react-select "^1.0.0-rc.3"
    reduce-css-calc "^1.3.0"
@ -93,8 +93,8 @@ accepts@~1.3.3:
    negotiator "0.6.1"

 acorn-dynamic-import@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
  dependencies:
    acorn "^4.0.3"

@ -346,11 +346,11 @@ auto-bind@^1.1.0:
  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-1.1.0.tgz#93b864dc7ee01a326281775d5c75ca0a751e5961"

 autoprefixer@^6.0.0, autoprefixer@^6.3.1:
-  version "6.7.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.5.tgz#50848f39dc08730091d9495023487e7cc21f518d"
+  version "6.7.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.6.tgz#00f05656c7ef73de9d2fd9b4668f6ef6905a855a"
  dependencies:
    browserslist "^1.7.5"
-    caniuse-db "^1.0.30000624"
+    caniuse-db "^1.0.30000628"
    normalize-range "^0.1.2"
    num2fraction "^1.2.2"
    postcss "^5.2.15"
@ -1085,9 +1085,9 @@ babel-plugin-webpack-alias@^2.1.2:
    lodash.some "^4.5.1"
    lodash.template "^4.3.0"

-babel-plugin-webpack-loaders@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-webpack-loaders/-/babel-plugin-webpack-loaders-0.8.0.tgz#1ec5255e2c9de8d5226c58a099890d935a876065"
+babel-plugin-webpack-loaders@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-webpack-loaders/-/babel-plugin-webpack-loaders-0.9.0.tgz#686ec1cab9db348958f990a95f57090f7e16b743"
  dependencies:
    babel-preset-es2015 "^6.3.13"
    babel-preset-stage-0 "^6.5.0"
@ -1108,9 +1108,9 @@ babel-polyfill@^6.23.0:
    core-js "^2.4.0"
    regenerator-runtime "^0.10.0"

-babel-preset-env@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.1.8.tgz#c46734c6233c3f87d177513773db3cf3c1758aaa"
+babel-preset-env@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.1.10.tgz#c1055b69d25c3cf5383a925ee5c553c323558368"
  dependencies:
    babel-plugin-check-es2015-constants "^6.3.13"
    babel-plugin-syntax-trailing-function-commas "^6.13.0"
@ -1140,6 +1140,8 @@ babel-preset-env@^1.1.8:
    babel-plugin-transform-exponentiation-operator "^6.8.0"
    babel-plugin-transform-regenerator "^6.6.0"
    browserslist "^1.4.0"
+    electron-to-chromium "^1.1.0"
+    invariant "^2.2.2"

 babel-preset-es2015@^6.3.13:
  version "6.22.0"
@ -1547,9 +1549,9 @@ caniuse-api@^1.5.2:
    lodash.memoize "^4.1.0"
    lodash.uniq "^4.3.0"

-caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000624:
-  version "1.0.30000626"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000626.tgz#44363dc86857efaf758fea9faef6a15ed93d8f33"
+caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000624, caniuse-db@^1.0.30000628:
+  version "1.0.30000631"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000631.tgz#8aa6f65cff452c4aba1c2aaa1e724102fbb9114f"

 capture-stack-trace@^1.0.0:
  version "1.0.0"
@ -2052,8 +2054,8 @@ cross-spawn@^4, cross-spawn@^4.0.0:
    which "^1.2.9"

 cross-spawn@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.0.1.tgz#a3bbb302db2297cbea3c04edf36941f4613aa399"
+  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"
@ -2104,14 +2106,14 @@ css-color-names@0.0.4:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"

-css-loader@^0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.1.tgz#2ba7f20131b93597496b3e9bb500785a49cd29ea"
+css-loader@^0.26.2:
+  version "0.26.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.2.tgz#a9cd4c2b1a559b45d8efc04fc311ab5d2aaccb9d"
  dependencies:
    babel-code-frame "^6.11.0"
    css-selector-tokenizer "^0.7.0"
    cssnano ">=2.6.1 <4"
-    loader-utils "~0.2.2"
+    loader-utils "^1.0.2"
    lodash.camelcase "^4.3.0"
    object-assign "^4.0.1"
    postcss "^5.0.6"
@ -2119,7 +2121,7 @@ css-loader@^0.26.1:
    postcss-modules-local-by-default "^1.0.1"
    postcss-modules-scope "^1.0.0"
    postcss-modules-values "^1.1.0"
-    source-list-map "^0.1.4"
+    source-list-map "^0.1.7"

 css-rule-stream@^1.1.0:
  version "1.1.0"
@ -2244,13 +2246,13 @@ d@^0.1.1, d@~0.1.1:
  dependencies:
    es5-ext "~0.10.2"

-d3-array@1, d3-array@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.0.2.tgz#174237bf356a852fadd6af87743d928631de7655"
+d3-array@1, d3-array@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.1.0.tgz#bfea66b89d46f9aedf77296d3aad6307b50771cc"

-d3-axis@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.4.tgz#bdfdcf5e859824062e0f17ad920f76236e72512c"
+d3-axis@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.5.tgz#865db17a7b54433e3b35c1d2b1a76bdb7c3d434d"

 d3-brush@1.0.3:
  version "1.0.3"
@ -2281,14 +2283,22 @@ d3-dispatch@1, d3-dispatch@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.2.tgz#5b511e79a46a1f89492841c0a8f656687d5daa0a"

-d3-drag@1, d3-drag@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.0.2.tgz#d634cc3f7689f99dd03fd7eb1af2945c0f4339ad"
+d3-drag@1, d3-drag@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.0.3.tgz#a016d21c696d130ba758babf1cd9e5f049169d0b"
  dependencies:
    d3-dispatch "1"
    d3-selection "1"

-d3-dsv@1, d3-dsv@1.0.3:
+d3-dsv@1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.4.tgz#2f491bcf00729d9ee6734f7cfb7049ddcc5e981d"
+  dependencies:
+    commander "2"
+    iconv-lite "0.4"
+    rw "1"
+
+d3-dsv@1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.3.tgz#049fe43c0f5f60c7ff7d376616bc76d6fc9d378f"
  dependencies:
@ -2300,22 +2310,22 @@ d3-ease@1, d3-ease@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.2.tgz#b486f8f3ca308ca7be38197d65622b6e30983377"

-d3-force@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.0.4.tgz#f84dcbb3200be41de7bc30fa71923143156758bf"
+d3-force@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.0.5.tgz#be8f65ac70688b8d26a9d9bc1e4699c1525f46b1"
  dependencies:
    d3-collection "1"
    d3-dispatch "1"
    d3-quadtree "1"
    d3-timer "1"

-d3-format@1, d3-format@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.0.2.tgz#138618320b4bbeb43b5c0ff30519079fbbd7375e"
+d3-format@1, d3-format@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.1.0.tgz#736775d5e6604421bef6c76d5746638a8e70d295"

-d3-geo@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.5.0.tgz#cf32c26f61cc5130382f74d40c4d3503dd226a1f"
+d3-geo@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.6.0.tgz#f72cbb7631e114654023a5907c5b87cf703c8aa9"
  dependencies:
    d3-array "1"

@ -2341,17 +2351,17 @@ d3-quadtree@1, d3-quadtree@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.2.tgz#e7e873af06aaa427eaa4af094cc4cbfb350b9e38"

-d3-queue@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.3.tgz#10ee4dd0574a1affaabfb931d0ba4f117926edc6"
+d3-queue@3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.4.tgz#6e549807c4b646e6768f0b2bdfdaaa6792f3d4a9"

 d3-random@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.0.2.tgz#83ff6a391206209c30565299e43c6549866db269"

-d3-request@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.3.tgz#63fc7dfd784607db0df5d535d7cb898fceba755a"
+d3-request@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.4.tgz#e04f559644f98639af24d75f8fcf99e3d27f1f53"
  dependencies:
    d3-collection "1"
    d3-dispatch "1"
@ -2370,25 +2380,25 @@ d3-scale@1.0.4:
    d3-time "1"
    d3-time-format "2"

-d3-selection@1, d3-selection@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.0.3.tgz#e63e51416172427854c1bcdfa066eb5fe872c108"
-
-d3-shape@1.0.4:
+d3-selection@1, d3-selection@1.0.4:
  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.0.4.tgz#145ee100ccbec42f8e3f1996cd05c786f79fe1c6"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.0.4.tgz#b862c7ae22436efe8459b7659ccdae84f09b43a3"
+
+d3-shape@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.0.5.tgz#2e1946fbd9cf468d9f8dc6d2e58d6c4278ae286a"
  dependencies:
    d3-path "1"

-d3-time-format@2, d3-time-format@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.3.tgz#3241569b74ddc9c42e0689c0e8a903579fd6280a"
+d3-time-format@2, d3-time-format@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.4.tgz#db0ab6910b3f2fc729a2ddfd2ac1b750962e1f72"
  dependencies:
    d3-time "1"

-d3-time@1, d3-time@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.4.tgz#2ceba09a76b7450c992a1ded4e10fc6195e69649"
+d3-time@1, d3-time@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.5.tgz#ef07a27d4b56522d984a41c27b1c67aa80b0cdd9"

 d3-timer@1, d3-timer@1.0.4:
  version "1.0.4"
@ -2409,9 +2419,9 @@ d3-voronoi@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.1.tgz#998544dca98ef0e89a6c40c0bac3510d1bc1b8b9"

-d3-zoom@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.1.1.tgz#d2362d8f7043c1fc5d96a438de69f4e02ef1e67b"
+d3-zoom@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.1.2.tgz#a8944947e92a12bc5d5a3fb4dccf1a40e7de5fb3"
  dependencies:
    d3-dispatch "1"
    d3-drag "1"
@ -2420,39 +2430,39 @@ d3-zoom@1.1.1:
    d3-transition "1"

 d3@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-4.6.0.tgz#af2f0ddd00f4cc9737b8b0a565608bf6b787eafc"
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-4.7.0.tgz#8a7d5004cb559f2f117706ce22d9a9d75119daa6"
  dependencies:
-    d3-array "1.0.2"
-    d3-axis "1.0.4"
+    d3-array "1.1.0"
+    d3-axis "1.0.5"
    d3-brush "1.0.3"
    d3-chord "1.0.3"
    d3-collection "1.0.2"
    d3-color "1.0.2"
    d3-dispatch "1.0.2"
-    d3-drag "1.0.2"
+    d3-drag "1.0.3"
    d3-dsv "1.0.3"
    d3-ease "1.0.2"
-    d3-force "1.0.4"
-    d3-format "1.0.2"
-    d3-geo "1.5.0"
+    d3-force "1.0.5"
+    d3-format "1.1.0"
+    d3-geo "1.6.0"
    d3-hierarchy "1.1.2"
    d3-interpolate "1.1.3"
    d3-path "1.0.3"
    d3-polygon "1.0.2"
    d3-quadtree "1.0.2"
-    d3-queue "3.0.3"
+    d3-queue "3.0.4"
    d3-random "1.0.2"
-    d3-request "1.0.3"
+    d3-request "1.0.4"
    d3-scale "1.0.4"
-    d3-selection "1.0.3"
-    d3-shape "1.0.4"
-    d3-time "1.0.4"
-    d3-time-format "2.0.3"
+    d3-selection "1.0.4"
+    d3-shape "1.0.5"
+    d3-time "1.0.5"
+    d3-time-format "2.0.4"
    d3-timer "1.0.4"
    d3-transition "1.0.3"
    d3-voronoi "1.1.1"
-    d3-zoom "1.1.1"
+    d3-zoom "1.1.2"

 damerau-levenshtein@^1.0.0:
  version "1.0.3"
@ -2680,9 +2690,9 @@ ee-first@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

-electron-to-chromium@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.3.tgz#4b4d04d237c301f72e2d15c2137b2b79f9f5ab76"
+electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.4.tgz#9751cbea89fa120bf88c226ba41eb8d0b6f1b597"

 elliptic@^6.0.0:
  version "6.4.0"
@ -2874,17 +2884,17 @@ escope@^3.6.0:
    esrecurse "^4.1.0"
    estraverse "^4.1.1"

-eslint-config-react-app@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-0.5.1.tgz#de05b6fc191e627c38240299ad038aecb8478e88"
+eslint-config-react-app@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-0.5.2.tgz#15c558d1365323e0a23ed2dda7fbd4c9ef65706c"

 eslint-config-semistandard@^7.0.0:
  version "7.0.0"
  resolved "https://registry.yarnpkg.com/eslint-config-semistandard/-/eslint-config-semistandard-7.0.0.tgz#f803493f56a5172f7f59c35ae648360b41f2ff71"

-eslint-config-standard@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz#d3a68aafc7191639e7ee441e7348739026354292"
+eslint-config-standard@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-7.0.0.tgz#4f161bc65695e4bc61331c55b9eeaca458cd99c6"

 eslint-import-resolver-node@^0.2.0:
  version "0.2.3"
@ -2910,9 +2920,9 @@ eslint-module-utils@^2.0.0:
    debug "2.2.0"
    pkg-dir "^1.0.0"

-eslint-plugin-babel@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.0.1.tgz#77de74dabd67a6bef3b16bf258f5804e971e7349"
+eslint-plugin-babel@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.0.tgz#837a74c092ad4d74f9fc74aed43f750906adc827"

 eslint-plugin-flowtype@^2.30.0:
  version "2.30.0"
@ -2946,9 +2956,9 @@ eslint-plugin-jsx-a11y@^4.0.0:
    jsx-ast-utils "^1.0.0"
    object-assign "^4.0.1"

-eslint-plugin-promise@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
+eslint-plugin-promise@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"

 eslint-plugin-react@^6.10.0:
  version "6.10.0"
@ -3228,11 +3238,11 @@ file-entry-cache@^2.0.0:
    flat-cache "^1.2.1"
    object-assign "^4.0.1"

-file-loader@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.0.tgz#bbe6db7474ac92c7f54fdc197cf547e98b6b8e12"
+file-loader@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842"
  dependencies:
-    loader-utils "~0.2.5"
+    loader-utils "^1.0.2"

 filename-regex@^2.0.0:
  version "2.0.0"
@ -3300,15 +3310,15 @@ fn-name@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"

-for-in@^0.1.5:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"

 for-own@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
  dependencies:
-    for-in "^0.1.5"
+    for-in "^1.0.1"

 force-array@^3.1.0:
  version "3.1.0"
@ -3460,8 +3470,8 @@ getpass@^0.1.1:
    assert-plus "^1.0.0"

 glamor@^2.20.12:
-  version "2.20.23"
-  resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.23.tgz#aa597b9b0e8835258d0655b19687dc4e772e6c49"
+  version "2.20.24"
+  resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.24.tgz#a299af2eec687322634ba38e4a0854d8743d2041"
  dependencies:
    babel-runtime "^6.18.0"
    fbjs "^0.8.8"
@ -4036,8 +4046,8 @@ is-glob@^3.1.0:
    is-extglob "^2.1.0"

 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
  dependencies:
    generate-function "^2.0.0"
    generate-object-property "^1.1.0"
@ -4533,7 +4543,7 @@ loader-runner@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"

-loader-utils@^0.2, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x:
+loader-utils@^0.2, loader-utils@^0.2.16:
  version "0.2.17"
  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
  dependencies:
@ -4722,8 +4732,8 @@ loud-rejection@^1.0.0, loud-rejection@^1.2.0:
    signal-exit "^3.0.0"

 lower-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.3.tgz#c92393d976793eee5ba4edb583cf8eae35bd9bfb"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"

 lowercase-keys@^1.0.0:
  version "1.0.0"
@ -4860,14 +4870,10 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
  dependencies:
    mime-db "~1.26.0"

-mime@^1.3.4, mime@1.3.4:
+mime@^1.3.4, mime@1.3.4, mime@1.3.x:
  version "1.3.4"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"

-mime@1.2.x:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
-
 mimic-fn@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@ -4949,8 +4955,8 @@ ncp@^2.0.0:
  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"

 nearley@^2.7.7:
-  version "2.7.13"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.13.tgz#ae19927cc821a4b517de91962db9ed0e90d991fa"
+  version "2.7.14"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.14.tgz#085f7b5d071de73926167bde8627c5b0190cde11"
  dependencies:
    nomnom "~1.6.2"
    railroad-diagrams "^1.0.0"
@ -5147,8 +5153,8 @@ object-assign@^4.0.1, object-assign@^4.1.0:
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

 object-hash@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.5.tgz#bdd844e030d0861b692ca175c6cab6868ec233d7"
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.6.tgz#826fd161372e826bd124a85b7e67710d14146f65"

 object-is@^1.0.1:
  version "1.0.1"
@ -5572,8 +5578,8 @@ postcss-discard-comments@^2.0.4:
    postcss "^5.0.14"

 postcss-discard-duplicates@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.0.2.tgz#02be520e91571ffb10738766a981d5770989bb32"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
  dependencies:
    postcss "^5.0.4"

@ -6013,9 +6019,9 @@ react-broadcast@^0.1.2:
  dependencies:
    invariant "^2.2.1"

-react-dev-utils@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.5.0.tgz#aedbf69cb1fbedb6f42350e4a988021f5cb4c493"
+react-dev-utils@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.5.1.tgz#0715b73b6fb7ef53604bc2c4da146847cc4d43c9"
  dependencies:
    ansi-html "0.0.5"
    chalk "1.1.3"
@ -6052,7 +6058,7 @@ react-intl@^2.2.3:
    intl-relativeformat "^1.3.0"
    invariant "^2.1.1"

-react-redux@^5.0.2, react-redux@^5.0.3:
+react-redux@^5.0.3:
  version "5.0.3"
  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.3.tgz#86c3b68d56e74294a42e2a740ab66117ef6c019f"
  dependencies:
@ -6226,9 +6232,9 @@ reduce-reducers@^0.1.0, reduce-reducers@^0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b"

-redux-actions@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-1.2.1.tgz#649711d88f49f1dde5bc5a1cea8ceec5b54d9181"
+redux-actions@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-1.2.2.tgz#31f15ba494fe130f05c4a9f486c99cc8725f80cd"
  dependencies:
    invariant "^2.2.1"
    lodash "^4.13.1"
@ -6437,8 +6443,8 @@ resolve-pathname@^2.0.0:
  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.0.2.tgz#e55c016eb2e9df1de98e85002282bfb38c630436"

 resolve@^1.1.6:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.1.tgz#5d0a1632609b6b00a22284293db1d5d973676314"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
  dependencies:
    path-parse "^1.0.5"

@ -6677,7 +6683,7 @@ sort-keys@^1.0.0, sort-keys@^1.1.1:
  dependencies:
    is-plain-obj "^1.0.0"

-source-list-map@^0.1.4, source-list-map@~0.1.7:
+source-list-map@^0.1.7, source-list-map@~0.1.7:
  version "0.1.8"
  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"

@ -6894,19 +6900,19 @@ strip-json-comments@~2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"

-style-loader@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9"
+style-loader@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.2.tgz#74533384cf698c7104c7951150b49717adc2f3bb"
  dependencies:
-    loader-utils "^0.2.7"
+    loader-utils "^1.0.2"

 style-search@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"

-styled-components@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.3.tgz#83fa44e553882aaa3ddc4363ccc435814d690706"
+styled-components@^1.4.3, styled-components@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.4.tgz#c944de423d8ae2363f2ba4ff8fc26d367e7dfa8f"
  dependencies:
    buffer "^5.0.2"
    css-to-react-native "^1.0.6"
@ -7269,8 +7275,8 @@ ua-parser-js@^0.7.9:
  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"

 uglify-js@^2.6, uglify-js@^2.7.5:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.4.tgz#5aeb6fd6f1f0a672dea63795016590502c290513"
  dependencies:
    async "~0.2.6"
    source-map "~0.5.1"
@ -7346,12 +7352,12 @@ upper-case@^1.1.1:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"

-url-loader@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.7.tgz#67e8779759f8000da74994906680c943a9b0925d"
+url-loader@^0.5.8:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
  dependencies:
-    loader-utils "0.2.x"
-    mime "1.2.x"
+    loader-utils "^1.0.2"
+    mime "1.3.x"

 url-parse-lax@^1.0.0:
  version "1.0.0"
--- a/ui/.babelrc
+++ b/ui/.babelrc
@ -12,6 +12,9 @@
    }]
  ],
  "plugins": [
+    ["inline-react-svg", {
+      "ignorePattern": "assets\\/fonts\\/.*?\\.svg"
+    }],
    "transform-class-properties",
    ["transform-object-rest-spread", {
      "useBuiltIns": true
--- a/ui/.storybook/.babelrc
+++ b/ui/.storybook/.babelrc
@ -11,7 +11,9 @@
    }]
  ],
  "plugins": [
-    "inline-react-svg",
+    ["inline-react-svg", {
+      "ignorePattern": "assets\\/fonts\\/.*?\\.svg"
+    }],
    "transform-es2015-modules-commonjs",
    "transform-class-properties",
    ["transform-object-rest-spread", {
--- a/ui/Makefile
+++ b/ui/Makefile
@ -42,7 +42,7 @@ install-production: compile
 compile: install
 	mkdir -p dist
 	cp -R src/. dist/.
-	$(bindir)/babel src --out-dir dist --source-maps inline --plugins=inline-react-svg
+	$(bindir)/babel src --out-dir dist --source-maps inline

 .PHONY: build
 build:
--- a/ui/package.json
+++ b/ui/package.json
@ -21,7 +21,7 @@
    "chart.js": "^2.5.0",
    "chartjs-chart-box-plot": "prerelease",
    "color": "^1.0.3",
-    "d3": "^4.6.0",
+    "d3": "^4.7.0",
    "lodash.find": "^4.6.0",
    "lodash.first": "^3.0.0",
    "lodash.flatten": "^4.4.0",
@ -41,8 +41,7 @@
    "react-select": "^1.0.0-rc.3",
    "reduce-css-calc": "^1.3.0",
    "redux-form": "^6.5.0",
-    "styled-components": "^1.4.3",
-    "svg-react-loader": "^0.3.7",
+    "styled-components": "^1.4.4",
    "transform-props-with": "^2.1.0",
    "traverse": "^0.6.6"
  },
@ -62,16 +61,16 @@
    "babel-plugin-transform-react-jsx-self": "^6.22.0",
    "babel-plugin-transform-react-jsx-source": "^6.22.0",
    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.1.8",
+    "babel-preset-env": "^1.1.10",
    "babel-preset-react": "^6.23.0",
    "dangerously-set-inner-html": "2.0.0",
    "enzyme": "^2.7.1",
    "eslint": "^3.16.1",
    "eslint-config-semistandard": "^7.0.0",
-    "eslint-config-standard": "^6.2.1",
-    "eslint-plugin-babel": "^4.0.1",
+    "eslint-config-standard": "^7.0.0",
+    "eslint-plugin-babel": "^4.1.0",
    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-promise": "^3.4.2",
+    "eslint-plugin-promise": "^3.5.0",
    "eslint-plugin-react": "^6.10.0",
    "eslint-plugin-standard": "^2.0.1",
    "jsdom": "^9.11.0",
--- a/ui/src/assets/icons/close.svg
+++ b/ui/src/assets/icons/close.svg
@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-    <title>icon: close</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="ui-components-revised" transform="translate(-3367.000000, -870.000000)" fill="#646464">
-            <g id="notifications" transform="translate(2457.000000, 72.000000)">
-                <g id="notification:-error" transform="translate(0.000000, 780.000000)">
-                    <path d="M916.899495,22.8994949 L916.899495,16.8994949 L914.899495,16.8994949 L914.899495,22.8994949 L908.899495,22.8994949 L908.899495,24.8994949 L914.899495,24.8994949 L914.899495,30.8994949 L916.899495,30.8994949 L916.899495,24.8994949 L922.899495,24.8994949 L922.899495,22.8994949 L916.899495,22.8994949 Z" id="icon:-close" transform="translate(915.899495, 23.899495) rotate(45.000000) translate(-915.899495, -23.899495) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" id="nav" width="133.5" height="36" viewBox="0 0 106.78 29.01">
+    <title>logo</title>
+    <path fill="#464646" fill-rule="evenodd" d="M112.32,36.78a5.3,5.3,0,0,0,3.31,1.32c2.1,0,2.65-1.27,2.65-2.94V20.54h2.28V32.46c0,1,0,2.16-.06,3.2C120.38,38.43,119,40,115.72,40a6.43,6.43,0,0,1-4.55-1.64ZM134,32.61c0-3.46-1-5.88-3.8-5.88s-4,2.3-4,5.42c0,2.85.58,6.22,3.86,6.22C132.77,38.37,134,35.75,134,32.61ZM130.32,25c2,0,5.91.63,5.91,7.14,0,5.62-2.79,8-6.39,8s-5.91-2.48-5.91-7.66C123.93,26.47,127.47,25,130.32,25ZM150,39.12V25.38h-2.19V34a3.23,3.23,0,0,1-3.51,3.37c-3.05,0-3.25-1.67-3.25-3.86V25.38h-2.25v8.7c0,3.28,1.59,4.47,4,4.72-1.41.92-3.17,2.59-3.17,4.93s1.41,3.63,4.35,3.63a5.24,5.24,0,0,0,5.62-4.26A18.85,18.85,0,0,0,150,39.12Zm-5.76,6.51c2.62,0,3.54-2.28,3.54-5.41V37.7c-3.46,1.44-6,3-6,5.73C141.84,44.85,142.68,45.63,144.26,45.63ZM159.3,25c-4.38,0-6.68,3.51-6.68,7.78s1.9,7.35,6.4,7.35a7.47,7.47,0,0,0,4.7-1.64L162.85,37a5.92,5.92,0,0,1-3.69,1.33c-3.05,0-4.21-2.48-4.32-4.84,0.23,0,.46,0,0.75,0,2.79,0,7.92-.69,7.92-5C163.51,26.41,162,25,159.3,25Zm-0.11,1.67c-3.08,0-4.26,2.91-4.35,5.19,0.17,0,.35,0,0.58,0,2,0,6-.46,6-3.05A2.06,2.06,0,0,0,159.19,26.64Zm9.53,13V30.3a3.84,3.84,0,0,1,3.89-3.54c2.42,0,2.88,1.73,2.88,3.86v9.07h2.25V29.93c0-3.28-1.61-5-4.58-5a5.48,5.48,0,0,0-4.64,2.48l-0.26-2.07h-1.93l0.14,2.16V39.69h2.25Zm12.33-20v16.1c0,2.1.12,4.32,3.95,4.32a6.09,6.09,0,0,0,3.26-1l-0.66-1.5a4.19,4.19,0,0,1-2.19.69c-1.35,0-2.1-.6-2.1-2.51V27.31h4.09V25.38H183.3v-5.7h-2.25ZM97.58,41.21A11.43,11.43,0,1,0,86.15,29.78,11.43,11.43,0,0,0,97.58,41.21Zm-2-17.55A0.43,0.43,0,0,1,96,23.22h3.21a0.43,0.43,0,0,1,.43.43v4.09h4.09a0.43,0.43,0,0,1,.43.43v3.21a0.43,0.43,0,0,1-.43.43H99.62V35.9a0.43,0.43,0,0,1-.43.43H96a0.43,0.43,0,0,1-.43-0.43V31.81H91.46A0.43,0.43,0,0,1,91,31.38V28.17a0.43,0.43,0,0,1,.43-0.43h4.09V23.65ZM190,21a1.46,1.46,0,1,0,1.46-1.45A1.45,1.45,0,0,0,190,21Zm0.26,0a1.2,1.2,0,1,1,1.2,1.25A1.2,1.2,0,0,1,190.27,21Zm0.63,0.85h0.26V21.11h0.28l0.46,0.73h0.28l-0.49-.75a0.44,0.44,0,0,0,.45-0.46,0.48,0.48,0,0,0-.59-0.49h-0.66v1.7Zm0.26-1.48h0.35c0.18,0,.37,0,0.37.26s-0.21.28-.45,0.28h-0.28V20.36Z" transform="translate(-86.15 -18.34)"/>
+</svg>
--- a/ui/src/components/close/index.js
+++ b/ui/src/components/close/index.js
@ -2,6 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { Baseline } from '../../shared/composers';
 import { remcalc } from '../../shared/functions';
+import CloseSVG from '../../assets/icons/close.svg';

 const StyledButton = styled.button`
  background: none;
@ -11,15 +12,20 @@ const StyledButton = styled.button`
  right: ${remcalc(16)};
 `;

-const Close = (props) => (
+const Close = ({
+  children,
+  ...props
+}) => (
  <StyledButton {...props}>
-    <img
-      alt='Close'
-      src='./close.svg'
-    />
+    <CloseSVG />
+    {children}
  </StyledButton>
 );

+Close.propTypes = {
+  children: React.PropTypes.node
+};
+
 export default Baseline(
  Close
 );
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@ -397,11 +397,11 @@ auto-bind@^1.1.0:
  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-1.1.0.tgz#93b864dc7ee01a326281775d5c75ca0a751e5961"

 autoprefixer@^6.0.0, autoprefixer@^6.3.1, autoprefixer@^6.3.7:
-  version "6.7.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.5.tgz#50848f39dc08730091d9495023487e7cc21f518d"
+  version "6.7.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.6.tgz#00f05656c7ef73de9d2fd9b4668f6ef6905a855a"
  dependencies:
    browserslist "^1.7.5"
-    caniuse-db "^1.0.30000624"
+    caniuse-db "^1.0.30000628"
    normalize-range "^0.1.2"
    num2fraction "^1.2.2"
    postcss "^5.2.15"
@ -1109,9 +1109,9 @@ babel-polyfill@^6.23.0:
    core-js "^2.4.0"
    regenerator-runtime "^0.10.0"

-babel-preset-env@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.1.8.tgz#c46734c6233c3f87d177513773db3cf3c1758aaa"
+babel-preset-env@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.1.10.tgz#c1055b69d25c3cf5383a925ee5c553c323558368"
  dependencies:
    babel-plugin-check-es2015-constants "^6.3.13"
    babel-plugin-syntax-trailing-function-commas "^6.13.0"
@ -1141,6 +1141,8 @@ babel-preset-env@^1.1.8:
    babel-plugin-transform-exponentiation-operator "^6.8.0"
    babel-plugin-transform-regenerator "^6.6.0"
    browserslist "^1.4.0"
+    electron-to-chromium "^1.1.0"
+    invariant "^2.2.2"

 babel-preset-env@0.0.6:
  version "0.0.6"
@ -1542,9 +1544,9 @@ caniuse-api@^1.5.2:
    lodash.memoize "^4.1.0"
    lodash.uniq "^4.3.0"

-caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000624:
-  version "1.0.30000626"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000626.tgz#44363dc86857efaf758fea9faef6a15ed93d8f33"
+caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000624, caniuse-db@^1.0.30000628:
+  version "1.0.30000631"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000631.tgz#8aa6f65cff452c4aba1c2aaa1e724102fbb9114f"

 capture-stack-trace@^1.0.0:
  version "1.0.0"
@ -1972,8 +1974,8 @@ cross-spawn@^4, cross-spawn@^4.0.0:
    which "^1.2.9"

 cross-spawn@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.0.1.tgz#a3bbb302db2297cbea3c04edf36941f4613aa399"
+  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"
@ -2013,13 +2015,13 @@ css-color-names@0.0.4:
  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"

 css-loader@^0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.1.tgz#2ba7f20131b93597496b3e9bb500785a49cd29ea"
+  version "0.26.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.2.tgz#a9cd4c2b1a559b45d8efc04fc311ab5d2aaccb9d"
  dependencies:
    babel-code-frame "^6.11.0"
    css-selector-tokenizer "^0.7.0"
    cssnano ">=2.6.1 <4"
-    loader-utils "~0.2.2"
+    loader-utils "^1.0.2"
    lodash.camelcase "^4.3.0"
    object-assign "^4.0.1"
    postcss "^5.0.6"
@ -2027,7 +2029,7 @@ css-loader@^0.26.1:
    postcss-modules-local-by-default "^1.0.1"
    postcss-modules-scope "^1.0.0"
    postcss-modules-values "^1.1.0"
-    source-list-map "^0.1.4"
+    source-list-map "^0.1.7"

 css-rule-stream@^1.1.0:
  version "1.1.0"
@ -2152,13 +2154,13 @@ d@^0.1.1, d@~0.1.1:
  dependencies:
    es5-ext "~0.10.2"

-d3-array@1, d3-array@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.0.2.tgz#174237bf356a852fadd6af87743d928631de7655"
+d3-array@1, d3-array@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.1.0.tgz#bfea66b89d46f9aedf77296d3aad6307b50771cc"

-d3-axis@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.4.tgz#bdfdcf5e859824062e0f17ad920f76236e72512c"
+d3-axis@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.5.tgz#865db17a7b54433e3b35c1d2b1a76bdb7c3d434d"

 d3-brush@1.0.3:
  version "1.0.3"
@ -2189,14 +2191,22 @@ d3-dispatch@1, d3-dispatch@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.2.tgz#5b511e79a46a1f89492841c0a8f656687d5daa0a"

-d3-drag@1, d3-drag@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.0.2.tgz#d634cc3f7689f99dd03fd7eb1af2945c0f4339ad"
+d3-drag@1, d3-drag@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.0.3.tgz#a016d21c696d130ba758babf1cd9e5f049169d0b"
  dependencies:
    d3-dispatch "1"
    d3-selection "1"

-d3-dsv@1, d3-dsv@1.0.3:
+d3-dsv@1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.4.tgz#2f491bcf00729d9ee6734f7cfb7049ddcc5e981d"
+  dependencies:
+    commander "2"
+    iconv-lite "0.4"
+    rw "1"
+
+d3-dsv@1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.3.tgz#049fe43c0f5f60c7ff7d376616bc76d6fc9d378f"
  dependencies:
@ -2208,22 +2218,22 @@ d3-ease@1, d3-ease@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.2.tgz#b486f8f3ca308ca7be38197d65622b6e30983377"

-d3-force@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.0.4.tgz#f84dcbb3200be41de7bc30fa71923143156758bf"
+d3-force@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.0.5.tgz#be8f65ac70688b8d26a9d9bc1e4699c1525f46b1"
  dependencies:
    d3-collection "1"
    d3-dispatch "1"
    d3-quadtree "1"
    d3-timer "1"

-d3-format@1, d3-format@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.0.2.tgz#138618320b4bbeb43b5c0ff30519079fbbd7375e"
+d3-format@1, d3-format@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.1.0.tgz#736775d5e6604421bef6c76d5746638a8e70d295"

-d3-geo@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.5.0.tgz#cf32c26f61cc5130382f74d40c4d3503dd226a1f"
+d3-geo@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.6.0.tgz#f72cbb7631e114654023a5907c5b87cf703c8aa9"
  dependencies:
    d3-array "1"

@ -2249,17 +2259,17 @@ d3-quadtree@1, d3-quadtree@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.2.tgz#e7e873af06aaa427eaa4af094cc4cbfb350b9e38"

-d3-queue@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.3.tgz#10ee4dd0574a1affaabfb931d0ba4f117926edc6"
+d3-queue@3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.4.tgz#6e549807c4b646e6768f0b2bdfdaaa6792f3d4a9"

 d3-random@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.0.2.tgz#83ff6a391206209c30565299e43c6549866db269"

-d3-request@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.3.tgz#63fc7dfd784607db0df5d535d7cb898fceba755a"
+d3-request@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.4.tgz#e04f559644f98639af24d75f8fcf99e3d27f1f53"
  dependencies:
    d3-collection "1"
    d3-dispatch "1"
@ -2278,25 +2288,25 @@ d3-scale@1.0.4:
    d3-time "1"
    d3-time-format "2"

-d3-selection@1, d3-selection@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.0.3.tgz#e63e51416172427854c1bcdfa066eb5fe872c108"
-
-d3-shape@1.0.4:
+d3-selection@1, d3-selection@1.0.4:
  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.0.4.tgz#145ee100ccbec42f8e3f1996cd05c786f79fe1c6"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.0.4.tgz#b862c7ae22436efe8459b7659ccdae84f09b43a3"
+
+d3-shape@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.0.5.tgz#2e1946fbd9cf468d9f8dc6d2e58d6c4278ae286a"
  dependencies:
    d3-path "1"

-d3-time-format@2, d3-time-format@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.3.tgz#3241569b74ddc9c42e0689c0e8a903579fd6280a"
+d3-time-format@2, d3-time-format@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.4.tgz#db0ab6910b3f2fc729a2ddfd2ac1b750962e1f72"
  dependencies:
    d3-time "1"

-d3-time@1, d3-time@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.4.tgz#2ceba09a76b7450c992a1ded4e10fc6195e69649"
+d3-time@1, d3-time@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.5.tgz#ef07a27d4b56522d984a41c27b1c67aa80b0cdd9"

 d3-timer@1, d3-timer@1.0.4:
  version "1.0.4"
@ -2317,9 +2327,9 @@ d3-voronoi@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.1.tgz#998544dca98ef0e89a6c40c0bac3510d1bc1b8b9"

-d3-zoom@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.1.1.tgz#d2362d8f7043c1fc5d96a438de69f4e02ef1e67b"
+d3-zoom@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.1.2.tgz#a8944947e92a12bc5d5a3fb4dccf1a40e7de5fb3"
  dependencies:
    d3-dispatch "1"
    d3-drag "1"
@ -2327,40 +2337,40 @@ d3-zoom@1.1.1:
    d3-selection "1"
    d3-transition "1"

-d3@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-4.6.0.tgz#af2f0ddd00f4cc9737b8b0a565608bf6b787eafc"
+d3@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-4.7.0.tgz#8a7d5004cb559f2f117706ce22d9a9d75119daa6"
  dependencies:
-    d3-array "1.0.2"
-    d3-axis "1.0.4"
+    d3-array "1.1.0"
+    d3-axis "1.0.5"
    d3-brush "1.0.3"
    d3-chord "1.0.3"
    d3-collection "1.0.2"
    d3-color "1.0.2"
    d3-dispatch "1.0.2"
-    d3-drag "1.0.2"
+    d3-drag "1.0.3"
    d3-dsv "1.0.3"
    d3-ease "1.0.2"
-    d3-force "1.0.4"
-    d3-format "1.0.2"
-    d3-geo "1.5.0"
+    d3-force "1.0.5"
+    d3-format "1.1.0"
+    d3-geo "1.6.0"
    d3-hierarchy "1.1.2"
    d3-interpolate "1.1.3"
    d3-path "1.0.3"
    d3-polygon "1.0.2"
    d3-quadtree "1.0.2"
-    d3-queue "3.0.3"
+    d3-queue "3.0.4"
    d3-random "1.0.2"
-    d3-request "1.0.3"
+    d3-request "1.0.4"
    d3-scale "1.0.4"
-    d3-selection "1.0.3"
-    d3-shape "1.0.4"
-    d3-time "1.0.4"
-    d3-time-format "2.0.3"
+    d3-selection "1.0.4"
+    d3-shape "1.0.5"
+    d3-time "1.0.5"
+    d3-time-format "2.0.4"
    d3-timer "1.0.4"
    d3-transition "1.0.3"
    d3-voronoi "1.1.1"
-    d3-zoom "1.1.1"
+    d3-zoom "1.1.2"

 damerau-levenshtein@^1.0.0:
  version "1.0.3"
@ -2580,9 +2590,9 @@ ee-first@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

-electron-to-chromium@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.3.tgz#4b4d04d237c301f72e2d15c2137b2b79f9f5ab76"
+electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.4.tgz#9751cbea89fa120bf88c226ba41eb8d0b6f1b597"

 element-class@^0.2.0:
  version "0.2.2"
@ -2768,13 +2778,13 @@ eslint-config-semistandard@^7.0.0:
  version "7.0.0"
  resolved "https://registry.yarnpkg.com/eslint-config-semistandard/-/eslint-config-semistandard-7.0.0.tgz#f803493f56a5172f7f59c35ae648360b41f2ff71"

-eslint-config-standard@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz#d3a68aafc7191639e7ee441e7348739026354292"
+eslint-config-standard@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-7.0.0.tgz#4f161bc65695e4bc61331c55b9eeaca458cd99c6"

-eslint-plugin-babel@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.0.1.tgz#77de74dabd67a6bef3b16bf258f5804e971e7349"
+eslint-plugin-babel@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.0.tgz#837a74c092ad4d74f9fc74aed43f750906adc827"

 eslint-plugin-jsx-a11y@^4.0.0:
  version "4.0.0"
@ -2787,9 +2797,9 @@ eslint-plugin-jsx-a11y@^4.0.0:
    jsx-ast-utils "^1.0.0"
    object-assign "^4.0.1"

-eslint-plugin-promise@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
+eslint-plugin-promise@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"

 eslint-plugin-react@^6.10.0:
  version "6.10.0"
@ -3119,15 +3129,15 @@ fn-name@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"

-for-in@^0.1.5:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"

 for-own@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
  dependencies:
-    for-in "^0.1.5"
+    for-in "^1.0.1"

 foreach@^2.0.5:
  version "2.0.5"
@ -3160,9 +3170,9 @@ fresh@0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"

-fresh@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.4.0.tgz#475626a934a8d3480b2101a1d6ecef7dafd7c553"
+fresh@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"

 fs-readdir-recursive@^1.0.0:
  version "1.0.0"
@ -3275,8 +3285,8 @@ getpass@^0.1.1:
    assert-plus "^1.0.0"

 glamor@^2.20.12:
-  version "2.20.23"
-  resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.23.tgz#aa597b9b0e8835258d0655b19687dc4e772e6c49"
+  version "2.20.24"
+  resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.24.tgz#a299af2eec687322634ba38e4a0854d8743d2041"
  dependencies:
    babel-runtime "^6.18.0"
    fbjs "^0.8.8"
@ -3724,8 +3734,8 @@ is-glob@^2.0.0, is-glob@^2.0.1:
    is-extglob "^1.0.0"

 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
  dependencies:
    generate-function "^2.0.0"
    generate-object-property "^1.1.0"
@ -4188,7 +4198,7 @@ load-json-file@^2.0.0:
    pify "^2.0.0"
    strip-bom "^3.0.0"

-loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x:
+loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.5:
  version "0.2.17"
  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
  dependencies:
@ -4197,6 +4207,14 @@ loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2
    json5 "^0.5.0"
    object-assign "^4.0.1"

+loader-utils@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.0.2.tgz#a9f923c865a974623391a8602d031137fad74830"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
 locate-path@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@ -4252,7 +4270,7 @@ lodash.first@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/lodash.first/-/lodash.first-3.0.0.tgz#5dae180d7f818ee65fc5b210b104a7bbef98a16a"

-lodash.flatten, lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
+lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"

@ -4344,7 +4362,7 @@ lodash@^3.5.0:
  version "3.10.1"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.12.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@4.x.x:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@4.x.x:
  version "4.17.4"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

@ -4372,8 +4390,8 @@ loud-rejection@^1.0.0, loud-rejection@^1.2.0:
    signal-exit "^3.0.0"

 lower-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.3.tgz#c92393d976793eee5ba4edb583cf8eae35bd9bfb"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"

 lowercase-keys@^1.0.0:
  version "1.0.0"
@ -4515,14 +4533,10 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
  dependencies:
    mime-db "~1.26.0"

-mime@^1.3.4, mime@~1.3.4, mime@1.3.4:
+mime@^1.3.4, mime@~1.3.4, mime@1.3.4, mime@1.3.x:
  version "1.3.4"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"

-mime@1.2.x:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
-
 mimic-fn@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@ -4589,8 +4603,8 @@ natural-compare@^1.4.0:
  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"

 nearley@^2.7.7:
-  version "2.7.13"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.13.tgz#ae19927cc821a4b517de91962db9ed0e90d991fa"
+  version "2.7.14"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.14.tgz#085f7b5d071de73926167bde8627c5b0190cde11"
  dependencies:
    nomnom "~1.6.2"
    railroad-diagrams "^1.0.0"
@ -5160,8 +5174,8 @@ postcss-discard-comments@^2.0.4:
    postcss "^5.0.14"

 postcss-discard-duplicates@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.0.2.tgz#02be520e91571ffb10738766a981d5770989bb32"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
  dependencies:
    postcss "^5.0.4"

@ -6046,8 +6060,8 @@ resolve-pathname@^2.0.0:
  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.0.2.tgz#e55c016eb2e9df1de98e85002282bfb38c630436"

 resolve@^1.1.6:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.1.tgz#5d0a1632609b6b00a22284293db1d5d973676314"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
  dependencies:
    path-parse "^1.0.5"

@ -6105,7 +6119,7 @@ rx-lite@^3.1.2:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"

-sax@^1.2.1, sax@>=0.6.0, sax@~1.2.1:
+sax@^1.2.1, sax@~1.2.1:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"

@ -6138,11 +6152,11 @@ send@0.14.2:
    statuses "~1.3.1"

 serve-favicon@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.4.0.tgz#064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0"
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.4.1.tgz#491a860f5414dbc82e0fd9ceaf20068ffab3ee16"
  dependencies:
    etag "~1.8.0"
-    fresh "0.4.0"
+    fresh "0.5.0"
    ms "0.7.2"
    parseurl "~1.3.1"

@ -6237,7 +6251,7 @@ sort-keys@^1.0.0, sort-keys@^1.1.1:
  dependencies:
    is-plain-obj "^1.0.0"

-source-list-map@^0.1.4, source-list-map@~0.1.7:
+source-list-map@^0.1.7, source-list-map@~0.1.7:
  version "0.1.8"
  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"

@ -6461,9 +6475,9 @@ style-search@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"

-styled-components@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.3.tgz#83fa44e553882aaa3ddc4363ccc435814d690706"
+styled-components@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.4.tgz#c944de423d8ae2363f2ba4ff8fc26d367e7dfa8f"
  dependencies:
    buffer "^5.0.2"
    css-to-react-native "^1.0.6"
@ -6556,14 +6570,6 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
  dependencies:
    has-flag "^1.0.0"

-svg-react-loader@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/svg-react-loader/-/svg-react-loader-0.3.7.tgz#a88a92a6349260f599f922ac6def7753787b9216"
-  dependencies:
-    loader-utils "^0.2"
-    lodash "^4.12.0"
-    xml2js "^0.4"
-
 svg-tags@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@ -6803,7 +6809,16 @@ ua-parser-js@^0.7.9:
  version "0.7.12"
  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"

-uglify-js@^2.6, uglify-js@~2.7.3:
+uglify-js@^2.6:
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.4.tgz#5aeb6fd6f1f0a672dea63795016590502c290513"
+  dependencies:
+    async "~0.2.6"
+    source-map "~0.5.1"
+    uglify-to-browserify "~1.0.0"
+    yargs "~3.10.0"
+
+uglify-js@~2.7.3:
  version "2.7.5"
  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
  dependencies:
@ -6876,11 +6891,11 @@ upper-case@^1.1.1:
  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"

 url-loader@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.7.tgz#67e8779759f8000da74994906680c943a9b0925d"
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
  dependencies:
-    loader-utils "0.2.x"
-    mime "1.2.x"
+    loader-utils "^1.0.2"
+    mime "1.3.x"

 url-parse-lax@^1.0.0:
  version "1.0.0"
@ -7149,19 +7164,6 @@ xml-name-validator@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"

-xml2js@^0.4:
-  version "0.4.17"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.17.tgz#17be93eaae3f3b779359c795b419705a8817e868"
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "^4.1.0"
-
-xmlbuilder@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
-  dependencies:
-    lodash "^4.0.0"
-
 xmlbuilder@~4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.1.0.tgz#687e84d9c4145af8db438d8bec88805df66249f4"