diff --git a/package-lock.json b/package-lock.json
index 9deba94364..e87a23579a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,9 +115,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "5.6.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz",
-          "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==",
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+          "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
           "dev": true
         }
       }
@@ -518,6 +518,16 @@
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
+      }
+    },
     "array-map": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
@@ -632,9 +642,9 @@
       "dev": true
     },
     "assetgraph": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/assetgraph/-/assetgraph-4.10.1.tgz",
-      "integrity": "sha512-jskhqvZKQKx8M9uz0/k3yqhbTWVGwhb1lPGqBV8E/67AFYz0qi/k1t8mK/H+hhhrkRB4zaOBvjt2H2oDdFIVIg==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/assetgraph/-/assetgraph-4.11.1.tgz",
+      "integrity": "sha512-sDVtUmaDhWBb6eLHLORmBG4t6SW1YvhqgyhZJ1iKYnjSEGMAJfYmf+iK4/yGgzxVqdyKCkgt5VezsZys8yCCgA==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.1",
@@ -666,16 +676,17 @@
         "normalizeurl": "^1.0.0",
         "perfectionist": "^2.4.0",
         "postcss": "^6.0.14",
-        "read-pkg-up": "^3.0.0",
+        "postcss-values-parser": "^1.5.0",
+        "read-pkg-up": "^4.0.0",
         "repeat-string": "^1.5.4",
         "schemes": "^1.0.1",
         "semver": "^5.3.0",
-        "sift": "^5.0.0",
-        "source-map": "^0.6.1",
+        "sift": "^6.0.0",
+        "source-map": "~0.6.1",
         "specificity": "^0.3.2",
         "sw-precache": "^5.2.0",
         "teepee": "^2.31.1",
-        "uglify-js": "3.4.0",
+        "uglify-js": "3.4.2",
         "urltools": "^0.4.1",
         "xmldom": "^0.1.27"
       },
@@ -706,6 +717,15 @@
           "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
           "dev": true
         },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
         "load-json-file": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -718,6 +738,40 @@
             "strip-bom": "^3.0.0"
           }
         },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "dev": true
+        },
         "parse-json": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -755,12 +809,12 @@
           }
         },
         "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+          "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
+            "find-up": "^3.0.0",
             "read-pkg": "^3.0.0"
           }
         },
@@ -773,20 +827,20 @@
       }
     },
     "assetgraph-builder": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/assetgraph-builder/-/assetgraph-builder-6.3.4.tgz",
-      "integrity": "sha512-TuSYtZjRS6JPGCY8e+YoW68WuUwAC29/4B62q/owAV3oXcKSBn34WJXYjS+GX4nHVZrtLwDjHpByIJIf68EIDg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/assetgraph-builder/-/assetgraph-builder-6.4.1.tgz",
+      "integrity": "sha512-n7Acp+I6hHyTywRb5nMEMgDnOFX/efJ7RJ6C0xRRiBR/BUZBh26y8EZdfRUVjYjv+0YfLzUyoSqOMmlJHV1i3g==",
       "dev": true,
       "requires": {
-        "assetgraph": "4.10.1",
+        "assetgraph": "4.11.1",
         "assetgraph-sprite": "^3.0.0",
         "bluebird": "^3.5.0",
-        "browserslist": "^3.2.0",
+        "browserslist": "^4.0.0",
         "chalk": "^2.3.2",
         "esanimate": "^1.1.0",
         "escodegen": "^1.8.0",
         "estraverse": "^4.2.0",
-        "express-processimage": "7.9.1",
+        "express-processimage": "8.0.0",
         "extend": "^3.0.0",
         "histogram": "^3.0.0",
         "jpegtran": "1.0.5",
@@ -1627,13 +1681,14 @@
       }
     },
     "browserslist": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
-      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.0.0.tgz",
+      "integrity": "sha512-fJq4izbUYHHNdQd/5Mco31HeL8U8dg5sSaj5boaDP17+aAe41CrxSZbQifIjaWw27iIilmy48z9PrVtelNJhbw==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000844",
-        "electron-to-chromium": "^1.3.47"
+        "caniuse-lite": "^1.0.30000859",
+        "electron-to-chromium": "^1.3.50",
+        "node-releases": "^1.0.0-alpha.10"
       }
     },
     "buffer": {
@@ -1855,9 +1910,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000851",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000851.tgz",
-      "integrity": "sha512-Y1ecA1cL9wg0vni8t33nBw/poX8ypm+2c3fbwAESj8cm4ufK9CBFQ1+nUK8Dp5dtFo5Fc3JzkI5DKmQbuIo6hQ==",
+      "version": "1.0.30000861",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000861.tgz",
+      "integrity": "sha512-aeEQ4kyd41qCl8XFbCjWgVBI3EOd66M9sC43MFn0kuD/vcrNqvoIAlKon4xdp8yMCYvVjdCltI3lgArj8I6cNA==",
       "dev": true
     },
     "canvas": {
@@ -3788,9 +3843,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.48",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz",
-      "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=",
+      "version": "1.3.50",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz",
+      "integrity": "sha1-dDi3b5K0G5GfP73TUPvQdX2s3fc=",
       "dev": true
     },
     "elegant-spinner": {
@@ -4139,6 +4194,24 @@
         }
       }
     },
+    "eslint-config-pretty-standard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-pretty-standard/-/eslint-config-pretty-standard-2.0.0.tgz",
+      "integrity": "sha512-1D3m+zhFlAAJAsE8YvhwOB+osPXdio99ehst21nNZcpZTOGF5m4OUgM9Fg2F25fF2wIDWEDXQr54ISTWGMdhug==",
+      "dev": true,
+      "requires": {
+        "eslint-plugin-promise": "3.6.0",
+        "eslint-plugin-react": "7.10.0"
+      },
+      "dependencies": {
+        "eslint-plugin-promise": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.6.0.tgz",
+          "integrity": "sha512-YQzM6TLTlApAr7Li8vWKR+K3WghjwKcYzY0d2roWap4SLK+kzuagJX/leTetIDWsFcTFnKNJXWupDCD6aZkP2Q==",
+          "dev": true
+        }
+      }
+    },
     "eslint-config-semistandard": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/eslint-config-semistandard/-/eslint-config-semistandard-12.0.1.tgz",
@@ -4260,6 +4333,29 @@
       "integrity": "sha512-2WO+ZFh7vxUKRfR0cOIMrWgYKdR6S1AlOezw6pC52B6oYpd5WFghN+QHxvrRdZMtbo8h3dfUZ2o1rWb0UPbKtg==",
       "dev": true
     },
+    "eslint-plugin-react": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.10.0.tgz",
+      "integrity": "sha512-18rzWn4AtbSUxFKKM7aCVcj5LXOhOKdwBino3KKWy4psxfPW0YtIbE8WNRDUdyHFL50BeLb6qFd4vpvNYyp7hw==",
+      "dev": true,
+      "requires": {
+        "doctrine": "^2.1.0",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^2.0.1",
+        "prop-types": "^15.6.2"
+      },
+      "dependencies": {
+        "has": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+          "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+          "dev": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        }
+      }
+    },
     "eslint-plugin-standard": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
@@ -4551,137 +4647,37 @@
       }
     },
     "express-processimage": {
-      "version": "7.9.1",
-      "resolved": "https://registry.npmjs.org/express-processimage/-/express-processimage-7.9.1.tgz",
-      "integrity": "sha512-bopnQv9NEeyd+WY5meBLF03VgCIki0mWHSnmXrmJVDiFybC+ZtW/d762itr+kvMZLFhvb1yFYZvaerxOpPoIyg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/express-processimage/-/express-processimage-8.0.0.tgz",
+      "integrity": "sha1-/fFT8ZyrTKFlvjgD0v4ePO6oY1o=",
       "dev": true,
       "requires": {
         "accepts": "^1.3.3",
-        "animated-gif-detector": "1.2.0",
-        "bluebird": "3.3.4",
-        "createerror": "1.1.0",
-        "exif-reader-paras20xx": "1.1.1",
-        "gm-papandreou": "1.23.0-patch1",
-        "hijackresponse": "2.0.1",
-        "httperrors": "2.0.1",
-        "icc": "0.0.2",
-        "inkscape": "1.1.1",
-        "jpegtran": "1.0.5",
-        "mime": "1.3.4",
-        "optimist": "0.6.1",
-        "optipng": "1.0.0",
-        "passerror": "1.1.1",
-        "pngcrush": "1.1.1",
-        "pngquant": "1.2.0",
-        "sharp": "0.20.2",
-        "underscore": "1.8.3"
+        "animated-gif-detector": "^1.2.0",
+        "bluebird": "^3.3.4",
+        "createerror": "^1.1.0",
+        "eslint-config-pretty-standard": "^2.0.0",
+        "exif-reader-paras20xx": "^1.1.1",
+        "gm-papandreou": "^1.23.0-patch1",
+        "hijackresponse": "^3.0.0",
+        "httperrors": "^2.0.1",
+        "icc": "^1.0.0",
+        "inkscape": "^1.1.1",
+        "jpegtran": "^1.0.5",
+        "mime": "^2.3.1",
+        "optimist": "^0.6.1",
+        "optipng": "^1.0.0",
+        "passerror": "^1.1.1",
+        "pngcrush": "^1.1.1",
+        "pngquant": "^1.2.0",
+        "sharp": "^0.20.4",
+        "underscore": "^1.8.3"
       },
       "dependencies": {
-        "bluebird": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.4.tgz",
-          "integrity": "sha1-94D+Q+GnplEPZ6vX0NeVM6QN3eY=",
-          "dev": true
-        },
-        "createerror": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.1.0.tgz",
-          "integrity": "sha1-KnEfWJzHyjhYZBQ5iFa4ow6koGs=",
-          "dev": true
-        },
-        "gettemporaryfilepath": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/gettemporaryfilepath/-/gettemporaryfilepath-0.0.1.tgz",
-          "integrity": "sha1-uKLHAUu1zUFTTpg7XKFgo3RwhGk=",
-          "dev": true
-        },
-        "httperrors": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/httperrors/-/httperrors-2.0.1.tgz",
-          "integrity": "sha1-Av68rsjZ1qnhrjdzkVuf2qIgRnI=",
-          "dev": true,
-          "requires": {
-            "createerror": "1.1.0"
-          }
-        },
-        "lru-cache": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-          "integrity": "sha1-2COIrpyWC+y+oMc7uet5tsbOmus=",
-          "dev": true
-        },
-        "memoizeasync": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/memoizeasync/-/memoizeasync-0.0.1.tgz",
-          "integrity": "sha1-WIPtGSx9OXLy+ynqQgLUmgk3Y/c=",
-          "dev": true
-        },
         "mime": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-          "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
-          "dev": true
-        },
-        "optipng": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/optipng/-/optipng-1.0.0.tgz",
-          "integrity": "sha1-fL6tpQmqQa9slekDe8Ry4hIjEME=",
-          "dev": true,
-          "requires": {
-            "gettemporaryfilepath": "0.0.1",
-            "memoizeasync": "0.0.1",
-            "optipng-bin": "3.0.2",
-            "which": "1.0.5"
-          }
-        },
-        "pngquant": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/pngquant/-/pngquant-1.2.0.tgz",
-          "integrity": "sha1-aufz/1vxWlzCTJ0ozmT4G5n/jFM=",
-          "dev": true,
-          "requires": {
-            "memoizeasync": "0.8.0",
-            "pngquant-bin": "3.1.1",
-            "which": "1.1.2"
-          },
-          "dependencies": {
-            "memoizeasync": {
-              "version": "0.8.0",
-              "resolved": "https://registry.npmjs.org/memoizeasync/-/memoizeasync-0.8.0.tgz",
-              "integrity": "sha1-2uSHOWVeYd5WYxCAwKqRMcoW59Q=",
-              "dev": true,
-              "requires": {
-                "lru-cache": "2.5.0",
-                "passerror": "0.0.2"
-              }
-            },
-            "passerror": {
-              "version": "0.0.2",
-              "resolved": "https://registry.npmjs.org/passerror/-/passerror-0.0.2.tgz",
-              "integrity": "sha1-xDCQYnt4057OltvHVB9z9z79n0o=",
-              "dev": true
-            },
-            "which": {
-              "version": "1.1.2",
-              "resolved": "https://registry.npmjs.org/which/-/which-1.1.2.tgz",
-              "integrity": "sha1-SGxIr23+zHp9z5xlWs8QjS3L3z0=",
-              "dev": true,
-              "requires": {
-                "is-absolute": "^0.1.7"
-              }
-            }
-          }
-        },
-        "underscore": {
-          "version": "1.8.3",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-          "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-          "dev": true
-        },
-        "which": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.0.5.tgz",
-          "integrity": "sha1-VjDWgZ3aaS8UZEYueVbLQsCEJzk=",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+          "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==",
           "dev": true
         }
       }
@@ -4748,9 +4744,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "5.6.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz",
-          "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==",
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+          "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
           "dev": true
         },
         "isarray": {
@@ -5119,15 +5115,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5144,22 +5138,19 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5283,15 +5274,13 @@
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5308,7 +5297,6 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5324,7 +5312,6 @@
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5433,8 +5420,7 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5448,7 +5434,6 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5586,7 +5571,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6164,9 +6148,9 @@
       }
     },
     "gulp-rename": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.3.tgz",
-      "integrity": "sha512-CmdPM0BjJ105QCX1fk+j7NGhiN/1rCl9HLGss+KllBS/tdYadpjTxqdKyh/5fNV+M3yjT1MFz5z93bXdrTyzAw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.3.0.tgz",
+      "integrity": "sha512-nEuZB7/9i0IZ8AXORTizl2QLP9tcC9uWc/s329zElBLJw1CfOhmMXBxwVlCRKjDyrWuhVP0uBKl61KeQ32TiCg==",
       "dev": true
     },
     "gulp-sourcemaps": {
@@ -6467,9 +6451,9 @@
       "dev": true
     },
     "hijackresponse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hijackresponse/-/hijackresponse-2.0.1.tgz",
-      "integrity": "sha1-RfXgybh9c7rYWPZgIb7Dd8c2uLM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hijackresponse/-/hijackresponse-3.0.0.tgz",
+      "integrity": "sha1-gZe3B3tymIImS9bh+xddBySeBW0=",
       "dev": true
     },
     "hipchat-notifier": {
@@ -6556,9 +6540,9 @@
       }
     },
     "html-minifier": {
-      "version": "3.5.16",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.16.tgz",
-      "integrity": "sha512-zP5EfLSpiLRp0aAgud4CQXPQZm9kXwWjR/cF0PfdOj+jjWnOaCgeZcll4kYXSvIBPeUMmyaSc7mM4IDtA+kboA==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.17.tgz",
+      "integrity": "sha512-O+StuKL0UWfwX5Zv4rFxd60DPcT5DVjGq1AlnP6VQ8wzudft/W4hx5Wl98aSYNwFBHY6XWJreRw/BehX4l+diQ==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.x",
@@ -6567,25 +6551,7 @@
         "he": "1.1.x",
         "param-case": "2.1.x",
         "relateurl": "0.2.x",
-        "uglify-js": "3.3.x"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "3.3.28",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.28.tgz",
-          "integrity": "sha512-68Rc/aA6cswiaQ5SrE979UJcXX+ADA1z33/ZsPd+fbAiVdjZ16OXdbtGO+rJUUBgK6qdf3SOPhQf3K/ybF5Miw==",
-          "dev": true,
-          "requires": {
-            "commander": "~2.15.0",
-            "source-map": "~0.6.1"
-          }
-        }
+        "uglify-js": "3.4.x"
       }
     },
     "htmlescape": {
@@ -6721,9 +6687,9 @@
       }
     },
     "icc": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/icc/-/icc-0.0.2.tgz",
-      "integrity": "sha1-bzA2/LqUSGYhZaBEpVs7yaGUeuU=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/icc/-/icc-1.0.0.tgz",
+      "integrity": "sha1-eVLg+JgiklHJDKmTg26XX+xygZg=",
       "dev": true
     },
     "iconv-lite": {
@@ -6811,9 +6777,9 @@
       "dev": true
     },
     "inkscape": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/inkscape/-/inkscape-1.1.1.tgz",
-      "integrity": "sha1-ov1m+tiIbSgxOm7ckaWQHfYQeJA=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/inkscape/-/inkscape-1.2.0.tgz",
+      "integrity": "sha512-3XbLQjnfEp4hEJI+mTgAWwtKNN10cxu68IIz+dl2wiNvvETyJrZ9fWlXNTx38p28VMdzeVPXaDsCIOmv3yBZUw==",
       "dev": true,
       "requires": {
         "async": "=0.2.9",
@@ -8225,9 +8191,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "5.6.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz",
-          "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==",
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+          "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
           "dev": true
         },
         "cssstyle": {
@@ -8321,6 +8287,15 @@
         "verror": "1.10.0"
       }
     },
+    "jsx-ast-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
+      "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.0.3"
+      }
+    },
     "karma": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz",
@@ -9734,6 +9709,15 @@
       "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
       "dev": true
     },
+    "loose-envify": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0"
+      }
+    },
     "loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -10603,9 +10587,9 @@
       }
     },
     "node-abi": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz",
-      "integrity": "sha512-pUlswqpHQ7zGPI9lGjZ4XDNIEUDbHxsltfIRb7dTnYdhgHWHOcB0MLZKLoCz6UMcGzSPG5wGl1HODZVQAUsH6w==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz",
+      "integrity": "sha512-b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==",
       "dev": true,
       "requires": {
         "semver": "^5.4.1"
@@ -10802,6 +10786,15 @@
         }
       }
     },
+    "node-releases": {
+      "version": "1.0.0-alpha.10",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.10.tgz",
+      "integrity": "sha512-BSQrRgOfN6L/MoKIa7pRUc7dHvflCXMcqyTBvphixcSsgJTuUd24vAFONuNfVsuwTyz28S1HEc9XN6ZKylk4Hg==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
     "node-status-codes": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
@@ -11104,9 +11097,9 @@
       "dev": true
     },
     "nwsapi": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.3.tgz",
-      "integrity": "sha512-zFJF9lOpg2+uicP0BQKOAfIOqeTp/p8PC669mewxgRkR1hGjne8BMUHk4wpRS9o5Z0icA5Nv04HmGkW31KfMKw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.4.tgz",
+      "integrity": "sha512-Zt6HRR6RcJkuj5/N9zeE7FN6YitRW//hK2wTOwX274IBphbY3Zf5+yn5mZ9v/SzAOTMjQNxZf9KkmPLWn0cV4g==",
       "dev": true
     },
     "nyc": {
@@ -14266,17 +14259,6 @@
             "passerror": "1.1.1"
           }
         },
-        "optipng-bin": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-3.1.4.tgz",
-          "integrity": "sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ=",
-          "dev": true,
-          "requires": {
-            "bin-build": "^2.0.0",
-            "bin-wrapper": "^3.0.0",
-            "logalot": "^2.0.0"
-          }
-        },
         "which": {
           "version": "1.2.14",
           "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
@@ -14289,9 +14271,9 @@
       }
     },
     "optipng-bin": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-3.0.2.tgz",
-      "integrity": "sha1-Mj2U7KSMV4j1HJ5RV321k7sAfBI=",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-3.1.4.tgz",
+      "integrity": "sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ=",
       "dev": true,
       "requires": {
         "bin-build": "^2.0.0",
@@ -15014,9 +14996,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "6.0.22",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
-      "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.1",
@@ -15483,10 +15465,21 @@
       "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
       "dev": true
     },
+    "postcss-values-parser": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz",
+      "integrity": "sha512-3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==",
+      "dev": true,
+      "requires": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
     "prebuild-install": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz",
-      "integrity": "sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz",
+      "integrity": "sha512-7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA==",
       "dev": true,
       "requires": {
         "detect-libc": "^1.0.3",
@@ -15797,6 +15790,16 @@
         "with-callback": "^1.0.2"
       }
     },
+    "prop-types": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
+      "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.3.1",
+        "object-assign": "^4.1.1"
+      }
+    },
     "proxy-agent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz",
@@ -16759,20 +16762,20 @@
       "dev": true
     },
     "sharp": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.20.2.tgz",
-      "integrity": "sha512-cFL2qUT9eyR29bI+gj5kQjWlj+VIuTGdcY/CErQqmwJ4FKTXhmdE6d/zwjmrAokzr5n547KQed8HFQsmyUv9uw==",
+      "version": "0.20.5",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.20.5.tgz",
+      "integrity": "sha512-ZgSX4EAmJzqcykEGZZtth1YHeb21LH4IRnFYtqvvx49ix3R7jxBbXJSrjXrCsVfyE1woaZR/JdsQCLLGs3cF6w==",
       "dev": true,
       "requires": {
         "color": "^3.0.0",
         "detect-libc": "^1.0.3",
-        "fs-copy-file-sync": "^1.0.1",
+        "fs-copy-file-sync": "^1.1.1",
         "nan": "^2.10.0",
         "npmlog": "^4.1.2",
-        "prebuild-install": "^2.5.3",
+        "prebuild-install": "^4.0.0",
         "semver": "^5.5.0",
         "simple-get": "^2.8.1",
-        "tar": "^4.4.1",
+        "tar": "^4.4.4",
         "tunnel-agent": "^0.6.0"
       },
       "dependencies": {
@@ -16837,9 +16840,9 @@
       }
     },
     "sift": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/sift/-/sift-5.1.0.tgz",
-      "integrity": "sha1-G78t+w63HlbEzH+1Z/vRNRtlAV4=",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/sift/-/sift-6.0.0.tgz",
+      "integrity": "sha1-+Tp3jly/BaUCTrw5HmsyURptH4I=",
       "dev": true
     },
     "signal-exit": {
@@ -16875,9 +16878,9 @@
       },
       "dependencies": {
         "is-arrayish": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz",
-          "integrity": "sha1-wt/DhquqDD4zxI2z/ocFnmkGXv0=",
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
           "dev": true
         }
       }
@@ -17973,9 +17976,9 @@
       }
     },
     "tar-fs": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz",
-      "integrity": "sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ==",
+      "version": "1.16.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz",
+      "integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==",
       "dev": true,
       "requires": {
         "chownr": "^1.0.1",
@@ -18485,9 +18488,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.0.tgz",
-      "integrity": "sha512-Jcf5naPkX3rVPSQpRn9Vm6Rr572I1gTtR9LnqKgXjmOgfYQ/QS0V2WRStFR53Bdj520M66aCZqt9uzYXgtGrJQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz",
+      "integrity": "sha512-/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw==",
       "dev": true,
       "requires": {
         "commander": "~2.15.0",
diff --git a/package.json b/package.json
index e5d541c574..f2fd08acd8 100644
--- a/package.json
+++ b/package.json
@@ -474,7 +474,7 @@
   },
   "devDependencies": {
     "@mocha/docdash": "^1.0.1",
-    "assetgraph-builder": "^6.3.4",
+    "assetgraph-builder": "^6.4.1",
     "browserify": "^16.2.2",
     "chai": "^4.1.2",
     "coffee-script": "^1.10.0",