feat(my-joy-beta): show public/private label in ips

packages/my-joy-beta/package.json

@@ -47,9 +47,11 @@
     "lodash.isboolean": "^3.0.3",
     "lodash.isfinite": "^3.3.2",
     "lodash.isfunction": "^3.0.9",
+    "lodash.isinteger": "^4.0.4",
     "lodash.isstring": "^4.0.1",
     "lodash.omit": "^4.5.0",
     "lodash.reverse": "^4.0.1",
+    "lodash.some": "^4.6.0",
     "lodash.sortby": "^4.7.0",
     "lodash.uniqby": "^4.7.0",
     "lodash.values": "^4.3.0",

packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/summary.spec.js.snap

@@ -3995,7 +3995,7 @@ exports[`renders <Summary instance /> without throwing 1`] = `
                 className="c31"
                 htmlFor=""
               >
-                IP address 1
+                Public IP address 1
               </label>
               <div
                 className="c32"
@@ -4046,7 +4046,109 @@ exports[`renders <Summary instance /> without throwing 1`] = `
                 className="c31"
                 htmlFor=""
               >
-                IP address 2
+                Public IP address 2
+              </label>
+              <div
+                className="c32"
+              >
+                <input
+                  className="c33"
+                  disabled={false}
+                  id=""
+                  onBlur={null}
+                  value="72.2.119.146"
+                />
+                <div
+                  onClick={undefined}
+                  onMouseEnter={[Function]}
+                  onMouseLeave={[Function]}
+                  tag={false}
+                >
+                  <svg
+                    className="c34"
+                    height="19"
+                    innerRef={undefined}
+                    onClick={[Function]}
+                    style={
+                      Object {
+                        "transform": "rotate(0deg)",
+                      }
+                    }
+                    viewBox="0 0 15 19"
+                    width="15"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                      fill="rgba(73, 73, 73, 1)"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            className="c0"
+          >
+            <div
+              className="c30"
+            >
+              <label
+                className="c31"
+                htmlFor=""
+              >
+                Private IP address 1
+              </label>
+              <div
+                className="c32"
+              >
+                <input
+                  className="c33"
+                  disabled={false}
+                  id=""
+                  onBlur={null}
+                  value="10.112.5.63"
+                />
+                <div
+                  onClick={undefined}
+                  onMouseEnter={[Function]}
+                  onMouseLeave={[Function]}
+                  tag={false}
+                >
+                  <svg
+                    className="c34"
+                    height="19"
+                    innerRef={undefined}
+                    onClick={[Function]}
+                    style={
+                      Object {
+                        "transform": "rotate(0deg)",
+                      }
+                    }
+                    viewBox="0 0 15 19"
+                    width="15"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                      fill="rgba(73, 73, 73, 1)"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            className="c0"
+          >
+            <div
+              className="c30"
+            >
+              <label
+                className="c31"
+                htmlFor=""
+              >
+                Private IP address 2
               </label>
               <div
                 className="c35"
@@ -6122,7 +6224,7 @@ exports[`renders <Summary instance /> without throwing 2`] = `
                 className="c31"
                 htmlFor=""
               >
-                IP address 1
+                Public IP address 1
               </label>
               <div
                 className="c32"
@@ -6173,7 +6275,109 @@ exports[`renders <Summary instance /> without throwing 2`] = `
                 className="c31"
                 htmlFor=""
               >
-                IP address 2
+                Public IP address 2
+              </label>
+              <div
+                className="c32"
+              >
+                <input
+                  className="c33"
+                  disabled={false}
+                  id=""
+                  onBlur={null}
+                  value="72.2.119.146"
+                />
+                <div
+                  onClick={undefined}
+                  onMouseEnter={[Function]}
+                  onMouseLeave={[Function]}
+                  tag={false}
+                >
+                  <svg
+                    className="c34"
+                    height="19"
+                    innerRef={undefined}
+                    onClick={[Function]}
+                    style={
+                      Object {
+                        "transform": "rotate(0deg)",
+                      }
+                    }
+                    viewBox="0 0 15 19"
+                    width="15"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                      fill="rgba(73, 73, 73, 1)"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            className="c0"
+          >
+            <div
+              className="c30"
+            >
+              <label
+                className="c31"
+                htmlFor=""
+              >
+                Private IP address 1
+              </label>
+              <div
+                className="c32"
+              >
+                <input
+                  className="c33"
+                  disabled={false}
+                  id=""
+                  onBlur={null}
+                  value="10.112.5.63"
+                />
+                <div
+                  onClick={undefined}
+                  onMouseEnter={[Function]}
+                  onMouseLeave={[Function]}
+                  tag={false}
+                >
+                  <svg
+                    className="c34"
+                    height="19"
+                    innerRef={undefined}
+                    onClick={[Function]}
+                    style={
+                      Object {
+                        "transform": "rotate(0deg)",
+                      }
+                    }
+                    viewBox="0 0 15 19"
+                    width="15"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                      fill="rgba(73, 73, 73, 1)"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            className="c0"
+          >
+            <div
+              className="c30"
+            >
+              <label
+                className="c31"
+                htmlFor=""
+              >
+                Private IP address 2
               </label>
               <div
                 className="c35"

packages/my-joy-beta/src/components/instances/__tests__/summary.spec.js

@@ -72,7 +72,10 @@ it('renders <Summary instance /> without throwing', () => {
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },
@@ -99,7 +102,10 @@ it('renders <Summary instance /> without throwing', () => {
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },

packages/my-joy-beta/src/components/instances/__tests__/summary.ui.js

@@ -70,7 +70,10 @@ it('<Summary instance />', async () => {
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },
@@ -95,7 +98,10 @@ it('<Summary instance />', async () => {
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },

packages/my-joy-beta/src/components/instances/summary.js

@@ -1,10 +1,11 @@
 import React from 'react';
+import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
 import { Row, Col } from 'joyent-react-styled-flexboxgrid';
 import styled, { withTheme } from 'styled-components';
 import { Margin, Padding } from 'styled-components-spacing';
-import remcalc from 'remcalc';
 import titleCase from 'title-case';
-import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
+import get from 'lodash.get';
+import remcalc from 'remcalc';
 
 import {
   Card,
@@ -293,12 +294,19 @@ export default withTheme(
                 text={`ssh root@${instance.primary_ip}`}
                 label="Login"
               />
-              {(instance.ips || []).map((ip, i) => (
+              {get(instance, 'ips.public', []).map((ip, i, ips) => (
                 <CopiableField
-                  key={i}
+                  key={`public-${i}`}
-                  noMargin={i === instance.ips.length - 1}
+                  label={`Public IP address ${ips.length > 1 ? i + 1 : ''}`}
+                  text={ip}
+                />
+              ))}
+              {get(instance, 'ips.private', []).map((ip, i, ips) => (
+                <CopiableField
+                  key={`private-${i}`}
+                  noMargin={i === ips.length - 1}
+                  label={`Private IP address ${ips.length > 1 ? i + 1 : ''}`}
                   text={ip}
-                  label={`IP address ${i + 1}`}
                 />
               ))}
             </Padding>

packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/summary.spec.js.snap

@@ -2959,7 +2959,7 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
                   className="c32"
                   htmlFor=""
                 >
-                  IP address 1
+                  Public IP address 1
                 </label>
                 <div
                   className="c33"
@@ -3010,7 +3010,109 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
                   className="c32"
                   htmlFor=""
                 >
-                  IP address 2
+                  Public IP address 2
+                </label>
+                <div
+                  className="c33"
+                >
+                  <input
+                    className="c34"
+                    disabled={false}
+                    id=""
+                    onBlur={null}
+                    value="72.2.119.146"
+                  />
+                  <div
+                    onClick={undefined}
+                    onMouseEnter={[Function]}
+                    onMouseLeave={[Function]}
+                    tag={false}
+                  >
+                    <svg
+                      className="c35"
+                      height="19"
+                      innerRef={undefined}
+                      onClick={[Function]}
+                      style={
+                        Object {
+                          "transform": "rotate(0deg)",
+                        }
+                      }
+                      viewBox="0 0 15 19"
+                      width="15"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                        fill="rgba(73, 73, 73, 1)"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              className="c1"
+            >
+              <div
+                className="c31"
+              >
+                <label
+                  className="c32"
+                  htmlFor=""
+                >
+                  Private IP address 1
+                </label>
+                <div
+                  className="c33"
+                >
+                  <input
+                    className="c34"
+                    disabled={false}
+                    id=""
+                    onBlur={null}
+                    value="10.112.5.63"
+                  />
+                  <div
+                    onClick={undefined}
+                    onMouseEnter={[Function]}
+                    onMouseLeave={[Function]}
+                    tag={false}
+                  >
+                    <svg
+                      className="c35"
+                      height="19"
+                      innerRef={undefined}
+                      onClick={[Function]}
+                      style={
+                        Object {
+                          "transform": "rotate(0deg)",
+                        }
+                      }
+                      viewBox="0 0 15 19"
+                      width="15"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                        fill="rgba(73, 73, 73, 1)"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              className="c1"
+            >
+              <div
+                className="c31"
+              >
+                <label
+                  className="c32"
+                  htmlFor=""
+                >
+                  Private IP address 2
                 </label>
                 <div
                   className="c36"
@@ -5124,7 +5226,7 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
                   className="c32"
                   htmlFor=""
                 >
-                  IP address 1
+                  Public IP address 1
                 </label>
                 <div
                   className="c33"
@@ -5175,7 +5277,109 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
                   className="c32"
                   htmlFor=""
                 >
-                  IP address 2
+                  Public IP address 2
+                </label>
+                <div
+                  className="c33"
+                >
+                  <input
+                    className="c34"
+                    disabled={false}
+                    id=""
+                    onBlur={null}
+                    value="72.2.119.146"
+                  />
+                  <div
+                    onClick={undefined}
+                    onMouseEnter={[Function]}
+                    onMouseLeave={[Function]}
+                    tag={false}
+                  >
+                    <svg
+                      className="c35"
+                      height="19"
+                      innerRef={undefined}
+                      onClick={[Function]}
+                      style={
+                        Object {
+                          "transform": "rotate(0deg)",
+                        }
+                      }
+                      viewBox="0 0 15 19"
+                      width="15"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                        fill="rgba(73, 73, 73, 1)"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              className="c1"
+            >
+              <div
+                className="c31"
+              >
+                <label
+                  className="c32"
+                  htmlFor=""
+                >
+                  Private IP address 1
+                </label>
+                <div
+                  className="c33"
+                >
+                  <input
+                    className="c34"
+                    disabled={false}
+                    id=""
+                    onBlur={null}
+                    value="10.112.5.63"
+                  />
+                  <div
+                    onClick={undefined}
+                    onMouseEnter={[Function]}
+                    onMouseLeave={[Function]}
+                    tag={false}
+                  >
+                    <svg
+                      className="c35"
+                      height="19"
+                      innerRef={undefined}
+                      onClick={[Function]}
+                      style={
+                        Object {
+                          "transform": "rotate(0deg)",
+                        }
+                      }
+                      viewBox="0 0 15 19"
+                      width="15"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M5,12l2-2v9H8V10l2,2,1-1L7.5,8,4,11ZM11,1h2a2.15,2.15,0,0,1,2,2V16a2.15,2.15,0,0,1-2,2H10V16h3V3H11V5H4V3H2V16H5v2H2a2.15,2.15,0,0,1-2-2V3A2.15,2.15,0,0,1,2,1H4V0h7ZM9,2H6V3H9V2Z"
+                        fill="rgba(73, 73, 73, 1)"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              className="c1"
+            >
+              <div
+                className="c31"
+              >
+                <label
+                  className="c32"
+                  htmlFor=""
+                >
+                  Private IP address 2
                 </label>
                 <div
                   className="c36"

packages/my-joy-beta/src/containers/instances/__tests__/summary.spec.js

@@ -76,7 +76,10 @@ it('renders <Summary starting stopping rebooting removing /> without throwing',
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },
@@ -103,7 +106,10 @@ it('renders <Summary starting stopping rebooting removing /> without throwing',
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },

packages/my-joy-beta/src/containers/instances/__tests__/summary.ui.js

@@ -70,7 +70,10 @@ it('<Summary starting stopping rebooting removing />', async () => {
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },
@@ -95,7 +98,10 @@ it('<Summary starting stopping rebooting removing />', async () => {
     },
     // eslint-disable-next-line camelcase
     primary_ip: '72.2.119.146',
-    ips: ['72.2.119.146', '10.112.5.63'],
+    ips: {
+      public: ['72.2.119.146', '72.2.119.146'],
+      private: ['10.112.5.63', '10.112.5.63']
+    },
     package: {
       name: 'g4-highcpu-128M'
     },

packages/my-joy-beta/src/containers/instances/summary.js

@@ -3,9 +3,12 @@ import { compose, graphql } from 'react-apollo';
 import { connect } from 'react-redux';
 import { set } from 'react-redux-values';
 import { Margin } from 'styled-components-spacing';
-import find from 'lodash.find';
-import get from 'lodash.get';
 import intercept from 'apr-intercept';
+import find from 'lodash.find';
+import isArray from 'lodash.isarray';
+import some from 'lodash.some';
+import isInteger from 'lodash.isinteger';
+import get from 'lodash.get';
 
 import {
   ViewContainer,
@@ -77,6 +80,57 @@ export const Summary = ({
   );
 };
 
+// from https://github.com/natesilva/is-in-subnet
+const ipv4ToLong = ip => {
+  const octets = ip.split('.');
+
+  return (
+    ((parseInt(octets[0], 10) << 24) +
+      (parseInt(octets[1], 10) << 16) +
+      (parseInt(octets[2], 10) << 8) +
+      parseInt(octets[3], 10)) >>>
+    0
+  );
+};
+
+// from https://github.com/natesilva/is-in-subnet
+const isInSubnet = (address, subnetOrSubnets) => {
+  if (isArray(subnetOrSubnets)) {
+    return some(subnetOrSubnets, subnet => isInSubnet(address, subnet));
+  }
+
+  const subnet = subnetOrSubnets;
+
+  const [subnetAddress, prefixLengthString] = subnet.split('/');
+  const prefixLength = parseInt(prefixLengthString, 10);
+
+  if (!subnetAddress || !isInteger(prefixLength)) {
+    return;
+  }
+
+  if (prefixLength < 0 || prefixLength > 32) {
+    return;
+  }
+
+  // the next two lines throw if the addresses are not valid IPv4 addresses
+  const subnetLong = ipv4ToLong(subnetAddress);
+  const addressLong = ipv4ToLong(address);
+
+  if (prefixLength === 0) {
+    return true;
+  }
+
+  const subnetPrefix = subnetLong >> (32 - prefixLength);
+  const addressPrefix = addressLong >> (32 - prefixLength);
+
+  return subnetPrefix === addressPrefix;
+};
+
+// from https://github.com/natesilva/is-in-subnet
+const isPrivate = address => {
+  return isInSubnet(address, ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']);
+};
+
 export default compose(
   graphql(StopInstance, { name: 'stop' }),
   graphql(StartInstance, { name: 'start' }),
@@ -90,11 +144,31 @@ export default compose(
         name: get(match, 'params.instance')
       }
     }),
-    props: ({ data: { loading, error, variables, ...rest } }) => ({
+    props: ({ data: { loading, error, variables, ...rest } }) => {
-      instance: find(get(rest, 'machines', []), ['name', variables.name]),
+      let instance = find(get(rest, 'machines', []), ['name', variables.name]);
+
+      if (instance) {
+        const { ips } = instance;
+
+        const grupedIps = ips
+          .map(ip => ({ ip, openness: isPrivate(ip) ? 'private' : 'public' }))
+          .reduce(
+            (sum, { ip, openness }) =>
+              Object.assign(sum, {
+                [openness]: (sum[openness] || []).concat([ip])
+              }),
+            {}
+          );
+
+        instance = Object.assign({}, instance, { ips: grupedIps });
+      }
+
+      return {
+        instance,
         loading,
         loadingError: error
-    })
+      };
+    }
   }),
   connect(
     (state, ownProps) => {

packages/my-joy-beta/src/graphql/get-instance.gql

@@ -16,6 +16,7 @@ query instance($name: String) {
       name
     }
     package {
+      id
       name
     }
   }

yarn.lock

@@ -333,8 +333,8 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.3.0:
     json-schema-traverse "^0.3.0"
 
 ajv@^6.0.1, ajv@^6.1.0:
-  version "6.1.1"
+  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2"
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
@@ -2248,6 +2248,14 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
+camelcase-keys@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  dependencies:
+    camelcase "^4.1.0"
+    map-obj "^2.0.0"
+    quick-lru "^1.0.0"
+
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
@@ -2819,70 +2827,70 @@ content@4.x.x:
   dependencies:
     boom "7.x.x"
 
-conventional-changelog-angular@^1.3.3, conventional-changelog-angular@^1.6.5:
+conventional-changelog-angular@^1.3.3, conventional-changelog-angular@^1.6.6:
-  version "1.6.5"
+  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.5.tgz#936249e897501affdffc6043da45cab59d6f0907"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
   dependencies:
     compare-func "^1.3.1"
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-atom@^0.2.3:
+conventional-changelog-atom@^0.2.4:
-  version "0.2.3"
+  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.3.tgz#117d024e5cf9e28dcbd0575981105395be1bca74"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz#4917759947f4db86073f9d3838a2d54302d5843d"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
 conventional-changelog-cli@^1.3.13:
-  version "1.3.14"
+  version "1.3.15"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.14.tgz#2560f640929baf97bb65457f77a12a57d5322852"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.15.tgz#cd7f0e64473f1cecee902ee5ee00548ea91bcc9e"
   dependencies:
     add-stream "^1.0.0"
-    conventional-changelog "^1.1.16"
+    conventional-changelog "^1.1.17"
-    lodash "^4.1.0"
+    lodash "^4.2.1"
-    meow "^3.7.0"
+    meow "^4.0.0"
     tempfile "^1.1.1"
 
-conventional-changelog-codemirror@^0.3.3:
+conventional-changelog-codemirror@^0.3.4:
-  version "0.3.3"
+  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.3.tgz#e1ec78e77e7fe26a2bd18e32f02523527916a07b"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz#debc43991d487d7964e65087fbbe034044bd51fb"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-core@^2.0.4:
+conventional-changelog-core@^2.0.5:
-  version "2.0.4"
+  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.4.tgz#bbc476109c6b28ba6328b0b417f5ab5bfc7ca28a"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz#45b6347c4c6512e1f163f7ff55c9f5bcb88fd990"
   dependencies:
-    conventional-changelog-writer "^3.0.3"
+    conventional-changelog-writer "^3.0.4"
-    conventional-commits-parser "^2.1.4"
+    conventional-commits-parser "^2.1.5"
-    dateformat "^1.0.12"
+    dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.3.3"
+    git-raw-commits "^1.3.4"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.3.3"
+    git-semver-tags "^1.3.4"
-    lodash "^4.0.0"
+    lodash "^4.2.1"
     normalize-package-data "^2.3.5"
-    q "^1.4.1"
+    q "^1.5.1"
     read-pkg "^1.1.0"
     read-pkg-up "^1.0.1"
     through2 "^2.0.0"
 
-conventional-changelog-ember@^0.3.5:
+conventional-changelog-ember@^0.3.6:
-  version "0.3.5"
+  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.5.tgz#db9a23f01103c6a0446ed2077ed5c87656d0571a"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz#f3825d7434168f3d9211b5532dc1d5769532b668"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-eslint@^1.0.3:
+conventional-changelog-eslint@^1.0.4:
-  version "1.0.3"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.3.tgz#023002a3f776266c501e4d4def7b0bb24130f29d"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.4.tgz#333456d1884d96f3a49cc0984a745095e9d56288"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-express@^0.3.3:
+conventional-changelog-express@^0.3.4:
-  version "0.3.3"
+  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.3.tgz#25aef42a30b5457f97681a94f2ac9b0ee515484a"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz#812a9cf778677e12f978ac9c40d85297c0bfcca9"
   dependencies:
-    q "^1.4.1"
+    q "^1.5.1"
 
 conventional-changelog-jquery@^0.1.0:
   version "0.1.0"
@@ -2896,63 +2904,63 @@ conventional-changelog-jscs@^0.1.0:
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-jshint@^0.3.3:
+conventional-changelog-jshint@^0.3.4:
-  version "0.3.3"
+  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.3.tgz#28b6fe4d41fb945f38c6c31cd195fe37594f0007"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz#b2de33cd0870d9af804ac6a4fded0ee25b69c9bb"
   dependencies:
     compare-func "^1.3.1"
-    q "^1.4.1"
+    q "^1.5.1"
 
-conventional-changelog-preset-loader@^1.1.5:
+conventional-changelog-preset-loader@^1.1.6:
-  version "1.1.5"
+  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.5.tgz#d5af525d7ad81179d9b54137284d74d665997fa7"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz#b29af6332f9313857be36427623c9016bfeeaf33"
 
-conventional-changelog-writer@^3.0.3:
+conventional-changelog-writer@^3.0.4:
-  version "3.0.3"
+  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.3.tgz#2faa65739370769639fff1c0008722162936d46c"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz#705b46a8b8277bd7fd79cad8032095b5d803864c"
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^1.1.4"
+    conventional-commits-filter "^1.1.5"
-    dateformat "^1.0.11"
+    dateformat "^3.0.0"
     handlebars "^4.0.2"
     json-stringify-safe "^5.0.1"
-    lodash "^4.0.0"
+    lodash "^4.2.1"
-    meow "^3.3.0"
+    meow "^4.0.0"
-    semver "^5.0.1"
+    semver "^5.5.0"
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-changelog@^1.1.16:
+conventional-changelog@^1.1.17:
-  version "1.1.16"
+  version "1.1.17"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.16.tgz#fa78386c831f5b1ae45f60391ef015c2a4a400b9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.17.tgz#9019503d51328d8b33b0be6d425ab7f065918332"
   dependencies:
-    conventional-changelog-angular "^1.6.5"
+    conventional-changelog-angular "^1.6.6"
-    conventional-changelog-atom "^0.2.3"
+    conventional-changelog-atom "^0.2.4"
-    conventional-changelog-codemirror "^0.3.3"
+    conventional-changelog-codemirror "^0.3.4"
-    conventional-changelog-core "^2.0.4"
+    conventional-changelog-core "^2.0.5"
-    conventional-changelog-ember "^0.3.5"
+    conventional-changelog-ember "^0.3.6"
-    conventional-changelog-eslint "^1.0.3"
+    conventional-changelog-eslint "^1.0.4"
-    conventional-changelog-express "^0.3.3"
+    conventional-changelog-express "^0.3.4"
     conventional-changelog-jquery "^0.1.0"
     conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.3.3"
+    conventional-changelog-jshint "^0.3.4"
-    conventional-changelog-preset-loader "^1.1.5"
+    conventional-changelog-preset-loader "^1.1.6"
 
-conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.4:
+conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.5:
-  version "1.1.4"
+  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.4.tgz#8b5be3979c372e4f7440180d5c655a94ac5a134a"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz#77aac065e3de9c1a74b801e8e25c9affb3184f65"
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.4:
+conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.5:
-  version "2.1.4"
+  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.4.tgz#86d2c21029268d99543c4ebda37d76fe5c44d8d1"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz#9ac3a4ab221c0c3c9e9dd2c09ae01e6d1e1dabe0"
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
     lodash "^4.2.1"
-    meow "^3.3.0"
+    meow "^4.0.0"
     split2 "^2.0.0"
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
@@ -3337,12 +3345,9 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-dateformat@^1.0.11, dateformat@^1.0.12:
+dateformat@^3.0.0:
-  version "1.0.12"
+  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  dependencies:
-    get-stdin "^4.0.1"
-    meow "^3.3.0"
 
 debug@2.6.9, debug@3.1.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0:
   version "3.1.0"
@@ -3360,7 +3365,14 @@ decache@^3.0.5:
   dependencies:
     find "^0.2.4"
 
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize-keys@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -3806,7 +3818,7 @@ envir@^1.0.0:
     all-object-keys "^1.1.0"
     jessy "^2.0.0"
 
-errno@^0.1.3, errno@^0.1.4:
+errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   dependencies:
@@ -4415,7 +4427,7 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extglob@^2.0.2, extglob@^2.0.4:
+extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
   dependencies:
@@ -4467,21 +4479,22 @@ facet@0.3.0:
   resolved "https://registry.yarnpkg.com/facet/-/facet-0.3.0.tgz#1bf949d8a112e2045dda84259407def3deb62c1b"
 
 fast-deep-equal@^1.0.0:
-  version "1.0.0"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
 
 fast-diff@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
 
 fast-glob@^2.0.2:
-  version "2.0.4"
+  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.0.4.tgz#a4b9f49e36175f5ef1a3456f580226a6e7abcc9e"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.1.0.tgz#50ee95e6a112f09e886cfff5215de69ca4a6a861"
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
-    glob-parent "3.1.0"
+    glob-parent "^3.1.0"
-    merge2 "1.2.1"
+    is-glob "^4.0.0"
-    micromatch "3.1.5"
+    merge2 "^1.2.1"
+    micromatch "^3.1.8"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -4925,13 +4938,13 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^1.3.0, git-raw-commits@^1.3.3:
+git-raw-commits@^1.3.0, git-raw-commits@^1.3.4:
-  version "1.3.3"
+  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.3.tgz#464f9aa14c4e78235e98654f0da467f3702590f9"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.4.tgz#442c3df5985b4f5689e9e43597f5194736aac001"
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
-    meow "^3.3.0"
+    meow "^4.0.0"
     split2 "^2.0.0"
     through2 "^2.0.0"
 
@@ -4942,12 +4955,12 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^1.3.0, git-semver-tags@^1.3.3:
+git-semver-tags@^1.3.0, git-semver-tags@^1.3.4:
-  version "1.3.3"
+  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.3.tgz#0b0416c43285adfdc93a8038ea25502a09319245"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.4.tgz#2ceb2a355c6d7514c123c35e297067d08caf3a92"
   dependencies:
-    meow "^3.3.0"
+    meow "^4.0.0"
-    semver "^5.0.1"
+    semver "^5.5.0"
 
 gitconfiglocal@^1.0.0:
   version "1.0.0"
@@ -4978,19 +4991,19 @@ glob-base@^0.3.0:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
 
-glob-parent@3.1.0, glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
   dependencies:
     is-glob "^2.0.0"
 
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -5672,6 +5685,10 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -6984,10 +7001,6 @@ lodash.difference@^4.4.0, lodash.difference@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
 
-lodash.endswith@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
-
 lodash.find@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
@@ -7036,7 +7049,7 @@ lodash.isfinite@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
 
-lodash.isfunction@^3.0.8, lodash.isfunction@^3.0.9:
+lodash.isfunction@^3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
 
@@ -7092,10 +7105,6 @@ lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
-lodash.startswith@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.startswith/-/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
-
 lodash.template@^4.0.2, lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
@@ -7121,7 +7130,7 @@ lodash.values@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
 
-"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.1.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1:
+"lodash@>=3.5 <5", lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
@@ -7220,6 +7229,10 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
+map-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -7318,11 +7331,25 @@ meow@^3.3.0, meow@^3.7.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
+meow@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.0.tgz#fd5855dd008db5b92c552082db1c307cba20b29d"
+  dependencies:
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist "^1.1.3"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
-merge2@1.2.1:
+merge2@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.1.tgz#271d2516ff52d4af7f7b710b8bf3e16e183fef66"
 
@@ -7343,24 +7370,6 @@ micro@^9.1.0:
     mri "1.1.0"
     raw-body "2.3.2"
 
-micromatch@3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.0"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
-    extglob "^2.0.2"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.0"
-    nanomatch "^1.2.5"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -7379,9 +7388,9 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.4:
+micromatch@^3.1.4, micromatch@^3.1.8:
-  version "3.1.8"
+  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.8.tgz#5c8caa008de588eebb395e8c0ad12c128f25fff1"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7457,6 +7466,13 @@ minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimist-options@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -7569,7 +7585,7 @@ nan@^2.3.0, nan@^2.6.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
 
-nanomatch@^1.2.5, nanomatch@^1.2.9:
+nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
   dependencies:
@@ -7638,8 +7654,8 @@ no-case@^2.2.0:
     lower-case "^1.1.1"
 
 node-abi@^2.2.0:
-  version "2.2.0"
+  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.2.0.tgz#e802ac7a2408e2c0593fb3176ffdf8a99a9b4dec"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.3.0.tgz#f3d554d6ac72a9ee16f0f4dc9548db7c08de4986"
   dependencies:
     semver "^5.4.1"
 
@@ -8838,8 +8854,8 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 puppeteer@^1.0.0:
-  version "1.1.0"
+  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.1.0.tgz#97fbc2fbbf9ab659e7e202a68ac1ba54b8bc0a25"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.1.1.tgz#adbf25e49f5ef03443c10ab8e09a954ca0c7bfee"
   dependencies:
     debug "^2.6.8"
     extract-zip "^1.6.5"
@@ -8859,7 +8875,7 @@ q-i@^1.2.0:
     is-plain-object "^2.0.4"
     stringify-object "^3.2.0"
 
-q@^1.1.2, q@^1.4.1:
+q@^1.1.2, q@^1.4.1, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -8927,6 +8943,10 @@ querystringify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
 
+quick-lru@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+
 quotation@^1.0.0, quotation@^1.0.1, quotation@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quotation/-/quotation-1.1.0.tgz#3f9c9b2e7780856f27c5015bec628d690e82c70d"
@@ -9374,6 +9394,13 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -9484,6 +9511,13 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  dependencies:
+    indent-string "^3.0.0"
+    strip-indent "^2.0.0"
+
 redrun@^5.10.5, redrun@^5.9.18:
   version "5.10.5"
   resolved "https://registry.yarnpkg.com/redrun/-/redrun-5.10.5.tgz#e8ce39d00b6a7ffe50e96e4bcda330e5bd796dd3"
@@ -9572,7 +9606,7 @@ regex-cache@^0.4.2:
   dependencies:
     is-equal-shallow "^0.1.3"
 
-regex-not@^1.0.0:
+regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   dependencies:
@@ -10170,7 +10204,7 @@ semver-utils@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/semver-utils/-/semver-utils-1.1.1.tgz#27d92fec34d27cfa42707d3b40d025ae9855f2df"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -11128,12 +11162,13 @@ to-regex-range@^2.1.0:
     repeat-string "^1.6.1"
 
 to-regex@^3.0.1:
-  version "3.0.1"
+  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
   dependencies:
-    define-property "^0.2.5"
+    define-property "^2.0.2"
-    extend-shallow "^2.0.1"
+    extend-shallow "^3.0.2"
-    regex-not "^1.0.0"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
 
 to-vfile@^2.1.1:
   version "2.2.0"
@@ -11181,6 +11216,10 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
+trim-newlines@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
@@ -11304,8 +11343,8 @@ uglifyjs-webpack-plugin@^0.4.6:
     webpack-sources "^1.0.1"
 
 uglifyjs-webpack-plugin@^1.1.6:
-  version "1.2.1"
+  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.1.tgz#e72ae01a31028b198b4631ec98da997dc3386fa2"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz#e7516d4367afdb715c3847841eb46f94c45ca2b9"
   dependencies:
     cacache "^10.0.1"
     find-cache-dir "^1.0.0"
@@ -11458,13 +11497,8 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 upath@^1.0.0:
-  version "1.0.2"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.2.tgz#80aaae5395abc5fd402933ae2f58694f0860204c"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
-  dependencies:
-    lodash.endswith "^4.2.1"
-    lodash.isfunction "^3.0.8"
-    lodash.isstring "^4.0.1"
-    lodash.startswith "^4.2.1"
 
 update-notifier@^2.3.0:
   version "2.3.0"
@@ -11987,11 +12021,11 @@ wordwrap@~1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
 worker-farm@^1.3.1, worker-farm@^1.4.1, worker-farm@^1.5.2:
-  version "1.5.2"
+  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.4.tgz#4debbe46b40edefcc717ebde74a90b1ae1e909a1"
   dependencies:
-    errno "^0.1.4"
+    errno "~0.1.7"
-    xtend "^4.0.1"
+    xtend "~4.0.1"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"