diff --git a/.eslintrc b/.eslintrc
index 91ec6bdb95b..23beb60f33f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,15 +1,24 @@
 {
   "extends": [
     "mourner",
-    "plugin:flowtype/recommended"
+    "plugin:flowtype/recommended",
+    "plugin:import/recommended"
   ],
   "parser": "babel-eslint",
   "parserOptions": {
     "sourceType": "script"
   },
   "plugins": [
-    "flowtype"
+    "flowtype",
+    "import"
   ],
+  "settings": {
+    "import/ignore": [
+        "@mapbox/gl-matrix",
+        "@mapbox/shelf-pack",
+        "@mapbox/whoots-js"
+    ]
+  },
   "rules": {
     "array-bracket-spacing": "off",
     "block-scoped-var": "error",
diff --git a/.gitignore b/.gitignore
index 5e99fabcee8..d59787feb0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/rollup/build/
 /docs/components/api.json
 /dist/mapbox-gl-dev.js
 /dist/mapbox-gl.js
diff --git a/bench/benchmarks.js b/bench/benchmarks.js
index 4d9aa73e65c..c699ef286e8 100644
--- a/bench/benchmarks.js
+++ b/bench/benchmarks.js
@@ -1,6 +1,8 @@
 // @flow
 
-require('../src').accessToken = require('./lib/access_token');
+import mapboxgl from '../src';
+import accessToken from './lib/access_token';
+mapboxgl.accessToken = accessToken;
 
 window.mapboxglVersions = window.mapboxglVersions || [];
 window.mapboxglBenchmarks = window.mapboxglBenchmarks || {};
@@ -13,19 +15,36 @@ function register(Benchmark) {
     window.mapboxglBenchmarks[Benchmark.name][version] = new Benchmark();
 }
 
-register(require('./benchmarks/layout'));
-register(require('./benchmarks/layout_dds'));
-register(require('./benchmarks/paint'));
-require('./benchmarks/layers').forEach(register);
-register(require('./benchmarks/map_load'));
-register(require('./benchmarks/style_validate'));
-register(require('./benchmarks/style_layer_create'));
-register(require('./benchmarks/query_point'));
-register(require('./benchmarks/query_box'));
-require('./benchmarks/expressions').forEach(register);
-register(require('./benchmarks/filter_create'));
-register(require('./benchmarks/filter_evaluate'));
+import Layout from './benchmarks/layout';
+import LayoutDDS from './benchmarks/layout_dds';
+import Paint from './benchmarks/paint';
+import LayerBenchmarks from './benchmarks/layers';
+import Load from './benchmarks/map_load';
+import Validate from './benchmarks/style_validate';
+import StyleLayerCreate from './benchmarks/style_layer_create';
+import QueryPoint from './benchmarks/query_point';
+import QueryBox from './benchmarks/query_box';
+import ExpressionBenchmarks from './benchmarks/expressions';
+import FilterCreate from './benchmarks/filter_create';
+import FilterEvaluate from './benchmarks/filter_evaluate';
 
+register(Layout);
+register(LayoutDDS);
+register(Paint);
+LayerBenchmarks.forEach(register);
+register(Load);
+register(Validate);
+register(StyleLayerCreate);
+register(QueryPoint);
+register(QueryBox);
+ExpressionBenchmarks.forEach(register);
+register(FilterCreate);
+register(FilterEvaluate);
+
+import getWorkerPool from '../src/util/global_worker_pool';
+// Set up the worker blob URL--written to window.mapboxGlWorkerUrl before this
+// module is executed--before acquiring workers.
+mapboxgl.workerUrl = window.mapboxGlWorkerUrl;
 // Ensure the global worker pool is never drained. Browsers have resource limits
 // on the max number of workers that can be created per page.
-require('../src/util/global_worker_pool')().acquire(-1);
+getWorkerPool().acquire(-1);
diff --git a/bench/benchmarks/expressions.js b/bench/benchmarks/expressions.js
index f77322b990c..dfa65767dbe 100644
--- a/bench/benchmarks/expressions.js
+++ b/bench/benchmarks/expressions.js
@@ -1,11 +1,12 @@
 // @flow
 
-const Benchmark = require('../lib/benchmark');
-const accessToken = require('../lib/access_token');
-const spec = require('../../src/style-spec/reference/latest');
-const convertFunction = require('../../src/style-spec/function/convert');
-const {isFunction, createFunction} = require('../../src/style-spec/function');
-const {createPropertyExpression} = require('../../src/style-spec/expression');
+import Benchmark from '../lib/benchmark';
+
+import accessToken from '../lib/access_token';
+import spec from '../../src/style-spec/reference/latest';
+import convertFunction from '../../src/style-spec/function/convert';
+import { isFunction, createFunction } from '../../src/style-spec/function';
+import { createPropertyExpression } from '../../src/style-spec/expression';
 
 import type {StylePropertySpecification} from '../../src/style-spec/style-spec';
 import type {StylePropertyExpression} from '../../src/style-spec/expression';
@@ -102,7 +103,7 @@ class ExpressionEvaluate extends ExpressionBenchmark {
     }
 }
 
-module.exports = [
+export default [
     FunctionCreate,
     FunctionConvert,
     FunctionEvaluate,
diff --git a/bench/benchmarks/filter_create.js b/bench/benchmarks/filter_create.js
index d5bec17847f..a8d45c903c7 100644
--- a/bench/benchmarks/filter_create.js
+++ b/bench/benchmarks/filter_create.js
@@ -1,13 +1,14 @@
 // @flow
 
-const Benchmark = require('../lib/benchmark');
-const createFilter = require('../../src/style-spec/feature_filter');
-const filters = require('../data/filters.json');
+import Benchmark from '../lib/benchmark';
 
-module.exports = class FilterCreate extends Benchmark {
+import createFilter from '../../src/style-spec/feature_filter';
+import filters from '../data/filters.json';
+
+export default class FilterCreate extends Benchmark {
     bench() {
         for (const filter of filters) {
             createFilter(filter.filter);
         }
     }
-};
+}
diff --git a/bench/benchmarks/filter_evaluate.js b/bench/benchmarks/filter_evaluate.js
index e07c270c7e0..041470c0fa7 100644
--- a/bench/benchmarks/filter_evaluate.js
+++ b/bench/benchmarks/filter_evaluate.js
@@ -1,12 +1,12 @@
 
-const Benchmark = require('../lib/benchmark');
-const VectorTile = require('@mapbox/vector-tile').VectorTile;
-const Pbf = require('pbf');
-const createFilter = require('../../src/style-spec/feature_filter');
-const filters = require('../data/filters.json');
-const assert = require('assert');
+import Benchmark from '../lib/benchmark';
+import { VectorTile } from '@mapbox/vector-tile';
+import Pbf from 'pbf';
+import createFilter from '../../src/style-spec/feature_filter';
+import filters from '../data/filters.json';
+import assert from 'assert';
 
-module.exports = class FilterEvaluate extends Benchmark {
+export default class FilterEvaluate extends Benchmark {
     setup() {
         return fetch('/bench/data/785.vector.pbf')
             .then(response => response.arrayBuffer())
@@ -46,4 +46,4 @@ module.exports = class FilterEvaluate extends Benchmark {
             }
         }
     }
-};
+}
diff --git a/bench/benchmarks/layers.js b/bench/benchmarks/layers.js
index 29d71f1e1ee..470c5a139b7 100644
--- a/bench/benchmarks/layers.js
+++ b/bench/benchmarks/layers.js
@@ -1,7 +1,7 @@
 
-const Benchmark = require('../lib/benchmark');
-const createMap = require('../lib/create_map');
-const style = require('../data/empty.json');
+import Benchmark from '../lib/benchmark';
+import createMap from '../lib/create_map';
+import style from '../data/empty.json';
 
 function generateLayers(layer) {
     const generated = [];
@@ -100,41 +100,44 @@ class LayerFillExtrusion extends LayerBenchmark {
 }
 
 class LayerHeatmap extends LayerBenchmark {
-    constructor() {
-        super();
-
-        this.layerStyle = Object.assign({}, style, {
-            sources: {
-                'heatmap': {
-                    'type': 'geojson',
-                    'data': require('../data/naturalearth-land.json'),
-                    'maxzoom': 23
-                }
-            },
-            layers: generateLayers({
-                'id': 'layer',
-                'type': 'heatmap',
-                'source': 'heatmap',
-                'paint': {
-                    "heatmap-radius": 50,
-                    "heatmap-weight": {
-                        "stops": [[0, 0.5], [4, 2]]
+    setup() {
+        return fetch('/bench/data/naturalearth-land.json')
+            .then(response => response.json())
+            .then(data => {
+                this.layerStyle = Object.assign({}, style, {
+                    sources: {
+                        'heatmap': {
+                            'type': 'geojson',
+                            'data': data,
+                            'maxzoom': 23
+                        }
                     },
-                    "heatmap-intensity": 0.9,
-                    "heatmap-color": [
-                        "interpolate",
-                        ["linear"],
-                        ["heatmap-density"],
-                        0, "rgba(0, 0, 255, 0)",
-                        0.1, "royalblue",
-                        0.3, "cyan",
-                        0.5, "lime",
-                        0.7, "yellow",
-                        1, "red"
-                    ]
-                }
+                    layers: generateLayers({
+                        'id': 'layer',
+                        'type': 'heatmap',
+                        'source': 'heatmap',
+                        'paint': {
+                            "heatmap-radius": 50,
+                            "heatmap-weight": {
+                                "stops": [[0, 0.5], [4, 2]]
+                            },
+                            "heatmap-intensity": 0.9,
+                            "heatmap-color": [
+                                "interpolate",
+                                ["linear"],
+                                ["heatmap-density"],
+                                0, "rgba(0, 0, 255, 0)",
+                                0.1, "royalblue",
+                                0.3, "cyan",
+                                0.5, "lime",
+                                0.7, "yellow",
+                                1, "red"
+                            ]
+                        }
+                    })
+                });
             })
-        });
+            .then(() => super.setup());
     }
 }
 
@@ -214,7 +217,7 @@ class LayerSymbol extends LayerBenchmark {
 }
 
 
-module.exports = [
+export default [
     LayerBackground,
     LayerCircle,
     LayerFill,
diff --git a/bench/benchmarks/layout.js b/bench/benchmarks/layout.js
index 1b76258a7a6..b8ac7bbdaf3 100644
--- a/bench/benchmarks/layout.js
+++ b/bench/benchmarks/layout.js
@@ -1,28 +1,22 @@
 // @flow
 
-const Benchmark = require('../lib/benchmark');
-const createStyle = require('../lib/create_style');
-
-const VT = require('@mapbox/vector-tile');
-const Protobuf = require('pbf');
-const assert = require('assert');
-const promisify = require('pify');
-
-const WorkerTile = require('../../src/source/worker_tile');
-const StyleLayerIndex = require('../../src/style/style_layer_index');
-const deref = require('../../src/style-spec/deref');
-const {OverscaledTileID} = require('../../src/source/tile_id');
-
-const {
-    normalizeStyleURL,
-    normalizeSourceURL,
-    normalizeTileURL
-} = require('../../src/util/mapbox');
+import Benchmark from '../lib/benchmark';
+
+import createStyle from '../lib/create_style';
+import VT from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import assert from 'assert';
+import promisify from 'pify';
+import WorkerTile from '../../src/source/worker_tile';
+import StyleLayerIndex from '../../src/style/style_layer_index';
+import deref from '../../src/style-spec/deref';
+import { OverscaledTileID } from '../../src/source/tile_id';
+import { normalizeStyleURL, normalizeSourceURL, normalizeTileURL } from '../../src/util/mapbox';
 
 import type {TileJSON} from '../../src/types/tilejson';
 
 // Note: this class is extended in turn by the LayoutDDS benchmark.
-module.exports = class Layout extends Benchmark {
+export default class Layout extends Benchmark {
     glyphs: Object;
     icons: Object;
     workerTile: WorkerTile;
@@ -136,4 +130,4 @@ module.exports = class Layout extends Benchmark {
 
         return promise;
     }
-};
+}
diff --git a/bench/benchmarks/layout_dds.js b/bench/benchmarks/layout_dds.js
index 5610c670a13..af3812c50ad 100644
--- a/bench/benchmarks/layout_dds.js
+++ b/bench/benchmarks/layout_dds.js
@@ -1,11 +1,12 @@
 // @flow
 
-const Layout = require('./layout');
-const {OverscaledTileID} = require('../../src/source/tile_id');
+import Layout from './layout';
+
+import { OverscaledTileID } from '../../src/source/tile_id';
 
 const LAYER_COUNT = 2;
 
-module.exports = class LayoutDDS extends Layout {
+export default class LayoutDDS extends Layout {
     tileIDs(): Array<OverscaledTileID> {
         return [
             new OverscaledTileID(15, 0, 15, 9373, 12535)
@@ -92,4 +93,4 @@ module.exports = class LayoutDDS extends Layout {
 
         return Promise.resolve(style);
     }
-};
+}
diff --git a/bench/benchmarks/map_load.js b/bench/benchmarks/map_load.js
index 7852aefa704..8d54de97346 100644
--- a/bench/benchmarks/map_load.js
+++ b/bench/benchmarks/map_load.js
@@ -1,8 +1,8 @@
 
-const Benchmark = require('../lib/benchmark');
-const createMap = require('../lib/create_map');
+import Benchmark from '../lib/benchmark';
+import createMap from '../lib/create_map';
 
-module.exports = class MapLoad extends Benchmark {
+export default class MapLoad extends Benchmark {
     bench() {
         return createMap({
             style: {
@@ -12,4 +12,4 @@ module.exports = class MapLoad extends Benchmark {
             }
         }).then(map => map.remove());
     }
-};
+}
diff --git a/bench/benchmarks/paint.js b/bench/benchmarks/paint.js
index bcab11907e0..c996ac9e02e 100644
--- a/bench/benchmarks/paint.js
+++ b/bench/benchmarks/paint.js
@@ -1,12 +1,12 @@
 
-const Benchmark = require('../lib/benchmark');
-const createMap = require('../lib/create_map');
+import Benchmark from '../lib/benchmark';
+import createMap from '../lib/create_map';
 
 const width = 1024;
 const height = 768;
 const zooms = [4, 8, 11, 13, 15, 17];
 
-module.exports = class Paint extends Benchmark {
+export default class Paint extends Benchmark {
     setup() {
         return Promise.all(zooms.map(zoom => {
             return createMap({
@@ -34,4 +34,4 @@ module.exports = class Paint extends Benchmark {
             map.remove();
         }
     }
-};
+}
diff --git a/bench/benchmarks/query_box.js b/bench/benchmarks/query_box.js
index bb51e361c1d..53f2b3a10be 100644
--- a/bench/benchmarks/query_box.js
+++ b/bench/benchmarks/query_box.js
@@ -1,12 +1,12 @@
 
-const Benchmark = require('../lib/benchmark');
-const createMap = require('../lib/create_map');
+import Benchmark from '../lib/benchmark';
+import createMap from '../lib/create_map';
 
 const width = 1024;
 const height = 768;
 const zooms = [4, 8, 11, 13, 15, 17];
 
-module.exports = class QueryBox extends Benchmark {
+export default class QueryBox extends Benchmark {
     setup() {
         return Promise.all(zooms.map(zoom => {
             return createMap({
@@ -30,4 +30,4 @@ module.exports = class QueryBox extends Benchmark {
             map.remove();
         }
     }
-};
+}
diff --git a/bench/benchmarks/query_point.js b/bench/benchmarks/query_point.js
index 3bb37a8be47..3d5150b1067 100644
--- a/bench/benchmarks/query_point.js
+++ b/bench/benchmarks/query_point.js
@@ -1,6 +1,6 @@
 
-const Benchmark = require('../lib/benchmark');
-const createMap = require('../lib/create_map');
+import Benchmark from '../lib/benchmark';
+import createMap from '../lib/create_map';
 
 const width = 1024;
 const height = 768;
@@ -17,7 +17,7 @@ for (let x = 0; x < d; x++) {
     }
 }
 
-module.exports = class QueryPoint extends Benchmark {
+export default class QueryPoint extends Benchmark {
     setup() {
         return Promise.all(zooms.map(zoom => {
             return createMap({
@@ -43,4 +43,4 @@ module.exports = class QueryPoint extends Benchmark {
             map.remove();
         }
     }
-};
+}
diff --git a/bench/benchmarks/style_layer_create.js b/bench/benchmarks/style_layer_create.js
index 7ba3a163632..83e2293cf8e 100644
--- a/bench/benchmarks/style_layer_create.js
+++ b/bench/benchmarks/style_layer_create.js
@@ -1,10 +1,10 @@
 
-const Benchmark = require('../lib/benchmark');
-const accessToken = require('../lib/access_token');
-const StyleLayer = require('../../src/style/style_layer');
-const deref = require('../../src/style-spec/deref');
+import Benchmark from '../lib/benchmark';
+import accessToken from '../lib/access_token';
+import createStyleLayer from '../../src/style/create_style_layer';
+import deref from '../../src/style-spec/deref';
 
-module.exports = class StyleLayerCreate extends Benchmark {
+export default class StyleLayerCreate extends Benchmark {
     setup() {
         return fetch(`https://api.mapbox.com/styles/v1/mapbox/streets-v9?access_token=${accessToken}`)
             .then(response => response.json())
@@ -13,7 +13,7 @@ module.exports = class StyleLayerCreate extends Benchmark {
 
     bench() {
         for (const layer of this.layers) {
-            StyleLayer.create(layer);
+            createStyleLayer(layer);
         }
     }
-};
+}
diff --git a/bench/benchmarks/style_validate.js b/bench/benchmarks/style_validate.js
index b1d13a0e8de..363520614c9 100644
--- a/bench/benchmarks/style_validate.js
+++ b/bench/benchmarks/style_validate.js
@@ -1,9 +1,9 @@
 
-const Benchmark = require('../lib/benchmark');
-const accessToken = require('../lib/access_token');
-const validateStyle = require('../../src/style-spec/validate_style.min');
+import Benchmark from '../lib/benchmark';
+import accessToken from '../lib/access_token';
+import validateStyle from '../../src/style-spec/validate_style.min';
 
-module.exports = class StyleValidate extends Benchmark {
+export default class StyleValidate extends Benchmark {
     setup() {
         return fetch(`https://api.mapbox.com/styles/v1/mapbox/streets-v9?access_token=${accessToken}`)
             .then(response => response.json())
@@ -13,4 +13,4 @@ module.exports = class StyleValidate extends Benchmark {
     bench() {
         validateStyle(this.json);
     }
-};
+}
diff --git a/bench/benchmarks_view.js b/bench/benchmarks_view.js
index 09a596d09c1..101e8d041a7 100644
--- a/bench/benchmarks_view.js
+++ b/bench/benchmarks_view.js
@@ -1,13 +1,8 @@
-const React = require('react');
-const ReactDOM = require('react-dom');
-const d3 = require('d3');
-const Axis = require('./lib/axis');
-const {
-    summaryStatistics,
-    regression,
-    kde,
-    probabilitiesOfSuperiority
-} = require('./lib/statistics');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import * as d3 from 'd3';
+import Axis from './lib/axis';
+import { summaryStatistics, regression, kde, probabilitiesOfSuperiority } from './lib/statistics';
 
 const versionColor = d3.scaleOrdinal(['#1b9e77', '#7570b3', '#d95f02']);
 const formatSample = d3.format(".3r");
diff --git a/bench/lib/access_token.js b/bench/lib/access_token.js
index f817a73d6cb..905ad26ba9f 100644
--- a/bench/lib/access_token.js
+++ b/bench/lib/access_token.js
@@ -8,7 +8,7 @@ const accessToken = (
 
 localStorage.setItem('accessToken', accessToken);
 
-module.exports = accessToken;
+export default accessToken;
 
 function getURLParameter(name) {
     const regexp = new RegExp(`[?&]${name}=([^&#]*)`, 'i');
diff --git a/bench/lib/axis.js b/bench/lib/axis.js
index 909cc710c07..567d59330b3 100644
--- a/bench/lib/axis.js
+++ b/bench/lib/axis.js
@@ -1,4 +1,4 @@
-const React = require('react');
+import React from 'react';
 
 function identity(x) {
     return x;
@@ -82,4 +82,4 @@ class Axis extends React.Component {
     }
 }
 
-module.exports = Axis;
+export default Axis;
diff --git a/bench/lib/benchmark.js b/bench/lib/benchmark.js
index fa68b4fcffd..ee44cdb2deb 100644
--- a/bench/lib/benchmark.js
+++ b/bench/lib/benchmark.js
@@ -125,4 +125,4 @@ class Benchmark {
     }
 }
 
-module.exports = Benchmark;
+export default Benchmark;
diff --git a/bench/lib/create_map.js b/bench/lib/create_map.js
index d44daeea5e0..cde19b4e5d7 100644
--- a/bench/lib/create_map.js
+++ b/bench/lib/create_map.js
@@ -1,9 +1,10 @@
 // @flow
 
-const Map = require('../../src/ui/map');
-const browser = require('../../src/util/browser');
+import Map from '../../src/ui/map';
 
-module.exports = function (options: any): Promise<Map> {
+import browser from '../../src/util/browser';
+
+export default function (options: any): Promise<Map> {
     return new Promise((resolve, reject) => {
         const container = document.createElement('div');
         container.style.width = `${options.width || 512}px`;
@@ -33,4 +34,4 @@ module.exports = function (options: any): Promise<Map> {
             .on('error', (e) => reject(e.error))
             .on('remove', () => container.remove());
     });
-};
+}
diff --git a/bench/lib/create_style.js b/bench/lib/create_style.js
index 36a8ba7f074..95c0ea85a79 100644
--- a/bench/lib/create_style.js
+++ b/bench/lib/create_style.js
@@ -1,7 +1,8 @@
 // @flow
 
-const Style = require('../../src/style/style');
-const {Evented} = require('../../src/util/evented');
+import Style from '../../src/style/style';
+
+import { Evented } from '../../src/util/evented';
 
 class StubMap extends Evented {
     _transformRequest(url) {
@@ -9,7 +10,7 @@ class StubMap extends Evented {
     }
 }
 
-module.exports = function (styleJSON: StyleSpecification): Promise<Style> {
+export default function (styleJSON: StyleSpecification): Promise<Style> {
     return new Promise((resolve, reject) => {
         const style = new Style((new StubMap(): any));
         style.loadJSON(styleJSON);
@@ -18,4 +19,4 @@ module.exports = function (styleJSON: StyleSpecification): Promise<Style> {
             .on('style.load', () => resolve(style))
             .on('error', reject);
     });
-};
+}
diff --git a/bench/lib/statistics.js b/bench/lib/statistics.js
index a8e286f7c20..ef919d325e7 100644
--- a/bench/lib/statistics.js
+++ b/bench/lib/statistics.js
@@ -1,13 +1,6 @@
-const d3 = require('d3');
+import * as d3 from 'd3';
 
-module.exports = {
-    summaryStatistics,
-    regression,
-    kde,
-    probabilitiesOfSuperiority
-};
-
-function probabilitiesOfSuperiority(before, after) {
+export function probabilitiesOfSuperiority(before, after) {
     const timerPrecision = 0.005;
 
     let superiorCount = 0;
@@ -29,7 +22,7 @@ function probabilitiesOfSuperiority(before, after) {
     };
 }
 
-function summaryStatistics(data) {
+export function summaryStatistics(data) {
     const variance = d3.variance(data);
     const sorted = data.slice().sort(d3.ascending);
     const [q1, q2, q3] = [.25, .5, .75].map((d) => d3.quantile(sorted, d));
@@ -69,7 +62,7 @@ function summaryStatistics(data) {
     };
 }
 
-function regression(measurements) {
+export function regression(measurements) {
     const result = [];
     for (let i = 0, n = 1; i + n < measurements.length; i += n, n++) {
         const subset = measurements.slice(i, i + n);
@@ -98,7 +91,7 @@ function leastSquaresRegression(data) {
     return { correlation, slope, intercept, data };
 }
 
-function kde(samples, summary, ticks) {
+export function kde(samples, summary, ticks) {
     const kernel = kernelEpanechnikov;
 
     if (samples.length === 0) {
diff --git a/bench/rollup_config_benchmarks.js b/bench/rollup_config_benchmarks.js
new file mode 100644
index 00000000000..23f4a9bca20
--- /dev/null
+++ b/bench/rollup_config_benchmarks.js
@@ -0,0 +1,51 @@
+import sourcemaps from 'rollup-plugin-sourcemaps';
+import replace from 'rollup-plugin-replace';
+import {plugins as basePlugins} from '../build/rollup_plugins';
+
+const plugins = () => basePlugins().concat(
+    replace({
+        'process.env.BENCHMARK_VERSION': JSON.stringify(process.env.BENCHMARK_VERSION),
+        'process.env.MAPBOX_ACCESS_TOKEN': JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN),
+        'process.env.MapboxAccessToken': JSON.stringify(process.env.MapboxAccessToken),
+        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+    })
+);
+
+const config = [{
+    input: ['bench/benchmarks.js', 'src/source/worker.js'],
+    output: {
+        dir: 'rollup/build',
+        format: 'amd',
+        sourcemap: 'inline'
+    },
+    experimentalCodeSplitting: true,
+    plugins: plugins()
+}, {
+    input: 'rollup/benchmarks.js',
+    output: {
+        file: 'bench/benchmarks_generated.js',
+        format: 'umd',
+        sourcemap: 'inline',
+        intro: `
+let shared, worker;
+function define(_, module) {
+if (!shared) {
+    shared = module;
+} else if (!worker) {
+    worker = module;
+} else {
+    const workerBundleString = 'const sharedModule = {}; (' + shared + ')(sharedModule); (' + worker + ')(sharedModule);'
+
+    const sharedModule = {};
+    shared(sharedModule);
+    window.mapboxGlWorkerUrl = window.URL.createObjectURL(new Blob([workerBundleString], { type: 'text/javascript' }));
+    module(sharedModule);
+}
+}
+`
+    },
+    plugins: [sourcemaps()],
+}];
+
+export default config;
+
diff --git a/bench/rollup_config_benchmarks_view.js b/bench/rollup_config_benchmarks_view.js
new file mode 100644
index 00000000000..ff6d00fd632
--- /dev/null
+++ b/bench/rollup_config_benchmarks_view.js
@@ -0,0 +1,25 @@
+import replace from 'rollup-plugin-replace';
+import {plugins as basePlugins} from '../build/rollup_plugins';
+
+const plugins = () => basePlugins().concat(
+    replace({
+        'process.env.BENCHMARK_VERSION': JSON.stringify(process.env.BENCHMARK_VERSION),
+        'process.env.MAPBOX_ACCESS_TOKEN': JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN),
+        'process.env.MapboxAccessToken': JSON.stringify(process.env.MapboxAccessToken),
+        // should we rewrite this as 'production' if BUILD==='production'?
+        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+    })
+);
+
+const config = [{
+    input: 'bench/benchmarks_view.js',
+    output: {
+        file: 'bench/benchmarks_view_generated.js',
+        format: 'umd',
+        sourcemap: 'inline'
+    },
+    plugins: plugins()
+}];
+
+export default config;
+
diff --git a/build/flow-remove-types.js b/build/flow-remove-types.js
new file mode 100644
index 00000000000..e67a9200924
--- /dev/null
+++ b/build/flow-remove-types.js
@@ -0,0 +1,68 @@
+/*
+ * Temporary patch to work around
+ * https://github.com/standard-things/esm/issues/119.
+ *
+ * Upstream PR: https://github.com/flowtype/flow-remove-types/pull/62
+ */
+
+var flowRemoveTypes = require('flow-remove-types');
+var pirates = require('pirates');
+
+// Supported options:
+//
+//   - all: Transform all files, not just those with a @flow comment.
+//   - includes: A Regexp/String to determine which files should be transformed.
+//               (alias: include)
+//   - excludes: A Regexp/String to determine which files should not be
+//               transformed, defaults to ignoring /node_modules/, provide null
+//               to exclude nothing. (alias: exclude)
+var options;
+module.exports = function setOptions(newOptions) {
+  options = newOptions;
+}
+
+var jsLoader = require.extensions['.js'];
+var exts = [ '.js', '.mjs', '.jsx', '.flow', '.es6' ];
+
+var revert = pirates.addHook(function hook(code, filename) {
+  try {
+    var patched = flowRemoveTypes(code, options);
+    return patched.toString();
+  }
+  catch (e) {
+    e.message = filename + ': ' + e.message;
+    throw e;
+  }
+}, { exts, matcher: shouldTransform });
+
+function shouldTransform(filename) {
+  var includes = options && regexpPattern(options.includes || options.include);
+  var excludes =
+    options && 'excludes' in options ? regexpPattern(options.excludes) :
+    options && 'exclude' in options ? regexpPattern(options.exclude) :
+    /\/node_modules\//;
+  return (!includes || includes.test(filename)) && !(excludes && excludes.test(filename));
+}
+
+// Given a null | string | RegExp | any, returns null | Regexp or throws a
+// more helpful error.
+function regexpPattern(pattern) {
+  if (!pattern) {
+    return pattern;
+  }
+  // A very simplified glob transform which allows passing legible strings like
+  // "myPath/*.js" instead of a harder to read RegExp like /\/myPath\/.*\.js/.
+  if (typeof pattern === 'string') {
+    pattern = pattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
+    if (pattern[0] !== '/') {
+      pattern = '/' + pattern;
+    }
+    return new RegExp(pattern);
+  }
+  if (typeof pattern.test === 'function') {
+    return pattern;
+  }
+  throw new Error(
+    'flow-remove-types: includes and excludes must be RegExp or path strings. Got: ' + pattern
+  );
+}
diff --git a/build/generate-access-token-script.js b/build/generate-access-token-script.js
new file mode 100644
index 00000000000..0eb7d3d60bf
--- /dev/null
+++ b/build/generate-access-token-script.js
@@ -0,0 +1,11 @@
+/* eslint-disable */
+'use strict';
+const fs = require('fs');
+const path = require('path');
+const script = fs.readFileSync(path.join(__dirname, '../debug/access_token.js'), 'utf-8')
+    .replace('process.env.MapboxAccessToken',
+        JSON.stringify(process.env.MapboxAccessToken))
+    .replace('process.env.MAPBOX_ACCESS_TOKEN',
+        JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN));
+
+fs.writeFileSync(path.join(__dirname, '../debug/access_token_generated.js'), script);
diff --git a/build/generate-struct-arrays.js b/build/generate-struct-arrays.js
index a0ad45b0f8c..aad8fdf1c9c 100644
--- a/build/generate-struct-arrays.js
+++ b/build/generate-struct-arrays.js
@@ -10,9 +10,8 @@
 
 'use strict'; // eslint-disable-line strict
 
-require('flow-remove-types/register');
-
 const fs = require('fs');
+
 const ejs = require('ejs');
 const util = require('../src/util/util');
 const {createLayout, viewTypes} = require('../src/util/struct_array');
@@ -72,7 +71,7 @@ function createStructArrayType(name: string, layout: StructArrayLayout, includeS
             includeStructAccessors
         });
     } else {
-        arrayTypeEntries.add(`${arrayClass}: ${layoutClass}`);
+        arrayTypeEntries.add(`${layoutClass} as ${arrayClass}`);
     }
 }
 
@@ -118,33 +117,53 @@ function camelize (str) {
 
 global.camelize = camelize;
 
-createStructArrayType('pos', require('../src/data/pos_attributes'));
-createStructArrayType('raster_bounds', require('../src/data/raster_bounds_attributes'));
+const posAttributes = require('../src/data/pos_attributes').default;
+const rasterBoundsAttributes = require('../src/data/raster_bounds_attributes').default;
+
+createStructArrayType('pos', posAttributes);
+createStructArrayType('raster_bounds', rasterBoundsAttributes);
+
+const circleAttributes = require('../src/data/bucket/circle_attributes').default;
+const fillAttributes = require('../src/data/bucket/fill_attributes').default;
+const fillExtrusionAttributes = require('../src/data/bucket/fill_extrusion_attributes').default ;
+const lineAttributes = require('../src/data/bucket/line_attributes').default;
 
 // layout vertex arrays
 const layoutAttributes = {
-    circle: require('../src/data/bucket/circle_attributes'),
-    fill: require('../src/data/bucket/fill_attributes'),
-    'fill-extrusion': require('../src/data/bucket/fill_extrusion_attributes'),
-    heatmap: require('../src/data/bucket/circle_attributes'),
-    line: require('../src/data/bucket/line_attributes')
+    circle: circleAttributes,
+    fill: fillAttributes,
+    'fill-extrusion': fillExtrusionAttributes,
+    heatmap: circleAttributes,
+    line: lineAttributes
 };
 for (const name in layoutAttributes) {
     createStructArrayType(`${name.replace(/-/g, '_')}_layout`, layoutAttributes[name]);
 }
 
 // symbol layer specific arrays
-const symbolAttributes = require('../src/data/bucket/symbol_attributes');
-createStructArrayType(`symbol_layout`, symbolAttributes.symbolLayoutAttributes);
-createStructArrayType(`symbol_dynamic_layout`, symbolAttributes.dynamicLayoutAttributes);
-createStructArrayType(`symbol_opacity`, symbolAttributes.placementOpacityAttributes);
-createStructArrayType('collision_box', symbolAttributes.collisionBox, true);
-createStructArrayType(`collision_box_layout`, symbolAttributes.collisionBoxLayout);
-createStructArrayType(`collision_circle_layout`, symbolAttributes.collisionCircleLayout);
-createStructArrayType(`collision_vertex`, symbolAttributes.collisionVertexAttributes);
-createStructArrayType('placed_symbol', symbolAttributes.placement, true);
-createStructArrayType('glyph_offset', symbolAttributes.glyphOffset, true);
-createStructArrayType('symbol_line_vertex', symbolAttributes.lineVertex, true);
+const {
+    symbolLayoutAttributes,
+    dynamicLayoutAttributes,
+    placementOpacityAttributes,
+    collisionBox,
+    collisionBoxLayout,
+    collisionCircleLayout,
+    collisionVertexAttributes,
+    placement,
+    glyphOffset,
+    lineVertex
+} = require('../src/data/bucket/symbol_attributes');
+
+createStructArrayType(`symbol_layout`, symbolLayoutAttributes);
+createStructArrayType(`symbol_dynamic_layout`, dynamicLayoutAttributes);
+createStructArrayType(`symbol_opacity`, placementOpacityAttributes);
+createStructArrayType('collision_box', collisionBox, true);
+createStructArrayType(`collision_box_layout`, collisionBoxLayout);
+createStructArrayType(`collision_circle_layout`, collisionCircleLayout);
+createStructArrayType(`collision_vertex`, collisionVertexAttributes);
+createStructArrayType('placed_symbol', placement, true);
+createStructArrayType('glyph_offset', glyphOffset, true);
+createStructArrayType('symbol_line_vertex', lineVertex, true);
 
 // feature index array
 createStructArrayType('feature_index', createLayout([
@@ -195,19 +214,17 @@ fs.writeFileSync('src/data/array_types.js',
     `// This file is generated. Edit build/generate-struct-arrays.js, then run \`yarn run codegen\`.
 // @flow
 
-const assert = require('assert');
-const {StructArray} = require('../util/struct_array');
-const {Struct} = require('../util/struct_array');
-const {register} = require('../util/web_worker_transfer');
-const Point = require('@mapbox/point-geometry');
+import assert from 'assert';
+import {Struct, StructArray} from '../util/struct_array';
+import {register} from '../util/web_worker_transfer';
+import Point from '@mapbox/point-geometry';
 
 ${layouts.map(structArrayLayoutJs).join('\n')}
 
 ${arraysWithStructAccessors.map(structArrayJs).join('\n')}
 
-module.exports = {
+export {
     ${layouts.map(layout => layout.className).join(',\n    ')},
-    ${[...arrayTypeEntries].join(',\n    ')},
-    ${arraysWithStructAccessors.map(array => array.arrayClass).join(',\n    ')}
-};\n`);
+    ${[...arrayTypeEntries].join(',\n    ')}
+};`);
 
diff --git a/build/generate-style-code.js b/build/generate-style-code.js
index e19cf875d4d..c648c6d50d2 100644
--- a/build/generate-style-code.js
+++ b/build/generate-style-code.js
@@ -1,8 +1,7 @@
 'use strict';
 
-require('flow-remove-types/register');
-
 const fs = require('fs');
+
 const ejs = require('ejs');
 const spec = require('../src/style-spec/reference/v8');
 const Color = require('../src/style-spec/util/color');
diff --git a/build/rollup_plugin_minify_style_spec.js b/build/rollup_plugin_minify_style_spec.js
new file mode 100644
index 00000000000..9a51315c6b6
--- /dev/null
+++ b/build/rollup_plugin_minify_style_spec.js
@@ -0,0 +1,20 @@
+
+function replacer(k, v) {
+    return (k === 'doc' || k === 'example' || k === 'sdk-support') ? undefined : v;
+}
+
+export default function minifyStyleSpec() {
+    return {
+        name: 'minify-style-spec',
+        transform: (source, id) => {
+            if (!/style\-spec[\\/]reference[\\/]v[0-9]+\.json$/.test(id)) {
+                return;
+            }
+
+            return {
+                code: JSON.stringify(JSON.parse(source), replacer, 0),
+                map: {mappings: ''}
+            };
+        }
+    };
+}
diff --git a/build/rollup_plugins.js b/build/rollup_plugins.js
new file mode 100644
index 00000000000..1e62ef4e006
--- /dev/null
+++ b/build/rollup_plugins.js
@@ -0,0 +1,52 @@
+
+import flowRemoveTypes from 'flow-remove-types';
+import buble from 'rollup-plugin-buble';
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+import unassert from 'rollup-plugin-unassert';
+import json from 'rollup-plugin-json';
+import browserifyPlugin from 'rollup-plugin-browserify-transform';
+import brfs from 'brfs';
+import uglify from 'rollup-plugin-uglify';
+import sourcemaps from 'rollup-plugin-sourcemaps';
+import minifyStyleSpec from './rollup_plugin_minify_style_spec';
+
+const production = process.env.BUILD === 'production';
+
+// Common set of plugins/transformations shared across different rollup
+// builds (main mapboxgl bundle, style-spec package, benchmarks bundle)
+
+export const plugins = () => [
+    sourcemaps(),
+    flow(),
+    minifyStyleSpec(),
+    json(),
+    buble({transforms: {dangerousForOf: true}, objectAssign: "Object.assign"}),
+    production ? unassert() : false,
+    resolve({
+        browser: true,
+        preferBuiltins: false
+    }),
+    browserifyPlugin(brfs, {
+        include: 'src/shaders/index.js'
+    }),
+    commonjs({
+        namedExports: {
+            '@mapbox/gl-matrix': ['vec3', 'vec4', 'mat2', 'mat3', 'mat4']
+        }
+    }),
+    production ? uglify() : false
+].filter(Boolean);
+
+// Using this instead of rollup-plugin-flow due to
+// https://github.com/leebyron/rollup-plugin-flow/issues/5
+function flow() {
+    return {
+        name: 'flow-remove-types',
+        transform: (code) => ({
+            code: flowRemoveTypes(code).toString(),
+            map: null
+        })
+    };
+}
+
diff --git a/build/run-node b/build/run-node
new file mode 100755
index 00000000000..031968ba4e7
--- /dev/null
+++ b/build/run-node
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+node -r ./build/flow-remove-types -r @std/esm ${@}
diff --git a/build/run-tap b/build/run-tap
new file mode 100755
index 00000000000..e4b4edd8b4a
--- /dev/null
+++ b/build/run-tap
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+node_modules/.bin/tap --node-arg -r --node-arg ./build/flow-remove-types --node-arg -r --node-arg @std/esm ${@}
diff --git a/docs/components/example.js b/docs/components/example.js
index acb96835ce1..8537ec6c059 100644
--- a/docs/components/example.js
+++ b/docs/components/example.js
@@ -8,7 +8,7 @@ import TopNav from './top_nav';
 import {highlightMarkup} from './prism_highlight';
 import supported from '@mapbox/mapbox-gl-supported';
 import {copy} from 'execcommand-copy';
-import examples from '@mapbox/batfish/data/examples';
+import examples from '@mapbox/batfish/data/examples'; // eslint-disable-line import/no-unresolved
 import entries from 'object.entries';
 
 const tags = {
diff --git a/docs/components/expression-metadata.js b/docs/components/expression-metadata.js
index 7a4110fd2f3..3f3baa5e1e2 100644
--- a/docs/components/expression-metadata.js
+++ b/docs/components/expression-metadata.js
@@ -1,9 +1,9 @@
-const ref = require('../../src/style-spec/reference/latest');
-const toString = require('../../src/style-spec/expression/types').toString;
-const CompoundExpression = require('../../src/style-spec/expression/compound_expression').CompoundExpression;
+import ref from '../../src/style-spec/reference/latest';
+import { toString } from '../../src/style-spec/expression/types';
+import CompoundExpression from '../../src/style-spec/expression/compound_expression';
 
 // registers compound expressions
-require('../../src/style-spec/expression/definitions/index');
+import '../../src/style-spec/expression/definitions/index';
 
 const types = {
     '==': [{
diff --git a/docs/pages/api.js b/docs/pages/api.js
index 013e057472c..ac1113d151d 100644
--- a/docs/pages/api.js
+++ b/docs/pages/api.js
@@ -4,7 +4,7 @@ import LeftNav from '../components/left_nav';
 import TopNav from '../components/top_nav';
 import {highlightJavascript} from '../components/prism_highlight.js';
 import Quickstart from '../components/quickstart';
-import docs from '../components/api.json';
+import docs from '../components/api.json'; // eslint-disable-line import/no-unresolved
 import GithubSlugger from 'github-slugger';
 
 const meta = {
diff --git a/docs/pages/example/.eslintrc b/docs/pages/example/.eslintrc
index 05487f52657..ebf0cf4b759 100644
--- a/docs/pages/example/.eslintrc
+++ b/docs/pages/example/.eslintrc
@@ -1,28 +1,32 @@
 {
-  "parser": "espree",
-  "parserOptions": {
-      "ecmaVersion": 5
-  },
-  "plugins": ["html"],
-  "globals": {
-    "mapboxgl": true,
-    "MapboxGeocoder": true,
-    "MapboxDirections": true,
-    "turf": true,
-    "d3": true,
-    "Uint8Array": true
-  },
-  "rules": {
-    "flowtype/require-valid-file-annotation": [0],
-    "strict": "off",
-    "no-unused-vars": ["error", {"varsIgnorePattern": "map|popup"}],
-    "no-loop-func": "off",
-    "no-var": "off",
-    "prefer-arrow-callback": "off",
-    "prefer-template": "off"
-  },
-  "env": {
-    "es6": false,
-    "browser": true
+  "overrides": {
+      "files": ["*.html"],
+      "parser": "espree",
+      "parserOptions": {
+          "ecmaVersion": 5,
+          "sourceType": "script"
+      },
+      "plugins": ["html"],
+      "globals": {
+        "mapboxgl": true,
+        "MapboxGeocoder": true,
+        "MapboxDirections": true,
+        "turf": true,
+        "d3": true,
+        "Uint8Array": true
+      },
+      "rules": {
+        "flowtype/require-valid-file-annotation": [0],
+        "strict": "off",
+        "no-unused-vars": ["error", {"varsIgnorePattern": "map|popup"}],
+        "no-loop-func": "off",
+        "no-var": "off",
+        "prefer-arrow-callback": "off",
+        "prefer-template": "off"
+      },
+      "env": {
+        "es6": false,
+        "browser": true
+      }
   }
 }
diff --git a/docs/pages/example/mapbox-gl-geocoder-limit-region.html b/docs/pages/example/mapbox-gl-geocoder-limit-region.html
index 1d0b1364797..34b7522494f 100644
--- a/docs/pages/example/mapbox-gl-geocoder-limit-region.html
+++ b/docs/pages/example/mapbox-gl-geocoder-limit-region.html
@@ -24,11 +24,11 @@
     // the New South Wales region
     filter: function (item) {
         // returns true if item contains New South Wales region
-        return item.context.map((i) => {
+        return item.context.map(function (i) {
             // id is in the form {index}.{id} per https://github.com/mapbox/carmen/blob/master/carmen-geojson.md
             // this example attempts to find the `region` named `New South Wales`
             return (i.id.split('.').shift() === 'region' && i.text === 'New South Wales');
-        }).reduce((acc, cur) => {
+        }).reduce(function (acc, cur) {
             return acc || cur;
         });
     }
diff --git a/docs/pages/plugins.js b/docs/pages/plugins.js
index 3801a9e9410..ad30e24d4f9 100644
--- a/docs/pages/plugins.js
+++ b/docs/pages/plugins.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import slug from 'slugg';
 import {prefixUrl} from '@mapbox/batfish/modules/prefix-url';
-import md from '@mapbox/batfish/modules/md';
+import md from '@mapbox/batfish/modules/md'; // eslint-disable-line import/no-unresolved
 import PageShell from '../components/page_shell';
 import LeftNav from "../components/left_nav";
 import TopNav from "../components/top_nav";
diff --git a/docs/pages/style-spec.js b/docs/pages/style-spec.js
index 10eb1d15125..961946ed79b 100644
--- a/docs/pages/style-spec.js
+++ b/docs/pages/style-spec.js
@@ -7,8 +7,7 @@ import LeftNav from '../components/left_nav';
 import TopNav from '../components/top_nav';
 import {highlightJavascript, highlightJSON, highlightMarkup} from '../components/prism_highlight';
 import entries from 'object.entries';
-
-const ref = require('../../src/style-spec/reference/latest');
+import ref from '../../src/style-spec/reference/latest';
 
 const meta = {
     title: 'Mapbox Style Specification',
diff --git a/flow-typed/mapbox-gl-js-test.js b/flow-typed/mapbox-gl-js-test.js
index ae22f14c3ca..6ecb398333e 100644
--- a/flow-typed/mapbox-gl-js-test.js
+++ b/flow-typed/mapbox-gl-js-test.js
@@ -1,5 +1,5 @@
 // @flow
 declare module "mapbox-gl-js-test" {
     declare type CreateTest = (name: string, body: (test: CreateTest) => void) => void;
-    declare module.exports: CreateTest;
+    declare module.exports: { test: CreateTest };
 }
diff --git a/package.json b/package.json
index 4420bfea64c..d0ab29d3ad8 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "@mapbox/vector-tile": "^1.3.1",
     "@mapbox/whoots-js": "^3.0.0",
     "brfs": "^1.4.4",
-    "bubleify": "^0.7.0",
     "csscolorparser": "~1.0.2",
     "earcut": "^2.1.3",
     "geojson-rewind": "^0.3.0",
@@ -31,7 +30,6 @@
     "grid-index": "^1.0.0",
     "jsonlint-lines-primitives": "~1.6.0",
     "minimist": "0.0.8",
-    "package-json-versionify": "^1.0.2",
     "pbf": "^3.0.5",
     "quickselect": "^1.0.0",
     "rw": "^1.3.3",
@@ -40,28 +38,26 @@
     "supercluster": "^2.3.0",
     "through2": "^2.0.3",
     "tinyqueue": "^1.1.0",
-    "unassertify": "^2.0.0",
-    "unflowify": "^1.0.0",
-    "vt-pbf": "^3.0.1",
-    "webworkify": "^1.5.0"
+    "vt-pbf": "^3.0.1"
   },
   "devDependencies": {
-    "@mapbox/batfish": "^0.13.3",
+    "@mapbox/batfish": "^1.0.4",
     "@mapbox/mapbox-gl-rtl-text": "^0.1.1",
     "@mapbox/mapbox-gl-test-suite": "file:test/integration",
+    "@mapbox/rollup": "0.57.0-await.upstream.pr2035",
+    "@std/esm": "^0.21.7",
     "babel-eslint": "^7.0.0",
     "benchmark": "~2.1.0",
-    "browserify": "^14.0.0",
+    "browserify": "^16.1.0",
     "coveralls": "^2.11.8",
     "d3": "^4.12.0",
-    "derequire": "^2.0.6",
     "documentation": "5.3.3",
     "ejs": "^2.5.7",
-    "envify": "^4.0.0",
     "eslint": "4.1.1",
     "eslint-config-mourner": "^2.0.0",
     "eslint-plugin-flowtype": "^2.34.0",
     "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.9.0",
     "eslint-plugin-node": "^5.1.1",
     "eslint-plugin-react": "^7.3.0",
     "execcommand-copy": "^1.1.0",
@@ -76,15 +72,14 @@
     "jsdom": "^11.6.2",
     "json-stringify-pretty-compact": "^1.0.4",
     "lodash": "^4.16.0",
-    "minifyify": "^7.0.1",
     "mock-geolocation": "^1.0.11",
     "npm-run-all": "^4.0.1",
     "nyc": "^10.1.2",
     "object.entries": "^1.0.4",
+    "pirates": "^3.0.2",
     "pngjs": "^3.0.0",
     "prismjs": "^1.8.1",
     "prop-types": "^15.6.0",
-    "proxyquire": "^1.7.9",
     "raw-loader": "^0.5.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
@@ -93,46 +88,40 @@
     "remark-html": "^5.0.1",
     "remark-react": "^4.0.1",
     "request": "^2.79.0",
+    "rollup-plugin-browserify-transform": "^1.0.1",
+    "rollup-plugin-buble": "^0.18.0",
+    "rollup-plugin-commonjs": "^8.2.6",
+    "rollup-plugin-json": "^2.3.0",
+    "rollup-plugin-node-resolve": "3.0.0",
+    "rollup-plugin-replace": "^2.0.0",
+    "rollup-plugin-sourcemaps": "^0.4.2",
+    "rollup-plugin-uglify": "^3.0.0",
+    "rollup-plugin-unassert": "^0.2.0",
     "sinon": "^2.1.0",
     "slugg": "^1.2.1",
     "st": "^1.2.0",
     "stylelint": "^8.4.0",
     "stylelint-config-standard": "^18.0.0",
-    "tap": "^10.3.0",
-    "watchify": "^3.7.0"
-  },
-  "browserify": {
-    "transform": [
-      "unflowify",
-      [
-        "bubleify",
-        {
-          "bubleError": true,
-          "transforms": {
-            "dangerousForOf": true
-          },
-          "objectAssign": "Object.assign"
-        }
-      ],
-      "package-json-versionify",
-      "unassertify",
-      "brfs",
-      "./build/minifyify_style_spec",
-      "./build/strictify"
-    ]
+    "tap": "^10.3.0"
   },
   "browser": {
     "./src/util/window.js": "./src/util/browser/window.js",
     "./src/util/web_worker.js": "./src/util/browser/web_worker.js"
   },
+  "@std/esm": {
+    "cjs": true,
+    "esm": "js",
+    "sourceCache": true
+  },
   "scripts": {
-    "build-dev": "browserify src/index.js --debug --ignore-transform unassertify --standalone mapboxgl > dist/mapbox-gl-dev.js && tap --no-coverage test/build/dev.test.js",
-    "watch-dev": "watchify src/index.js --debug --ignore-transform unassertify --standalone mapboxgl --outfile dist/mapbox-gl-dev.js --verbose",
-    "build-min": "browserify src/index.js --debug --plugin [minifyify --map mapbox-gl.js.map --output dist/mapbox-gl.js.map] --standalone mapboxgl | derequire > dist/mapbox-gl.js && tap --no-coverage test/build/min.test.js",
-    "build-token": "browserify debug/access_token.js --debug --transform envify > debug/access_token_generated.js",
-    "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} browserify bench/benchmarks.js --debug --transform envify --outfile bench/benchmarks_generated.js --verbose",
-    "watch-benchmarks": "BENCHMARK_VERSION=\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\" watchify bench/benchmarks.js --debug --transform envify --outfile bench/benchmarks_generated.js --verbose",
-    "watch-benchmarks-view": "watchify bench/benchmarks_view.js --debug --outfile bench/benchmarks_view_generated.js --verbose",
+    "build-dev": "rollup -c --environment BUILD:dev && build/run-tap --no-coverage test/build/dev.test.js",
+    "watch-dev": "rollup -c --environment BUILD:dev --watch",
+    "build-min": "rollup -c --environment BUILD:production && build/run-tap --no-coverage test/build/min.test.js",
+    "build-token": "node build/generate-access-token-script.js",
+    "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js",
+    "build-benchmarks-view": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks_view.js",
+    "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js --watch",
+    "watch-benchmarks-view": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks_view.js --watch",
     "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .",
     "start": "run-p build-token watch-dev watch-benchmarks watch-benchmarks-view start-server",
     "start-debug": "run-p build-token watch-dev start-server",
@@ -147,7 +136,7 @@
     "test": "run-s lint lint-css test-flow test-unit",
     "test-suite": "run-s test-render test-query",
     "test-suite-clean": "find test/integration/{render,query}-tests -mindepth 2 -type d  -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r",
-    "test-unit": "tap --reporter classic --no-coverage test/unit",
+    "test-unit": "build/run-tap --reporter classic --no-coverage test/unit",
     "test-render": "node --max-old-space-size=2048 test/render.test.js",
     "test-query": "node test/query.test.js",
     "test-expressions": "node test/expression.test.js",
@@ -155,7 +144,8 @@
     "test-flow-cov": "flow-coverage-report -i 'src/**/*.js' -t html",
     "test-cov": "nyc --require=flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render",
     "prepublish": "in-publish && run-s build-dev build-min || not-in-publish",
-    "codegen": "node build/generate-style-code.js && flow-node build/generate-struct-arrays.js"
+    "remove-flow-types": "flow-remove-types -i node_modules -d src_untyped src",
+    "codegen": "build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js"
   },
   "files": [
     "build/",
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 00000000000..008b67ff752
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,56 @@
+import sourcemaps from 'rollup-plugin-sourcemaps';
+import {plugins} from './build/rollup_plugins';
+
+const production = process.env.BUILD === 'production';
+const outputFile = production ? 'dist/mapbox-gl.js' : 'dist/mapbox-gl-dev.js';
+
+const config = [{
+    // First, use code splitting to bundle GL JS into three "chunks":
+    // - rollup/build/index.js: the main module, plus all its dependencies not shared by the worker module
+    // - rollup/build/worker.js: the worker module, plus all dependencies not shared by the main module
+    // - rollup/build/chunk1.js: the set of modules that are dependencies of both the main module and the worker module
+    //
+    // This is also where we do all of our source transformations: removing
+    // flow annotations, transpiling ES6 features using buble, inlining shader
+    // sources as strings, etc.
+    input: ['src/index.js', 'src/source/worker.js'],
+    output: {
+        dir: 'rollup/build',
+        format: 'amd',
+        sourcemap: 'inline'
+    },
+    experimentalCodeSplitting: true,
+    plugins: plugins()
+}, {
+    // Next, bundle together the three "chunks" produced in the previous pass
+    // into a single, final bundle. See 'intro:' below and rollup/mapboxgl.js
+    // for details.
+    input: 'rollup/mapboxgl.js',
+    output: {
+        name: 'mapboxgl',
+        file: outputFile,
+        format: 'umd',
+        sourcemap: production ? true : 'inline',
+        intro: `
+let shared, worker, mapboxgl;
+// define gets called three times: one for each chunk. we rely on the order
+// they're imported to know which is which
+function define(_, chunk) {
+if (!shared) {
+    shared = chunk;
+} else if (!worker) {
+    worker = chunk;
+} else {
+    const workerBundleString = 'const sharedChunk = {}; (' + shared + ')(sharedChunk); (' + worker + ')(sharedChunk);'
+
+    const sharedChunk = {};
+    shared(sharedChunk);
+    mapboxgl = chunk(sharedChunk);
+    mapboxgl.workerUrl = window.URL.createObjectURL(new Blob([workerBundleString], { type: 'text/javascript' }));
+}
+}`
+    },
+    plugins: [sourcemaps()],
+}];
+
+export default config
diff --git a/rollup/benchmarks.js b/rollup/benchmarks.js
new file mode 100644
index 00000000000..9015caf94f9
--- /dev/null
+++ b/rollup/benchmarks.js
@@ -0,0 +1,4 @@
+import './build/chunk1';
+import './build/worker';
+import './build/benchmarks';
+
diff --git a/rollup/mapboxgl.js b/rollup/mapboxgl.js
new file mode 100644
index 00000000000..196d1036935
--- /dev/null
+++ b/rollup/mapboxgl.js
@@ -0,0 +1,47 @@
+//
+// Our custom intro provides a specialized "define()" function, called by the
+// AMD modules below, that sets up the worker blob URL and then executes the
+// main module, storing its exported value as 'mapboxgl'
+
+// The three "chunks" imported here are produced by a first Rollup pass,
+// which outputs them as AMD modules.
+
+// Shared dependencies, i.e.:
+/*
+define(['exports'], function (exports) {
+    // Code for all common dependencies
+    // Each module's exports are attached attached to 'exports' (with
+    // names rewritten to avoid collisions, etc.)
+})
+*/
+import './build/chunk1';
+
+// Worker and its unique dependencies, i.e.:
+/*
+define(['./chunk1.js'], function (__chunk1__js) {
+    //  Code for worker script and its unique dependencies.
+    //  Expects the output of 'chunk1' module to be passed in as an argument,
+    //  since all references to common deps look like, e.g.,
+    //  __chunk1__js.shapeText().
+});
+*/
+// When this wrapper function is passed to our custom define() above,
+// it gets stringified, together with the chunk1 wrapper (using
+// Function.toString()), and the resulting string of code is made into a
+// Blob URL that gets used by the main module to create the web workers.
+import './build/worker';
+
+// Main module and its unique dependencies
+/*
+define(['./chunk1.js'], function (__chunk1__js) {
+    //  Code for main GL JS module and its unique dependencies.
+    //  Expects the output of 'chunk1' module to be passed in as an argument,
+    //  since all references to common deps look like, e.g.,
+    //  __chunk1__js.shapeText().
+    //
+    //  Returns the actual mapboxgl (i.e. src/index.js)
+});
+*/
+import './build/index';
+
+export default mapboxgl;
diff --git a/src/data/array_types.js b/src/data/array_types.js
index fa105d1061e..30800dd3ed0 100644
--- a/src/data/array_types.js
+++ b/src/data/array_types.js
@@ -1,11 +1,10 @@
 // This file is generated. Edit build/generate-struct-arrays.js, then run `yarn run codegen`.
 // @flow
 
-const assert = require('assert');
-const {StructArray} = require('../util/struct_array');
-const {Struct} = require('../util/struct_array');
-const {register} = require('../util/web_worker_transfer');
-const Point = require('@mapbox/point-geometry');
+import assert from 'assert';
+import {Struct, StructArray} from '../util/struct_array';
+import {register} from '../util/web_worker_transfer';
+import Point from '@mapbox/point-geometry';
 
 
 /**
@@ -673,7 +672,7 @@ export type CollisionBox = CollisionBoxStruct;
 /**
  * @private
  */
-class CollisionBoxArray extends StructArrayLayout6i1ul2ui2i24 {
+export class CollisionBoxArray extends StructArrayLayout6i1ul2ui2i24 {
     /**
      * Return the CollisionBoxStruct at the given location in the array.
      * @param {number} index The index of the element.
@@ -740,7 +739,7 @@ export type PlacedSymbol = PlacedSymbolStruct;
 /**
  * @private
  */
-class PlacedSymbolArray extends StructArrayLayout2i2ui3ul3ui2f2ub40 {
+export class PlacedSymbolArray extends StructArrayLayout2i2ui3ul3ui2f2ub40 {
     /**
      * Return the PlacedSymbolStruct at the given location in the array.
      * @param {number} index The index of the element.
@@ -768,7 +767,7 @@ export type GlyphOffset = GlyphOffsetStruct;
 /**
  * @private
  */
-class GlyphOffsetArray extends StructArrayLayout1f4 {
+export class GlyphOffsetArray extends StructArrayLayout1f4 {
     getoffsetX(index: number) { return this.float32[index * 1 + 0]; }
     /**
      * Return the GlyphOffsetStruct at the given location in the array.
@@ -803,7 +802,7 @@ export type SymbolLineVertex = SymbolLineVertexStruct;
 /**
  * @private
  */
-class SymbolLineVertexArray extends StructArrayLayout3i6 {
+export class SymbolLineVertexArray extends StructArrayLayout3i6 {
     getx(index: number) { return this.int16[index * 3 + 0]; }
     gety(index: number) { return this.int16[index * 3 + 1]; }
     gettileUnitDistanceFromAnchor(index: number) { return this.int16[index * 3 + 2]; }
@@ -840,7 +839,7 @@ export type FeatureIndex = FeatureIndexStruct;
 /**
  * @private
  */
-class FeatureIndexArray extends StructArrayLayout1ul2ui8 {
+export class FeatureIndexArray extends StructArrayLayout1ul2ui8 {
     /**
      * Return the FeatureIndexStruct at the given location in the array.
      * @param {number} index The index of the element.
@@ -854,7 +853,7 @@ class FeatureIndexArray extends StructArrayLayout1ul2ui8 {
 register('FeatureIndexArray', FeatureIndexArray);
 
 
-module.exports = {
+export {
     StructArrayLayout2i4,
     StructArrayLayout4i8,
     StructArrayLayout2i4i12,
@@ -873,24 +872,19 @@ module.exports = {
     StructArrayLayout2ui4,
     StructArrayLayout2f8,
     StructArrayLayout4f16,
-    PosArray: StructArrayLayout2i4,
-    RasterBoundsArray: StructArrayLayout4i8,
-    CircleLayoutArray: StructArrayLayout2i4,
-    FillLayoutArray: StructArrayLayout2i4,
-    FillExtrusionLayoutArray: StructArrayLayout2i4i12,
-    HeatmapLayoutArray: StructArrayLayout2i4,
-    LineLayoutArray: StructArrayLayout4i4ub12,
-    SymbolLayoutArray: StructArrayLayout4i4ui16,
-    SymbolDynamicLayoutArray: StructArrayLayout3f12,
-    SymbolOpacityArray: StructArrayLayout1ul4,
-    CollisionBoxLayoutArray: StructArrayLayout2i2i2i12,
-    CollisionCircleLayoutArray: StructArrayLayout2i2i2i12,
-    CollisionVertexArray: StructArrayLayout2ub4,
-    TriangleIndexArray: StructArrayLayout3ui6,
-    LineIndexArray: StructArrayLayout2ui4,
-    CollisionBoxArray,
-    PlacedSymbolArray,
-    GlyphOffsetArray,
-    SymbolLineVertexArray,
-    FeatureIndexArray
+    StructArrayLayout2i4 as PosArray,
+    StructArrayLayout4i8 as RasterBoundsArray,
+    StructArrayLayout2i4 as CircleLayoutArray,
+    StructArrayLayout2i4 as FillLayoutArray,
+    StructArrayLayout2i4i12 as FillExtrusionLayoutArray,
+    StructArrayLayout2i4 as HeatmapLayoutArray,
+    StructArrayLayout4i4ub12 as LineLayoutArray,
+    StructArrayLayout4i4ui16 as SymbolLayoutArray,
+    StructArrayLayout3f12 as SymbolDynamicLayoutArray,
+    StructArrayLayout1ul4 as SymbolOpacityArray,
+    StructArrayLayout2i2i2i12 as CollisionBoxLayoutArray,
+    StructArrayLayout2i2i2i12 as CollisionCircleLayoutArray,
+    StructArrayLayout2ub4 as CollisionVertexArray,
+    StructArrayLayout3ui6 as TriangleIndexArray,
+    StructArrayLayout2ui4 as LineIndexArray
 };
diff --git a/src/data/bucket.js b/src/data/bucket.js
index dce714d53b5..0c4c4443431 100644
--- a/src/data/bucket.js
+++ b/src/data/bucket.js
@@ -69,7 +69,7 @@ export interface Bucket {
     destroy(): void;
 }
 
-module.exports = {
+const exported = {
     deserialize(input: Array<Bucket>, style: Style): {[string]: Bucket} {
         const output = {};
 
@@ -98,3 +98,9 @@ module.exports = {
         return output;
     }
 };
+
+export default exported;
+
+export const {
+    deserialize
+} = exported;
diff --git a/src/data/bucket/circle_attributes.js b/src/data/bucket/circle_attributes.js
index a721b44aca9..224721709b5 100644
--- a/src/data/bucket/circle_attributes.js
+++ b/src/data/bucket/circle_attributes.js
@@ -1,5 +1,9 @@
 // @flow
-const {createLayout} = require('../../util/struct_array');
-module.exports = createLayout([
+import { createLayout } from '../../util/struct_array';
+
+const layout = createLayout([
     {name: 'a_pos', components: 2, type: 'Int16'}
 ], 4);
+
+export default layout;
+export const {members, size, alignment} = layout;
diff --git a/src/data/bucket/circle_bucket.js b/src/data/bucket/circle_bucket.js
index c0ba80f61ac..361499ed483 100644
--- a/src/data/bucket/circle_bucket.js
+++ b/src/data/bucket/circle_bucket.js
@@ -1,13 +1,14 @@
 // @flow
 
-const {CircleLayoutArray} = require('../array_types');
-const layoutAttributes = require('./circle_attributes').members;
-const {SegmentVector} = require('../segment');
-const {ProgramConfigurationSet} = require('../program_configuration');
-const {TriangleIndexArray} = require('../index_array_type');
-const loadGeometry = require('../load_geometry');
-const EXTENT = require('../extent');
-const {register} = require('../../util/web_worker_transfer');
+import { CircleLayoutArray } from '../array_types';
+
+import { members as layoutAttributes } from './circle_attributes';
+import SegmentVector from '../segment';
+import { ProgramConfigurationSet } from '../program_configuration';
+import { TriangleIndexArray } from '../index_array_type';
+import loadGeometry from '../load_geometry';
+import EXTENT from '../extent';
+import { register } from '../../util/web_worker_transfer';
 
 import type {
     Bucket,
@@ -134,4 +135,4 @@ class CircleBucket<Layer: CircleStyleLayer | HeatmapStyleLayer> implements Bucke
 
 register('CircleBucket', CircleBucket, {omit: ['layers']});
 
-module.exports = CircleBucket;
+export default CircleBucket;
diff --git a/src/data/bucket/fill_attributes.js b/src/data/bucket/fill_attributes.js
index a721b44aca9..224721709b5 100644
--- a/src/data/bucket/fill_attributes.js
+++ b/src/data/bucket/fill_attributes.js
@@ -1,5 +1,9 @@
 // @flow
-const {createLayout} = require('../../util/struct_array');
-module.exports = createLayout([
+import { createLayout } from '../../util/struct_array';
+
+const layout = createLayout([
     {name: 'a_pos', components: 2, type: 'Int16'}
 ], 4);
+
+export default layout;
+export const {members, size, alignment} = layout;
diff --git a/src/data/bucket/fill_bucket.js b/src/data/bucket/fill_bucket.js
index 1a30b7ac68c..009c945a1c8 100644
--- a/src/data/bucket/fill_bucket.js
+++ b/src/data/bucket/fill_bucket.js
@@ -1,16 +1,17 @@
 // @flow
 
-const {FillLayoutArray} = require('../array_types');
-const layoutAttributes = require('./fill_attributes').members;
-const {SegmentVector} = require('../segment');
-const {ProgramConfigurationSet} = require('../program_configuration');
-const {LineIndexArray, TriangleIndexArray} = require('../index_array_type');
-const loadGeometry = require('../load_geometry');
-const earcut = require('earcut');
-const classifyRings = require('../../util/classify_rings');
-const assert = require('assert');
+import { FillLayoutArray } from '../array_types';
+
+import { members as layoutAttributes } from './fill_attributes';
+import SegmentVector from '../segment';
+import { ProgramConfigurationSet } from '../program_configuration';
+import { LineIndexArray, TriangleIndexArray } from '../index_array_type';
+import loadGeometry from '../load_geometry';
+import earcut from 'earcut';
+import classifyRings from '../../util/classify_rings';
+import assert from 'assert';
 const EARCUT_MAX_RINGS = 500;
-const {register} = require('../../util/web_worker_transfer');
+import { register } from '../../util/web_worker_transfer';
 
 import type {
     Bucket,
@@ -152,4 +153,4 @@ class FillBucket implements Bucket {
 
 register('FillBucket', FillBucket, {omit: ['layers']});
 
-module.exports = FillBucket;
+export default FillBucket;
diff --git a/src/data/bucket/fill_extrusion_attributes.js b/src/data/bucket/fill_extrusion_attributes.js
index 41a8efc6c59..52f3cdc264e 100644
--- a/src/data/bucket/fill_extrusion_attributes.js
+++ b/src/data/bucket/fill_extrusion_attributes.js
@@ -1,6 +1,10 @@
 // @flow
-const {createLayout} = require('../../util/struct_array');
-module.exports = createLayout([
+import { createLayout } from '../../util/struct_array';
+
+const layout = createLayout([
     {name: 'a_pos',          components: 2, type: 'Int16'},
     {name: 'a_normal_ed',    components: 4, type: 'Int16'},
 ], 4);
+
+export default layout;
+export const {members, size, alignment} = layout;
diff --git a/src/data/bucket/fill_extrusion_bucket.js b/src/data/bucket/fill_extrusion_bucket.js
index 8759106c238..5a477468aa5 100644
--- a/src/data/bucket/fill_extrusion_bucket.js
+++ b/src/data/bucket/fill_extrusion_bucket.js
@@ -1,17 +1,18 @@
 // @flow
 
-const {FillExtrusionLayoutArray} = require('../array_types');
-const layoutAttributes = require('./fill_extrusion_attributes').members;
-const {SegmentVector, MAX_VERTEX_ARRAY_LENGTH} = require('../segment');
-const {ProgramConfigurationSet} = require('../program_configuration');
-const {TriangleIndexArray} = require('../index_array_type');
-const loadGeometry = require('../load_geometry');
-const EXTENT = require('../extent');
-const earcut = require('earcut');
-const classifyRings = require('../../util/classify_rings');
-const assert = require('assert');
+import { FillExtrusionLayoutArray } from '../array_types';
+
+import { members as layoutAttributes } from './fill_extrusion_attributes';
+import SegmentVector from '../segment';
+import { ProgramConfigurationSet } from '../program_configuration';
+import { TriangleIndexArray } from '../index_array_type';
+import loadGeometry from '../load_geometry';
+import EXTENT from '../extent';
+import earcut from 'earcut';
+import classifyRings from '../../util/classify_rings';
+import assert from 'assert';
 const EARCUT_MAX_RINGS = 500;
-const {register} = require('../../util/web_worker_transfer');
+import { register } from '../../util/web_worker_transfer';
 
 import type {
     Bucket,
@@ -126,7 +127,7 @@ class FillExtrusionBucket implements Bucket {
                         const p2 = ring[p - 1];
 
                         if (!isBoundaryEdge(p1, p2)) {
-                            if (segment.vertexLength + 4 > MAX_VERTEX_ARRAY_LENGTH) {
+                            if (segment.vertexLength + 4 > SegmentVector.MAX_VERTEX_ARRAY_LENGTH) {
                                 segment = this.segments.prepareSegment(4, this.layoutVertexArray, this.indexArray);
                             }
 
@@ -154,7 +155,7 @@ class FillExtrusionBucket implements Bucket {
                 }
             }
 
-            if (segment.vertexLength + numVertices > MAX_VERTEX_ARRAY_LENGTH) {
+            if (segment.vertexLength + numVertices > SegmentVector.MAX_VERTEX_ARRAY_LENGTH) {
                 segment = this.segments.prepareSegment(numVertices, this.layoutVertexArray, this.indexArray);
             }
 
@@ -201,7 +202,7 @@ class FillExtrusionBucket implements Bucket {
 
 register('FillExtrusionBucket', FillExtrusionBucket, {omit: ['layers']});
 
-module.exports = FillExtrusionBucket;
+export default FillExtrusionBucket;
 
 function isBoundaryEdge(p1, p2) {
     return (p1.x === p2.x && (p1.x < 0 || p1.x > EXTENT)) ||
diff --git a/src/data/bucket/heatmap_bucket.js b/src/data/bucket/heatmap_bucket.js
index fb3a1df41c4..2c77b85635e 100644
--- a/src/data/bucket/heatmap_bucket.js
+++ b/src/data/bucket/heatmap_bucket.js
@@ -1,7 +1,8 @@
 // @flow
 
-const CircleBucket = require('./circle_bucket');
-const {register} = require('../../util/web_worker_transfer');
+import CircleBucket from './circle_bucket';
+
+import { register } from '../../util/web_worker_transfer';
 
 import type HeatmapStyleLayer from '../../style/style_layer/heatmap_style_layer';
 
@@ -13,4 +14,4 @@ class HeatmapBucket extends CircleBucket<HeatmapStyleLayer> {
 
 register('HeatmapBucket', HeatmapBucket, {omit: ['layers']});
 
-module.exports = HeatmapBucket;
+export default HeatmapBucket;
diff --git a/src/data/bucket/line_attributes.js b/src/data/bucket/line_attributes.js
index ea2c23c14e8..90ce0c0ace6 100644
--- a/src/data/bucket/line_attributes.js
+++ b/src/data/bucket/line_attributes.js
@@ -1,6 +1,10 @@
 // @flow
-const {createLayout} = require('../../util/struct_array');
-module.exports = createLayout([
+import { createLayout } from '../../util/struct_array';
+
+const layout = createLayout([
     {name: 'a_pos_normal', components: 4, type: 'Int16'},
     {name: 'a_data', components: 4, type: 'Uint8'}
 ], 4);
+
+export default layout;
+export const {members, size, alignment} = layout;
diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
index 72b93575fc4..f3527545bf7 100644
--- a/src/data/bucket/line_bucket.js
+++ b/src/data/bucket/line_bucket.js
@@ -1,14 +1,16 @@
 // @flow
 
-const {LineLayoutArray} = require('../array_types');
-const layoutAttributes = require('./line_attributes').members;
-const {SegmentVector} = require('../segment');
-const {ProgramConfigurationSet} = require('../program_configuration');
-const {TriangleIndexArray} = require('../index_array_type');
-const loadGeometry = require('../load_geometry');
-const EXTENT = require('../extent');
-const vectorTileFeatureTypes = require('@mapbox/vector-tile').VectorTileFeature.types;
-const {register} = require('../../util/web_worker_transfer');
+import { LineLayoutArray } from '../array_types';
+
+import { members as layoutAttributes } from './line_attributes';
+import SegmentVector from '../segment';
+import { ProgramConfigurationSet } from '../program_configuration';
+import { TriangleIndexArray } from '../index_array_type';
+import loadGeometry from '../load_geometry';
+import EXTENT from '../extent';
+import mvt from '@mapbox/vector-tile';
+const vectorTileFeatureTypes = mvt.VectorTileFeature.types;
+import { register } from '../../util/web_worker_transfer';
 
 import type {
     Bucket,
@@ -510,4 +512,4 @@ class LineBucket implements Bucket {
 
 register('LineBucket', LineBucket, {omit: ['layers']});
 
-module.exports = LineBucket;
+export default LineBucket;
diff --git a/src/data/bucket/symbol_attributes.js b/src/data/bucket/symbol_attributes.js
index e787637a5e8..e76fd544175 100644
--- a/src/data/bucket/symbol_attributes.js
+++ b/src/data/bucket/symbol_attributes.js
@@ -1,88 +1,84 @@
 // @flow
 
-const {createLayout} = require('../../util/struct_array');
-import type {StructArrayLayout} from '../../util/struct_array';
+import { createLayout } from '../../util/struct_array';
 
-const symbolLayoutAttributes = createLayout([
+export const symbolLayoutAttributes = createLayout([
     {name: 'a_pos_offset',  components: 4, type: 'Int16'},
     {name: 'a_data',        components: 4, type: 'Uint16'}
 ]);
 
-const dynamicLayoutAttributes = createLayout([
+export const dynamicLayoutAttributes = createLayout([
     { name: 'a_projected_pos', components: 3, type: 'Float32' }
 ], 4);
 
-const placementOpacityAttributes = createLayout([
+export const placementOpacityAttributes = createLayout([
     { name: 'a_fade_opacity', components: 1, type: 'Uint32' }
 ], 4);
 
-const collisionVertexAttributes = createLayout([
+export const collisionVertexAttributes = createLayout([
     { name: 'a_placed', components: 2, type: 'Uint8' }
 ], 4);
 
-const symbolAttributes: {[string]: StructArrayLayout} = {
-    symbolLayoutAttributes,
-    dynamicLayoutAttributes,
-    placementOpacityAttributes,
-    collisionVertexAttributes,
-    collisionBox: createLayout([
-        // the box is centered around the anchor point
-        { type: 'Int16', name: 'anchorPointX' },
-        { type: 'Int16', name: 'anchorPointY' },
+export const collisionBox = createLayout([
+    // the box is centered around the anchor point
+    { type: 'Int16', name: 'anchorPointX' },
+    { type: 'Int16', name: 'anchorPointY' },
 
-        // distances to the edges from the anchor
-        { type: 'Int16', name: 'x1' },
-        { type: 'Int16', name: 'y1' },
-        { type: 'Int16', name: 'x2' },
-        { type: 'Int16', name: 'y2' },
+    // distances to the edges from the anchor
+    { type: 'Int16', name: 'x1' },
+    { type: 'Int16', name: 'y1' },
+    { type: 'Int16', name: 'x2' },
+    { type: 'Int16', name: 'y2' },
 
-        // the index of the feature in the original vectortile
-        { type: 'Uint32', name: 'featureIndex' },
-        // the source layer the feature appears in
-        { type: 'Uint16', name: 'sourceLayerIndex' },
-        // the bucket the feature appears in
-        { type: 'Uint16', name: 'bucketIndex' },
+    // the index of the feature in the original vectortile
+    { type: 'Uint32', name: 'featureIndex' },
+    // the source layer the feature appears in
+    { type: 'Uint16', name: 'sourceLayerIndex' },
+    // the bucket the feature appears in
+    { type: 'Uint16', name: 'bucketIndex' },
 
-        // collision circles for lines store their distance to the anchor in tile units
-        // so that they can be ignored if the projected label doesn't extend into
-        // the box area
-        { type: 'Int16', name: 'radius' },
-        { type: 'Int16', name: 'signedDistanceFromAnchor' }
-    ]),
-    collisionBoxLayout: createLayout([ // used to render collision boxes for debugging purposes
-        {name: 'a_pos',        components: 2, type: 'Int16'},
-        {name: 'a_anchor_pos', components: 2, type: 'Int16'},
-        {name: 'a_extrude',    components: 2, type: 'Int16'}
-    ], 4),
-    collisionCircleLayout: createLayout([ // used to render collision circles for debugging purposes
-        {name: 'a_pos',        components: 2, type: 'Int16'},
-        {name: 'a_anchor_pos', components: 2, type: 'Int16'},
-        {name: 'a_extrude',    components: 2, type: 'Int16'}
-    ], 4),
-    placement: createLayout([
-        { type: 'Int16', name: 'anchorX' },
-        { type: 'Int16', name: 'anchorY' },
-        { type: 'Uint16', name: 'glyphStartIndex' },
-        { type: 'Uint16', name: 'numGlyphs' },
-        { type: 'Uint32', name: 'vertexStartIndex' },
-        { type: 'Uint32', name: 'lineStartIndex' },
-        { type: 'Uint32', name: 'lineLength' },
-        { type: 'Uint16', name: 'segment' },
-        { type: 'Uint16', name: 'lowerSize' },
-        { type: 'Uint16', name: 'upperSize' },
-        { type: 'Float32', name: 'lineOffsetX' },
-        { type: 'Float32', name: 'lineOffsetY' },
-        { type: 'Uint8', name: 'writingMode' },
-        { type: 'Uint8', name: 'hidden' }
-    ]),
-    glyphOffset: createLayout([
-        { type: 'Float32', name: 'offsetX' }
-    ]),
-    lineVertex: createLayout([
-        { type: 'Int16', name: 'x' },
-        { type: 'Int16', name: 'y' },
-        { type: 'Int16', name: 'tileUnitDistanceFromAnchor' }
-    ])
-};
+    // collision circles for lines store their distance to the anchor in tile units
+    // so that they can be ignored if the projected label doesn't extend into
+    // the box area
+    { type: 'Int16', name: 'radius' },
+    { type: 'Int16', name: 'signedDistanceFromAnchor' }
+]);
+
+export const collisionBoxLayout = createLayout([ // used to render collision boxes for debugging purposes
+    {name: 'a_pos',        components: 2, type: 'Int16'},
+    {name: 'a_anchor_pos', components: 2, type: 'Int16'},
+    {name: 'a_extrude',    components: 2, type: 'Int16'}
+], 4);
+
+export const collisionCircleLayout = createLayout([ // used to render collision circles for debugging purposes
+    {name: 'a_pos',        components: 2, type: 'Int16'},
+    {name: 'a_anchor_pos', components: 2, type: 'Int16'},
+    {name: 'a_extrude',    components: 2, type: 'Int16'}
+], 4);
 
-module.exports = symbolAttributes;
+export const placement = createLayout([
+    { type: 'Int16', name: 'anchorX' },
+    { type: 'Int16', name: 'anchorY' },
+    { type: 'Uint16', name: 'glyphStartIndex' },
+    { type: 'Uint16', name: 'numGlyphs' },
+    { type: 'Uint32', name: 'vertexStartIndex' },
+    { type: 'Uint32', name: 'lineStartIndex' },
+    { type: 'Uint32', name: 'lineLength' },
+    { type: 'Uint16', name: 'segment' },
+    { type: 'Uint16', name: 'lowerSize' },
+    { type: 'Uint16', name: 'upperSize' },
+    { type: 'Float32', name: 'lineOffsetX' },
+    { type: 'Float32', name: 'lineOffsetY' },
+    { type: 'Uint8', name: 'writingMode' },
+    { type: 'Uint8', name: 'hidden' }
+]);
+
+export const glyphOffset = createLayout([
+    { type: 'Float32', name: 'offsetX' }
+]);
+
+export const lineVertex = createLayout([
+    { type: 'Int16', name: 'x' },
+    { type: 'Int16', name: 'y' },
+    { type: 'Int16', name: 'tileUnitDistanceFromAnchor' }
+]);
diff --git a/src/data/bucket/symbol_bucket.js b/src/data/bucket/symbol_bucket.js
index 00c0ebe44d7..b123f655879 100644
--- a/src/data/bucket/symbol_bucket.js
+++ b/src/data/bucket/symbol_bucket.js
@@ -1,38 +1,22 @@
 // @flow
 
-const {
-    symbolLayoutAttributes,
-    collisionVertexAttributes,
-    collisionBoxLayout,
-    collisionCircleLayout,
-    dynamicLayoutAttributes
-} = require('./symbol_attributes');
-
-const {
-    SymbolLayoutArray,
-    SymbolDynamicLayoutArray,
-    SymbolOpacityArray,
-    CollisionBoxLayoutArray,
-    CollisionCircleLayoutArray,
-    CollisionVertexArray,
-    PlacedSymbolArray,
-    GlyphOffsetArray,
-    SymbolLineVertexArray
-} = require('../array_types');
-
-const Point = require('@mapbox/point-geometry');
-const {SegmentVector} = require('../segment');
-const {ProgramConfigurationSet} = require('../program_configuration');
-const {TriangleIndexArray, LineIndexArray} = require('../index_array_type');
-const transformText = require('../../symbol/transform_text');
-const mergeLines = require('../../symbol/mergelines');
-const scriptDetection = require('../../util/script_detection');
-const loadGeometry = require('../load_geometry');
-const vectorTileFeatureTypes = require('@mapbox/vector-tile').VectorTileFeature.types;
-const verticalizePunctuation = require('../../util/verticalize_punctuation');
-const Anchor = require('../../symbol/anchor');
-const {getSizeData} = require('../../symbol/symbol_size');
-const {register} = require('../../util/web_worker_transfer');
+import { symbolLayoutAttributes, collisionVertexAttributes, collisionBoxLayout, collisionCircleLayout, dynamicLayoutAttributes } from './symbol_attributes';
+
+import { SymbolLayoutArray, SymbolDynamicLayoutArray, SymbolOpacityArray, CollisionBoxLayoutArray, CollisionCircleLayoutArray, CollisionVertexArray, PlacedSymbolArray, GlyphOffsetArray, SymbolLineVertexArray } from '../array_types';
+import Point from '@mapbox/point-geometry';
+import SegmentVector from '../segment';
+import { ProgramConfigurationSet } from '../program_configuration';
+import { TriangleIndexArray, LineIndexArray } from '../index_array_type';
+import transformText from '../../symbol/transform_text';
+import mergeLines from '../../symbol/mergelines';
+import {allowsVerticalWritingMode} from '../../util/script_detection';
+import loadGeometry from '../load_geometry';
+import mvt from '@mapbox/vector-tile';
+const vectorTileFeatureTypes = mvt.VectorTileFeature.types;
+import {verticalizedCharacterMap} from '../../util/verticalize_punctuation';
+import Anchor from '../../symbol/anchor';
+import { getSizeData } from '../../symbol/symbol_size';
+import { register } from '../../util/web_worker_transfer';
 
 import type {Feature as ExpressionFeature} from '../../style-spec/expression';
 import type {
@@ -394,11 +378,11 @@ class SymbolBucket implements Bucket {
                 const fontStack = textFont.evaluate(feature).join(',');
                 const stack = stacks[fontStack] = stacks[fontStack] || {};
                 const textAlongLine = layout.get('text-rotation-alignment') === 'map' && layout.get('symbol-placement') === 'line';
-                const allowsVerticalWritingMode = scriptDetection.allowsVerticalWritingMode(text);
+                const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text);
                 for (let i = 0; i < text.length; i++) {
                     stack[text.charCodeAt(i)] = true;
-                    if (textAlongLine && allowsVerticalWritingMode) {
-                        const verticalChar = verticalizePunctuation.lookup[text.charAt(i)];
+                    if (textAlongLine && doesAllowVerticalWritingMode) {
+                        const verticalChar = verticalizedCharacterMap[text.charAt(i)];
                         if (verticalChar) {
                             stack[verticalChar.charCodeAt(0)] = true;
                         }
@@ -707,4 +691,5 @@ SymbolBucket.MAX_GLYPHS = 65535;
 
 SymbolBucket.addDynamicAttributes = addDynamicAttributes;
 
-module.exports = SymbolBucket;
+export default SymbolBucket;
+export { addDynamicAttributes };
diff --git a/src/data/dem_data.js b/src/data/dem_data.js
index 4dc472749e0..cce13c15b51 100644
--- a/src/data/dem_data.js
+++ b/src/data/dem_data.js
@@ -1,7 +1,8 @@
 // @flow
-const {RGBAImage} = require('../util/image');
-const util = require('../util/util');
-const {register} = require('../util/web_worker_transfer');
+import { RGBAImage } from '../util/image';
+
+import { warnOnce, clamp } from '../util/util';
+import { register } from '../util/web_worker_transfer';
 
 class Level {
     dim: number;
@@ -59,7 +60,9 @@ class DEMData {
 
     loadFromImage(data: RGBAImage, encoding: "mapbox" | "terrarium") {
         if (data.height !== data.width) throw new RangeError('DEM tiles must be square');
-        if (encoding && encoding !== "mapbox" && encoding !== "terrarium") return util.warnOnce(`"${encoding}" is not a valid encoding type. Valid types include "mapbox" and "terrarium".`);
+        if (encoding && encoding !== "mapbox" && encoding !== "terrarium") return warnOnce(
+            `"${encoding}" is not a valid encoding type. Valid types include "mapbox" and "terrarium".`
+        );
         // Build level 0
         const level = this.level = new Level(data.width, data.width / 2);
         const pixels = data.data;
@@ -144,10 +147,10 @@ class DEMData {
             break;
         }
 
-        const xMin = util.clamp(_xMin, -t.border, t.dim + t.border);
-        const xMax = util.clamp(_xMax, -t.border, t.dim + t.border);
-        const yMin = util.clamp(_yMin, -t.border, t.dim + t.border);
-        const yMax = util.clamp(_yMax, -t.border, t.dim + t.border);
+        const xMin = clamp(_xMin, -t.border, t.dim + t.border);
+        const xMax = clamp(_xMax, -t.border, t.dim + t.border);
+        const yMin = clamp(_yMin, -t.border, t.dim + t.border);
+        const yMax = clamp(_yMax, -t.border, t.dim + t.border);
 
         const ox = -dx * t.dim;
         const oy = -dy * t.dim;
@@ -160,5 +163,12 @@ class DEMData {
 }
 
 register('DEMData', DEMData);
-module.exports = {DEMData, Level};
+
+const exported = {
+    DEMData,
+    Level
+};
+
+export default exported;
+export { DEMData, Level };
 
diff --git a/src/data/extent.js b/src/data/extent.js
index 3e9030d9e67..a4e99634842 100644
--- a/src/data/extent.js
+++ b/src/data/extent.js
@@ -16,4 +16,4 @@
  * @private
  * @readonly
  */
-module.exports = 8192;
+export default 8192;
diff --git a/src/data/feature_index.js b/src/data/feature_index.js
index ea015e69976..661d2d1a9be 100644
--- a/src/data/feature_index.js
+++ b/src/data/feature_index.js
@@ -1,17 +1,18 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-const loadGeometry = require('./load_geometry');
-const EXTENT = require('./extent');
-const featureFilter = require('../style-spec/feature_filter');
-const Grid = require('grid-index');
-const DictionaryCoder = require('../util/dictionary_coder');
-const vt = require('@mapbox/vector-tile');
-const Protobuf = require('pbf');
-const GeoJSONFeature = require('../util/vectortile_to_geojson');
-const arraysIntersect = require('../util/util').arraysIntersect;
-const {OverscaledTileID} = require('../source/tile_id');
-const {register} = require('../util/web_worker_transfer');
+import Point from '@mapbox/point-geometry';
+
+import loadGeometry from './load_geometry';
+import EXTENT from './extent';
+import featureFilter from '../style-spec/feature_filter';
+import Grid from 'grid-index';
+import DictionaryCoder from '../util/dictionary_coder';
+import vt from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import GeoJSONFeature from '../util/vectortile_to_geojson';
+import { arraysIntersect } from '../util/util';
+import { OverscaledTileID } from '../source/tile_id';
+import { register } from '../util/web_worker_transfer';
 
 import type CollisionIndex from '../symbol/collision_index';
 import type StyleLayer from '../style/style_layer';
@@ -19,7 +20,7 @@ import type {FeatureFilter} from '../style-spec/feature_filter';
 import type {CollisionBoxArray} from './array_types';
 import type Transform from '../geo/transform';
 
-const {FeatureIndexArray} = require('./array_types');
+import { FeatureIndexArray } from './array_types';
 
 type QueryParameters = {
     scale: number,
@@ -211,7 +212,7 @@ register(
     { omit: ['rawTileData', 'sourceLayerCoder'] }
 );
 
-module.exports = FeatureIndex;
+export default FeatureIndex;
 
 function topDownFeatureComparator(a, b) {
     return b - a;
diff --git a/src/data/index_array_type.js b/src/data/index_array_type.js
index 24ba58f4bf2..0678a0fdc01 100644
--- a/src/data/index_array_type.js
+++ b/src/data/index_array_type.js
@@ -1,12 +1,14 @@
 // @flow
 
+import {
+    LineIndexArray,
+    TriangleIndexArray
+} from './array_types';
+
 /**
  * An index array stores Uint16 indicies of vertexes in a corresponding vertex array. We use
  * two kinds of index arrays: arrays storing groups of three indicies, forming triangles; and
  * arrays storing pairs of indicies, forming line segments.
  * @private
  */
-module.exports = {
-    LineIndexArray: require('./array_types').LineIndexArray,
-    TriangleIndexArray: require('./array_types').TriangleIndexArray
-};
+export {LineIndexArray, TriangleIndexArray};
diff --git a/src/data/load_geometry.js b/src/data/load_geometry.js
index 6e6a749019d..69e8b7f6db8 100644
--- a/src/data/load_geometry.js
+++ b/src/data/load_geometry.js
@@ -1,7 +1,8 @@
 // @flow
 
-const util = require('../util/util');
-const EXTENT = require('./extent');
+import { warnOnce } from '../util/util';
+
+import EXTENT from './extent';
 
 import type Point from '@mapbox/point-geometry';
 
@@ -24,7 +25,7 @@ const bounds = createBounds(16);
  * @param {VectorTileFeature} feature
  * @private
  */
-module.exports = function loadGeometry(feature: VectorTileFeature): Array<Array<Point>> {
+export default function loadGeometry(feature: VectorTileFeature): Array<Array<Point>> {
     const scale = EXTENT / feature.extent;
     const geometry = feature.loadGeometry();
     for (let r = 0; r < geometry.length; r++) {
@@ -37,9 +38,9 @@ module.exports = function loadGeometry(feature: VectorTileFeature): Array<Array<
             point.y = Math.round(point.y * scale);
 
             if (point.x < bounds.min || point.x > bounds.max || point.y < bounds.min || point.y > bounds.max) {
-                util.warnOnce('Geometry exceeds allowed extent, reduce your vector tile buffer size');
+                warnOnce('Geometry exceeds allowed extent, reduce your vector tile buffer size');
             }
         }
     }
     return geometry;
-};
+}
diff --git a/src/data/pos_attributes.js b/src/data/pos_attributes.js
index c317d7b4d39..d1175a274e3 100644
--- a/src/data/pos_attributes.js
+++ b/src/data/pos_attributes.js
@@ -1,5 +1,6 @@
 // @flow
-const {createLayout} = require('../util/struct_array');
-module.exports = createLayout([
+import { createLayout } from '../util/struct_array';
+
+export default createLayout([
     { name: 'a_pos', type: 'Int16', components: 2 }
 ]);
diff --git a/src/data/program_configuration.js b/src/data/program_configuration.js
index 9ce837a6056..6d0befd1dc9 100644
--- a/src/data/program_configuration.js
+++ b/src/data/program_configuration.js
@@ -1,23 +1,22 @@
 // @flow
 
-import type {GlobalProperties} from "../style-spec/expression/index";
-
-const packUint8ToFloat = require('../shaders/encode_attribute').packUint8ToFloat;
-const Color = require('../style-spec/util/color');
-const {register} = require('../util/web_worker_transfer');
-const {PossiblyEvaluatedPropertyValue} = require('../style/properties');
-const {
-    StructArrayLayout1f4,
-    StructArrayLayout2f8,
-    StructArrayLayout4f16
-} = require('./array_types');
+import { packUint8ToFloat } from '../shaders/encode_attribute';
+import Color from '../style-spec/util/color';
+import { register } from '../util/web_worker_transfer';
+import { PossiblyEvaluatedPropertyValue } from '../style/properties';
+import { StructArrayLayout1f4, StructArrayLayout2f8, StructArrayLayout4f16 } from './array_types';
 
 import type Context from '../gl/context';
 import type {TypedStyleLayer} from '../style/style_layer/typed_style_layer';
 import type {StructArray, StructArrayMember} from '../util/struct_array';
 import type VertexBuffer from '../gl/vertex_buffer';
 import type Program from '../render/program';
-import type {Feature, SourceExpression, CompositeExpression} from '../style-spec/expression';
+import type {
+    Feature,
+    GlobalProperties,
+    SourceExpression,
+    CompositeExpression
+} from '../style-spec/expression';
 import type {PossiblyEvaluated} from '../style/properties';
 
 function packColor(color: Color): [number, number] {
@@ -425,7 +424,10 @@ register('CompositeExpressionBinder', CompositeExpressionBinder);
 register('ProgramConfiguration', ProgramConfiguration, {omit: ['_buffers']});
 register('ProgramConfigurationSet', ProgramConfigurationSet);
 
-module.exports = {
+const exported = {
     ProgramConfiguration,
     ProgramConfigurationSet
 };
+
+export default exported;
+export { ProgramConfiguration, ProgramConfigurationSet };
diff --git a/src/data/raster_bounds_attributes.js b/src/data/raster_bounds_attributes.js
index 996546b6425..8c7ca0bba99 100644
--- a/src/data/raster_bounds_attributes.js
+++ b/src/data/raster_bounds_attributes.js
@@ -1,6 +1,7 @@
 // @flow
-const {createLayout} = require('../util/struct_array');
-module.exports = createLayout([
+import { createLayout } from '../util/struct_array';
+
+export default createLayout([
     { name: 'a_pos', type: 'Int16', components: 2 },
     { name: 'a_texture_pos', type: 'Int16', components: 2 }
 ]);
diff --git a/src/data/segment.js b/src/data/segment.js
index 50985eee5b6..5cd8e3c1a1b 100644
--- a/src/data/segment.js
+++ b/src/data/segment.js
@@ -1,13 +1,12 @@
 // @flow
 
-const {warnOnce} = require('../util/util');
-const {register} = require('../util/web_worker_transfer');
+import { warnOnce } from '../util/util';
+
+import { register } from '../util/web_worker_transfer';
 
 import type VertexArrayObject from '../render/vertex_array_object';
 import type {StructArray} from '../util/struct_array';
 
-const MAX_VERTEX_ARRAY_LENGTH = Math.pow(2, 16) - 1;
-
 export type Segment = {
     vertexOffset: number,
     primitiveOffset: number,
@@ -17,6 +16,7 @@ export type Segment = {
 }
 
 class SegmentVector {
+    static MAX_VERTEX_ARRAY_LENGTH: number;
     segments: Array<Segment>;
 
     constructor(segments?: Array<Segment> = []) {
@@ -25,8 +25,8 @@ class SegmentVector {
 
     prepareSegment(numVertices: number, layoutVertexArray: StructArray, indexArray: StructArray): Segment {
         let segment: Segment = this.segments[this.segments.length - 1];
-        if (numVertices > MAX_VERTEX_ARRAY_LENGTH) warnOnce(`Max vertices per segment is ${MAX_VERTEX_ARRAY_LENGTH}: bucket requested ${numVertices}`);
-        if (!segment || segment.vertexLength + numVertices > module.exports.MAX_VERTEX_ARRAY_LENGTH) {
+        if (numVertices > SegmentVector.MAX_VERTEX_ARRAY_LENGTH) warnOnce(`Max vertices per segment is ${SegmentVector.MAX_VERTEX_ARRAY_LENGTH}: bucket requested ${numVertices}`);
+        if (!segment || segment.vertexLength + numVertices > SegmentVector.MAX_VERTEX_ARRAY_LENGTH) {
             segment = ({
                 vertexOffset: layoutVertexArray.length,
                 primitiveOffset: indexArray.length,
@@ -51,16 +51,13 @@ class SegmentVector {
     }
 }
 
-register('SegmentVector', SegmentVector);
+/*
+ * The maximum size of a vertex array. This limit is imposed by WebGL's 16 bit
+ * addressing of vertex buffers.
+ * @private
+ * @readonly
+ */
+SegmentVector.MAX_VERTEX_ARRAY_LENGTH = Math.pow(2, 16) - 1;
 
-module.exports = {
-    SegmentVector,
-
-    /**
-     * The maximum size of a vertex array. This limit is imposed by WebGL's 16 bit
-     * addressing of vertex buffers.
-     * @private
-     * @readonly
-     */
-    MAX_VERTEX_ARRAY_LENGTH: MAX_VERTEX_ARRAY_LENGTH
-};
+register('SegmentVector', SegmentVector);
+export default SegmentVector;
diff --git a/src/geo/coordinate.js b/src/geo/coordinate.js
index 2e89b20772e..52f981d77ab 100644
--- a/src/geo/coordinate.js
+++ b/src/geo/coordinate.js
@@ -76,4 +76,4 @@ class Coordinate {
     }
 }
 
-module.exports = Coordinate;
+export default Coordinate;
diff --git a/src/geo/lng_lat.js b/src/geo/lng_lat.js
index f53194e4762..a61a0f8ffa5 100644
--- a/src/geo/lng_lat.js
+++ b/src/geo/lng_lat.js
@@ -1,6 +1,7 @@
 // @flow
 
-const wrap = require('../util/util').wrap;
+import { wrap } from '../util/util';
+import LngLatBounds from './lng_lat_bounds';
 
 /**
  * A `LngLat` object represents a given longitude and latitude coordinate, measured in degrees.
@@ -86,7 +87,6 @@ class LngLat {
         const latAccuracy = 360 * radius / earthCircumferenceInMetersAtEquator,
             lngAccuracy = latAccuracy / Math.cos((Math.PI / 180) * this.lat);
 
-        const LngLatBounds = require('./lng_lat_bounds');
         return new LngLatBounds(new LngLat(this.lng - lngAccuracy, this.lat - latAccuracy),
             new LngLat(this.lng + lngAccuracy, this.lat + latAccuracy));
     }
@@ -128,4 +128,4 @@ class LngLat {
  */
 export type LngLatLike = LngLat | {lng: number, lat: number} | [number, number];
 
-module.exports = LngLat;
+export default LngLat;
diff --git a/src/geo/lng_lat_bounds.js b/src/geo/lng_lat_bounds.js
index 9e371c3a3be..645a0d3af39 100644
--- a/src/geo/lng_lat_bounds.js
+++ b/src/geo/lng_lat_bounds.js
@@ -1,6 +1,6 @@
 // @flow
 
-const LngLat = require('./lng_lat');
+import LngLat from './lng_lat';
 
 import type {LngLatLike} from './lng_lat';
 
@@ -66,7 +66,7 @@ class LngLatBounds {
      * @param {LngLat|LngLatBounds} obj object to extend to
      * @returns {LngLatBounds} `this`
      */
-    extend(obj) {
+    extend(obj: LngLat | LngLatBounds) {
         const sw = this._sw,
             ne = this._ne;
         let sw2, ne2;
@@ -244,4 +244,4 @@ class LngLatBounds {
  */
 export type LngLatBoundsLike = LngLatBounds | [LngLatLike, LngLatLike] | [number, number, number, number];
 
-module.exports = LngLatBounds;
+export default LngLatBounds;
diff --git a/src/geo/transform.js b/src/geo/transform.js
index 4d486251553..b25b5277181 100644
--- a/src/geo/transform.js
+++ b/src/geo/transform.js
@@ -1,14 +1,15 @@
 // @flow
 
-const LngLat = require('./lng_lat'),
-    Point = require('@mapbox/point-geometry'),
-    Coordinate = require('./coordinate'),
-    util = require('../util/util'),
-    interp = require('../style-spec/util/interpolate').number,
-    tileCover = require('../util/tile_cover'),
-    {CanonicalTileID, UnwrappedTileID} = require('../source/tile_id'),
-    EXTENT = require('../data/extent'),
-    glmatrix = require('@mapbox/gl-matrix');
+import LngLat from './lng_lat';
+
+import Point from '@mapbox/point-geometry';
+import Coordinate from './coordinate';
+import { wrap, clamp } from '../util/util';
+import {number as interpolate} from '../style-spec/util/interpolate';
+import tileCover from '../util/tile_cover';
+import { CanonicalTileID, UnwrappedTileID } from '../source/tile_id';
+import EXTENT from '../data/extent';
+import glmatrix from '@mapbox/gl-matrix';
 
 const vec4 = glmatrix.vec4,
     mat4 = glmatrix.mat4,
@@ -114,11 +115,11 @@ class Transform {
         return this.tileSize * this.scale;
     }
 
-    get centerPoint() {
+    get centerPoint(): Point {
         return this.size._div(2);
     }
 
-    get size() {
+    get size(): Point {
         return new Point(this.width, this.height);
     }
 
@@ -126,7 +127,7 @@ class Transform {
         return -this.angle / Math.PI * 180;
     }
     set bearing(bearing: number) {
-        const b = -util.wrap(bearing, -180, 180) * Math.PI / 180;
+        const b = -wrap(bearing, -180, 180) * Math.PI / 180;
         if (this.angle === b) return;
         this._unmodified = false;
         this.angle = b;
@@ -141,7 +142,7 @@ class Transform {
         return this._pitch / Math.PI * 180;
     }
     set pitch(pitch: number) {
-        const p = util.clamp(pitch, 0, 60) / 180 * Math.PI;
+        const p = clamp(pitch, 0, 60) / 180 * Math.PI;
         if (this._pitch === p) return;
         this._unmodified = false;
         this._pitch = p;
@@ -275,7 +276,7 @@ class Transform {
             this.latY(lnglat.lat));
     }
 
-    unproject(point) {
+    unproject(point: Point): LngLat {
         return new LngLat(
             this.xLng(point.x),
             this.yLat(point.y));
@@ -284,7 +285,7 @@ class Transform {
     get x(): number { return this.lngX(this.center.lng); }
     get y(): number { return this.latY(this.center.lat); }
 
-    get point() { return new Point(this.x, this.y); }
+    get point(): Point { return new Point(this.x, this.y); }
 
     /**
      * latitude to absolute x coord
@@ -302,10 +303,10 @@ class Transform {
         return (180 - y) * this.worldSize / 360;
     }
 
-    xLng(x) {
+    xLng(x: number) {
         return x * 360 / this.worldSize - 180;
     }
-    yLat(y) {
+    yLat(y: number) {
         const y2 = 180 - y * 360 / this.worldSize;
         return 360 / Math.PI * Math.atan(Math.exp(y2 * Math.PI / 180)) - 90;
     }
@@ -354,7 +355,7 @@ class Transform {
      * @param {Coordinate} coord
      * @returns {LngLat} lnglat
      */
-    coordinateLocation(coord) {
+    coordinateLocation(coord: Coordinate) {
         const zoomedCoord = coord.zoomTo(this.zoom);
         return new LngLat(
             this.xLng(zoomedCoord.column * this.tileSize),
@@ -387,8 +388,8 @@ class Transform {
         const t = z0 === z1 ? 0 : (targetZ - z0) / (z1 - z0);
 
         return new Coordinate(
-            interp(x0, x1, t) / this.tileSize,
-            interp(y0, y1, t) / this.tileSize,
+            interpolate(x0, x1, t) / this.tileSize,
+            interpolate(y0, y1, t) / this.tileSize,
             this.zoom)._zoomTo(zoom);
     }
 
@@ -397,7 +398,7 @@ class Transform {
      * @param {Coordinate} coord
      * @returns {Point} screen point
      */
-    coordinatePoint(coord) {
+    coordinatePoint(coord: Coordinate) {
         const zoomedCoord = coord.zoomTo(this.zoom);
         const p = [zoomedCoord.column * this.tileSize, zoomedCoord.row * this.tileSize, 0, 1];
         vec4.transformMat4(p, p, this.pixelMatrix);
@@ -571,4 +572,4 @@ class Transform {
     }
 }
 
-module.exports = Transform;
+export default Transform;
diff --git a/src/gl/color_mode.js b/src/gl/color_mode.js
index d754e6aae4a..0037b0d0ae7 100644
--- a/src/gl/color_mode.js
+++ b/src/gl/color_mode.js
@@ -1,5 +1,5 @@
 // @flow
-const Color = require('../style-spec/util/color');
+import Color from '../style-spec/util/color';
 
 import type {BlendFuncType, ColorMaskType} from './types';
 
@@ -31,4 +31,4 @@ ColorMode.disabled = new ColorMode(ColorMode.Replace, Color.transparent, [false,
 ColorMode.unblended = new ColorMode(ColorMode.Replace, Color.transparent, [true, true, true, true]);
 ColorMode.alphaBlended = new ColorMode([ONE, ONE_MINUS_SRC_ALPHA], Color.transparent, [true, true, true, true]);
 
-module.exports = ColorMode;
+export default ColorMode;
diff --git a/src/gl/context.js b/src/gl/context.js
index ad1c18068e0..e5f264d1428 100644
--- a/src/gl/context.js
+++ b/src/gl/context.js
@@ -1,40 +1,13 @@
 // @flow
-const IndexBuffer = require('./index_buffer');
-const VertexBuffer = require('./vertex_buffer');
-const Framebuffer = require('./framebuffer');
-const DepthMode = require('./depth_mode');
-const StencilMode = require('./stencil_mode');
-const ColorMode = require('./color_mode');
-const util = require('../util/util');
-const {
-    ClearColor,
-    ClearDepth,
-    ClearStencil,
-    ColorMask,
-    DepthMask,
-    StencilMask,
-    StencilFunc,
-    StencilOp,
-    StencilTest,
-    DepthRange,
-    DepthTest,
-    DepthFunc,
-    Blend,
-    BlendFunc,
-    BlendColor,
-    Program,
-    LineWidth,
-    ActiveTextureUnit,
-    Viewport,
-    BindFramebuffer,
-    BindRenderbuffer,
-    BindTexture,
-    BindVertexBuffer,
-    BindElementBuffer,
-    BindVertexArrayOES,
-    PixelStoreUnpack,
-    PixelStoreUnpackPremultiplyAlpha,
-} = require('./value');
+import IndexBuffer from './index_buffer';
+
+import VertexBuffer from './vertex_buffer';
+import Framebuffer from './framebuffer';
+import DepthMode from './depth_mode';
+import StencilMode from './stencil_mode';
+import ColorMode from './color_mode';
+import { deepEqual } from '../util/util';
+import { ClearColor, ClearDepth, ClearStencil, ColorMask, DepthMask, StencilMask, StencilFunc, StencilOp, StencilTest, DepthRange, DepthTest, DepthFunc, Blend, BlendFunc, BlendColor, Program, LineWidth, ActiveTextureUnit, Viewport, BindFramebuffer, BindRenderbuffer, BindTexture, BindVertexBuffer, BindElementBuffer, BindVertexArrayOES, PixelStoreUnpack, PixelStoreUnpackPremultiplyAlpha } from './value';
 
 
 import type {TriangleIndexArray, LineIndexArray} from '../data/index_array_type';
@@ -214,7 +187,7 @@ class Context {
     }
 
     setColorMode(colorMode: $ReadOnly<ColorMode>) {
-        if (util.deepEqual(colorMode.blendFunction, ColorMode.Replace)) {
+        if (deepEqual(colorMode.blendFunction, ColorMode.Replace)) {
             this.blend.set(false);
         } else {
             this.blend.set(true);
@@ -226,4 +199,4 @@ class Context {
     }
 }
 
-module.exports = Context;
+export default Context;
diff --git a/src/gl/depth_mode.js b/src/gl/depth_mode.js
index 67d9c2a1c41..c3ad66f93ed 100644
--- a/src/gl/depth_mode.js
+++ b/src/gl/depth_mode.js
@@ -26,4 +26,4 @@ DepthMode.ReadWrite = true;
 
 DepthMode.disabled = new DepthMode(ALWAYS, DepthMode.ReadOnly, [0, 1]);
 
-module.exports = DepthMode;
+export default DepthMode;
diff --git a/src/gl/framebuffer.js b/src/gl/framebuffer.js
index 46e19651b03..15376dfa92b 100644
--- a/src/gl/framebuffer.js
+++ b/src/gl/framebuffer.js
@@ -1,5 +1,5 @@
 // @flow
-const { ColorAttachment, DepthAttachment } = require('./value');
+import { ColorAttachment, DepthAttachment } from './value';
 
 import type Context from './context';
 
@@ -35,4 +35,4 @@ class Framebuffer {
     }
 }
 
-module.exports = Framebuffer;
+export default Framebuffer;
diff --git a/src/gl/index_buffer.js b/src/gl/index_buffer.js
index 42fc7e1fede..2bfdd72a824 100644
--- a/src/gl/index_buffer.js
+++ b/src/gl/index_buffer.js
@@ -1,5 +1,5 @@
 // @flow
-const assert = require('assert');
+import assert from 'assert';
 
 import type {StructArray} from '../util/struct_array';
 import type {TriangleIndexArray, LineIndexArray} from '../data/index_array_type';
@@ -59,4 +59,4 @@ class IndexBuffer {
     }
 }
 
-module.exports = IndexBuffer;
+export default IndexBuffer;
diff --git a/src/gl/stencil_mode.js b/src/gl/stencil_mode.js
index 74cc9735273..37ba57cb09e 100644
--- a/src/gl/stencil_mode.js
+++ b/src/gl/stencil_mode.js
@@ -27,4 +27,4 @@ class StencilMode {
 
 StencilMode.disabled = new StencilMode({ func: ALWAYS, mask: 0 }, 0, 0, KEEP, KEEP, KEEP);
 
-module.exports = StencilMode;
+export default StencilMode;
diff --git a/src/gl/value.js b/src/gl/value.js
index 8bf0d3652e9..dbab84a8914 100644
--- a/src/gl/value.js
+++ b/src/gl/value.js
@@ -1,7 +1,8 @@
 // @flow
 
-const Color = require('../style-spec/util/color');
-const util = require('../util/util');
+import Color from '../style-spec/util/color';
+
+import { clamp } from '../util/util';
 
 import type Context from './context';
 import type {
@@ -368,7 +369,7 @@ class LineWidth implements Value<number> {
 
     set(v: number): void {
         const range = this.context.lineWidthRange;
-        const clamped = util.clamp(v, range[0], range[1]);
+        const clamped = clamp(v, range[0], range[1]);
         if (this.current !== clamped) {
             this.context.gl.lineWidth(clamped);
             this.current = v;
@@ -630,7 +631,7 @@ class DepthAttachment extends FramebufferValue<?WebGLRenderbuffer> implements Va
     }
 }
 
-module.exports = {
+const exported = {
     ClearColor,
     ClearDepth,
     ClearStencil,
@@ -658,7 +659,9 @@ module.exports = {
     BindVertexArrayOES,
     PixelStoreUnpack,
     PixelStoreUnpackPremultiplyAlpha,
-
     ColorAttachment,
-    DepthAttachment,
+    DepthAttachment
 };
+
+export default exported;
+export { ClearColor, ClearDepth, ClearStencil, ColorMask, DepthMask, StencilMask, StencilFunc, StencilOp, StencilTest, DepthRange, DepthTest, DepthFunc, Blend, BlendFunc, BlendColor, Program, LineWidth, ActiveTextureUnit, Viewport, BindFramebuffer, BindRenderbuffer, BindTexture, BindVertexBuffer, BindElementBuffer, BindVertexArrayOES, PixelStoreUnpack, PixelStoreUnpackPremultiplyAlpha, ColorAttachment, DepthAttachment };
diff --git a/src/gl/vertex_buffer.js b/src/gl/vertex_buffer.js
index 917d4be6d6a..d6294771832 100644
--- a/src/gl/vertex_buffer.js
+++ b/src/gl/vertex_buffer.js
@@ -1,6 +1,7 @@
 // @flow
 
-const assert = require('assert');
+import assert from 'assert';
+
 import type {
     StructArray,
     StructArrayMember
@@ -114,4 +115,4 @@ class VertexBuffer {
     }
 }
 
-module.exports = VertexBuffer;
+export default VertexBuffer;
diff --git a/src/index.js b/src/index.js
index 6502c0504a2..a169cfe5c65 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,30 +1,30 @@
 // @flow
 
-const supported = require('@mapbox/mapbox-gl-supported');
-const browser = require('./util/browser');
-const version: string = require('../package.json').version;
-const Map = require('./ui/map');
-const NavigationControl = require('./ui/control/navigation_control');
-const GeolocateControl = require('./ui/control/geolocate_control');
-const AttributionControl = require('./ui/control/attribution_control');
-const ScaleControl = require('./ui/control/scale_control');
-const FullscreenControl = require('./ui/control/fullscreen_control');
-const Popup = require('./ui/popup');
-const Marker = require('./ui/marker');
-const Style = require('./style/style');
-const LngLat = require('./geo/lng_lat');
-const LngLatBounds = require('./geo/lng_lat_bounds');
-const Point = require('@mapbox/point-geometry');
-const config = require('./util/config');
-const rtlTextPlugin = require('./source/rtl_text_plugin');
+import assert from 'assert';
+import supported from '@mapbox/mapbox-gl-supported';
 
-module.exports = {
+import browser from './util/browser';
+import { version } from '../package.json';
+import Map from './ui/map';
+import NavigationControl from './ui/control/navigation_control';
+import GeolocateControl from './ui/control/geolocate_control';
+import AttributionControl from './ui/control/attribution_control';
+import ScaleControl from './ui/control/scale_control';
+import FullscreenControl from './ui/control/fullscreen_control';
+import Popup from './ui/popup';
+import Marker from './ui/marker';
+import Style from './style/style';
+import LngLat from './geo/lng_lat';
+import LngLatBounds from './geo/lng_lat_bounds';
+import Point from '@mapbox/point-geometry';
+import config from './util/config';
+import {setRTLTextPlugin} from './source/rtl_text_plugin';
+
+const exported = {
     version,
     supported,
-
     workerCount: Math.max(Math.floor(browser.hardwareConcurrency / 2), 1),
-    setRTLTextPlugin: rtlTextPlugin.setRTLTextPlugin,
-
+    setRTLTextPlugin: setRTLTextPlugin,
     Map,
     NavigationControl,
     GeolocateControl,
@@ -53,7 +53,9 @@ module.exports = {
 
     set accessToken(token: string) {
         config.ACCESS_TOKEN = token;
-    }
+    },
+
+    workerUrl: ''
 };
 
 /**
@@ -88,3 +90,8 @@ module.exports = {
  * mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.1.1/mapbox-gl-rtl-text.js');
  * @see [Add support for right-to-left scripts](https://www.mapbox.com/mapbox-gl-js/example/mapbox-gl-rtl-text/)
  */
+
+export default exported;
+
+// canary assert: used to confirm that asserts have been removed from production build
+assert(true, 'canary assert');
diff --git a/src/render/draw_background.js b/src/render/draw_background.js
index 311d64d09e6..de79d96318c 100644
--- a/src/render/draw_background.js
+++ b/src/render/draw_background.js
@@ -1,14 +1,19 @@
 // @flow
 
-const pattern = require('./pattern');
-const StencilMode = require('../gl/stencil_mode');
-const DepthMode = require('../gl/depth_mode');
+import {
+    isPatternMissing,
+    setPatternUniforms,
+    prepare as preparePattern
+} from './pattern';
+
+import StencilMode from '../gl/stencil_mode';
+import DepthMode from '../gl/depth_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
 import type BackgroundStyleLayer from '../style/style_layer/background_style_layer';
 
-module.exports = drawBackground;
+export default drawBackground;
 
 function drawBackground(painter: Painter, sourceCache: SourceCache, layer: BackgroundStyleLayer) {
     const color = layer.paint.get('background-color');
@@ -31,9 +36,9 @@ function drawBackground(painter: Painter, sourceCache: SourceCache, layer: Backg
 
     let program;
     if (image) {
-        if (pattern.isPatternMissing(image, painter)) return;
+        if (isPatternMissing(image, painter)) return;
         program = painter.useProgram('backgroundPattern');
-        pattern.prepare(image, painter, program);
+        preparePattern(image, painter, program);
         painter.tileExtentPatternVAO.bind(context, program, painter.tileExtentBuffer, []);
     } else {
         program = painter.useProgram('background');
@@ -46,7 +51,7 @@ function drawBackground(painter: Painter, sourceCache: SourceCache, layer: Backg
 
     for (const tileID of tileIDs) {
         if (image) {
-            pattern.setTile({tileID, tileSize}, painter, program);
+            setPatternUniforms({tileID, tileSize}, painter, program);
         }
         gl.uniformMatrix4fv(program.uniforms.u_matrix, false, painter.transform.calculatePosMatrix(tileID.toUnwrapped()));
         gl.drawArrays(gl.TRIANGLE_STRIP, 0, painter.tileExtentBuffer.length);
diff --git a/src/render/draw_circle.js b/src/render/draw_circle.js
index aa12308bd38..9a80dfdd61f 100644
--- a/src/render/draw_circle.js
+++ b/src/render/draw_circle.js
@@ -1,8 +1,9 @@
 // @flow
 
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
-const StencilMode = require('../gl/stencil_mode');
-const DepthMode = require('../gl/depth_mode');
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
+
+import StencilMode from '../gl/stencil_mode';
+import DepthMode from '../gl/depth_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
@@ -10,7 +11,7 @@ import type CircleStyleLayer from '../style/style_layer/circle_style_layer';
 import type CircleBucket from '../data/bucket/circle_bucket';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = drawCircles;
+export default drawCircles;
 
 function drawCircles(painter: Painter, sourceCache: SourceCache, layer: CircleStyleLayer, coords: Array<OverscaledTileID>) {
     if (painter.renderPass !== 'translucent') return;
diff --git a/src/render/draw_collision_debug.js b/src/render/draw_collision_debug.js
index bd9ace4992e..dc321544757 100644
--- a/src/render/draw_collision_debug.js
+++ b/src/render/draw_collision_debug.js
@@ -5,11 +5,11 @@ import type SourceCache from '../source/source_cache';
 import type StyleLayer from '../style/style_layer';
 import type {OverscaledTileID} from '../source/tile_id';
 import type SymbolBucket from '../data/bucket/symbol_bucket';
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
-const DepthMode = require('../gl/depth_mode');
-const StencilMode = require('../gl/stencil_mode');
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
+import DepthMode from '../gl/depth_mode';
+import StencilMode from '../gl/stencil_mode';
 
-module.exports = drawCollisionDebug;
+export default drawCollisionDebug;
 
 function drawCollisionDebugGeometry(painter: Painter, sourceCache: SourceCache, layer: StyleLayer, coords: Array<OverscaledTileID>, drawCircles: boolean) {
     const context = painter.context;
diff --git a/src/render/draw_debug.js b/src/render/draw_debug.js
index c78447d6cea..8c64df02438 100644
--- a/src/render/draw_debug.js
+++ b/src/render/draw_debug.js
@@ -1,19 +1,20 @@
 // @flow
 
-const browser = require('../util/browser');
-const mat4 = require('@mapbox/gl-matrix').mat4;
-const EXTENT = require('../data/extent');
-const VertexArrayObject = require('./vertex_array_object');
-const {PosArray} = require('../data/array_types');
-const posAttributes = require('../data/pos_attributes');
-const DepthMode = require('../gl/depth_mode');
-const StencilMode = require('../gl/stencil_mode');
+import browser from '../util/browser';
+
+import { mat4 } from '@mapbox/gl-matrix';
+import EXTENT from '../data/extent';
+import VertexArrayObject from './vertex_array_object';
+import { PosArray } from '../data/array_types';
+import posAttributes from '../data/pos_attributes';
+import DepthMode from '../gl/depth_mode';
+import StencilMode from '../gl/stencil_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = drawDebug;
+export default drawDebug;
 
 function drawDebug(painter: Painter, sourceCache: SourceCache, coords: Array<OverscaledTileID>) {
     for (let i = 0; i < coords.length; i++) {
diff --git a/src/render/draw_fill.js b/src/render/draw_fill.js
index 3840e3cbaef..b84d98f1d10 100644
--- a/src/render/draw_fill.js
+++ b/src/render/draw_fill.js
@@ -1,8 +1,13 @@
 // @flow
 
-const pattern = require('./pattern');
-const Color = require('../style-spec/util/color');
-const DepthMode = require('../gl/depth_mode');
+import {
+    isPatternMissing,
+    setPatternUniforms,
+    prepare as preparePattern
+} from './pattern';
+
+import Color from '../style-spec/util/color';
+import DepthMode from '../gl/depth_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
@@ -11,7 +16,7 @@ import type FillBucket from '../data/bucket/fill_bucket';
 import type {OverscaledTileID} from '../source/tile_id';
 import type {CrossFaded} from '../style/cross_faded';
 
-module.exports = drawFill;
+export default drawFill;
 
 function drawFill(painter: Painter, sourceCache: SourceCache, layer: FillStyleLayer, coords: Array<OverscaledTileID>) {
     const color = layer.paint.get('fill-color');
@@ -55,7 +60,7 @@ function drawFill(painter: Painter, sourceCache: SourceCache, layer: FillStyleLa
 }
 
 function drawFillTiles(painter, sourceCache, layer, coords, drawFn) {
-    if (pattern.isPatternMissing(layer.paint.get('fill-pattern'), painter)) return;
+    if (isPatternMissing(layer.paint.get('fill-pattern'), painter)) return;
 
     let firstTile = true;
     for (const coord of coords) {
@@ -115,9 +120,9 @@ function setFillProgram(programId, pat: ?CrossFaded<string>, painter, programCon
         program = painter.useProgram(`${programId}Pattern`, programConfiguration);
         if (firstTile || program.program !== prevProgram) {
             programConfiguration.setUniforms(painter.context, program, layer.paint, {zoom: painter.transform.zoom});
-            pattern.prepare(pat, painter, program);
+            preparePattern(pat, painter, program);
         }
-        pattern.setTile(tile, painter, program);
+        setPatternUniforms(tile, painter, program);
     }
     painter.context.gl.uniformMatrix4fv(program.uniforms.u_matrix, false, painter.translatePosMatrix(
         coord.posMatrix, tile,
diff --git a/src/render/draw_fill_extrusion.js b/src/render/draw_fill_extrusion.js
index 964ff4f9a47..977eff7fcd9 100644
--- a/src/render/draw_fill_extrusion.js
+++ b/src/render/draw_fill_extrusion.js
@@ -1,14 +1,19 @@
 // @flow
 
-const glMatrix = require('@mapbox/gl-matrix');
-const pattern = require('./pattern');
-const Texture = require('./texture');
-const Color = require('../style-spec/util/color');
-const DepthMode = require('../gl/depth_mode');
+import glMatrix from '@mapbox/gl-matrix';
+
+import {
+    isPatternMissing,
+    setPatternUniforms,
+    prepare as preparePattern
+} from './pattern';
+import Texture from './texture';
+import Color from '../style-spec/util/color';
+import DepthMode from '../gl/depth_mode';
 const mat3 = glMatrix.mat3;
 const mat4 = glMatrix.mat4;
 const vec3 = glMatrix.vec3;
-const StencilMode = require('../gl/stencil_mode');
+import StencilMode from '../gl/stencil_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
@@ -16,7 +21,7 @@ import type FillExtrusionStyleLayer from '../style/style_layer/fill_extrusion_st
 import type FillExtrusionBucket from '../data/bucket/fill_extrusion_bucket';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = draw;
+export default draw;
 
 function draw(painter: Painter, source: SourceCache, layer: FillExtrusionStyleLayer, coords: Array<OverscaledTileID>) {
     if (layer.paint.get('fill-extrusion-opacity') === 0) {
@@ -115,9 +120,9 @@ function drawExtrusion(painter, source, layer, tile, coord, bucket, first) {
     }
 
     if (image) {
-        if (pattern.isPatternMissing(image, painter)) return;
-        pattern.prepare(image, painter, program);
-        pattern.setTile(tile, painter, program);
+        if (isPatternMissing(image, painter)) return;
+        preparePattern(image, painter, program);
+        setPatternUniforms(tile, painter, program);
         gl.uniform1f(program.uniforms.u_height_factor, -Math.pow(2, coord.overscaledZ) / tile.tileSize / 8);
     }
 
diff --git a/src/render/draw_heatmap.js b/src/render/draw_heatmap.js
index e4ddaaba9cc..cb902029142 100644
--- a/src/render/draw_heatmap.js
+++ b/src/render/draw_heatmap.js
@@ -1,12 +1,13 @@
 // @flow
 
-const mat4 = require('@mapbox/gl-matrix').mat4;
-const Texture = require('./texture');
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
-const Color = require('../style-spec/util/color');
-const DepthMode = require('../gl/depth_mode');
-const StencilMode = require('../gl/stencil_mode');
-const ColorMode = require('../gl/color_mode');
+import { mat4 } from '@mapbox/gl-matrix';
+
+import Texture from './texture';
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
+import Color from '../style-spec/util/color';
+import DepthMode from '../gl/depth_mode';
+import StencilMode from '../gl/stencil_mode';
+import ColorMode from '../gl/color_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
@@ -14,7 +15,7 @@ import type HeatmapStyleLayer from '../style/style_layer/heatmap_style_layer';
 import type HeatmapBucket from '../data/bucket/heatmap_bucket';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = drawHeatmap;
+export default drawHeatmap;
 
 function drawHeatmap(painter: Painter, sourceCache: SourceCache, layer: HeatmapStyleLayer, coords: Array<OverscaledTileID>) {
     if (layer.paint.get('heatmap-opacity') === 0) {
diff --git a/src/render/draw_hillshade.js b/src/render/draw_hillshade.js
index 73224685ef5..275ea16dbdb 100644
--- a/src/render/draw_hillshade.js
+++ b/src/render/draw_hillshade.js
@@ -1,17 +1,18 @@
 // @flow
-const Coordinate = require('../geo/coordinate');
-const Texture = require('./texture');
-const EXTENT = require('../data/extent');
-const mat4 = require('@mapbox/gl-matrix').mat4;
-const StencilMode = require('../gl/stencil_mode');
-const DepthMode = require('../gl/depth_mode');
+import Coordinate from '../geo/coordinate';
+
+import Texture from './texture';
+import EXTENT from '../data/extent';
+import { mat4 } from '@mapbox/gl-matrix';
+import StencilMode from '../gl/stencil_mode';
+import DepthMode from '../gl/depth_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
 import type HillshadeStyleLayer from '../style/style_layer/hillshade_style_layer';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = drawHillshade;
+export default drawHillshade;
 
 function drawHillshade(painter: Painter, sourceCache: SourceCache, layer: HillshadeStyleLayer, tileIDs: Array<OverscaledTileID>) {
     if (painter.renderPass !== 'offscreen' && painter.renderPass !== 'translucent') return;
diff --git a/src/render/draw_line.js b/src/render/draw_line.js
index 271b5984116..4b00708f592 100644
--- a/src/render/draw_line.js
+++ b/src/render/draw_line.js
@@ -1,8 +1,9 @@
 // @flow
 
-const browser = require('../util/browser');
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
-const DepthMode = require('../gl/depth_mode');
+import browser from '../util/browser';
+
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
+import DepthMode from '../gl/depth_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
@@ -10,7 +11,7 @@ import type LineStyleLayer from '../style/style_layer/line_style_layer';
 import type LineBucket from '../data/bucket/line_bucket';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = function drawLine(painter: Painter, sourceCache: SourceCache, layer: LineStyleLayer, coords: Array<OverscaledTileID>) {
+export default function drawLine(painter: Painter, sourceCache: SourceCache, layer: LineStyleLayer, coords: Array<OverscaledTileID>) {
     if (painter.renderPass !== 'translucent') return;
 
     const opacity = layer.paint.get('line-opacity');
@@ -46,7 +47,7 @@ module.exports = function drawLine(painter: Painter, sourceCache: SourceCache, l
         prevTileZoom = tile.tileID.overscaledZ;
         firstTile = false;
     }
-};
+}
 
 function drawLineTile(program, painter, tile, bucket, layer, coord, programConfiguration, programChanged, tileRatioChanged) {
     const context = painter.context;
diff --git a/src/render/draw_raster.js b/src/render/draw_raster.js
index 0c9227787e8..8f788414677 100644
--- a/src/render/draw_raster.js
+++ b/src/render/draw_raster.js
@@ -1,17 +1,18 @@
 // @flow
 
-const util = require('../util/util');
-const ImageSource = require('../source/image_source');
-const browser = require('../util/browser');
-const StencilMode = require('../gl/stencil_mode');
-const DepthMode = require('../gl/depth_mode');
+import { clamp } from '../util/util';
+
+import ImageSource from '../source/image_source';
+import browser from '../util/browser';
+import StencilMode from '../gl/stencil_mode';
+import DepthMode from '../gl/depth_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
 import type RasterStyleLayer from '../style/style_layer/raster_style_layer';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = drawRaster;
+export default drawRaster;
 
 function drawRaster(painter: Painter, sourceCache: SourceCache, layer: RasterStyleLayer, coords: Array<OverscaledTileID>) {
     if (painter.renderPass !== 'translucent') return;
@@ -139,7 +140,7 @@ function getFadeValues(tile, parentTile, sourceCache, layer, transform) {
         // if no parent or parent is older, fade in; if parent is younger, fade out
         const fadeIn = !parentTile || Math.abs(parentTile.tileID.overscaledZ - idealZ) > Math.abs(tile.tileID.overscaledZ - idealZ);
 
-        const childOpacity = (fadeIn && tile.refreshedUponExpiration) ? 1 : util.clamp(fadeIn ? sinceTile : 1 - sinceParent, 0, 1);
+        const childOpacity = (fadeIn && tile.refreshedUponExpiration) ? 1 : clamp(fadeIn ? sinceTile : 1 - sinceParent, 0, 1);
 
         // we don't crossfade tiles that were just refreshed upon expiring:
         // once they're old enough to pass the crossfading threshold
diff --git a/src/render/draw_symbol.js b/src/render/draw_symbol.js
index 9f671e07190..7445e7a9391 100644
--- a/src/render/draw_symbol.js
+++ b/src/render/draw_symbol.js
@@ -1,14 +1,16 @@
 // @flow
 
-const drawCollisionDebug = require('./draw_collision_debug');
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
-const symbolProjection = require('../symbol/projection');
-const symbolSize = require('../symbol/symbol_size');
-const mat4 = require('@mapbox/gl-matrix').mat4;
+import drawCollisionDebug from './draw_collision_debug';
+
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
+import * as symbolProjection from '../symbol/projection';
+import * as symbolSize from '../symbol/symbol_size';
+import { mat4 } from '@mapbox/gl-matrix';
 const identityMat4 = mat4.identity(new Float32Array(16));
-const symbolLayoutProperties = require('../style/style_layer/symbol_style_layer_properties').layout;
-const StencilMode = require('../gl/stencil_mode');
-const DepthMode = require('../gl/depth_mode');
+import properties from '../style/style_layer/symbol_style_layer_properties';
+const symbolLayoutProperties = properties.layout;
+import StencilMode from '../gl/stencil_mode';
+import DepthMode from '../gl/depth_mode';
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
@@ -16,7 +18,7 @@ import type SymbolStyleLayer from '../style/style_layer/symbol_style_layer';
 import type SymbolBucket from '../data/bucket/symbol_bucket';
 import type {OverscaledTileID} from '../source/tile_id';
 
-module.exports = drawSymbols;
+export default drawSymbols;
 
 function drawSymbols(painter: Painter, sourceCache: SourceCache, layer: SymbolStyleLayer, coords: Array<OverscaledTileID>) {
     if (painter.renderPass !== 'translucent') return;
diff --git a/src/render/glyph_atlas.js b/src/render/glyph_atlas.js
index 41e531717d0..c9c18e1fa75 100644
--- a/src/render/glyph_atlas.js
+++ b/src/render/glyph_atlas.js
@@ -1,7 +1,8 @@
 // @flow
 
-const ShelfPack = require('@mapbox/shelf-pack');
-const {AlphaImage} = require('../util/image');
+import ShelfPack from '@mapbox/shelf-pack';
+
+import { AlphaImage } from '../util/image';
 
 import type {GlyphMetrics, StyleGlyph} from '../style/style_glyph';
 
@@ -70,6 +71,9 @@ function makeGlyphAtlas(stacks: {[string]: {[number]: ?StyleGlyph}}): GlyphAtlas
     return {image, positions};
 }
 
-module.exports = {
+const exported = {
     makeGlyphAtlas
 };
+
+export default exported;
+export { makeGlyphAtlas };
diff --git a/src/render/glyph_manager.js b/src/render/glyph_manager.js
index 1e657f16d36..537f8be291d 100644
--- a/src/render/glyph_manager.js
+++ b/src/render/glyph_manager.js
@@ -1,10 +1,11 @@
 // @flow
 
-const loadGlyphRange = require('../style/load_glyph_range');
-const TinySDF = require('@mapbox/tiny-sdf');
-const isChar = require('../util/is_char_in_unicode_block');
-const {asyncAll} = require('../util/util');
-const {AlphaImage} = require('../util/image');
+import loadGlyphRange from '../style/load_glyph_range';
+
+import TinySDF from '@mapbox/tiny-sdf';
+import isChar from '../util/is_char_in_unicode_block';
+import { asyncAll } from '../util/util';
+import { AlphaImage } from '../util/image';
 
 import type {StyleGlyph} from '../style/style_glyph';
 import type {RequestTransformFunction} from '../ui/map';
@@ -23,6 +24,10 @@ class GlyphManager {
     entries: {[string]: Entry};
     url: ?string;
 
+    // exposed as statics to enable stubbing in unit tests
+    static loadGlyphRange: typeof loadGlyphRange;
+    static TinySDF: Class<TinySDF>;
+
     constructor(requestTransform: RequestTransformFunction, localIdeographFontFamily: ?string) {
         this.requestTransform = requestTransform;
         this.localIdeographFontFamily = localIdeographFontFamily;
@@ -72,7 +77,7 @@ class GlyphManager {
             let requests = entry.requests[range];
             if (!requests) {
                 requests = entry.requests[range] = [];
-                loadGlyphRange(stack, range, (this.url: any), this.requestTransform,
+                GlyphManager.loadGlyphRange(stack, range, (this.url: any), this.requestTransform,
                     (err, response: ?{[number]: StyleGlyph | null}) => {
                         if (response) {
                             for (const id in response) {
@@ -133,7 +138,7 @@ class GlyphManager {
             } else if (/light/i.test(stack)) {
                 fontWeight = '200';
             }
-            tinySDF = entry.tinySDF = new TinySDF(24, 3, 8, .25, family, fontWeight);
+            tinySDF = entry.tinySDF = new GlyphManager.TinySDF(24, 3, 8, .25, family, fontWeight);
         }
 
         return {
@@ -150,4 +155,7 @@ class GlyphManager {
     }
 }
 
-module.exports = GlyphManager;
+GlyphManager.loadGlyphRange = loadGlyphRange;
+GlyphManager.TinySDF = TinySDF;
+
+export default GlyphManager;
diff --git a/src/render/image_atlas.js b/src/render/image_atlas.js
index 38a1a2b380b..4c2284e4787 100644
--- a/src/render/image_atlas.js
+++ b/src/render/image_atlas.js
@@ -1,7 +1,8 @@
 // @flow
 
-const ShelfPack = require('@mapbox/shelf-pack');
-const {RGBAImage} = require('../util/image');
+import ShelfPack from '@mapbox/shelf-pack';
+
+import { RGBAImage } from '../util/image';
 
 import type {StyleImage} from '../style/style_image';
 
@@ -95,7 +96,10 @@ function makeImageAtlas(images: {[string]: StyleImage}): ImageAtlas {
     return {image, positions};
 }
 
-module.exports = {
+const exported = {
     imagePosition,
     makeImageAtlas
 };
+
+export default exported;
+export { imagePosition, makeImageAtlas };
diff --git a/src/render/image_manager.js b/src/render/image_manager.js
index 24ab0872a57..65119413ff1 100644
--- a/src/render/image_manager.js
+++ b/src/render/image_manager.js
@@ -1,10 +1,11 @@
 // @flow
 
-const ShelfPack = require('@mapbox/shelf-pack');
-const {RGBAImage} = require('../util/image');
-const {imagePosition} = require('./image_atlas');
-const Texture = require('./texture');
-const assert = require('assert');
+import ShelfPack from '@mapbox/shelf-pack';
+
+import { RGBAImage } from '../util/image';
+import { imagePosition } from './image_atlas';
+import Texture from './texture';
+import assert from 'assert';
 
 import type {StyleImage} from '../style/style_image';
 import type Context from '../gl/context';
@@ -198,4 +199,4 @@ class ImageManager {
     }
 }
 
-module.exports = ImageManager;
+export default ImageManager;
diff --git a/src/render/line_atlas.js b/src/render/line_atlas.js
index 2d41b9b2c39..2e870134370 100644
--- a/src/render/line_atlas.js
+++ b/src/render/line_atlas.js
@@ -1,6 +1,6 @@
 // @flow
 
-const util = require('../util/util');
+import { warnOnce } from '../util/util';
 
 import type Context from '../gl/context';
 
@@ -58,7 +58,7 @@ class LineAtlas {
         const offset = 128;
 
         if (this.nextRow + height > this.height) {
-            util.warnOnce('LineAtlas out of space');
+            warnOnce('LineAtlas out of space');
             return null;
         }
 
@@ -152,4 +152,4 @@ class LineAtlas {
     }
 }
 
-module.exports = LineAtlas;
+export default LineAtlas;
diff --git a/src/render/painter.js b/src/render/painter.js
index 0828bc44aa4..b679d42d4fd 100644
--- a/src/render/painter.js
+++ b/src/render/painter.js
@@ -1,38 +1,49 @@
 // @flow
 
-const browser = require('../util/browser');
-const mat4 = require('@mapbox/gl-matrix').mat4;
-const SourceCache = require('../source/source_cache');
-const EXTENT = require('../data/extent');
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
-const util = require('../util/util');
-const VertexArrayObject = require('./vertex_array_object');
-const {RasterBoundsArray, PosArray} = require('../data/array_types');
-const rasterBoundsAttributes = require('../data/raster_bounds_attributes');
-const posAttributes = require('../data/pos_attributes');
-const {ProgramConfiguration} = require('../data/program_configuration');
-const CrossTileSymbolIndex = require('../symbol/cross_tile_symbol_index');
-const shaders = require('../shaders');
-const Program = require('./program');
-const Context = require('../gl/context');
-const DepthMode = require('../gl/depth_mode');
-const StencilMode = require('../gl/stencil_mode');
-const ColorMode = require('../gl/color_mode');
-const Texture = require('./texture');
-const updateTileMasks = require('./tile_mask');
-const Color = require('../style-spec/util/color');
+import browser from '../util/browser';
+
+import { mat4 } from '@mapbox/gl-matrix';
+import SourceCache from '../source/source_cache';
+import EXTENT from '../data/extent';
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
+import { filterObject } from '../util/util';
+import VertexArrayObject from './vertex_array_object';
+import { RasterBoundsArray, PosArray } from '../data/array_types';
+import rasterBoundsAttributes from '../data/raster_bounds_attributes';
+import posAttributes from '../data/pos_attributes';
+import { ProgramConfiguration } from '../data/program_configuration';
+import CrossTileSymbolIndex from '../symbol/cross_tile_symbol_index';
+import shaders from '../shaders';
+import Program from './program';
+import Context from '../gl/context';
+import DepthMode from '../gl/depth_mode';
+import StencilMode from '../gl/stencil_mode';
+import ColorMode from '../gl/color_mode';
+import Texture from './texture';
+import updateTileMasks from './tile_mask';
+import Color from '../style-spec/util/color';
+import symbol from './draw_symbol';
+import circle from './draw_circle';
+import heatmap from './draw_heatmap';
+import line from './draw_line';
+import fill from './draw_fill';
+import fillExtrusion from './draw_fill_extrusion';
+import hillshade from './draw_hillshade';
+import raster from './draw_raster';
+import background from './draw_background';
+import debug from './draw_debug';
 
 const draw = {
-    symbol: require('./draw_symbol'),
-    circle: require('./draw_circle'),
-    heatmap: require('./draw_heatmap'),
-    line: require('./draw_line'),
-    fill: require('./draw_fill'),
-    'fill-extrusion': require('./draw_fill_extrusion'),
-    hillshade: require('./draw_hillshade'),
-    raster: require('./draw_raster'),
-    background: require('./draw_background'),
-    debug: require('./draw_debug')
+    symbol,
+    circle,
+    heatmap,
+    line,
+    fill,
+    'fill-extrusion': fillExtrusion,
+    hillshade,
+    raster,
+    background,
+    debug
 };
 
 import type Transform from '../geo/transform';
@@ -274,7 +285,10 @@ class Painter {
 
         const layerIds = this.style._order;
 
-        const rasterSources = util.filterObject(this.style.sourceCaches, (sc) => { return sc.getSource().type === 'raster' || sc.getSource().type === 'raster-dem'; });
+        const rasterSources = filterObject(
+            this.style.sourceCaches,
+            (sc) => { return sc.getSource().type === 'raster' || sc.getSource().type === 'raster-dem'; }
+        );
         for (const key in rasterSources) {
             const sourceCache = rasterSources[key];
             const coords = sourceCache.getVisibleCoordinates();
@@ -472,4 +486,4 @@ class Painter {
     }
 }
 
-module.exports = Painter;
+export default Painter;
diff --git a/src/render/pattern.js b/src/render/pattern.js
index 1de7b178f25..69128d844e5 100644
--- a/src/render/pattern.js
+++ b/src/render/pattern.js
@@ -1,7 +1,8 @@
 // @flow
 
-const assert = require('assert');
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
+import assert from 'assert';
+
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
 
 import type Painter from './painter';
 import type Program from './program';
@@ -13,14 +14,14 @@ import type {CrossFaded} from '../style/cross_faded';
  * @private
  * @returns true if a needed image is missing and rendering needs to be skipped.
  */
-exports.isPatternMissing = function(image: ?CrossFaded<string>, painter: Painter): boolean {
+export const isPatternMissing = function(image: ?CrossFaded<string>, painter: Painter): boolean {
     if (!image) return false;
     const imagePosA = painter.imageManager.getPattern(image.from);
     const imagePosB = painter.imageManager.getPattern(image.to);
     return !imagePosA || !imagePosB;
 };
 
-exports.prepare = function (image: CrossFaded<string>, painter: Painter, program: Program) {
+export const prepare = function (image: CrossFaded<string>, painter: Painter, program: Program) {
     const context = painter.context;
     const gl = context.gl;
 
@@ -45,7 +46,7 @@ exports.prepare = function (image: CrossFaded<string>, painter: Painter, program
     painter.imageManager.bind(painter.context);
 };
 
-exports.setTile = function (tile: {tileID: OverscaledTileID, tileSize: number}, painter: Painter, program: Program) {
+export const setPatternUniforms = function (tile: {tileID: OverscaledTileID, tileSize: number}, painter: Painter, program: Program) {
     const gl = painter.context.gl;
 
     gl.uniform1f(program.uniforms.u_tile_units_to_pixels, 1 / pixelsToTileUnits(tile, 1, painter.transform.tileZoom));
diff --git a/src/render/program.js b/src/render/program.js
index 91732c81a14..693a011239a 100644
--- a/src/render/program.js
+++ b/src/render/program.js
@@ -1,13 +1,14 @@
 // @flow
 
-const browser = require('../util/browser');
-const shaders = require('../shaders');
-const assert = require('assert');
-const {ProgramConfiguration} = require('../data/program_configuration');
-const VertexArrayObject = require('./vertex_array_object');
-const Context = require('../gl/context');
-
-import type {SegmentVector} from '../data/segment';
+import browser from '../util/browser';
+
+import shaders from '../shaders';
+import assert from 'assert';
+import { ProgramConfiguration } from '../data/program_configuration';
+import VertexArrayObject from './vertex_array_object';
+import Context from '../gl/context';
+
+import type SegmentVector from '../data/segment';
 import type VertexBuffer from '../gl/vertex_buffer';
 import type IndexBuffer from '../gl/index_buffer';
 
@@ -123,4 +124,4 @@ class Program {
     }
 }
 
-module.exports = Program;
+export default Program;
diff --git a/src/render/texture.js b/src/render/texture.js
index 53d9ca2152e..2caff150334 100644
--- a/src/render/texture.js
+++ b/src/render/texture.js
@@ -1,6 +1,7 @@
 // @flow
 
-const {HTMLImageElement, HTMLCanvasElement, HTMLVideoElement, ImageData} = require('../util/window');
+import window from '../util/window';
+const { HTMLImageElement, HTMLCanvasElement, HTMLVideoElement, ImageData } = window;
 
 import type Context from '../gl/context';
 import type {RGBAImage, AlphaImage} from '../util/image';
@@ -96,4 +97,4 @@ class Texture {
     }
 }
 
-module.exports = Texture;
+export default Texture;
diff --git a/src/render/tile_mask.js b/src/render/tile_mask.js
index 2d6811a3dfa..cdfbbfb4d28 100644
--- a/src/render/tile_mask.js
+++ b/src/render/tile_mask.js
@@ -1,11 +1,11 @@
 // @flow
 
-const {OverscaledTileID, CanonicalTileID} = require('../source/tile_id');
+import { OverscaledTileID, CanonicalTileID } from '../source/tile_id';
 
 import type Tile from './../source/tile';
 import type Context from '../gl/context';
 
-export type Mask = {
+type Mask = {
     [number]: CanonicalTileID
 };
 
@@ -60,7 +60,7 @@ export type Mask = {
 // 2/1/3, since it is not a descendant of it.
 
 
-module.exports = function(renderableTiles: Array<Tile>, context: Context) {
+export default function(renderableTiles: Array<Tile>, context: Context) {
     const sortedRenderables = renderableTiles.sort((a, b) => { return a.tileID.isLessThan(b.tileID) ? -1 : b.tileID.isLessThan(a.tileID) ? 1 : 0; });
 
     for (let i = 0; i < sortedRenderables.length; i++) {
@@ -75,7 +75,7 @@ module.exports = function(renderableTiles: Array<Tile>, context: Context) {
         computeTileMasks(tile.tileID.wrapped(), tile.tileID, childArray, new OverscaledTileID(0, tile.tileID.wrap + 1, 0, 0, 0), mask);
         tile.setMask(mask, context);
     }
-};
+}
 
 function computeTileMasks(rootTile: OverscaledTileID, ref: OverscaledTileID, childArray: Array<Tile>, lowerBound: OverscaledTileID, mask: Mask) {
     // If the reference or any of its children is found in the list, we need to recurse.
diff --git a/src/render/vertex_array_object.js b/src/render/vertex_array_object.js
index 10fcf8bf7de..e5250092164 100644
--- a/src/render/vertex_array_object.js
+++ b/src/render/vertex_array_object.js
@@ -1,6 +1,6 @@
 // @flow
 
-const assert = require('assert');
+import assert from 'assert';
 
 import type Program from './program';
 import type VertexBuffer from '../gl/vertex_buffer';
@@ -160,4 +160,4 @@ class VertexArrayObject {
     }
 }
 
-module.exports = VertexArrayObject;
+export default VertexArrayObject;
diff --git a/src/shaders/encode_attribute.js b/src/shaders/encode_attribute.js
index f1e9a183502..3ae48c50d35 100644
--- a/src/shaders/encode_attribute.js
+++ b/src/shaders/encode_attribute.js
@@ -1,6 +1,6 @@
 // @flow
 
-const util = require('../util/util');
+import { clamp } from '../util/util';
 
 /**
  * Packs two numbers, interpreted as 8-bit unsigned integers, into a single
@@ -9,10 +9,10 @@ const util = require('../util/util');
  *
  * @private
  */
-exports.packUint8ToFloat = function pack(a: number, b: number) {
+export const packUint8ToFloat = function pack(a: number, b: number) {
     // coerce a and b to 8-bit ints
-    a = util.clamp(Math.floor(a), 0, 255);
-    b = util.clamp(Math.floor(b), 0, 255);
+    a = clamp(Math.floor(a), 0, 255);
+    b = clamp(Math.floor(b), 0, 255);
     return 256 * a + b;
 };
 
diff --git a/src/shaders/index.js b/src/shaders/index.js
index 00609272404..afd8f24ed09 100644
--- a/src/shaders/index.js
+++ b/src/shaders/index.js
@@ -1,5 +1,7 @@
 // @flow
 
+/* eslint-disable import/unambiguous */
+
 const fs = require('fs');
 
 // readFileSync calls must be written out long-form for brfs.
diff --git a/src/source/canvas_source.js b/src/source/canvas_source.js
index fc52040a349..a897e83fd74 100644
--- a/src/source/canvas_source.js
+++ b/src/source/canvas_source.js
@@ -1,11 +1,12 @@
 // @flow
 
-const ImageSource = require('./image_source');
-const window = require('../util/window');
-const rasterBoundsAttributes = require('../data/raster_bounds_attributes');
-const VertexArrayObject = require('../render/vertex_array_object');
-const Texture = require('../render/texture');
-const {ErrorEvent} = require('../util/evented');
+import ImageSource from './image_source';
+
+import window from '../util/window';
+import rasterBoundsAttributes from '../data/raster_bounds_attributes';
+import VertexArrayObject from '../render/vertex_array_object';
+import Texture from '../render/texture';
+import { ErrorEvent } from '../util/evented';
 
 import type Map from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
@@ -195,4 +196,4 @@ class CanvasSource extends ImageSource {
     }
 }
 
-module.exports = CanvasSource;
+export default CanvasSource;
diff --git a/src/source/geojson_source.js b/src/source/geojson_source.js
index c1f126b6e38..78cc1053eb5 100644
--- a/src/source/geojson_source.js
+++ b/src/source/geojson_source.js
@@ -1,11 +1,12 @@
 // @flow
 
-const {Event, ErrorEvent, Evented} = require('../util/evented');
-const util = require('../util/util');
-const window = require('../util/window');
-const EXTENT = require('../data/extent');
-const ResourceType = require('../util/ajax').ResourceType;
-const browser = require('../util/browser');
+import { Event, ErrorEvent, Evented } from '../util/evented';
+
+import { extend } from '../util/util';
+import window from '../util/window';
+import EXTENT from '../data/extent';
+import { ResourceType } from '../util/ajax';
+import browser from '../util/browser';
 
 import type {Source} from './source';
 import type Map from '../ui/map';
@@ -102,7 +103,7 @@ class GeoJSONSource extends Evented implements Source {
         this.setEventedParent(eventedParent);
 
         this._data = (options.data: any);
-        this._options = util.extend({}, options);
+        this._options = extend({}, options);
 
         this._collectResourceTiming = options.collectResourceTiming;
         this._resourceTiming = [];
@@ -116,7 +117,7 @@ class GeoJSONSource extends Evented implements Source {
         // so that it can load/parse/index the geojson data
         // extending with `options.workerOptions` helps to make it easy for
         // third-party sources to hack/reuse GeoJSONSource.
-        this.workerOptions = util.extend({
+        this.workerOptions = extend({
             source: this.id,
             cluster: options.cluster || false,
             geojsonVtOptions: {
@@ -192,7 +193,7 @@ class GeoJSONSource extends Evented implements Source {
      * using geojson-vt or supercluster as appropriate.
      */
     _updateWorkerData(callback: Function) {
-        const options = util.extend({}, this.workerOptions);
+        const options = extend({}, this.workerOptions);
         const data = this._data;
         if (typeof data === 'string') {
             options.request = this.map._transformRequest(resolveURL(data), ResourceType.Source);
@@ -273,7 +274,7 @@ class GeoJSONSource extends Evented implements Source {
     }
 
     serialize() {
-        return util.extend({}, this._options, {
+        return extend({}, this._options, {
             type: this.type,
             data: this._data
         });
@@ -290,4 +291,4 @@ function resolveURL(url) {
     return a.href;
 }
 
-module.exports = GeoJSONSource;
+export default GeoJSONSource;
diff --git a/src/source/geojson_worker_source.js b/src/source/geojson_worker_source.js
index 6056f193517..4e59bde0f48 100644
--- a/src/source/geojson_worker_source.js
+++ b/src/source/geojson_worker_source.js
@@ -1,15 +1,15 @@
 // @flow
 
-const ajax = require('../util/ajax');
-const perf = require('../util/performance');
-const rewind = require('geojson-rewind');
-const GeoJSONWrapper = require('./geojson_wrapper');
-const vtpbf = require('vt-pbf');
-const supercluster = require('supercluster');
-const geojsonvt = require('geojson-vt');
-const assert = require('assert');
+import { getJSON } from '../util/ajax';
 
-const VectorTileWorkerSource = require('./vector_tile_worker_source');
+import perf from '../util/performance';
+import rewind from 'geojson-rewind';
+import GeoJSONWrapper from './geojson_wrapper';
+import vtpbf from 'vt-pbf';
+import supercluster from 'supercluster';
+import geojsonvt from 'geojson-vt';
+import assert from 'assert';
+import VectorTileWorkerSource from './vector_tile_worker_source';
 
 import type {
     WorkerTileParameters,
@@ -250,7 +250,7 @@ class GeoJSONWorkerSource extends VectorTileWorkerSource {
         // ie: /foo/bar.json or http://example.com/bar.json
         // but not ../foo/bar.json
         if (params.request) {
-            ajax.getJSON(params.request, callback);
+            getJSON(params.request, callback);
         } else if (typeof params.data === 'string') {
             try {
                 return callback(null, JSON.parse(params.data));
@@ -271,4 +271,4 @@ class GeoJSONWorkerSource extends VectorTileWorkerSource {
     }
 }
 
-module.exports = GeoJSONWorkerSource;
+export default GeoJSONWorkerSource;
diff --git a/src/source/geojson_wrapper.js b/src/source/geojson_wrapper.js
index f7f0fc53ba5..c621f80de6b 100644
--- a/src/source/geojson_wrapper.js
+++ b/src/source/geojson_wrapper.js
@@ -1,8 +1,10 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-const toGeoJSON = require('@mapbox/vector-tile').VectorTileFeature.prototype.toGeoJSON;
-const EXTENT = require('../data/extent');
+import Point from '@mapbox/point-geometry';
+
+import mvt from '@mapbox/vector-tile';
+const toGeoJSON = mvt.VectorTileFeature.prototype.toGeoJSON;
+import EXTENT from '../data/extent';
 
 // The feature type used by geojson-vt and supercluster. Should be extracted to
 // global type and used in module definitions for those two modules.
@@ -89,4 +91,4 @@ class GeoJSONWrapper implements VectorTile, VectorTileLayer {
     }
 }
 
-module.exports = GeoJSONWrapper;
+export default GeoJSONWrapper;
diff --git a/src/source/image_source.js b/src/source/image_source.js
index 6c0b36db8b5..199f2c4af19 100644
--- a/src/source/image_source.js
+++ b/src/source/image_source.js
@@ -1,17 +1,18 @@
 // @flow
 
-const util = require('../util/util');
-const {CanonicalTileID} = require('./tile_id');
-const LngLat = require('../geo/lng_lat');
-const Point = require('@mapbox/point-geometry');
-const {Event, ErrorEvent, Evented} = require('../util/evented');
-const ajax = require('../util/ajax');
-const browser = require('../util/browser');
-const EXTENT = require('../data/extent');
-const {RasterBoundsArray} = require('../data/array_types');
-const rasterBoundsAttributes = require('../data/raster_bounds_attributes');
-const VertexArrayObject = require('../render/vertex_array_object');
-const Texture = require('../render/texture');
+import { getCoordinatesCenter } from '../util/util';
+
+import { CanonicalTileID } from './tile_id';
+import LngLat from '../geo/lng_lat';
+import Point from '@mapbox/point-geometry';
+import { Event, ErrorEvent, Evented } from '../util/evented';
+import { getImage, ResourceType } from '../util/ajax';
+import browser from '../util/browser';
+import EXTENT from '../data/extent';
+import { RasterBoundsArray } from '../data/array_types';
+import rasterBoundsAttributes from '../data/raster_bounds_attributes';
+import VertexArrayObject from '../render/vertex_array_object';
+import Texture from '../render/texture';
 
 import type {Source} from './source';
 import type Map from '../ui/map';
@@ -96,7 +97,7 @@ class ImageSource extends Evented implements Source {
 
         this.url = this.options.url;
 
-        ajax.getImage(this.map._transformRequest(this.url, ajax.ResourceType.Image), (err, image) => {
+        getImage(this.map._transformRequest(this.url, ResourceType.Image), (err, image) => {
             if (err) {
                 this.fire(new ErrorEvent(err));
             } else if (image) {
@@ -143,7 +144,7 @@ class ImageSource extends Evented implements Source {
 
         // Compute the coordinates of the tile we'll use to hold this image's
         // render data
-        const centerCoord = this.centerCoord = util.getCoordinatesCenter(cornerZ0Coords);
+        const centerCoord = this.centerCoord = getCoordinatesCenter(cornerZ0Coords);
         // `column` and `row` may be fractional; round them down so that they
         // represent integer tile coordinates
         centerCoord.column = Math.floor(centerCoord.column);
@@ -239,4 +240,4 @@ class ImageSource extends Evented implements Source {
     }
 }
 
-module.exports = ImageSource;
+export default ImageSource;
diff --git a/src/source/load_tilejson.js b/src/source/load_tilejson.js
index 7472a20d27e..60ee8a6cf21 100644
--- a/src/source/load_tilejson.js
+++ b/src/source/load_tilejson.js
@@ -1,20 +1,24 @@
 // @flow
 
-const util = require('../util/util');
-const ajax = require('../util/ajax');
-const browser = require('../util/browser');
-const normalizeURL = require('../util/mapbox').normalizeSourceURL;
+import { pick } from '../util/util';
+
+import { getJSON, ResourceType } from '../util/ajax';
+import browser from '../util/browser';
+import { normalizeSourceURL as normalizeURL } from '../util/mapbox';
 
 import type {RequestTransformFunction} from '../ui/map';
 import type {Callback} from '../types/callback';
 import type {TileJSON} from '../types/tilejson';
 
-module.exports = function(options: any, requestTransformFn: RequestTransformFunction, callback: Callback<TileJSON>) {
+export default function(options: any, requestTransformFn: RequestTransformFunction, callback: Callback<TileJSON>) {
     const loaded = function(err, tileJSON: any) {
         if (err) {
             return callback(err);
         } else if (tileJSON) {
-            const result: any = util.pick(tileJSON, ['tiles', 'minzoom', 'maxzoom', 'attribution', 'mapbox_logo', 'bounds']);
+            const result: any = pick(
+                tileJSON,
+                ['tiles', 'minzoom', 'maxzoom', 'attribution', 'mapbox_logo', 'bounds']
+            );
 
             if (tileJSON.vector_layers) {
                 result.vectorLayers = tileJSON.vector_layers;
@@ -26,8 +30,8 @@ module.exports = function(options: any, requestTransformFn: RequestTransformFunc
     };
 
     if (options.url) {
-        ajax.getJSON(requestTransformFn(normalizeURL(options.url), ajax.ResourceType.Source), loaded);
+        getJSON(requestTransformFn(normalizeURL(options.url), ResourceType.Source), loaded);
     } else {
         browser.frame(() => loaded(null, options));
     }
-};
+}
diff --git a/src/source/pixels_to_tile_units.js b/src/source/pixels_to_tile_units.js
index 344d90f2e70..7874396f30c 100644
--- a/src/source/pixels_to_tile_units.js
+++ b/src/source/pixels_to_tile_units.js
@@ -1,6 +1,6 @@
 // @flow
 
-const EXTENT = require('../data/extent');
+import EXTENT from '../data/extent';
 
 import type {OverscaledTileID} from './tile_id';
 
@@ -16,6 +16,6 @@ import type {OverscaledTileID} from './tile_id';
  * @returns value in tile units
  * @private
  */
-module.exports = function(tile: {tileID: OverscaledTileID, tileSize: number}, pixelValue: number, z: number): number {
+export default function(tile: {tileID: OverscaledTileID, tileSize: number}, pixelValue: number, z: number): number {
     return pixelValue * (EXTENT / (tile.tileSize * Math.pow(2, z - tile.tileID.overscaledZ)));
-};
+}
diff --git a/src/source/query_features.js b/src/source/query_features.js
index 129832b0650..98854e13f7b 100644
--- a/src/source/query_features.js
+++ b/src/source/query_features.js
@@ -6,7 +6,7 @@ import type Coordinate from '../geo/coordinate';
 import type CollisionIndex from '../symbol/collision_index';
 import type Transform from '../geo/transform';
 
-exports.rendered = function(sourceCache: SourceCache,
+export function queryRenderedFeatures(sourceCache: SourceCache,
                             styleLayers: {[string]: StyleLayer},
                             queryGeometry: Array<Coordinate>,
                             params: { filter: FilterSpecification, layers: Array<string> },
@@ -35,9 +35,9 @@ exports.rendered = function(sourceCache: SourceCache,
     }
 
     return mergeRenderedFeatureLayers(renderedFeatureLayers);
-};
+}
 
-exports.source = function(sourceCache: SourceCache, params: any) {
+export function querySourceFeatures(sourceCache: SourceCache, params: any) {
     const tiles = sourceCache.getRenderableIds().map((id) => {
         return sourceCache.getTileByID(id);
     });
@@ -55,7 +55,7 @@ exports.source = function(sourceCache: SourceCache, params: any) {
     }
 
     return result;
-};
+}
 
 function sortTilesIn(a, b) {
     const idA = a.tileID;
diff --git a/src/source/raster_dem_tile_source.js b/src/source/raster_dem_tile_source.js
index 4f7eef832d4..0cef8af2283 100644
--- a/src/source/raster_dem_tile_source.js
+++ b/src/source/raster_dem_tile_source.js
@@ -1,12 +1,14 @@
 // @flow
 
-const ajax = require('../util/ajax');
-const util = require('../util/util');
-const {Evented} = require('../util/evented');
-const normalizeURL = require('../util/mapbox').normalizeTileURL;
-const browser = require('../util/browser');
-const {OverscaledTileID} = require('./tile_id');
-const RasterTileSource = require('./raster_tile_source');
+import { getImage, ResourceType } from '../util/ajax';
+import { extend } from '../util/util';
+import { Evented } from '../util/evented';
+import { normalizeTileURL as normalizeURL } from '../util/mapbox';
+import browser from '../util/browser';
+import { OverscaledTileID } from './tile_id';
+import RasterTileSource from './raster_tile_source';
+// ensure DEMData is registered for worker transfer on main thread:
+import '../data/dem_data';
 
 import type {Source} from './source';
 import type Dispatcher from '../util/dispatcher';
@@ -21,7 +23,7 @@ class RasterDEMTileSource extends RasterTileSource implements Source {
         super(id, options, dispatcher, eventedParent);
         this.type = 'raster-dem';
         this.maxzoom = 22;
-        this._options = util.extend({}, options);
+        this._options = extend({}, options);
         this.encoding = options.encoding || "mapbox";
     }
 
@@ -38,7 +40,7 @@ class RasterDEMTileSource extends RasterTileSource implements Source {
 
     loadTile(tile: Tile, callback: Callback<void>) {
         const url = normalizeURL(tile.tileID.canonical.url(this.tiles, this.scheme), this.url, this.tileSize);
-        tile.request = ajax.getImage(this.map._transformRequest(url, ajax.ResourceType.Tile), imageLoaded.bind(this));
+        tile.request = getImage(this.map._transformRequest(url, ResourceType.Tile), imageLoaded.bind(this));
 
         tile.neighboringTiles = this._getNeighboringTiles(tile.tileID);
         function imageLoaded(err, img) {
@@ -131,4 +133,4 @@ class RasterDEMTileSource extends RasterTileSource implements Source {
 
 }
 
-module.exports = RasterDEMTileSource;
+export default RasterDEMTileSource;
diff --git a/src/source/raster_dem_tile_worker_source.js b/src/source/raster_dem_tile_worker_source.js
index d6051e0d1c6..52682208652 100644
--- a/src/source/raster_dem_tile_worker_source.js
+++ b/src/source/raster_dem_tile_worker_source.js
@@ -1,6 +1,6 @@
 // @flow
 
-const {DEMData} = require('../data/dem_data');
+import { DEMData } from '../data/dem_data';
 
 import type Actor from '../util/actor';
 import type {
@@ -43,4 +43,4 @@ class RasterDEMTileWorkerSource {
     }
 }
 
-module.exports = RasterDEMTileWorkerSource;
+export default RasterDEMTileWorkerSource;
diff --git a/src/source/raster_tile_source.js b/src/source/raster_tile_source.js
index b3e4e0f4e42..d7fe6863173 100644
--- a/src/source/raster_tile_source.js
+++ b/src/source/raster_tile_source.js
@@ -1,12 +1,13 @@
 // @flow
 
-const util = require('../util/util');
-const ajax = require('../util/ajax');
-const {Event, ErrorEvent, Evented} = require('../util/evented');
-const loadTileJSON = require('./load_tilejson');
-const normalizeURL = require('../util/mapbox').normalizeTileURL;
-const TileBounds = require('./tile_bounds');
-const Texture = require('../render/texture');
+import { extend, pick } from '../util/util';
+
+import { getImage, ResourceType } from '../util/ajax';
+import { Event, ErrorEvent, Evented } from '../util/evented';
+import loadTileJSON from './load_tilejson';
+import { normalizeTileURL as normalizeURL } from '../util/mapbox';
+import TileBounds from './tile_bounds';
+import Texture from '../render/texture';
 
 import type {Source} from './source';
 import type {OverscaledTileID} from './tile_id';
@@ -48,8 +49,8 @@ class RasterTileSource extends Evented implements Source {
         this.tileSize = 512;
         this._loaded = false;
 
-        this._options = util.extend({}, options);
-        util.extend(this, util.pick(options, ['url', 'scheme', 'tileSize']));
+        this._options = extend({}, options);
+        extend(this, pick(options, ['url', 'scheme', 'tileSize']));
     }
 
     load() {
@@ -58,7 +59,7 @@ class RasterTileSource extends Evented implements Source {
             if (err) {
                 this.fire(new ErrorEvent(err));
             } else if (tileJSON) {
-                util.extend(this, tileJSON);
+                extend(this, tileJSON);
                 if (tileJSON.bounds) this.tileBounds = new TileBounds(tileJSON.bounds, this.minzoom, this.maxzoom);
 
                 // `content` is included here to prevent a race condition where `Style#_updateSources` is called
@@ -76,7 +77,7 @@ class RasterTileSource extends Evented implements Source {
     }
 
     serialize() {
-        return util.extend({}, this._options);
+        return extend({}, this._options);
     }
 
     hasTile(tileID: OverscaledTileID) {
@@ -85,7 +86,7 @@ class RasterTileSource extends Evented implements Source {
 
     loadTile(tile: Tile, callback: Callback<void>) {
         const url = normalizeURL(tile.tileID.canonical.url(this.tiles, this.scheme), this.url, this.tileSize);
-        tile.request = ajax.getImage(this.map._transformRequest(url, ajax.ResourceType.Tile), (err, img) => {
+        tile.request = getImage(this.map._transformRequest(url, ResourceType.Tile), (err, img) => {
             delete tile.request;
 
             if (tile.aborted) {
@@ -140,4 +141,4 @@ class RasterTileSource extends Evented implements Source {
     }
 }
 
-module.exports = RasterTileSource;
+export default RasterTileSource;
diff --git a/src/source/rtl_text_plugin.js b/src/source/rtl_text_plugin.js
index 95da352c248..7dc429ed119 100644
--- a/src/source/rtl_text_plugin.js
+++ b/src/source/rtl_text_plugin.js
@@ -1,40 +1,47 @@
 // @flow
 
-const {Event, Evented} = require('../util/evented');
+import { Event, Evented } from '../util/evented';
 
 let pluginRequested = false;
 let pluginURL = null;
 
-module.exports.evented = new Evented();
+export const evented = new Evented();
 
 type ErrorCallback = (error: Error) => void;
 
-module.exports.registerForPluginAvailability = function(
+let _errorCallback;
+
+export const registerForPluginAvailability = function(
     callback: (args: {pluginURL: string, errorCallback: ErrorCallback}) => void
 ) {
     if (pluginURL) {
-        callback({ pluginURL: pluginURL, errorCallback: module.exports.errorCallback});
+        callback({ pluginURL: pluginURL, errorCallback: _errorCallback});
     } else {
-        module.exports.evented.once('pluginAvailable', callback);
+        evented.once('pluginAvailable', callback);
     }
     return callback;
 };
 
 // Only exposed for tests
-module.exports.clearRTLTextPlugin = function() {
+export const clearRTLTextPlugin = function() {
     pluginRequested = false;
     pluginURL = null;
 };
 
-module.exports.setRTLTextPlugin = function(url: string, callback: ErrorCallback) {
+export const setRTLTextPlugin = function(url: string, callback: ErrorCallback) {
     if (pluginRequested) {
         throw new Error('setRTLTextPlugin cannot be called multiple times.');
     }
     pluginRequested = true;
     pluginURL = url;
-    module.exports.errorCallback = callback;
-    module.exports.evented.fire(new Event('pluginAvailable', { pluginURL: pluginURL, errorCallback: callback }));
+    evented.fire(new Event('pluginAvailable', { pluginURL: pluginURL, errorCallback: callback }));
+    _errorCallback = callback;
 };
 
-module.exports.applyArabicShaping = (null: ?Function);
-module.exports.processBidirectionalText = (null: ?(string, Array<number>) => Array<string>);
+export const plugin: {
+    applyArabicShaping: ?Function,
+    processBidirectionalText: ?(string, Array<number>) => Array<string>
+} = {
+    applyArabicShaping: null,
+    processBidirectionalText: null
+};
diff --git a/src/source/source.js b/src/source/source.js
index 12709d6dc35..5b372a11b40 100644
--- a/src/source/source.js
+++ b/src/source/source.js
@@ -1,6 +1,6 @@
 // @flow
 
-const util = require('../util/util');
+import { bindAll } from '../util/util';
 
 import type Dispatcher from '../util/dispatcher';
 import type {Event, Evented} from '../util/evented';
@@ -77,14 +77,22 @@ export interface Source {
     +prepare?: () => void;
 }
 
+import vector from '../source/vector_tile_source';
+import raster from '../source/raster_tile_source';
+import rasterDem from '../source/raster_dem_tile_source';
+import geojson from '../source/geojson_source';
+import video from '../source/video_source';
+import image from '../source/image_source';
+import canvas from '../source/canvas_source';
+
 const sourceTypes = {
-    'vector': require('../source/vector_tile_source'),
-    'raster': require('../source/raster_tile_source'),
-    'raster-dem': require('../source/raster_dem_tile_source'),
-    'geojson': require('../source/geojson_source'),
-    'video': require('../source/video_source'),
-    'image': require('../source/image_source'),
-    'canvas': require('../source/canvas_source')
+    vector,
+    raster,
+    'raster-dem': rasterDem,
+    geojson,
+    video,
+    image,
+    canvas
 };
 
 /*
@@ -97,22 +105,22 @@ const sourceTypes = {
  * @param {Dispatcher} dispatcher
  * @returns {Source}
  */
-exports.create = function(id: string, specification: SourceSpecification, dispatcher: Dispatcher, eventedParent: Evented) {
+export const create = function(id: string, specification: SourceSpecification, dispatcher: Dispatcher, eventedParent: Evented) {
     const source = new sourceTypes[specification.type](id, (specification: any), dispatcher, eventedParent);
 
     if (source.id !== id) {
         throw new Error(`Expected Source id to be ${id} instead of ${source.id}`);
     }
 
-    util.bindAll(['load', 'abort', 'unload', 'serialize', 'prepare'], source);
+    bindAll(['load', 'abort', 'unload', 'serialize', 'prepare'], source);
     return source;
 };
 
-exports.getType = function (name: string) {
+export const getType = function (name: string) {
     return sourceTypes[name];
 };
 
-exports.setType = function (name: string, type: Class<Source>) {
+export const setType = function (name: string, type: Class<Source>) {
     sourceTypes[name] = type;
 };
 
diff --git a/src/source/source_cache.js b/src/source/source_cache.js
index 495adaefabe..2634de3ecbe 100644
--- a/src/source/source_cache.js
+++ b/src/source/source_cache.js
@@ -1,17 +1,18 @@
 // @flow
 
-const createSource = require('./source').create;
-const Tile = require('./tile');
-const {Event, ErrorEvent, Evented} = require('../util/evented');
-const Cache = require('../util/lru_cache');
-const Coordinate = require('../geo/coordinate');
-const util = require('../util/util');
-const EXTENT = require('../data/extent');
-const Context = require('../gl/context');
-const Point = require('@mapbox/point-geometry');
-const browser = require('../util/browser');
-const {OverscaledTileID} = require('./tile_id');
-const assert = require('assert');
+import { create as createSource } from './source';
+
+import Tile from './tile';
+import { Event, ErrorEvent, Evented } from '../util/evented';
+import Cache from '../util/lru_cache';
+import Coordinate from '../geo/coordinate';
+import { keysDifference } from '../util/util';
+import EXTENT from '../data/extent';
+import Context from '../gl/context';
+import Point from '@mapbox/point-geometry';
+import browser from '../util/browser';
+import { OverscaledTileID } from './tile_id';
+import assert from 'assert';
 
 import type {Source} from './source';
 import type Map from '../ui/map';
@@ -472,7 +473,7 @@ class SourceCache extends Evented {
             retain[fadedParent] = parentsForFading[fadedParent];
         }
         // Remove the tiles we don't need anymore.
-        const remove = util.keysDifference(this._tiles, retain);
+        const remove = keysDifference(this._tiles, retain);
         for (let i = 0; i < remove.length; i++) {
             this._removeTile(remove[i]);
         }
@@ -777,4 +778,5 @@ function isRasterType(type) {
     return type === 'raster' || type === 'image' || type === 'video';
 }
 
-module.exports = SourceCache;
+export default SourceCache;
+
diff --git a/src/source/tile.js b/src/source/tile.js
index 6dec5ba64ad..49cbe9141f4 100644
--- a/src/source/tile.js
+++ b/src/source/tile.js
@@ -1,25 +1,22 @@
 // @flow
 
-const util = require('../util/util');
-const deserializeBucket = require('../data/bucket').deserialize;
-const FeatureIndex = require('../data/feature_index');
-const vt = require('@mapbox/vector-tile');
-const Protobuf = require('pbf');
-const GeoJSONFeature = require('../util/vectortile_to_geojson');
-const featureFilter = require('../style-spec/feature_filter');
-const CollisionIndex = require('../symbol/collision_index');
-const SymbolBucket = require('../data/bucket/symbol_bucket');
-const {
-    RasterBoundsArray,
-    CollisionBoxArray
-} = require('../data/array_types');
-const rasterBoundsAttributes = require('../data/raster_bounds_attributes');
-const EXTENT = require('../data/extent');
-const Point = require('@mapbox/point-geometry');
-const Texture = require('../render/texture');
-const {SegmentVector} = require('../data/segment');
-const {TriangleIndexArray} = require('../data/index_array_type');
-const browser = require('../util/browser');
+import { uniqueId, deepEqual, parseCacheControl } from '../util/util';
+import { deserialize as deserializeBucket } from '../data/bucket';
+import FeatureIndex from '../data/feature_index';
+import vt from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import GeoJSONFeature from '../util/vectortile_to_geojson';
+import featureFilter from '../style-spec/feature_filter';
+import CollisionIndex from '../symbol/collision_index';
+import SymbolBucket from '../data/bucket/symbol_bucket';
+import { RasterBoundsArray, CollisionBoxArray } from '../data/array_types';
+import rasterBoundsAttributes from '../data/raster_bounds_attributes';
+import EXTENT from '../data/extent';
+import Point from '@mapbox/point-geometry';
+import Texture from '../render/texture';
+import SegmentVector from '../data/segment';
+import { TriangleIndexArray } from '../data/index_array_type';
+import browser from '../util/browser';
 
 const CLOCK_SKEW_RETRY_TIMEOUT = 30000;
 
@@ -100,7 +97,7 @@ class Tile {
      */
     constructor(tileID: OverscaledTileID, size: number) {
         this.tileID = tileID;
-        this.uid = util.uniqueId();
+        this.uid = uniqueId();
         this.uses = 0;
         this.tileSize = size;
         this.buckets = {};
@@ -321,14 +318,14 @@ class Tile {
     setMask(mask: Mask, context: Context) {
 
         // don't redo buffer work if the mask is the same;
-        if (util.deepEqual(this.mask, mask)) return;
+        if (deepEqual(this.mask, mask)) return;
 
         this.mask = mask;
         this.clearMask();
 
         // We want to render the full tile, and keeping the segments/vertices/indices empty means
         // using the global shared buffers for covering the entire tile.
-        if (util.deepEqual(mask, {'0': true})) return;
+        if (deepEqual(mask, {'0': true})) return;
 
         const maskedBoundsArray = new RasterBoundsArray();
         const indexArray = new TriangleIndexArray();
@@ -375,7 +372,7 @@ class Tile {
         const prior = this.expirationTime;
 
         if (data.cacheControl) {
-            const parsedCC = util.parseCacheControl(data.cacheControl);
+            const parsedCC = parseCacheControl(data.cacheControl);
             if (parsedCC['max-age']) this.expirationTime = Date.now() + parsedCC['max-age'] * 1000;
         } else if (data.expires) {
             this.expirationTime = new Date(data.expires).getTime();
@@ -432,4 +429,4 @@ class Tile {
     }
 }
 
-module.exports = Tile;
+export default Tile;
diff --git a/src/source/tile_bounds.js b/src/source/tile_bounds.js
index 909a46fdd16..f8729b77865 100644
--- a/src/source/tile_bounds.js
+++ b/src/source/tile_bounds.js
@@ -1,7 +1,8 @@
 // @flow
 
-const LngLatBounds = require('../geo/lng_lat_bounds');
-const clamp = require('../util/util').clamp;
+import LngLatBounds from '../geo/lng_lat_bounds';
+
+import { clamp } from '../util/util';
 
 import type {CanonicalTileID} from './tile_id';
 
@@ -44,4 +45,4 @@ class TileBounds {
     }
 }
 
-module.exports = TileBounds;
+export default TileBounds;
diff --git a/src/source/tile_id.js b/src/source/tile_id.js
index b74f6b5d334..094940e65d1 100644
--- a/src/source/tile_id.js
+++ b/src/source/tile_id.js
@@ -1,9 +1,10 @@
 // @flow
 
-const WhooTS = require('@mapbox/whoots-js');
-const assert = require('assert');
-const {register} = require('../util/web_worker_transfer');
-const Coordinate = require('../geo/coordinate');
+import WhooTS from '@mapbox/whoots-js';
+
+import assert from 'assert';
+import { register } from '../util/web_worker_transfer';
+import Coordinate from '../geo/coordinate';
 
 class CanonicalTileID {
     z: number;
@@ -158,8 +159,11 @@ function getQuadkey(z, x, y) {
 register('CanonicalTileID', CanonicalTileID);
 register('OverscaledTileID', OverscaledTileID, {omit: ['posMatrix']});
 
-module.exports = {
+const exported = {
     CanonicalTileID: CanonicalTileID,
     OverscaledTileID: OverscaledTileID,
     UnwrappedTileID: UnwrappedTileID
 };
+
+export default exported;
+export { CanonicalTileID, OverscaledTileID, UnwrappedTileID };
diff --git a/src/source/vector_tile_source.js b/src/source/vector_tile_source.js
index 57ad2a350e2..2583ed8da4a 100644
--- a/src/source/vector_tile_source.js
+++ b/src/source/vector_tile_source.js
@@ -1,12 +1,13 @@
 // @flow
 
-const {Event, ErrorEvent, Evented} = require('../util/evented');
-const util = require('../util/util');
-const loadTileJSON = require('./load_tilejson');
-const normalizeURL = require('../util/mapbox').normalizeTileURL;
-const TileBounds = require('./tile_bounds');
-const ResourceType = require('../util/ajax').ResourceType;
-const browser = require('../util/browser');
+import { Event, ErrorEvent, Evented } from '../util/evented';
+
+import { extend, pick } from '../util/util';
+import loadTileJSON from './load_tilejson';
+import { normalizeTileURL as normalizeURL } from '../util/mapbox';
+import TileBounds from './tile_bounds';
+import { ResourceType } from '../util/ajax';
+import browser from '../util/browser';
 
 import type {Source} from './source';
 import type {OverscaledTileID} from './tile_id';
@@ -47,8 +48,8 @@ class VectorTileSource extends Evented implements Source {
         this.reparseOverscaled = true;
         this.isTileClipped = true;
 
-        util.extend(this, util.pick(options, ['url', 'scheme', 'tileSize']));
-        this._options = util.extend({ type: 'vector' }, options);
+        extend(this, pick(options, ['url', 'scheme', 'tileSize']));
+        this._options = extend({ type: 'vector' }, options);
 
         this._collectResourceTiming = options.collectResourceTiming;
 
@@ -66,7 +67,7 @@ class VectorTileSource extends Evented implements Source {
             if (err) {
                 this.fire(new ErrorEvent(err));
             } else if (tileJSON) {
-                util.extend(this, tileJSON);
+                extend(this, tileJSON);
                 if (tileJSON.bounds) this.tileBounds = new TileBounds(tileJSON.bounds, this.minzoom, this.maxzoom);
 
                 // `content` is included here to prevent a race condition where `Style#_updateSources` is called
@@ -88,7 +89,7 @@ class VectorTileSource extends Evented implements Source {
     }
 
     serialize() {
-        return util.extend({}, this._options);
+        return extend({}, this._options);
     }
 
     loadTile(tile: Tile, callback: Callback<void>) {
@@ -154,4 +155,4 @@ class VectorTileSource extends Evented implements Source {
     }
 }
 
-module.exports = VectorTileSource;
+export default VectorTileSource;
diff --git a/src/source/vector_tile_worker_source.js b/src/source/vector_tile_worker_source.js
index 0a302955319..46d08ec96f3 100644
--- a/src/source/vector_tile_worker_source.js
+++ b/src/source/vector_tile_worker_source.js
@@ -1,11 +1,12 @@
 // @flow
 
-const ajax = require('../util/ajax');
-const vt = require('@mapbox/vector-tile');
-const Protobuf = require('pbf');
-const WorkerTile = require('./worker_tile');
-const util = require('../util/util');
-const perf = require('../util/performance');
+import {getArrayBuffer} from '../util/ajax';
+
+import vt from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import WorkerTile from './worker_tile';
+import { extend } from '../util/util';
+import perf from '../util/performance';
 
 import type {
     WorkerSource,
@@ -42,7 +43,7 @@ export type LoadVectorData = (params: WorkerTileParameters, callback: LoadVector
  * @private
  */
 function loadVectorTile(params: WorkerTileParameters, callback: LoadVectorDataCallback) {
-    const xhr = ajax.getArrayBuffer(params.request, (err, response) => {
+    const xhr = getArrayBuffer(params.request, (err, response) => {
         if (err) {
             callback(err);
         } else if (response) {
@@ -127,7 +128,7 @@ class VectorTileWorkerSource implements WorkerSource {
                 if (err || !result) return callback(err);
 
                 // Transferring a copy of rawTileData because the worker needs to retain its copy.
-                callback(null, util.extend({rawTileData: rawTileData.slice(0)}, result, cacheControl, resourceTiming));
+                callback(null, extend({rawTileData: rawTileData.slice(0)}, result, cacheControl, resourceTiming));
             });
 
             this.loaded = this.loaded || {};
@@ -197,4 +198,4 @@ class VectorTileWorkerSource implements WorkerSource {
     }
 }
 
-module.exports = VectorTileWorkerSource;
+export default VectorTileWorkerSource;
diff --git a/src/source/video_source.js b/src/source/video_source.js
index 1c306acf880..14489a0cb91 100644
--- a/src/source/video_source.js
+++ b/src/source/video_source.js
@@ -1,12 +1,12 @@
 // @flow
 
-const ajax = require('../util/ajax');
-const ImageSource = require('./image_source');
-const rasterBoundsAttributes = require('../data/raster_bounds_attributes');
-const VertexArrayObject = require('../render/vertex_array_object');
-const Texture = require('../render/texture');
-const {ErrorEvent} = require('../util/evented');
-const ResourceType = require('../util/ajax').ResourceType;
+import { getVideo, ResourceType } from '../util/ajax';
+
+import ImageSource from './image_source';
+import rasterBoundsAttributes from '../data/raster_bounds_attributes';
+import VertexArrayObject from '../render/vertex_array_object';
+import Texture from '../render/texture';
+import { ErrorEvent } from '../util/evented';
 
 import type Map from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
@@ -68,7 +68,7 @@ class VideoSource extends ImageSource {
             this.urls.push(this.map._transformRequest(url, ResourceType.Source).url);
         }
 
-        ajax.getVideo(this.urls, (err, video) => {
+        getVideo(this.urls, (err, video) => {
             if (err) {
                 this.fire(new ErrorEvent(err));
             } else if (video) {
@@ -169,4 +169,4 @@ class VideoSource extends ImageSource {
     }
 }
 
-module.exports = VideoSource;
+export default VideoSource;
diff --git a/src/source/worker.js b/src/source/worker.js
index 7a7469c1c41..bf041c48763 100644
--- a/src/source/worker.js
+++ b/src/source/worker.js
@@ -1,14 +1,13 @@
 // @flow
 
-const Actor = require('../util/actor');
-const StyleLayerIndex = require('../style/style_layer_index');
+import Actor from '../util/actor';
 
-const VectorTileWorkerSource = require('./vector_tile_worker_source');
-const RasterDEMTileWorkerSource = require('./raster_dem_tile_worker_source');
-const GeoJSONWorkerSource = require('./geojson_worker_source');
-const assert = require('assert');
-
-const globalRTLTextPlugin = require('./rtl_text_plugin');
+import StyleLayerIndex from '../style/style_layer_index';
+import VectorTileWorkerSource from './vector_tile_worker_source';
+import RasterDEMTileWorkerSource from './raster_dem_tile_worker_source';
+import GeoJSONWorkerSource from './geojson_worker_source';
+import assert from 'assert';
+import { plugin as globalRTLTextPlugin } from './rtl_text_plugin';
 
 import type {
     WorkerSource,
@@ -25,7 +24,7 @@ import type {Callback} from '../types/callback';
 /**
  * @private
  */
-class Worker {
+export default class Worker {
     self: WorkerGlobalScopeInterface;
     actor: Actor;
     layerIndexes: { [string]: StyleLayerIndex };
@@ -191,6 +190,10 @@ class Worker {
     }
 }
 
-module.exports = function createWorker(self: WorkerGlobalScopeInterface) {
-    return new Worker(self);
-};
+/* global self, WorkerGlobalScope */
+if (typeof WorkerGlobalScope !== 'undefined' &&
+    typeof self !== 'undefined' &&
+    self instanceof WorkerGlobalScope) {
+    new Worker(self);
+}
+
diff --git a/src/source/worker_tile.js b/src/source/worker_tile.js
index 4be271261b4..f1f16012962 100644
--- a/src/source/worker_tile.js
+++ b/src/source/worker_tile.js
@@ -1,16 +1,17 @@
 // @flow
 
-const FeatureIndex = require('../data/feature_index');
-const {performSymbolLayout} = require('../symbol/symbol_layout');
-const {CollisionBoxArray} = require('../data/array_types');
-const DictionaryCoder = require('../util/dictionary_coder');
-const SymbolBucket = require('../data/bucket/symbol_bucket');
-const util = require('../util/util');
-const assert = require('assert');
-const {makeImageAtlas} = require('../render/image_atlas');
-const {makeGlyphAtlas} = require('../render/glyph_atlas');
-const EvaluationParameters = require('../style/evaluation_parameters');
-const {OverscaledTileID} = require('./tile_id');
+import FeatureIndex from '../data/feature_index';
+
+import { performSymbolLayout } from '../symbol/symbol_layout';
+import { CollisionBoxArray } from '../data/array_types';
+import DictionaryCoder from '../util/dictionary_coder';
+import SymbolBucket from '../data/bucket/symbol_bucket';
+import { warnOnce, mapObject, values } from '../util/util';
+import assert from 'assert';
+import { makeImageAtlas } from '../render/image_atlas';
+import { makeGlyphAtlas } from '../render/glyph_atlas';
+import EvaluationParameters from '../style/evaluation_parameters';
+import { OverscaledTileID } from './tile_id';
 
 import type {Bucket} from '../data/bucket';
 import type Actor from '../util/actor';
@@ -80,7 +81,7 @@ class WorkerTile {
             }
 
             if (sourceLayer.version === 1) {
-                util.warnOnce(`Vector tile source "${this.source}" layer "${sourceLayerId}" ` +
+                warnOnce(`Vector tile source "${this.source}" layer "${sourceLayerId}" ` +
                     `does not use vector tile spec v2 and therefore may have some rendering errors.`);
             }
 
@@ -119,7 +120,7 @@ class WorkerTile {
         let glyphMap: ?{[string]: {[number]: ?StyleGlyph}};
         let imageMap: ?{[string]: StyleImage};
 
-        const stacks = util.mapObject(options.glyphDependencies, (glyphs) => Object.keys(glyphs).map(Number));
+        const stacks = mapObject(options.glyphDependencies, (glyphs) => Object.keys(glyphs).map(Number));
         if (Object.keys(stacks).length) {
             actor.send('getGlyphs', {uid: this.uid, stacks}, (err, result) => {
                 if (!error) {
@@ -165,7 +166,7 @@ class WorkerTile {
                 this.status = 'done';
 
                 callback(null, {
-                    buckets: util.values(buckets).filter(b => !b.isEmpty()),
+                    buckets: values(buckets).filter(b => !b.isEmpty()),
                     featureIndex,
                     collisionBoxArray: this.collisionBoxArray,
                     glyphAtlasImage: glyphAtlas.image,
@@ -184,4 +185,4 @@ function recalculateLayers(layers: $ReadOnlyArray<StyleLayer>, zoom: number) {
     }
 }
 
-module.exports = WorkerTile;
+export default WorkerTile;
diff --git a/src/style-spec/build/strictify.js b/src/style-spec/build/strictify.js
index 21a947f0835..dc93f3f72c0 100644
--- a/src/style-spec/build/strictify.js
+++ b/src/style-spec/build/strictify.js
@@ -1,7 +1,7 @@
-const through = require('through2');
-const path = require('path');
+import through from 'through2';
+import path from 'path';
 
-module.exports = (file) => {
+export default (file) => {
     if (path.extname(file) === '.json') {
         return through();
     }
diff --git a/src/style-spec/composite.js b/src/style-spec/composite.js
index 746ca2036c0..b9858126a15 100644
--- a/src/style-spec/composite.js
+++ b/src/style-spec/composite.js
@@ -1,5 +1,5 @@
 
-module.exports = function (style) {
+export default function (style) {
     const styleIDs = [];
     const sourceIDs = [];
     const compositedSourceLayers = [];
@@ -47,4 +47,4 @@ module.exports = function (style) {
     });
 
     return style;
-};
+}
diff --git a/src/style-spec/declass.js b/src/style-spec/declass.js
index 0cfbb59c6c6..8d2140f99fa 100644
--- a/src/style-spec/declass.js
+++ b/src/style-spec/declass.js
@@ -1,7 +1,7 @@
 
-const extend = require('./util/extend');
+import extend from './util/extend';
 
-module.exports = declassStyle;
+export default declassStyle;
 
 /**
  * Returns a new style with the given 'paint classes' merged into each layer's
diff --git a/src/style-spec/deref.js b/src/style-spec/deref.js
index 90e57b30993..729c9c923fa 100644
--- a/src/style-spec/deref.js
+++ b/src/style-spec/deref.js
@@ -1,5 +1,5 @@
 
-const refProperties = require('./util/ref_properties');
+import refProperties from './util/ref_properties';
 
 function deref(layer, parent) {
     const result = {};
@@ -19,7 +19,7 @@ function deref(layer, parent) {
     return result;
 }
 
-module.exports = derefLayers;
+export default derefLayers;
 
 /**
  * Given an array of layers, some of which may contain `ref` properties
diff --git a/src/style-spec/diff.js b/src/style-spec/diff.js
index cbbe61fdf45..3bf499e3acc 100644
--- a/src/style-spec/diff.js
+++ b/src/style-spec/diff.js
@@ -1,5 +1,5 @@
 
-const isEqual = require('./util/deep_equal');
+import isEqual from './util/deep_equal';
 
 const operations = {
 
@@ -389,5 +389,5 @@ function diffStyles(before, after) {
     return commands;
 }
 
-module.exports = diffStyles;
-module.exports.operations = operations;
+export default diffStyles;
+export { operations };
diff --git a/src/style-spec/error/parsing_error.js b/src/style-spec/error/parsing_error.js
index 0ac00ee0ce7..d5c20f58583 100644
--- a/src/style-spec/error/parsing_error.js
+++ b/src/style-spec/error/parsing_error.js
@@ -6,4 +6,4 @@ function ParsingError(error) {
     this.line = match ? parseInt(match[1], 10) : 0;
 }
 
-module.exports = ParsingError;
+export default ParsingError;
diff --git a/src/style-spec/error/validation_error.js b/src/style-spec/error/validation_error.js
index 15762a5e158..c301b1bc784 100644
--- a/src/style-spec/error/validation_error.js
+++ b/src/style-spec/error/validation_error.js
@@ -7,4 +7,4 @@ function ValidationError(key, value, message) {
     }
 }
 
-module.exports = ValidationError;
+export default ValidationError;
diff --git a/src/style-spec/expression/compound_expression.js b/src/style-spec/expression/compound_expression.js
index 90b6691b269..8052e34dd18 100644
--- a/src/style-spec/expression/compound_expression.js
+++ b/src/style-spec/expression/compound_expression.js
@@ -1,15 +1,16 @@
 // @flow
 
-const { toString } = require('./types');
-const ParsingContext = require('./parsing_context');
-const EvaluationContext = require('./evaluation_context');
-const assert = require('assert');
+import { toString } from './types';
+
+import ParsingContext from './parsing_context';
+import EvaluationContext from './evaluation_context';
+import assert from 'assert';
 
 import type { Expression, ExpressionRegistry } from './expression';
 import type { Type } from './types';
 import type { Value } from './values';
 
-type Varargs = {| type: Type |};
+export type Varargs = {| type: Type |};
 type Signature = Array<Type> | Varargs;
 type Evaluate = (EvaluationContext, Array<Expression>) => Value;
 type Definition = [Type, Signature, Evaluate] |
@@ -133,10 +134,6 @@ class CompoundExpression implements Expression {
     }
 }
 
-function varargs(type: Type): Varargs {
-    return { type };
-}
-
 function stringifySignature(signature: Signature): string {
     if (Array.isArray(signature)) {
         return `(${signature.map(toString).join(', ')})`;
@@ -145,8 +142,4 @@ function stringifySignature(signature: Signature): string {
     }
 }
 
-module.exports = {
-    CompoundExpression,
-    varargs
-};
-
+export default CompoundExpression;
diff --git a/src/style-spec/expression/definitions/array.js b/src/style-spec/expression/definitions/array.js
index 85b7ff683da..2d18b4b7f3f 100644
--- a/src/style-spec/expression/definitions/array.js
+++ b/src/style-spec/expression/definitions/array.js
@@ -1,17 +1,9 @@
 // @flow
 
-const {
-    toString,
-    array,
-    ValueType,
-    StringType,
-    NumberType,
-    BooleanType,
-    checkSubtype
-} = require('../types');
-
-const {typeOf} = require('../values');
-const RuntimeError = require('../runtime_error');
+import { toString, array, ValueType, StringType, NumberType, BooleanType, checkSubtype } from '../types';
+
+import { typeOf } from '../values';
+import RuntimeError from '../runtime_error';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -85,4 +77,4 @@ class ArrayAssertion implements Expression {
     }
 }
 
-module.exports = ArrayAssertion;
+export default ArrayAssertion;
diff --git a/src/style-spec/expression/definitions/assertion.js b/src/style-spec/expression/definitions/assertion.js
index 0ed23b13604..40fa85bbc70 100644
--- a/src/style-spec/expression/definitions/assertion.js
+++ b/src/style-spec/expression/definitions/assertion.js
@@ -1,17 +1,18 @@
 // @flow
 
-const assert = require('assert');
-const {
+import assert from 'assert';
+
+import {
     ObjectType,
     ValueType,
     StringType,
     NumberType,
-    BooleanType
-} = require('../types');
-
-const RuntimeError = require('../runtime_error');
-const {checkSubtype, toString} = require('../types');
-const {typeOf} = require('../values');
+    BooleanType,
+    checkSubtype,
+    toString
+} from '../types';
+import RuntimeError from '../runtime_error';
+import { typeOf } from '../values';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -77,4 +78,4 @@ class Assertion implements Expression {
     }
 }
 
-module.exports = Assertion;
+export default Assertion;
diff --git a/src/style-spec/expression/definitions/at.js b/src/style-spec/expression/definitions/at.js
index c47d8102c48..3dbbb2cf857 100644
--- a/src/style-spec/expression/definitions/at.js
+++ b/src/style-spec/expression/definitions/at.js
@@ -1,12 +1,8 @@
 // @flow
 
-const {
-    array,
-    ValueType,
-    NumberType
-} = require('../types');
+import { array, ValueType, NumberType } from '../types';
 
-const RuntimeError = require('../runtime_error');
+import RuntimeError from '../runtime_error';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -67,4 +63,4 @@ class At implements Expression {
     }
 }
 
-module.exports = At;
+export default At;
diff --git a/src/style-spec/expression/definitions/case.js b/src/style-spec/expression/definitions/case.js
index aef77cd6a53..5929578e303 100644
--- a/src/style-spec/expression/definitions/case.js
+++ b/src/style-spec/expression/definitions/case.js
@@ -1,7 +1,8 @@
 // @flow
 
-const assert = require('assert');
-const { BooleanType } = require('../types');
+import assert from 'assert';
+
+import { BooleanType } from '../types';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -77,4 +78,4 @@ class Case implements Expression {
     }
 }
 
-module.exports = Case;
+export default Case;
diff --git a/src/style-spec/expression/definitions/coalesce.js b/src/style-spec/expression/definitions/coalesce.js
index d3d49526f76..af764bbdd91 100644
--- a/src/style-spec/expression/definitions/coalesce.js
+++ b/src/style-spec/expression/definitions/coalesce.js
@@ -1,7 +1,8 @@
 // @flow
 
-const assert = require('assert');
-const {checkSubtype, ValueType} = require('../types');
+import assert from 'assert';
+
+import { checkSubtype, ValueType } from '../types';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -67,4 +68,4 @@ class Coalesce implements Expression {
     }
 }
 
-module.exports = Coalesce;
+export default Coalesce;
diff --git a/src/style-spec/expression/definitions/coercion.js b/src/style-spec/expression/definitions/coercion.js
index d1d072f2458..c4c05be756e 100644
--- a/src/style-spec/expression/definitions/coercion.js
+++ b/src/style-spec/expression/definitions/coercion.js
@@ -1,14 +1,10 @@
 // @flow
 
-const assert = require('assert');
-const {
-    ColorType,
-    ValueType,
-    NumberType,
-} = require('../types');
+import assert from 'assert';
 
-const { Color, validateRGBA } = require('../values');
-const RuntimeError = require('../runtime_error');
+import { ColorType, ValueType, NumberType } from '../types';
+import { Color, validateRGBA } from '../values';
+import RuntimeError from '../runtime_error';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -99,4 +95,4 @@ class Coercion implements Expression {
     }
 }
 
-module.exports = Coercion;
+export default Coercion;
diff --git a/src/style-spec/expression/definitions/equals.js b/src/style-spec/expression/definitions/equals.js
index 90d0b2671ed..dd08dc92355 100644
--- a/src/style-spec/expression/definitions/equals.js
+++ b/src/style-spec/expression/definitions/equals.js
@@ -1,10 +1,6 @@
 // @flow
 
-const {
-    ValueType,
-    BooleanType,
-} = require('../types');
-const {toString} = require('../types');
+import { toString, ValueType, BooleanType } from '../types';
 
 import type { Expression } from '../expression';
 import type EvaluationContext from '../evaluation_context';
@@ -79,7 +75,5 @@ function makeComparison(compare) {
     };
 }
 
-module.exports = {
-    Equals: makeComparison((lhs, rhs) => lhs === rhs),
-    NotEquals: makeComparison((lhs, rhs) => lhs !== rhs)
-};
+export const Equals = makeComparison((lhs, rhs) => lhs === rhs);
+export const NotEquals = makeComparison((lhs, rhs) => lhs !== rhs);
diff --git a/src/style-spec/expression/definitions/index.js b/src/style-spec/expression/definitions/index.js
index 97aa54c6954..19c839193f8 100644
--- a/src/style-spec/expression/definitions/index.js
+++ b/src/style-spec/expression/definitions/index.js
@@ -1,35 +1,27 @@
 // @flow
 
-const {
-    NumberType,
-    StringType,
-    BooleanType,
-    ColorType,
-    ObjectType,
-    ValueType,
-    ErrorType,
-    array,
-    toString
-} = require('../types');
+import { NumberType, StringType, BooleanType, ColorType, ObjectType, ValueType, ErrorType, array, toString } from '../types';
 
-const { typeOf, Color, validateRGBA } = require('../values');
-const { CompoundExpression, varargs } = require('../compound_expression');
-const RuntimeError = require('../runtime_error');
-const Let = require('./let');
-const Var = require('./var');
-const Literal = require('./literal');
-const Assertion = require('./assertion');
-const ArrayAssertion = require('./array');
-const Coercion = require('./coercion');
-const At = require('./at');
-const Match = require('./match');
-const Case = require('./case');
-const Step = require('./step');
-const Interpolate = require('./interpolate');
-const Coalesce = require('./coalesce');
-const {Equals, NotEquals} = require('./equals');
-const Length = require('./length');
+import { typeOf, Color, validateRGBA } from '../values';
+import CompoundExpression from '../compound_expression';
+import RuntimeError from '../runtime_error';
+import Let from './let';
+import Var from './var';
+import Literal from './literal';
+import Assertion from './assertion';
+import ArrayAssertion from './array';
+import Coercion from './coercion';
+import At from './at';
+import Match from './match';
+import Case from './case';
+import Step from './step';
+import Interpolate from './interpolate';
+import Coalesce from './coalesce';
+import { Equals, NotEquals } from './equals';
+import Length from './length';
 
+import type { Type } from '../types';
+import type { Varargs } from '../compound_expression';
 import type { ExpressionRegistry } from '../expression';
 
 const expressions: ExpressionRegistry = {
@@ -92,6 +84,9 @@ function binarySearch(v, a, i, j) {
     return false;
 }
 
+function varargs(type: Type): Varargs {
+    return { type };
+}
 
 CompoundExpression.register(expressions, {
     'error': [
@@ -522,4 +517,4 @@ CompoundExpression.register(expressions, {
     ]
 });
 
-module.exports = expressions;
+export default expressions;
diff --git a/src/style-spec/expression/definitions/interpolate.js b/src/style-spec/expression/definitions/interpolate.js
index 62912ff3a40..779475bdc27 100644
--- a/src/style-spec/expression/definitions/interpolate.js
+++ b/src/style-spec/expression/definitions/interpolate.js
@@ -1,9 +1,10 @@
 // @flow
 
-const UnitBezier = require('@mapbox/unitbezier');
-const interpolate = require('../../util/interpolate');
-const { toString, NumberType } = require('../types');
-const { findStopLessThanOrEqualTo } = require("../stops");
+import UnitBezier from '@mapbox/unitbezier';
+
+import * as interpolate from '../../util/interpolate';
+import { toString, NumberType } from '../types';
+import { findStopLessThanOrEqualTo } from '../stops';
 
 import type { Stops } from '../stops';
 import type { Expression } from '../expression';
@@ -164,7 +165,7 @@ class Interpolate implements Expression {
         const outputLower = outputs[index].evaluate(ctx);
         const outputUpper = outputs[index + 1].evaluate(ctx);
 
-        return (interpolate[this.type.kind.toLowerCase()]: any)(outputLower, outputUpper, t);
+        return (interpolate[this.type.kind.toLowerCase()]: any)(outputLower, outputUpper, t); // eslint-disable-line import/namespace
     }
 
     eachChild(fn: (Expression) => void) {
@@ -227,4 +228,4 @@ function exponentialInterpolation(input, base, lowerValue, upperValue) {
     }
 }
 
-module.exports = Interpolate;
+export default Interpolate;
diff --git a/src/style-spec/expression/definitions/length.js b/src/style-spec/expression/definitions/length.js
index 4ff5cd484e7..3361a19e304 100644
--- a/src/style-spec/expression/definitions/length.js
+++ b/src/style-spec/expression/definitions/length.js
@@ -1,12 +1,9 @@
 // @flow
 
-const {
-    NumberType,
-    toString
-} = require('../types');
-const {typeOf} = require('../values');
+import { NumberType, toString } from '../types';
 
-const RuntimeError = require('../runtime_error');
+import { typeOf } from '../values';
+import RuntimeError from '../runtime_error';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -55,4 +52,4 @@ class Length implements Expression {
     }
 }
 
-module.exports = Length;
+export default Length;
diff --git a/src/style-spec/expression/definitions/let.js b/src/style-spec/expression/definitions/let.js
index b5cf9048007..8d4bb2eb3a1 100644
--- a/src/style-spec/expression/definitions/let.js
+++ b/src/style-spec/expression/definitions/let.js
@@ -63,4 +63,4 @@ class Let implements Expression {
     }
 }
 
-module.exports = Let;
+export default Let;
diff --git a/src/style-spec/expression/definitions/literal.js b/src/style-spec/expression/definitions/literal.js
index 4dfa62a0b4f..fbb8564dcfc 100644
--- a/src/style-spec/expression/definitions/literal.js
+++ b/src/style-spec/expression/definitions/literal.js
@@ -1,6 +1,6 @@
 // @flow
 
-const { isValue, typeOf } = require('../values');
+import { isValue, typeOf } from '../values';
 
 import type { Type } from '../types';
 import type { Value }  from '../values';
@@ -52,4 +52,4 @@ class Literal implements Expression {
     }
 }
 
-module.exports = Literal;
+export default Literal;
diff --git a/src/style-spec/expression/definitions/match.js b/src/style-spec/expression/definitions/match.js
index 13e2adbf2f8..1d01dbb0918 100644
--- a/src/style-spec/expression/definitions/match.js
+++ b/src/style-spec/expression/definitions/match.js
@@ -1,7 +1,8 @@
 // @flow
 
-const assert = require('assert');
-const { typeOf } = require('../values');
+import assert from 'assert';
+
+import { typeOf } from '../values';
 
 import type { Expression } from '../expression';
 import type ParsingContext from '../parsing_context';
@@ -111,4 +112,4 @@ class Match implements Expression {
     }
 }
 
-module.exports = Match;
+export default Match;
diff --git a/src/style-spec/expression/definitions/step.js b/src/style-spec/expression/definitions/step.js
index bc7cd36cbaa..9b45b4bb125 100644
--- a/src/style-spec/expression/definitions/step.js
+++ b/src/style-spec/expression/definitions/step.js
@@ -1,7 +1,8 @@
 // @flow
 
-const { NumberType } = require('../types');
-const { findStopLessThanOrEqualTo } = require("../stops");
+import { NumberType } from '../types';
+
+import { findStopLessThanOrEqualTo } from '../stops';
 
 import type { Stops } from '../stops';
 import type { Expression } from '../expression';
@@ -109,4 +110,4 @@ class Step implements Expression {
     }
 }
 
-module.exports = Step;
+export default Step;
diff --git a/src/style-spec/expression/definitions/var.js b/src/style-spec/expression/definitions/var.js
index cf4e1c70395..1c452a3918e 100644
--- a/src/style-spec/expression/definitions/var.js
+++ b/src/style-spec/expression/definitions/var.js
@@ -37,4 +37,4 @@ class Var implements Expression {
     }
 }
 
-module.exports = Var;
+export default Var;
diff --git a/src/style-spec/expression/evaluation_context.js b/src/style-spec/expression/evaluation_context.js
index 002e7e44093..4a20e2a4db5 100644
--- a/src/style-spec/expression/evaluation_context.js
+++ b/src/style-spec/expression/evaluation_context.js
@@ -1,8 +1,9 @@
 // @flow
 
-const assert = require('assert');
-const Scope = require('./scope');
-const {Color} = require('./values');
+import assert from 'assert';
+
+import Scope from './scope';
+import { Color } from './values';
 
 import type { Feature, GlobalProperties } from './index';
 import type { Expression } from './expression';
@@ -51,4 +52,4 @@ class EvaluationContext {
     }
 }
 
-module.exports = EvaluationContext;
+export default EvaluationContext;
diff --git a/src/style-spec/expression/index.js b/src/style-spec/expression/index.js
index dae8652bb4b..999caffb444 100644
--- a/src/style-spec/expression/index.js
+++ b/src/style-spec/expression/index.js
@@ -1,19 +1,20 @@
 // @flow
 
-const assert = require('assert');
-const extend = require('../util/extend');
-const ParsingError = require('./parsing_error');
-const ParsingContext = require('./parsing_context');
-const EvaluationContext = require('./evaluation_context');
-const {CompoundExpression} = require('./compound_expression');
-const Step = require('./definitions/step');
-const Interpolate = require('./definitions/interpolate');
-const Coalesce = require('./definitions/coalesce');
-const Let = require('./definitions/let');
-const definitions = require('./definitions');
-const isConstant = require('./is_constant');
-const RuntimeError = require('./runtime_error');
-const {success, error} = require('../util/result');
+import assert from 'assert';
+
+import extend from '../util/extend';
+import ParsingError from './parsing_error';
+import ParsingContext from './parsing_context';
+import EvaluationContext from './evaluation_context';
+import CompoundExpression from './compound_expression';
+import Step from './definitions/step';
+import Interpolate from './definitions/interpolate';
+import Coalesce from './definitions/coalesce';
+import Let from './definitions/let';
+import definitions from './definitions';
+import * as isConstant from './is_constant';
+import RuntimeError from './runtime_error';
+import { success, error } from '../util/result';
 
 import type {Type} from './types';
 import type {Value} from './values';
@@ -240,8 +241,8 @@ function createPropertyExpression(expression: mixed,
         (new ZoomDependentExpression('composite', expression.value, zoomCurve): CompositeExpression));
 }
 
-const {isFunction, createFunction} = require('../function');
-const {Color} = require('./values');
+import { isFunction, createFunction } from '../function';
+import { Color } from './values';
 
 // serialization wrapper for old-style stop functions normalized to the
 // expression interface
@@ -296,7 +297,7 @@ function normalizePropertyExpression<T>(value: PropertyValueSpecification<T>, sp
     }
 }
 
-module.exports = {
+const exported = {
     StyleExpression,
     StyleExpressionWithErrorHandling,
     isExpression,
@@ -308,6 +309,9 @@ module.exports = {
     StylePropertyFunction
 };
 
+export default exported;
+export { StyleExpression, StyleExpressionWithErrorHandling, isExpression, createExpression, createPropertyExpression, normalizePropertyExpression, ZoomConstantExpression, ZoomDependentExpression, StylePropertyFunction };
+
 // Zoom-dependent expressions may only use ["zoom"] as the input to a top-level "step" or "interpolate"
 // expression (collectively referred to as a "curve"). The curve may be wrapped in one or more "let" or
 // "coalesce" expressions.
@@ -349,14 +353,7 @@ function findZoomCurve(expression: Expression): Step | Interpolate | ParsingErro
     return result;
 }
 
-const {
-    ColorType,
-    StringType,
-    NumberType,
-    BooleanType,
-    ValueType,
-    array
-} = require('./types');
+import { ColorType, StringType, NumberType, BooleanType, ValueType, array } from './types';
 
 function getExpectedType(spec: StylePropertySpecification): Type | null {
     const types = {
diff --git a/src/style-spec/expression/is_constant.js b/src/style-spec/expression/is_constant.js
index 6181e41486f..27b039d5795 100644
--- a/src/style-spec/expression/is_constant.js
+++ b/src/style-spec/expression/is_constant.js
@@ -1,6 +1,6 @@
 // @flow
 
-const { CompoundExpression } = require('./compound_expression');
+import CompoundExpression from './compound_expression';
 
 import type { Expression } from './expression.js';
 
@@ -37,7 +37,4 @@ function isGlobalPropertyConstant(e: Expression, properties: Array<string>) {
     return result;
 }
 
-module.exports = {
-    isFeatureConstant,
-    isGlobalPropertyConstant,
-};
+export { isFeatureConstant, isGlobalPropertyConstant };
diff --git a/src/style-spec/expression/parsing_context.js b/src/style-spec/expression/parsing_context.js
index 5e4569a8459..cb981ca6f5e 100644
--- a/src/style-spec/expression/parsing_context.js
+++ b/src/style-spec/expression/parsing_context.js
@@ -1,12 +1,18 @@
 // @flow
 
-const Scope = require('./scope');
-const {checkSubtype} = require('./types');
-const ParsingError = require('./parsing_error');
-const Literal = require('./definitions/literal');
-const Assertion = require('./definitions/assertion');
-const ArrayAssertion = require('./definitions/array');
-const Coercion = require('./definitions/coercion');
+import Scope from './scope';
+
+import { checkSubtype } from './types';
+import ParsingError from './parsing_error';
+import Literal from './definitions/literal';
+import Assertion from './definitions/assertion';
+import ArrayAssertion from './definitions/array';
+import Coercion from './definitions/coercion';
+import EvaluationContext from './evaluation_context';
+import CompoundExpression from './compound_expression';
+import {isGlobalPropertyConstant, isFeatureConstant} from './is_constant';
+import Var from './definitions/var';
+
 
 import type {Expression, ExpressionRegistry} from './expression';
 import type {Type} from './types';
@@ -112,7 +118,7 @@ class ParsingContext {
                 // it immediately and replace it with a literal value in the
                 // parsed/compiled result.
                 if (!(parsed instanceof Literal) && isConstant(parsed)) {
-                    const ec = new (require('./evaluation_context'))();
+                    const ec = new EvaluationContext();
                     try {
                         parsed = new Literal(parsed.type, parsed.evaluate(ec));
                     } catch (e) {
@@ -177,14 +183,9 @@ class ParsingContext {
     }
 }
 
-module.exports = ParsingContext;
+export default ParsingContext;
 
 function isConstant(expression: Expression) {
-    // requires within function body to workaround circular dependency
-    const {CompoundExpression} = require('./compound_expression');
-    const {isGlobalPropertyConstant, isFeatureConstant} = require('./is_constant');
-    const Var = require('./definitions/var');
-
     if (expression instanceof Var) {
         return false;
     } else if (expression instanceof CompoundExpression && expression.name === 'error') {
diff --git a/src/style-spec/expression/parsing_error.js b/src/style-spec/expression/parsing_error.js
index ae8e18f1d59..8f676e81313 100644
--- a/src/style-spec/expression/parsing_error.js
+++ b/src/style-spec/expression/parsing_error.js
@@ -10,4 +10,4 @@ class ParsingError extends Error {
     }
 }
 
-module.exports = ParsingError;
+export default ParsingError;
diff --git a/src/style-spec/expression/runtime_error.js b/src/style-spec/expression/runtime_error.js
index de76ac14ff2..6c7c1144851 100644
--- a/src/style-spec/expression/runtime_error.js
+++ b/src/style-spec/expression/runtime_error.js
@@ -14,4 +14,4 @@ class RuntimeError {
     }
 }
 
-module.exports = RuntimeError;
+export default RuntimeError;
diff --git a/src/style-spec/expression/scope.js b/src/style-spec/expression/scope.js
index 457ca6d404e..15f35e2f5f0 100644
--- a/src/style-spec/expression/scope.js
+++ b/src/style-spec/expression/scope.js
@@ -33,4 +33,4 @@ class Scope {
     }
 }
 
-module.exports = Scope;
+export default Scope;
diff --git a/src/style-spec/expression/stops.js b/src/style-spec/expression/stops.js
index a187c7e4949..df88ae2520c 100644
--- a/src/style-spec/expression/stops.js
+++ b/src/style-spec/expression/stops.js
@@ -1,6 +1,6 @@
 // @flow
 
-const RuntimeError = require('./runtime_error');
+import RuntimeError from './runtime_error';
 
 import type { Expression } from './expression';
 
@@ -35,4 +35,9 @@ function findStopLessThanOrEqualTo(stops: Array<number>, input: number) {
     return Math.max(currentIndex - 1, 0);
 }
 
-module.exports = {findStopLessThanOrEqualTo};
+const exported = {
+    findStopLessThanOrEqualTo
+};
+
+export default exported;
+export { findStopLessThanOrEqualTo };
diff --git a/src/style-spec/expression/types.js b/src/style-spec/expression/types.js
index 0d09cf7afc2..c6fb5726733 100644
--- a/src/style-spec/expression/types.js
+++ b/src/style-spec/expression/types.js
@@ -92,7 +92,7 @@ function checkSubtype(expected: Type, t: Type): ?string {
     return `Expected ${toString(expected)} but found ${toString(t)} instead.`;
 }
 
-module.exports = {
+const exported = {
     NullType,
     NumberType,
     StringType,
@@ -105,3 +105,6 @@ module.exports = {
     toString,
     checkSubtype
 };
+
+export default exported;
+export { NullType, NumberType, StringType, BooleanType, ColorType, ObjectType, ValueType, array, ErrorType, toString, checkSubtype };
diff --git a/src/style-spec/expression/values.js b/src/style-spec/expression/values.js
index 64fc4c4013c..b12c11cc57a 100644
--- a/src/style-spec/expression/values.js
+++ b/src/style-spec/expression/values.js
@@ -1,18 +1,9 @@
 // @flow
 
-const assert = require('assert');
-const Color = require('../util/color');
+import assert from 'assert';
 
-const {
-    NullType,
-    NumberType,
-    StringType,
-    BooleanType,
-    ColorType,
-    ObjectType,
-    ValueType,
-    array
-} = require('./types');
+import Color from '../util/color';
+import { NullType, NumberType, StringType, BooleanType, ColorType, ObjectType, ValueType, array } from './types';
 
 import type { Type } from './types';
 
@@ -101,9 +92,12 @@ function typeOf(value: Value): Type {
     }
 }
 
-module.exports = {
+const exported = {
     Color,
     validateRGBA,
     isValue,
     typeOf
 };
+
+export default exported;
+export { Color, validateRGBA, isValue, typeOf };
diff --git a/src/style-spec/feature_filter/index.js b/src/style-spec/feature_filter/index.js
index 237d4dec688..54cad4aaf3a 100644
--- a/src/style-spec/feature_filter/index.js
+++ b/src/style-spec/feature_filter/index.js
@@ -1,14 +1,14 @@
 // @flow
 
-const {createExpression} = require('../expression');
+import { createExpression } from '../expression';
 
 import type {GlobalProperties} from '../expression';
 export type FeatureFilter = (globalProperties: GlobalProperties, feature: VectorTileFeature) => boolean;
 
-module.exports = createFilter;
-module.exports.isExpressionFilter = isExpressionFilter;
+export default createFilter;
+export { isExpressionFilter };
 
-function isExpressionFilter(filter) {
+function isExpressionFilter(filter: any) {
     if (!Array.isArray(filter) || filter.length === 0) {
         return false;
     }
diff --git a/src/style-spec/format.js b/src/style-spec/format.js
index 310d99cf3fa..3a9b27e776c 100644
--- a/src/style-spec/format.js
+++ b/src/style-spec/format.js
@@ -1,6 +1,6 @@
 
-const reference = require('./reference/latest.js');
-const sortObject = require('sort-object');
+import reference from './reference/latest.js';
+import sortObject from 'sort-object';
 
 function sameOrderAs(reference) {
     const keyOrder = {};
@@ -51,4 +51,4 @@ function format(style, space) {
     return JSON.stringify(style, null, space);
 }
 
-module.exports = format;
+export default format;
diff --git a/src/style-spec/function/convert.js b/src/style-spec/function/convert.js
index 176723052ce..366ecb3390a 100644
--- a/src/style-spec/function/convert.js
+++ b/src/style-spec/function/convert.js
@@ -1,11 +1,12 @@
 // @flow
 
-const assert = require('assert');
-const extend = require('../util/extend');
+import assert from 'assert';
+
+import extend from '../util/extend';
 
 import type {StylePropertySpecification} from '../style-spec';
 
-module.exports = convertFunction;
+export default convertFunction;
 
 function convertFunction(parameters: PropertyValueSpecification<any>, propertySpec: StylePropertySpecification) {
     let expression;
diff --git a/src/style-spec/function/index.js b/src/style-spec/function/index.js
index 09b13b5882e..3a3f197cb1c 100644
--- a/src/style-spec/function/index.js
+++ b/src/style-spec/function/index.js
@@ -1,10 +1,10 @@
 
-const colorSpaces = require('../util/color_spaces');
-const Color = require('../util/color');
-const extend = require('../util/extend');
-const getType = require('../util/get_type');
-const interpolate = require('../util/interpolate');
-const Interpolate = require('../expression/definitions/interpolate');
+import * as colorSpaces from '../util/color_spaces';
+import Color from '../util/color';
+import extend from '../util/extend';
+import getType from '../util/get_type';
+import * as interpolate from '../util/interpolate';
+import Interpolate from '../expression/definitions/interpolate';
 
 function isFunction(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -37,7 +37,7 @@ function createFunction(parameters, propertySpec) {
         }
     }
 
-    if (parameters.colorSpace && parameters.colorSpace !== 'rgb' && !colorSpaces[parameters.colorSpace]) {
+    if (parameters.colorSpace && parameters.colorSpace !== 'rgb' && !colorSpaces[parameters.colorSpace]) { // eslint-disable-line import/namespace
         throw new Error(`Unknown color space: ${parameters.colorSpace}`);
     }
 
@@ -166,10 +166,10 @@ function evaluateExponentialFunction(parameters, propertySpec, input) {
 
     const outputLower = parameters.stops[index][1];
     const outputUpper = parameters.stops[index + 1][1];
-    let interp = interpolate[propertySpec.type] || identityFunction;
+    let interp = interpolate[propertySpec.type] || identityFunction; // eslint-disable-line import/namespace
 
     if (parameters.colorSpace && parameters.colorSpace !== 'rgb') {
-        const colorspace = colorSpaces[parameters.colorSpace];
+        const colorspace = colorSpaces[parameters.colorSpace]; // eslint-disable-line import/namespace
         interp = (a, b) => colorspace.reverse(colorspace.interpolate(colorspace.forward(a), colorspace.forward(b), t));
     }
 
@@ -278,7 +278,10 @@ function interpolationFactor(input, base, lowerValue, upperValue) {
     }
 }
 
-module.exports = {
+const exported = {
     createFunction,
     isFunction
 };
+
+export default exported;
+export { createFunction, isFunction };
diff --git a/src/style-spec/group_by_layout.js b/src/style-spec/group_by_layout.js
index 6d64870860b..ae93d72390d 100644
--- a/src/style-spec/group_by_layout.js
+++ b/src/style-spec/group_by_layout.js
@@ -1,5 +1,5 @@
 
-const refProperties = require('./util/ref_properties');
+import refProperties from './util/ref_properties';
 
 function stringify(obj) {
     const type = typeof obj;
@@ -31,7 +31,7 @@ function getKey(layer) {
     return key;
 }
 
-module.exports = groupByLayout;
+export default groupByLayout;
 
 /**
  * Given an array of layers, return an array of arrays of layers where all
diff --git a/src/style-spec/migrate.js b/src/style-spec/migrate.js
index 807cbd19746..7ef5ea8db52 100644
--- a/src/style-spec/migrate.js
+++ b/src/style-spec/migrate.js
@@ -1,4 +1,6 @@
 
+import migrateToV8 from './migrate/v8';
+
 /**
  * Migrate a Mapbox GL Style to the latest version.
  *
@@ -12,11 +14,11 @@
  * var style = fs.readFileSync('./style.json', 'utf8');
  * fs.writeFileSync('./style.json', JSON.stringify(migrate(style)));
  */
-module.exports = function(style) {
+export default function(style) {
     let migrated = false;
 
     if (style.version === 7 || style.version === 8) {
-        style = require('./migrate/v8')(style);
+        style = migrateToV8(style);
         migrated = true;
     }
 
@@ -25,4 +27,4 @@ module.exports = function(style) {
     }
 
     return style;
-};
+}
diff --git a/src/style-spec/migrate/v8.js b/src/style-spec/migrate/v8.js
index 7868234d59d..0aba82b0a6a 100644
--- a/src/style-spec/migrate/v8.js
+++ b/src/style-spec/migrate/v8.js
@@ -1,6 +1,6 @@
 
-const Reference = require('../reference/v8.json');
-const URL = require('url');
+import Reference from '../reference/v8.json';
+import URL from 'url';
 
 function getPropertyReference(propertyName) {
     for (let i = 0; i < Reference.layout.length; i++) {
@@ -96,7 +96,7 @@ function renameProperty(obj, from, to) {
     obj[to] = obj[from]; delete obj[from];
 }
 
-module.exports = function(style) {
+export default function(style) {
     style.version = 8;
 
     // Rename properties, reverse coordinates in source and layers
@@ -262,4 +262,4 @@ module.exports = function(style) {
     style.layers = style.layers.concat(symbolLayers);
 
     return style;
-};
+}
diff --git a/src/style-spec/migrate/v9.js b/src/style-spec/migrate/v9.js
index d1f876ed06e..bb182dbfea1 100644
--- a/src/style-spec/migrate/v9.js
+++ b/src/style-spec/migrate/v9.js
@@ -1,5 +1,5 @@
 
-const deref = require('../deref');
+import deref from '../deref';
 
 function eachLayer(style, callback) {
     for (const k in style.layers) {
@@ -7,7 +7,7 @@ function eachLayer(style, callback) {
     }
 }
 
-module.exports = function(style) {
+export default function(style) {
     style.version = 9;
 
     // remove user-specified refs
@@ -23,4 +23,4 @@ module.exports = function(style) {
     });
 
     return style;
-};
+}
diff --git a/src/style-spec/package.json b/src/style-spec/package.json
index 40202db6cad..6c7d47267bc 100644
--- a/src/style-spec/package.json
+++ b/src/style-spec/package.json
@@ -12,27 +12,10 @@
   "main": "./dist/index.js",
   "scripts": {
     "copy-flow-typed": "cp -R ../../flow-typed .",
-    "build": "../../node_modules/.bin/browserify style-spec.js --standalone=mapboxGlStyleSpecification | ../../node_modules/.bin/derequire > dist/index.js",
+    "build": "rollup -c",
     "prepublish": "in-publish && yarn copy-flow-typed && yarn build || not-in-publish",
     "postpublish": "in-publish && rm -r flow-typed dist/index.js || not-in-publish"
   },
-  "browserify": {
-    "transform": [
-      "unflowify",
-      [
-        "bubleify",
-        {
-          "bubleError": true,
-          "transforms": {
-            "dangerousForOf": true
-          },
-          "objectAssign": "Object.assign"
-        }
-      ],
-      "brfs",
-      "./build/strictify"
-    ]
-  },
   "repository": {
     "type": "git",
     "url": "git@github.com:mapbox/mapbox-gl-style-spec.git"
@@ -46,13 +29,11 @@
   "dependencies": {
     "@mapbox/unitbezier": "^0.0.0",
     "brfs": "^1.4.0",
-    "bubleify": "^0.7.0",
     "csscolorparser": "~1.0.2",
     "in-publish": "^2.0.0",
     "jsonlint-lines-primitives": "~1.6.0",
     "minimist": "0.0.8",
     "rw": "^1.3.3",
-    "sort-object": "^0.3.2",
-    "unflowify": "^1.0.0"
+    "sort-object": "^0.3.2"
   }
 }
diff --git a/src/style-spec/reference/latest.js b/src/style-spec/reference/latest.js
index 0cd918e0a06..ab337fd3976 100644
--- a/src/style-spec/reference/latest.js
+++ b/src/style-spec/reference/latest.js
@@ -1,2 +1,3 @@
 
-module.exports = require('./v8.json');
+import spec from './v8.json';
+export default spec;
diff --git a/src/style-spec/rollup.config.js b/src/style-spec/rollup.config.js
new file mode 100644
index 00000000000..09ed5c47f35
--- /dev/null
+++ b/src/style-spec/rollup.config.js
@@ -0,0 +1,22 @@
+import replace from 'rollup-plugin-replace';
+import {plugins} from '../../build/rollup_plugins';
+const config = [{
+    input: `${__dirname}/style-spec.js`,
+    output: {
+        name: 'mapboxGlStyleSpecification',
+        file: `${__dirname}/dist/index.js`,
+        format: 'umd',
+        sourcemap: true
+    },
+    plugins: [
+        // https://github.com/zaach/jison/issues/351
+        replace({
+            include: /\/jsonlint-lines-primitives\/lib\/jsonlint.js/,
+            delimiters: ['', ''],
+            values: {
+                '_token_stack:': ''
+            }
+        })
+    ].concat(plugins())
+}];
+export default config;
diff --git a/src/style-spec/style-spec.js b/src/style-spec/style-spec.js
index fbdd018a274..ce8e57ed0f1 100644
--- a/src/style-spec/style-spec.js
+++ b/src/style-spec/style-spec.js
@@ -50,22 +50,42 @@ export type StylePropertySpecification = {
     default?: Array<string>
 };
 
-exports.v8 = require('./reference/v8.json');
-exports.latest = require('./reference/latest');
+import v8 from './reference/v8.json';
+export {v8};
 
-exports.format = require('./format');
-exports.migrate = require('./migrate');
-exports.composite = require('./composite');
-exports.diff = require('./diff');
-exports.ValidationError = require('./error/validation_error');
-exports.ParsingError = require('./error/parsing_error');
-exports.expression = require('./expression');
-exports.featureFilter = require('./feature_filter');
-exports.Color = require('./util/color');
+import latest from './reference/latest';
+import format from './format';
+import migrate from './migrate';
+import composite from './composite';
+import diff from './diff';
+import ValidationError from './error/validation_error';
+import ParsingError from './error/parsing_error';
+import expression from './expression';
+import featureFilter from './feature_filter';
+import Color from './util/color';
+import styleFunction from './function';
+import convertFunction from './function/convert';
 
-exports.function = require('./function');
-exports.function.convertFunction = require('./function/convert');
+import validate from './validate_style';
 
-exports.validate = require('./validate_style');
-exports.validate.parsed = require('./validate_style');
-exports.validate.latest = require('./validate_style');
+const exported = {
+    latest,
+    format,
+    migrate,
+    composite,
+    diff,
+    ValidationError,
+    ParsingError,
+    expression,
+    featureFilter,
+    Color,
+    function: styleFunction,
+    validate
+};
+
+export default exported;
+
+exported.function.convertFunction = convertFunction;
+
+validate.parsed = validate;
+validate.latest = validate;
diff --git a/src/style-spec/util/color.js b/src/style-spec/util/color.js
index 996751c5248..2773246f45a 100644
--- a/src/style-spec/util/color.js
+++ b/src/style-spec/util/color.js
@@ -1,6 +1,6 @@
 // @flow
 
-const {parseCSSColor} = require('csscolorparser');
+import { parseCSSColor } from 'csscolorparser';
 
 /**
  * An RGBA color value. Create instances from color strings using the static
@@ -81,4 +81,4 @@ Color.black = new Color(0, 0, 0, 1);
 Color.white = new Color(1, 1, 1, 1);
 Color.transparent = new Color(0, 0, 0, 0);
 
-module.exports = Color;
+export default Color;
diff --git a/src/style-spec/util/color_spaces.js b/src/style-spec/util/color_spaces.js
index 3578d6fb151..c4d1a2d39c9 100644
--- a/src/style-spec/util/color_spaces.js
+++ b/src/style-spec/util/color_spaces.js
@@ -1,7 +1,8 @@
 // @flow
 
-const Color = require('./color');
-const interpolateNumber = require('./interpolate').number;
+import Color from './color';
+
+import {number as interpolateNumber} from './interpolate';
 
 type LABColor = {
     l: number,
@@ -125,15 +126,14 @@ function interpolateHcl(from: HCLColor, to: HCLColor, t: number) {
     };
 }
 
-module.exports = {
-    lab: {
-        forward: rgbToLab,
-        reverse: labToRgb,
-        interpolate: interpolateLab
-    },
-    hcl: {
-        forward: rgbToHcl,
-        reverse: hclToRgb,
-        interpolate: interpolateHcl
-    }
+export const lab = {
+    forward: rgbToLab,
+    reverse: labToRgb,
+    interpolate: interpolateLab
+};
+
+export const hcl = {
+    forward: rgbToHcl,
+    reverse: hclToRgb,
+    interpolate: interpolateHcl
 };
diff --git a/src/style-spec/util/deep_equal.js b/src/style-spec/util/deep_equal.js
index 53146fd0356..773af912f59 100644
--- a/src/style-spec/util/deep_equal.js
+++ b/src/style-spec/util/deep_equal.js
@@ -25,4 +25,4 @@ function deepEqual(a: ?mixed, b: ?mixed): boolean {
     return a === b;
 }
 
-module.exports = deepEqual;
+export default deepEqual;
diff --git a/src/style-spec/util/eval_support.js b/src/style-spec/util/eval_support.js
index d2f14bda8a4..44e232e8dd2 100644
--- a/src/style-spec/util/eval_support.js
+++ b/src/style-spec/util/eval_support.js
@@ -1,6 +1,4 @@
-// @flow
-
-module.exports = (function () {
+export default (function () {
     try {
         new Function('');
         return true;
diff --git a/src/style-spec/util/extend.js b/src/style-spec/util/extend.js
index 8062489eae5..3f041cc63b0 100644
--- a/src/style-spec/util/extend.js
+++ b/src/style-spec/util/extend.js
@@ -1,9 +1,9 @@
 
-module.exports = function (output, ...inputs) {
+export default function (output, ...inputs) {
     for (const input of inputs) {
         for (const k in input) {
             output[k] = input[k];
         }
     }
     return output;
-};
+}
diff --git a/src/style-spec/util/get_type.js b/src/style-spec/util/get_type.js
index 91fb5df9eaf..c31925f35a3 100644
--- a/src/style-spec/util/get_type.js
+++ b/src/style-spec/util/get_type.js
@@ -1,5 +1,5 @@
 
-module.exports = function getType(val) {
+export default function getType(val) {
     if (val instanceof Number) {
         return 'number';
     } else if (val instanceof String) {
@@ -13,4 +13,4 @@ module.exports = function getType(val) {
     } else {
         return typeof val;
     }
-};
+}
diff --git a/src/style-spec/util/interpolate.js b/src/style-spec/util/interpolate.js
index 499a32ae238..bf3826e1dfd 100644
--- a/src/style-spec/util/interpolate.js
+++ b/src/style-spec/util/interpolate.js
@@ -1,18 +1,12 @@
 // @flow
 
-const Color = require('./color');
+import Color from './color';
 
-module.exports = {
-    number,
-    color,
-    array
-};
-
-function number(a: number, b: number, t: number) {
+export function number(a: number, b: number, t: number) {
     return (a * (1 - t)) + (b * t);
 }
 
-function color(from: Color, to: Color, t: number) {
+export function color(from: Color, to: Color, t: number) {
     return new Color(
         number(from.r, to.r, t),
         number(from.g, to.g, t),
@@ -21,7 +15,7 @@ function color(from: Color, to: Color, t: number) {
     );
 }
 
-function array(from: Array<number>, to: Array<number>, t: number) {
+export function array(from: Array<number>, to: Array<number>, t: number) {
     return from.map((d, i) => {
         return number(d, to[i], t);
     });
diff --git a/src/style-spec/util/ref_properties.js b/src/style-spec/util/ref_properties.js
index 42f6d358591..c3cab034c46 100644
--- a/src/style-spec/util/ref_properties.js
+++ b/src/style-spec/util/ref_properties.js
@@ -1,2 +1,2 @@
 
-module.exports = ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'];
+export default ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'];
diff --git a/src/style-spec/util/result.js b/src/style-spec/util/result.js
index ca7db4249c0..e829d0a545b 100644
--- a/src/style-spec/util/result.js
+++ b/src/style-spec/util/result.js
@@ -18,7 +18,10 @@ function error<T, E>(value: E): Result<T, E> {
     return { result: 'error', value };
 }
 
-module.exports = {
+const exported = {
     success,
     error
 };
+
+export default exported;
+export { success, error };
diff --git a/src/style-spec/util/unbundle_jsonlint.js b/src/style-spec/util/unbundle_jsonlint.js
index 8cf4217b3e6..2c84e5ce952 100644
--- a/src/style-spec/util/unbundle_jsonlint.js
+++ b/src/style-spec/util/unbundle_jsonlint.js
@@ -1,6 +1,6 @@
 
 // Turn jsonlint-lines-primitives objects into primitive objects
-function unbundle(value) {
+export function unbundle(value) {
     if (value instanceof Number || value instanceof String || value instanceof Boolean) {
         return value.valueOf();
     } else {
@@ -8,12 +8,10 @@ function unbundle(value) {
     }
 }
 
-function deepUnbundle(value) {
+export function deepUnbundle(value) {
     if (Array.isArray(value)) {
         return value.map(deepUnbundle);
     }
     return unbundle(value);
 }
 
-module.exports = unbundle;
-module.exports.deep = deepUnbundle;
diff --git a/src/style-spec/validate/latest.js b/src/style-spec/validate/latest.js
index c5edbafbe19..91db6e9eef8 100644
--- a/src/style-spec/validate/latest.js
+++ b/src/style-spec/validate/latest.js
@@ -1,4 +1,6 @@
 
+import validateStyle from '../validate_style.min';
+
 /*
  * Validate a style against the latest specification. This method is optimized
  * to keep its bundle size small by refraining from requiring jslint or old
@@ -6,4 +8,4 @@
  * @see validateStyleMin
  * @deprecated This file exists for backwards compatibility and will be dropped in the next minor release.
  */
-module.exports = require('../validate_style.min');
+export default validateStyle;
diff --git a/src/style-spec/validate/validate.js b/src/style-spec/validate/validate.js
index a80ed21fc98..86a04072a30 100644
--- a/src/style-spec/validate/validate.js
+++ b/src/style-spec/validate/validate.js
@@ -1,8 +1,43 @@
 
-const extend = require('../util/extend');
-const unbundle = require('../util/unbundle_jsonlint');
-const {isExpression} = require('../expression');
-const {isFunction} = require('../function');
+import extend from '../util/extend';
+import { unbundle, deepUnbundle } from '../util/unbundle_jsonlint';
+import { isExpression } from '../expression';
+import { isFunction } from '../function';
+
+import validateFunction from './validate_function';
+import validateExpression from './validate_expression';
+import validateObject from './validate_object';
+import validateArray from './validate_array';
+import validateBoolean from './validate_boolean';
+import validateNumber from './validate_number';
+import validateColor from './validate_color';
+import validateConstants from './validate_constants';
+import validateEnum from './validate_enum';
+import validateFilter from './validate_filter';
+import validateLayer from './validate_layer';
+import validateSource from './validate_source';
+import validateLight from './validate_light';
+import validateString from './validate_string';
+
+const VALIDATORS = {
+    '*': function() {
+        return [];
+    },
+    'array': validateArray,
+    'boolean': validateBoolean,
+    'number': validateNumber,
+    'color': validateColor,
+    'constants': validateConstants,
+    'enum': validateEnum,
+    'filter': validateFilter,
+    'function': validateFunction,
+    'layer': validateLayer,
+    'object': validateObject,
+    'source': validateSource,
+    'light': validateLight,
+    'string': validateString
+};
+
 
 // Main recursive validation function. Tracks:
 //
@@ -14,30 +49,7 @@ const {isFunction} = require('../function');
 // - valueSpec: current spec being evaluated. Tracks value.
 // - styleSpec: current full spec being evaluated.
 
-module.exports = function validate(options) {
-
-    const validateFunction = require('./validate_function');
-    const validateExpression = require('./validate_expression');
-    const validateObject = require('./validate_object');
-    const VALIDATORS = {
-        '*': function() {
-            return [];
-        },
-        'array': require('./validate_array'),
-        'boolean': require('./validate_boolean'),
-        'number': require('./validate_number'),
-        'color': require('./validate_color'),
-        'constants': require('./validate_constants'),
-        'enum': require('./validate_enum'),
-        'filter': require('./validate_filter'),
-        'function': require('./validate_function'),
-        'layer': require('./validate_layer'),
-        'object': require('./validate_object'),
-        'source': require('./validate_source'),
-        'light': require('./validate_light'),
-        'string': require('./validate_string')
-    };
-
+export default function validate(options) {
     const value = options.value;
     const valueSpec = options.valueSpec;
     const styleSpec = options.styleSpec;
@@ -45,7 +57,7 @@ module.exports = function validate(options) {
     if (valueSpec.function && isFunction(unbundle(value))) {
         return validateFunction(options);
 
-    } else if (valueSpec.function && isExpression(unbundle.deep(value))) {
+    } else if (valueSpec.function && isExpression(deepUnbundle(value))) {
         return validateExpression(options);
 
     } else if (valueSpec.type && VALIDATORS[valueSpec.type]) {
@@ -56,4 +68,4 @@ module.exports = function validate(options) {
             valueSpec: valueSpec.type ? styleSpec[valueSpec.type] : valueSpec
         }));
     }
-};
+}
diff --git a/src/style-spec/validate/validate_array.js b/src/style-spec/validate/validate_array.js
index 8fcf5f3db37..7ae1e646af0 100644
--- a/src/style-spec/validate/validate_array.js
+++ b/src/style-spec/validate/validate_array.js
@@ -1,9 +1,9 @@
 
-const getType = require('../util/get_type');
-const validate = require('./validate');
-const ValidationError = require('../error/validation_error');
+import getType from '../util/get_type';
+import validate from './validate';
+import ValidationError from '../error/validation_error';
 
-module.exports = function validateArray(options) {
+export default function validateArray(options) {
     const array = options.value;
     const arraySpec = options.valueSpec;
     const style = options.style;
@@ -48,4 +48,4 @@ module.exports = function validateArray(options) {
         }));
     }
     return errors;
-};
+}
diff --git a/src/style-spec/validate/validate_boolean.js b/src/style-spec/validate/validate_boolean.js
index 0c959dd4634..5412b23d24f 100644
--- a/src/style-spec/validate/validate_boolean.js
+++ b/src/style-spec/validate/validate_boolean.js
@@ -1,8 +1,8 @@
 
-const getType = require('../util/get_type');
-const ValidationError = require('../error/validation_error');
+import getType from '../util/get_type';
+import ValidationError from '../error/validation_error';
 
-module.exports = function validateBoolean(options) {
+export default function validateBoolean(options) {
     const value = options.value;
     const key = options.key;
     const type = getType(value);
@@ -12,4 +12,4 @@ module.exports = function validateBoolean(options) {
     }
 
     return [];
-};
+}
diff --git a/src/style-spec/validate/validate_color.js b/src/style-spec/validate/validate_color.js
index c200d3588da..eedd924b79c 100644
--- a/src/style-spec/validate/validate_color.js
+++ b/src/style-spec/validate/validate_color.js
@@ -1,9 +1,9 @@
 
-const ValidationError = require('../error/validation_error');
-const getType = require('../util/get_type');
-const parseCSSColor = require('csscolorparser').parseCSSColor;
+import ValidationError from '../error/validation_error';
+import getType from '../util/get_type';
+import { parseCSSColor } from 'csscolorparser';
 
-module.exports = function validateColor(options) {
+export default function validateColor(options) {
     const key = options.key;
     const value = options.value;
     const type = getType(value);
@@ -17,4 +17,4 @@ module.exports = function validateColor(options) {
     }
 
     return [];
-};
+}
diff --git a/src/style-spec/validate/validate_constants.js b/src/style-spec/validate/validate_constants.js
index 4e7a360c568..7888bb32621 100644
--- a/src/style-spec/validate/validate_constants.js
+++ b/src/style-spec/validate/validate_constants.js
@@ -1,7 +1,7 @@
 
-const ValidationError = require('../error/validation_error');
+import ValidationError from '../error/validation_error';
 
-module.exports = function validateConstants(options) {
+export default function validateConstants(options) {
     const key = options.key;
     const constants = options.value;
 
@@ -10,4 +10,4 @@ module.exports = function validateConstants(options) {
     } else {
         return [];
     }
-};
+}
diff --git a/src/style-spec/validate/validate_enum.js b/src/style-spec/validate/validate_enum.js
index 0b04078e818..5d23392f361 100644
--- a/src/style-spec/validate/validate_enum.js
+++ b/src/style-spec/validate/validate_enum.js
@@ -1,8 +1,8 @@
 
-const ValidationError = require('../error/validation_error');
-const unbundle = require('../util/unbundle_jsonlint');
+import ValidationError from '../error/validation_error';
+import { unbundle } from '../util/unbundle_jsonlint';
 
-module.exports = function validateEnum(options) {
+export default function validateEnum(options) {
     const key = options.key;
     const value = options.value;
     const valueSpec = options.valueSpec;
@@ -18,4 +18,4 @@ module.exports = function validateEnum(options) {
         }
     }
     return errors;
-};
+}
diff --git a/src/style-spec/validate/validate_expression.js b/src/style-spec/validate/validate_expression.js
index 7c94fd54a0b..3cd8735748a 100644
--- a/src/style-spec/validate/validate_expression.js
+++ b/src/style-spec/validate/validate_expression.js
@@ -1,11 +1,12 @@
 // @flow
 
-const ValidationError = require('../error/validation_error');
-const {createExpression, createPropertyExpression} = require('../expression');
-const unbundle = require('../util/unbundle_jsonlint');
+import ValidationError from '../error/validation_error';
 
-module.exports = function validateExpression(options: any) {
-    const expression = (options.expressionContext === 'property' ? createPropertyExpression : createExpression)(unbundle.deep(options.value), options.valueSpec);
+import { createExpression, createPropertyExpression } from '../expression';
+import { deepUnbundle } from '../util/unbundle_jsonlint';
+
+export default function validateExpression(options: any) {
+    const expression = (options.expressionContext === 'property' ? createPropertyExpression : createExpression)(deepUnbundle(options.value), options.valueSpec);
     if (expression.result === 'error') {
         return expression.value.map((error) => {
             return new ValidationError(`${options.key}${error.key}`, options.value, error.message);
@@ -18,4 +19,4 @@ module.exports = function validateExpression(options: any) {
     }
 
     return [];
-};
+}
diff --git a/src/style-spec/validate/validate_filter.js b/src/style-spec/validate/validate_filter.js
index fbd053b3ec4..121e995e51a 100644
--- a/src/style-spec/validate/validate_filter.js
+++ b/src/style-spec/validate/validate_filter.js
@@ -1,14 +1,14 @@
 
-const ValidationError = require('../error/validation_error');
-const validateExpression = require('./validate_expression');
-const validateEnum = require('./validate_enum');
-const getType = require('../util/get_type');
-const unbundle = require('../util/unbundle_jsonlint');
-const extend = require('../util/extend');
-const {isExpressionFilter} = require('../feature_filter');
+import ValidationError from '../error/validation_error';
+import validateExpression from './validate_expression';
+import validateEnum from './validate_enum';
+import getType from '../util/get_type';
+import { unbundle, deepUnbundle } from '../util/unbundle_jsonlint';
+import extend from '../util/extend';
+import { isExpressionFilter } from '../feature_filter';
 
-module.exports = function validateFilter(options) {
-    if (isExpressionFilter(unbundle.deep(options.value))) {
+export default function validateFilter(options) {
+    if (isExpressionFilter(deepUnbundle(options.value))) {
         return validateExpression(extend({}, options, {
             expressionContext: 'filter',
             valueSpec: { value: 'boolean' }
@@ -16,7 +16,7 @@ module.exports = function validateFilter(options) {
     } else {
         return validateNonExpressionFilter(options);
     }
-};
+}
 
 function validateNonExpressionFilter(options) {
     const value = options.value;
diff --git a/src/style-spec/validate/validate_function.js b/src/style-spec/validate/validate_function.js
index 2107e6be8b2..c29ed79eea3 100644
--- a/src/style-spec/validate/validate_function.js
+++ b/src/style-spec/validate/validate_function.js
@@ -1,13 +1,13 @@
 
-const ValidationError = require('../error/validation_error');
-const getType = require('../util/get_type');
-const validate = require('./validate');
-const validateObject = require('./validate_object');
-const validateArray = require('./validate_array');
-const validateNumber = require('./validate_number');
-const unbundle = require('../util/unbundle_jsonlint');
-
-module.exports = function validateFunction(options) {
+import ValidationError from '../error/validation_error';
+import getType from '../util/get_type';
+import validate from './validate';
+import validateObject from './validate_object';
+import validateArray from './validate_array';
+import validateNumber from './validate_number';
+import { unbundle } from '../util/unbundle_jsonlint';
+
+export default function validateFunction(options) {
     const functionValueSpec = options.valueSpec;
     const functionType = unbundle(options.value.type);
     let stopKeyType;
@@ -194,4 +194,4 @@ module.exports = function validateFunction(options) {
             styleSpec: options.styleSpec
         });
     }
-};
+}
diff --git a/src/style-spec/validate/validate_glyphs_url.js b/src/style-spec/validate/validate_glyphs_url.js
index c4396ed9800..84f74aadef1 100644
--- a/src/style-spec/validate/validate_glyphs_url.js
+++ b/src/style-spec/validate/validate_glyphs_url.js
@@ -1,8 +1,8 @@
 
-const ValidationError = require('../error/validation_error');
-const validateString = require('./validate_string');
+import ValidationError from '../error/validation_error';
+import validateString from './validate_string';
 
-module.exports = function(options) {
+export default function(options) {
     const value = options.value;
     const key = options.key;
 
@@ -18,4 +18,4 @@ module.exports = function(options) {
     }
 
     return errors;
-};
+}
diff --git a/src/style-spec/validate/validate_layer.js b/src/style-spec/validate/validate_layer.js
index 523f9c4d6ef..1fba525dc43 100644
--- a/src/style-spec/validate/validate_layer.js
+++ b/src/style-spec/validate/validate_layer.js
@@ -1,14 +1,14 @@
 
-const ValidationError = require('../error/validation_error');
-const unbundle = require('../util/unbundle_jsonlint');
-const validateObject = require('./validate_object');
-const validateFilter = require('./validate_filter');
-const validatePaintProperty = require('./validate_paint_property');
-const validateLayoutProperty = require('./validate_layout_property');
-const validateSpec = require('./validate');
-const extend = require('../util/extend');
+import ValidationError from '../error/validation_error';
+import { unbundle } from '../util/unbundle_jsonlint';
+import validateObject from './validate_object';
+import validateFilter from './validate_filter';
+import validatePaintProperty from './validate_paint_property';
+import validateLayoutProperty from './validate_layout_property';
+import validateSpec from './validate';
+import extend from '../util/extend';
 
-module.exports = function validateLayer(options) {
+export default function validateLayer(options) {
     let errors = [];
 
     const layer = options.value;
@@ -128,4 +128,4 @@ module.exports = function validateLayer(options) {
     }));
 
     return errors;
-};
+}
diff --git a/src/style-spec/validate/validate_layout_property.js b/src/style-spec/validate/validate_layout_property.js
index 6cd3eaf52a2..da4151a0b4d 100644
--- a/src/style-spec/validate/validate_layout_property.js
+++ b/src/style-spec/validate/validate_layout_property.js
@@ -1,6 +1,6 @@
 
-const validateProperty = require('./validate_property');
+import validateProperty from './validate_property';
 
-module.exports = function validateLayoutProperty(options) {
+export default function validateLayoutProperty(options) {
     return validateProperty(options, 'layout');
-};
+}
diff --git a/src/style-spec/validate/validate_light.js b/src/style-spec/validate/validate_light.js
index 2975e9eaf56..c8f21b2a506 100644
--- a/src/style-spec/validate/validate_light.js
+++ b/src/style-spec/validate/validate_light.js
@@ -1,9 +1,9 @@
 
-const ValidationError = require('../error/validation_error');
-const getType = require('../util/get_type');
-const validate = require('./validate');
+import ValidationError from '../error/validation_error';
+import getType from '../util/get_type';
+import validate from './validate';
 
-module.exports = function validateLight(options) {
+export default function validateLight(options) {
     const light = options.value;
     const styleSpec = options.styleSpec;
     const lightSpec = styleSpec.light;
@@ -44,4 +44,4 @@ module.exports = function validateLight(options) {
     }
 
     return errors;
-};
+}
diff --git a/src/style-spec/validate/validate_number.js b/src/style-spec/validate/validate_number.js
index 8961242b2a3..adf7f3e5ef3 100644
--- a/src/style-spec/validate/validate_number.js
+++ b/src/style-spec/validate/validate_number.js
@@ -1,8 +1,8 @@
 
-const getType = require('../util/get_type');
-const ValidationError = require('../error/validation_error');
+import getType from '../util/get_type';
+import ValidationError from '../error/validation_error';
 
-module.exports = function validateNumber(options) {
+export default function validateNumber(options) {
     const key = options.key;
     const value = options.value;
     const valueSpec = options.valueSpec;
@@ -21,4 +21,4 @@ module.exports = function validateNumber(options) {
     }
 
     return [];
-};
+}
diff --git a/src/style-spec/validate/validate_object.js b/src/style-spec/validate/validate_object.js
index 55c83296351..436b597edff 100644
--- a/src/style-spec/validate/validate_object.js
+++ b/src/style-spec/validate/validate_object.js
@@ -1,9 +1,9 @@
 
-const ValidationError = require('../error/validation_error');
-const getType = require('../util/get_type');
-const validateSpec = require('./validate');
+import ValidationError from '../error/validation_error';
+import getType from '../util/get_type';
+import validateSpec from './validate';
 
-module.exports = function validateObject(options) {
+export default function validateObject(options) {
     const key = options.key;
     const object = options.value;
     const elementSpecs = options.valueSpec || {};
@@ -58,4 +58,4 @@ module.exports = function validateObject(options) {
     }
 
     return errors;
-};
+}
diff --git a/src/style-spec/validate/validate_paint_property.js b/src/style-spec/validate/validate_paint_property.js
index ae45851501c..bafe9bbca06 100644
--- a/src/style-spec/validate/validate_paint_property.js
+++ b/src/style-spec/validate/validate_paint_property.js
@@ -1,6 +1,6 @@
 
-const validateProperty = require('./validate_property');
+import validateProperty from './validate_property';
 
-module.exports = function validatePaintProperty(options) {
+export default function validatePaintProperty(options) {
     return validateProperty(options, 'paint');
-};
+}
diff --git a/src/style-spec/validate/validate_property.js b/src/style-spec/validate/validate_property.js
index 5b650b05130..2e3905e25b9 100644
--- a/src/style-spec/validate/validate_property.js
+++ b/src/style-spec/validate/validate_property.js
@@ -1,11 +1,11 @@
 
-const validate = require('./validate');
-const ValidationError = require('../error/validation_error');
-const getType = require('../util/get_type');
-const {isFunction} = require('../function');
-const unbundle = require('../util/unbundle_jsonlint');
+import validate from './validate';
+import ValidationError from '../error/validation_error';
+import getType from '../util/get_type';
+import { isFunction } from '../function';
+import { unbundle, deepUnbundle } from '../util/unbundle_jsonlint';
 
-module.exports = function validateProperty(options, propertyType) {
+export default function validateProperty(options, propertyType) {
     const key = options.key;
     const style = options.style;
     const styleSpec = options.styleSpec;
@@ -45,7 +45,7 @@ module.exports = function validateProperty(options, propertyType) {
         if (propertyKey === 'text-field' && style && !style.glyphs) {
             errors.push(new ValidationError(key, value, 'use of "text-field" requires a style "glyphs" property'));
         }
-        if (propertyKey === 'text-font' && isFunction(unbundle.deep(value)) && unbundle(value.type) === 'identity') {
+        if (propertyKey === 'text-font' && isFunction(deepUnbundle(value)) && unbundle(value.type) === 'identity') {
             errors.push(new ValidationError(key, value, '"text-font" does not support identity functions'));
         }
     }
@@ -59,4 +59,4 @@ module.exports = function validateProperty(options, propertyType) {
         expressionContext: 'property',
         propertyKey
     }));
-};
+}
diff --git a/src/style-spec/validate/validate_source.js b/src/style-spec/validate/validate_source.js
index ed85f0f9b20..f72efca99c5 100644
--- a/src/style-spec/validate/validate_source.js
+++ b/src/style-spec/validate/validate_source.js
@@ -1,10 +1,10 @@
 
-const ValidationError = require('../error/validation_error');
-const unbundle = require('../util/unbundle_jsonlint');
-const validateObject = require('./validate_object');
-const validateEnum = require('./validate_enum');
+import ValidationError from '../error/validation_error';
+import { unbundle } from '../util/unbundle_jsonlint';
+import validateObject from './validate_object';
+import validateEnum from './validate_enum';
 
-module.exports = function validateSource(options) {
+export default function validateSource(options) {
     const value = options.value;
     const key = options.key;
     const styleSpec = options.styleSpec;
@@ -82,4 +82,4 @@ module.exports = function validateSource(options) {
             styleSpec: styleSpec
         });
     }
-};
+}
diff --git a/src/style-spec/validate/validate_string.js b/src/style-spec/validate/validate_string.js
index 358ebfe7c8a..c3353fdc5dc 100644
--- a/src/style-spec/validate/validate_string.js
+++ b/src/style-spec/validate/validate_string.js
@@ -1,8 +1,8 @@
 
-const getType = require('../util/get_type');
-const ValidationError = require('../error/validation_error');
+import getType from '../util/get_type';
+import ValidationError from '../error/validation_error';
 
-module.exports = function validateString(options) {
+export default function validateString(options) {
     const value = options.value;
     const key = options.key;
     const type = getType(value);
@@ -12,4 +12,4 @@ module.exports = function validateString(options) {
     }
 
     return [];
-};
+}
diff --git a/src/style-spec/validate_style.js b/src/style-spec/validate_style.js
index 12fc2f31721..d1d3b1b3832 100644
--- a/src/style-spec/validate_style.js
+++ b/src/style-spec/validate_style.js
@@ -1,7 +1,8 @@
 
-const validateStyleMin = require('./validate_style.min');
-const ParsingError = require('./error/parsing_error');
-const jsonlint = require('jsonlint-lines-primitives');
+import validateStyleMin from './validate_style.min';
+import ParsingError from './error/parsing_error';
+import jsonlint from 'jsonlint-lines-primitives';
+import {v8} from './style-spec';
 
 /**
  * Validate a Mapbox GL style against the style specification.
@@ -19,9 +20,7 @@ const jsonlint = require('jsonlint-lines-primitives');
  *   var errors = validate(style);
  */
 
-module.exports = function validateStyle(style, styleSpec) {
-    const index = require('./style-spec');
-
+export default function validateStyle(style, styleSpec) {
     if (style instanceof String || typeof style === 'string' || style instanceof Buffer) {
         try {
             style = jsonlint.parse(style.toString());
@@ -30,14 +29,14 @@ module.exports = function validateStyle(style, styleSpec) {
         }
     }
 
-    styleSpec = styleSpec || index.v8;
+    styleSpec = styleSpec || v8;
 
     return validateStyleMin(style, styleSpec);
-};
+}
 
-exports.source = validateStyleMin.source;
-exports.light = validateStyleMin.light;
-exports.layer = validateStyleMin.layer;
-exports.filter = validateStyleMin.filter;
-exports.paintProperty = validateStyleMin.paintProperty;
-exports.layoutProperty = validateStyleMin.layoutProperty;
+export const source = validateStyleMin.source;
+export const light = validateStyleMin.light;
+export const layer = validateStyleMin.layer;
+export const filter = validateStyleMin.filter;
+export const paintProperty = validateStyleMin.paintProperty;
+export const layoutProperty = validateStyleMin.layoutProperty;
diff --git a/src/style-spec/validate_style.min.js b/src/style-spec/validate_style.min.js
index 46a65b41282..0c7d05902d3 100644
--- a/src/style-spec/validate_style.min.js
+++ b/src/style-spec/validate_style.min.js
@@ -1,8 +1,15 @@
 
-const validateConstants = require('./validate/validate_constants');
-const validate = require('./validate/validate');
-const latestStyleSpec = require('./reference/latest');
-const validateGlyphsURL = require('./validate/validate_glyphs_url');
+import validateConstants from './validate/validate_constants';
+import validate from './validate/validate';
+import latestStyleSpec from './reference/latest';
+import validateGlyphsURL from './validate/validate_glyphs_url';
+
+import validateSource from './validate/validate_source';
+import validateLight from './validate/validate_light';
+import validateLayer from './validate/validate_layer';
+import validateFilter from './validate/validate_filter';
+import validatePaintProperty from './validate/validate_paint_property';
+import validateLayoutProperty from './validate/validate_layout_property';
 
 /**
  * Validate a Mapbox GL style against the style specification. This entrypoint,
@@ -50,12 +57,12 @@ function validateStyleMin(style, styleSpec) {
     return sortErrors(errors);
 }
 
-validateStyleMin.source = wrapCleanErrors(require('./validate/validate_source'));
-validateStyleMin.light = wrapCleanErrors(require('./validate/validate_light'));
-validateStyleMin.layer = wrapCleanErrors(require('./validate/validate_layer'));
-validateStyleMin.filter = wrapCleanErrors(require('./validate/validate_filter'));
-validateStyleMin.paintProperty = wrapCleanErrors(require('./validate/validate_paint_property'));
-validateStyleMin.layoutProperty = wrapCleanErrors(require('./validate/validate_layout_property'));
+validateStyleMin.source = wrapCleanErrors(validateSource);
+validateStyleMin.light = wrapCleanErrors(validateLight);
+validateStyleMin.layer = wrapCleanErrors(validateLayer);
+validateStyleMin.filter = wrapCleanErrors(validateFilter);
+validateStyleMin.paintProperty = wrapCleanErrors(validatePaintProperty);
+validateStyleMin.layoutProperty = wrapCleanErrors(validateLayoutProperty);
 
 function sortErrors(errors) {
     return [].concat(errors).sort((a, b) => {
@@ -69,4 +76,4 @@ function wrapCleanErrors(inner) {
     };
 }
 
-module.exports = validateStyleMin;
+export default validateStyleMin;
diff --git a/src/style/create_style_layer.js b/src/style/create_style_layer.js
new file mode 100644
index 00000000000..ad37b87e991
--- /dev/null
+++ b/src/style/create_style_layer.js
@@ -0,0 +1,28 @@
+// @flow
+
+import circle from './style_layer/circle_style_layer';
+import heatmap from './style_layer/heatmap_style_layer';
+import hillshade from './style_layer/hillshade_style_layer';
+import fill from './style_layer/fill_style_layer';
+import fillExtrusion from './style_layer/fill_extrusion_style_layer';
+import line from './style_layer/line_style_layer';
+import symbol from './style_layer/symbol_style_layer';
+import background from './style_layer/background_style_layer';
+import raster from './style_layer/raster_style_layer';
+
+const subclasses = {
+    circle,
+    heatmap,
+    hillshade,
+    fill,
+    'fill-extrusion': fillExtrusion,
+    line,
+    symbol,
+    background,
+    raster
+};
+
+export default function createStyleLayer(layer: LayerSpecification) {
+    return new subclasses[layer.type](layer);
+}
+
diff --git a/src/style/evaluation_parameters.js b/src/style/evaluation_parameters.js
index 78c83e7f6ce..7ec6a67ae59 100644
--- a/src/style/evaluation_parameters.js
+++ b/src/style/evaluation_parameters.js
@@ -1,6 +1,6 @@
 // @flow
 
-const ZoomHistory = require('./zoom_history');
+import ZoomHistory from './zoom_history';
 
 class EvaluationParameters {
     zoom: number;
@@ -34,4 +34,4 @@ class EvaluationParameters {
     }
 }
 
-module.exports = EvaluationParameters;
+export default EvaluationParameters;
diff --git a/src/style/light.js b/src/style/light.js
index cdb89707349..4776410c566 100644
--- a/src/style/light.js
+++ b/src/style/light.js
@@ -1,23 +1,21 @@
 // @flow
 
-const styleSpec = require('../style-spec/reference/latest');
-const util = require('../util/util');
-const {Evented} = require('../util/evented');
-const validateStyle = require('./validate_style');
-const {sphericalToCartesian} = require('../util/util');
-const Color = require('../style-spec/util/color');
-const interpolate = require('../style-spec/util/interpolate');
+import styleSpec from '../style-spec/reference/latest';
+
+import { endsWith, extend, sphericalToCartesian } from '../util/util';
+import { Evented } from '../util/evented';
+import {
+    validateStyle,
+    validateLight,
+    emitValidationErrors
+} from './validate_style';
+import Color from '../style-spec/util/color';
+import { number as interpolate } from '../style-spec/util/interpolate';
 
 import type {StylePropertySpecification} from '../style-spec/style-spec';
 import type EvaluationParameters from './evaluation_parameters';
 
-const {
-    Properties,
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated,
-    DataConstantProperty
-} = require('./properties');
+import { Properties, Transitionable, Transitioning, PossiblyEvaluated, DataConstantProperty } from './properties';
 
 import type {
     Property,
@@ -44,9 +42,9 @@ class LightPositionProperty implements Property<[number, number, number], LightP
 
     interpolate(a: LightPosition, b: LightPosition, t: number): LightPosition {
         return {
-            x: interpolate.number(a.x, b.x, t),
-            y: interpolate.number(a.y, b.y, t),
-            z: interpolate.number(a.z, b.z, t),
+            x: interpolate(a.x, b.x, t),
+            y: interpolate(a.y, b.y, t),
+            z: interpolate(a.z, b.z, t),
         };
     }
 }
@@ -87,13 +85,13 @@ class Light extends Evented {
     }
 
     setLight(options?: LightSpecification) {
-        if (this._validate(validateStyle.light, options)) {
+        if (this._validate(validateLight, options)) {
             return;
         }
 
         for (const name in options) {
             const value = options[name];
-            if (util.endsWith(name, TRANSITION_SUFFIX)) {
+            if (endsWith(name, TRANSITION_SUFFIX)) {
                 this._transitionable.setTransition(name.slice(0, -TRANSITION_SUFFIX.length), value);
             } else {
                 this._transitionable.setValue(name, value);
@@ -113,8 +111,8 @@ class Light extends Evented {
         this.properties = this._transitioning.possiblyEvaluate(parameters);
     }
 
-    _validate(validate, value: mixed) {
-        return validateStyle.emitErrors(this, validate.call(validateStyle, util.extend({
+    _validate(validate: Function, value: mixed) {
+        return emitValidationErrors(this, validate.call(validateStyle, extend({
             value: value,
             // Workaround for https://github.com/mapbox/mapbox-gl-js/issues/2407
             style: {glyphs: true, sprite: true},
@@ -123,4 +121,4 @@ class Light extends Evented {
     }
 }
 
-module.exports = Light;
+export default Light;
diff --git a/src/style/load_glyph_range.js b/src/style/load_glyph_range.js
index 6dcef00459c..13208efcf87 100644
--- a/src/style/load_glyph_range.js
+++ b/src/style/load_glyph_range.js
@@ -1,14 +1,15 @@
 // @flow
 
-const {normalizeGlyphsURL} = require('../util/mapbox');
-const ajax = require('../util/ajax');
-const parseGlyphPBF = require('./parse_glyph_pbf');
+import { normalizeGlyphsURL } from '../util/mapbox';
+
+import { getArrayBuffer, ResourceType } from '../util/ajax';
+import parseGlyphPBF from './parse_glyph_pbf';
 
 import type {StyleGlyph} from './style_glyph';
 import type {RequestTransformFunction} from '../ui/map';
 import type {Callback} from '../types/callback';
 
-module.exports = function (fontstack: string,
+export default function (fontstack: string,
                            range: number,
                            urlTemplate: string,
                            requestTransform: RequestTransformFunction,
@@ -20,9 +21,9 @@ module.exports = function (fontstack: string,
         normalizeGlyphsURL(urlTemplate)
             .replace('{fontstack}', fontstack)
             .replace('{range}', `${begin}-${end}`),
-        ajax.ResourceType.Glyphs);
+        ResourceType.Glyphs);
 
-    ajax.getArrayBuffer(request, (err, response) => {
+    getArrayBuffer(request, (err, response) => {
         if (err) {
             callback(err);
         } else if (response) {
@@ -35,4 +36,4 @@ module.exports = function (fontstack: string,
             callback(null, glyphs);
         }
     });
-};
+}
diff --git a/src/style/load_sprite.js b/src/style/load_sprite.js
index 837ca01ff2c..2c3f15eaff1 100644
--- a/src/style/load_sprite.js
+++ b/src/style/load_sprite.js
@@ -1,21 +1,22 @@
 // @flow
 
-const ajax = require('../util/ajax');
-const browser = require('../util/browser');
-const {normalizeSpriteURL} = require('../util/mapbox');
-const {RGBAImage} = require('../util/image');
+import { getJSON, getImage, ResourceType } from '../util/ajax';
+
+import browser from '../util/browser';
+import { normalizeSpriteURL } from '../util/mapbox';
+import { RGBAImage } from '../util/image';
 
 import type {StyleImage} from './style_image';
 import type {RequestTransformFunction} from '../ui/map';
 import type {Callback} from '../types/callback';
 
-module.exports = function(baseURL: string,
+export default function(baseURL: string,
                           transformRequestCallback: RequestTransformFunction,
                           callback: Callback<{[string]: StyleImage}>) {
     let json: any, image, error;
     const format = browser.devicePixelRatio > 1 ? '@2x' : '';
 
-    ajax.getJSON(transformRequestCallback(normalizeSpriteURL(baseURL, format, '.json'), ajax.ResourceType.SpriteJSON), (err, data) => {
+    getJSON(transformRequestCallback(normalizeSpriteURL(baseURL, format, '.json'), ResourceType.SpriteJSON), (err, data) => {
         if (!error) {
             error = err;
             json = data;
@@ -23,7 +24,7 @@ module.exports = function(baseURL: string,
         }
     });
 
-    ajax.getImage(transformRequestCallback(normalizeSpriteURL(baseURL, format, '.png'), ajax.ResourceType.SpriteImage), (err, img) => {
+    getImage(transformRequestCallback(normalizeSpriteURL(baseURL, format, '.png'), ResourceType.SpriteImage), (err, img) => {
         if (!error) {
             error = err;
             image = img;
@@ -48,4 +49,4 @@ module.exports = function(baseURL: string,
             callback(null, result);
         }
     }
-};
+}
diff --git a/src/style/parse_glyph_pbf.js b/src/style/parse_glyph_pbf.js
index c46ba111973..ad1f3b486ca 100644
--- a/src/style/parse_glyph_pbf.js
+++ b/src/style/parse_glyph_pbf.js
@@ -1,7 +1,8 @@
 // @flow
 
-const {AlphaImage} = require('../util/image');
-const Protobuf = require('pbf');
+import { AlphaImage } from '../util/image';
+
+import Protobuf from 'pbf';
 const border = 3;
 
 import type {StyleGlyph} from './style_glyph';
@@ -36,8 +37,8 @@ function readGlyph(tag: number, glyph: Object, pbf: Protobuf) {
     else if (tag === 7) glyph.advance = pbf.readVarint();
 }
 
-module.exports = function (data: ArrayBuffer | Uint8Array): Array<StyleGlyph> {
+export default function (data: ArrayBuffer | Uint8Array): Array<StyleGlyph> {
     return new Protobuf(data).readFields(readFontstacks, []);
-};
+}
 
-module.exports.GLYPH_PBF_BORDER = border;
+export const GLYPH_PBF_BORDER = border;
diff --git a/src/style/pauseable_placement.js b/src/style/pauseable_placement.js
index 973e3e95ad1..531936e087c 100644
--- a/src/style/pauseable_placement.js
+++ b/src/style/pauseable_placement.js
@@ -1,7 +1,8 @@
 // @flow
 
-const browser = require('../util/browser');
-const Placement = require('../symbol/placement');
+import browser from '../util/browser';
+
+import Placement from '../symbol/placement';
 
 import type Transform from '../geo/transform';
 import type StyleLayer from './style_layer';
@@ -96,4 +97,4 @@ class PauseablePlacement {
     }
 }
 
-module.exports = PauseablePlacement;
+export default PauseablePlacement;
diff --git a/src/style/properties.js b/src/style/properties.js
index f5633738e0e..c745c102e62 100644
--- a/src/style/properties.js
+++ b/src/style/properties.js
@@ -1,11 +1,12 @@
 // @flow
 
-const assert = require('assert');
-const {clone, extend, easeCubicInOut} = require('../util/util');
-const interpolate = require('../style-spec/util/interpolate');
-const {normalizePropertyExpression} = require('../style-spec/expression');
-const Color = require('../style-spec/util/color');
-const {register} = require('../util/web_worker_transfer');
+import assert from 'assert';
+
+import { clone, extend, easeCubicInOut } from '../util/util';
+import * as interpolate from '../style-spec/util/interpolate';
+import { normalizePropertyExpression } from '../style-spec/expression';
+import Color from '../style-spec/util/color';
+import { register } from '../util/web_worker_transfer';
 
 import type {StylePropertySpecification} from '../style-spec/style-spec';
 import type {CrossFaded} from './cross_faded';
@@ -679,7 +680,7 @@ register('DataConstantProperty', DataConstantProperty);
 register('CrossFadedProperty', CrossFadedProperty);
 register('HeatmapColorProperty', HeatmapColorProperty);
 
-module.exports = {
+const exported = {
     PropertyValue,
     Transitionable,
     Transitioning,
@@ -692,3 +693,6 @@ module.exports = {
     HeatmapColorProperty,
     Properties
 };
+
+export default exported;
+export { PropertyValue, Transitionable, Transitioning, Layout, PossiblyEvaluatedPropertyValue, PossiblyEvaluated, DataConstantProperty, DataDrivenProperty, CrossFadedProperty, HeatmapColorProperty, Properties };
diff --git a/src/style/query_utils.js b/src/style/query_utils.js
index b5bba7dd9d1..615ce763303 100644
--- a/src/style/query_utils.js
+++ b/src/style/query_utils.js
@@ -1,6 +1,6 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
+import Point from '@mapbox/point-geometry';
 
 import type {PossiblyEvaluatedPropertyValue} from "./properties";
 import type StyleLayer from '../style/style_layer';
@@ -48,8 +48,11 @@ function translate(queryGeometry: Array<Array<Point>>,
     return translated;
 }
 
-module.exports = {
+const exported = {
     getMaximumPaintValue,
     translateDistance,
     translate
 };
+
+export default exported;
+export { getMaximumPaintValue, translateDistance, translate };
diff --git a/src/style/style.js b/src/style/style.js
index 8e257b0020e..efbc61c26a5 100644
--- a/src/style/style.js
+++ b/src/style/style.js
@@ -1,32 +1,39 @@
 // @flow
 
-const assert = require('assert');
-const {Event, ErrorEvent, Evented} = require('../util/evented');
-const StyleLayer = require('./style_layer');
-const loadSprite = require('./load_sprite');
-const ImageManager = require('../render/image_manager');
-const GlyphManager = require('../render/glyph_manager');
-const Light = require('./light');
-const LineAtlas = require('../render/line_atlas');
-const util = require('../util/util');
-const ajax = require('../util/ajax');
-const mapbox = require('../util/mapbox');
-const browser = require('../util/browser');
-const Dispatcher = require('../util/dispatcher');
-const validateStyle = require('./validate_style');
-const getSourceType = require('../source/source').getType;
-const setSourceType = require('../source/source').setType;
-const QueryFeatures = require('../source/query_features');
-const SourceCache = require('../source/source_cache');
-const GeoJSONSource = require('../source/geojson_source');
-const styleSpec = require('../style-spec/reference/latest');
-const getWorkerPool = require('../util/global_worker_pool');
-const deref = require('../style-spec/deref');
-const diff = require('../style-spec/diff');
-const rtlTextPlugin = require('../source/rtl_text_plugin');
-const PauseablePlacement = require('./pauseable_placement');
-const ZoomHistory = require('./zoom_history');
-const CrossTileSymbolIndex = require('../symbol/cross_tile_symbol_index');
+import assert from 'assert';
+
+import { Event, ErrorEvent, Evented } from '../util/evented';
+import StyleLayer from './style_layer';
+import createStyleLayer from './create_style_layer';
+import loadSprite from './load_sprite';
+import ImageManager from '../render/image_manager';
+import GlyphManager from '../render/glyph_manager';
+import Light from './light';
+import LineAtlas from '../render/line_atlas';
+import { pick, clone, extend, deepEqual, filterObject, mapObject } from '../util/util';
+import { getJSON, ResourceType } from '../util/ajax';
+import { isMapboxURL, normalizeStyleURL } from '../util/mapbox';
+import browser from '../util/browser';
+import Dispatcher from '../util/dispatcher';
+import { validateStyle, emitValidationErrors } from './validate_style';
+import {
+    getType as getSourceType,
+    setType as setSourceType
+} from '../source/source';
+import { queryRenderedFeatures, querySourceFeatures } from '../source/query_features';
+import SourceCache from '../source/source_cache';
+import GeoJSONSource from '../source/geojson_source';
+import styleSpec from '../style-spec/reference/latest';
+import getWorkerPool from '../util/global_worker_pool';
+import deref from '../style-spec/deref';
+import diffStyles, {operations as diffOperations} from '../style-spec/diff';
+import {
+    registerForPluginAvailability,
+    evented as rtlTextPluginEvented
+} from '../source/rtl_text_plugin';
+import PauseablePlacement from './pauseable_placement';
+import ZoomHistory from './zoom_history';
+import CrossTileSymbolIndex from '../symbol/cross_tile_symbol_index';
 
 import type Map from '../ui/map';
 import type Transform from '../geo/transform';
@@ -37,7 +44,7 @@ import type {Callback} from '../types/callback';
 import type EvaluationParameters from './evaluation_parameters';
 import type Placement from '../symbol/placement';
 
-const supportedDiffOperations = util.pick(diff.operations, [
+const supportedDiffOperations = pick(diffOperations, [
     'addLayer',
     'removeLayer',
     'setPaintProperty',
@@ -53,7 +60,7 @@ const supportedDiffOperations = util.pick(diff.operations, [
     // 'setSprite',
 ]);
 
-const ignoredDiffOperations = util.pick(diff.operations, [
+const ignoredDiffOperations = pick(diffOperations, [
     'setCenter',
     'setZoom',
     'setBearing',
@@ -95,6 +102,11 @@ class Style extends Evented {
     placement: Placement;
     z: number;
 
+    // exposed to allow stubbing by unit tests
+    static getSourceType: typeof getSourceType;
+    static setSourceType: typeof setSourceType;
+    static registerForPluginAvailability: typeof registerForPluginAvailability;
+
     constructor(map: Map, options: StyleOptions = {}) {
         super();
 
@@ -114,7 +126,7 @@ class Style extends Evented {
         this._resetUpdates();
 
         const self = this;
-        this._rtlTextPluginCallback = rtlTextPlugin.registerForPluginAvailability((args) => {
+        this._rtlTextPluginCallback = Style.registerForPluginAvailability((args) => {
             self.dispatcher.broadcast('loadRTLTextPlugin', args.pluginURL, args.errorCallback);
             for (const id in self.sourceCaches) {
                 self.sourceCaches[id].reload(); // Should be a no-op if the plugin loads before any tiles load
@@ -152,12 +164,12 @@ class Style extends Evented {
         this.fire(new Event('dataloading', {dataType: 'style'}));
 
         const validate = typeof options.validate === 'boolean' ?
-            options.validate : !mapbox.isMapboxURL(url);
+            options.validate : !isMapboxURL(url);
 
-        url = mapbox.normalizeStyleURL(url, options.accessToken);
-        const request = this.map._transformRequest(url, ajax.ResourceType.Style);
+        url = normalizeStyleURL(url, options.accessToken);
+        const request = this.map._transformRequest(url, ResourceType.Style);
 
-        ajax.getJSON(request, (error, json) => {
+        getJSON(request, (error, json) => {
             if (error) {
                 this.fire(new ErrorEvent(error));
             } else if (json) {
@@ -177,7 +189,7 @@ class Style extends Evented {
     }
 
     _load(json: StyleSpecification, validate: boolean) {
-        if (validate && validateStyle.emitErrors(this, validateStyle(json))) {
+        if (validate && emitValidationErrors(this, validateStyle(json))) {
             return;
         }
 
@@ -213,7 +225,7 @@ class Style extends Evented {
 
         this._layers = {};
         for (let layer of layers) {
-            layer = StyleLayer.create(layer);
+            layer = createStyleLayer(layer);
             layer.setEventedParent(this, {layer: {id: layer.id}});
             this._layers[layer.id] = layer;
         }
@@ -377,12 +389,12 @@ class Style extends Evented {
     setState(nextState: StyleSpecification) {
         this._checkLoaded();
 
-        if (validateStyle.emitErrors(this, validateStyle(nextState))) return false;
+        if (emitValidationErrors(this, validateStyle(nextState))) return false;
 
-        nextState = util.clone(nextState);
+        nextState = clone(nextState);
         nextState.layers = deref(nextState.layers);
 
-        const changes = diff(this.serialize(), nextState)
+        const changes = diffStyles(this.serialize(), nextState)
             .filter(op => !(op.command in ignoredDiffOperations));
 
         if (changes.length === 0) {
@@ -526,15 +538,15 @@ class Style extends Evented {
 
         if (typeof layerObject.source === 'object') {
             this.addSource(id, layerObject.source);
-            layerObject = util.clone(layerObject);
-            layerObject = (util.extend(layerObject, {source: id}): any);
+            layerObject = clone(layerObject);
+            layerObject = (extend(layerObject, {source: id}): any);
         }
 
         // this layer is not in the style.layers array, so we pass an impossible array index
         if (this._validate(validateStyle.layer,
             `layers.${id}`, layerObject, {arrayIndex: -1}, options)) return;
 
-        const layer = StyleLayer.create(layerObject);
+        const layer = createStyleLayer(layerObject);
         this._validateLayer(layer);
 
         layer.setEventedParent(this, {layer: {id: id}});
@@ -669,7 +681,7 @@ class Style extends Evented {
             return;
         }
 
-        if (util.deepEqual(layer.filter, filter)) {
+        if (deepEqual(layer.filter, filter)) {
             return;
         }
 
@@ -683,7 +695,7 @@ class Style extends Evented {
             return;
         }
 
-        layer.filter = util.clone(filter);
+        layer.filter = clone(filter);
         this._updateLayer(layer);
     }
 
@@ -693,7 +705,7 @@ class Style extends Evented {
      * @returns {*} the layer's filter, if any
      */
     getFilter(layer: string) {
-        return util.clone(this.getLayer(layer).filter);
+        return clone(this.getLayer(layer).filter);
     }
 
     setLayoutProperty(layerId: string, name: string, value: any) {
@@ -705,7 +717,7 @@ class Style extends Evented {
             return;
         }
 
-        if (util.deepEqual(layer.getLayoutProperty(name), value)) return;
+        if (deepEqual(layer.getLayoutProperty(name), value)) return;
 
         layer.setLayoutProperty(name, value);
         this._updateLayer(layer);
@@ -730,7 +742,7 @@ class Style extends Evented {
             return;
         }
 
-        if (util.deepEqual(layer.getPaintProperty(name), value)) return;
+        if (deepEqual(layer.getPaintProperty(name), value)) return;
 
         const wasDataDriven = layer._transitionablePaint._values[name].value.isDataDriven();
         layer.setPaintProperty(name, value);
@@ -749,12 +761,11 @@ class Style extends Evented {
     }
 
     getTransition() {
-        return util.extend({ duration: 300, delay: 0 },
-            this.stylesheet && this.stylesheet.transition);
+        return extend({ duration: 300, delay: 0 }, this.stylesheet && this.stylesheet.transition);
     }
 
     serialize() {
-        return util.filterObject({
+        return filterObject({
             version: this.stylesheet.version,
             name: this.stylesheet.name,
             metadata: this.stylesheet.metadata,
@@ -766,7 +777,7 @@ class Style extends Evented {
             sprite: this.stylesheet.sprite,
             glyphs: this.stylesheet.glyphs,
             transition: this.stylesheet.transition,
-            sources: util.mapObject(this.sourceCaches, (source) => source.serialize()),
+            sources: mapObject(this.sourceCaches, (source) => source.serialize()),
             layers: this._order.map((id) => this._layers[id].serialize())
         }, (value) => { return value !== undefined; });
     }
@@ -821,7 +832,7 @@ class Style extends Evented {
         const sourceResults = [];
         for (const id in this.sourceCaches) {
             if (params.layers && !includedSources[id]) continue;
-            const results = QueryFeatures.rendered(this.sourceCaches[id], this._layers, queryGeometry, params, transform, this.placement ? this.placement.collisionIndex : null);
+            const results = queryRenderedFeatures(this.sourceCaches[id], this._layers, queryGeometry, params, transform, this.placement ? this.placement.collisionIndex : null);
             sourceResults.push(results);
         }
         return this._flattenRenderedFeatures(sourceResults);
@@ -832,15 +843,15 @@ class Style extends Evented {
             this._validate(validateStyle.filter, 'querySourceFeatures.filter', params.filter);
         }
         const sourceCache = this.sourceCaches[sourceID];
-        return sourceCache ? QueryFeatures.source(sourceCache, params) : [];
+        return sourceCache ? querySourceFeatures(sourceCache, params) : [];
     }
 
     addSourceType(name: string, SourceType: Class<Source>, callback: Callback<void>) {
-        if (getSourceType(name)) {
+        if (Style.getSourceType(name)) {
             return callback(new Error(`A source type called "${name}" already exists.`));
         }
 
-        setSourceType(name, SourceType);
+        Style.setSourceType(name, SourceType);
 
         if (!SourceType.workerSourceURL) {
             return callback(null, null);
@@ -862,7 +873,7 @@ class Style extends Evented {
         const light = this.light.getLight();
         let _update = false;
         for (const key in lightOptions) {
-            if (!util.deepEqual(lightOptions[key], light[key])) {
+            if (!deepEqual(lightOptions[key], light[key])) {
                 _update = true;
                 break;
             }
@@ -871,7 +882,7 @@ class Style extends Evented {
 
         const parameters = {
             now: browser.now(),
-            transition: util.extend({
+            transition: extend({
                 duration: 300,
                 delay: 0
             }, this.stylesheet.transition)
@@ -885,7 +896,7 @@ class Style extends Evented {
         if (options && options.validate === false) {
             return false;
         }
-        return validateStyle.emitErrors(this, validate.call(validateStyle, util.extend({
+        return emitValidationErrors(this, validate.call(validateStyle, extend({
             key: key,
             style: this.serialize(),
             value: value,
@@ -894,7 +905,7 @@ class Style extends Evented {
     }
 
     _remove() {
-        rtlTextPlugin.evented.off('pluginAvailable', this._rtlTextPluginCallback);
+        rtlTextPluginEvented.off('pluginAvailable', this._rtlTextPluginCallback);
         for (const id in this.sourceCaches) {
             this.sourceCaches[id].clearTiles();
         }
@@ -1001,4 +1012,8 @@ class Style extends Evented {
     }
 }
 
-module.exports = Style;
+Style.getSourceType = getSourceType;
+Style.setSourceType = setSourceType;
+Style.registerForPluginAvailability = registerForPluginAvailability;
+
+export default Style;
diff --git a/src/style/style_layer.js b/src/style/style_layer.js
index 2e536a86692..4ba625a6b69 100644
--- a/src/style/style_layer.js
+++ b/src/style/style_layer.js
@@ -1,17 +1,16 @@
 // @flow
 
-
-const util = require('../util/util');
-const styleSpec = require('../style-spec/reference/latest');
-const validateStyle = require('./validate_style');
-const {Evented} = require('../util/evented');
-
-const {
-    Layout,
-    Transitionable,
-    Transitioning,
-    Properties
-} = require('./properties');
+import { endsWith, filterObject } from '../util/util';
+
+import styleSpec from '../style-spec/reference/latest';
+import {
+    validateStyle,
+    validateLayoutProperty,
+    validatePaintProperty,
+    emitValidationErrors
+} from './validate_style';
+import { Evented } from '../util/evented';
+import { Layout, Transitionable, Transitioning, Properties } from './properties';
 
 import type {Bucket} from '../data/bucket';
 import type Point from '@mapbox/point-geometry';
@@ -23,8 +22,6 @@ import type Transform from '../geo/transform';
 const TRANSITION_SUFFIX = '-transition';
 
 class StyleLayer extends Evented {
-    static create: (layer: LayerSpecification) => StyleLayer;
-
     id: string;
     metadata: mixed;
     type: string;
@@ -98,7 +95,7 @@ class StyleLayer extends Evented {
     setLayoutProperty(name: string, value: mixed, options: {validate: boolean}) {
         if (value !== null && value !== undefined) {
             const key = `layers.${this.id}.layout.${name}`;
-            if (this._validate(validateStyle.layoutProperty, key, name, value, options)) {
+            if (this._validate(validateLayoutProperty, key, name, value, options)) {
                 return;
             }
         }
@@ -112,7 +109,7 @@ class StyleLayer extends Evented {
     }
 
     getPaintProperty(name: string) {
-        if (util.endsWith(name, TRANSITION_SUFFIX)) {
+        if (endsWith(name, TRANSITION_SUFFIX)) {
             return this._transitionablePaint.getTransition(name.slice(0, -TRANSITION_SUFFIX.length));
         } else {
             return this._transitionablePaint.getValue(name);
@@ -122,12 +119,12 @@ class StyleLayer extends Evented {
     setPaintProperty(name: string, value: mixed, options: {validate: boolean}) {
         if (value !== null && value !== undefined) {
             const key = `layers.${this.id}.paint.${name}`;
-            if (this._validate(validateStyle.paintProperty, key, name, value, options)) {
+            if (this._validate(validatePaintProperty, key, name, value, options)) {
                 return;
             }
         }
 
-        if (util.endsWith(name, TRANSITION_SUFFIX)) {
+        if (endsWith(name, TRANSITION_SUFFIX)) {
             this._transitionablePaint.setTransition(name.slice(0, -TRANSITION_SUFFIX.length), (value: any) || undefined);
         } else {
             this._transitionablePaint.setValue(name, value);
@@ -175,7 +172,7 @@ class StyleLayer extends Evented {
             output.layout.visibility = 'none';
         }
 
-        return util.filterObject(output, (value, key) => {
+        return filterObject(output, (value, key) => {
             return value !== undefined &&
                 !(key === 'layout' && !Object.keys(value).length) &&
                 !(key === 'paint' && !Object.keys(value).length);
@@ -186,7 +183,7 @@ class StyleLayer extends Evented {
         if (options && options.validate === false) {
             return false;
         }
-        return validateStyle.emitErrors(this, validate.call(validateStyle, {
+        return emitValidationErrors(this, validate.call(validateStyle, {
             key: key,
             layerType: this.type,
             objectKey: name,
@@ -206,20 +203,6 @@ class StyleLayer extends Evented {
     }
 }
 
-module.exports = StyleLayer;
-
-const subclasses = {
-    'circle': require('./style_layer/circle_style_layer'),
-    'heatmap': require('./style_layer/heatmap_style_layer'),
-    'hillshade': require('./style_layer/hillshade_style_layer'),
-    'fill': require('./style_layer/fill_style_layer'),
-    'fill-extrusion': require('./style_layer/fill_extrusion_style_layer'),
-    'line': require('./style_layer/line_style_layer'),
-    'symbol': require('./style_layer/symbol_style_layer'),
-    'background': require('./style_layer/background_style_layer'),
-    'raster': require('./style_layer/raster_style_layer')
-};
-
-StyleLayer.create = function(layer: LayerSpecification) {
-    return new subclasses[layer.type](layer);
-};
+export default StyleLayer;
+
+
diff --git a/src/style/style_layer/background_style_layer.js b/src/style/style_layer/background_style_layer.js
index 4d48cc533f5..44b9c1e4a08 100644
--- a/src/style/style_layer/background_style_layer.js
+++ b/src/style/style_layer/background_style_layer.js
@@ -1,13 +1,9 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const properties = require('./background_style_layer_properties');
+import StyleLayer from '../style_layer';
 
-const {
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated
-} = require('../properties');
+import properties from './background_style_layer_properties';
+import { Transitionable, Transitioning, PossiblyEvaluated } from '../properties';
 
 import type {PaintProps} from './background_style_layer_properties';
 
@@ -21,4 +17,4 @@ class BackgroundStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = BackgroundStyleLayer;
+export default BackgroundStyleLayer;
diff --git a/src/style/style_layer/background_style_layer_properties.js b/src/style/style_layer/background_style_layer_properties.js
index ae5677589a2..229ec679f32 100644
--- a/src/style/style_layer/background_style_layer_properties.js
+++ b/src/style/style_layer/background_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -27,4 +27,4 @@ const paint: Properties<PaintProps> = new Properties({
     "background-opacity": new DataConstantProperty(styleSpec["paint_background"]["background-opacity"]),
 });
 
-module.exports = { paint };
+export default { paint };
diff --git a/src/style/style_layer/circle_style_layer.js b/src/style/style_layer/circle_style_layer.js
index e23ff259d04..45ac9ce31cb 100644
--- a/src/style/style_layer/circle_style_layer.js
+++ b/src/style/style_layer/circle_style_layer.js
@@ -1,21 +1,16 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const CircleBucket = require('../../data/bucket/circle_bucket');
-const {multiPolygonIntersectsBufferedPoint} = require('../../util/intersection_tests');
-const {getMaximumPaintValue, translateDistance, translate} = require('../query_utils');
-const properties = require('./circle_style_layer_properties');
-const {vec4} = require('@mapbox/gl-matrix');
-const Point = require('@mapbox/point-geometry');
+import StyleLayer from '../style_layer';
 
-import type Transform from '../../geo/transform';
-
-const {
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated
-} = require('../properties');
+import CircleBucket from '../../data/bucket/circle_bucket';
+import { multiPolygonIntersectsBufferedPoint } from '../../util/intersection_tests';
+import { getMaximumPaintValue, translateDistance, translate } from '../query_utils';
+import properties from './circle_style_layer_properties';
+import { Transitionable, Transitioning, PossiblyEvaluated } from '../properties';
+import {vec4} from '@mapbox/gl-matrix';
+import Point from '@mapbox/point-geometry';
 
+import type Transform from '../../geo/transform';
 import type {Bucket, BucketParameters} from '../../data/bucket';
 import type {PaintProps} from './circle_style_layer_properties';
 
@@ -98,4 +93,4 @@ function projectQueryGeometry(queryGeometry: Array<Array<Point>>, posMatrix: Flo
     });
 }
 
-module.exports = CircleStyleLayer;
+export default CircleStyleLayer;
diff --git a/src/style/style_layer/circle_style_layer_properties.js b/src/style/style_layer/circle_style_layer_properties.js
index 27e63fbcc85..37a7d88e251 100644
--- a/src/style/style_layer/circle_style_layer_properties.js
+++ b/src/style/style_layer/circle_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -43,4 +43,4 @@ const paint: Properties<PaintProps> = new Properties({
     "circle-stroke-opacity": new DataDrivenProperty(styleSpec["paint_circle"]["circle-stroke-opacity"]),
 });
 
-module.exports = { paint };
+export default { paint };
diff --git a/src/style/style_layer/fill_extrusion_style_layer.js b/src/style/style_layer/fill_extrusion_style_layer.js
index 5e8ff0ec88a..f119e17ef47 100644
--- a/src/style/style_layer/fill_extrusion_style_layer.js
+++ b/src/style/style_layer/fill_extrusion_style_layer.js
@@ -1,16 +1,12 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const FillExtrusionBucket = require('../../data/bucket/fill_extrusion_bucket');
-const {multiPolygonIntersectsMultiPolygon} = require('../../util/intersection_tests');
-const {translateDistance, translate} = require('../query_utils');
-const properties = require('./fill_extrusion_style_layer_properties');
+import StyleLayer from '../style_layer';
 
-const {
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated
-} = require('../properties');
+import FillExtrusionBucket from '../../data/bucket/fill_extrusion_bucket';
+import { multiPolygonIntersectsMultiPolygon } from '../../util/intersection_tests';
+import { translateDistance, translate } from '../query_utils';
+import properties from './fill_extrusion_style_layer_properties';
+import { Transitionable, Transitioning, PossiblyEvaluated } from '../properties';
 
 import type {BucketParameters} from '../../data/bucket';
 import type Point from '@mapbox/point-geometry';
@@ -61,4 +57,4 @@ class FillExtrusionStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = FillExtrusionStyleLayer;
+export default FillExtrusionStyleLayer;
diff --git a/src/style/style_layer/fill_extrusion_style_layer_properties.js b/src/style/style_layer/fill_extrusion_style_layer_properties.js
index 7a0189092f4..012be6474e2 100644
--- a/src/style/style_layer/fill_extrusion_style_layer_properties.js
+++ b/src/style/style_layer/fill_extrusion_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -35,4 +35,4 @@ const paint: Properties<PaintProps> = new Properties({
     "fill-extrusion-base": new DataDrivenProperty(styleSpec["paint_fill-extrusion"]["fill-extrusion-base"]),
 });
 
-module.exports = { paint };
+export default { paint };
diff --git a/src/style/style_layer/fill_style_layer.js b/src/style/style_layer/fill_style_layer.js
index 44926514dbc..0a73901531a 100644
--- a/src/style/style_layer/fill_style_layer.js
+++ b/src/style/style_layer/fill_style_layer.js
@@ -1,16 +1,12 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const FillBucket = require('../../data/bucket/fill_bucket');
-const {multiPolygonIntersectsMultiPolygon} = require('../../util/intersection_tests');
-const {translateDistance, translate} = require('../query_utils');
-const properties = require('./fill_style_layer_properties');
-
-const {
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated
-} = require('../properties');
+import StyleLayer from '../style_layer';
+
+import FillBucket from '../../data/bucket/fill_bucket';
+import { multiPolygonIntersectsMultiPolygon } from '../../util/intersection_tests';
+import { translateDistance, translate } from '../query_utils';
+import properties from './fill_style_layer_properties';
+import { Transitionable, Transitioning, PossiblyEvaluated } from '../properties';
 
 import type {BucketParameters} from '../../data/bucket';
 import type Point from '@mapbox/point-geometry';
@@ -58,4 +54,4 @@ class FillStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = FillStyleLayer;
+export default FillStyleLayer;
diff --git a/src/style/style_layer/fill_style_layer_properties.js b/src/style/style_layer/fill_style_layer_properties.js
index da8783d4ad1..51a471be24d 100644
--- a/src/style/style_layer/fill_style_layer_properties.js
+++ b/src/style/style_layer/fill_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -35,4 +35,4 @@ const paint: Properties<PaintProps> = new Properties({
     "fill-pattern": new CrossFadedProperty(styleSpec["paint_fill"]["fill-pattern"]),
 });
 
-module.exports = { paint };
+export default { paint };
diff --git a/src/style/style_layer/heatmap_style_layer.js b/src/style/style_layer/heatmap_style_layer.js
index 4bcdda1b8b1..c19fd28b8a0 100644
--- a/src/style/style_layer/heatmap_style_layer.js
+++ b/src/style/style_layer/heatmap_style_layer.js
@@ -1,15 +1,11 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const HeatmapBucket = require('../../data/bucket/heatmap_bucket');
-const RGBAImage = require('../../util/image').RGBAImage;
-const properties = require('./heatmap_style_layer_properties');
+import StyleLayer from '../style_layer';
 
-const {
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated
-} = require('../properties');
+import HeatmapBucket from '../../data/bucket/heatmap_bucket';
+import { RGBAImage } from '../../util/image';
+import properties from './heatmap_style_layer_properties';
+import { Transitionable, Transitioning, PossiblyEvaluated } from '../properties';
 
 import type Texture from '../../render/texture';
 import type Framebuffer from '../../gl/framebuffer';
@@ -80,4 +76,4 @@ class HeatmapStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = HeatmapStyleLayer;
+export default HeatmapStyleLayer;
diff --git a/src/style/style_layer/heatmap_style_layer_properties.js b/src/style/style_layer/heatmap_style_layer_properties.js
index 9b7f51da842..dccace28905 100644
--- a/src/style/style_layer/heatmap_style_layer_properties.js
+++ b/src/style/style_layer/heatmap_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -31,4 +31,4 @@ const paint: Properties<PaintProps> = new Properties({
     "heatmap-opacity": new DataConstantProperty(styleSpec["paint_heatmap"]["heatmap-opacity"]),
 });
 
-module.exports = { paint };
+export default { paint };
diff --git a/src/style/style_layer/hillshade_style_layer.js b/src/style/style_layer/hillshade_style_layer.js
index 1e159202aaa..f4153c31aed 100644
--- a/src/style/style_layer/hillshade_style_layer.js
+++ b/src/style/style_layer/hillshade_style_layer.js
@@ -1,13 +1,9 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const properties = require('./hillshade_style_layer_properties');
+import StyleLayer from '../style_layer';
 
-const {
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated
-} = require('../properties');
+import properties from './hillshade_style_layer_properties';
+import { Transitionable, Transitioning, PossiblyEvaluated } from '../properties';
 
 import type {PaintProps} from './hillshade_style_layer_properties';
 
@@ -25,4 +21,4 @@ class HillshadeStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = HillshadeStyleLayer;
+export default HillshadeStyleLayer;
diff --git a/src/style/style_layer/hillshade_style_layer_properties.js b/src/style/style_layer/hillshade_style_layer_properties.js
index 382b2bf7872..98d1a603a31 100644
--- a/src/style/style_layer/hillshade_style_layer_properties.js
+++ b/src/style/style_layer/hillshade_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -33,4 +33,4 @@ const paint: Properties<PaintProps> = new Properties({
     "hillshade-accent-color": new DataConstantProperty(styleSpec["paint_hillshade"]["hillshade-accent-color"]),
 });
 
-module.exports = { paint };
+export default { paint };
diff --git a/src/style/style_layer/layer_properties.js.ejs b/src/style/style_layer/layer_properties.js.ejs
index 98766a2a310..4fb8850392c 100644
--- a/src/style/style_layer/layer_properties.js.ejs
+++ b/src/style/style_layer/layer_properties.js.ejs
@@ -7,15 +7,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -47,4 +47,4 @@ const paint: Properties<PaintProps> = new Properties({
 <% } -%>
 });
 
-module.exports = { paint<% if (layoutProperties.length) { %>, layout<% } %> };
+export default { paint<% if (layoutProperties.length) { %>, layout<% } %> };
diff --git a/src/style/style_layer/line_style_layer.js b/src/style/style_layer/line_style_layer.js
index 0ad51821982..fabe7a2d952 100644
--- a/src/style/style_layer/line_style_layer.js
+++ b/src/style/style_layer/line_style_layer.js
@@ -1,22 +1,15 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-
-const StyleLayer = require('../style_layer');
-const LineBucket = require('../../data/bucket/line_bucket');
-const {multiPolygonIntersectsBufferedMultiLine} = require('../../util/intersection_tests');
-const {getMaximumPaintValue, translateDistance, translate} = require('../query_utils');
-const properties = require('./line_style_layer_properties');
-const {extend} = require('../../util/util');
-const EvaluationParameters = require('../evaluation_parameters');
-
-const {
-    Transitionable,
-    Transitioning,
-    Layout,
-    PossiblyEvaluated,
-    DataDrivenProperty
-} = require('../properties');
+import Point from '@mapbox/point-geometry';
+
+import StyleLayer from '../style_layer';
+import LineBucket from '../../data/bucket/line_bucket';
+import { multiPolygonIntersectsBufferedMultiLine } from '../../util/intersection_tests';
+import { getMaximumPaintValue, translateDistance, translate } from '../query_utils';
+import properties from './line_style_layer_properties';
+import { extend } from '../../util/util';
+import EvaluationParameters from '../evaluation_parameters';
+import { Transitionable, Transitioning, Layout, PossiblyEvaluated, DataDrivenProperty } from '../properties';
 
 import type {Bucket, BucketParameters} from '../../data/bucket';
 import type {LayoutProps, PaintProps} from './line_style_layer_properties';
@@ -97,7 +90,7 @@ class LineStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = LineStyleLayer;
+export default LineStyleLayer;
 
 function getLineWidth(lineWidth, lineGapWidth) {
     if (lineGapWidth > 0) {
diff --git a/src/style/style_layer/line_style_layer_properties.js b/src/style/style_layer/line_style_layer_properties.js
index 8e89efc77b8..cd6400c7e4a 100644
--- a/src/style/style_layer/line_style_layer_properties.js
+++ b/src/style/style_layer/line_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -54,4 +54,4 @@ const paint: Properties<PaintProps> = new Properties({
     "line-pattern": new CrossFadedProperty(styleSpec["paint_line"]["line-pattern"]),
 });
 
-module.exports = { paint, layout };
+export default { paint, layout };
diff --git a/src/style/style_layer/raster_style_layer.js b/src/style/style_layer/raster_style_layer.js
index 68968d8b8cf..3db7ab5cffd 100644
--- a/src/style/style_layer/raster_style_layer.js
+++ b/src/style/style_layer/raster_style_layer.js
@@ -1,13 +1,9 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const properties = require('./raster_style_layer_properties');
+import StyleLayer from '../style_layer';
 
-const {
-    Transitionable,
-    Transitioning,
-    PossiblyEvaluated
-} = require('../properties');
+import properties from './raster_style_layer_properties';
+import { Transitionable, Transitioning, PossiblyEvaluated } from '../properties';
 
 import type {PaintProps} from './raster_style_layer_properties';
 
@@ -21,4 +17,4 @@ class RasterStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = RasterStyleLayer;
+export default RasterStyleLayer;
diff --git a/src/style/style_layer/raster_style_layer_properties.js b/src/style/style_layer/raster_style_layer_properties.js
index bbe853bf4a9..f538bc0a1da 100644
--- a/src/style/style_layer/raster_style_layer_properties.js
+++ b/src/style/style_layer/raster_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -35,4 +35,4 @@ const paint: Properties<PaintProps> = new Properties({
     "raster-fade-duration": new DataConstantProperty(styleSpec["paint_raster"]["raster-fade-duration"]),
 });
 
-module.exports = { paint };
+export default { paint };
diff --git a/src/style/style_layer/symbol_style_layer.js b/src/style/style_layer/symbol_style_layer.js
index b780628f42a..82c0c4efefb 100644
--- a/src/style/style_layer/symbol_style_layer.js
+++ b/src/style/style_layer/symbol_style_layer.js
@@ -1,18 +1,13 @@
 // @flow
 
-const StyleLayer = require('../style_layer');
-const SymbolBucket = require('../../data/bucket/symbol_bucket');
-const resolveTokens = require('../../util/token');
-const {isExpression} = require('../../style-spec/expression');
-const assert = require('assert');
-const properties = require('./symbol_style_layer_properties');
-
-const {
-    Transitionable,
-    Transitioning,
-    Layout,
-    PossiblyEvaluated
-} = require('../properties');
+import StyleLayer from '../style_layer';
+
+import SymbolBucket from '../../data/bucket/symbol_bucket';
+import resolveTokens from '../../util/token';
+import { isExpression } from '../../style-spec/expression';
+import assert from 'assert';
+import properties from './symbol_style_layer_properties';
+import { Transitionable, Transitioning, Layout, PossiblyEvaluated } from '../properties';
 
 import type {BucketParameters} from '../../data/bucket';
 import type {LayoutProps, PaintProps} from './symbol_style_layer_properties';
@@ -83,4 +78,4 @@ class SymbolStyleLayer extends StyleLayer {
     }
 }
 
-module.exports = SymbolStyleLayer;
+export default SymbolStyleLayer;
diff --git a/src/style/style_layer/symbol_style_layer_properties.js b/src/style/style_layer/symbol_style_layer_properties.js
index 705e76373d5..586c43507bc 100644
--- a/src/style/style_layer/symbol_style_layer_properties.js
+++ b/src/style/style_layer/symbol_style_layer_properties.js
@@ -2,15 +2,15 @@
 // @flow
 /* eslint-disable */
 
-const styleSpec = require('../../style-spec/reference/latest');
+import styleSpec from '../../style-spec/reference/latest';
 
-const {
+import {
     Properties,
     DataConstantProperty,
     DataDrivenProperty,
     CrossFadedProperty,
     HeatmapColorProperty
-} = require('../properties');
+} from '../properties';
 
 import type Color from '../../style-spec/util/color';
 
@@ -126,4 +126,4 @@ const paint: Properties<PaintProps> = new Properties({
     "text-translate-anchor": new DataConstantProperty(styleSpec["paint_symbol"]["text-translate-anchor"]),
 });
 
-module.exports = { paint, layout };
+export default { paint, layout };
diff --git a/src/style/style_layer_index.js b/src/style/style_layer_index.js
index 77869e3a6dc..b992453c94b 100644
--- a/src/style/style_layer_index.js
+++ b/src/style/style_layer_index.js
@@ -1,9 +1,11 @@
 // @flow
 
-const StyleLayer = require('./style_layer');
-const util = require('../util/util');
-const featureFilter = require('../style-spec/feature_filter');
-const groupByLayout = require('../style-spec/group_by_layout');
+import StyleLayer from './style_layer';
+import createStyleLayer from './create_style_layer';
+
+import { values } from '../util/util';
+import featureFilter from '../style-spec/feature_filter';
+import groupByLayout from '../style-spec/group_by_layout';
 
 import type {TypedStyleLayer} from './style_layer/typed_style_layer';
 
@@ -32,7 +34,7 @@ class StyleLayerIndex {
         for (const layerConfig of layerConfigs) {
             this._layerConfigs[layerConfig.id] = layerConfig;
 
-            const layer = this._layers[layerConfig.id] = StyleLayer.create(layerConfig);
+            const layer = this._layers[layerConfig.id] = createStyleLayer(layerConfig);
             layer._featureFilter = featureFilter(layer.filter);
         }
         for (const id of removedIds) {
@@ -42,7 +44,7 @@ class StyleLayerIndex {
 
         this.familiesBySource = {};
 
-        const groups = groupByLayout(util.values(this._layerConfigs));
+        const groups = groupByLayout(values(this._layerConfigs));
 
         for (const layerConfigs of groups) {
             const layers = layerConfigs.map((layerConfig) => this._layers[layerConfig.id]);
@@ -69,4 +71,4 @@ class StyleLayerIndex {
     }
 }
 
-module.exports = StyleLayerIndex;
+export default StyleLayerIndex;
diff --git a/src/style/validate_style.js b/src/style/validate_style.js
index c8ef0915090..ca17782a14e 100644
--- a/src/style/validate_style.js
+++ b/src/style/validate_style.js
@@ -1,12 +1,25 @@
 // @flow
+import validateStyleMin from '../style-spec/validate_style.min';
+import { ErrorEvent } from '../util/evented';
 
-module.exports = require('../style-spec/validate_style.min');
+import type {Evented} from '../util/evented';
 
-const {ErrorEvent} = require('../util/evented');
+type ValidationError = {
+    message: string,
+    line: number
+};
 
-import type {Evented} from '../util/evented';
+type Validator = (Object) => $ReadOnlyArray<ValidationError>;
 
-module.exports.emitErrors = function (emitter: Evented, errors: ?Array<{message: string}>) {
+export const validateStyle = (validateStyleMin: (Object, ?Object) => $ReadOnlyArray<ValidationError>);
+
+export const validateSource = (validateStyleMin.source: Validator);
+export const validateLight = (validateStyleMin.light: Validator);
+export const validateFilter = (validateStyleMin.filter: Validator);
+export const validatePaintProperty = (validateStyleMin.paintProperty: Validator);
+export const validateLayoutProperty = (validateStyleMin.layoutProperty: Validator);
+
+export function emitValidationErrors(emitter: Evented, errors: ?$ReadOnlyArray<{message: string}>) {
     if (errors && errors.length) {
         for (const {message} of errors) {
             emitter.fire(new ErrorEvent(new Error(message)));
@@ -15,4 +28,4 @@ module.exports.emitErrors = function (emitter: Evented, errors: ?Array<{message:
     } else {
         return false;
     }
-};
+}
diff --git a/src/style/zoom_history.js b/src/style/zoom_history.js
index 17599e0deae..b2f684e2a69 100644
--- a/src/style/zoom_history.js
+++ b/src/style/zoom_history.js
@@ -41,4 +41,4 @@ class ZoomHistory {
     }
 }
 
-module.exports = ZoomHistory;
+export default ZoomHistory;
diff --git a/src/symbol/anchor.js b/src/symbol/anchor.js
index 27b8070b113..1637d9785fb 100644
--- a/src/symbol/anchor.js
+++ b/src/symbol/anchor.js
@@ -1,7 +1,8 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-const {register} = require('../util/web_worker_transfer');
+import Point from '@mapbox/point-geometry';
+
+import { register } from '../util/web_worker_transfer';
 
 class Anchor extends Point {
     angle: any;
@@ -22,4 +23,4 @@ class Anchor extends Point {
 
 register('Anchor', Anchor);
 
-module.exports = Anchor;
+export default Anchor;
diff --git a/src/symbol/check_max_angle.js b/src/symbol/check_max_angle.js
index 556b50c0d9e..cc124c5fc85 100644
--- a/src/symbol/check_max_angle.js
+++ b/src/symbol/check_max_angle.js
@@ -1,6 +1,6 @@
 // @flow
 
-module.exports = checkMaxAngle;
+export default checkMaxAngle;
 
 import type Point from '@mapbox/point-geometry';
 import type Anchor from './anchor';
diff --git a/src/symbol/clip_line.js b/src/symbol/clip_line.js
index b4df5398233..81dc5db105e 100644
--- a/src/symbol/clip_line.js
+++ b/src/symbol/clip_line.js
@@ -1,8 +1,8 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
+import Point from '@mapbox/point-geometry';
 
-module.exports = clipLine;
+export default clipLine;
 
 /**
  * Returns the part of a multiline that intersects with the provided rectangular box.
diff --git a/src/symbol/collision_feature.js b/src/symbol/collision_feature.js
index 3a2d900010c..ee1cf80ab6f 100644
--- a/src/symbol/collision_feature.js
+++ b/src/symbol/collision_feature.js
@@ -179,4 +179,4 @@ class CollisionFeature {
     }
 }
 
-module.exports = CollisionFeature;
+export default CollisionFeature;
diff --git a/src/symbol/collision_index.js b/src/symbol/collision_index.js
index 60a94b90835..49326b01574 100644
--- a/src/symbol/collision_index.js
+++ b/src/symbol/collision_index.js
@@ -1,14 +1,14 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-const intersectionTests = require('../util/intersection_tests');
+import Point from '@mapbox/point-geometry';
 
-const Grid = require('./grid_index');
-const glmatrix = require('@mapbox/gl-matrix');
+import * as intersectionTests from '../util/intersection_tests';
+import Grid from './grid_index';
+import glmatrix from '@mapbox/gl-matrix';
 
 const mat4 = glmatrix.mat4;
 
-const projection = require('../symbol/projection');
+import * as projection from '../symbol/projection';
 
 import type Transform from '../geo/transform';
 import type {OverscaledTileID} from '../source/tile_id';
@@ -399,4 +399,4 @@ function markCollisionCircleUsed(collisionCircles: Array<number>, index: number,
     collisionCircles[index + 4] = used ? 1 : 0;
 }
 
-module.exports = CollisionIndex;
+export default CollisionIndex;
diff --git a/src/symbol/cross_tile_symbol_index.js b/src/symbol/cross_tile_symbol_index.js
index 95ec990a3fd..3937e305837 100644
--- a/src/symbol/cross_tile_symbol_index.js
+++ b/src/symbol/cross_tile_symbol_index.js
@@ -1,10 +1,9 @@
 // @flow
 
-const EXTENT = require('../data/extent');
+import EXTENT from '../data/extent';
 
 import type {OverscaledTileID} from '../source/tile_id';
-import type {SymbolInstance} from '../data/bucket/symbol_bucket';
-import type SymbolBucket from '../data/bucket/symbol_bucket';
+import type SymbolBucket, {SymbolInstance} from '../data/bucket/symbol_bucket';
 import type StyleLayer from '../style/style_layer';
 import type Tile from '../source/tile';
 
@@ -263,4 +262,4 @@ class CrossTileSymbolIndex {
     }
 }
 
-module.exports = CrossTileSymbolIndex;
+export default CrossTileSymbolIndex;
diff --git a/src/symbol/get_anchors.js b/src/symbol/get_anchors.js
index 8a9832d987c..0d12733ab50 100644
--- a/src/symbol/get_anchors.js
+++ b/src/symbol/get_anchors.js
@@ -1,13 +1,14 @@
 // @flow
 
-const interpolate = require('../style-spec/util/interpolate').number;
-const Anchor = require('../symbol/anchor');
-const checkMaxAngle = require('./check_max_angle');
+import { number as interpolate } from '../style-spec/util/interpolate';
+
+import Anchor from '../symbol/anchor';
+import checkMaxAngle from './check_max_angle';
 
 import type Point from '@mapbox/point-geometry';
 import type {Shaping, PositionedIcon} from './shaping';
 
-module.exports = getAnchors;
+export default getAnchors;
 
 function getAnchors(line: Array<Point>,
                     spacing: number,
diff --git a/src/symbol/grid_index.js b/src/symbol/grid_index.js
index 0c9ef6b7d09..63f73b27011 100644
--- a/src/symbol/grid_index.js
+++ b/src/symbol/grid_index.js
@@ -292,4 +292,4 @@ class GridIndex {
     }
 }
 
-module.exports = GridIndex;
+export default GridIndex;
diff --git a/src/symbol/mergelines.js b/src/symbol/mergelines.js
index d828adb030a..0c9c46a9cb4 100644
--- a/src/symbol/mergelines.js
+++ b/src/symbol/mergelines.js
@@ -2,7 +2,7 @@
 
 import type {SymbolFeature} from '../data/bucket/symbol_bucket';
 
-module.exports = function (features: Array<SymbolFeature>) {
+export default function (features: Array<SymbolFeature>) {
     const leftIndex: {[string]: number} = {};
     const rightIndex: {[string]: number} = {};
     const mergedFeatures = [];
@@ -79,4 +79,4 @@ module.exports = function (features: Array<SymbolFeature>) {
     }
 
     return mergedFeatures.filter((f) => f.geometry);
-};
+}
diff --git a/src/symbol/opacity_state.js b/src/symbol/opacity_state.js
index 05ac9164ef1..864c1fb32f5 100644
--- a/src/symbol/opacity_state.js
+++ b/src/symbol/opacity_state.js
@@ -1,6 +1,6 @@
 // @flow
 
-const {register} = require('../util/web_worker_transfer');
+import { register } from '../util/web_worker_transfer';
 
 class OpacityState {
     opacity: number;
@@ -24,4 +24,4 @@ class OpacityState {
 
 register('OpacityState', OpacityState);
 
-module.exports = OpacityState;
+export default OpacityState;
diff --git a/src/symbol/placement.js b/src/symbol/placement.js
index ec8732cce83..dc1e3cee5ca 100644
--- a/src/symbol/placement.js
+++ b/src/symbol/placement.js
@@ -1,12 +1,14 @@
 // @flow
 
-const CollisionIndex = require('./collision_index');
-const EXTENT = require('../data/extent');
-const symbolSize = require('./symbol_size');
-const projection = require('./projection');
-const symbolLayoutProperties = require('../style/style_layer/symbol_style_layer_properties').layout;
-const assert = require('assert');
-const pixelsToTileUnits = require('../source/pixels_to_tile_units');
+import CollisionIndex from './collision_index';
+
+import EXTENT from '../data/extent';
+import * as symbolSize from './symbol_size';
+import * as projection from './projection';
+import properties from '../style/style_layer/symbol_style_layer_properties';
+const symbolLayoutProperties = properties.layout;
+import assert from 'assert';
+import pixelsToTileUnits from '../source/pixels_to_tile_units';
 
 import type Transform from '../geo/transform';
 import type StyleLayer from '../style/style_layer';
@@ -416,4 +418,4 @@ function packOpacity(opacityState: OpacityState): number {
         opacityBits * shift1 + targetBit;
 }
 
-module.exports = Placement;
+export default Placement;
diff --git a/src/symbol/projection.js b/src/symbol/projection.js
index 2abba3a4821..a00b045ebd1 100644
--- a/src/symbol/projection.js
+++ b/src/symbol/projection.js
@@ -1,10 +1,12 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-const {mat4, vec4} = require('@mapbox/gl-matrix');
-const symbolSize = require('./symbol_size');
-const {addDynamicAttributes} = require('../data/bucket/symbol_bucket');
-const symbolLayoutProperties = require('../style/style_layer/symbol_style_layer_properties').layout;
+import Point from '@mapbox/point-geometry';
+
+import { mat4, vec4 } from '@mapbox/gl-matrix';
+import * as symbolSize from './symbol_size';
+import { addDynamicAttributes } from '../data/bucket/symbol_bucket';
+import properties from '../style/style_layer/symbol_style_layer_properties';
+const symbolLayoutProperties = properties.layout;
 
 import type Painter from '../render/painter';
 import type Transform from '../geo/transform';
@@ -14,16 +16,9 @@ import type {
     SymbolLineVertexArray,
     SymbolDynamicLayoutArray
 } from '../data/array_types';
-const WritingMode = require('../symbol/shaping').WritingMode;
-
-module.exports = {
-    updateLineLabels,
-    getLabelPlaneMatrix,
-    getGlCoordMatrix,
-    project,
-    placeFirstAndLastGlyph,
-    xyTransformMat4
-};
+import { WritingMode } from '../symbol/shaping';
+
+export { updateLineLabels, getLabelPlaneMatrix, getGlCoordMatrix, project, placeFirstAndLastGlyph, xyTransformMat4 };
 
 /*
  * # Overview of coordinate spaces
diff --git a/src/symbol/quads.js b/src/symbol/quads.js
index bda42f9b24c..d0ae82b4ac4 100644
--- a/src/symbol/quads.js
+++ b/src/symbol/quads.js
@@ -1,7 +1,8 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-const {GLYPH_PBF_BORDER} = require('../style/parse_glyph_pbf');
+import Point from '@mapbox/point-geometry';
+
+import { GLYPH_PBF_BORDER } from '../style/parse_glyph_pbf';
 
 import type Anchor from './anchor';
 import type {PositionedIcon, Shaping} from './shaping';
@@ -9,11 +10,14 @@ import type SymbolStyleLayer from '../style/style_layer/symbol_style_layer';
 import type {Feature} from '../style-spec/expression';
 import type {GlyphPosition} from '../render/glyph_atlas';
 
-module.exports = {
+const exported = {
     getIconQuads,
     getGlyphQuads
 };
 
+export default exported;
+export { getIconQuads, getGlyphQuads };
+
 /**
  * A textured quad for rendering a single icon or glyph.
  *
diff --git a/src/symbol/shaping.js b/src/symbol/shaping.js
index 131b8586be1..d6667185749 100644
--- a/src/symbol/shaping.js
+++ b/src/symbol/shaping.js
@@ -1,8 +1,11 @@
 // @flow
 
-const scriptDetection = require('../util/script_detection');
-const verticalizePunctuation = require('../util/verticalize_punctuation');
-const rtlTextPlugin = require('../source/rtl_text_plugin');
+import {
+    charHasUprightVerticalOrientation,
+    charAllowsIdeographicBreaking
+} from '../util/script_detection';
+import verticalizePunctuation from '../util/verticalize_punctuation';
+import { plugin as rtlTextPlugin } from '../source/rtl_text_plugin';
 
 import type {StyleGlyph} from '../style/style_glyph';
 import type {ImagePosition} from '../render/image_atlas';
@@ -13,11 +16,7 @@ const WritingMode = {
     horizontalOnly: 3
 };
 
-module.exports = {
-    shapeText,
-    shapeIcon,
-    WritingMode
-};
+export { shapeText, shapeIcon, WritingMode };
 
 // The position of a glyph relative to the text's anchor point.
 export type PositionedGlyph = {
@@ -250,7 +249,7 @@ function determineLineBreaks(logicalInput: string,
         // surrounding spaces.
         if ((i < logicalInput.length - 1) &&
             (breakable[codePoint] ||
-                scriptDetection.charAllowsIdeographicBreaking(codePoint))) {
+                charAllowsIdeographicBreaking(codePoint))) {
 
             potentialLineBreaks.push(
                 evaluateBreak(
@@ -342,7 +341,7 @@ function shapeLines(shaping: Shaping,
 
             if (!glyph) continue;
 
-            if (!scriptDetection.charHasUprightVerticalOrientation(codePoint) || writingMode === WritingMode.horizontal) {
+            if (!charHasUprightVerticalOrientation(codePoint) || writingMode === WritingMode.horizontal) {
                 positionedGlyphs.push({glyph: codePoint, x, y, vertical: false});
                 x += glyph.metrics.advance + spacing;
             } else {
diff --git a/src/symbol/symbol_layout.js b/src/symbol/symbol_layout.js
index 8b6588d0be3..56da9338e4a 100644
--- a/src/symbol/symbol_layout.js
+++ b/src/symbol/symbol_layout.js
@@ -1,19 +1,23 @@
 // @flow
 
-const Anchor = require('./anchor');
-const getAnchors = require('./get_anchors');
-const clipLine = require('./clip_line');
-const OpacityState = require('./opacity_state');
-const {shapeText, shapeIcon, WritingMode} = require('./shaping');
-const {getGlyphQuads, getIconQuads} = require('./quads');
-const CollisionFeature = require('./collision_feature');
-const util = require('../util/util');
-const scriptDetection = require('../util/script_detection');
-const findPoleOfInaccessibility = require('../util/find_pole_of_inaccessibility');
-const classifyRings = require('../util/classify_rings');
-const EXTENT = require('../data/extent');
-const SymbolBucket = require('../data/bucket/symbol_bucket');
-const EvaluationParameters = require('../style/evaluation_parameters');
+import Anchor from './anchor';
+
+import getAnchors from './get_anchors';
+import clipLine from './clip_line';
+import OpacityState from './opacity_state';
+import { shapeText, shapeIcon, WritingMode } from './shaping';
+import { getGlyphQuads, getIconQuads } from './quads';
+import CollisionFeature from './collision_feature';
+import { warnOnce } from '../util/util';
+import {
+    allowsVerticalWritingMode,
+    allowsLetterSpacing
+} from '../util/script_detection';
+import findPoleOfInaccessibility from '../util/find_pole_of_inaccessibility';
+import classifyRings from '../util/classify_rings';
+import EXTENT from '../data/extent';
+import SymbolBucket from '../data/bucket/symbol_bucket';
+import EvaluationParameters from '../style/evaluation_parameters';
 
 import type {Shaping, PositionedIcon} from './shaping';
 import type {CollisionBoxArray} from '../data/array_types';
@@ -25,12 +29,15 @@ import type {ImagePosition} from '../render/image_atlas';
 import type {GlyphPosition} from '../render/glyph_atlas';
 import type {PossiblyEvaluatedPropertyValue} from '../style/properties';
 
-const Point = require('@mapbox/point-geometry');
+import Point from '@mapbox/point-geometry';
 
-module.exports = {
+const exported = {
     performSymbolLayout
 };
 
+export default exported;
+export { performSymbolLayout };
+
 // The symbol layout process needs `text-size` evaluated at up to five different zoom levels, and
 // `icon-size` at up to three:
 //
@@ -106,10 +113,9 @@ function performSymbolLayout(bucket: SymbolBucket,
         const shapedTextOrientations = {};
         const text = feature.text;
         if (text) {
-            const allowsVerticalWritingMode = scriptDetection.allowsVerticalWritingMode(text);
             const textOffset: [number, number] = (layout.get('text-offset').evaluate(feature).map((t)=> t * oneEm): any);
             const spacing = layout.get('text-letter-spacing').evaluate(feature) * oneEm;
-            const spacingIfAllowed = scriptDetection.allowsLetterSpacing(text) ? spacing : 0;
+            const spacingIfAllowed = allowsLetterSpacing(text) ? spacing : 0;
             const textAnchor = layout.get('text-anchor').evaluate(feature);
             const textJustify = layout.get('text-justify').evaluate(feature);
             const maxWidth = layout.get('symbol-placement') !== 'line' ?
@@ -117,7 +123,7 @@ function performSymbolLayout(bucket: SymbolBucket,
                 0;
 
             shapedTextOrientations.horizontal = shapeText(text, glyphs, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed, textOffset, oneEm, WritingMode.horizontal);
-            if (allowsVerticalWritingMode && textAlongLine && keepUpright) {
+            if (allowsVerticalWritingMode(text) && textAlongLine && keepUpright) {
                 shapedTextOrientations.vertical = shapeText(text, glyphs, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed, textOffset, oneEm, WritingMode.vertical);
             }
         }
@@ -133,7 +139,7 @@ function performSymbolLayout(bucket: SymbolBucket,
                 if (bucket.sdfIcons === undefined) {
                     bucket.sdfIcons = image.sdf;
                 } else if (bucket.sdfIcons !== image.sdf) {
-                    util.warnOnce('Style sheet warning: Cannot mix SDF and non-SDF icons in one buffer');
+                    warnOnce('Style sheet warning: Cannot mix SDF and non-SDF icons in one buffer');
                 }
                 if (image.pixelRatio !== bucket.pixelRatio) {
                     bucket.iconsNeedLinear = true;
@@ -390,7 +396,9 @@ function addSymbol(bucket: SymbolBucket,
     const iconBoxStartIndex = iconCollisionFeature ? iconCollisionFeature.boxStartIndex : bucket.collisionBoxArray.length;
     const iconBoxEndIndex = iconCollisionFeature ? iconCollisionFeature.boxEndIndex : bucket.collisionBoxArray.length;
 
-    if (bucket.glyphOffsetArray.length >= SymbolBucket.MAX_GLYPHS) util.warnOnce("Too many glyphs being rendered in a tile. See https://github.com/mapbox/mapbox-gl-js/issues/2907");
+    if (bucket.glyphOffsetArray.length >= SymbolBucket.MAX_GLYPHS) warnOnce(
+        "Too many glyphs being rendered in a tile. See https://github.com/mapbox/mapbox-gl-js/issues/2907"
+    );
 
     const textOpacityState = new OpacityState();
     const iconOpacityState = new OpacityState();
diff --git a/src/symbol/symbol_size.js b/src/symbol/symbol_size.js
index abaf68403dc..2fee70bfa86 100644
--- a/src/symbol/symbol_size.js
+++ b/src/symbol/symbol_size.js
@@ -1,17 +1,14 @@
 // @flow
 
-const {normalizePropertyExpression} = require('../style-spec/expression');
-const interpolate = require('../style-spec/util/interpolate');
-const util = require('../util/util');
+import { normalizePropertyExpression } from '../style-spec/expression';
+
+import { number as interpolate } from '../style-spec/util/interpolate';
+import { clamp } from '../util/util';
 
 import type {Property, PropertyValue, PossiblyEvaluatedPropertyValue} from '../style/properties';
 import type {CameraExpression, CompositeExpression} from '../style-spec/expression/index';
 
-module.exports = {
-    getSizeData,
-    evaluateSizeForFeature,
-    evaluateSizeForZoom
-};
+export { getSizeData, evaluateSizeForFeature, evaluateSizeForZoom };
 
 export type SizeData = {
     functionType: 'constant',
@@ -92,7 +89,7 @@ function evaluateSizeForFeature(sizeData: SizeData,
     if (sizeData.functionType === 'source') {
         return symbol.lowerSize / 10;
     } else if (sizeData.functionType === 'composite') {
-        return interpolate.number(symbol.lowerSize / 10, symbol.upperSize / 10, part.uSizeT);
+        return interpolate(symbol.lowerSize / 10, symbol.upperSize / 10, part.uSizeT);
     } else {
         return part.uSize;
     }
@@ -118,9 +115,11 @@ function evaluateSizeForZoom(sizeData: SizeData, currentZoom: number, property:
         // between the camera function values at a pair of zoom stops covering
         // [tileZoom, tileZoom + 1] in order to be consistent with this
         // restriction on composite functions
-        const t = util.clamp(
+        const t = clamp(
             expression.interpolationFactor(currentZoom, zoomRange.min, zoomRange.max),
-            0, 1);
+            0,
+            1
+        );
 
         return {
             uSizeT: 0,
@@ -131,7 +130,11 @@ function evaluateSizeForZoom(sizeData: SizeData, currentZoom: number, property:
         const expression = ((normalizePropertyExpression(propertyValue, property.specification): any): CompositeExpression);
 
         return {
-            uSizeT: util.clamp(expression.interpolationFactor(currentZoom, zoomRange.min, zoomRange.max), 0, 1),
+            uSizeT: clamp(
+                expression.interpolationFactor(currentZoom, zoomRange.min, zoomRange.max),
+                0,
+                1
+            ),
             uSize: 0
         };
     }
diff --git a/src/symbol/transform_text.js b/src/symbol/transform_text.js
index ac9b352e1d6..dceaef36879 100644
--- a/src/symbol/transform_text.js
+++ b/src/symbol/transform_text.js
@@ -1,11 +1,11 @@
 // @flow
 
-const rtlTextPlugin = require('../source/rtl_text_plugin');
+import { plugin as rtlTextPlugin } from '../source/rtl_text_plugin';
 
 import type SymbolStyleLayer from '../style/style_layer/symbol_style_layer';
 import type {Feature} from '../style-spec/expression';
 
-module.exports = function(text: string, layer: SymbolStyleLayer, feature: Feature) {
+export default function(text: string, layer: SymbolStyleLayer, feature: Feature) {
     const transform = layer.layout.get('text-transform').evaluate(feature);
     if (transform === 'uppercase') {
         text = text.toLocaleUpperCase();
@@ -18,4 +18,4 @@ module.exports = function(text: string, layer: SymbolStyleLayer, feature: Featur
     }
 
     return text;
-};
+}
diff --git a/src/ui/bind_handlers.js b/src/ui/bind_handlers.js
index 04d35260c95..d5b91490e96 100644
--- a/src/ui/bind_handlers.js
+++ b/src/ui/bind_handlers.js
@@ -1,25 +1,30 @@
 // @flow
 
-const {
-    MapMouseEvent,
-    MapTouchEvent,
-    MapWheelEvent
-} = require('../ui/events');
-const DOM = require('../util/dom');
+import { MapMouseEvent, MapTouchEvent, MapWheelEvent } from '../ui/events';
+
+import DOM from '../util/dom';
 
 import type Map from './map';
 
+import scrollZoom from './handler/scroll_zoom';
+import boxZoom from './handler/box_zoom';
+import dragRotate from './handler/drag_rotate';
+import dragPan from './handler/drag_pan';
+import keyboard from './handler/keyboard';
+import doubleClickZoom from './handler/dblclick_zoom';
+import touchZoomRotate from './handler/touch_zoom_rotate';
+
 const handlers = {
-    scrollZoom: require('./handler/scroll_zoom'),
-    boxZoom: require('./handler/box_zoom'),
-    dragRotate: require('./handler/drag_rotate'),
-    dragPan: require('./handler/drag_pan'),
-    keyboard: require('./handler/keyboard'),
-    doubleClickZoom: require('./handler/dblclick_zoom'),
-    touchZoomRotate: require('./handler/touch_zoom_rotate')
+    scrollZoom,
+    boxZoom,
+    dragRotate,
+    dragPan,
+    keyboard,
+    doubleClickZoom,
+    touchZoomRotate
 };
 
-module.exports = function bindHandlers(map: Map, options: {}) {
+export default function bindHandlers(map: Map, options: {}) {
     const el = map.getCanvasContainer();
     let contextMenuEvent = null;
     let mouseDown = false;
@@ -175,4 +180,4 @@ module.exports = function bindHandlers(map: Map, options: {}) {
 
         map.scrollZoom.onWheel(e);
     }
-};
+}
diff --git a/src/ui/camera.js b/src/ui/camera.js
index ef166c3c8cb..6d15f5d14c8 100644
--- a/src/ui/camera.js
+++ b/src/ui/camera.js
@@ -1,12 +1,12 @@
 // @flow
 
-const util = require('../util/util');
-const interpolate = require('../style-spec/util/interpolate').number;
-const browser = require('../util/browser');
-const LngLat = require('../geo/lng_lat');
-const LngLatBounds = require('../geo/lng_lat_bounds');
-const Point = require('@mapbox/point-geometry');
-const {Event, Evented} = require('../util/evented');
+import { extend, deepEqual, warnOnce, clamp, wrap, ease as defaultEasing } from '../util/util';
+import { number as interpolate } from '../style-spec/util/interpolate';
+import browser from '../util/browser';
+import LngLat from '../geo/lng_lat';
+import LngLatBounds from '../geo/lng_lat_bounds';
+import Point from '@mapbox/point-geometry';
+import { Event, Evented } from '../util/evented';
 
 import type Transform from '../geo/transform';
 import type {LngLatLike} from '../geo/lng_lat';
@@ -127,7 +127,7 @@ class Camera extends Evented {
      */
     panBy(offset: PointLike, options?: AnimationOptions, eventData?: Object) {
         offset = Point.convert(offset).mult(-1);
-        return this.panTo(this.transform.center, util.extend({offset}, options), eventData);
+        return this.panTo(this.transform.center, extend({offset}, options), eventData);
     }
 
     /**
@@ -142,7 +142,7 @@ class Camera extends Evented {
      * @returns {Map} `this`
      */
     panTo(lnglat: LngLatLike, options?: AnimationOptions, eventData?: Object) {
-        return this.easeTo(util.extend({
+        return this.easeTo(extend({
             center: lnglat
         }, options), eventData);
     }
@@ -193,7 +193,7 @@ class Camera extends Evented {
      * @returns {Map} `this`
      */
     zoomTo(zoom: number, options: ? AnimationOptions, eventData?: Object) {
-        return this.easeTo(util.extend({
+        return this.easeTo(extend({
             zoom: zoom
         }, options), eventData);
     }
@@ -280,7 +280,7 @@ class Camera extends Evented {
      * @returns {Map} `this`
      */
     rotateTo(bearing: number, options?: AnimationOptions, eventData?: Object) {
-        return this.easeTo(util.extend({
+        return this.easeTo(extend({
             bearing: bearing
         }, options), eventData);
     }
@@ -296,7 +296,7 @@ class Camera extends Evented {
      * @returns {Map} `this`
      */
     resetNorth(options?: AnimationOptions, eventData?: Object) {
-        this.rotateTo(0, util.extend({duration: 1000}, options), eventData);
+        this.rotateTo(0, extend({duration: 1000}, options), eventData);
         return this;
     }
 
@@ -371,7 +371,7 @@ class Camera extends Evented {
      */
     fitBounds(bounds: LngLatBoundsLike, options?: AnimationOptions & CameraOptions, eventData?: Object) {
 
-        options = util.extend({
+        options = extend({
             padding: {
                 top: 0,
                 bottom: 0,
@@ -391,12 +391,14 @@ class Camera extends Evented {
                 left: p
             };
         }
-        if (!util.deepEqual(Object.keys(options.padding).sort((a, b) => {
+        if (!deepEqual(Object.keys(options.padding).sort((a, b) => {
             if (a < b) return -1;
             if (a > b) return 1;
             return 0;
         }), ["bottom", "left", "right", "top"])) {
-            util.warnOnce("options.padding must be a positive number, or an Object with keys 'bottom', 'left', 'right', 'top'");
+            warnOnce(
+                "options.padding must be a positive number, or an Object with keys 'bottom', 'left', 'right', 'top'"
+            );
             return this;
         }
 
@@ -420,7 +422,9 @@ class Camera extends Evented {
             scaleY = (tr.height - verticalPadding * 2 - Math.abs(offset.y) * 2) / size.y;
 
         if (scaleY < 0 || scaleX < 0) {
-            util.warnOnce('Map cannot fit within canvas with the given bounds, padding, and/or offset.');
+            warnOnce(
+                'Map cannot fit within canvas with the given bounds, padding, and/or offset.'
+            );
             return this;
         }
 
@@ -529,10 +533,10 @@ class Camera extends Evented {
     easeTo(options: CameraOptions & AnimationOptions & {delayEndEvents?: number}, eventData?: Object) {
         this.stop();
 
-        options = util.extend({
+        options = extend({
             offset: [0, 0],
             duration: 500,
-            easing: util.ease
+            easing: defaultEasing
         }, options);
 
         if (options.animate === false) options.duration = 0;
@@ -712,7 +716,7 @@ class Camera extends Evented {
      * @see [Slowly fly to a location](https://www.mapbox.com/mapbox-gl-js/example/flyto-options/)
      * @see [Fly to a location based on scroll position](https://www.mapbox.com/mapbox-gl-js/example/scroll-fly-to/)
      */
-    flyTo(options, eventData?: Object) {
+    flyTo(options: Object, eventData?: Object) {
         // This method implements an “optimal path” animation, as detailed in:
         //
         // Van Wijk, Jarke J.; Nuij, Wim A. A. “Smooth and efficient zooming and panning.” INFOVIS
@@ -723,11 +727,11 @@ class Camera extends Evented {
 
         this.stop();
 
-        options = util.extend({
+        options = extend({
             offset: [0, 0],
             speed: 1.2,
             curve: 1.42,
-            easing: util.ease
+            easing: defaultEasing
         }, options);
 
         const tr = this.transform,
@@ -735,7 +739,7 @@ class Camera extends Evented {
             startBearing = this.getBearing(),
             startPitch = this.getPitch();
 
-        const zoom = 'zoom' in options ? util.clamp(+options.zoom, tr.minZoom, tr.maxZoom) : startZoom;
+        const zoom = 'zoom' in options ? clamp(+options.zoom, tr.minZoom, tr.maxZoom) : startZoom;
         const bearing = 'bearing' in options ? this._normalizeBearing(options.bearing, startBearing) : startBearing;
         const pitch = 'pitch' in options ? +options.pitch : startPitch;
 
@@ -759,7 +763,7 @@ class Camera extends Evented {
             u1 = delta.mag();
 
         if ('minZoom' in options) {
-            const minZoom = util.clamp(Math.min(options.minZoom, startZoom, zoom), tr.minZoom, tr.maxZoom);
+            const minZoom = clamp(Math.min(options.minZoom, startZoom, zoom), tr.minZoom, tr.maxZoom);
             // w<sub>m</sub>: Maximum visible span, measured in pixels with respect to the initial
             // scale.
             const wMax = w0 / tr.zoomScale(minZoom - startZoom);
@@ -929,7 +933,7 @@ class Camera extends Evented {
 
     // convert bearing so that it's numerically close to the current one so that it interpolates properly
     _normalizeBearing(bearing: number, currentBearing: number) {
-        bearing = util.wrap(bearing, -180, 180);
+        bearing = wrap(bearing, -180, 180);
         const diff = Math.abs(bearing - currentBearing);
         if (Math.abs(bearing - 360 - currentBearing) < diff) bearing -= 360;
         if (Math.abs(bearing + 360 - currentBearing) < diff) bearing += 360;
@@ -949,4 +953,4 @@ class Camera extends Evented {
     }
 }
 
-module.exports = Camera;
+export default Camera;
diff --git a/src/ui/control/attribution_control.js b/src/ui/control/attribution_control.js
index 358618d6ac8..ddb69a9222c 100644
--- a/src/ui/control/attribution_control.js
+++ b/src/ui/control/attribution_control.js
@@ -1,8 +1,9 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
-const config = require('../../util/config');
+import DOM from '../../util/dom';
+
+import { bindAll } from '../../util/util';
+import config from '../../util/config';
 
 import type Map from '../map';
 
@@ -29,7 +30,7 @@ class AttributionControl {
     constructor(options: any) {
         this.options = options;
 
-        util.bindAll([
+        bindAll([
             '_updateEditLink',
             '_updateData',
             '_updateCompact'
@@ -151,4 +152,4 @@ class AttributionControl {
 
 }
 
-module.exports = AttributionControl;
+export default AttributionControl;
diff --git a/src/ui/control/fullscreen_control.js b/src/ui/control/fullscreen_control.js
index d6fb7bb1203..35198c1c57d 100644
--- a/src/ui/control/fullscreen_control.js
+++ b/src/ui/control/fullscreen_control.js
@@ -1,8 +1,9 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
-const window = require('../../util/window');
+import DOM from '../../util/dom';
+
+import { bindAll, warnOnce } from '../../util/util';
+import window from '../../util/window';
 
 import type Map from '../map';
 
@@ -26,7 +27,7 @@ class FullscreenControl {
 
     constructor() {
         this._fullscreen = false;
-        util.bindAll([
+        bindAll([
             '_onClickFullscreen',
             '_changeIcon'
         ], this);
@@ -50,7 +51,7 @@ class FullscreenControl {
             this._setupUI();
         } else {
             this._container.style.display = 'none';
-            util.warnOnce('This device does not support fullscreen mode.');
+            warnOnce('This device does not support fullscreen mode.');
         }
         return this._container;
     }
@@ -119,4 +120,4 @@ class FullscreenControl {
     }
 }
 
-module.exports = FullscreenControl;
+export default FullscreenControl;
diff --git a/src/ui/control/geolocate_control.js b/src/ui/control/geolocate_control.js
index 66519b1df21..d3822632ffe 100644
--- a/src/ui/control/geolocate_control.js
+++ b/src/ui/control/geolocate_control.js
@@ -1,12 +1,13 @@
 // @flow
 
-const {Event, Evented} = require('../../util/evented');
-const DOM = require('../../util/dom');
-const window = require('../../util/window');
-const util = require('../../util/util');
-const assert = require('assert');
-const LngLat = require('../../geo/lng_lat');
-const Marker = require('../marker');
+import { Event, Evented } from '../../util/evented';
+
+import DOM from '../../util/dom';
+import window from '../../util/window';
+import { extend, bindAll } from '../../util/util';
+import assert from 'assert';
+import LngLat from '../../geo/lng_lat';
+import Marker from '../marker';
 
 import type Map from '../map';
 
@@ -91,9 +92,9 @@ class GeolocateControl extends Evented {
 
     constructor(options: any) {
         super();
-        this.options = util.extend({}, defaultOptions, options);
+        this.options = extend({}, defaultOptions, options);
 
-        util.bindAll([
+        bindAll([
             '_onSuccess',
             '_onError',
             '_finish',
@@ -387,7 +388,7 @@ class GeolocateControl extends Evented {
     }
 }
 
-module.exports = GeolocateControl;
+export default GeolocateControl;
 
 /* Geolocate Control Watch States
  * This is the private state of the control.
diff --git a/src/ui/control/logo_control.js b/src/ui/control/logo_control.js
index 07b39ea6494..9bdeeec4e0d 100644
--- a/src/ui/control/logo_control.js
+++ b/src/ui/control/logo_control.js
@@ -1,7 +1,8 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
+import DOM from '../../util/dom';
+
+import { bindAll } from '../../util/util';
 
 import type Map from '../map';
 
@@ -19,7 +20,7 @@ class LogoControl {
     _container: HTMLElement;
 
     constructor() {
-        util.bindAll(['_updateLogo'], this);
+        bindAll(['_updateLogo'], this);
     }
 
     onAdd(map: Map) {
@@ -69,4 +70,4 @@ class LogoControl {
 }
 
 
-module.exports = LogoControl;
+export default LogoControl;
diff --git a/src/ui/control/navigation_control.js b/src/ui/control/navigation_control.js
index a09c55574af..96f63516296 100644
--- a/src/ui/control/navigation_control.js
+++ b/src/ui/control/navigation_control.js
@@ -1,8 +1,9 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
-const DragRotateHandler = require('../handler/drag_rotate');
+import DOM from '../../util/dom';
+
+import { extend, bindAll } from '../../util/util';
+import DragRotateHandler from '../handler/drag_rotate';
 
 import type Map from '../map';
 
@@ -35,7 +36,7 @@ class NavigationControl {
     _handler: DragRotateHandler;
 
     constructor(options: any) {
-        this.options = util.extend({}, defaultOptions, options);
+        this.options = extend({}, defaultOptions, options);
 
         this._container = DOM.create('div', 'mapboxgl-ctrl mapboxgl-ctrl-group');
         this._container.addEventListener('contextmenu', (e) => e.preventDefault());
@@ -45,7 +46,7 @@ class NavigationControl {
             this._zoomOutButton = this._createButton('mapboxgl-ctrl-icon mapboxgl-ctrl-zoom-out', 'Zoom Out', () => this._map.zoomOut());
         }
         if (this.options.showCompass) {
-            util.bindAll([
+            bindAll([
                 '_rotateCompassArrow'
             ], this);
             this._compass = this._createButton('mapboxgl-ctrl-icon mapboxgl-ctrl-compass', 'Reset North', () => this._map.resetNorth());
@@ -89,4 +90,4 @@ class NavigationControl {
     }
 }
 
-module.exports = NavigationControl;
+export default NavigationControl;
diff --git a/src/ui/control/scale_control.js b/src/ui/control/scale_control.js
index 4270124cb79..6302b70d31c 100644
--- a/src/ui/control/scale_control.js
+++ b/src/ui/control/scale_control.js
@@ -1,7 +1,8 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
+import DOM from '../../util/dom';
+
+import { extend, bindAll } from '../../util/util';
 
 import type Map from '../map';
 
@@ -32,9 +33,9 @@ class ScaleControl {
     options: any;
 
     constructor(options: any) {
-        this.options = util.extend({}, defaultOptions, options);
+        this.options = extend({}, defaultOptions, options);
 
-        util.bindAll([
+        bindAll([
             '_onMove',
             'setUnit'
         ], this);
@@ -75,7 +76,7 @@ class ScaleControl {
     }
 }
 
-module.exports = ScaleControl;
+export default ScaleControl;
 
 function updateScale(map, container, options) {
     // A horizontal scale is imagined to be present at center of the map
diff --git a/src/ui/events.js b/src/ui/events.js
index 82b4127dd95..2f628c2d26f 100644
--- a/src/ui/events.js
+++ b/src/ui/events.js
@@ -1,9 +1,10 @@
 // @flow
 
-const {Event} = require('../util/evented');
-const DOM = require('../util/dom');
-const Point = require('@mapbox/point-geometry');
-const util = require('../util/util');
+import { Event } from '../util/evented';
+
+import DOM from '../util/dom';
+import Point from '@mapbox/point-geometry';
+import { extend } from '../util/util';
 
 import type Map from './map';
 import type LngLat from '../geo/lng_lat';
@@ -79,7 +80,7 @@ class MapMouseEvent extends Event {
     constructor(type: string, map: Map, originalEvent: MouseEvent, data: Object = {}) {
         const point = DOM.mousePos(map.getCanvasContainer(), originalEvent);
         const lngLat = map.unproject(point);
-        super(type, util.extend({ point, lngLat, originalEvent }, data));
+        super(type, extend({ point, lngLat, originalEvent }, data));
         this._defaultPrevented = false;
     }
 }
@@ -785,8 +786,11 @@ export type MapEvent =
      */
     | 'style.load';
 
-module.exports = {
+const exported = {
     MapMouseEvent,
     MapTouchEvent,
     MapWheelEvent
 };
+
+export default exported;
+export { MapMouseEvent, MapTouchEvent, MapWheelEvent };
diff --git a/src/ui/handler/box_zoom.js b/src/ui/handler/box_zoom.js
index 90c968d679f..fb088abe92c 100644
--- a/src/ui/handler/box_zoom.js
+++ b/src/ui/handler/box_zoom.js
@@ -1,10 +1,11 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const LngLatBounds = require('../../geo/lng_lat_bounds');
-const util = require('../../util/util');
-const window = require('../../util/window');
-const {Event} = require('../../util/evented');
+import DOM from '../../util/dom';
+
+import LngLatBounds from '../../geo/lng_lat_bounds';
+import { bindAll } from '../../util/util';
+import window from '../../util/window';
+import { Event } from '../../util/evented';
 
 import type Map from '../map';
 
@@ -29,7 +30,7 @@ class BoxZoomHandler {
         this._el = map.getCanvasContainer();
         this._container = map.getContainer();
 
-        util.bindAll([
+        bindAll([
             '_onMouseMove',
             '_onMouseUp',
             '_onKeyDown'
@@ -161,4 +162,4 @@ class BoxZoomHandler {
     }
 }
 
-module.exports = BoxZoomHandler;
+export default BoxZoomHandler;
diff --git a/src/ui/handler/dblclick_zoom.js b/src/ui/handler/dblclick_zoom.js
index 6e5346d0ae5..1be4de8b931 100644
--- a/src/ui/handler/dblclick_zoom.js
+++ b/src/ui/handler/dblclick_zoom.js
@@ -1,6 +1,6 @@
 // @flow
 
-const util = require('../../util/util');
+import { bindAll } from '../../util/util';
 
 import type Map from '../map';
 import type {MapMouseEvent, MapTouchEvent} from '../events';
@@ -21,7 +21,7 @@ class DoubleClickZoomHandler {
     constructor(map: Map) {
         this._map = map;
 
-        util.bindAll([
+        bindAll([
             '_onDblClick',
             '_onZoomEnd'
         ], this);
@@ -102,4 +102,4 @@ class DoubleClickZoomHandler {
     }
 }
 
-module.exports = DoubleClickZoomHandler;
+export default DoubleClickZoomHandler;
diff --git a/src/ui/handler/drag_pan.js b/src/ui/handler/drag_pan.js
index 33f92aac707..4cb59dc8104 100644
--- a/src/ui/handler/drag_pan.js
+++ b/src/ui/handler/drag_pan.js
@@ -1,18 +1,18 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
-const window = require('../../util/window');
-const browser = require('../../util/browser');
-const {Event} = require('../../util/evented');
-const assert = require('assert');
+import DOM from '../../util/dom';
+import { bezier, bindAll } from '../../util/util';
+import window from '../../util/window';
+import browser from '../../util/browser';
+import { Event } from '../../util/evented';
+import assert from 'assert';
 
 import type Map from '../map';
 import type Point from '@mapbox/point-geometry';
 import type Transform from '../../geo/transform';
 
 const inertiaLinearity = 0.3,
-    inertiaEasing = util.bezier(0, 0, inertiaLinearity, 1),
+    inertiaEasing = bezier(0, 0, inertiaLinearity, 1),
     inertiaMaxSpeed = 1400, // px/s
     inertiaDeceleration = 2500; // px/s^2
 
@@ -37,7 +37,7 @@ class DragPanHandler {
         this._el = map.getCanvasContainer();
         this._state = 'disabled';
 
-        util.bindAll([
+        bindAll([
             '_onMove',
             '_onMouseUp',
             '_onTouchEnd',
@@ -301,4 +301,4 @@ class DragPanHandler {
     }
 }
 
-module.exports = DragPanHandler;
+export default DragPanHandler;
diff --git a/src/ui/handler/drag_rotate.js b/src/ui/handler/drag_rotate.js
index b8035791900..f23187a6231 100644
--- a/src/ui/handler/drag_rotate.js
+++ b/src/ui/handler/drag_rotate.js
@@ -1,18 +1,19 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
-const window = require('../../util/window');
-const browser = require('../../util/browser');
-const {Event} = require('../../util/evented');
-const assert = require('assert');
+import DOM from '../../util/dom';
+
+import { bezier, bindAll } from '../../util/util';
+import window from '../../util/window';
+import browser from '../../util/browser';
+import { Event } from '../../util/evented';
+import assert from 'assert';
 
 import type Map from '../map';
 import type Point from '@mapbox/point-geometry';
 import type Transform from '../../geo/transform';
 
 const inertiaLinearity = 0.25,
-    inertiaEasing = util.bezier(0, 0, inertiaLinearity, 1),
+    inertiaEasing = bezier(0, 0, inertiaLinearity, 1),
     inertiaMaxSpeed = 180, // deg/s
     inertiaDeceleration = 720; // deg/s^2
 
@@ -56,7 +57,7 @@ class DragRotateHandler {
         this._bearingSnap = options.bearingSnap || 0;
         this._pitchWithRotate = options.pitchWithRotate !== false;
 
-        util.bindAll([
+        bindAll([
             '_onMouseMove',
             '_onMouseUp',
             '_onBlur',
@@ -324,4 +325,4 @@ class DragRotateHandler {
     }
 }
 
-module.exports = DragRotateHandler;
+export default DragRotateHandler;
diff --git a/src/ui/handler/keyboard.js b/src/ui/handler/keyboard.js
index 792746c7b4c..b103746a271 100644
--- a/src/ui/handler/keyboard.js
+++ b/src/ui/handler/keyboard.js
@@ -1,6 +1,6 @@
 // @flow
 
-const util = require('../../util/util');
+import { bindAll } from '../../util/util';
 
 import type Map from '../map';
 
@@ -34,7 +34,7 @@ class KeyboardHandler {
         this._map = map;
         this._el = map.getCanvasContainer();
 
-        util.bindAll([
+        bindAll([
             '_onKeyDown'
         ], this);
     }
@@ -158,4 +158,4 @@ function easeOut(t) {
     return t * (2 - t);
 }
 
-module.exports = KeyboardHandler;
+export default KeyboardHandler;
diff --git a/src/ui/handler/scroll_zoom.js b/src/ui/handler/scroll_zoom.js
index d776e74dc95..cdd322e5af8 100644
--- a/src/ui/handler/scroll_zoom.js
+++ b/src/ui/handler/scroll_zoom.js
@@ -1,12 +1,13 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
-const browser = require('../../util/browser');
-const window = require('../../util/window');
-const interpolate = require('../../style-spec/util/interpolate').number;
-const LngLat = require('../../geo/lng_lat');
-const {Event} = require('../../util/evented');
+import DOM from '../../util/dom';
+
+import { ease as _ease, bindAll, bezier } from '../../util/util';
+import browser from '../../util/browser';
+import window from '../../util/window';
+import { number as interpolate } from '../../style-spec/util/interpolate';
+import LngLat from '../../geo/lng_lat';
+import { Event } from '../../util/evented';
 
 import type Map from '../map';
 import type Point from '@mapbox/point-geometry';
@@ -57,7 +58,7 @@ class ScrollZoomHandler {
 
         this._delta = 0;
 
-        util.bindAll([
+        bindAll([
             '_onWheel',
             '_onTimeout',
             '_onScrollFrame',
@@ -242,7 +243,7 @@ class ScrollZoomHandler {
     }
 
     _smoothOutEasing(duration: number) {
-        let easing = util.ease;
+        let easing = _ease;
 
         if (this._prevEase) {
             const ease = this._prevEase,
@@ -253,7 +254,7 @@ class ScrollZoomHandler {
                 x = 0.27 / Math.sqrt(speed * speed + 0.0001) * 0.01,
                 y = Math.sqrt(0.27 * 0.27 - x * x);
 
-            easing = util.bezier(x, y, 0.25, 1);
+            easing = bezier(x, y, 0.25, 1);
         }
 
         this._prevEase = {
@@ -266,4 +267,4 @@ class ScrollZoomHandler {
     }
 }
 
-module.exports = ScrollZoomHandler;
+export default ScrollZoomHandler;
diff --git a/src/ui/handler/touch_zoom_rotate.js b/src/ui/handler/touch_zoom_rotate.js
index 65ebf40df46..20d83062a8a 100644
--- a/src/ui/handler/touch_zoom_rotate.js
+++ b/src/ui/handler/touch_zoom_rotate.js
@@ -1,17 +1,18 @@
 // @flow
 
-const DOM = require('../../util/dom');
-const util = require('../../util/util');
-const window = require('../../util/window');
-const browser = require('../../util/browser');
-const {Event} = require('../../util/evented');
+import DOM from '../../util/dom';
+
+import { bezier, bindAll } from '../../util/util';
+import window from '../../util/window';
+import browser from '../../util/browser';
+import { Event } from '../../util/evented';
 
 import type Map from '../map';
 import type Point from '@mapbox/point-geometry';
 import type Transform from '../../geo/transform';
 
 const inertiaLinearity = 0.15,
-    inertiaEasing = util.bezier(0, 0, inertiaLinearity, 1),
+    inertiaEasing = bezier(0, 0, inertiaLinearity, 1),
     inertiaDeceleration = 12, // scale / s^2
     inertiaMaxSpeed = 2.5, // scale / s
     significantScaleThreshold = 0.15,
@@ -41,7 +42,7 @@ class TouchZoomRotateHandler {
         this._map = map;
         this._el = map.getCanvasContainer();
 
-        util.bindAll([
+        bindAll([
             '_onMove',
             '_onEnd',
             '_onTouchFrame'
@@ -270,4 +271,4 @@ class TouchZoomRotateHandler {
     }
 }
 
-module.exports = TouchZoomRotateHandler;
+export default TouchZoomRotateHandler;
diff --git a/src/ui/hash.js b/src/ui/hash.js
index 4bc5639fbdf..66d44893de7 100644
--- a/src/ui/hash.js
+++ b/src/ui/hash.js
@@ -1,8 +1,8 @@
 // @flow
 
-const util = require('../util/util');
-const window = require('../util/window');
-const throttle = require('../util/throttle');
+import { bindAll } from '../util/util';
+import window from '../util/window';
+import throttle from '../util/throttle';
 
 import type Map from './map';
 
@@ -17,7 +17,7 @@ class Hash {
     _updateHash: () => TimeoutID;
 
     constructor() {
-        util.bindAll([
+        bindAll([
             '_onHashChange',
             '_updateHash'
         ], this);
@@ -96,4 +96,4 @@ class Hash {
 
 }
 
-module.exports = Hash;
+export default Hash;
diff --git a/src/ui/map.js b/src/ui/map.js
index c69b34aa822..99492059c72 100755
--- a/src/ui/map.js
+++ b/src/ui/map.js
@@ -1,31 +1,28 @@
 // @flow
 
-const util = require('../util/util');
-const browser = require('../util/browser');
-const window = require('../util/window');
-const {HTMLImageElement, HTMLElement} = require('../util/window');
-const DOM = require('../util/dom');
-const ajax = require('../util/ajax');
-
-const Style = require('../style/style');
-const EvaluationParameters = require('../style/evaluation_parameters');
-const Painter = require('../render/painter');
-
-const Transform = require('../geo/transform');
-const Hash = require('./hash');
-
-const bindHandlers = require('./bind_handlers');
-
-const Camera = require('./camera');
-const LngLat = require('../geo/lng_lat');
-const LngLatBounds = require('../geo/lng_lat_bounds');
-const Point = require('@mapbox/point-geometry');
-const AttributionControl = require('./control/attribution_control');
-const LogoControl = require('./control/logo_control');
-const isSupported = require('@mapbox/mapbox-gl-supported');
-const {RGBAImage} = require('../util/image');
-const {Event, ErrorEvent} = require('../util/evented');
-const {MapMouseEvent} = require('./events');
+import { extend, bindAll, warnOnce } from '../util/util';
+
+import browser from '../util/browser';
+import window from '../util/window';
+const { HTMLImageElement, HTMLElement } = window;
+import DOM from '../util/dom';
+import { getImage, ResourceType } from '../util/ajax';
+import Style from '../style/style';
+import EvaluationParameters from '../style/evaluation_parameters';
+import Painter from '../render/painter';
+import Transform from '../geo/transform';
+import Hash from './hash';
+import bindHandlers from './bind_handlers';
+import Camera from './camera';
+import LngLat from '../geo/lng_lat';
+import LngLatBounds from '../geo/lng_lat_bounds';
+import Point from '@mapbox/point-geometry';
+import AttributionControl from './control/attribution_control';
+import LogoControl from './control/logo_control';
+import isSupported from '@mapbox/mapbox-gl-supported';
+import { RGBAImage } from '../util/image';
+import { Event, ErrorEvent } from '../util/evented';
+import { MapMouseEvent } from './events';
 
 import type {LngLatLike} from '../geo/lng_lat';
 import type {LngLatBoundsLike} from '../geo/lng_lat_bounds';
@@ -52,7 +49,7 @@ type IControl = {
 }
 /* eslint-enable no-use-before-define */
 
-type ResourceTypeEnum = $Keys<typeof ajax.ResourceType>;
+type ResourceTypeEnum = $Keys<typeof ResourceType>;
 export type RequestTransformFunction = (url: string, resourceType?: ResourceTypeEnum) => RequestParameters;
 
 type MapOptions = {
@@ -256,7 +253,7 @@ class Map extends Camera {
     touchZoomRotate: TouchZoomRotateHandler;
 
     constructor(options: MapOptions) {
-        options = util.extend({}, defaultOptions, options);
+        options = extend({}, defaultOptions, options);
 
         if (options.minZoom != null && options.maxZoom != null && options.minZoom > options.maxZoom) {
             throw new Error(`maxZoom must be greater than minZoom`);
@@ -296,7 +293,7 @@ class Map extends Camera {
             this.setMaxBounds(options.maxBounds);
         }
 
-        util.bindAll([
+        bindAll([
             '_onWindowOnline',
             '_onWindowResize',
             '_contextLost',
@@ -946,7 +943,9 @@ class Map extends Camera {
                 }
                 return this;
             } catch (e) {
-                util.warnOnce(`Unable to perform style diff: ${e.message || e.error || e}.  Rebuilding the style from scratch.`);
+                warnOnce(
+                    `Unable to perform style diff: ${e.message || e.error || e}.  Rebuilding the style from scratch.`
+                );
             }
         }
 
@@ -990,7 +989,7 @@ class Map extends Camera {
      * @returns {boolean} A Boolean indicating whether the style is fully loaded.
      */
     isStyleLoaded() {
-        if (!this.style) return util.warnOnce('There is no style added to the map.');
+        if (!this.style) return warnOnce('There is no style added to the map.');
         return this.style.loaded();
     }
 
@@ -1148,7 +1147,7 @@ class Map extends Camera {
      * @see [Add an icon to the map](https://www.mapbox.com/mapbox-gl-js/example/add-image/)
      */
     loadImage(url: string, callback: Function) {
-        ajax.getImage(this._transformRequest(url, ajax.ResourceType.Image), callback);
+        getImage(this._transformRequest(url, ResourceType.Image), callback);
     }
 
     /**
@@ -1429,7 +1428,7 @@ class Map extends Camera {
     }
 
     _setupPainter() {
-        const attributes = util.extend({
+        const attributes = extend({
             failIfMajorPerformanceCaveat: this._failIfMajorPerformanceCaveat,
             preserveDrawingBuffer: this._preserveDrawingBuffer
         }, isSupported.webGLContextAttributes);
@@ -1710,7 +1709,7 @@ class Map extends Camera {
     }
 }
 
-module.exports = Map;
+export default Map;
 
 function removeNode(node) {
     if (node.parentNode) {
diff --git a/src/ui/marker.js b/src/ui/marker.js
index 5ff9e804453..5652f105910 100644
--- a/src/ui/marker.js
+++ b/src/ui/marker.js
@@ -1,10 +1,11 @@
 // @flow
 
-const DOM = require('../util/dom');
-const LngLat = require('../geo/lng_lat');
-const Point = require('@mapbox/point-geometry');
-const smartWrap = require('../util/smart_wrap');
-const {bindAll} = require('../util/util');
+import DOM from '../util/dom';
+
+import LngLat from '../geo/lng_lat';
+import Point from '@mapbox/point-geometry';
+import smartWrap from '../util/smart_wrap';
+import { bindAll } from '../util/util';
 
 import type Map from './map';
 import type Popup from './popup';
@@ -318,4 +319,4 @@ class Marker {
     }
 }
 
-module.exports = Marker;
+export default Marker;
diff --git a/src/ui/popup.js b/src/ui/popup.js
index 1af5dd06727..23ca03b6fed 100644
--- a/src/ui/popup.js
+++ b/src/ui/popup.js
@@ -1,12 +1,12 @@
 // @flow
 
-const util = require('../util/util');
-const {Event, Evented} = require('../util/evented');
-const DOM = require('../util/dom');
-const LngLat = require('../geo/lng_lat');
-const Point = require('@mapbox/point-geometry');
-const window = require('../util/window');
-const smartWrap = require('../util/smart_wrap');
+import { extend, bindAll } from '../util/util';
+import { Event, Evented } from '../util/evented';
+import DOM from '../util/dom';
+import LngLat from '../geo/lng_lat';
+import Point from '@mapbox/point-geometry';
+import window from '../util/window';
+import smartWrap from '../util/smart_wrap';
 
 import type Map from './map';
 import type {LngLatLike} from '../geo/lng_lat';
@@ -78,8 +78,8 @@ class Popup extends Evented {
 
     constructor(options: PopupOptions) {
         super();
-        this.options = util.extend(Object.create(defaultOptions), options);
-        util.bindAll(['_update', '_onClickClose'], this);
+        this.options = extend(Object.create(defaultOptions), options);
+        bindAll(['_update', '_onClickClose'], this);
     }
 
     /**
@@ -378,4 +378,4 @@ function normalizeOffset(offset: ?Offset) {
     }
 }
 
-module.exports = Popup;
+export default Popup;
diff --git a/src/util/actor.js b/src/util/actor.js
index e4cd66a2a96..4927a82d14d 100644
--- a/src/util/actor.js
+++ b/src/util/actor.js
@@ -1,7 +1,7 @@
 // @flow
 
-const util = require('./util');
-const {serialize, deserialize} = require('./web_worker_transfer');
+import { bindAll } from './util';
+import { serialize, deserialize } from './web_worker_transfer';
 
 import type {Transferable} from '../types/transferable';
 
@@ -30,7 +30,7 @@ class Actor {
         this.mapId = mapId;
         this.callbacks = {};
         this.callbackID = 0;
-        util.bindAll(['receive'], this);
+        bindAll(['receive'], this);
         this.target.addEventListener('message', this.receive, false);
     }
 
@@ -100,4 +100,4 @@ class Actor {
     }
 }
 
-module.exports = Actor;
+export default Actor;
diff --git a/src/util/ajax.js b/src/util/ajax.js
index eb52d025e00..554ebb3c001 100644
--- a/src/util/ajax.js
+++ b/src/util/ajax.js
@@ -1,6 +1,6 @@
 // @flow
 
-const window = require('./window');
+import window from './window';
 
 import type { Callback } from '../types/callback';
 
@@ -20,7 +20,7 @@ const ResourceType = {
     SpriteJSON: 'SpriteJSON',
     Image: 'Image'
 };
-exports.ResourceType = ResourceType;
+export { ResourceType };
 
 if (typeof Object.freeze == 'function') {
     Object.freeze(ResourceType);
@@ -69,7 +69,7 @@ function makeRequest(requestParameters: RequestParameters): XMLHttpRequest {
     return xhr;
 }
 
-exports.getJSON = function(requestParameters: RequestParameters, callback: Callback<mixed>) {
+export const getJSON = function(requestParameters: RequestParameters, callback: Callback<mixed>) {
     const xhr = makeRequest(requestParameters);
     xhr.setRequestHeader('Accept', 'application/json');
     xhr.onerror = function() {
@@ -96,7 +96,7 @@ exports.getJSON = function(requestParameters: RequestParameters, callback: Callb
     return xhr;
 };
 
-exports.getArrayBuffer = function(requestParameters: RequestParameters, callback: Callback<{data: ArrayBuffer, cacheControl: ?string, expires: ?string}>) {
+export const getArrayBuffer = function(requestParameters: RequestParameters, callback: Callback<{data: ArrayBuffer, cacheControl: ?string, expires: ?string}>) {
     const xhr = makeRequest(requestParameters);
     xhr.responseType = 'arraybuffer';
     xhr.onerror = function() {
@@ -129,10 +129,10 @@ function sameOrigin(url) {
 
 const transparentPngUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYV2NgAAIAAAUAAarVyFEAAAAASUVORK5CYII=';
 
-exports.getImage = function(requestParameters: RequestParameters, callback: Callback<HTMLImageElement>) {
+export const getImage = function(requestParameters: RequestParameters, callback: Callback<HTMLImageElement>) {
     // request the image with XHR to work around caching issues
     // see https://github.com/mapbox/mapbox-gl-js/issues/1470
-    return exports.getArrayBuffer(requestParameters, (err, imgData) => {
+    return getArrayBuffer(requestParameters, (err, imgData) => {
         if (err) {
             callback(err);
         } else if (imgData) {
@@ -150,7 +150,7 @@ exports.getImage = function(requestParameters: RequestParameters, callback: Call
     });
 };
 
-exports.getVideo = function(urls: Array<string>, callback: Callback<HTMLVideoElement>) {
+export const getVideo = function(urls: Array<string>, callback: Callback<HTMLVideoElement>) {
     const video: HTMLVideoElement = window.document.createElement('video');
     video.onloadstart = function() {
         callback(null, video);
diff --git a/src/util/browser.js b/src/util/browser.js
index 7ff44c36499..cd099661d1c 100755
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -1,12 +1,12 @@
 // @flow
 
-const window = require('./window');
+import window from './window';
 
 const now = window.performance && window.performance.now ?
     window.performance.now.bind(window.performance) :
     Date.now.bind(Date);
 
-const frame = window.requestAnimationFrame ||
+const raf = window.requestAnimationFrame ||
     window.mozRequestAnimationFrame ||
     window.webkitRequestAnimationFrame ||
     window.msRequestAnimationFrame;
@@ -19,7 +19,7 @@ const cancel = window.cancelAnimationFrame ||
 /**
  * @private
  */
-module.exports = {
+const exported = {
     /**
      * Provides a function that outputs milliseconds: either performance.now()
      * or a fallback to Date.now()
@@ -27,7 +27,7 @@ module.exports = {
     now,
 
     frame(fn: Function) {
-        return frame(fn);
+        return raf(fn);
     },
 
     cancelFrame(id: number) {
@@ -47,14 +47,16 @@ module.exports = {
     },
 
     hardwareConcurrency: window.navigator.hardwareConcurrency || 4,
-
     get devicePixelRatio() { return window.devicePixelRatio; },
-
     supportsWebp: false
 };
 
-const webpImgTest = window.document.createElement('img');
-webpImgTest.onload = function() {
-    module.exports.supportsWebp = true;
-};
-webpImgTest.src = 'data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAQAAAAfQ//73v/+BiOh/AAA=';
+export default exported;
+
+if (window.document) {
+    const webpImgTest = window.document.createElement('img');
+    webpImgTest.onload = function() {
+        exported.supportsWebp = true;
+    };
+    webpImgTest.src = 'data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAQAAAAfQ//73v/+BiOh/AAA=';
+}
diff --git a/src/util/browser/web_worker.js b/src/util/browser/web_worker.js
index 04243febb60..3d1314da10c 100644
--- a/src/util/browser/web_worker.js
+++ b/src/util/browser/web_worker.js
@@ -1,11 +1,10 @@
 // @flow
 
-const WebWorkify = require('webworkify');
-const window = require('../window');
-const workerURL = window.URL.createObjectURL(new WebWorkify(require('../../source/worker'), {bare: true}));
+import window from '../window';
+import mapboxgl from '../../';
 
 import type {WorkerInterface} from '../web_worker';
 
-module.exports = function (): WorkerInterface {
-    return (new window.Worker(workerURL): any);
-};
+export default function (): WorkerInterface {
+    return (new window.Worker(mapboxgl.workerUrl): any);
+}
diff --git a/src/util/browser/window.js b/src/util/browser/window.js
index 60ef0c79b25..7f78d94d43e 100644
--- a/src/util/browser/window.js
+++ b/src/util/browser/window.js
@@ -1,4 +1,3 @@
 // @flow
-
 /* eslint-env browser */
-module.exports = (self: Window);
+export default (self: Window);
diff --git a/src/util/classify_rings.js b/src/util/classify_rings.js
index 79345d9568d..55ce3ba4404 100644
--- a/src/util/classify_rings.js
+++ b/src/util/classify_rings.js
@@ -1,12 +1,13 @@
 // @flow
 
-const quickselect = require('quickselect');
-const calculateSignedArea = require('./util').calculateSignedArea;
+import quickselect from 'quickselect';
+
+import { calculateSignedArea } from './util';
 
 import type Point from '@mapbox/point-geometry';
 
 // classifies an array of rings into polygons with outer rings and holes
-module.exports = function classifyRings(rings: Array<Array<Point>>, maxRings: number) {
+export default function classifyRings(rings: Array<Array<Point>>, maxRings: number) {
     const len = rings.length;
 
     if (len <= 1) return [rings];
@@ -44,7 +45,7 @@ module.exports = function classifyRings(rings: Array<Array<Point>>, maxRings: nu
     }
 
     return polygons;
-};
+}
 
 function compareAreas(a, b) {
     return b.area - a.area;
diff --git a/src/util/config.js b/src/util/config.js
index 55b5e29b9bf..c8511362f98 100644
--- a/src/util/config.js
+++ b/src/util/config.js
@@ -12,4 +12,4 @@ const config: Config = {
     ACCESS_TOKEN: null
 };
 
-module.exports = config;
+export default config;
diff --git a/src/util/dictionary_coder.js b/src/util/dictionary_coder.js
index e80a2787a3a..1b8302f8e29 100644
--- a/src/util/dictionary_coder.js
+++ b/src/util/dictionary_coder.js
@@ -1,6 +1,6 @@
 // @flow
 
-const assert = require('assert');
+import assert from 'assert';
 
 class DictionaryCoder {
     _stringToNumber: { [string]: number };
@@ -27,4 +27,4 @@ class DictionaryCoder {
     }
 }
 
-module.exports = DictionaryCoder;
+export default DictionaryCoder;
diff --git a/src/util/dispatcher.js b/src/util/dispatcher.js
index 26564e299ee..b2f3b9b0adc 100644
--- a/src/util/dispatcher.js
+++ b/src/util/dispatcher.js
@@ -1,7 +1,7 @@
 // @flow
 
-const util = require('./util');
-const Actor = require('./actor');
+import { uniqueId, asyncAll } from './util';
+import Actor from './actor';
 
 import type WorkerPool from './worker_pool';
 
@@ -17,15 +17,18 @@ class Dispatcher {
     currentActor: number;
     id: number;
 
+    // exposed to allow stubbing in unit tests
+    static Actor: Class<Actor>;
+
     constructor(workerPool: WorkerPool, parent: any) {
         this.workerPool = workerPool;
         this.actors = [];
         this.currentActor = 0;
-        this.id = util.uniqueId();
+        this.id = uniqueId();
         const workers = this.workerPool.acquire(this.id);
         for (let i = 0; i < workers.length; i++) {
             const worker = workers[i];
-            const actor = new Actor(worker, parent, this.id);
+            const actor = new Dispatcher.Actor(worker, parent, this.id);
             actor.name = `Worker ${i}`;
             this.actors.push(actor);
         }
@@ -36,7 +39,7 @@ class Dispatcher {
      */
     broadcast(type: string, data: mixed, cb?: Function) {
         cb = cb || function () {};
-        util.asyncAll(this.actors, (actor, done) => {
+        asyncAll(this.actors, (actor, done) => {
             actor.send(type, data, done);
         }, cb);
     }
@@ -63,4 +66,6 @@ class Dispatcher {
     }
 }
 
-module.exports = Dispatcher;
+Dispatcher.Actor = Actor;
+
+export default Dispatcher;
diff --git a/src/util/dom.js b/src/util/dom.js
index affa74c6010..fa75bca9649 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -1,24 +1,31 @@
 // @flow
 
-const Point = require('@mapbox/point-geometry');
-const window = require('./window');
-const assert = require('assert');
+import Point from '@mapbox/point-geometry';
 
-exports.create = function (tagName: *, className?: string, container?: HTMLElement) {
+import window from './window';
+import assert from 'assert';
+
+const DOM = {};
+export default DOM;
+
+DOM.create = function (tagName: *, className?: string, container?: HTMLElement) {
     const el = window.document.createElement(tagName);
     if (className) el.className = className;
     if (container) container.appendChild(el);
     return el;
 };
 
-exports.createNS = function (namespaceURI: string, tagName: string) {
+DOM.createNS = function (namespaceURI: string, tagName: string) {
     const el = window.document.createElementNS(namespaceURI, tagName);
     return el;
 };
 
-const docStyle = (window.document.documentElement: any).style;
+const docStyle = window.document ?
+    (window.document.documentElement: any).style :
+    null;
 
 function testProp(props) {
+    if (!docStyle) return null;
     for (let i = 0; i < props.length; i++) {
         if (props[i] in docStyle) {
             return props[i];
@@ -29,20 +36,23 @@ function testProp(props) {
 
 const selectProp = testProp(['userSelect', 'MozUserSelect', 'WebkitUserSelect', 'msUserSelect']);
 let userSelect;
-exports.disableDrag = function () {
-    if (selectProp) {
+
+DOM.disableDrag = function () {
+    if (docStyle && selectProp) {
         userSelect = docStyle[selectProp];
         docStyle[selectProp] = 'none';
     }
 };
-exports.enableDrag = function () {
-    if (selectProp) {
+
+DOM.enableDrag = function () {
+    if (docStyle && selectProp) {
         docStyle[selectProp] = userSelect;
     }
 };
 
 const transformProp = testProp(['transform', 'WebkitTransform']);
-exports.setTransform = function(el: HTMLElement, value: string) {
+
+DOM.setTransform = function(el: HTMLElement, value: string) {
     (el.style: any)[transformProp] = value;
 };
 
@@ -61,7 +71,7 @@ try {
     passiveSupported = false;
 }
 
-exports.addEventListener = function(target: *, type: *, callback: *, options: {passive?: boolean, capture?: boolean} = {}) {
+DOM.addEventListener = function(target: *, type: *, callback: *, options: {passive?: boolean, capture?: boolean} = {}) {
     if ('passive' in options && passiveSupported) {
         target.addEventListener(type, callback, (options: any));
     } else {
@@ -69,7 +79,7 @@ exports.addEventListener = function(target: *, type: *, callback: *, options: {p
     }
 };
 
-exports.removeEventListener = function(target: *, type: *, callback: *, options: {passive?: boolean, capture?: boolean} = {}) {
+DOM.removeEventListener = function(target: *, type: *, callback: *, options: {passive?: boolean, capture?: boolean} = {}) {
     if ('passive' in options && passiveSupported) {
         target.removeEventListener(type, callback, (options: any));
     } else {
@@ -84,14 +94,14 @@ const suppressClick: MouseEventListener = function (e) {
     window.removeEventListener('click', suppressClick, true);
 };
 
-exports.suppressClick = function() {
+DOM.suppressClick = function() {
     window.addEventListener('click', suppressClick, true);
     window.setTimeout(() => {
         window.removeEventListener('click', suppressClick, true);
     }, 0);
 };
 
-exports.mousePos = function (el: HTMLElement, e: any) {
+DOM.mousePos = function (el: HTMLElement, e: any) {
     const rect = el.getBoundingClientRect();
     e = e.touches ? e.touches[0] : e;
     return new Point(
@@ -100,7 +110,7 @@ exports.mousePos = function (el: HTMLElement, e: any) {
     );
 };
 
-exports.touchPos = function (el: HTMLElement, e: any) {
+DOM.touchPos = function (el: HTMLElement, e: any) {
     const rect = el.getBoundingClientRect(),
         points = [];
     const touches = (e.type === 'touchend') ? e.changedTouches : e.touches;
@@ -113,7 +123,7 @@ exports.touchPos = function (el: HTMLElement, e: any) {
     return points;
 };
 
-exports.mouseButton = function (e: MouseEvent) {
+DOM.mouseButton = function (e: MouseEvent) {
     assert(e.type === 'mousedown' || e.type === 'mouseup');
     if (typeof window.InstallTrigger !== 'undefined' && e.button === 2 && e.ctrlKey &&
         window.navigator.platform.toUpperCase().indexOf('MAC') >= 0) {
@@ -125,7 +135,7 @@ exports.mouseButton = function (e: MouseEvent) {
     return e.button;
 };
 
-exports.remove = function(node: HTMLElement) {
+DOM.remove = function(node: HTMLElement) {
     if (node.parentNode) {
         node.parentNode.removeChild(node);
     }
diff --git a/src/util/evented.js b/src/util/evented.js
index ea375889cde..a93176b1f1e 100644
--- a/src/util/evented.js
+++ b/src/util/evented.js
@@ -1,6 +1,6 @@
 // @flow
 
-const util = require('./util');
+import { extend, endsWith } from './util';
 
 type Listener = (Object) => any;
 type Listeners = { [string]: Array<Listener> };
@@ -23,14 +23,14 @@ class Event {
     +type: string;
 
     constructor(type: string, data: Object = {}) {
-        util.extend(this, data);
+        extend(this, data);
         this.type = type;
     }
 }
 
 class ErrorEvent extends Event {
     constructor(error: Error, data: Object = {}) {
-        super('error', util.extend({error}, data));
+        super('error', extend({error}, data));
     }
 }
 
@@ -111,13 +111,16 @@ class Evented {
 
             const parent = this._eventedParent;
             if (parent) {
-                util.extend(event, typeof this._eventedParentData === 'function' ? this._eventedParentData() : this._eventedParentData);
+                extend(
+                    event,
+                    typeof this._eventedParentData === 'function' ? this._eventedParentData() : this._eventedParentData
+                );
                 parent.fire(event);
             }
 
         // To ensure that no error events are dropped, print them to the
         // console if they have no listeners.
-        } else if (util.endsWith(type, 'error')) {
+        } else if (endsWith(type, 'error')) {
             console.error((event && event.error) || event || 'Empty error event');
         }
 
@@ -154,8 +157,11 @@ class Evented {
     }
 }
 
-module.exports = {
+const exported = {
     Event,
     ErrorEvent,
     Evented
 };
+
+export default exported;
+export { Event, ErrorEvent, Evented };
diff --git a/src/util/find_pole_of_inaccessibility.js b/src/util/find_pole_of_inaccessibility.js
index f2f758d6a2b..8980189a2bb 100644
--- a/src/util/find_pole_of_inaccessibility.js
+++ b/src/util/find_pole_of_inaccessibility.js
@@ -1,8 +1,9 @@
 // @flow
 
-const Queue = require('tinyqueue');
-const Point = require('@mapbox/point-geometry');
-const distToSegmentSquared = require('./intersection_tests').distToSegmentSquared;
+import Queue from 'tinyqueue';
+
+import Point from '@mapbox/point-geometry';
+import { distToSegmentSquared } from './intersection_tests';
 
 /**
  * Finds an approximation of a polygon's Pole Of Inaccessibiliy https://en.wikipedia.org/wiki/Pole_of_inaccessibility
@@ -14,7 +15,7 @@ const distToSegmentSquared = require('./intersection_tests').distToSegmentSquare
  * @returns Pole of Inaccessibiliy.
  * @private
  */
-module.exports = function (polygonRings: Array<Array<Point>>, precision?: number = 1, debug?: boolean = false): Point {
+export default function (polygonRings: Array<Array<Point>>, precision?: number = 1, debug?: boolean = false): Point {
     // find the bounding box of the outer ring
     let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
     const outerRing = polygonRings[0];
@@ -75,7 +76,7 @@ module.exports = function (polygonRings: Array<Array<Point>>, precision?: number
     }
 
     return bestCell.p;
-};
+}
 
 function compareMax(a, b) {
     return b.max - a.max;
diff --git a/src/util/global_worker_pool.js b/src/util/global_worker_pool.js
index 8ebf4b9f430..9552b58c798 100644
--- a/src/util/global_worker_pool.js
+++ b/src/util/global_worker_pool.js
@@ -1,6 +1,6 @@
 // @flow
 
-const WorkerPool = require('./worker_pool');
+import WorkerPool from './worker_pool';
 
 let globalWorkerPool;
 
@@ -9,9 +9,9 @@ let globalWorkerPool;
  * to be shared across each Map
  * @private
  */
-module.exports = function getGlobalWorkerPool () {
+export default function getGlobalWorkerPool () {
     if (!globalWorkerPool) {
         globalWorkerPool = new WorkerPool();
     }
     return globalWorkerPool;
-};
+}
diff --git a/src/util/image.js b/src/util/image.js
index 5f7eeeaa607..cbce58ac805 100644
--- a/src/util/image.js
+++ b/src/util/image.js
@@ -1,7 +1,8 @@
 // @flow
 
-const assert = require('assert');
-const {register} = require('./web_worker_transfer');
+import assert from 'assert';
+
+import { register } from './web_worker_transfer';
 
 export type Size = {
     width: number,
@@ -126,7 +127,10 @@ class RGBAImage {
 register('AlphaImage', AlphaImage);
 register('RGBAImage', RGBAImage);
 
-module.exports = {
+const exported = {
     AlphaImage,
     RGBAImage
 };
+
+export default exported;
+export { AlphaImage, RGBAImage };
diff --git a/src/util/intersection_tests.js b/src/util/intersection_tests.js
index 1782ae5e30c..790be48e173 100644
--- a/src/util/intersection_tests.js
+++ b/src/util/intersection_tests.js
@@ -1,17 +1,10 @@
 // @flow
 
-const {isCounterClockwise} = require('./util');
+import { isCounterClockwise } from './util';
 
 import type Point from '@mapbox/point-geometry';
 
-module.exports = {
-    multiPolygonIntersectsBufferedPoint,
-    multiPolygonIntersectsBufferedMultiPoint,
-    multiPolygonIntersectsMultiPolygon,
-    multiPolygonIntersectsBufferedMultiLine,
-    polygonIntersectsPolygon,
-    distToSegmentSquared
-};
+export { multiPolygonIntersectsBufferedPoint, multiPolygonIntersectsBufferedMultiPoint, multiPolygonIntersectsMultiPolygon, multiPolygonIntersectsBufferedMultiLine, polygonIntersectsPolygon, distToSegmentSquared };
 
 type Line = Array<Point>;
 type MultiLine = Array<Line>;
diff --git a/src/util/is_char_in_unicode_block.js b/src/util/is_char_in_unicode_block.js
index 5a93e245368..7c3e163d754 100644
--- a/src/util/is_char_in_unicode_block.js
+++ b/src/util/is_char_in_unicode_block.js
@@ -288,4 +288,4 @@ const unicodeBlockLookup: UnicodeBlockLookup = {
     // 'Supplementary Private Use Area-B': (char) => char >= 0x100000 && char <= 0x10FFFF,
 };
 
-module.exports = unicodeBlockLookup;
+export default unicodeBlockLookup;
diff --git a/src/util/lru_cache.js b/src/util/lru_cache.js
index 988b1ff1244..3074c4b5699 100644
--- a/src/util/lru_cache.js
+++ b/src/util/lru_cache.js
@@ -161,4 +161,4 @@ class LRUCache<T> {
     }
 }
 
-module.exports = LRUCache;
+export default LRUCache;
diff --git a/src/util/mapbox.js b/src/util/mapbox.js
index 2619132f371..0db851f6382 100644
--- a/src/util/mapbox.js
+++ b/src/util/mapbox.js
@@ -1,7 +1,8 @@
 // @flow
 
-const config = require('./config');
-const browser = require('./browser');
+import config from './config';
+
+import browser from './browser';
 
 const help = 'See https://www.mapbox.com/api-documentation/#access-tokens';
 
@@ -37,23 +38,23 @@ function isMapboxURL(url: string) {
     return url.indexOf('mapbox:') === 0;
 }
 
-exports.isMapboxURL = isMapboxURL;
+export { isMapboxURL };
 
-exports.normalizeStyleURL = function(url: string, accessToken?: string): string {
+export const normalizeStyleURL = function(url: string, accessToken?: string): string {
     if (!isMapboxURL(url)) return url;
     const urlObject = parseUrl(url);
     urlObject.path = `/styles/v1${urlObject.path}`;
     return makeAPIURL(urlObject, accessToken);
 };
 
-exports.normalizeGlyphsURL = function(url: string, accessToken?: string): string {
+export const normalizeGlyphsURL = function(url: string, accessToken?: string): string {
     if (!isMapboxURL(url)) return url;
     const urlObject = parseUrl(url);
     urlObject.path = `/fonts/v1${urlObject.path}`;
     return makeAPIURL(urlObject, accessToken);
 };
 
-exports.normalizeSourceURL = function(url: string, accessToken?: string): string {
+export const normalizeSourceURL = function(url: string, accessToken?: string): string {
     if (!isMapboxURL(url)) return url;
     const urlObject = parseUrl(url);
     urlObject.path = `/v4/${urlObject.authority}.json`;
@@ -63,7 +64,7 @@ exports.normalizeSourceURL = function(url: string, accessToken?: string): string
     return makeAPIURL(urlObject, accessToken);
 };
 
-exports.normalizeSpriteURL = function(url: string, format: string, extension: string, accessToken?: string): string {
+export const normalizeSpriteURL = function(url: string, format: string, extension: string, accessToken?: string): string {
     const urlObject = parseUrl(url);
     if (!isMapboxURL(url)) {
         urlObject.path += `${format}${extension}`;
@@ -75,7 +76,7 @@ exports.normalizeSpriteURL = function(url: string, format: string, extension: st
 
 const imageExtensionRe = /(\.(png|jpg)\d*)(?=$)/;
 
-exports.normalizeTileURL = function(tileURL: string, sourceURL?: ?string, tileSize?: ?number): string {
+export const normalizeTileURL = function(tileURL: string, sourceURL?: ?string, tileSize?: ?number): string {
     if (!sourceURL || !isMapboxURL(sourceURL)) return tileURL;
 
     const urlObject = parseUrl(tileURL);
diff --git a/src/util/performance.js b/src/util/performance.js
index d3a48a9fed2..1957823fbb0 100644
--- a/src/util/performance.js
+++ b/src/util/performance.js
@@ -2,7 +2,7 @@
 
 // Wraps performance.getEntriesByName to facilitate testing
 // Not incorporated into browser.js because the latter is poisonous when used outside the main thread
-module.exports = {
+const exported = {
     getEntriesByName: (url: string) => {
         if (performance && performance.getEntriesByName)
             return performance.getEntriesByName(url);
@@ -10,3 +10,5 @@ module.exports = {
             return false;
     }
 };
+
+export default exported;
diff --git a/src/util/script_detection.js b/src/util/script_detection.js
index 00c0bf39519..c4207b2a11b 100644
--- a/src/util/script_detection.js
+++ b/src/util/script_detection.js
@@ -2,30 +2,30 @@
 
 /* eslint-disable new-cap */
 
-const isChar = require('./is_char_in_unicode_block');
+import isChar from './is_char_in_unicode_block';
 
-module.exports.allowsIdeographicBreaking = function(chars: string) {
+export function allowsIdeographicBreaking(chars: string) {
     for (const char of chars) {
-        if (!exports.charAllowsIdeographicBreaking(char.charCodeAt(0))) return false;
+        if (!charAllowsIdeographicBreaking(char.charCodeAt(0))) return false;
     }
     return true;
-};
+}
 
-module.exports.allowsVerticalWritingMode = function(chars: string) {
+export function allowsVerticalWritingMode(chars: string) {
     for (const char of chars) {
-        if (exports.charHasUprightVerticalOrientation(char.charCodeAt(0))) return true;
+        if (charHasUprightVerticalOrientation(char.charCodeAt(0))) return true;
     }
     return false;
-};
+}
 
-module.exports.allowsLetterSpacing = function(chars: string) {
+export function allowsLetterSpacing(chars: string) {
     for (const char of chars) {
-        if (!exports.charAllowsLetterSpacing(char.charCodeAt(0))) return false;
+        if (!charAllowsLetterSpacing(char.charCodeAt(0))) return false;
     }
     return true;
-};
+}
 
-module.exports.charAllowsLetterSpacing = function(char: number) {
+export function charAllowsLetterSpacing(char: number) {
     if (isChar['Arabic'](char)) return false;
     if (isChar['Arabic Supplement'](char)) return false;
     if (isChar['Arabic Extended-A'](char)) return false;
@@ -33,9 +33,9 @@ module.exports.charAllowsLetterSpacing = function(char: number) {
     if (isChar['Arabic Presentation Forms-B'](char)) return false;
 
     return true;
-};
+}
 
-module.exports.charAllowsIdeographicBreaking = function(char: number) {
+export function charAllowsIdeographicBreaking(char: number) {
     // Return early for characters outside all ideographic ranges.
     if (char < 0x2E80) return false;
 
@@ -61,7 +61,7 @@ module.exports.charAllowsIdeographicBreaking = function(char: number) {
     if (isChar['Yi Syllables'](char)) return true;
 
     return false;
-};
+}
 
 // The following logic comes from
 // <http://www.unicode.org/Public/vertical/revision-17/VerticalOrientation-17.txt>.
@@ -83,7 +83,7 @@ module.exports.charAllowsIdeographicBreaking = function(char: number) {
  * “neutral” character to be drawn upright as well.
  * @private
  */
-exports.charHasUprightVerticalOrientation = function(char: number) {
+export function charHasUprightVerticalOrientation(char: number) {
     if (char === 0x02EA /* modifier letter yin departing tone mark */ ||
         char === 0x02EB /* modifier letter yang departing tone mark */) {
         return true;
@@ -96,7 +96,7 @@ exports.charHasUprightVerticalOrientation = function(char: number) {
     if (isChar['Bopomofo Extended'](char)) return true;
     if (isChar['Bopomofo'](char)) return true;
     if (isChar['CJK Compatibility Forms'](char)) {
-        if (!(char >= 0xFE49 /* dashed overline */ && char <= 0xFE4F /* wavy low line */)) {
+        if (!((char >= 0xFE49 /* dashed overline */ && char <= 0xFE4F) /* wavy low line */)) {
             return true;
         }
     }
@@ -105,8 +105,8 @@ exports.charHasUprightVerticalOrientation = function(char: number) {
     if (isChar['CJK Radicals Supplement'](char)) return true;
     if (isChar['CJK Strokes'](char)) return true;
     if (isChar['CJK Symbols and Punctuation'](char)) {
-        if (!(char >= 0x3008 /* left angle bracket */ && char <= 0x3011 /* right black lenticular bracket */) &&
-            !(char >= 0x3014 /* left tortoise shell bracket */ && char <= 0x301F /* low double prime quotation mark */) &&
+        if (!((char >= 0x3008 /* left angle bracket */ && char <= 0x3011) /* right black lenticular bracket */) &&
+            !((char >= 0x3014 /* left tortoise shell bracket */ && char <= 0x301F) /* low double prime quotation mark */) &&
             char !== 0x3030 /* wavy dash */) {
             return true;
         }
@@ -133,7 +133,7 @@ exports.charHasUprightVerticalOrientation = function(char: number) {
         if (char !== 0xFF08 /* fullwidth left parenthesis */ &&
             char !== 0xFF09 /* fullwidth right parenthesis */ &&
             char !== 0xFF0D /* fullwidth hyphen-minus */ &&
-            !(char >= 0xFF1A /* fullwidth colon */ && char <= 0xFF1E /* fullwidth greater-than sign */) &&
+            !((char >= 0xFF1A /* fullwidth colon */ && char <= 0xFF1E) /* fullwidth greater-than sign */) &&
             char !== 0xFF3B /* fullwidth left square bracket */ &&
             char !== 0xFF3D /* fullwidth right square bracket */ &&
             char !== 0xFF3F /* fullwidth low line */ &&
@@ -144,8 +144,8 @@ exports.charHasUprightVerticalOrientation = function(char: number) {
         }
     }
     if (isChar['Small Form Variants'](char)) {
-        if (!(char >= 0xFE58 /* small em dash */ && char <= 0xFE5E /* small right tortoise shell bracket */) &&
-            !(char >= 0xFE63 /* small hyphen-minus */ && char <= 0xFE66 /* small equals sign */)) {
+        if (!((char >= 0xFE58 /* small em dash */ && char <= 0xFE5E) /* small right tortoise shell bracket */) &&
+            !((char >= 0xFE63 /* small hyphen-minus */ && char <= 0xFE66) /* small equals sign */)) {
             return true;
         }
     }
@@ -157,7 +157,7 @@ exports.charHasUprightVerticalOrientation = function(char: number) {
     if (isChar['Yi Radicals'](char)) return true;
 
     return false;
-};
+}
 
 /**
  * Returns true if the given Unicode codepoint identifies a character with
@@ -171,7 +171,7 @@ exports.charHasUprightVerticalOrientation = function(char: number) {
  * adjacent character is drawn upright or rotated.
  * @private
  */
-exports.charHasNeutralVerticalOrientation = function(char: number) {
+export function charHasNeutralVerticalOrientation(char: number) {
     if (isChar['Latin-1 Supplement'](char)) {
         if (char === 0x00A7 /* section sign */ ||
             char === 0x00A9 /* copyright sign */ ||
@@ -221,7 +221,7 @@ exports.charHasNeutralVerticalOrientation = function(char: number) {
     if (isChar['Enclosed Alphanumerics'](char)) return true;
     if (isChar['Geometric Shapes'](char)) return true;
     if (isChar['Miscellaneous Symbols'](char)) {
-        if (!(char >= 0x261A /* black left pointing index */ && char <= 0x261F /* white down pointing index */)) {
+        if (!((char >= 0x261A /* black left pointing index */ && char <= 0x261F) /* white down pointing index */)) {
             return true;
         }
     }
@@ -250,7 +250,7 @@ exports.charHasNeutralVerticalOrientation = function(char: number) {
     }
 
     return false;
-};
+}
 
 /**
  * Returns true if the given Unicode codepoint identifies a character with
@@ -262,7 +262,7 @@ exports.charHasNeutralVerticalOrientation = function(char: number) {
  * character causes an adjacent “neutral” character to be drawn rotated as well.
  * @private
  */
-exports.charHasRotatedVerticalOrientation = function(char: number) {
-    return !(exports.charHasUprightVerticalOrientation(char) ||
-             exports.charHasNeutralVerticalOrientation(char));
-};
+export function charHasRotatedVerticalOrientation(char: number) {
+    return !(charHasUprightVerticalOrientation(char) ||
+             charHasNeutralVerticalOrientation(char));
+}
diff --git a/src/util/smart_wrap.js b/src/util/smart_wrap.js
index ae8aaad5fbc..a713d1e2b9d 100644
--- a/src/util/smart_wrap.js
+++ b/src/util/smart_wrap.js
@@ -1,6 +1,6 @@
 // @flow
 
-const LngLat = require('../geo/lng_lat');
+import LngLat from '../geo/lng_lat';
 
 import type Point from '@mapbox/point-geometry';
 import type Transform from '../geo/transform';
@@ -20,7 +20,7 @@ import type Transform from '../geo/transform';
  *
  * @private
  */
-module.exports = function(lngLat: LngLat, priorPos: ?Point, transform: Transform): LngLat {
+export default function(lngLat: LngLat, priorPos: ?Point, transform: Transform): LngLat {
     lngLat = new LngLat(lngLat.lng, lngLat.lat);
 
     // First, try shifting one world in either direction, and see if either is closer to the
@@ -52,4 +52,4 @@ module.exports = function(lngLat: LngLat, priorPos: ?Point, transform: Transform
     }
 
     return lngLat;
-};
+}
diff --git a/src/util/struct_array.js b/src/util/struct_array.js
index 5233908840f..8500b79fad1 100644
--- a/src/util/struct_array.js
+++ b/src/util/struct_array.js
@@ -2,7 +2,7 @@
 
 // Note: all "sizes" are measured in bytes
 
-const assert = require('assert');
+import assert from 'assert';
 
 import type {Transferable} from '../types/transferable';
 
@@ -238,7 +238,4 @@ function align(offset: number, size: number): number {
     return Math.ceil(offset / size) * size;
 }
 
-module.exports.StructArray = StructArray;
-module.exports.Struct = Struct;
-module.exports.viewTypes = viewTypes;
-module.exports.createLayout = createLayout;
+export { StructArray, Struct, viewTypes, createLayout };
diff --git a/src/util/struct_array.js.ejs b/src/util/struct_array.js.ejs
index cf73d53b722..36a840c1af4 100644
--- a/src/util/struct_array.js.ejs
+++ b/src/util/struct_array.js.ejs
@@ -69,7 +69,7 @@ export type <%=StructTypeClass.replace('Struct', '')%> = <%=StructTypeClass%>;
 /**
  * @private
  */
-class <%=StructArrayClass%> extends <%=StructArrayLayoutClass%> {
+export class <%=StructArrayClass%> extends <%=StructArrayLayoutClass%> {
 <%
 if (StructArrayClass === 'GlyphOffsetArray' || StructArrayClass === 'SymbolLineVertexArray') {
     // component getters
diff --git a/src/util/throttle.js b/src/util/throttle.js
index e34f3c10412..a525d85f006 100644
--- a/src/util/throttle.js
+++ b/src/util/throttle.js
@@ -5,7 +5,7 @@
  Throttle the given function to run at most every period milliseconds.
  * @private
  */
-module.exports = function throttle(fn: () => void, time: number): () => TimeoutID {
+export default function throttle(fn: () => void, time: number): () => TimeoutID {
     let pending = false;
     let timerId: TimeoutID = (0: any);
 
@@ -25,4 +25,4 @@ module.exports = function throttle(fn: () => void, time: number): () => TimeoutI
         }
         return timerId;
     };
-};
+}
diff --git a/src/util/tile_cover.js b/src/util/tile_cover.js
index 4a5e2cd5fb3..f44a24d9f64 100644
--- a/src/util/tile_cover.js
+++ b/src/util/tile_cover.js
@@ -1,9 +1,10 @@
 // @flow
 
-const Coordinate = require('../geo/coordinate');
-const {OverscaledTileID} = require('../source/tile_id');
+import Coordinate from '../geo/coordinate';
 
-module.exports = tileCover;
+import { OverscaledTileID } from '../source/tile_id';
+
+export default tileCover;
 
 function tileCover(z: number, bounds: [Coordinate, Coordinate, Coordinate, Coordinate],
         actualZ: number, renderWorldCopies: boolean | void) {
diff --git a/src/util/token.js b/src/util/token.js
index 3dc0c7276f8..3ca7c86055b 100644
--- a/src/util/token.js
+++ b/src/util/token.js
@@ -1,6 +1,5 @@
 // @flow
-
-module.exports = resolveTokens;
+export default resolveTokens;
 
 /**
  * Replace tokens in a string template with values in an object
diff --git a/src/util/util.js b/src/util/util.js
index 1b76d1d509d..c96f91255d0 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -1,8 +1,9 @@
 // @flow
 
-const UnitBezier = require('@mapbox/unitbezier');
-const Coordinate = require('../geo/coordinate');
-const Point = require('@mapbox/point-geometry');
+import UnitBezier from '@mapbox/unitbezier';
+
+import Coordinate from '../geo/coordinate';
+import Point from '@mapbox/point-geometry';
 
 import type {Callback} from '../types/callback';
 
@@ -18,13 +19,13 @@ import type {Callback} from '../types/callback';
  *
  * @private
  */
-exports.easeCubicInOut = function(t: number): number {
+export function easeCubicInOut(t: number): number {
     if (t <= 0) return 0;
     if (t >= 1) return 1;
     const t2 = t * t,
         t3 = t2 * t;
     return 4 * (t < 0.5 ? t3 : 3 * (t - t2) + t3 - 0.75);
-};
+}
 
 /**
  * Given given (x, y), (x1, y1) control points for a bezier curve,
@@ -36,12 +37,12 @@ exports.easeCubicInOut = function(t: number): number {
  * @param p2y control point 2 y coordinate
  * @private
  */
-exports.bezier = function(p1x: number, p1y: number, p2x: number, p2y: number): (t: number) => number {
+export function bezier(p1x: number, p1y: number, p2x: number, p2y: number): (t: number) => number {
     const bezier = new UnitBezier(p1x, p1y, p2x, p2y);
     return function(t: number) {
         return bezier.solve(t);
     };
-};
+}
 
 /**
  * A default bezier-curve powered easing function with
@@ -49,7 +50,7 @@ exports.bezier = function(p1x: number, p1y: number, p2x: number, p2y: number): (
  *
  * @private
  */
-exports.ease = exports.bezier(0.25, 0.1, 0.25, 1);
+export const ease = bezier(0.25, 0.1, 0.25, 1);
 
 /**
  * constrain n to the given range via min + max
@@ -60,9 +61,9 @@ exports.ease = exports.bezier(0.25, 0.1, 0.25, 1);
  * @returns the clamped value
  * @private
  */
-exports.clamp = function (n: number, min: number, max: number): number {
+export function clamp(n: number, min: number, max: number): number {
     return Math.min(max, Math.max(min, n));
-};
+}
 
 /**
  * constrain n to the given range, excluding the minimum, via modular arithmetic
@@ -73,11 +74,11 @@ exports.clamp = function (n: number, min: number, max: number): number {
  * @returns constrained number
  * @private
  */
-exports.wrap = function (n: number, min: number, max: number): number {
+export function wrap(n: number, min: number, max: number): number {
     const d = max - min;
     const w = ((n - min) % d + d) % d + min;
     return (w === min) ? max : w;
-};
+}
 
 /*
  * Call an asynchronous function on an array of arguments,
@@ -89,7 +90,7 @@ exports.wrap = function (n: number, min: number, max: number): number {
  * called with an array, containing the results of each async call.
  * @private
  */
-exports.asyncAll = function<Item, Result> (
+export function asyncAll<Item, Result>(
     array: Array<Item>,
     fn: (item: Item, fnCallback: Callback<Result>) => void,
     callback: Callback<Array<Result>>
@@ -105,7 +106,7 @@ exports.asyncAll = function<Item, Result> (
             if (--remaining === 0) callback(error, results);
         });
     });
-};
+}
 
 /*
  * Polyfill for Object.values. Not fully spec compliant, but we don't
@@ -113,13 +114,13 @@ exports.asyncAll = function<Item, Result> (
  *
  * @private
  */
-exports.values = function<T>(obj: {[key: string]: T}): Array<T> {
+export function values<T>(obj: {[key: string]: T}): Array<T> {
     const result = [];
     for (const k in obj) {
         result.push(obj[k]);
     }
     return result;
-};
+}
 
 /*
  * Compute the difference between the keys in one object and the keys
@@ -128,7 +129,7 @@ exports.values = function<T>(obj: {[key: string]: T}): Array<T> {
  * @returns keys difference
  * @private
  */
-exports.keysDifference = function<S, T>(obj: {[key: string]: S}, other: {[key: string]: T}): Array<string> {
+export function keysDifference<S, T>(obj: {[key: string]: S}, other: {[key: string]: T}): Array<string> {
     const difference = [];
     for (const i in obj) {
         if (!(i in other)) {
@@ -136,7 +137,7 @@ exports.keysDifference = function<S, T>(obj: {[key: string]: S}, other: {[key: s
         }
     }
     return difference;
-};
+}
 
 /**
  * Given a destination object and optionally many source objects,
@@ -148,14 +149,14 @@ exports.keysDifference = function<S, T>(obj: {[key: string]: S}, other: {[key: s
  * @param sources sources from which properties are pulled
  * @private
  */
-exports.extend = function (dest: Object, ...sources: Array<?Object>): Object {
+export function extend(dest: Object, ...sources: Array<?Object>): Object {
     for (const src of sources) {
         for (const k in src) {
             dest[k] = src[k];
         }
     }
     return dest;
-};
+}
 
 /**
  * Given an object and a number of properties as strings, return version
@@ -171,7 +172,7 @@ exports.extend = function (dest: Object, ...sources: Array<?Object>): Object {
  * // justName = { name: 'Charlie' }
  * @private
  */
-exports.pick = function (src: Object, properties: Array<string>): Object {
+export function pick(src: Object, properties: Array<string>): Object {
     const result = {};
     for (let i = 0; i < properties.length; i++) {
         const k = properties[i];
@@ -180,7 +181,7 @@ exports.pick = function (src: Object, properties: Array<string>): Object {
         }
     }
     return result;
-};
+}
 
 let id = 1;
 
@@ -191,9 +192,9 @@ let id = 1;
  * @returns unique numeric id.
  * @private
  */
-exports.uniqueId = function (): number {
+export function uniqueId(): number {
     return id++;
-};
+}
 
 /**
  * Given an array of member function names as strings, replace all of them
@@ -216,12 +217,12 @@ exports.uniqueId = function (): number {
  * setTimeout(myClass.ontimer, 100);
  * @private
  */
-exports.bindAll = function(fns: Array<string>, context: Object): void {
+export function bindAll(fns: Array<string>, context: Object): void {
     fns.forEach((fn) => {
         if (!context[fn]) { return; }
         context[fn] = context[fn].bind(context);
     });
-};
+}
 
 /**
  * Given a list of coordinates, get their center as a coordinate.
@@ -229,7 +230,7 @@ exports.bindAll = function(fns: Array<string>, context: Object): void {
  * @returns centerpoint
  * @private
  */
-exports.getCoordinatesCenter = function(coords: Array<Coordinate>): Coordinate {
+export function getCoordinatesCenter(coords: Array<Coordinate>): Coordinate {
     let minX = Infinity;
     let minY = Infinity;
     let maxX = -Infinity;
@@ -248,16 +249,16 @@ exports.getCoordinatesCenter = function(coords: Array<Coordinate>): Coordinate {
     const zoom = Math.max(0, Math.floor(-Math.log(dMax) / Math.LN2));
     return new Coordinate((minX + maxX) / 2, (minY + maxY) / 2, 0)
         .zoomTo(zoom);
-};
+}
 
 /**
  * Determine if a string ends with a particular substring
  *
  * @private
  */
-exports.endsWith = function(string: string, suffix: string): boolean {
+export function endsWith(string: string, suffix: string): boolean {
     return string.indexOf(suffix, string.length - suffix.length) !== -1;
-};
+}
 
 /**
  * Create an object by mapping all the values of an existing object while
@@ -265,20 +266,20 @@ exports.endsWith = function(string: string, suffix: string): boolean {
  *
  * @private
  */
-exports.mapObject = function(input: Object, iterator: Function, context?: Object): Object {
+export function mapObject(input: Object, iterator: Function, context?: Object): Object {
     const output = {};
     for (const key in input) {
         output[key] = iterator.call(context || this, input[key], key, input);
     }
     return output;
-};
+}
 
 /**
  * Create an object by filtering out values of an existing object.
  *
  * @private
  */
-exports.filterObject = function(input: Object, iterator: Function, context?: Object): Object {
+export function filterObject(input: Object, iterator: Function, context?: Object): Object {
     const output = {};
     for (const key in input) {
         if (iterator.call(context || this, input[key], key, input)) {
@@ -286,36 +287,37 @@ exports.filterObject = function(input: Object, iterator: Function, context?: Obj
         }
     }
     return output;
-};
+}
 
-exports.deepEqual = require('../style-spec/util/deep_equal');
+import deepEqual from '../style-spec/util/deep_equal';
+export { deepEqual };
 
 /**
  * Deeply clones two objects.
  *
  * @private
  */
-exports.clone = function<T>(input: T): T {
+export function clone<T>(input: T): T {
     if (Array.isArray(input)) {
-        return input.map(exports.clone);
+        return input.map(clone);
     } else if (typeof input === 'object' && input) {
-        return ((exports.mapObject(input, exports.clone): any): T);
+        return ((mapObject(input, clone): any): T);
     } else {
         return input;
     }
-};
+}
 
 /**
  * Check if two arrays have at least one common element.
  *
  * @private
  */
-exports.arraysIntersect = function<T>(a: Array<T>, b: Array<T>): boolean {
+export function arraysIntersect<T>(a: Array<T>, b: Array<T>): boolean {
     for (let l = 0; l < a.length; l++) {
         if (b.indexOf(a[l]) >= 0) return true;
     }
     return false;
-};
+}
 
 /**
  * Print a warning message to the console and ensure duplicate warning messages
@@ -324,13 +326,14 @@ exports.arraysIntersect = function<T>(a: Array<T>, b: Array<T>): boolean {
  * @private
  */
 const warnOnceHistory: {[key: string]: boolean} = {};
-exports.warnOnce = function(message: string): void {
+
+export function warnOnce(message: string): void {
     if (!warnOnceHistory[message]) {
         // console isn't defined in some WebWorkers, see #2558
         if (typeof console !== "undefined") console.warn(message);
         warnOnceHistory[message] = true;
     }
-};
+}
 
 /**
  * Indicates if the provided Points are in a counter clockwise (true) or clockwise (false) order
@@ -339,9 +342,9 @@ exports.warnOnce = function(message: string): void {
  * @returns true for a counter clockwise set of points
  */
 // http://bryceboe.com/2006/10/23/line-segment-intersection-algorithm/
-exports.isCounterClockwise = function(a: Point, b: Point, c: Point): boolean {
+export function isCounterClockwise(a: Point, b: Point, c: Point): boolean {
     return (c.y - a.y) * (b.x - a.x) > (b.y - a.y) * (c.x - a.x);
-};
+}
 
 /**
  * Returns the signed area for the polygon ring.  Postive areas are exterior rings and
@@ -351,7 +354,7 @@ exports.isCounterClockwise = function(a: Point, b: Point, c: Point): boolean {
  * @private
  * @param ring Exterior or interior ring
  */
-exports.calculateSignedArea = function(ring: Array<Point>): number {
+export function calculateSignedArea(ring: Array<Point>): number {
     let sum = 0;
     for (let i = 0, len = ring.length, j = len - 1, p1, p2; i < len; j = i++) {
         p1 = ring[i];
@@ -359,7 +362,7 @@ exports.calculateSignedArea = function(ring: Array<Point>): number {
         sum += (p2.x - p1.x) * (p1.y + p2.y);
     }
     return sum;
-};
+}
 
 /**
  * Detects closed polygons, first + last point are equal
@@ -368,7 +371,7 @@ exports.calculateSignedArea = function(ring: Array<Point>): number {
  * @param points array of points
  * @return true if the points are a closed polygon
  */
-exports.isClosedPolygon = function(points: Array<Point>): boolean {
+export function isClosedPolygon(points: Array<Point>): boolean {
     // If it is 2 points that are the same then it is a point
     // If it is 3 points with start and end the same then it is a line
     if (points.length < 4)
@@ -383,8 +386,8 @@ exports.isClosedPolygon = function(points: Array<Point>): boolean {
     }
 
     // polygon simplification can produce polygons with zero area and more than 3 points
-    return (Math.abs(exports.calculateSignedArea(points)) > 0.01);
-};
+    return Math.abs(calculateSignedArea(points)) > 0.01;
+}
 
 /**
  * Converts spherical coordinates to cartesian coordinates.
@@ -394,7 +397,7 @@ exports.isClosedPolygon = function(points: Array<Point>): boolean {
  * @return cartesian coordinates in [x, y, z]
  */
 
-exports.sphericalToCartesian = function([r, azimuthal, polar]: [number, number, number]): {x: number, y: number, z: number} {
+export function sphericalToCartesian([r, azimuthal, polar]: [number, number, number]): {x: number, y: number, z: number} {
     // We abstract "north"/"up" (compass-wise) to be 0° when really this is 90° (π/2):
     // correct for that here
     azimuthal += 90;
@@ -408,7 +411,7 @@ exports.sphericalToCartesian = function([r, azimuthal, polar]: [number, number,
         y: r * Math.sin(azimuthal) * Math.sin(polar),
         z: r * Math.cos(polar)
     };
-};
+}
 
 /**
  * Parses data from 'Cache-Control' headers.
@@ -418,7 +421,7 @@ exports.sphericalToCartesian = function([r, azimuthal, polar]: [number, number,
  * @return object containing parsed header info.
  */
 
-exports.parseCacheControl = function(cacheControl: string): Object {
+export function parseCacheControl(cacheControl: string): Object {
     // Taken from [Wreck](https://github.com/hapijs/wreck)
     const re = /(?:^|(?:\s*\,\s*))([^\x00-\x20\(\)<>@\,;\:\\"\/\[\]\?\=\{\}\x7F]+)(?:\=(?:([^\x00-\x20\(\)<>@\,;\:\\"\/\[\]\?\=\{\}\x7F]+)|(?:\"((?:[^"\\]|\\.)*)\")))?/g;
 
@@ -436,4 +439,4 @@ exports.parseCacheControl = function(cacheControl: string): Object {
     }
 
     return header;
-};
+}
diff --git a/src/util/vectortile_to_geojson.js b/src/util/vectortile_to_geojson.js
index fe3c7ba6dc6..41989ea1d65 100644
--- a/src/util/vectortile_to_geojson.js
+++ b/src/util/vectortile_to_geojson.js
@@ -49,4 +49,4 @@ class Feature {
     }
 }
 
-module.exports = Feature;
+export default Feature;
diff --git a/src/util/verticalize_punctuation.js b/src/util/verticalize_punctuation.js
index 813c984a45c..658ffdf6316 100644
--- a/src/util/verticalize_punctuation.js
+++ b/src/util/verticalize_punctuation.js
@@ -1,30 +1,10 @@
 // @flow
 
-const scriptDetection = require('./script_detection');
+import {
+    charHasRotatedVerticalOrientation,
+} from './script_detection';
 
-module.exports = function verticalizePunctuation(input: string) {
-    let output = '';
-
-    for (let i = 0; i < input.length; i++) {
-        const nextCharCode = input.charCodeAt(i + 1) || null;
-        const prevCharCode = input.charCodeAt(i - 1) || null;
-
-        const canReplacePunctuation = (
-            (!nextCharCode || !scriptDetection.charHasRotatedVerticalOrientation(nextCharCode) || module.exports.lookup[input[i + 1]]) &&
-            (!prevCharCode || !scriptDetection.charHasRotatedVerticalOrientation(prevCharCode) || module.exports.lookup[input[i - 1]])
-        );
-
-        if (canReplacePunctuation && module.exports.lookup[input[i]]) {
-            output += module.exports.lookup[input[i]];
-        } else {
-            output += input[i];
-        }
-    }
-
-    return output;
-};
-
-module.exports.lookup = {
+export const verticalizedCharacterMap = {
     '!': '︕',
     '#': '＃',
     '$': '＄',
@@ -109,3 +89,26 @@ module.exports.lookup = {
     '｢': '﹁',
     '｣': '﹂'
 };
+
+export default function verticalizePunctuation(input: string) {
+    let output = '';
+
+    for (let i = 0; i < input.length; i++) {
+        const nextCharCode = input.charCodeAt(i + 1) || null;
+        const prevCharCode = input.charCodeAt(i - 1) || null;
+
+        const canReplacePunctuation = (
+            (!nextCharCode || !charHasRotatedVerticalOrientation(nextCharCode) || verticalizedCharacterMap[input[i + 1]]) &&
+            (!prevCharCode || !charHasRotatedVerticalOrientation(prevCharCode) || verticalizedCharacterMap[input[i - 1]])
+        );
+
+        if (canReplacePunctuation && verticalizedCharacterMap[input[i]]) {
+            output += verticalizedCharacterMap[input[i]];
+        } else {
+            output += input[i];
+        }
+    }
+
+    return output;
+}
+
diff --git a/src/util/web_worker.js b/src/util/web_worker.js
index a849d08d956..6462e4cdb87 100644
--- a/src/util/web_worker.js
+++ b/src/util/web_worker.js
@@ -1,6 +1,6 @@
 // @flow
 
-const Worker = require('../source/worker');
+import Worker from '../source/worker';
 
 import type {WorkerSource} from '../source/worker_source';
 
@@ -67,7 +67,7 @@ class MessageBus implements WorkerInterface, WorkerGlobalScopeInterface {
     importScripts() {}
 }
 
-module.exports = function (): WorkerInterface {
+export default function WebWorker(): WorkerInterface {
     const parentListeners = [],
         workerListeners = [],
         parentBus = new MessageBus(workerListeners, parentListeners),
@@ -76,7 +76,10 @@ module.exports = function (): WorkerInterface {
     parentBus.target = workerBus;
     workerBus.target = parentBus;
 
-    new Worker(workerBus);
+    new WebWorker.Worker(workerBus);
 
     return parentBus;
-};
+}
+
+// expose to allow stubbing in unit tests
+WebWorker.Worker = Worker;
diff --git a/src/util/web_worker_transfer.js b/src/util/web_worker_transfer.js
index 794cf8af859..fb1c8971e67 100644
--- a/src/util/web_worker_transfer.js
+++ b/src/util/web_worker_transfer.js
@@ -1,19 +1,14 @@
 // @flow
 
-const assert = require('assert');
+import assert from 'assert';
 
-const Grid = require('grid-index');
-const Color = require('../style-spec/util/color');
-const {
-    StylePropertyFunction,
-    StyleExpression,
-    StyleExpressionWithErrorHandling,
-    ZoomDependentExpression,
-    ZoomConstantExpression
-} = require('../style-spec/expression');
-const {CompoundExpression} = require('../style-spec/expression/compound_expression');
-const expressions = require('../style-spec/expression/definitions');
-const {ImageData} = require('./window');
+import Grid from 'grid-index';
+import Color from '../style-spec/util/color';
+import { StylePropertyFunction, StyleExpression, StyleExpressionWithErrorHandling, ZoomDependentExpression, ZoomConstantExpression } from '../style-spec/expression';
+import CompoundExpression from '../style-spec/expression/compound_expression';
+import expressions from '../style-spec/expression/definitions';
+import window from './window';
+const { ImageData } = window;
 
 import type {Transferable} from '../types/transferable';
 
@@ -191,6 +186,10 @@ function serialize(input: mixed, transferables?: Array<Transferable>): Serialize
                     property :
                     serialize(property, transferables);
             }
+
+            if (input instanceof Error) {
+                properties.message = input.message;
+            }
         }
 
         return {name, properties};
@@ -248,8 +247,11 @@ function deserialize(input: Serialized): mixed {
     throw new Error(`can't deserialize object of type ${typeof input}`);
 }
 
-module.exports = {
+const exported = {
     register,
     serialize,
     deserialize
 };
+
+export default exported;
+export { register, serialize, deserialize };
diff --git a/src/util/window.js b/src/util/window.js
index 0fed6cfd0b3..e72549c2f94 100644
--- a/src/util/window.js
+++ b/src/util/window.js
@@ -1,21 +1,30 @@
 // @flow
 
-const jsdom = require('jsdom');
-const gl = require('gl');
-const sinon = require('sinon');
-const util = require('./util');
+import jsdom from 'jsdom';
+
+import gl from 'gl';
+import sinon from 'sinon';
+import { extend } from './util';
+
+const { window: _window } = new jsdom.JSDOM('', {
+    virtualConsole: new jsdom.VirtualConsole().sendTo(console)
+});
+
+restore();
+
+export default _window;
 
 function restore(): Window {
-    // Remove previous window from module.exports
-    const previousWindow = module.exports;
+    // Remove previous window from exported object
+    const previousWindow = _window;
     if (previousWindow.close) previousWindow.close();
     for (const key in previousWindow) {
         if (previousWindow.hasOwnProperty(key)) {
-            delete previousWindow[key];
+            delete (previousWindow: any)[key];
         }
     }
 
-    // Create new window and inject into module.exports
+    // Create new window and inject into exported object
     const { window } = new jsdom.JSDOM('', {
         // Send jsdom console output to the node console object.
         virtualConsole: new jsdom.VirtualConsole().sendTo(console)
@@ -58,9 +67,7 @@ function restore(): Window {
     window.ImageData = window.ImageData || function() { return false; };
     window.ImageBitmap = window.ImageBitmap || function() { return false; };
     window.WebGLFramebuffer = window.WebGLFramebuffer || Object;
-    util.extend(module.exports, window);
+    extend(_window, window);
 
     return window;
 }
-
-module.exports = restore();
diff --git a/src/util/worker_pool.js b/src/util/worker_pool.js
index bafe8a704c4..24ae4d178d7 100644
--- a/src/util/worker_pool.js
+++ b/src/util/worker_pool.js
@@ -1,9 +1,11 @@
 // @flow
 
-const assert = require('assert');
-const WebWorker = require('./web_worker');
+import assert from 'assert';
+
+import WebWorker from './web_worker';
 
 import type {WorkerInterface} from './web_worker';
+import mapboxgl from '../';
 
 /**
  * Constructs a worker pool.
@@ -19,10 +21,9 @@ class WorkerPool {
 
     acquire(mapId: number) {
         if (!this.workers) {
-            // Lazily look up the value of mapboxgl.workerCount.  This allows
-            // client code a chance to set it while circumventing cyclic
-            // dependency problems
-            const workerCount = require('../').workerCount;
+            // Lazily look up the value of mapboxgl.workerCount so that
+            // client code has had a chance to set it.
+            const workerCount = mapboxgl.workerCount;
             assert(typeof workerCount === 'number' && workerCount < Infinity);
 
             this.workers = [];
@@ -46,4 +47,4 @@ class WorkerPool {
     }
 }
 
-module.exports = WorkerPool;
+export default WorkerPool;
diff --git a/test/.eslintrc b/test/.eslintrc
index 6f7c66dfabc..df7ce4e10cc 100644
--- a/test/.eslintrc
+++ b/test/.eslintrc
@@ -1,4 +1,7 @@
 {
+  "parserOptions": {
+    "sourceType": "module",
+  },
   "rules": {
     "flowtype/require-valid-file-annotation": [0],
     "no-restricted-properties": "off"
diff --git a/test/ajax_stubs.js b/test/ajax_stubs.js
new file mode 100644
index 00000000000..7b756610a09
--- /dev/null
+++ b/test/ajax_stubs.js
@@ -0,0 +1,106 @@
+
+import {PNG} from 'pngjs';
+import request from 'request';
+// we're using a require hook to load this file instead of src/util/ajax.js,
+// so we import browser module as if it were in an adjacent file
+import browser from './browser'; // eslint-disable-line import/no-unresolved
+const cache = {};
+
+/**
+ * The type of a resource.
+ * @private
+ * @readonly
+ * @enum {string}
+ */
+const ResourceType = {
+    Unknown: 'Unknown',
+    Style: 'Style',
+    Source: 'Source',
+    Tile: 'Tile',
+    Glyphs: 'Glyphs',
+    SpriteImage: 'SpriteImage',
+    SpriteJSON: 'SpriteJSON',
+    Image: 'Image'
+};
+export { ResourceType };
+
+if (typeof Object.freeze == 'function') {
+    Object.freeze(ResourceType);
+}
+
+function cached(data, callback) {
+    setImmediate(() => {
+        callback(null, data);
+    });
+}
+
+export const getJSON = function({ url }, callback) {
+    if (cache[url]) return cached(cache[url], callback);
+    return request(url, (error, response, body) => {
+        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
+            let data;
+            try {
+                data = JSON.parse(body);
+            } catch (err) {
+                return callback(err);
+            }
+            cache[url] = data;
+            callback(null, data);
+        } else {
+            callback(error || new Error(response.statusCode));
+        }
+    });
+};
+
+export const getArrayBuffer = function({ url }, callback) {
+    if (cache[url]) return cached(cache[url], callback);
+    return request({ url, encoding: null }, (error, response, body) => {
+        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
+            cache[url] = {data: body};
+            callback(null, {data: body});
+        } else {
+            callback(error || new Error(response.statusCode));
+        }
+    });
+};
+
+export const getImage = function({ url }, callback) {
+    if (cache[url]) return cached(cache[url], callback);
+    return request({ url, encoding: null }, (error, response, body) => {
+        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
+            new PNG().parse(body, (err, png) => {
+                if (err) return callback(err);
+                cache[url] = png;
+                callback(null, png);
+            });
+        } else {
+            callback(error || {status: response.statusCode});
+        }
+    });
+};
+
+browser.getImageData = function({width, height, data}) {
+    return {width, height, data: new Uint8Array(data)};
+};
+
+// Hack: since node doesn't have any good video codec modules, just grab a png with
+// the first frame and fake the video API.
+export const getVideo = function(urls, callback) {
+    return request({ url: urls[0], encoding: null }, (error, response, body) => {
+        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
+            new PNG().parse(body, (err, png) => {
+                if (err) return callback(err);
+                callback(null, {
+                    readyState: 4, // HAVE_ENOUGH_DATA
+                    addEventListener: function() {},
+                    play: function() {},
+                    width: png.width,
+                    height: png.height,
+                    data: png.data
+                });
+            });
+        } else {
+            callback(error || new Error(response.statusCode));
+        }
+    });
+};
diff --git a/test/build/browserify-test-fixture.js b/test/build/browserify-test-fixture.js
index ca60384a1b1..b484e105d84 100644
--- a/test/build/browserify-test-fixture.js
+++ b/test/build/browserify-test-fixture.js
@@ -1,2 +1,2 @@
-'use strict';
+/* eslint-disable import/unambiguous */
 require('../..');
diff --git a/test/build/dev.test.js b/test/build/dev.test.js
index 7e17c55cbcf..6d9838ea1d8 100644
--- a/test/build/dev.test.js
+++ b/test/build/dev.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
+import {test} from 'mapbox-gl-js-test';
+import fs from 'fs';
 
 test('dev build contains asserts', (t) => {
-    t.assert(fs.readFileSync('dist/mapbox-gl-dev.js', 'utf8').indexOf('assert(') !== -1);
+    t.assert(fs.readFileSync('dist/mapbox-gl-dev.js', 'utf8').indexOf('canary assert') !== -1);
     t.end();
 });
diff --git a/test/build/min.test.js b/test/build/min.test.js
index 63105550416..f5a2d45ab8c 100644
--- a/test/build/min.test.js
+++ b/test/build/min.test.js
@@ -1,20 +1,23 @@
-'use strict';
+import {test} from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import reference from '../../src/style-spec/reference/latest';
 
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
-const path = require('path');
 const pkg = require('../../package.json');
-const reference = require('../../src/style-spec/reference/latest');
 
 const minBundle = fs.readFileSync('dist/mapbox-gl.js', 'utf8');
 
 test('production build removes asserts', (t) => {
-    t.assert(minBundle.indexOf('assert(') === -1);
+    t.assert(minBundle.indexOf('canary assert') === -1);
     t.end();
 });
 
 test('trims package.json assets', (t) => {
-    t.assert(minBundle.indexOf(`module.exports={"version":"${pkg.version}"}`) !== -1);
+    // confirm that the entire package.json isn't present by asserting
+    // the absence of each of our script strings
+    for (const name in pkg.scripts) {
+        t.assert(minBundle.indexOf(pkg.scripts[name]) === -1);
+    }
     t.end();
 });
 
@@ -24,12 +27,6 @@ test('trims reference.json fields', (t) => {
     t.end();
 });
 
-test('does not include outdated reference.json files', (t) => {
-    t.assert(minBundle.indexOf('reference/v7.json') === -1);
-    t.assert(minBundle.indexOf('reference/v6.json') === -1);
-    t.end();
-});
-
 test('can be browserified', (t) => {
     const browserify = require('browserify');
     browserify(path.join(__dirname, 'browserify-test-fixture.js')).bundle((err) => {
diff --git a/test/build/style-spec.test.js b/test/build/style-spec.test.js
index 43a9b2ea4a6..71c5a2873ec 100644
--- a/test/build/style-spec.test.js
+++ b/test/build/style-spec.test.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const test = require('mapbox-gl-js-test').test;
 const fs = require('fs');
 const path = require('path');
@@ -7,8 +5,9 @@ const exec = require('child_process').exec;
 const isBuiltin = require('is-builtin-module');
 
 const Linter = require('eslint').Linter;
-const browserify = require('browserify');
+const rollup = require('rollup');
 
+import rollupConfig from '../../src/style-spec/rollup.config';
 
 // some paths
 const styleSpecDirectory = path.join(__dirname, '../../src/style-spec');
@@ -24,7 +23,7 @@ test('@mapbox/mapbox-gl-style-spec npm package', (t) => {
             });
         });
 
-        exec('npm run build', { cwd: styleSpecDirectory }, (error) => {
+        exec(`rm -f ${styleSpecDistBundle} && npm run build`, { cwd: styleSpecDirectory }, (error) => {
             t.error(error);
             t.ok(fs.existsSync(styleSpecDistBundle), 'dist bundle exists');
 
@@ -40,17 +39,27 @@ test('@mapbox/mapbox-gl-style-spec npm package', (t) => {
             }).map(message => `${message.line}:${message.column}: ${message.message}`);
             t.deepEqual(messages, [], 'distributed bundle is plain ES5 code');
 
-            browserify(styleSpecDirectory, {
-                postFilter: (id) => {
-                    if (!/^[\/\.]/.test(id) && !isBuiltin(id)) {
-                        t.ok(styleSpecPackage.dependencies[id], `External dependency ${id} declared in style-spec's package.json`);
+            t.stub(console, 'warn');
+            rollup.rollup({
+                input: `${styleSpecDirectory}/style-spec.js`,
+                plugins: [{
+                    resolveId: (id, importer) => {
+                        if (
+                            /^[\/\.]/.test(id) ||
+                            isBuiltin(id) ||
+                            /node_modules/.test(importer)
+                        ) {
+                            return null;
+                        }
+
+                        t.ok(styleSpecPackage.dependencies[id], `External dependency ${id} (imported from ${importer}) declared in style-spec's package.json`);
                         return false;
                     }
-                    return true;
-                }
-            }).bundle((err) => {
-                t.error(err);
+                }].concat(rollupConfig[0].plugins)
+            }).then(() => {
                 t.end();
+            }).catch(e => {
+                t.error(e);
             });
         });
     });
diff --git a/test/expression.test.js b/test/expression.test.js
index 50ed7527ffe..ad56802aeda 100644
--- a/test/expression.test.js
+++ b/test/expression.test.js
@@ -1,6 +1,9 @@
-'use strict';
 
-require('flow-remove-types/register');
+/* eslint-disable import/unambiguous, no-global-assign */
+
+require('../build/flow-remove-types.js');
+require = require("@std/esm")(module, true);
+
 const expressionSuite = require('./integration').expression;
 const { createPropertyExpression } = require('../src/style-spec/expression');
 const { toString } = require('../src/style-spec/expression/types');
diff --git a/test/integration/.eslintrc b/test/integration/.eslintrc
index 0a269f42cee..fb847b879a3 100644
--- a/test/integration/.eslintrc
+++ b/test/integration/.eslintrc
@@ -1,4 +1,7 @@
 {
+  "parserOptions": {
+    "sourceType": "script",
+  },
   "plugins": [
     "node"
   ],
diff --git a/test/node_modules/mapbox-gl-js-test.js b/test/node_modules/mapbox-gl-js-test.js
index 7ec1658a133..70a8db88709 100644
--- a/test/node_modules/mapbox-gl-js-test.js
+++ b/test/node_modules/mapbox-gl-js-test.js
@@ -1,9 +1,8 @@
-'use strict';
-
-require('flow-remove-types/register');
-const tap = module.exports = require('tap');
+/* eslint-disable import/unambiguous */
+const tap = require('tap');
 const sinon = require('sinon');
-const util = require('../../src/util/util');
+
+module.exports = tap;
 
 tap.Test.prototype.addAssert('equalWithPrecision', 3, assertEqualWithPrecision);
 
diff --git a/test/query.test.js b/test/query.test.js
index 6cbde8857ea..182c1e15e9a 100644
--- a/test/query.test.js
+++ b/test/query.test.js
@@ -1,6 +1,8 @@
-'use strict';
+/* eslint-disable import/unambiguous,no-global-assign */
 
-require('flow-remove-types/register');
+require('./stub_loader');
+require('../build/flow-remove-types.js');
+require = require("@std/esm")(module, true);
 
 const querySuite = require('./integration').query;
 const suiteImplementation = require('./suite_implementation');
diff --git a/test/render.test.js b/test/render.test.js
index 10c72cbf8b2..2828816c36a 100644
--- a/test/render.test.js
+++ b/test/render.test.js
@@ -1,6 +1,8 @@
-'use strict';
+/* eslint-disable import/unambiguous,no-global-assign */
 
-require('flow-remove-types/register');
+require('./stub_loader');
+require('../build/flow-remove-types.js');
+require = require("@std/esm")(module, true);
 
 const suite = require('./integration').render;
 const suiteImplementation = require('./suite_implementation');
diff --git a/test/stub_loader.js b/test/stub_loader.js
new file mode 100644
index 00000000000..0c742f01fa4
--- /dev/null
+++ b/test/stub_loader.js
@@ -0,0 +1,14 @@
+// Load our stubbed ajax module for the integration suite implementation
+/* eslint-disable import/unambiguous */
+const fs = require('fs');
+const assert = require('assert');
+const pirates = require('pirates');
+
+pirates.addHook((code, filename) => {
+    assert(filename.endsWith('/ajax.js'));
+    return fs.readFileSync(`${__dirname}/ajax_stubs.js`, 'utf-8');
+}, {
+    exts: ['.js'],
+    matcher: filename => filename.endsWith('/ajax.js')
+});
+
diff --git a/test/suite_implementation.js b/test/suite_implementation.js
index 41935e71e1c..703001590be 100644
--- a/test/suite_implementation.js
+++ b/test/suite_implementation.js
@@ -1,16 +1,12 @@
-'use strict';
-
-const ajax =  require('../src/util/ajax');
-const request = require('request');
-const PNG = require('pngjs').PNG;
-const Map = require('../src/ui/map');
-const config = require('../src/util/config');
-const window = require('../src/util/window');
-const browser = require('../src/util/browser');
-const rtlTextPlugin = require('../src/source/rtl_text_plugin');
-const rtlText = require('@mapbox/mapbox-gl-rtl-text');
-const fs = require('fs');
-const path = require('path');
+import {PNG} from 'pngjs';
+import Map from '../src/ui/map';
+import config from '../src/util/config';
+import window from '../src/util/window';
+import browser from '../src/util/browser';
+import {plugin as rtlTextPlugin} from '../src/source/rtl_text_plugin';
+import rtlText from '@mapbox/mapbox-gl-rtl-text';
+import fs from 'fs';
+import path from 'path';
 
 rtlTextPlugin['applyArabicShaping'] = rtlText.applyArabicShaping;
 rtlTextPlugin['processBidirectionalText'] = rtlText.processBidirectionalText;
@@ -150,82 +146,3 @@ module.exports = function(style, options, _callback) {
         }
     }
 };
-
-const cache = {};
-
-function cached(data, callback) {
-    setImmediate(() => {
-        callback(null, data);
-    });
-}
-
-ajax.getJSON = function({ url }, callback) {
-    if (cache[url]) return cached(cache[url], callback);
-    return request(url, (error, response, body) => {
-        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
-            let data;
-            try {
-                data = JSON.parse(body);
-            } catch (err) {
-                return callback(err);
-            }
-            cache[url] = data;
-            callback(null, data);
-        } else {
-            callback(error || new Error(response.statusCode));
-        }
-    });
-};
-
-ajax.getArrayBuffer = function({ url }, callback) {
-    if (cache[url]) return cached(cache[url], callback);
-    return request({ url, encoding: null }, (error, response, body) => {
-        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
-            cache[url] = {data: body};
-            callback(null, {data: body});
-        } else {
-            callback(error || new Error(response.statusCode));
-        }
-    });
-};
-
-ajax.getImage = function({ url }, callback) {
-    if (cache[url]) return cached(cache[url], callback);
-    return request({ url, encoding: null }, (error, response, body) => {
-        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
-            new PNG().parse(body, (err, png) => {
-                if (err) return callback(err);
-                cache[url] = png;
-                callback(null, png);
-            });
-        } else {
-            callback(error || {status: response.statusCode});
-        }
-    });
-};
-
-browser.getImageData = function({width, height, data}) {
-    return {width, height, data: new Uint8Array(data)};
-};
-
-// Hack: since node doesn't have any good video codec modules, just grab a png with
-// the first frame and fake the video API.
-ajax.getVideo = function(urls, callback) {
-    return request({ url: urls[0], encoding: null }, (error, response, body) => {
-        if (!error && response.statusCode >= 200 && response.statusCode < 300) {
-            new PNG().parse(body, (err, png) => {
-                if (err) return callback(err);
-                callback(null, {
-                    readyState: 4, // HAVE_ENOUGH_DATA
-                    addEventListener: function() {},
-                    play: function() {},
-                    width: png.width,
-                    height: png.height,
-                    data: png.data
-                });
-            });
-        } else {
-            callback(error || new Error(response.statusCode));
-        }
-    });
-};
diff --git a/test/unit/data/dem_data.test.js b/test/unit/data/dem_data.test.js
index 74e12f59d6f..949bccfadac 100644
--- a/test/unit/data/dem_data.test.js
+++ b/test/unit/data/dem_data.test.js
@@ -1,10 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const util = require('../../../src/util/util');
-const {DEMData, Level} = require('../../../src/data/dem_data');
-const {RGBAImage} = require('../../../src/util/image');
-const {serialize, deserialize} = require('../../../src/util/web_worker_transfer');
+import { test } from 'mapbox-gl-js-test';
+import { DEMData, Level } from '../../../src/data/dem_data';
+import { RGBAImage } from '../../../src/util/image';
+import { serialize, deserialize } from '../../../src/util/web_worker_transfer';
 
 function createMockImage(height, width) {
     const pixels = new Uint8Array(height * width * 4);
@@ -80,13 +77,13 @@ test('DEMData', (t) => {
 
     t.test('loadFromImage with invalid encoding', (t) => {
         const dem = new DEMData(0, 1);
-        t.stub(util, 'warnOnce');
+        t.stub(console, 'warn');
         t.false(dem.loaded);
         t.equal(dem.uid, 0);
 
         dem.loadFromImage({width: 4, height: 4, data: new Uint8ClampedArray(4 * 4 * 4)}, "derp");
-        t.ok(util.warnOnce.calledOnce);
-        t.ok(util.warnOnce.getCall(0).calledWithMatch(/"derp" is not a valid encoding type/));
+        t.ok(console.warn.calledOnce);
+        t.ok(console.warn.getCall(0).calledWithMatch(/"derp" is not a valid encoding type/));
         t.end();
     });
 
diff --git a/test/unit/data/fill_bucket.test.js b/test/unit/data/fill_bucket.test.js
index d7c17464656..3d05645b0cc 100644
--- a/test/unit/data/fill_bucket.test.js
+++ b/test/unit/data/fill_bucket.test.js
@@ -1,14 +1,12 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
-const path = require('path');
-const Protobuf = require('pbf');
-const VectorTile = require('@mapbox/vector-tile').VectorTile;
-const Point = require('@mapbox/point-geometry');
-const segment = require('../../../src/data/segment');
-const FillBucket = require('../../../src/data/bucket/fill_bucket');
-const FillStyleLayer = require('../../../src/style/style_layer/fill_style_layer');
+import { test } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import Protobuf from 'pbf';
+import { VectorTile } from '@mapbox/vector-tile';
+import Point from '@mapbox/point-geometry';
+import segment from '../../../src/data/segment';
+import FillBucket from '../../../src/data/bucket/fill_bucket';
+import FillStyleLayer from '../../../src/style/style_layer/fill_style_layer';
 
 // Load a fill feature from fixture tile.
 const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf'))));
diff --git a/test/unit/data/line_bucket.test.js b/test/unit/data/line_bucket.test.js
index 574bdacdf4f..4cf4d0d6846 100644
--- a/test/unit/data/line_bucket.test.js
+++ b/test/unit/data/line_bucket.test.js
@@ -1,14 +1,12 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
-const path = require('path');
-const Protobuf = require('pbf');
-const VectorTile = require('@mapbox/vector-tile').VectorTile;
-const Point = require('@mapbox/point-geometry');
-const segment = require('../../../src/data/segment');
-const LineBucket = require('../../../src/data/bucket/line_bucket');
-const LineStyleLayer = require('../../../src/style/style_layer/line_style_layer');
+import { test } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import Protobuf from 'pbf';
+import { VectorTile } from '@mapbox/vector-tile';
+import Point from '@mapbox/point-geometry';
+import segment from '../../../src/data/segment';
+import LineBucket from '../../../src/data/bucket/line_bucket';
+import LineStyleLayer from '../../../src/style/style_layer/line_style_layer';
 
 // Load a line feature from fixture tile.
 const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf'))));
@@ -100,6 +98,8 @@ test('LineBucket', (t) => {
 });
 
 test('LineBucket segmentation', (t) => {
+    t.stub(console, 'warn');
+
     // Stub MAX_VERTEX_ARRAY_LENGTH so we can test features
     // breaking across array groups without tests taking a _long_ time.
     t.stub(segment, 'MAX_VERTEX_ARRAY_LENGTH').value(256);
@@ -133,5 +133,7 @@ test('LineBucket segmentation', (t) => {
         primitiveLength: 254
     }]);
 
+    t.equal(console.warn.callCount, 1);
+
     t.end();
 });
diff --git a/test/unit/data/load_geometry.test.js b/test/unit/data/load_geometry.test.js
index 624f69ba14f..93cd2982000 100644
--- a/test/unit/data/load_geometry.test.js
+++ b/test/unit/data/load_geometry.test.js
@@ -1,11 +1,9 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
-const path = require('path');
-const Protobuf = require('pbf');
-const VectorTile = require('@mapbox/vector-tile').VectorTile;
-const loadGeometry = require('../../../src/data/load_geometry.js');
+import { test } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import Protobuf from 'pbf';
+import { VectorTile } from '@mapbox/vector-tile';
+import loadGeometry from '../../../src/data/load_geometry.js';
 
 // Load a line feature from fixture tile.
 const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf'))));
diff --git a/test/unit/data/symbol_bucket.test.js b/test/unit/data/symbol_bucket.test.js
index 7b90bfe58da..22905c7426b 100644
--- a/test/unit/data/symbol_bucket.test.js
+++ b/test/unit/data/symbol_bucket.test.js
@@ -1,21 +1,18 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
-const path = require('path');
-const Protobuf = require('pbf');
-const VectorTile = require('@mapbox/vector-tile').VectorTile;
-const SymbolBucket = require('../../../src/data/bucket/symbol_bucket');
-const {CollisionBoxArray} = require('../../../src/data/array_types');
-const SymbolStyleLayer = require('../../../src/style/style_layer/symbol_style_layer');
-const util = require('../../../src/util/util');
-const featureFilter = require('../../../src/style-spec/feature_filter');
-const {performSymbolLayout} = require('../../../src/symbol/symbol_layout');
-const Placement = require('../../../src/symbol/placement');
-const Transform = require('../../../src/geo/transform');
-const {OverscaledTileID} = require('../../../src/source/tile_id');
-const Tile = require('../../../src/source/tile');
-const CrossTileSymbolIndex = require('../../../src/symbol/cross_tile_symbol_index');
+import { test } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import Protobuf from 'pbf';
+import { VectorTile } from '@mapbox/vector-tile';
+import SymbolBucket from '../../../src/data/bucket/symbol_bucket';
+import { CollisionBoxArray } from '../../../src/data/array_types';
+import SymbolStyleLayer from '../../../src/style/style_layer/symbol_style_layer';
+import featureFilter from '../../../src/style-spec/feature_filter';
+import { performSymbolLayout } from '../../../src/symbol/symbol_layout';
+import Placement from '../../../src/symbol/placement';
+import Transform from '../../../src/geo/transform';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import Tile from '../../../src/source/tile';
+import CrossTileSymbolIndex from '../../../src/symbol/cross_tile_symbol_index';
 
 // Load a point feature from fixture tile.
 const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf'))));
@@ -85,7 +82,7 @@ test('SymbolBucket', (t) => {
 });
 
 test('SymbolBucket integer overflow', (t) => {
-    t.stub(util, 'warnOnce');
+    t.stub(console, 'warn');
     t.stub(SymbolBucket, 'MAX_GLYPHS').value(5);
 
     const bucket = bucketSetup();
@@ -95,7 +92,7 @@ test('SymbolBucket integer overflow', (t) => {
     const fakeGlyph = { rect: { w: 10, h: 10 }, metrics: { left: 10, top: 10, advance: 10 } };
     performSymbolLayout(bucket, stacks, { 'Test': {97: fakeGlyph, 98: fakeGlyph, 99: fakeGlyph, 100: fakeGlyph, 101: fakeGlyph, 102: fakeGlyph} });
 
-    t.ok(util.warnOnce.calledOnce);
-    t.ok(util.warnOnce.getCall(0).calledWithMatch(/Too many glyphs being rendered in a tile./));
+    t.ok(console.warn.calledOnce);
+    t.ok(console.warn.getCall(0).calledWithMatch(/Too many glyphs being rendered in a tile./));
     t.end();
 });
diff --git a/test/unit/data/vertex_buffer.test.js b/test/unit/data/vertex_buffer.test.js
index 8e7ca10006b..67c5dab6a65 100644
--- a/test/unit/data/vertex_buffer.test.js
+++ b/test/unit/data/vertex_buffer.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const VertexBuffer = require('../../../src/gl/vertex_buffer');
-const {StructArrayLayout3i6} = require('../../../src/data/array_types');
-const Context = require('../../../src/gl/context');
+import { test } from 'mapbox-gl-js-test';
+import VertexBuffer from '../../../src/gl/vertex_buffer';
+import { StructArrayLayout3i6 } from '../../../src/data/array_types';
+import Context from '../../../src/gl/context';
 
 test('VertexBuffer', (t) => {
     class TestArray extends StructArrayLayout3i6 {}
diff --git a/test/unit/geo/coordinate.test.js b/test/unit/geo/coordinate.test.js
index cc3565b029e..944cb41a52b 100644
--- a/test/unit/geo/coordinate.test.js
+++ b/test/unit/geo/coordinate.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Coordinate = require('../../../src/geo/coordinate');
+import { test } from 'mapbox-gl-js-test';
+import Coordinate from '../../../src/geo/coordinate';
 
 test('Coordinate', (t) => {
     t.test('#constructor', (t) => {
diff --git a/test/unit/geo/lng_lat.test.js b/test/unit/geo/lng_lat.test.js
index 3f96b6c725e..b82c51cbfc4 100644
--- a/test/unit/geo/lng_lat.test.js
+++ b/test/unit/geo/lng_lat.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const LngLat = require('../../../src/geo/lng_lat');
+import { test } from 'mapbox-gl-js-test';
+import LngLat from '../../../src/geo/lng_lat';
 
 test('LngLat', (t) => {
     t.test('#constructor', (t) => {
diff --git a/test/unit/geo/lng_lat_bounds.test.js b/test/unit/geo/lng_lat_bounds.test.js
index d1156cdd3db..a4dbcacb744 100644
--- a/test/unit/geo/lng_lat_bounds.test.js
+++ b/test/unit/geo/lng_lat_bounds.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const LngLat = require('../../../src/geo/lng_lat');
-const LngLatBounds = require('../../../src/geo/lng_lat_bounds');
+import { test } from 'mapbox-gl-js-test';
+import LngLat from '../../../src/geo/lng_lat';
+import LngLatBounds from '../../../src/geo/lng_lat_bounds';
 
 test('LngLatBounds', (t) => {
     t.test('#constructor', (t) => {
diff --git a/test/unit/geo/transform.test.js b/test/unit/geo/transform.test.js
index dc1681e0e4c..c8cc5551209 100644
--- a/test/unit/geo/transform.test.js
+++ b/test/unit/geo/transform.test.js
@@ -1,12 +1,9 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Point = require('@mapbox/point-geometry');
-const Transform = require('../../../src/geo/transform');
-const LngLat = require('../../../src/geo/lng_lat');
-const {OverscaledTileID, CanonicalTileID} = require('../../../src/source/tile_id');
-
-const fixed = require('mapbox-gl-js-test/fixed');
+import { test } from 'mapbox-gl-js-test';
+import Point from '@mapbox/point-geometry';
+import Transform from '../../../src/geo/transform';
+import LngLat from '../../../src/geo/lng_lat';
+import { OverscaledTileID, CanonicalTileID } from '../../../src/source/tile_id';
+import fixed from 'mapbox-gl-js-test/fixed';
 const fixedLngLat = fixed.LngLat;
 const fixedCoord = fixed.Coord;
 
diff --git a/test/unit/gl/state.test.js b/test/unit/gl/state.test.js
index 3caada9f7fb..4d31e93d686 100644
--- a/test/unit/gl/state.test.js
+++ b/test/unit/gl/state.test.js
@@ -1,38 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const {
-    ClearColor,
-    ClearDepth,
-    ClearStencil,
-    ColorMask,
-    DepthMask,
-    StencilMask,
-    StencilFunc,
-    StencilOp,
-    StencilTest,
-    DepthRange,
-    DepthTest,
-    DepthFunc,
-    Blend,
-    BlendFunc,
-    BlendColor,
-    Program,
-    LineWidth,
-    ActiveTextureUnit,
-    Viewport,
-    BindFramebuffer,
-    BindRenderbuffer,
-    BindTexture,
-    BindVertexBuffer,
-    BindElementBuffer,
-    BindVertexArrayOES,
-    PixelStoreUnpack,
-    PixelStoreUnpackPremultiplyAlpha
-} = require('../../../src/gl/value');
-const Context = require('../../../src/gl/context');
-const Color = require('../../../src/style-spec/util/color');
-const {deepEqual} = require('../../../src/util/util');
+import { test } from 'mapbox-gl-js-test';
+import { ClearColor, ClearDepth, ClearStencil, ColorMask, DepthMask, StencilMask, StencilFunc, StencilOp, StencilTest, DepthRange, DepthTest, DepthFunc, Blend, BlendFunc, BlendColor, Program, LineWidth, ActiveTextureUnit, Viewport, BindFramebuffer, BindRenderbuffer, BindTexture, BindVertexBuffer, BindElementBuffer, BindVertexArrayOES, PixelStoreUnpack, PixelStoreUnpackPremultiplyAlpha } from '../../../src/gl/value';
+import Context from '../../../src/gl/context';
+import Color from '../../../src/style-spec/util/color';
+import { deepEqual } from '../../../src/util/util';
 
 const context = new Context(require('gl')(10, 10));
 context.lineWidthRange = [0, 1];
diff --git a/test/unit/mapbox-gl.js b/test/unit/mapbox-gl.js
index d47e3b3728f..6e5b91e3cbc 100644
--- a/test/unit/mapbox-gl.js
+++ b/test/unit/mapbox-gl.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const mapboxgl = require('../../src');
+import { test } from 'mapbox-gl-js-test';
+import mapboxgl from '../../src';
 
 test('mapboxgl', (t) => {
     t.test('version', (t) => {
diff --git a/test/unit/render/glyph_manager.test.js b/test/unit/render/glyph_manager.test.js
index 55d155b24f4..016fb85b3a6 100644
--- a/test/unit/render/glyph_manager.test.js
+++ b/test/unit/render/glyph_manager.test.js
@@ -1,11 +1,7 @@
-// @flow
-
-'use strict';
-
-const {test} = require('mapbox-gl-js-test');
-const proxyquire = require('proxyquire');
-const parseGlyphPBF = require('../../../src/style/parse_glyph_pbf');
-const fs = require('fs');
+import { test } from 'mapbox-gl-js-test';
+import parseGlyphPBF from '../../../src/style/parse_glyph_pbf';
+import GlyphManager from '../../../src/render/glyph_manager';
+import fs from 'fs';
 
 const glyphs = {};
 for (const glyph of parseGlyphPBF(fs.readFileSync('./test/fixtures/0-255.pbf'))) {
@@ -14,14 +10,12 @@ for (const glyph of parseGlyphPBF(fs.readFileSync('./test/fixtures/0-255.pbf')))
 
 test('GlyphManager requests 0-255 PBF', (t) => {
     const identityTransform = (url) => ({url});
-    const GlyphManager = proxyquire('../../../src/render/glyph_manager', {
-        '../style/load_glyph_range': (stack, range, urlTemplate, transform, callback) => {
-            t.equal(stack, 'Arial Unicode MS');
-            t.equal(range, 0);
-            t.equal(urlTemplate, 'https://localhost/fonts/v1/{fontstack}/{range}.pbf');
-            t.equal(transform, identityTransform);
-            setImmediate(() => callback(null, glyphs));
-        }
+    t.stub(GlyphManager, 'loadGlyphRange').callsFake((stack, range, urlTemplate, transform, callback) => {
+        t.equal(stack, 'Arial Unicode MS');
+        t.equal(range, 0);
+        t.equal(urlTemplate, 'https://localhost/fonts/v1/{fontstack}/{range}.pbf');
+        t.equal(transform, identityTransform);
+        setImmediate(() => callback(null, glyphs));
     });
 
     const manager = new GlyphManager(identityTransform);
@@ -35,10 +29,8 @@ test('GlyphManager requests 0-255 PBF', (t) => {
 });
 
 test('GlyphManager requests remote CJK PBF', (t) => {
-    const GlyphManager = proxyquire('../../../src/render/glyph_manager', {
-        '../style/load_glyph_range': (stack, range, urlTemplate, transform, callback) => {
-            setImmediate(() => callback(null, glyphs));
-        }
+    t.stub(GlyphManager, 'loadGlyphRange').callsFake((stack, range, urlTemplate, transform, callback) => {
+        setImmediate(() => callback(null, glyphs));
     });
 
     const manager = new GlyphManager((url) => ({url}));
@@ -52,10 +44,10 @@ test('GlyphManager requests remote CJK PBF', (t) => {
 });
 
 test('GlyphManager generates CJK PBF locally', (t) => {
-    const GlyphManager = proxyquire('../../../src/render/glyph_manager', {
-        '@mapbox/tiny-sdf': class {
-            // Return empty 30x30 bitmap (24 fontsize + 3 * 2 buffer)
-            draw() { return new Uint8ClampedArray(900); }
+    t.stub(GlyphManager, 'TinySDF').value(class {
+        // Return empty 30x30 bitmap (24 fontsize + 3 * 2 buffer)
+        draw() {
+            return new Uint8ClampedArray(900);
         }
     });
 
diff --git a/test/unit/shaders/encode_attribute.test.js b/test/unit/shaders/encode_attribute.test.js
index dcf4d82d12b..6cf2517924d 100644
--- a/test/unit/shaders/encode_attribute.test.js
+++ b/test/unit/shaders/encode_attribute.test.js
@@ -1,15 +1,13 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const encode = require('../../../src/shaders/encode_attribute');
+import { test } from 'mapbox-gl-js-test';
+import { packUint8ToFloat } from '../../../src/shaders/encode_attribute';
 
 test('packUint8ToFloat', (t) => {
-    t.equal(encode.packUint8ToFloat(0, 0), 0);
-    t.equal(encode.packUint8ToFloat(255, 255), 65535);
-    t.equal(encode.packUint8ToFloat(123, 45), 31533);
+    t.equal(packUint8ToFloat(0, 0), 0);
+    t.equal(packUint8ToFloat(255, 255), 65535);
+    t.equal(packUint8ToFloat(123, 45), 31533);
 
-    t.equal(encode.packUint8ToFloat(-1, -1), 0);
-    t.equal(encode.packUint8ToFloat(256, 256), 65535);
+    t.equal(packUint8ToFloat(-1, -1), 0);
+    t.equal(packUint8ToFloat(256, 256), 65535);
 
     t.end();
 });
diff --git a/test/unit/source/canvas_source.test.js b/test/unit/source/canvas_source.test.js
index 7b610dfdf75..b87d29f04ce 100644
--- a/test/unit/source/canvas_source.test.js
+++ b/test/unit/source/canvas_source.test.js
@@ -1,11 +1,9 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const CanvasSource = require('../../../src/source/canvas_source');
-const Transform = require('../../../src/geo/transform');
-const {Event, Evented} = require('../../../src/util/evented');
-const util = require('../../../src/util/util');
-const window = require('../../../src/util/window');
+import { test } from 'mapbox-gl-js-test';
+import CanvasSource from '../../../src/source/canvas_source';
+import Transform from '../../../src/geo/transform';
+import { Event, Evented } from '../../../src/util/evented';
+import { extend } from '../../../src/util/util';
+import window from '../../../src/util/window';
 
 function createSource(options) {
     window.useFakeHTMLCanvasGetContext();
@@ -14,7 +12,7 @@ function createSource(options) {
     c.width = 20;
     c.height = 20;
 
-    options = util.extend({
+    options = extend({
         canvas: 'id',
         coordinates: [[0, 0], [1, 0], [1, 1], [0, 1]],
     }, options);
diff --git a/test/unit/source/geojson_source.test.js b/test/unit/source/geojson_source.test.js
index 5bf8861bfef..55bc6dfcc1f 100644
--- a/test/unit/source/geojson_source.test.js
+++ b/test/unit/source/geojson_source.test.js
@@ -1,12 +1,10 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Tile = require('../../../src/source/tile');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
-const GeoJSONSource = require('../../../src/source/geojson_source');
-const Transform = require('../../../src/geo/transform');
-const LngLat = require('../../../src/geo/lng_lat');
-const util = require('../../../src/util/util');
+import { test } from 'mapbox-gl-js-test';
+import Tile from '../../../src/source/tile';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import GeoJSONSource from '../../../src/source/geojson_source';
+import Transform from '../../../src/geo/transform';
+import LngLat from '../../../src/geo/lng_lat';
+import { extend } from '../../../src/util/util';
 
 const mockDispatcher = {
     send: function () {}
@@ -49,7 +47,7 @@ const hawkHill = {
 test('GeoJSONSource#setData', (t) => {
     function createSource(opts) {
         opts = opts || {};
-        opts = util.extend(opts, { data: {} });
+        opts = extend(opts, { data: {} });
         return new GeoJSONSource('id', opts, {
             send: function (type, data, callback) {
                 if (callback) {
diff --git a/test/unit/source/geojson_worker_source.test.js b/test/unit/source/geojson_worker_source.test.js
index 13ddace1402..e5256ba42e0 100644
--- a/test/unit/source/geojson_worker_source.test.js
+++ b/test/unit/source/geojson_worker_source.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const GeoJSONWorkerSource = require('../../../src/source/geojson_worker_source');
-const StyleLayerIndex = require('../../../src/style/style_layer_index');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
-const perf = require('../../../src/util/performance');
+import { test } from 'mapbox-gl-js-test';
+import GeoJSONWorkerSource from '../../../src/source/geojson_worker_source';
+import StyleLayerIndex from '../../../src/style/style_layer_index';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import perf from '../../../src/util/performance';
 
 test('reloadTile', (t) => {
     t.test('does not rebuild vector data unless data has changed', (t) => {
diff --git a/test/unit/source/geojson_wrapper.test.js b/test/unit/source/geojson_wrapper.test.js
index 8a2c17e0ac4..1c5ae05ba16 100644
--- a/test/unit/source/geojson_wrapper.test.js
+++ b/test/unit/source/geojson_wrapper.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Wrapper = require('../../../src/source/geojson_wrapper');
+import { test } from 'mapbox-gl-js-test';
+import Wrapper from '../../../src/source/geojson_wrapper';
 
 test('geojsonwrapper', (t) => {
 
diff --git a/test/unit/source/image_source.test.js b/test/unit/source/image_source.test.js
index 85ab7e0e701..a2b01313371 100644
--- a/test/unit/source/image_source.test.js
+++ b/test/unit/source/image_source.test.js
@@ -1,15 +1,14 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const ImageSource = require('../../../src/source/image_source');
-const {Evented} = require('../../../src/util/evented');
-const Transform = require('../../../src/geo/transform');
-const util = require('../../../src/util/util');
-const ajax = require('../../../src/util/ajax');
-const browser = require('../../../src/util/browser');
+import { test } from 'mapbox-gl-js-test';
+import assert from 'assert';
+import ImageSource from '../../../src/source/image_source';
+import { Evented } from '../../../src/util/evented';
+import Transform from '../../../src/geo/transform';
+import { extend } from '../../../src/util/util';
+import browser from '../../../src/util/browser';
+import window from '../../../src/util/window';
 
 function createSource(options) {
-    options = util.extend({
+    options = extend({
         coordinates: [[0, 0], [1, 0], [1, 1], [0, 1]]
     }, options);
 
@@ -29,8 +28,26 @@ class StubMap extends Evented {
 }
 
 test('ImageSource', (t) => {
-
-    t.stub(ajax, 'getImage').callsFake((params, callback) => callback(null, {}));
+    window.useFakeXMLHttpRequest();
+    // stub this manually because sinon does not stub non-existent methods
+    assert(!window.URL.createObjectURL);
+    window.URL.createObjectURL = () => 'blob:';
+    t.tearDown(() => delete window.URL.createObjectURL);
+    // stub Image so we can invoke 'onload'
+    // https://github.com/jsdom/jsdom/commit/58a7028d0d5b6aacc5b435daee9fd8f9eacbb14c
+    const img = {};
+    t.stub(window, 'Image').returns(img);
+    // fake the image request (sinon doesn't allow non-string data for
+    // server.respondWith, so we do so manually)
+    const requests = [];
+    window.XMLHttpRequest.onCreate = req => { requests.push(req); };
+    const respond = () => {
+        const req = requests.shift();
+        req.setStatus(200);
+        req.response = new ArrayBuffer(1);
+        req.onload();
+        img.onload();
+    };
     t.stub(browser, 'getImageData').callsFake(() => new ArrayBuffer(1));
 
     t.test('constructor', (t) => {
@@ -49,6 +66,7 @@ test('ImageSource', (t) => {
             t.end();
         });
         source.onAdd(new StubMap());
+        respond();
     });
 
     t.test('transforms url request', (t) => {
@@ -56,6 +74,7 @@ test('ImageSource', (t) => {
         const map = new StubMap();
         const spy = t.spy(map, '_transformRequest');
         source.onAdd(map);
+        respond();
         t.ok(spy.calledOnce);
         t.equal(spy.getCall(0).args[0], '/image.png');
         t.equal(spy.getCall(0).args[1], 'Image');
@@ -71,6 +90,7 @@ test('ImageSource', (t) => {
             }
         });
         source.onAdd(new StubMap());
+        respond();
     });
 
     t.test('fires data event when metadata is loaded', (t) => {
@@ -81,6 +101,7 @@ test('ImageSource', (t) => {
             }
         });
         source.onAdd(new StubMap());
+        respond();
     });
 
     t.test('serialize url and coordinates', (t) => {
diff --git a/test/unit/source/query_features.test.js b/test/unit/source/query_features.test.js
index 017219e110a..8cafdaf79e1 100644
--- a/test/unit/source/query_features.test.js
+++ b/test/unit/source/query_features.test.js
@@ -1,15 +1,16 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const QueryFeatures = require('../../../src/source/query_features.js');
-const SourceCache = require('../../../src/source/source_cache.js');
-const Transform = require('../../../src/geo/transform.js');
+import { test } from 'mapbox-gl-js-test';
+import {
+    queryRenderedFeatures,
+    querySourceFeatures
+} from '../../../src/source/query_features.js';
+import SourceCache from '../../../src/source/source_cache.js';
+import Transform from '../../../src/geo/transform.js';
 
 test('QueryFeatures#rendered', (t) => {
     t.test('returns empty object if source returns no tiles', (t) => {
-        const mockSourceCache = { tilesIn: function () { return []; }};
+        const mockSourceCache = { tilesIn: function () { return []; } };
         const transform = new Transform();
-        const result = QueryFeatures.rendered(mockSourceCache, undefined, undefined, undefined, transform);
+        const result = queryRenderedFeatures(mockSourceCache, undefined, undefined, undefined, transform);
         t.deepEqual(result, []);
         t.end();
     });
@@ -25,7 +26,7 @@ test('QueryFeatures#source', (t) => {
         }, {
             send: function (type, params, callback) { return callback(); }
         });
-        const result = QueryFeatures.source(sourceCache, {});
+        const result = querySourceFeatures(sourceCache, {});
         t.deepEqual(result, []);
         t.end();
     });
diff --git a/test/unit/source/raster_dem_tile_source.test.js b/test/unit/source/raster_dem_tile_source.test.js
index 246291dabe9..73c45ae6d55 100644
--- a/test/unit/source/raster_dem_tile_source.test.js
+++ b/test/unit/source/raster_dem_tile_source.test.js
@@ -1,8 +1,7 @@
-'use strict';
-const test = require('mapbox-gl-js-test').test;
-const RasterDEMTileSource = require('../../../src/source/raster_dem_tile_source');
-const window = require('../../../src/util/window');
-const {OverscaledTileID} = require('../../../src/source/tile_id');
+import { test } from 'mapbox-gl-js-test';
+import RasterDEMTileSource from '../../../src/source/raster_dem_tile_source';
+import window from '../../../src/util/window';
+import { OverscaledTileID } from '../../../src/source/tile_id';
 
 function createSource(options, transformCallback) {
     const source = new RasterDEMTileSource('id', options, { send: function() {} }, options.eventedParent);
diff --git a/test/unit/source/raster_dem_tile_worker_source.test.js b/test/unit/source/raster_dem_tile_worker_source.test.js
index c9581562f18..4d068e08ff3 100644
--- a/test/unit/source/raster_dem_tile_worker_source.test.js
+++ b/test/unit/source/raster_dem_tile_worker_source.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const RasterDEMTileWorkerSource = require('../../../src/source/raster_dem_tile_worker_source');
-const StyleLayerIndex = require('../../../src/style/style_layer_index');
-const {DEMData} = require('../../../src/data/dem_data');
+import { test } from 'mapbox-gl-js-test';
+import RasterDEMTileWorkerSource from '../../../src/source/raster_dem_tile_worker_source';
+import StyleLayerIndex from '../../../src/style/style_layer_index';
+import { DEMData } from '../../../src/data/dem_data';
 
 test('loadTile', (t) => {
     t.test('loads DEM tile', (t) => {
diff --git a/test/unit/source/raster_tile_source.test.js b/test/unit/source/raster_tile_source.test.js
index da8604b882a..6309e86f91e 100644
--- a/test/unit/source/raster_tile_source.test.js
+++ b/test/unit/source/raster_tile_source.test.js
@@ -1,8 +1,7 @@
-'use strict';
-const test = require('mapbox-gl-js-test').test;
-const RasterTileSource = require('../../../src/source/raster_tile_source');
-const window = require('../../../src/util/window');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
+import { test } from 'mapbox-gl-js-test';
+import RasterTileSource from '../../../src/source/raster_tile_source';
+import window from '../../../src/util/window';
+import { OverscaledTileID } from '../../../src/source/tile_id';
 
 function createSource(options, transformCallback) {
     const source = new RasterTileSource('id', options, { send: function() {} }, options.eventedParent);
diff --git a/test/unit/source/source_cache.test.js b/test/unit/source/source_cache.test.js
index af205890bc5..3fe7b26beb6 100644
--- a/test/unit/source/source_cache.test.js
+++ b/test/unit/source/source_cache.test.js
@@ -1,16 +1,14 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const SourceCache = require('../../../src/source/source_cache');
-const Source = require('../../../src/source/source');
-const Tile = require('../../../src/source/tile');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
-const Transform = require('../../../src/geo/transform');
-const LngLat = require('../../../src/geo/lng_lat');
-const Coordinate = require('../../../src/geo/coordinate');
-const {Event, ErrorEvent, Evented} = require('../../../src/util/evented');
-const util = require('../../../src/util/util');
-const browser = require('../../../src/util/browser');
+import { test } from 'mapbox-gl-js-test';
+import SourceCache from '../../../src/source/source_cache';
+import {setType} from '../../../src/source/source';
+import Tile from '../../../src/source/tile';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import Transform from '../../../src/geo/transform';
+import LngLat from '../../../src/geo/lng_lat';
+import Coordinate from '../../../src/geo/coordinate';
+import { Event, ErrorEvent, Evented } from '../../../src/util/evented';
+import { extend } from '../../../src/util/util';
+import browser from '../../../src/util/browser';
 
 // Add a mocked source type for use in these tests
 function MockSourceType(id, sourceOptions, _dispatcher, eventedParent) {
@@ -22,7 +20,7 @@ function MockSourceType(id, sourceOptions, _dispatcher, eventedParent) {
             this.id = id;
             this.minzoom = 0;
             this.maxzoom = 22;
-            util.extend(this, sourceOptions);
+            extend(this, sourceOptions);
             this.setEventedParent(eventedParent);
             if (sourceOptions.hasTile) {
                 this.hasTile = sourceOptions.hasTile;
@@ -53,10 +51,10 @@ function MockSourceType(id, sourceOptions, _dispatcher, eventedParent) {
     return source;
 }
 
-Source.setType('mock-source-type', MockSourceType);
+setType('mock-source-type', MockSourceType);
 
 function createSourceCache(options, used) {
-    const sc = new SourceCache('id', util.extend({
+    const sc = new SourceCache('id', extend({
         tileSize: 512,
         minzoom: 0,
         maxzoom: 14,
diff --git a/test/unit/source/tile.test.js b/test/unit/source/tile.test.js
index d9d62069933..7a06dd9f9f1 100644
--- a/test/unit/source/tile.test.js
+++ b/test/unit/source/tile.test.js
@@ -1,17 +1,15 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Tile = require('../../../src/source/tile');
-const GeoJSONWrapper = require('../../../src/source/geojson_wrapper');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
-const fs = require('fs');
-const path = require('path');
-const vtpbf = require('vt-pbf');
-const FeatureIndex = require('../../../src/data/feature_index');
-const {CollisionBoxArray} = require('../../../src/data/array_types');
-const util = require('../../../src/util/util');
-const Context = require('../../../src/gl/context');
-const {serialize} = require('../../../src/util/web_worker_transfer');
+import { test } from 'mapbox-gl-js-test';
+import Tile from '../../../src/source/tile';
+import GeoJSONWrapper from '../../../src/source/geojson_wrapper';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import fs from 'fs';
+import path from 'path';
+import vtpbf from 'vt-pbf';
+import FeatureIndex from '../../../src/data/feature_index';
+import { CollisionBoxArray } from '../../../src/data/array_types';
+import { extend } from '../../../src/util/util';
+import Context from '../../../src/gl/context';
+import { serialize } from '../../../src/util/web_worker_transfer';
 
 test('querySourceFeatures', (t) => {
     const features = [{
@@ -309,7 +307,7 @@ function createRawTileData() {
 
 function createVectorData(options) {
     const collisionBoxArray = new CollisionBoxArray();
-    return util.extend({
+    return extend({
         collisionBoxArray: serialize(collisionBoxArray),
         featureIndex: serialize(new FeatureIndex(new OverscaledTileID(1, 0, 1, 1, 1))),
         buckets: []
diff --git a/test/unit/source/tile_id.test.js b/test/unit/source/tile_id.test.js
index de8e55a756a..c133c19439e 100644
--- a/test/unit/source/tile_id.test.js
+++ b/test/unit/source/tile_id.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const {CanonicalTileID, OverscaledTileID} = require('../../../src/source/tile_id');
+import { test } from 'mapbox-gl-js-test';
+import { CanonicalTileID, OverscaledTileID } from '../../../src/source/tile_id';
 
 test('CanonicalTileID', (t) => {
     t.test('#constructor', (t) => {
diff --git a/test/unit/source/tile_mask.test.js b/test/unit/source/tile_mask.test.js
index f451d83fcf9..a2b91100a18 100644
--- a/test/unit/source/tile_mask.test.js
+++ b/test/unit/source/tile_mask.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const updateTileMasks = require('../../../src/render/tile_mask');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
+import { test } from 'mapbox-gl-js-test';
+import updateTileMasks from '../../../src/render/tile_mask';
+import { OverscaledTileID } from '../../../src/source/tile_id';
 
 
 test('computeTileMasks', (t) => {
diff --git a/test/unit/source/vector_tile_source.test.js b/test/unit/source/vector_tile_source.test.js
index 661ceaef224..bf11a5ed2a7 100644
--- a/test/unit/source/vector_tile_source.test.js
+++ b/test/unit/source/vector_tile_source.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const VectorTileSource = require('../../../src/source/vector_tile_source');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
-const window = require('../../../src/util/window');
-const {Evented} = require('../../../src/util/evented');
+import { test } from 'mapbox-gl-js-test';
+import VectorTileSource from '../../../src/source/vector_tile_source';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import window from '../../../src/util/window';
+import { Evented } from '../../../src/util/evented';
 
 function createSource(options, transformCallback) {
     const source = new VectorTileSource('id', options, { send: function() {} }, options.eventedParent);
diff --git a/test/unit/source/vector_tile_worker_source.test.js b/test/unit/source/vector_tile_worker_source.test.js
index 1d218693745..732eea7f3b4 100644
--- a/test/unit/source/vector_tile_worker_source.test.js
+++ b/test/unit/source/vector_tile_worker_source.test.js
@@ -1,13 +1,11 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const vt = require('@mapbox/vector-tile');
-const Protobuf = require('pbf');
-const test = require('mapbox-gl-js-test').test;
-const VectorTileWorkerSource = require('../../../src/source/vector_tile_worker_source');
-const StyleLayerIndex = require('../../../src/style/style_layer_index');
-const perf = require('../../../src/util/performance');
+import fs from 'fs';
+import path from 'path';
+import vt from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import { test } from 'mapbox-gl-js-test';
+import VectorTileWorkerSource from '../../../src/source/vector_tile_worker_source';
+import StyleLayerIndex from '../../../src/style/style_layer_index';
+import perf from '../../../src/util/performance';
 
 test('abortTile', (t) => {
     t.test('aborts pending request', (t) => {
diff --git a/test/unit/source/worker.test.js b/test/unit/source/worker.test.js
index 6b7b86a6b0a..1f1d3107c82 100644
--- a/test/unit/source/worker.test.js
+++ b/test/unit/source/worker.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Worker = require('../../../src/source/worker');
-const window = require('../../../src/util/window');
+import { test } from 'mapbox-gl-js-test';
+import Worker from '../../../src/source/worker';
+import window from '../../../src/util/window';
 
 const _self = {
     addEventListener: function() {}
diff --git a/test/unit/source/worker_tile.test.js b/test/unit/source/worker_tile.test.js
index 6f56780a63b..e2e2d530513 100644
--- a/test/unit/source/worker_tile.test.js
+++ b/test/unit/source/worker_tile.test.js
@@ -1,11 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const WorkerTile = require('../../../src/source/worker_tile');
-const Wrapper = require('../../../src/source/geojson_wrapper');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
-const StyleLayerIndex = require('../../../src/style/style_layer_index');
-const util = require('../../../src/util/util');
+import { test } from 'mapbox-gl-js-test';
+import WorkerTile from '../../../src/source/worker_tile';
+import Wrapper from '../../../src/source/geojson_wrapper';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import StyleLayerIndex from '../../../src/style/style_layer_index';
 
 function createWorkerTile() {
     return new WorkerTile({
@@ -90,12 +87,12 @@ test('WorkerTile#parse warns once when encountering a v1 vector tile layer', (t)
         }
     };
 
-    t.stub(util, 'warnOnce');
+    t.stub(console, 'warn');
 
     const tile = createWorkerTile();
     tile.parse(data, layerIndex, {}, (err) => {
         t.ifError(err);
-        t.ok(util.warnOnce.calledWithMatch(/does not use vector tile spec v2/));
+        t.ok(console.warn.calledWithMatch(/does not use vector tile spec v2/));
         t.end();
     });
 });
diff --git a/test/unit/style-spec/color.js b/test/unit/style-spec/color.js
index a874bee9217..77c1407940a 100644
--- a/test/unit/style-spec/color.js
+++ b/test/unit/style-spec/color.js
@@ -1,9 +1,7 @@
 // @flow
 
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Color = require('../../../src/style-spec/util/color');
+import { test } from 'mapbox-gl-js-test';
+import Color from '../../../src/style-spec/util/color';
 
 test('Color.parse', (t) => {
     t.deepEqual(Color.parse('red'), new Color(1, 0, 0, 1));
diff --git a/test/unit/style-spec/composite.test.js b/test/unit/style-spec/composite.test.js
index 40d0f8f6c75..05d47a673c6 100644
--- a/test/unit/style-spec/composite.test.js
+++ b/test/unit/style-spec/composite.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const composite = require('../../../src/style-spec/composite');
+import { test } from 'mapbox-gl-js-test';
+import composite from '../../../src/style-spec/composite';
 
 test('composites Mapbox vector sources', (t) => {
     const result = composite({
diff --git a/test/unit/style-spec/convert_function.test.js b/test/unit/style-spec/convert_function.test.js
index 07e97864ea0..3901871b9ca 100644
--- a/test/unit/style-spec/convert_function.test.js
+++ b/test/unit/style-spec/convert_function.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const convertFunction = require('../../../src/style-spec/function/convert');
+import { test } from 'mapbox-gl-js-test';
+import convertFunction from '../../../src/style-spec/function/convert';
 
 test('convertFunction', (t) => {
     t.test('feature-constant text-field with token replacement', (t) => {
diff --git a/test/unit/style-spec/declass.test.js b/test/unit/style-spec/declass.test.js
index 5f9b4a01765..a692184e7c7 100644
--- a/test/unit/style-spec/declass.test.js
+++ b/test/unit/style-spec/declass.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const t = require('mapbox-gl-js-test').test;
-const declass = require('../../../src/style-spec/declass');
+import { test as t } from 'mapbox-gl-js-test';
+import declass from '../../../src/style-spec/declass';
 
 t('declass a style, one class', (t) => {
     const style = {
diff --git a/test/unit/style-spec/deref.test.js b/test/unit/style-spec/deref.test.js
index 9e2e03083d6..70c01916ede 100644
--- a/test/unit/style-spec/deref.test.js
+++ b/test/unit/style-spec/deref.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    deref = require('../../../src/style-spec/deref');
+import { test as t } from 'mapbox-gl-js-test';
+import deref from '../../../src/style-spec/deref';
 
 t('derefs a ref layer which follows its parent', (t) => {
     t.deepEqual(deref([
diff --git a/test/unit/style-spec/diff.test.js b/test/unit/style-spec/diff.test.js
index 8d5a119b553..bfdbe4b44c4 100644
--- a/test/unit/style-spec/diff.test.js
+++ b/test/unit/style-spec/diff.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    diffStyles = require('../../../src/style-spec/diff');
+import { test as t } from 'mapbox-gl-js-test';
+import diffStyles from '../../../src/style-spec/diff';
 
 t('diff', (t) => {
 
diff --git a/test/unit/style-spec/expression.test.js b/test/unit/style-spec/expression.test.js
index eb5cf6952ae..598f5f74aa7 100644
--- a/test/unit/style-spec/expression.test.js
+++ b/test/unit/style-spec/expression.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const {createPropertyExpression} = require('../../../src/style-spec/expression');
+import { test } from 'mapbox-gl-js-test';
+import { createPropertyExpression } from '../../../src/style-spec/expression';
 
 test('createPropertyExpression', (t) => {
     test('prohibits piecewise-constant properties from using an "interpolate" expression', (t) => {
diff --git a/test/unit/style-spec/feature_filter.test.js b/test/unit/style-spec/feature_filter.test.js
index 7938e483802..877e6de94ab 100644
--- a/test/unit/style-spec/feature_filter.test.js
+++ b/test/unit/style-spec/feature_filter.test.js
@@ -1,13 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const proxyquire = require('proxyquire');
-
-const filterTests = (isEvalSupported) => (t) => {
-    const filter = proxyquire('../../../src/style-spec/feature_filter', {
-        '../util/eval_support': isEvalSupported
-    });
+import { test } from 'mapbox-gl-js-test';
+import filter from '../../../src/style-spec/feature_filter';
 
+test('filter', (t) => {
     t.test('expression, zoom', (t) => {
         const f = filter(['>=', ['number', ['get', 'x']], ['zoom']]);
         t.equal(f({zoom: 1}, {properties: {x: 0}}), false);
@@ -501,7 +495,4 @@ const filterTests = (isEvalSupported) => (t) => {
     });
 
     t.end();
-};
-
-test('filter - eval supported', filterTests(true));
-test('filter - eval not supported', filterTests(false));
+});
diff --git a/test/unit/style-spec/format.test.js b/test/unit/style-spec/format.test.js
index 16e2e1c5bb8..1ee9bf6eb77 100644
--- a/test/unit/style-spec/format.test.js
+++ b/test/unit/style-spec/format.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    format = require('../../../src/style-spec/format');
+import { test as t } from 'mapbox-gl-js-test';
+import format from '../../../src/style-spec/format';
 
 function roundtrip(style) {
     return JSON.parse(format(style));
diff --git a/test/unit/style-spec/function.test.js b/test/unit/style-spec/function.test.js
index 757cb229b68..2b315adc952 100644
--- a/test/unit/style-spec/function.test.js
+++ b/test/unit/style-spec/function.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const {createFunction} = require('../../../src/style-spec/function');
-const Color = require('../../../src/style-spec/util/color');
+import { test } from 'mapbox-gl-js-test';
+import { createFunction } from '../../../src/style-spec/function';
+import Color from '../../../src/style-spec/util/color';
 
 test('binary search', (t) => {
     t.test('will eventually terminate.', (t) => {
diff --git a/test/unit/style-spec/group_by_layout.test.js b/test/unit/style-spec/group_by_layout.test.js
index a703336e942..8bf9d689dfb 100644
--- a/test/unit/style-spec/group_by_layout.test.js
+++ b/test/unit/style-spec/group_by_layout.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    group = require('../../../src/style-spec/group_by_layout');
+import { test as t } from 'mapbox-gl-js-test';
+import group from '../../../src/style-spec/group_by_layout';
 
 t('group layers whose ref properties are identical', (t) => {
     const a = {
diff --git a/test/unit/style-spec/interpolate.test.js b/test/unit/style-spec/interpolate.test.js
index a56bff53c6c..8991659b7ee 100644
--- a/test/unit/style-spec/interpolate.test.js
+++ b/test/unit/style-spec/interpolate.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const interpolate = require('../../../src/style-spec/util/interpolate');
-const Color = require('../../../src/style-spec/util/color');
+import { test } from 'mapbox-gl-js-test';
+import * as interpolate from '../../../src/style-spec/util/interpolate';
+import Color from '../../../src/style-spec/util/color';
 
 test('interpolate.number', (t) => {
     t.equal(interpolate.number(0, 1, 0.5), 0.5);
diff --git a/test/unit/style-spec/migrate.test.js b/test/unit/style-spec/migrate.test.js
index e4c65ed03ea..1b93747cfbc 100644
--- a/test/unit/style-spec/migrate.test.js
+++ b/test/unit/style-spec/migrate.test.js
@@ -1,14 +1,11 @@
-/* global process, __dirname */
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    fs = require('fs'),
-    glob = require('glob'),
-    spec = require('../../../src/style-spec/style-spec'),
-    path = require('path'),
-    validate = require('../../../src/style-spec/validate_style'),
-    v8 = require('../../../src/style-spec/reference/v8'),
-    migrate = require('../../../src/style-spec/migrate');
+import { test as t } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import glob from 'glob';
+import spec from '../../../src/style-spec/style-spec';
+import path from 'path';
+import validate from '../../../src/style-spec/validate_style';
+import v8 from '../../../src/style-spec/reference/v8';
+import migrate from '../../../src/style-spec/migrate';
 
 const UPDATE = !!process.env.UPDATE;
 
diff --git a/test/unit/style-spec/migrate/v8.js b/test/unit/style-spec/migrate/v8.js
index fa5bed8e43c..8811317d737 100644
--- a/test/unit/style-spec/migrate/v8.js
+++ b/test/unit/style-spec/migrate/v8.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    migrate = require('../../../../src/style-spec/migrate/v8');
+import { test as t } from 'mapbox-gl-js-test';
+import migrate from '../../../../src/style-spec/migrate/v8';
 
 t('split text-font', (t) => {
     const input = {
diff --git a/test/unit/style-spec/migrate/v9.js b/test/unit/style-spec/migrate/v9.js
index 9c4aba4d625..d371f34df55 100644
--- a/test/unit/style-spec/migrate/v9.js
+++ b/test/unit/style-spec/migrate/v9.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    migrate = require('../../../../src/style-spec/migrate/v9');
+import { test as t } from 'mapbox-gl-js-test';
+import migrate from '../../../../src/style-spec/migrate/v9';
 
 t('deref layers', (t) => {
     const input = {
diff --git a/test/unit/style-spec/spec.test.js b/test/unit/style-spec/spec.test.js
index d431f066ffc..80751ba13de 100644
--- a/test/unit/style-spec/spec.test.js
+++ b/test/unit/style-spec/spec.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const spec = require('../../../src/style-spec/style-spec');
+import { test } from 'mapbox-gl-js-test';
+import spec from '../../../src/style-spec/style-spec';
 
 ['v8', 'latest'].forEach((version) => {
     ['', 'min'].forEach((kind) => {
diff --git a/test/unit/style-spec/util/color_spaces.test.js b/test/unit/style-spec/util/color_spaces.test.js
index fc82148faaf..e7c41df2647 100644
--- a/test/unit/style-spec/util/color_spaces.test.js
+++ b/test/unit/style-spec/util/color_spaces.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const colorSpaces = require('../../../../src/style-spec/util/color_spaces');
-const Color = require('../../../../src/style-spec/util/color');
+import { test } from 'mapbox-gl-js-test';
+import * as colorSpaces from '../../../../src/style-spec/util/color_spaces';
+import Color from '../../../../src/style-spec/util/color';
 
 test('#hclToRgb zero', (t) => {
     const hclColor = {h: 0, c: 0, l: 0, alpha: null};
diff --git a/test/unit/style-spec/validate.test.js b/test/unit/style-spec/validate.test.js
index aa39ba98baf..294c2b38361 100644
--- a/test/unit/style-spec/validate.test.js
+++ b/test/unit/style-spec/validate.test.js
@@ -1,11 +1,8 @@
-/* global process, __dirname */
-'use strict';
-
-const t = require('mapbox-gl-js-test').test,
-    glob = require('glob'),
-    fs = require('fs'),
-    path = require('path'),
-    validate = require('../../../src/style-spec/validate_style');
+import { test as t } from 'mapbox-gl-js-test';
+import glob from 'glob';
+import fs from 'fs';
+import path from 'path';
+import validate from '../../../src/style-spec/validate_style';
 
 const UPDATE = !!process.env.UPDATE;
 
@@ -23,7 +20,7 @@ glob.sync(`${__dirname}/fixture/*.input.json`).forEach((file) => {
 
 const fixtures = glob.sync(`${__dirname}/fixture/*.input.json`);
 const style = JSON.parse(fs.readFileSync(fixtures[0]));
-const reference = require('../../../src/style-spec/reference/latest');
+import reference from '../../../src/style-spec/reference/latest';
 
 t('validate.parsed exists', (t) => {
     t.equal(typeof validate.parsed, 'function');
diff --git a/test/unit/style/light.test.js b/test/unit/style/light.test.js
index 3015ecc4ca8..737556bc627 100644
--- a/test/unit/style/light.test.js
+++ b/test/unit/style/light.test.js
@@ -1,10 +1,10 @@
-'use strict';
+import { test } from 'mapbox-gl-js-test';
+import Light from '../../../src/style/light';
+import styleSpec from '../../../src/style-spec/reference/latest';
+import Color from '../../../src/style-spec/util/color';
+import { sphericalToCartesian } from '../../../src/util/util';
 
-const test = require('mapbox-gl-js-test').test;
-const Light = require('../../../src/style/light');
-const spec = require('../../../src/style-spec/reference/latest').light;
-const Color = require('../../../src/style-spec/util/color');
-const {sphericalToCartesian} = require('../../../src/util/util');
+const spec = styleSpec.light;
 
 test('Light with defaults', (t) => {
     const light = new Light({});
diff --git a/test/unit/style/load_glyph_range.test.js b/test/unit/style/load_glyph_range.test.js
index d24d5081cf1..b70b2e289a4 100644
--- a/test/unit/style/load_glyph_range.test.js
+++ b/test/unit/style/load_glyph_range.test.js
@@ -1,29 +1,50 @@
 // @flow
 
-'use strict';
-
-const {test} = require('mapbox-gl-js-test');
-const proxyquire = require('proxyquire');
+import { test } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import window from '../../../src/util/window';
+import loadGlyphRange from '../../../src/style/load_glyph_range';
 
 test('loadGlyphRange', (t) => {
-    const transform = t.stub().callsFake((url) => ({url}));
-    const data = {};
-    const getArrayBuffer = t.stub().yields(null, {data});
-    const parseGlyphPBF = t.stub().returns([]);
+    window.useFakeXMLHttpRequest();
 
-    const loadGlyphRange = proxyquire('../../../src/style/load_glyph_range', {
-        '../util/ajax': {getArrayBuffer},
-        './parse_glyph_pbf': parseGlyphPBF
+    t.tearDown(() => {
+        window.restore();
     });
 
-    loadGlyphRange('Arial Unicode MS', 0, 'https://localhost/fonts/v1/{fontstack}/{range}.pbf', transform, (err) => {
+    const transform = t.stub().callsFake((url) => ({url}));
+
+    let request;
+    window.XMLHttpRequest.onCreate = (req) => { request = req; };
+
+    loadGlyphRange('Arial Unicode MS', 0, 'https://localhost/fonts/v1/{fontstack}/{range}.pbf', transform, (err, result) => {
         t.ifError(err);
         t.ok(transform.calledOnce);
         t.deepEqual(transform.getCall(0).args, ['https://localhost/fonts/v1/Arial Unicode MS/0-255.pbf', 'Glyphs']);
-        t.ok(getArrayBuffer.calledOnce);
-        t.deepEqual(getArrayBuffer.getCall(0).args[0], {url: 'https://localhost/fonts/v1/Arial Unicode MS/0-255.pbf'});
-        t.ok(parseGlyphPBF.calledOnce);
-        t.deepEqual(parseGlyphPBF.getCall(0).args, [data]);
+
+        if (!result) return t.fail(); // appease flow
+
+        t.equal(Object.keys(result).length, 223);
+        for (const key in result) {
+            const id = Number(key);
+            const glyph = result[id];
+            if (!glyph) return t.fail(); // appease flow
+            t.equal(glyph.id, Number(id));
+            t.ok(glyph.metrics);
+            t.equal(typeof glyph.metrics.width, 'number');
+            t.equal(typeof glyph.metrics.height, 'number');
+            t.equal(typeof glyph.metrics.top, 'number');
+            t.equal(typeof glyph.metrics.advance, 'number');
+        }
         t.end();
     });
+
+    if (!request) return t.fail(); // appease flow
+
+    t.equal(request.url, 'https://localhost/fonts/v1/Arial Unicode MS/0-255.pbf');
+    request.setStatus(200);
+    request.response = fs.readFileSync(path.join(__dirname, '../../fixtures/0-255.pbf'));
+    request.onload();
+
 });
diff --git a/test/unit/style/style.test.js b/test/unit/style/style.test.js
index 855422e7588..a0576f4eaa9 100644
--- a/test/unit/style/style.test.js
+++ b/test/unit/style/style.test.js
@@ -1,20 +1,23 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const proxyquire = require('proxyquire');
-const Style = require('../../../src/style/style');
-const SourceCache = require('../../../src/source/source_cache');
-const StyleLayer = require('../../../src/style/style_layer');
-const Transform = require('../../../src/geo/transform');
-const util = require('../../../src/util/util');
-const {Event, Evented} = require('../../../src/util/evented');
-const window = require('../../../src/util/window');
-const rtlTextPlugin = require('../../../src/source/rtl_text_plugin');
-const ajax = require('../../../src/util/ajax');
-const browser = require('../../../src/util/browser');
+import { test } from 'mapbox-gl-js-test';
+import assert from 'assert';
+import Style from '../../../src/style/style';
+import SourceCache from '../../../src/source/source_cache';
+import StyleLayer from '../../../src/style/style_layer';
+import Transform from '../../../src/geo/transform';
+import EvaluationParameters from '../../../src/style/evaluation_parameters';
+import { extend } from '../../../src/util/util';
+import { Event, Evented } from '../../../src/util/evented';
+import window from '../../../src/util/window';
+import {
+    setRTLTextPlugin,
+    clearRTLTextPlugin,
+    evented as rtlTextPluginEvented
+} from '../../../src/source/rtl_text_plugin';
+import browser from '../../../src/util/browser';
+import { OverscaledTileID } from '../../../src/source/tile_id';
 
 function createStyleJSON(properties) {
-    return util.extend({
+    return extend({
         "version": 8,
         "sources": {},
         "layers": []
@@ -59,30 +62,29 @@ test('Style', (t) => {
     });
 
     t.test('registers plugin listener', (t) => {
-        rtlTextPlugin.clearRTLTextPlugin();
+        clearRTLTextPlugin();
 
-        t.spy(rtlTextPlugin, 'registerForPluginAvailability');
+        t.spy(Style, 'registerForPluginAvailability');
 
         const style = new Style(new StubMap());
         t.spy(style.dispatcher, 'broadcast');
-        t.ok(rtlTextPlugin.registerForPluginAvailability.calledOnce);
+        t.ok(Style.registerForPluginAvailability.calledOnce);
 
-        rtlTextPlugin.setRTLTextPlugin("some bogus url");
+        setRTLTextPlugin("some bogus url");
         t.ok(style.dispatcher.broadcast.calledWith('loadRTLTextPlugin', "some bogus url"));
         t.end();
     });
 
     t.test('loads plugin immediately if already registered', (t) => {
-        rtlTextPlugin.clearRTLTextPlugin();
-        t.stub(rtlTextPlugin, 'createBlobURL').returns("data:text/javascript;base64,abc");
+        clearRTLTextPlugin();
         window.useFakeXMLHttpRequest();
         window.server.respondWith('/plugin.js', "doesn't matter");
         let firstError = true;
-        rtlTextPlugin.setRTLTextPlugin("/plugin.js", (error) => {
+        setRTLTextPlugin("/plugin.js", (error) => {
             // Getting this error message shows the bogus URL was succesfully passed to the worker
             // We'll get the error from all workers, only pay attention to the first one
             if (firstError) {
-                t.deepEquals(error, new Error('RTL Text Plugin failed to import scripts from data:text/javascript;base64,abc'));
+                t.equals(error.message, 'RTL Text Plugin failed to import scripts from /plugin.js');
                 t.end();
                 firstError = false;
             }
@@ -196,16 +198,37 @@ test('Style#loadJSON', (t) => {
 
     t.test('fires "data" when the sprite finishes loading', (t) => {
         window.useFakeXMLHttpRequest();
-        window.server.respondWith('http://example.com/sprite.json', '{}');
 
-        // Stubbing rather than using a fake response because we need to bypass several Web APIs that
-        // aren't supported by jsdom:
-        //
+        // Stubbing to bypass Web APIs that supported by jsdom:
         // * `URL.createObjectURL` in ajax.getImage (https://github.com/tmpvar/jsdom/issues/1721)
         // * `canvas.getContext('2d')` in browser.getImageData
-        //
-        t.stub(ajax, 'getImage').yields(null, new window.Image());
+        t.stub(window.URL, 'revokeObjectURL');
         t.stub(browser, 'getImageData');
+        // stub Image so we can invoke 'onload'
+        // https://github.com/jsdom/jsdom/commit/58a7028d0d5b6aacc5b435daee9fd8f9eacbb14c
+        const img = {};
+        t.stub(window, 'Image').returns(img);
+        // stub this manually because sinon does not stub non-existent methods
+        assert(!window.URL.createObjectURL);
+        window.URL.createObjectURL = () => 'blob:';
+        t.tearDown(() => delete window.URL.createObjectURL);
+
+        // fake the image request (sinon doesn't allow non-string data for
+        // server.respondWith, so we do so manually)
+        const requests = [];
+        window.XMLHttpRequest.onCreate = req => { requests.push(req); };
+        const respond = () => {
+            let req = requests.find(req => req.url === 'http://example.com/sprite.png');
+            req.setStatus(200);
+            req.response = new ArrayBuffer(8);
+            req.onload();
+            img.onload();
+
+            req = requests.find(req => req.url === 'http://example.com/sprite.json');
+            req.setStatus(200);
+            req.response = '{}';
+            req.onload();
+        };
 
         const style = new Style(new StubMap());
 
@@ -216,6 +239,8 @@ test('Style#loadJSON', (t) => {
             "sprite": "http://example.com/sprite"
         });
 
+        style.once('error', (e) => t.error(e));
+
         style.once('data', (e) => {
             t.equal(e.target, style);
             t.equal(e.dataType, 'style');
@@ -226,7 +251,7 @@ test('Style#loadJSON', (t) => {
                 t.end();
             });
 
-            window.server.respond();
+            respond();
         });
     });
 
@@ -250,7 +275,7 @@ test('Style#loadJSON', (t) => {
             t.end();
         });
 
-        style.loadJSON(util.extend(createStyleJSON(), {
+        style.loadJSON(extend(createStyleJSON(), {
             "sources": {
                 "mapbox": {
                     "type": "vector",
@@ -300,7 +325,7 @@ test('Style#loadJSON', (t) => {
             t.end();
         });
 
-        style.loadJSON(util.extend(createStyleJSON(), {
+        style.loadJSON(extend(createStyleJSON(), {
             "sprite": "http://example.com/sprites/bright-v8"
         }));
     });
@@ -380,7 +405,6 @@ test('Style#_remove', (t) => {
     });
 
     t.test('deregisters plugin listener', (t) => {
-        t.spy(rtlTextPlugin, 'registerForPluginAvailability');
         const style = new Style(new StubMap());
         style.loadJSON(createStyleJSON());
         t.spy(style.dispatcher, 'broadcast');
@@ -388,7 +412,7 @@ test('Style#_remove', (t) => {
         style.on('style.load', () => {
             style._remove();
 
-            rtlTextPlugin.evented.fire(new Event('pluginAvailable'));
+            rtlTextPluginEvented.fire(new Event('pluginAvailable'));
             t.notOk(style.dispatcher.broadcast.calledWith('loadRTLTextPlugin'));
             t.end();
         });
@@ -877,7 +901,7 @@ test('Style#addLayer', (t) => {
 
     t.test('reloads source', (t) => {
         const style = new Style(new StubMap());
-        style.loadJSON(util.extend(createStyleJSON(), {
+        style.loadJSON(extend(createStyleJSON(), {
             "sources": {
                 "mapbox": {
                     "type": "vector",
@@ -904,7 +928,7 @@ test('Style#addLayer', (t) => {
 
     t.test('#3895 reloads source (instead of clearing) if adding this layer with the same type, immediately after removing it', (t) => {
         const style = new Style(new StubMap());
-        style.loadJSON(util.extend(createStyleJSON(), {
+        style.loadJSON(extend(createStyleJSON(), {
             "sources": {
                 "mapbox": {
                     "type": "vector",
@@ -941,7 +965,7 @@ test('Style#addLayer', (t) => {
 
     t.test('clears source (instead of reloading) if adding this layer with a different type, immediately after removing it', (t) => {
         const style = new Style(new StubMap());
-        style.loadJSON(util.extend(createStyleJSON(), {
+        style.loadJSON(extend(createStyleJSON(), {
             "sources": {
                 "mapbox": {
                     "type": "vector",
@@ -1068,7 +1092,7 @@ test('Style#addLayer', (t) => {
 
     t.test('fires an error on non-existant source layer', (t) => {
         const style = new Style(new StubMap());
-        style.loadJSON(util.extend(createStyleJSON(), {
+        style.loadJSON(extend(createStyleJSON(), {
             sources: {
                 dummy: {
                     type: 'geojson',
@@ -1255,7 +1279,7 @@ test('Style#moveLayer', (t) => {
 test('Style#setPaintProperty', (t) => {
     t.test('#4738 postpones source reload until layers have been broadcast to workers', (t) => {
         const style = new Style(new StubMap());
-        style.loadJSON(util.extend(createStyleJSON(), {
+        style.loadJSON(extend(createStyleJSON(), {
             "sources": {
                 "geojson": {
                     "type": "geojson",
@@ -1619,61 +1643,61 @@ test('Style#setLayerZoomRange', (t) => {
 });
 
 test('Style#queryRenderedFeatures', (t) => {
-    let style; // eslint-disable-line prefer-const
-    const Style = proxyquire('../../../src/style/style', {
-        '../source/query_features': {
-            rendered: function(source, layers, queryGeom, params) {
-                if (source.id !== 'mapbox') {
-                    return [];
+    const style = new Style(new StubMap());
+    const transform = new Transform();
+    transform.resize(512, 512);
+
+    function queryMapboxFeatures(layers, queryGeom, scale, params) {
+        const features = {
+            'land': [{
+                type: 'Feature',
+                layer: style._layers.land.serialize(),
+                geometry: {
+                    type: 'Polygon'
                 }
-
-                const features = {
-                    'land': [{
-                        type: 'Feature',
-                        layer: style._layers.land.serialize(),
-                        geometry: {
-                            type: 'Polygon'
-                        }
-                    }, {
-                        type: 'Feature',
-                        layer: style._layers.land.serialize(),
-                        geometry: {
-                            type: 'Point'
-                        }
-                    }],
-                    'landref': [{
-                        type: 'Feature',
-                        layer: style._layers.landref.serialize(),
-                        geometry: {
-                            type: 'Line'
-                        }
-                    }]
-                };
-
-                if (params.layers) {
-                    for (const l in features) {
-                        if (params.layers.indexOf(l) < 0) {
-                            delete features[l];
-                        }
-                    }
+            }, {
+                type: 'Feature',
+                layer: style._layers.land.serialize(),
+                geometry: {
+                    type: 'Point'
                 }
+            }],
+            'landref': [{
+                type: 'Feature',
+                layer: style._layers.landref.serialize(),
+                geometry: {
+                    type: 'Line'
+                }
+            }]
+        };
 
-                return features;
+        // format result to shape of tile.queryRenderedFeatures result
+        for (const layer in features) {
+            features[layer] = features[layer].map((feature, featureIndex) =>
+                ({ feature, featureIndex }));
+        }
+
+        if (params.layers) {
+            for (const l in features) {
+                if (params.layers.indexOf(l) < 0) {
+                    delete features[l];
+                }
             }
         }
-    });
 
-    style = new Style(new StubMap());
+        return features;
+    }
+
     style.loadJSON({
         "version": 8,
         "sources": {
             "mapbox": {
-                "type": "vector",
-                "tiles": ["local://tiles/{z}-{x}-{y}.vector.pbf"]
+                "type": "geojson",
+                "data": { type: "FeatureCollection", features: [] }
             },
             "other": {
-                "type": "vector",
-                "tiles": ["local://tiles/{z}-{x}-{y}.vector.pbf"]
+                "type": "geojson",
+                "data": { type: "FeatureCollection", features: [] }
             }
         },
         "layers": [{
@@ -1714,16 +1738,32 @@ test('Style#queryRenderedFeatures', (t) => {
     });
 
     style.on('style.load', () => {
-        style.update(0, 0);
+        style.sourceCaches.mapbox.tilesIn = () => {
+            return [{
+                tile: { queryRenderedFeatures: queryMapboxFeatures },
+                tileID: new OverscaledTileID(0, 0, 0, 0, 0),
+                queryGeometry: [],
+                scale: 1
+            }];
+        };
+        style.sourceCaches.other.tilesIn = () => {
+            return [];
+        };
+
+        style.sourceCaches.mapbox.transform = transform;
+        style.sourceCaches.other.transform = transform;
+
+        style.update(new EvaluationParameters(0));
+        style._updateSources(transform);
 
         t.test('returns feature type', (t) => {
-            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, 0, 0);
+            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, transform);
             t.equal(results[0].geometry.type, 'Line');
             t.end();
         });
 
         t.test('filters by `layers` option', (t) => {
-            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers: ['land']}, 0, 0);
+            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers: ['land']}, transform);
             t.equal(results.length, 2);
             t.end();
         });
@@ -1733,26 +1773,26 @@ test('Style#queryRenderedFeatures', (t) => {
             t.stub(style, 'fire').callsFake((event) => {
                 if (event.error && event.error.message.includes('parameters.layers must be an Array.')) errors++;
             });
-            style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers:'string'});
+            style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers:'string'}, transform);
             t.equals(errors, 1);
             t.end();
         });
 
         t.test('includes layout properties', (t) => {
-            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, 0, 0);
+            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, transform);
             const layout = results[0].layer.layout;
             t.deepEqual(layout['line-cap'], 'round');
             t.end();
         });
 
         t.test('includes paint properties', (t) => {
-            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, 0, 0);
+            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, transform);
             t.deepEqual(results[2].layer.paint['line-color'], 'red');
             t.end();
         });
 
         t.test('includes metadata', (t) => {
-            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, 0, 0);
+            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, transform);
 
             const layer = results[1].layer;
             t.equal(layer.metadata.something, 'else');
@@ -1761,14 +1801,14 @@ test('Style#queryRenderedFeatures', (t) => {
         });
 
         t.test('include multiple layers', (t) => {
-            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers: ['land', 'landref']}, 0, 0);
+            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers: ['land', 'landref']}, transform);
             t.equals(results.length, 3);
             t.end();
         });
 
         t.test('does not query sources not implicated by `layers` parameter', (t) => {
             style.sourceCaches.mapbox.queryRenderedFeatures = function() { t.fail(); };
-            style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers: ['land--other']});
+            style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers: ['land--other']}, transform);
             t.end();
         });
 
@@ -1777,7 +1817,7 @@ test('Style#queryRenderedFeatures', (t) => {
             t.stub(style, 'fire').callsFake((event) => {
                 if (event.error && event.error.message.includes('does not exist in the map\'s style and cannot be queried for features.')) errors++;
             });
-            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers:['merp']});
+            const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers:['merp']}, transform);
             t.equals(errors, 1);
             t.equals(results.length, 0);
             t.end();
@@ -1880,11 +1920,10 @@ test('Style#query*Features', (t) => {
 
 test('Style#addSourceType', (t) => {
     const _types = { 'existing': function () {} };
-    const Style = proxyquire('../../../src/style/style', {
-        '../source/source': {
-            getType: function (name) { return _types[name]; },
-            setType: function (name, create) { _types[name] = create; }
-        }
+
+    t.stub(Style, 'getSourceType').callsFake(name => _types[name]);
+    t.stub(Style, 'setSourceType').callsFake((name, create) => {
+        _types[name] = create;
     });
 
     t.test('adds factory function', (t) => {
diff --git a/test/unit/style/style_layer.test.js b/test/unit/style/style_layer.test.js
index d2397cd2b2a..29b241107af 100644
--- a/test/unit/style/style_layer.test.js
+++ b/test/unit/style/style_layer.test.js
@@ -1,14 +1,12 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const StyleLayer = require('../../../src/style/style_layer');
-const FillStyleLayer = require('../../../src/style/style_layer/fill_style_layer');
-const util = require('../../../src/util/util');
-const Color = require('../../../src/style-spec/util/color');
+import { test } from 'mapbox-gl-js-test';
+import createStyleLayer from '../../../src/style/create_style_layer';
+import FillStyleLayer from '../../../src/style/style_layer/fill_style_layer';
+import { extend } from '../../../src/util/util';
+import Color from '../../../src/style-spec/util/color';
 
 test('StyleLayer', (t) => {
     t.test('instantiates the correct subclass', (t) => {
-        const layer = StyleLayer.create({type: 'fill'});
+        const layer = createStyleLayer({type: 'fill'});
 
         t.ok(layer instanceof FillStyleLayer);
         t.end();
@@ -19,7 +17,7 @@ test('StyleLayer', (t) => {
 
 test('StyleLayer#setPaintProperty', (t) => {
     t.test('sets new property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background"
         });
@@ -31,7 +29,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('updates property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background",
             "paint": {
@@ -46,7 +44,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('unsets value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background",
             "paint": {
@@ -68,7 +66,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('preserves existing transition', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background",
             "paint": {
@@ -86,7 +84,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('sets transition', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background",
             "paint": {
@@ -101,7 +99,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('emits on an invalid property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background"
         });
@@ -115,7 +113,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('emits on an invalid transition property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background"
         });
@@ -130,7 +128,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('can unset fill-outline-color #2886', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             id: 'building',
             type: 'fill',
             source: 'streets',
@@ -153,7 +151,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('can transition fill-outline-color from undefined to a value #3657', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             id: 'building',
             type: 'fill',
             source: 'streets',
@@ -184,7 +182,7 @@ test('StyleLayer#setPaintProperty', (t) => {
     });
 
     t.test('sets null property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "background",
             "type": "background"
         });
@@ -200,7 +198,7 @@ test('StyleLayer#setPaintProperty', (t) => {
 
 test('StyleLayer#setLayoutProperty', (t) => {
     t.test('sets new property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "symbol",
             "type": "symbol"
         });
@@ -212,7 +210,7 @@ test('StyleLayer#setLayoutProperty', (t) => {
     });
 
     t.test('emits on an invalid property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "symbol",
             "type": "symbol"
         });
@@ -225,7 +223,7 @@ test('StyleLayer#setLayoutProperty', (t) => {
     });
 
     t.test('updates property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "symbol",
             "type": "symbol",
             "layout": {
@@ -240,7 +238,7 @@ test('StyleLayer#setLayoutProperty', (t) => {
     });
 
     t.test('unsets property value', (t) => {
-        const layer = StyleLayer.create({
+        const layer = createStyleLayer({
             "id": "symbol",
             "type": "symbol",
             "layout": {
@@ -262,7 +260,7 @@ test('StyleLayer#setLayoutProperty', (t) => {
 test('StyleLayer#serialize', (t) => {
 
     function createSymbolLayer(layer) {
-        return util.extend({
+        return extend({
             id: 'symbol',
             type: 'symbol',
             paint: {
@@ -276,7 +274,7 @@ test('StyleLayer#serialize', (t) => {
 
     t.test('serializes layers', (t) => {
         t.deepEqual(
-            StyleLayer.create(createSymbolLayer()).serialize(),
+            createStyleLayer(createSymbolLayer()).serialize(),
             createSymbolLayer()
         );
         t.end();
@@ -291,14 +289,14 @@ test('StyleLayer#serialize', (t) => {
         };
 
         t.deepEqual(
-            StyleLayer.create(createSymbolLayer({ paint: layerPaint })).serialize().paint,
+            createStyleLayer(createSymbolLayer({ paint: layerPaint })).serialize().paint,
             layerPaint
         );
         t.end();
     });
 
     t.test('serializes added paint properties', (t) => {
-        const layer = StyleLayer.create(createSymbolLayer());
+        const layer = createStyleLayer(createSymbolLayer());
         layer.setPaintProperty('text-halo-color', 'orange');
 
         t.equal(layer.serialize().paint['text-halo-color'], 'orange');
@@ -308,7 +306,7 @@ test('StyleLayer#serialize', (t) => {
     });
 
     t.test('serializes added layout properties', (t) => {
-        const layer = StyleLayer.create(createSymbolLayer());
+        const layer = createStyleLayer(createSymbolLayer());
         layer.setLayoutProperty('text-size', 20);
 
         t.equal(layer.serialize().layout['text-transform'], 'uppercase');
@@ -323,7 +321,7 @@ test('StyleLayer#serialize', (t) => {
 test('StyleLayer#serialize', (t) => {
 
     function createSymbolLayer(layer) {
-        return util.extend({
+        return extend({
             id: 'symbol',
             type: 'symbol',
             paint: {
@@ -337,7 +335,7 @@ test('StyleLayer#serialize', (t) => {
 
     t.test('serializes layers', (t) => {
         t.deepEqual(
-            StyleLayer.create(createSymbolLayer()).serialize(),
+            createStyleLayer(createSymbolLayer()).serialize(),
             createSymbolLayer()
         );
         t.end();
@@ -352,14 +350,14 @@ test('StyleLayer#serialize', (t) => {
         };
 
         t.deepEqual(
-            StyleLayer.create(createSymbolLayer({ paint: layerPaint })).serialize().paint,
+            createStyleLayer(createSymbolLayer({ paint: layerPaint })).serialize().paint,
             layerPaint
         );
         t.end();
     });
 
     t.test('serializes added paint properties', (t) => {
-        const layer = StyleLayer.create(createSymbolLayer());
+        const layer = createStyleLayer(createSymbolLayer());
         layer.setPaintProperty('text-halo-color', 'orange');
 
         t.equal(layer.serialize().paint['text-halo-color'], 'orange');
@@ -369,7 +367,7 @@ test('StyleLayer#serialize', (t) => {
     });
 
     t.test('serializes added layout properties', (t) => {
-        const layer = StyleLayer.create(createSymbolLayer());
+        const layer = createStyleLayer(createSymbolLayer());
         layer.setLayoutProperty('text-size', 20);
 
         t.equal(layer.serialize().layout['text-transform'], 'uppercase');
diff --git a/test/unit/style/style_layer_index.test.js b/test/unit/style/style_layer_index.test.js
index a4e5e029ccd..c8594c819f3 100644
--- a/test/unit/style/style_layer_index.test.js
+++ b/test/unit/style/style_layer_index.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const util = require('../../../src/util/util');
-const StyleLayerIndex = require('../../../src/style/style_layer_index');
+import { test } from 'mapbox-gl-js-test';
+import { mapObject } from '../../../src/util/util';
+import StyleLayerIndex from '../../../src/style/style_layer_index';
 
 test('StyleLayerIndex#replace', (t) => {
     const index = new StyleLayerIndex([
@@ -62,8 +60,8 @@ test('StyleLayerIndex#familiesBySource', (t) => {
         { id: '6', type: 'background' }
     ]);
 
-    const ids = util.mapObject(index.familiesBySource, (bySource) => {
-        return util.mapObject(bySource, (families) => {
+    const ids = mapObject(index.familiesBySource, (bySource) => {
+        return mapObject(bySource, (families) => {
             return families.map((family) => {
                 return family.map((layer) => layer.id);
             });
diff --git a/test/unit/symbol/anchor.test.js b/test/unit/symbol/anchor.test.js
index b30cd08782b..ba50f125eff 100644
--- a/test/unit/symbol/anchor.test.js
+++ b/test/unit/symbol/anchor.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Anchor = require('../../../src/symbol/anchor');
+import { test } from 'mapbox-gl-js-test';
+import Anchor from '../../../src/symbol/anchor';
 
 test('Anchor', (t) => {
     t.test('#constructor', (t) => {
diff --git a/test/unit/symbol/check_max_angle.test.js b/test/unit/symbol/check_max_angle.test.js
index 04fab251722..4bd15c57ce1 100644
--- a/test/unit/symbol/check_max_angle.test.js
+++ b/test/unit/symbol/check_max_angle.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Point = require('@mapbox/point-geometry');
-const checkMaxAngle = require('../../../src/symbol/check_max_angle');
-const Anchor = require('../../../src/symbol/anchor');
+import { test } from 'mapbox-gl-js-test';
+import Point from '@mapbox/point-geometry';
+import checkMaxAngle from '../../../src/symbol/check_max_angle';
+import Anchor from '../../../src/symbol/anchor';
 
 test('line with no sharp angles', (t) => {
     const line = [ new Point(0, 0), new Point(20, -1), new Point(40, 1), new Point(60, 0) ];
diff --git a/test/unit/symbol/collision_feature.js b/test/unit/symbol/collision_feature.js
index 9f5a274ce82..85ac45b5414 100644
--- a/test/unit/symbol/collision_feature.js
+++ b/test/unit/symbol/collision_feature.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const CollisionFeature = require('../../../src/symbol/collision_feature');
-const Anchor = require('../../../src/symbol/anchor');
-const Point = require('@mapbox/point-geometry');
-const {CollisionBoxArray} = require('../../../src/data/array_types');
+import { test } from 'mapbox-gl-js-test';
+import CollisionFeature from '../../../src/symbol/collision_feature';
+import Anchor from '../../../src/symbol/anchor';
+import Point from '@mapbox/point-geometry';
+import { CollisionBoxArray } from '../../../src/data/array_types';
 
 test('CollisionFeature', (t) => {
 
diff --git a/test/unit/symbol/cross_tile_symbol_index.js b/test/unit/symbol/cross_tile_symbol_index.js
index 3dbf4062c98..3f6b64552d6 100644
--- a/test/unit/symbol/cross_tile_symbol_index.js
+++ b/test/unit/symbol/cross_tile_symbol_index.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Anchor = require('../../../src/symbol/anchor');
-const CrossTileSymbolIndex = require('../../../src/symbol/cross_tile_symbol_index');
-const {OverscaledTileID} = require('../../../src/source/tile_id');
+import { test } from 'mapbox-gl-js-test';
+import Anchor from '../../../src/symbol/anchor';
+import CrossTileSymbolIndex from '../../../src/symbol/cross_tile_symbol_index';
+import { OverscaledTileID } from '../../../src/source/tile_id';
 
 const styleLayer = {
     id: 'test'
diff --git a/test/unit/symbol/get_anchors.test.js b/test/unit/symbol/get_anchors.test.js
index ac7a4ec1670..b6e3b3fa73f 100644
--- a/test/unit/symbol/get_anchors.test.js
+++ b/test/unit/symbol/get_anchors.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Point = require('@mapbox/point-geometry');
-const getAnchors = require('../../../src/symbol/get_anchors');
+import { test } from 'mapbox-gl-js-test';
+import Point from '@mapbox/point-geometry';
+import getAnchors from '../../../src/symbol/get_anchors';
 
 const TILE_EXTENT = 4096;
 
diff --git a/test/unit/symbol/grid_index.test.js b/test/unit/symbol/grid_index.test.js
index 6e7cb002b9f..70a55f574c0 100644
--- a/test/unit/symbol/grid_index.test.js
+++ b/test/unit/symbol/grid_index.test.js
@@ -1,8 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-
-const GridIndex = require('../../../src/symbol/grid_index');
+import { test } from 'mapbox-gl-js-test';
+import GridIndex from '../../../src/symbol/grid_index';
 
 test('GridIndex', (t) => {
 
diff --git a/test/unit/symbol/mergelines.test.js b/test/unit/symbol/mergelines.test.js
index a7f37cb267a..50ba731d16b 100644
--- a/test/unit/symbol/mergelines.test.js
+++ b/test/unit/symbol/mergelines.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const mergeLines = require('../../../src/symbol/mergelines');
-const Point = require('@mapbox/point-geometry');
+import { test } from 'mapbox-gl-js-test';
+import mergeLines from '../../../src/symbol/mergelines';
+import Point from '@mapbox/point-geometry';
 
 function makeFeatures(lines) {
     const features = [];
diff --git a/test/unit/symbol/quads.test.js b/test/unit/symbol/quads.test.js
index 403b8987339..e9bb69f2922 100644
--- a/test/unit/symbol/quads.test.js
+++ b/test/unit/symbol/quads.test.js
@@ -1,10 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-
-const getIconQuads = require('../../../src/symbol/quads').getIconQuads;
-const Anchor = require('../../../src/symbol/anchor');
-const SymbolStyleLayer = require('../../../src/style/style_layer/symbol_style_layer');
+import { test } from 'mapbox-gl-js-test';
+import { getIconQuads } from '../../../src/symbol/quads';
+import Anchor from '../../../src/symbol/anchor';
+import SymbolStyleLayer from '../../../src/style/style_layer/symbol_style_layer';
 
 function createLayer(layer) {
     const result = new SymbolStyleLayer(layer);
diff --git a/test/unit/symbol/shaping.test.js b/test/unit/symbol/shaping.test.js
index ff9731b3c4b..23f59fbc9ce 100644
--- a/test/unit/symbol/shaping.test.js
+++ b/test/unit/symbol/shaping.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
-const path = require('path');
-const shaping = require('../../../src/symbol/shaping');
+import { test } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import * as shaping from '../../../src/symbol/shaping';
 const WritingMode = shaping.WritingMode;
 
 let UPDATE = false;
diff --git a/test/unit/ui/camera.test.js b/test/unit/ui/camera.test.js
index cfb4d7bae3c..dd8a82d4871 100644
--- a/test/unit/ui/camera.test.js
+++ b/test/unit/ui/camera.test.js
@@ -1,11 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Camera = require('../../../src/ui/camera');
-const Transform = require('../../../src/geo/transform');
-const browser = require('../../../src/util/browser');
-
-const fixed = require('mapbox-gl-js-test/fixed');
+import { test } from 'mapbox-gl-js-test';
+import Camera from '../../../src/ui/camera';
+import Transform from '../../../src/geo/transform';
+import browser from '../../../src/util/browser';
+import fixed from 'mapbox-gl-js-test/fixed';
 const fixedLngLat = fixed.LngLat;
 const fixedNum = fixed.Num;
 
diff --git a/test/unit/ui/control/attribution.test.js b/test/unit/ui/control/attribution.test.js
index 0f8a311321b..a7e5c31393b 100644
--- a/test/unit/ui/control/attribution.test.js
+++ b/test/unit/ui/control/attribution.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const config = require('../../../../src/util/config');
-const AttributionControl = require('../../../../src/ui/control/attribution_control');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import config from '../../../../src/util/config';
+import AttributionControl from '../../../../src/ui/control/attribution_control';
 
 function createMap() {
     const container = window.document.createElement('div');
diff --git a/test/unit/ui/control/fullscreen.test.js b/test/unit/ui/control/fullscreen.test.js
index 4f3a8744543..539e13c0bb1 100644
--- a/test/unit/ui/control/fullscreen.test.js
+++ b/test/unit/ui/control/fullscreen.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const FullscreenControl = require('../../../../src/ui/control/fullscreen_control');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import FullscreenControl from '../../../../src/ui/control/fullscreen_control';
 
 function createMap() {
     const container = window.document.createElement('div');
diff --git a/test/unit/ui/control/geolocate.test.js b/test/unit/ui/control/geolocate.test.js
index ecf6ce40eb7..1a05a6322c2 100644
--- a/test/unit/ui/control/geolocate.test.js
+++ b/test/unit/ui/control/geolocate.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const GeolocateControl = require('../../../../src/ui/control/geolocate_control');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import GeolocateControl from '../../../../src/ui/control/geolocate_control';
 
 // window and navigator globals need to be set for mock-geolocation
 global.window = {};
diff --git a/test/unit/ui/control/logo.test.js b/test/unit/ui/control/logo.test.js
index d70a79017af..ab0a9ece9d4 100644
--- a/test/unit/ui/control/logo.test.js
+++ b/test/unit/ui/control/logo.test.js
@@ -1,8 +1,7 @@
-'use strict';
-const test = require('mapbox-gl-js-test').test;
-const VectorTileSource = require('../../../../src/source/vector_tile_source');
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
+import { test } from 'mapbox-gl-js-test';
+import VectorTileSource from '../../../../src/source/vector_tile_source';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
 
 function createMap(logoPosition, logoRequired) {
     const container = window.document.createElement('div');
diff --git a/test/unit/ui/control/scale.test.js b/test/unit/ui/control/scale.test.js
index 43244c4dd28..18f4456375c 100644
--- a/test/unit/ui/control/scale.test.js
+++ b/test/unit/ui/control/scale.test.js
@@ -1,9 +1,8 @@
-'use strict';
 
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const ScaleControl = require('../../../../src/ui/control/scale_control');
+import {test} from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import ScaleControl from '../../../../src/ui/control/scale_control';
 
 function createMap() {
     const container = window.document.createElement('div');
diff --git a/test/unit/ui/handler/box_zoom.test.js b/test/unit/ui/handler/box_zoom.test.js
index e9d241843f0..f78b5563204 100644
--- a/test/unit/ui/handler/box_zoom.test.js
+++ b/test/unit/ui/handler/box_zoom.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({ container: DOM.create('div', '', window.document.body) });
diff --git a/test/unit/ui/handler/dblclick_zoom.test.js b/test/unit/ui/handler/dblclick_zoom.test.js
index 999bbe1d132..5bf257c3c75 100644
--- a/test/unit/ui/handler/dblclick_zoom.test.js
+++ b/test/unit/ui/handler/dblclick_zoom.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({ container: DOM.create('div', '', window.document.body) });
diff --git a/test/unit/ui/handler/drag_pan.test.js b/test/unit/ui/handler/drag_pan.test.js
index 0ba2b4c3332..dd377b0509d 100644
--- a/test/unit/ui/handler/drag_pan.test.js
+++ b/test/unit/ui/handler/drag_pan.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({ container: DOM.create('div', '', window.document.body) });
diff --git a/test/unit/ui/handler/drag_rotate.test.js b/test/unit/ui/handler/drag_rotate.test.js
index 3d08f52e0a0..3371f741b4c 100644
--- a/test/unit/ui/handler/drag_rotate.test.js
+++ b/test/unit/ui/handler/drag_rotate.test.js
@@ -1,14 +1,12 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const util = require('../../../../src/util/util');
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import { extend } from '../../../../src/util/util';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap(options) {
-    return new Map(util.extend({ container: DOM.create('div', '', window.document.body) }, options));
+    return new Map(extend({ container: DOM.create('div', '', window.document.body) }, options));
 }
 
 test('DragRotateHandler fires rotatestart, rotate, and rotateend events at appropriate times in response to a right-click drag', (t) => {
diff --git a/test/unit/ui/handler/scroll_zoom.test.js b/test/unit/ui/handler/scroll_zoom.test.js
index d29872e3d2b..954a6d006df 100644
--- a/test/unit/ui/handler/scroll_zoom.test.js
+++ b/test/unit/ui/handler/scroll_zoom.test.js
@@ -1,15 +1,13 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const browser = require('../../../../src/util/browser');
-const util = require('../../../../src/util/util');
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import browser from '../../../../src/util/browser';
+import { extend } from '../../../../src/util/util';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap(options) {
-    return new Map(util.extend({
+    return new Map(extend({
         container: DOM.create('div', '', window.document.body),
         style: {
             "version": 8,
diff --git a/test/unit/ui/handler/touch_zoom_rotate.test.js b/test/unit/ui/handler/touch_zoom_rotate.test.js
index 7af860eb3cc..cc2fe456bf5 100644
--- a/test/unit/ui/handler/touch_zoom_rotate.test.js
+++ b/test/unit/ui/handler/touch_zoom_rotate.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({ container: DOM.create('div', '', window.document.body) });
diff --git a/test/unit/ui/hash.test.js b/test/unit/ui/hash.test.js
index 67f7fa7b99d..30b2206cc92 100644
--- a/test/unit/ui/hash.test.js
+++ b/test/unit/ui/hash.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Hash = require('../../../src/ui/hash');
-const window = require('../../../src/util/window');
-const Map = require('../../../src/ui/map');
+import { test } from 'mapbox-gl-js-test';
+import Hash from '../../../src/ui/hash';
+import window from '../../../src/util/window';
+import Map from '../../../src/ui/map';
 
 test('hash', (t) => {
     function createHash() {
diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
index 3a5e0c62ce4..47a1d3ec3b2 100755
--- a/test/unit/ui/map.test.js
+++ b/test/unit/ui/map.test.js
@@ -1,15 +1,12 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const util = require('../../../src/util/util');
-const window = require('../../../src/util/window');
-const Map = require('../../../src/ui/map');
-const LngLat = require('../../../src/geo/lng_lat');
-const Tile = require('../../../src/source/tile');
-const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID;
-const {Event, ErrorEvent} = require('../../../src/util/evented');
-
-const fixed = require('mapbox-gl-js-test/fixed');
+import { test } from 'mapbox-gl-js-test';
+import { extend } from '../../../src/util/util';
+import window from '../../../src/util/window';
+import Map from '../../../src/ui/map';
+import LngLat from '../../../src/geo/lng_lat';
+import Tile from '../../../src/source/tile';
+import { OverscaledTileID } from '../../../src/source/tile_id';
+import { Event, ErrorEvent } from '../../../src/util/evented';
+import fixed from 'mapbox-gl-js-test/fixed';
 const fixedNum = fixed.Num;
 const fixedLngLat = fixed.LngLat;
 const fixedCoord = fixed.Coord;
@@ -19,7 +16,7 @@ function createMap(options, callback) {
     Object.defineProperty(container, 'offsetWidth', {value: 200, configurable: true});
     Object.defineProperty(container, 'offsetHeight', {value: 200, configurable: true});
 
-    const map = new Map(util.extend({
+    const map = new Map(extend({
         container: container,
         interactive: false,
         attributionControl: false,
@@ -333,7 +330,7 @@ test('Map', (t) => {
 
             map.on('load', () => {
                 map.addSource('geojson', createStyleSource());
-                t.deepEqual(map.getStyle(), util.extend(createStyle(), {
+                t.deepEqual(map.getStyle(), extend(createStyle(), {
                     sources: {geojson: createStyleSource()}
                 }));
                 t.end();
@@ -363,7 +360,7 @@ test('Map', (t) => {
 
             map.on('load', () => {
                 map.addLayer(layer);
-                t.deepEqual(map.getStyle(), util.extend(createStyle(), {
+                t.deepEqual(map.getStyle(), extend(createStyle(), {
                     layers: [layer]
                 }));
                 t.end();
@@ -383,7 +380,7 @@ test('Map', (t) => {
             map.on('load', () => {
                 map.addSource('fill', source);
                 map.addLayer(layer);
-                t.deepEqual(map.getStyle(), util.extend(createStyle(), {
+                t.deepEqual(map.getStyle(), extend(createStyle(), {
                     sources: { fill: source },
                     layers: [layer]
                 }));
@@ -423,7 +420,7 @@ test('Map', (t) => {
 
     t.test('#moveLayer', (t) => {
         const map = createMap({
-            style: util.extend(createStyle(), {
+            style: extend(createStyle(), {
                 sources: {
                     mapbox: {
                         type: 'vector',
@@ -462,7 +459,7 @@ test('Map', (t) => {
             'source-layer': 'sourceLayer'
         };
         const map = createMap({
-            style: util.extend(createStyle(), {
+            style: extend(createStyle(), {
                 sources: {
                     mapbox: {
                         type: 'vector',
@@ -1270,7 +1267,7 @@ test('Map', (t) => {
 
     t.test('#removeLayer restores Map#loaded() to true', (t) => {
         const map = createMap({
-            style: util.extend(createStyle(), {
+            style: extend(createStyle(), {
                 sources: {
                     mapbox: {
                         type: 'vector',
diff --git a/test/unit/ui/map/isMoving.test.js b/test/unit/ui/map/isMoving.test.js
index 1e7deea4159..7e822a50673 100644
--- a/test/unit/ui/map/isMoving.test.js
+++ b/test/unit/ui/map/isMoving.test.js
@@ -1,11 +1,9 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const browser = require('../../../../src/util/browser');
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import browser from '../../../../src/util/browser';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({ container: DOM.create('div', '', window.document.body) });
diff --git a/test/unit/ui/map/isRotating.test.js b/test/unit/ui/map/isRotating.test.js
index 3c84d8e850c..fa6bfa09391 100644
--- a/test/unit/ui/map/isRotating.test.js
+++ b/test/unit/ui/map/isRotating.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({ container: DOM.create('div', '', window.document.body) });
diff --git a/test/unit/ui/map/isZooming.test.js b/test/unit/ui/map/isZooming.test.js
index f42683523ee..23a5533acd8 100644
--- a/test/unit/ui/map/isZooming.test.js
+++ b/test/unit/ui/map/isZooming.test.js
@@ -1,11 +1,9 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const browser = require('../../../../src/util/browser');
-const window = require('../../../../src/util/window');
-const Map = require('../../../../src/ui/map');
-const DOM = require('../../../../src/util/dom');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import browser from '../../../../src/util/browser';
+import window from '../../../../src/util/window';
+import Map from '../../../../src/ui/map';
+import DOM from '../../../../src/util/dom';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({ container: DOM.create('div', '', window.document.body) });
diff --git a/test/unit/ui/map_events.test.js b/test/unit/ui/map_events.test.js
index e6b8f70354f..c1687fbac5c 100644
--- a/test/unit/ui/map_events.test.js
+++ b/test/unit/ui/map_events.test.js
@@ -1,9 +1,7 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Map = require('../../../src/ui/map');
-const window = require('../../../src/util/window');
-const simulate = require('mapbox-gl-js-test/simulate_interaction');
+import { test } from 'mapbox-gl-js-test';
+import Map from '../../../src/ui/map';
+import window from '../../../src/util/window';
+import simulate from 'mapbox-gl-js-test/simulate_interaction';
 
 function createMap() {
     return new Map({
diff --git a/test/unit/ui/marker.test.js b/test/unit/ui/marker.test.js
index d8b553c2d78..5719adba8f7 100644
--- a/test/unit/ui/marker.test.js
+++ b/test/unit/ui/marker.test.js
@@ -1,12 +1,10 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../src/util/window');
-const Map = require('../../../src/ui/map');
-const Marker = require('../../../src/ui/marker');
-const Popup = require('../../../src/ui/popup');
-const LngLat = require('../../../src/geo/lng_lat');
-const Point = require('@mapbox/point-geometry');
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../src/util/window';
+import Map from '../../../src/ui/map';
+import Marker from '../../../src/ui/marker';
+import Popup from '../../../src/ui/popup';
+import LngLat from '../../../src/geo/lng_lat';
+import Point from '@mapbox/point-geometry';
 
 function createMap() {
     const container = window.document.createElement('div');
diff --git a/test/unit/ui/popup.test.js b/test/unit/ui/popup.test.js
index 5eb2357b650..b01ed1c49da 100644
--- a/test/unit/ui/popup.test.js
+++ b/test/unit/ui/popup.test.js
@@ -1,12 +1,10 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const window = require('../../../src/util/window');
-const Map = require('../../../src/ui/map');
-const Popup = require('../../../src/ui/popup');
-const LngLat = require('../../../src/geo/lng_lat');
-const Point = require('@mapbox/point-geometry');
-const simulateClick = require('mapbox-gl-js-test/simulate_interaction').click;
+import { test } from 'mapbox-gl-js-test';
+import window from '../../../src/util/window';
+import Map from '../../../src/ui/map';
+import Popup from '../../../src/ui/popup';
+import LngLat from '../../../src/geo/lng_lat';
+import Point from '@mapbox/point-geometry';
+import { click as simulateClick } from 'mapbox-gl-js-test/simulate_interaction';
 
 const containerWidth = 512;
 const containerHeight = 512;
diff --git a/test/unit/util/actor.test.js b/test/unit/util/actor.test.js
index 0d42a242993..53e9b9900fb 100644
--- a/test/unit/util/actor.test.js
+++ b/test/unit/util/actor.test.js
@@ -1,19 +1,15 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const proxyquire = require('proxyquire');
-const Actor = require('../../../src/util/actor');
+import { test } from 'mapbox-gl-js-test';
+import Actor from '../../../src/util/actor';
+import WebWorker from '../../../src/util/web_worker';
 
 test('Actor', (t) => {
     t.test('forwards resopnses to correct callback', (t) => {
-        const WebWorker = proxyquire('../../../src/util/web_worker', {
-            '../source/worker': function Worker(self) {
-                this.self = self;
-                this.actor = new Actor(self, this);
-                this.test = function (mapId, params, callback) {
-                    setTimeout(callback, 0, null, params);
-                };
-            }
+        t.stub(WebWorker, 'Worker').callsFake(function Worker(self) {
+            this.self = self;
+            this.actor = new Actor(self, this);
+            this.test = function (mapId, params, callback) {
+                setTimeout(callback, 0, null, params);
+            };
         });
 
         const worker = new WebWorker();
@@ -35,12 +31,11 @@ test('Actor', (t) => {
     t.test('targets worker-initiated messages to correct map instance', (t) => {
         let workerActor;
 
-        const WebWorker = proxyquire('../../../src/util/web_worker', {
-            '../source/worker': function Worker(self) {
-                this.self = self;
-                this.actor = workerActor = new Actor(self, this);
-            }
+        t.stub(WebWorker, 'Worker').callsFake(function Worker(self) {
+            this.self = self;
+            this.actor = workerActor = new Actor(self, this);
         });
+
         const worker = new WebWorker();
 
         new Actor(worker, {
diff --git a/test/unit/util/ajax.test.js b/test/unit/util/ajax.test.js
index 3e649a210f1..300abef7289 100644
--- a/test/unit/util/ajax.test.js
+++ b/test/unit/util/ajax.test.js
@@ -1,8 +1,9 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const ajax = require('../../../src/util/ajax');
-const window = require('../../../src/util/window');
+import { test } from 'mapbox-gl-js-test';
+import {
+    getArrayBuffer,
+    getJSON
+} from '../../../src/util/ajax';
+import window from '../../../src/util/window';
 
 test('ajax', (t) => {
     t.beforeEach(callback => {
@@ -19,7 +20,7 @@ test('ajax', (t) => {
         window.server.respondWith(request => {
             request.respond(200, {'Content-Type': 'image/png'}, '');
         });
-        ajax.getArrayBuffer({ url:'' }, (error) => {
+        getArrayBuffer({ url:'' }, (error) => {
             t.pass('called getArrayBuffer');
             t.ok(error, 'should error when the status is 200 without content.');
             t.end();
@@ -31,7 +32,7 @@ test('ajax', (t) => {
         window.server.respondWith(request => {
             request.respond(404);
         });
-        ajax.getArrayBuffer({ url:'' }, (error) => {
+        getArrayBuffer({ url:'' }, (error) => {
             t.equal(error.status, 404);
             t.end();
         });
@@ -42,7 +43,7 @@ test('ajax', (t) => {
         window.server.respondWith(request => {
             request.respond(200, {'Content-Type': 'application/json'}, '{"foo": "bar"}');
         });
-        ajax.getJSON({ url:'' }, (error, body) => {
+        getJSON({ url:'' }, (error, body) => {
             t.error(error);
             t.deepEqual(body, {foo: 'bar'});
             t.end();
@@ -54,7 +55,7 @@ test('ajax', (t) => {
         window.server.respondWith(request => {
             request.respond(200, {'Content-Type': 'application/json'}, 'how do i even');
         });
-        ajax.getJSON({ url:'' }, (error) => {
+        getJSON({ url:'' }, (error) => {
             t.ok(error);
             t.end();
         });
@@ -65,7 +66,7 @@ test('ajax', (t) => {
         window.server.respondWith(request => {
             request.respond(404);
         });
-        ajax.getJSON({ url:'' }, (error) => {
+        getJSON({ url:'' }, (error) => {
             t.equal(error.status, 404);
             t.end();
         });
@@ -76,7 +77,7 @@ test('ajax', (t) => {
         window.server.respondWith(request => {
             request.respond(401);
         });
-        ajax.getJSON({ url:'' }, (error) => {
+        getJSON({ url:'' }, (error) => {
             t.equal(error.status, 401);
             t.equal(error.message, "Unauthorized");
             t.end();
@@ -88,7 +89,7 @@ test('ajax', (t) => {
         window.server.respondWith(request => {
             request.respond(401);
         });
-        ajax.getJSON({ url:'api.mapbox.com' }, (error) => {
+        getJSON({ url:'api.mapbox.com' }, (error) => {
             t.equal(error.status, 401);
             t.equal(error.message, "Unauthorized: you may have provided an invalid Mapbox access token. See https://www.mapbox.com/api-documentation/#access-tokens");
             t.end();
diff --git a/test/unit/util/browser.test.js b/test/unit/util/browser.test.js
index af63b6fae80..9ebf5d223f2 100644
--- a/test/unit/util/browser.test.js
+++ b/test/unit/util/browser.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const browser = require('../../../src/util/browser');
+import { test } from 'mapbox-gl-js-test';
+import browser from '../../../src/util/browser';
 
 test('browser', (t) => {
     t.test('frame', (t) => {
diff --git a/test/unit/util/classify_rings.test.js b/test/unit/util/classify_rings.test.js
index d2171f0647e..88f991dede5 100644
--- a/test/unit/util/classify_rings.test.js
+++ b/test/unit/util/classify_rings.test.js
@@ -1,11 +1,9 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const fs = require('fs');
-const path = require('path');
-const Protobuf = require('pbf');
-const VectorTile = require('@mapbox/vector-tile').VectorTile;
-const classifyRings = require('../../../src/util/classify_rings');
+import { test } from 'mapbox-gl-js-test';
+import fs from 'fs';
+import path from 'path';
+import Protobuf from 'pbf';
+import { VectorTile } from '@mapbox/vector-tile';
+import classifyRings from '../../../src/util/classify_rings';
 
 // Load a fill feature from fixture tile.
 const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf'))));
diff --git a/test/unit/util/dispatcher.test.js b/test/unit/util/dispatcher.test.js
index 77f73832fec..50a1c9e5d09 100644
--- a/test/unit/util/dispatcher.test.js
+++ b/test/unit/util/dispatcher.test.js
@@ -1,9 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const proxyquire = require('proxyquire');
-const Dispatcher = require('../../../src/util/dispatcher');
-const WebWorker = require('../../../src/util/web_worker');
+import { test } from 'mapbox-gl-js-test';
+import Dispatcher from '../../../src/util/dispatcher';
+import WebWorker from '../../../src/util/web_worker';
+import WorkerPool from '../../../src/util/worker_pool';
+import mapboxgl from '../../../src/';
 
 test('Dispatcher', (t) => {
     t.test('requests and releases workers from pool', (t) => {
@@ -29,13 +28,10 @@ test('Dispatcher', (t) => {
     });
 
     t.test('creates Actors with unique map id', (t) => {
-        const Dispatcher = proxyquire('../../../src/util/dispatcher', {'./actor': Actor });
-        const WorkerPool = proxyquire('../../../src/util/worker_pool', {
-            '../': { workerCount: 1 }
-        });
-
         const ids = [];
         function Actor (target, parent, mapId) { ids.push(mapId); }
+        t.stub(Dispatcher, 'Actor').callsFake(Actor);
+        t.stub(mapboxgl, 'workerCount').value(1);
 
         const workerPool = new WorkerPool();
         const dispatchers = [new Dispatcher(workerPool, {}), new Dispatcher(workerPool, {})];
@@ -45,14 +41,12 @@ test('Dispatcher', (t) => {
     });
 
     t.test('#remove destroys actors', (t) => {
-        const Dispatcher = proxyquire('../../../src/util/dispatcher', {'./actor': Actor });
         const actorsRemoved = [];
         function Actor() {
             this.remove = function() { actorsRemoved.push(this); };
         }
-        const WorkerPool = proxyquire('../../../src/util/worker_pool', {
-            '../': { workerCount: 4 }
-        });
+        t.stub(Dispatcher, 'Actor').callsFake(Actor);
+        t.stub(mapboxgl, 'workerCount').value(4);
 
         const workerPool = new WorkerPool();
         const dispatcher = new Dispatcher(workerPool, {});
diff --git a/test/unit/util/evented.test.js b/test/unit/util/evented.test.js
index 7635090d509..5430cdc82e6 100644
--- a/test/unit/util/evented.test.js
+++ b/test/unit/util/evented.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const {Event, Evented} = require('../../../src/util/evented');
+import { test } from 'mapbox-gl-js-test';
+import { Event, Evented } from '../../../src/util/evented';
 
 test('Evented', (t) => {
 
diff --git a/test/unit/util/find_pole_of_inaccessibility.test.js b/test/unit/util/find_pole_of_inaccessibility.test.js
index f52f90f9d09..d63b6d77aac 100644
--- a/test/unit/util/find_pole_of_inaccessibility.test.js
+++ b/test/unit/util/find_pole_of_inaccessibility.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const Point = require('@mapbox/point-geometry');
-const findPoleOfInaccessibility = require('../../../src/util/find_pole_of_inaccessibility');
+import { test } from 'mapbox-gl-js-test';
+import Point from '@mapbox/point-geometry';
+import findPoleOfInaccessibility from '../../../src/util/find_pole_of_inaccessibility';
 
 test('polygon_poi', (t) => {
 
diff --git a/test/unit/util/lru_cache.test.js b/test/unit/util/lru_cache.test.js
index 4842c0c4b40..c2261812b77 100644
--- a/test/unit/util/lru_cache.test.js
+++ b/test/unit/util/lru_cache.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const LRUCache = require('../../../src/util/lru_cache');
+import { test } from 'mapbox-gl-js-test';
+import LRUCache from '../../../src/util/lru_cache';
 
 test('LRUCache', (t) => {
     const cache = new LRUCache(10, (removed) => {
diff --git a/test/unit/util/mapbox.test.js b/test/unit/util/mapbox.test.js
index da8c5b4798c..6dd59f8ae60 100644
--- a/test/unit/util/mapbox.test.js
+++ b/test/unit/util/mapbox.test.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const mapbox = require('../../../src/util/mapbox');
-const config = require('../../../src/util/config');
-const browser = require('../../../src/util/browser');
-const window = require('../../../src/util/window');
+import { test } from 'mapbox-gl-js-test';
+import * as mapbox from '../../../src/util/mapbox';
+import config from '../../../src/util/config';
+import browser from '../../../src/util/browser';
+import window from '../../../src/util/window';
 
 test("mapbox", (t) => {
     const mapboxSource = 'mapbox://user.map';
diff --git a/test/unit/util/struct_array.test.js b/test/unit/util/struct_array.test.js
index 0550bea40c4..27e4e9fc90e 100644
--- a/test/unit/util/struct_array.test.js
+++ b/test/unit/util/struct_array.test.js
@@ -1,8 +1,7 @@
 // @flow
-'use strict';
 
-const test = require('mapbox-gl-js-test').test;
-const {StructArrayLayout3i6, FeatureIndexArray} = require('../../../src/data/array_types');
+import { test } from 'mapbox-gl-js-test';
+import { StructArrayLayout3i6, FeatureIndexArray } from '../../../src/data/array_types';
 
 test('StructArray', (t) => {
     class TestArray extends StructArrayLayout3i6 {}
diff --git a/test/unit/util/throttle.test.js b/test/unit/util/throttle.test.js
index 962d89ba9da..e1754eda0ce 100644
--- a/test/unit/util/throttle.test.js
+++ b/test/unit/util/throttle.test.js
@@ -1,8 +1,8 @@
-'use strict';
 // @flow
 
-const test = require('mapbox-gl-js-test').test;
-const throttle = require('../../../src/util/throttle');
+import { test } from 'mapbox-gl-js-test';
+
+import throttle from '../../../src/util/throttle';
 
 test('throttle', (t) => {
 
diff --git a/test/unit/util/tile_cover.test.js b/test/unit/util/tile_cover.test.js
index 96a1d3b01cc..c788f4976a3 100644
--- a/test/unit/util/tile_cover.test.js
+++ b/test/unit/util/tile_cover.test.js
@@ -1,8 +1,6 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const tileCover = require('../../../src/util/tile_cover');
-const {OverscaledTileID} = require('../../../src/source/tile_id');
+import { test } from 'mapbox-gl-js-test';
+import tileCover from '../../../src/util/tile_cover';
+import { OverscaledTileID } from '../../../src/source/tile_id';
 
 test('tileCover', (t) => {
 
diff --git a/test/unit/util/token.test.js b/test/unit/util/token.test.js
index 526eeeafd89..ac83e1f2b41 100644
--- a/test/unit/util/token.test.js
+++ b/test/unit/util/token.test.js
@@ -1,7 +1,5 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const resolveTokens = require('../../../src/util/token');
+import { test } from 'mapbox-gl-js-test';
+import resolveTokens from '../../../src/util/token';
 
 test('resolveToken', (t) => {
     t.equal('3 Fine Fields', resolveTokens({a:3, b:'Fine', c:'Fields'}, '{a} {b} {c}'));
diff --git a/test/unit/util/util.test.js b/test/unit/util/util.test.js
index 4c9e5e4f022..11dc4447228 100644
--- a/test/unit/util/util.test.js
+++ b/test/unit/util/util.test.js
@@ -1,25 +1,25 @@
-'use strict';
 // @flow
 
-const test = require('mapbox-gl-js-test').test;
-const Coordinate = require('../../../src/geo/coordinate');
-const util = require('../../../src/util/util');
-const Point = require('@mapbox/point-geometry');
+import { test } from 'mapbox-gl-js-test';
+
+import Coordinate from '../../../src/geo/coordinate';
+import { easeCubicInOut, keysDifference, extend, pick, uniqueId, getCoordinatesCenter, bindAll, asyncAll, clamp, wrap, bezier, endsWith, mapObject, filterObject, deepEqual, clone, arraysIntersect, isCounterClockwise, isClosedPolygon, parseCacheControl } from '../../../src/util/util';
+import Point from '@mapbox/point-geometry';
 
 test('util', (t) => {
-    t.equal(util.easeCubicInOut(0), 0, 'easeCubicInOut=0');
-    t.equal(util.easeCubicInOut(0.2), 0.03200000000000001);
-    t.equal(util.easeCubicInOut(0.5), 0.5, 'easeCubicInOut=0.5');
-    t.equal(util.easeCubicInOut(1), 1, 'easeCubicInOut=1');
-    t.deepEqual(util.keysDifference({a:1}, {}), ['a'], 'keysDifference');
-    t.deepEqual(util.keysDifference({a:1}, {a:1}), [], 'keysDifference');
-    t.deepEqual(util.extend({a:1}, {b:2}), {a:1, b:2}, 'extend');
-    t.deepEqual(util.pick({a:1, b:2, c:3}, ['a', 'c']), {a:1, c:3}, 'pick');
-    t.deepEqual(util.pick({a:1, b:2, c:3}, ['a', 'c', 'd']), {a:1, c:3}, 'pick');
-    t.ok(typeof util.uniqueId() === 'number', 'uniqueId');
+    t.equal(easeCubicInOut(0), 0, 'easeCubicInOut=0');
+    t.equal(easeCubicInOut(0.2), 0.03200000000000001);
+    t.equal(easeCubicInOut(0.5), 0.5, 'easeCubicInOut=0.5');
+    t.equal(easeCubicInOut(1), 1, 'easeCubicInOut=1');
+    t.deepEqual(keysDifference({a:1}, {}), ['a'], 'keysDifference');
+    t.deepEqual(keysDifference({a:1}, {a:1}), [], 'keysDifference');
+    t.deepEqual(extend({a:1}, {b:2}), {a:1, b:2}, 'extend');
+    t.deepEqual(pick({a:1, b:2, c:3}, ['a', 'c']), {a:1, c:3}, 'pick');
+    t.deepEqual(pick({a:1, b:2, c:3}, ['a', 'c', 'd']), {a:1, c:3}, 'pick');
+    t.ok(typeof uniqueId() === 'number', 'uniqueId');
 
     t.test('getCoordinatesCenter', (t) => {
-        t.deepEqual(util.getCoordinatesCenter([
+        t.deepEqual(getCoordinatesCenter([
             new Coordinate(0, 0, 2),
             new Coordinate(1, 1, 2)
         ]), new Coordinate(0.5, 0.5, 0));
@@ -28,7 +28,7 @@ test('util', (t) => {
 
     t.test('bindAll', (t) => {
         function MyClass() {
-            util.bindAll(['ontimer'], this);
+            bindAll(['ontimer'], this);
             this.name = 'Tom';
         }
         MyClass.prototype.ontimer = function() {
@@ -40,7 +40,7 @@ test('util', (t) => {
     });
 
     t.test('asyncAll - sync', (t) => {
-        t.equal(util.asyncAll([0, 1, 2], (data, callback) => {
+        t.equal(asyncAll([0, 1, 2], (data, callback) => {
             callback(null, data);
         }, (err, results) => {
             t.ifError(err);
@@ -50,7 +50,7 @@ test('util', (t) => {
     });
 
     t.test('asyncAll - async', (t) => {
-        t.equal(util.asyncAll([4, 0, 1, 2], (data, callback) => {
+        t.equal(asyncAll([4, 0, 1, 2], (data, callback) => {
             setTimeout(() => {
                 callback(null, data);
             }, data);
@@ -62,7 +62,7 @@ test('util', (t) => {
     });
 
     t.test('asyncAll - error', (t) => {
-        t.equal(util.asyncAll([4, 0, 1, 2], (data, callback) => {
+        t.equal(asyncAll([4, 0, 1, 2], (data, callback) => {
             setTimeout(() => {
                 callback(new Error('hi'), data);
             }, data);
@@ -74,7 +74,7 @@ test('util', (t) => {
     });
 
     t.test('asyncAll - empty', (t) => {
-        t.equal(util.asyncAll([], (data, callback) => {
+        t.equal(asyncAll([], (data, callback) => {
             callback(null, 'foo');
         }, (err, results) => {
             t.ifError(err);
@@ -84,23 +84,23 @@ test('util', (t) => {
     });
 
     t.test('clamp', (t) => {
-        t.equal(util.clamp(0, 0, 1), 0);
-        t.equal(util.clamp(1, 0, 1), 1);
-        t.equal(util.clamp(200, 0, 180), 180);
-        t.equal(util.clamp(-200, 0, 180), 0);
+        t.equal(clamp(0, 0, 1), 0);
+        t.equal(clamp(1, 0, 1), 1);
+        t.equal(clamp(200, 0, 180), 180);
+        t.equal(clamp(-200, 0, 180), 0);
         t.end();
     });
 
     t.test('wrap', (t) => {
-        t.equal(util.wrap(0, 0, 1), 1);
-        t.equal(util.wrap(1, 0, 1), 1);
-        t.equal(util.wrap(200, 0, 180), 20);
-        t.equal(util.wrap(-200, 0, 180), 160);
+        t.equal(wrap(0, 0, 1), 1);
+        t.equal(wrap(1, 0, 1), 1);
+        t.equal(wrap(200, 0, 180), 20);
+        t.equal(wrap(-200, 0, 180), 160);
         t.end();
     });
 
     t.test('bezier', (t) => {
-        const curve = util.bezier(0, 0, 0.25, 1);
+        const curve = bezier(0, 0, 0.25, 1);
         t.ok(curve instanceof Function, 'returns a function');
         t.equal(curve(0), 0);
         t.equal(curve(1), 1);
@@ -110,10 +110,10 @@ test('util', (t) => {
 
     t.test('asyncAll', (t) => {
         let expect = 1;
-        util.asyncAll([], (callback) => { callback(); }, () => {
+        asyncAll([], (callback) => { callback(); }, () => {
             t.ok('immediate callback');
         });
-        util.asyncAll([1, 2, 3], (number, callback) => {
+        asyncAll([1, 2, 3], (number, callback) => {
             t.equal(number, expect++);
             t.ok(callback instanceof Function);
             callback(null, 0);
@@ -123,16 +123,16 @@ test('util', (t) => {
     });
 
     t.test('endsWith', (t) => {
-        t.ok(util.endsWith('mapbox', 'box'));
-        t.notOk(util.endsWith('mapbox', 'map'));
+        t.ok(endsWith('mapbox', 'box'));
+        t.notOk(endsWith('mapbox', 'map'));
         t.end();
     });
 
     t.test('mapObject', (t) => {
         t.plan(6);
-        t.deepEqual(util.mapObject({}, () => { t.ok(false); }), {});
+        t.deepEqual(mapObject({}, () => { t.ok(false); }), {});
         const that = {};
-        t.deepEqual(util.mapObject({map: 'box'}, function(value, key, object) {
+        t.deepEqual(mapObject({map: 'box'}, function(value, key, object) {
             t.equal(value, 'box');
             t.equal(key, 'map');
             t.deepEqual(object, {map: 'box'});
@@ -143,16 +143,16 @@ test('util', (t) => {
 
     t.test('filterObject', (t) => {
         t.plan(6);
-        t.deepEqual(util.filterObject({}, () => { t.ok(false); }), {});
+        t.deepEqual(filterObject({}, () => { t.ok(false); }), {});
         const that = {};
-        util.filterObject({map: 'box'}, function(value, key, object) {
+        filterObject({map: 'box'}, function(value, key, object) {
             t.equal(value, 'box');
             t.equal(key, 'map');
             t.deepEqual(object, {map: 'box'});
             t.equal(this, that);
             return true;
         }, that);
-        t.deepEqual(util.filterObject({map: 'box', box: 'map'}, (value) => {
+        t.deepEqual(filterObject({map: 'box', box: 'map'}, (value) => {
             return value === 'box';
         }), {map: 'box'});
         t.end();
@@ -170,11 +170,11 @@ test('util', (t) => {
         const c = JSON.parse(JSON.stringify(a));
         c.bar.lol[0] = "z";
 
-        t.ok(util.deepEqual(a, b));
-        t.notOk(util.deepEqual(a, c));
-        t.notOk(util.deepEqual(a, null));
-        t.notOk(util.deepEqual(null, c));
-        t.ok(util.deepEqual(null, null));
+        t.ok(deepEqual(a, b));
+        t.notOk(deepEqual(a, c));
+        t.notOk(deepEqual(a, null));
+        t.notOk(deepEqual(null, c));
+        t.ok(deepEqual(null, null));
 
         t.end();
     });
@@ -182,7 +182,7 @@ test('util', (t) => {
     t.test('clone', (t) => {
         t.test('array', (t) => {
             const input = [false, 1, 'two'];
-            const output = util.clone(input);
+            const output = clone(input);
             t.notEqual(input, output);
             t.deepEqual(input, output);
             t.end();
@@ -190,7 +190,7 @@ test('util', (t) => {
 
         t.test('object', (t) => {
             const input = {a: false, b: 1, c: 'two'};
-            const output = util.clone(input);
+            const output = clone(input);
             t.notEqual(input, output);
             t.deepEqual(input, output);
             t.end();
@@ -198,7 +198,7 @@ test('util', (t) => {
 
         t.test('deep object', (t) => {
             const input = {object: {a: false, b: 1, c: 'two'}};
-            const output = util.clone(input);
+            const output = clone(input);
             t.notEqual(input.object, output.object);
             t.deepEqual(input.object, output.object);
             t.end();
@@ -206,7 +206,7 @@ test('util', (t) => {
 
         t.test('deep array', (t) => {
             const input = {array: [false, 1, 'two']};
-            const output = util.clone(input);
+            const output = clone(input);
             t.notEqual(input.array, output.array);
             t.deepEqual(input.array, output.array);
             t.end();
@@ -220,7 +220,7 @@ test('util', (t) => {
             const a = ["1", "2", "3"];
             const b = ["5", "4", "3"];
 
-            t.equal(util.arraysIntersect(a, b), true);
+            t.equal(arraysIntersect(a, b), true);
             t.end();
         });
 
@@ -228,7 +228,7 @@ test('util', (t) => {
             const a = ["1", "2", "3"];
             const b = ["4", "5", "6"];
 
-            t.equal(util.arraysIntersect(a, b), false);
+            t.equal(arraysIntersect(a, b), false);
             t.end();
         });
 
@@ -241,7 +241,7 @@ test('util', (t) => {
             const b = new Point(1, 0);
             const c = new Point(1, 1);
 
-            t.equal(util.isCounterClockwise(a, b, c), true);
+            t.equal(isCounterClockwise(a, b, c), true);
             t.end();
         });
 
@@ -250,7 +250,7 @@ test('util', (t) => {
             const b = new Point(1, 0);
             const c = new Point(1, 1);
 
-            t.equal(util.isCounterClockwise(c, b, a), false);
+            t.equal(isCounterClockwise(c, b, a), false);
             t.end();
         });
 
@@ -261,21 +261,21 @@ test('util', (t) => {
         t.test('not enough points', (t) => {
             const polygon = [new Point(0, 0), new Point(1, 0), new Point(0, 1)];
 
-            t.equal(util.isClosedPolygon(polygon), false);
+            t.equal(isClosedPolygon(polygon), false);
             t.end();
         });
 
         t.test('not equal first + last point', (t) => {
             const polygon = [new Point(0, 0), new Point(1, 0), new Point(0, 1), new Point(1, 1)];
 
-            t.equal(util.isClosedPolygon(polygon), false);
+            t.equal(isClosedPolygon(polygon), false);
             t.end();
         });
 
         t.test('closed polygon', (t) => {
             const polygon = [new Point(0, 0), new Point(1, 0), new Point(1, 1), new Point(0, 1), new Point(0, 0)];
 
-            t.equal(util.isClosedPolygon(polygon), true);
+            t.equal(isClosedPolygon(polygon), true);
             t.end();
         });
 
@@ -284,15 +284,15 @@ test('util', (t) => {
 
     t.test('parseCacheControl', (t) => {
         t.test('max-age', (t) => {
-            t.deepEqual(util.parseCacheControl('max-age=123456789'), {
+            t.deepEqual(parseCacheControl('max-age=123456789'), {
                 'max-age': 123456789
             }, 'returns valid max-age header');
 
-            t.deepEqual(util.parseCacheControl('max-age=1000'), {
+            t.deepEqual(parseCacheControl('max-age=1000'), {
                 'max-age': 1000
             }, 'returns valid max-age header');
 
-            t.deepEqual(util.parseCacheControl('max-age=null'), {}, 'does not return invalid max-age header');
+            t.deepEqual(parseCacheControl('max-age=null'), {}, 'does not return invalid max-age header');
 
             t.end();
         });
diff --git a/test/unit/util/web_worker_transfer.test.js b/test/unit/util/web_worker_transfer.test.js
index fa9a9382a3d..74bdc1171ce 100644
--- a/test/unit/util/web_worker_transfer.test.js
+++ b/test/unit/util/web_worker_transfer.test.js
@@ -1,19 +1,15 @@
 // @flow
 
-'use strict';
+import { test } from 'mapbox-gl-js-test';
+import { register, serialize, deserialize } from '../../../src/util/web_worker_transfer';
 
-const test = require('mapbox-gl-js-test').test;
-const {register, serialize, deserialize} = require('../../../src/util/web_worker_transfer');
-
-/*::
-import type {Serialized} from '../../../src/util/web_worker_transfer';
-*/
+import type { Serialized } from '../../../src/util/web_worker_transfer';
 
 test('round trip', (t) => {
     class Foo {
-        /*:: n: number;*/
-        /*:: buffer: ArrayBuffer;*/
-        /*:: _cached: ?number;*/
+        n: number;
+        buffer: ArrayBuffer;
+        _cached: ?number;
 
         constructor(n) {
             this.n = n;
@@ -36,7 +32,7 @@ test('round trip', (t) => {
     const transferables = [];
     const deserialized = deserialize(serialize(foo, transferables));
     t.assert(deserialized instanceof Foo);
-    const bar/*: Foo*/ = (deserialized/*: any*/);
+    const bar: Foo = (deserialized: any);
 
     t.assert(foo !== bar);
     t.assert(bar.constructor === Foo);
@@ -60,19 +56,19 @@ test('anonymous class', (t) => {
 
 test('custom serialization', (t) => {
     class Bar {
-        /*:: id: string; */
-        /*:: _deserialized: boolean; */
+        id: string;
+        _deserialized: boolean;
         constructor(id) {
             this.id = id;
             this._deserialized = false;
         }
 
-        static serialize(b/*: Bar*/)/*: Serialized*/ {
+        static serialize(b: Bar): Serialized {
             return `custom serialization,${b.id}`;
         }
 
-        static deserialize(input/*: Serialized*/)/*: Bar*/ {
-            const b = new Bar((input/*: any*/).split(',')[1]);
+        static deserialize(input: Serialized): Bar {
+            const b = new Bar((input: any).split(',')[1]);
             b._deserialized = true;
             return b;
         }
@@ -85,7 +81,7 @@ test('custom serialization', (t) => {
 
     const deserialized = deserialize(serialize(bar));
     t.assert(deserialized instanceof Bar);
-    const bar2/*: Bar*/ = (deserialized/*: any*/);
+    const bar2: Bar = (deserialized: any);
     t.equal(bar2.id, bar.id);
     t.assert(bar2._deserialized);
     t.end();
diff --git a/test/unit/util/worker_pool.test.js b/test/unit/util/worker_pool.test.js
index e1dcd5ffa21..a2cb029b76c 100644
--- a/test/unit/util/worker_pool.test.js
+++ b/test/unit/util/worker_pool.test.js
@@ -1,13 +1,10 @@
-'use strict';
-
-const test = require('mapbox-gl-js-test').test;
-const proxyquire = require('proxyquire');
+import { test } from 'mapbox-gl-js-test';
+import mapboxgl from '../../../src';
+import WorkerPool from '../../../src/util/worker_pool';
 
 test('WorkerPool', (t) => {
     t.test('#acquire', (t) => {
-        const WorkerPool = proxyquire('../../../src/util/worker_pool', {
-            '../': { workerCount: 4 }
-        });
+        t.stub(mapboxgl, 'workerCount').value(4);
 
         const pool = new WorkerPool();
 
@@ -24,9 +21,7 @@ test('WorkerPool', (t) => {
 
     t.test('#release', (t) => {
         let workersTerminated = 0;
-        const WorkerPool = proxyquire('../../../src/util/worker_pool', {
-            '../': { workerCount: 4 }
-        });
+        t.stub(mapboxgl, 'workerCount').value(4);
 
         const pool = new WorkerPool();
         pool.acquire('map-1');
diff --git a/yarn.lock b/yarn.lock
index 0d5ebcc715a..959e5cba68c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,86 +2,86 @@
 # yarn lockfile v1
 
 
-"@mapbox/babel-plugin-transform-jsxtreme-markdown@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/babel-plugin-transform-jsxtreme-markdown/-/babel-plugin-transform-jsxtreme-markdown-0.4.1.tgz#65dd3ff4d8b261313c2ece3d01099e1d420793cd"
+"@mapbox/babel-plugin-transform-jsxtreme-markdown@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/babel-plugin-transform-jsxtreme-markdown/-/babel-plugin-transform-jsxtreme-markdown-0.4.2.tgz#7b52474baa8b7bef5c4539f2bd5c26261dd77294"
   dependencies:
-    "@mapbox/jsxtreme-markdown" "^0.7.2"
+    "@mapbox/jsxtreme-markdown" "^0.7.3"
     babylon "^6.17.4"
 
-"@mapbox/batfish@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@mapbox/batfish/-/batfish-0.13.3.tgz#6f39de1730ea12fd295dc489e8f95d27abaab6fe"
+"@mapbox/batfish@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@mapbox/batfish/-/batfish-1.0.4.tgz#f06584e18bee5d4ac60e52e2ced9b32579c3e030"
   dependencies:
-    "@mapbox/babel-plugin-transform-jsxtreme-markdown" "^0.4.1"
-    "@mapbox/jsxtreme-markdown-loader" "^0.5.1"
-    "@mapbox/link-hijacker" "^1.0.0"
+    "@mapbox/babel-plugin-transform-jsxtreme-markdown" "^0.4.2"
+    "@mapbox/jsxtreme-markdown-loader" "^0.5.3"
+    "@mapbox/link-hijacker" "^1.1.0"
     "@mapbox/link-to-location" "^1.0.0"
     "@mapbox/postcss-html-filter" "^1.0.0"
     "@mapbox/query-selector-contains-node" "^1.0.0"
     "@mapbox/scroll-restorer" "^1.0.0"
     assets-webpack-plugin "^3.5.1"
-    autoprefixer "^7.1.4"
+    autoprefixer "^8.0.0"
     babel-loader "^7.1.2"
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-plugin-transform-class-properties "^6.24.1"
     babel-plugin-transform-react-jsx-self "^6.22.0"
     babel-plugin-transform-react-jsx-source "^6.22.0"
-    babel-plugin-transform-react-remove-prop-types "^0.4.9"
+    babel-plugin-transform-react-remove-prop-types "^0.4.13"
     babel-plugin-transform-runtime "^6.23.0"
-    babel-preset-env "^1.6.0"
+    babel-preset-env "^1.6.1"
     babel-preset-react "^6.24.1"
     babel-register "^6.26.0"
-    browser-sync "^2.18.12"
-    chalk "^2.1.0"
-    chokidar "^1.7.0"
-    concat-with-sourcemaps "^1.0.4"
-    connect-history-api-fallback "^1.3.0"
+    browser-sync "^2.23.6"
+    chalk "^2.3.1"
+    chokidar "^2.0.2"
+    concat-with-sourcemaps "^1.0.5"
+    connect-history-api-fallback "^1.5.0"
     cpy "^6.0.0"
     del "^3.0.0"
     del-cli "^1.1.0"
-    es6-promise "^4.1.0"
+    es6-promise "^4.2.4"
     fasterror "^1.1.0"
-    file-loader "^1.1.3"
+    file-loader "^1.1.8"
     get-port "^3.2.0"
-    globby "^6.1.0"
-    got "^7.0.0"
-    gray-matter "^3.0.7"
+    globby "^8.0.1"
+    got "^8.2.0"
+    gray-matter "^3.1.1"
     hasha "^3.0.0"
     html-webpack-plugin "^2.30.1"
     ignore-loader "^0.1.2"
-    indefinite "^1.0.1"
+    indefinite "^2.1.1"
     is-glob "^4.0.0"
-    json-loader "^0.5.4"
+    json-loader "^0.5.7"
     loader-utils "^1.1.0"
-    lodash "^4.17.4"
-    meow "^3.7.0"
+    lodash "^4.17.5"
+    meow "^4.0.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     p-try "^1.0.0"
     pify "^3.0.0"
-    postcss "^6.0.12"
+    postcss "^6.0.19"
     postcss-csso "^3.0.0"
-    postcss-url "^7.1.2"
-    postcss-values-parser "^1.3.1"
-    prettier "^1.7.4"
+    postcss-url "^7.3.0"
+    postcss-values-parser "^1.3.2"
+    prettier "^1.10.2"
     pretty-error "^2.1.1"
     prop-types "^15.6.0"
     remark-lint-no-dead-urls "^0.3.0"
-    remark-toc "^4.0.1"
+    remark-toc "^5.0.0"
     resolve-from "^4.0.0"
     sitemap-static "^0.4.2"
     slugg "^1.2.1"
-    source-map-support "^0.5.0"
+    source-map-support "^0.5.3"
     tempy "^0.2.1"
     time-stamp "^2.0.0"
-    uglify-js "^3.1.2"
-    webpack "^3.6.0"
+    uglify-js "^3.3.11"
+    uglifyjs-webpack-plugin "^1.2.0"
+    webpack "^3.11.0"
     webpack-chunk-hash "^0.5.0"
     webpack-format-messages "^1.0.1"
-    webpack-merge "^4.1.0"
-    webpack-parallel-uglify-plugin "^1.0.0"
-    worker-farm "^1.5.0"
+    webpack-merge "^4.1.1"
+    worker-farm "^1.5.2"
 
 "@mapbox/geojson-area@0.2.2":
   version "0.2.2"
@@ -93,16 +93,17 @@
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@mapbox/gl-matrix/-/gl-matrix-0.0.1.tgz#e5126aab4d64c36b81c7a97d0ae0dddde5773d2b"
 
-"@mapbox/jsxtreme-markdown-loader@^0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/jsxtreme-markdown-loader/-/jsxtreme-markdown-loader-0.5.1.tgz#a6b805c4b5872de9705a0d2509712533c52c9a0f"
+"@mapbox/jsxtreme-markdown-loader@^0.5.3":
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@mapbox/jsxtreme-markdown-loader/-/jsxtreme-markdown-loader-0.5.3.tgz#f43630f1bca4971bd3753afe182798e15b28706d"
   dependencies:
-    "@mapbox/jsxtreme-markdown" "^0.7.2"
+    "@mapbox/jsxtreme-markdown" "^0.7.3"
     loader-utils "^1.1.0"
+    lodash.clonedeep "^4.5.0"
 
-"@mapbox/jsxtreme-markdown@^0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@mapbox/jsxtreme-markdown/-/jsxtreme-markdown-0.7.2.tgz#608feaf9d7df208ef28565569b83b8f6b58b1b82"
+"@mapbox/jsxtreme-markdown@^0.7.3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@mapbox/jsxtreme-markdown/-/jsxtreme-markdown-0.7.3.tgz#150f230ff1d4afe48622f48a2fd71887786d0939"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-core "^6.25.0"
@@ -115,6 +116,7 @@
     line-column "^1.0.2"
     lodash "^4.17.4"
     pascal-case "^2.0.1"
+    prettier "^1.5.3"
     rehype-raw "^2.0.0"
     rehype-stringify "^3.0.0"
     remark-parse "^4.0.0"
@@ -122,17 +124,17 @@
     stringify-object "^3.2.0"
     unified "^6.1.5"
 
-"@mapbox/link-hijacker@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/link-hijacker/-/link-hijacker-1.0.0.tgz#ca7996ef6ddc77d9e5515583938e1dda2d1640d3"
+"@mapbox/link-hijacker@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/link-hijacker/-/link-hijacker-1.1.0.tgz#f14a68edabe45424d8bec7375ad13e18cac22bf8"
 
 "@mapbox/link-to-location@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/link-to-location/-/link-to-location-1.0.0.tgz#484a4d922e3e6f7b54fd7964d8035bcb00bbf59a"
 
 "@mapbox/mapbox-gl-rtl-text@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-rtl-text/-/mapbox-gl-rtl-text-0.1.1.tgz#1ceb3103cd668b16563b5492c0690c3f091c7491"
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-rtl-text/-/mapbox-gl-rtl-text-0.1.2.tgz#c6bdcc05ac71c1caa4dfa09022466d1e278083bc"
 
 "@mapbox/mapbox-gl-supported@^1.3.0":
   version "1.3.0"
@@ -181,6 +183,10 @@
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/query-selector-contains-node/-/query-selector-contains-node-1.0.0.tgz#b5e1fdbaa0f7e627dc7eeeb625619f09ba2cca0c"
 
+"@mapbox/rollup@0.57.0-await.upstream.pr2035":
+  version "0.57.0-await.upstream.pr2035"
+  resolved "https://registry.yarnpkg.com/@mapbox/rollup/-/rollup-0.57.0-await.upstream.pr2035.tgz#94d040c7599a2b8fc97715c6e6787bae4ece0049"
+
 "@mapbox/scroll-restorer@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/scroll-restorer/-/scroll-restorer-1.0.0.tgz#a4eb70a4266612d8e638ff8857c295d57c1c8ead"
@@ -214,39 +220,47 @@
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.0.0.tgz#c1de4293081424da3ac30c23afa850af1019bb54"
 
-"@types/node@*":
-  version "8.0.34"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.34.tgz#55f801fa2ddb2a40dd6dfc15ecfe1dde9c129fe9"
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
 
-"@types/node@^6.0.46":
-  version "6.0.88"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66"
+"@std/esm@^0.21.7":
+  version "0.21.7"
+  resolved "https://registry.yarnpkg.com/@std/esm/-/esm-0.21.7.tgz#492d7931aed03e91a133deac4d9062fbfce5fd6b"
 
-"@types/source-map@*":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
+"@types/node@*":
+  version "9.4.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
 
 "@types/tapable@*":
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-0.2.4.tgz#8181a228da46185439300e600c5ae3b3b3982585"
 
 "@types/uglify-js@*":
-  version "2.6.29"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-2.6.29.tgz#521347f69e20201d218f5991ae66e10878afcf1a"
+  version "2.6.30"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-2.6.30.tgz#257d2b6dd86673d60da476680fba90f2e30c6eef"
   dependencies:
-    "@types/source-map" "*"
+    source-map "^0.6.1"
 
 "@types/webpack@^3.0.5":
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-3.0.13.tgz#5a49ae51e784e73bc46830a6a20656e85b8af0e6"
+  version "3.8.8"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-3.8.8.tgz#fd9483edf2d6935eaab52aa530b1f737c188cd9a"
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"
     "@types/uglify-js" "*"
+    source-map "^0.6.0"
 
 JSONStream@^1.0.3, JSONStream@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -260,17 +274,10 @@ abab@^1.0.4:
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
 abbrev@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
-
-accepts@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
-  dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-accepts@~1.3.3:
+accepts@~1.3.3, accepts@~1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   dependencies:
@@ -295,41 +302,40 @@ acorn-jsx@^3.0.0, acorn-jsx@^3.0.1:
   dependencies:
     acorn "^3.0.4"
 
-acorn-object-spread@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz#48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"
+acorn-node@^1.2.0, acorn-node@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b"
   dependencies:
-    acorn "^3.1.0"
+    acorn "^5.4.1"
+    xtend "^4.0.1"
+
+acorn5-object-spread@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn5-object-spread/-/acorn5-object-spread-4.0.0.tgz#d5758081eed97121ab0be47e31caaef2aa399697"
+  dependencies:
+    acorn "^5.1.2"
 
-acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0:
+acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.0, acorn@^4.0.3:
+acorn@^4.0.0, acorn@^4.0.3, acorn@^4.0.4:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7"
-
-acorn@^5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
-
-acorn@^5.3.0:
+acorn@^5.0.0, acorn@^5.1.2, acorn@^5.2.1, acorn@^5.3.0, acorn@^5.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
+acorn@^5.4.1:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298"
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
 
-after@0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627"
-
-after@~0.8.1:
+after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
 
@@ -340,29 +346,37 @@ aggregate-error@^1.0.0:
     clean-stack "^1.0.0"
     indent-string "^3.0.0"
 
-ajv-keywords@^1.0.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+ajv-keywords@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
-ajv-keywords@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+ajv-keywords@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
+ajv@^5.1.0, ajv@^5.2.3:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+ajv@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
+  dependencies:
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
-    json-stable-stringify "^1.0.1"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -382,9 +396,9 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
-ansi-escapes@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
+ansi-escapes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
 
 ansi-html@^0.0.7:
   version "0.0.7"
@@ -402,7 +416,7 @@ ansi-styles@^2.0.1, ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0:
+ansi-styles@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
   dependencies:
@@ -412,16 +426,19 @@ ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
-ansi@^0.3.0, ansi@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
-
 anymatch@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
   dependencies:
-    arrify "^1.0.0"
     micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
 
 append-transform@^0.4.0:
   version "0.4.0"
@@ -429,9 +446,9 @@ append-transform@^0.4.0:
   dependencies:
     default-require-extensions "^1.0.0"
 
-aproba@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
 archy@^1.0.0:
   version "1.0.0"
@@ -445,8 +462,8 @@ are-we-there-yet@~1.1.2:
     readable-stream "^2.0.6"
 
 argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -460,11 +477,7 @@ arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
 
-arr-flatten@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
-
-arr-flatten@^1.1.0:
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
@@ -472,10 +485,6 @@ arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
 
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -499,13 +508,6 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
-array-index@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9"
-  dependencies:
-    debug "^2.2.0"
-    es6-symbol "^3.0.2"
-
 array-iterate@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-1.1.1.tgz#865bf7f8af39d6b0982c60902914ac76bc0108f6"
@@ -543,9 +545,9 @@ array.prototype.find@2.0.0:
     define-properties "^1.1.2"
     es-abstract "^1.5.0"
 
-arraybuffer.slice@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -556,8 +558,8 @@ asap@~2.0.3:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
 asn1.js@^4.0.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -591,6 +593,10 @@ assets-webpack-plugin@^3.5.1:
     lodash.merge "^3.3.2"
     mkdirp "^0.5.1"
 
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
 ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
@@ -623,9 +629,9 @@ async@1.5.2, async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2, async@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+async@^2.1.2:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
     lodash "^4.14.0"
 
@@ -638,25 +644,25 @@ atob@^2.0.0:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
 
 autoprefixer@^7.1.2:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192"
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
   dependencies:
-    browserslist "^2.11.1"
-    caniuse-lite "^1.0.30000791"
+    browserslist "^2.11.3"
+    caniuse-lite "^1.0.30000805"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.16"
+    postcss "^6.0.17"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^7.1.4:
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.5.tgz#d65d14b83c7cd1dd7bc801daa00557addf5a06b2"
+autoprefixer@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.0.0.tgz#c19e480f061013127c373df0b01cf46919943f74"
   dependencies:
-    browserslist "^2.5.0"
-    caniuse-lite "^1.0.30000744"
+    browserslist "^3.0.0"
+    caniuse-lite "^1.0.30000808"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.13"
+    postcss "^6.0.17"
     postcss-value-parser "^3.2.3"
 
 aws-sign2@~0.6.0:
@@ -671,15 +677,7 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-code-frame@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
-  dependencies:
-    chalk "^1.1.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -687,31 +685,7 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.0.14, babel-core@^6.17.0, babel-core@^6.24.1:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.25.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.25.0"
-    babel-traverse "^6.25.0"
-    babel-types "^6.25.0"
-    babylon "^6.17.2"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
-babel-core@^6.25.0, babel-core@^6.26.0:
+babel-core@^6.0.14, babel-core@^6.17.0, babel-core@^6.25.0, babel-core@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
@@ -744,22 +718,9 @@ babel-eslint@^7.0.0:
     babel-types "^6.23.0"
     babylon "^6.17.0"
 
-babel-generator@^6.18.0, babel-generator@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.25.0.tgz#33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.25.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-babel-generator@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+babel-generator@^6.18.0, babel-generator@^6.25.0, babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -767,7 +728,7 @@ babel-generator@^6.26.0:
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
     lodash "^4.17.4"
-    source-map "^0.5.6"
+    source-map "^0.5.7"
     trim-right "^1.0.1"
 
 babel-helper-bindify-decorators@^6.24.1:
@@ -787,12 +748,12 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
     babel-types "^6.24.1"
 
 babel-helper-builder-react-jsx@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz#0ad7917e33c8d751e646daca4e77cc19377d2cbc"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    esutils "^2.0.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    esutils "^2.0.2"
 
 babel-helper-call-delegate@^6.24.1:
   version "6.24.1"
@@ -804,13 +765,13 @@ babel-helper-call-delegate@^6.24.1:
     babel-types "^6.24.1"
 
 babel-helper-define-map@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
   dependencies:
     babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    lodash "^4.2.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
 
 babel-helper-explode-assignable-expression@^6.24.1:
   version "6.24.1"
@@ -861,12 +822,12 @@ babel-helper-optimise-call-expression@^6.24.1:
     babel-types "^6.24.1"
 
 babel-helper-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    lodash "^4.2.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
 
 babel-helper-remap-async-to-generator@^6.24.1:
   version "6.24.1"
@@ -1048,7 +1009,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0:
+babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
   dependencies:
@@ -1058,16 +1019,6 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-plugin-transform-es2015-block-scoping@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    lodash "^4.2.0"
-
 babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
@@ -1130,7 +1081,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.23.0:
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
   dependencies:
@@ -1139,15 +1090,6 @@ babel-plugin-transform-es2015-modules-commonjs@^6.23.0:
     babel-template "^6.26.0"
     babel-types "^6.26.0"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-types "^6.24.1"
-
 babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
@@ -1253,11 +1195,11 @@ babel-plugin-transform-function-bind@^6.22.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-object-rest-spread@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.22.0"
+    babel-runtime "^6.26.0"
 
 babel-plugin-transform-react-display-name@^6.23.0:
   version "6.25.0"
@@ -1287,22 +1229,16 @@ babel-plugin-transform-react-jsx@^6.24.1:
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-remove-prop-types@^0.4.9:
-  version "0.4.9"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.9.tgz#6805ef83d77bda94ded472ff2f2836bacd6ac44c"
+babel-plugin-transform-react-remove-prop-types@^0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.13.tgz#331cfc05099a808238311d78319c27460d481189"
 
-babel-plugin-transform-regenerator@^6.22.0:
+babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
   dependencies:
     regenerator-transform "^0.10.0"
 
-babel-plugin-transform-regenerator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
-  dependencies:
-    regenerator-transform "0.9.11"
-
 babel-plugin-transform-runtime@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
@@ -1316,9 +1252,9 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-preset-env@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
+babel-preset-env@^1.6.0, babel-preset-env@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -1432,18 +1368,6 @@ babel-preset-stage-3@^6.24.1:
     babel-plugin-transform-exponentiation-operator "^6.24.1"
     babel-plugin-transform-object-rest-spread "^6.22.0"
 
-babel-register@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
-  dependencies:
-    babel-core "^6.24.1"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
-
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
@@ -1463,31 +1387,14 @@ babel-runtime@6.11.6:
     core-js "^2.4.0"
     regenerator-runtime "^0.9.5"
 
-babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-runtime@^6.26.0:
+babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.25.0, babel-template@^6.3.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.25.0"
-    babel-types "^6.25.0"
-    babylon "^6.17.2"
-    lodash "^4.2.0"
-
-babel-template@^6.26.0:
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   dependencies:
@@ -1497,21 +1404,7 @@ babel-template@^6.26.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.25.0"
-    babylon "^6.17.2"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.26.0:
+babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   dependencies:
@@ -1525,16 +1418,7 @@ babel-traverse@^6.26.0:
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babel-types@^6.26.0:
+babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   dependencies:
@@ -1550,11 +1434,7 @@ babelify@^7.3.0:
     babel-core "^6.0.14"
     object-assign "^4.0.0"
 
-babylon@^6.15.0, babylon@^6.17.0, babylon@^6.17.2, babylon@^6.17.4:
-  version "6.17.4"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
-
-babylon@^6.18.0:
+babylon@^6.15.0, babylon@^6.17.0, babylon@^6.17.2, babylon@^6.17.4, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
@@ -1571,20 +1451,20 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
 base62@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.0.tgz#31e7e560dc846c9f44c1a531df6514da35474157"
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.7.tgz#5c01aad73c0124f9535cff1bdb9c4e6ccf838cfb"
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
 
 base64-js@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
 
-base64id@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-0.1.0.tgz#02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"
+base64id@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
 
 base@^0.11.1:
   version "0.11.2"
@@ -1626,32 +1506,26 @@ big.js@^3.1.3:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
 
 binary-extensions@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
 bind-obj-methods@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bind-obj-methods/-/bind-obj-methods-1.0.0.tgz#4f5979cac15793adf70e488161e463e209ca509c"
 
 bindings@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
 
 bit-twiddle@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
 
-bl@^1.0.0, bl@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
-  dependencies:
-    readable-stream "~2.0.5"
-
-bl@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.0.3.tgz#fc5421a28fd4226036c3b3891a66a25bc64d226e"
+bl@^1.0.0, bl@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
   dependencies:
-    readable-stream "~2.0.5"
+    readable-stream "^2.0.5"
 
 blob@0.0.4:
   version "0.0.4"
@@ -1667,17 +1541,13 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.3.1:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
-
-bluebird@^3.4.7:
+bluebird@^3.4.7, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.7"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
 body@^5.1.0:
   version "5.1.0"
@@ -1711,8 +1581,8 @@ boom@5.x.x:
     hoek "4.x.x"
 
 boxen@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.1.tgz#0f11e7fe344edb9397977fc13ede7f64d956481d"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1720,11 +1590,11 @@ boxen@^1.2.1:
     cli-boxes "^1.0.0"
     string-width "^2.0.0"
     term-size "^1.2.0"
-    widest-line "^1.0.0"
+    widest-line "^2.0.0"
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1737,9 +1607,9 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-braces@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.0.tgz#a46941cb5fb492156b3d6a656e06c35364e3e66e"
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1747,6 +1617,7 @@ braces@^2.3.0:
     extend-shallow "^2.0.1"
     fill-range "^4.0.0"
     isobject "^3.0.1"
+    kind-of "^6.0.2"
     repeat-element "^1.1.2"
     snapdragon "^0.8.1"
     snapdragon-node "^2.0.1"
@@ -1767,12 +1638,13 @@ brorand@^1.0.1:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
 browser-pack@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.2.tgz#f86cd6cef4f5300c8e63e07a4d512f65fbff4531"
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.4.tgz#9a73beb3b48f9e36868be007b64400102c04a99f"
   dependencies:
     JSONStream "^1.0.3"
-    combine-source-map "~0.7.1"
+    combine-source-map "~0.8.0"
     defined "^1.0.0"
+    safe-buffer "^5.1.1"
     through2 "^2.0.0"
     umd "^3.0.0"
 
@@ -1790,40 +1662,35 @@ browser-resolve@^1.11.0, browser-resolve@^1.7.0:
   dependencies:
     resolve "1.1.7"
 
-browser-sync-client@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.5.1.tgz#ec1ad69a49c2e2d4b645b18b1c06c29b3d9af8eb"
-  dependencies:
-    etag "^1.7.0"
-    fresh "^0.3.0"
-
-browser-sync-ui@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz#640a537c180689303d5be92bc476b9ebc441c0bc"
+browser-sync-ui@v1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-1.0.1.tgz#9740527b26d1d7ace259acc0c79e5b5e37d0fdf2"
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1.1.0"
     immutable "^3.7.6"
     server-destroy "1.0.1"
+    socket.io-client "2.0.4"
     stream-throttle "^0.1.3"
-    weinre "^2.0.0-pre-I0Z7U9OV"
 
-browser-sync@^2.18.12:
-  version "2.18.13"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.18.13.tgz#c28dc3eb3be67c97a907082b772a37f915c14d7d"
+browser-sync@^2.23.6:
+  version "2.23.6"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.23.6.tgz#ed0721c92e5b98c71b7bf839b39092ac9f220650"
   dependencies:
-    browser-sync-client "2.5.1"
-    browser-sync-ui "0.6.3"
+    browser-sync-ui v1.0.1
     bs-recipes "1.3.4"
     chokidar "1.7.0"
     connect "3.5.0"
+    connect-history-api-fallback "^1.5.0"
     dev-ip "^1.0.1"
     easy-extender "2.3.2"
     eazy-logger "3.0.2"
     emitter-steward "^1.0.0"
+    etag "^1.8.1"
+    fresh "^0.5.2"
     fs-extra "3.0.1"
     http-proxy "1.15.2"
-    immutable "3.8.1"
+    immutable "3.8.2"
     localtunnel "1.8.3"
     micromatch "2.3.11"
     opn "4.0.2"
@@ -1834,20 +1701,20 @@ browser-sync@^2.18.12:
     serve-index "1.8.0"
     serve-static "1.12.2"
     server-destroy "1.0.1"
-    socket.io "1.6.0"
-    socket.io-client "1.6.0"
+    socket.io "2.0.4"
     ua-parser-js "0.7.12"
     yargs "6.4.0"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
   dependencies:
-    buffer-xor "^1.0.2"
+    buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
     create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
+    evp_bytestokey "^1.0.3"
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
   version "1.0.0"
@@ -1865,10 +1732,6 @@ browserify-des@^1.0.0:
     des.js "^1.0.0"
     inherits "^2.0.1"
 
-browserify-package-json@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-package-json/-/browserify-package-json-1.0.1.tgz#98dde8aa5c561fd6d3fe49bbaa102b74b396fdea"
-
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
@@ -1888,32 +1751,32 @@ browserify-sign@^4.0.0:
     inherits "^2.0.1"
     parse-asn1 "^5.0.0"
 
-browserify-zlib@^0.1.4, browserify-zlib@~0.1.2:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+browserify-zlib@^0.2.0, browserify-zlib@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   dependencies:
-    pako "~0.2.0"
+    pako "~1.0.5"
 
-browserify@^14.0.0:
-  version "14.4.0"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.4.0.tgz#089a3463af58d0e48d8cd4070b3f74654d5abca9"
+browserify@^16.1.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.1.0.tgz#00b86844f89482bbd0d5d1b584b324762ef3f698"
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
     browser-pack "^6.0.1"
     browser-resolve "^1.11.0"
-    browserify-zlib "~0.1.2"
+    browserify-zlib "~0.2.0"
     buffer "^5.0.2"
     cached-path-relative "^1.0.0"
-    concat-stream "~1.5.1"
+    concat-stream "^1.6.0"
     console-browserify "^1.1.0"
     constants-browserify "~1.0.0"
     crypto-browserify "^3.0.0"
     defined "^1.0.0"
     deps-sort "^2.0.0"
-    domain-browser "~1.1.0"
+    domain-browser "^1.2.0"
     duplexer2 "~0.1.2"
-    events "~1.1.0"
+    events "^2.0.0"
     glob "^7.1.0"
     has "^1.0.0"
     htmlescape "^1.1.0"
@@ -1921,8 +1784,9 @@ browserify@^14.0.0:
     inherits "~2.0.1"
     insert-module-globals "^7.0.0"
     labeled-stream-splicer "^2.0.0"
-    module-deps "^4.0.8"
-    os-browserify "~0.1.1"
+    mkdirp "^0.5.0"
+    module-deps "^6.0.0"
+    os-browserify "~0.3.0"
     parents "^1.0.1"
     path-browserify "~0.0.0"
     process "~0.11.0"
@@ -1940,48 +1804,42 @@ browserify@^14.0.0:
     syntax-error "^1.1.1"
     through2 "^2.0.0"
     timers-browserify "^1.0.1"
-    tty-browserify "~0.0.0"
+    tty-browserify "0.0.1"
     url "~0.11.0"
     util "~0.10.1"
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
-browserslist@^2.1.2, browserslist@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.5.1.tgz#68e4bc536bbcc6086d62843a2ffccea8396821c6"
-  dependencies:
-    caniuse-lite "^1.0.30000744"
-    electron-to-chromium "^1.3.24"
-
-browserslist@^2.11.1:
+browserslist@^2.1.2, browserslist@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
   dependencies:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
+browserslist@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.1.1.tgz#d380fc048bc3a33e60fb87dc135110ebaaa6320a"
+  dependencies:
+    caniuse-lite "^1.0.30000809"
+    electron-to-chromium "^1.3.33"
+
 bs-recipes@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
 
-buble@^0.15.1:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/buble/-/buble-0.15.2.tgz#547fc47483f8e5e8176d82aa5ebccb183b02d613"
+buble@^0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/buble/-/buble-0.18.0.tgz#63b338b8248c474b46fd3e3546560ae08d8abe91"
   dependencies:
-    acorn "^3.3.0"
+    acorn "^5.1.2"
     acorn-jsx "^3.0.1"
-    acorn-object-spread "^1.0.0"
-    chalk "^1.1.3"
-    magic-string "^0.14.0"
+    acorn5-object-spread "^4.0.0"
+    chalk "^2.1.0"
+    magic-string "^0.22.4"
     minimist "^1.2.0"
     os-homedir "^1.0.1"
-
-bubleify@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/bubleify/-/bubleify-0.7.0.tgz#d08ea642ffd085ff8711c8843f57072f0d5eb8f6"
-  dependencies:
-    buble "^0.15.1"
-    object-assign "^4.0.1"
+    vlq "^0.2.2"
 
 buffer-equal@0.0.1:
   version "0.0.1"
@@ -1991,7 +1849,7 @@ buffer-shims@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
 
-buffer-xor@^1.0.2:
+buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
 
@@ -2004,13 +1862,13 @@ buffer@^4.3.0:
     isarray "^1.0.0"
 
 buffer@^5.0.2:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.6.tgz#2ea669f7eec0b6eda05b08f8b5ff661b28573588"
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -2022,6 +1880,24 @@ bytes@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
 
+cacache@^10.0.1:
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.1"
+    mississippi "^2.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^5.2.4"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -2036,6 +1912,18 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  dependencies:
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
 cached-path-relative@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
@@ -2057,7 +1945,11 @@ call-matcher@^1.0.1:
     espurify "^1.6.0"
     estraverse "^4.0.0"
 
-caller-path@^0.1.0:
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+
+caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
   dependencies:
@@ -2109,13 +2001,9 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
-caniuse-lite@^1.0.30000744:
-  version "1.0.30000746"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000746.tgz#c64f95a3925cfd30207a308ed76c1ae96ea09ea0"
-
-caniuse-lite@^1.0.30000791, caniuse-lite@^1.0.30000792:
-  version "1.0.30000792"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332"
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000808, caniuse-lite@^1.0.30000809:
+  version "1.0.30000810"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000810.tgz#47585fffce0e9f3593a6feea4673b945424351d9"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2140,7 +2028,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -2150,21 +2038,13 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
-chalk@^2.0.1, chalk@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
   dependencies:
-    ansi-styles "^3.1.0"
+    ansi-styles "^3.2.0"
     escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
+    supports-color "^5.2.0"
 
 chalk@~0.4.0:
   version "0.4.0"
@@ -2190,6 +2070,10 @@ character-reference-invalid@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc"
 
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+
 cheerio@^1.0.0-rc.1:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
@@ -2201,7 +2085,7 @@ cheerio@^1.0.0-rc.1:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.2.0, chokidar@^1.7.0:
+chokidar@1.7.0, chokidar@^1.2.0, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -2216,28 +2100,46 @@ chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.2.0, chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
   dependencies:
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 circular-json@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
 class-utils@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
-    lazy-cache "^2.0.2"
     static-extend "^0.1.1"
 
 clean-css@4.1.x:
@@ -2265,10 +2167,10 @@ cli-cursor@^2.1.0:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
 
-clipboard@^1.5.5:
+clipboard@^1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"
   dependencies:
@@ -2292,6 +2194,14 @@ cliui@^3.0.3, cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
+cliui@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -2303,6 +2213,12 @@ clone-regexp@^1.0.0:
     is-regexp "^1.0.0"
     is-supported-regexp-flag "^1.0.0"
 
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  dependencies:
+    mimic-response "^1.0.0"
+
 clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
@@ -2312,8 +2228,8 @@ clone-stats@^1.0.0:
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
 
 clone@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
 
 clone@^2.1.1:
   version "2.1.1"
@@ -2351,8 +2267,8 @@ collection-visit@^1.0.0:
     object-visit "^1.0.0"
 
 color-convert@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
     color-name "^1.1.1"
 
@@ -2377,9 +2293,18 @@ combine-source-map@~0.7.1:
     lodash.memoize "~3.0.3"
     source-map "~0.5.3"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+combine-source-map@~0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b"
+  dependencies:
+    convert-source-map "~1.1.0"
+    inline-source-map "~0.6.0"
+    lodash.memoize "~3.0.3"
+    source-map "~0.5.3"
+
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -2389,13 +2314,9 @@ comma-separated-tokens@^1.0.0, comma-separated-tokens@^1.0.1:
   dependencies:
     trim "0.0.1"
 
-commander@2:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
-
-commander@2.11.x, commander@^2.2.0, commander@^2.5.0, commander@^2.9.0, commander@~2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+commander@2, commander@2.14.x, commander@^2.2.0, commander@^2.5.0, commander@^2.9.0, commander@~2.14.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -2426,10 +2347,6 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
-component-emitter@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
-
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -2442,7 +2359,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -2458,11 +2375,11 @@ concat-stream@~1.5.0, concat-stream@~1.5.1:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-with-sourcemaps@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6"
+concat-with-sourcemaps@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.5.tgz#8964bc2347d05819b63798104d87d6e001bed8d0"
   dependencies:
-    source-map "^0.5.1"
+    source-map "^0.6.1"
 
 configstore@^3.0.0:
   version "3.1.1"
@@ -2475,17 +2392,9 @@ configstore@^3.0.0:
     write-file-atomic "^2.0.0"
     xdg-basedir "^3.0.0"
 
-connect-history-api-fallback@^1.1.0, connect-history-api-fallback@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
-
-connect@1.x:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-1.9.2.tgz#42880a22e9438ae59a8add74e437f58ae8e52807"
-  dependencies:
-    formidable "1.0.x"
-    mime ">= 0.0.1"
-    qs ">= 0.4.0"
+connect-history-api-fallback@^1.1.0, connect-history-api-fallback@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
 
 connect@3.5.0:
   version "3.5.0"
@@ -2510,6 +2419,10 @@ constants-browserify@^1.0.0, constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+
 content-type-parser@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
@@ -2574,9 +2487,9 @@ conventional-commits-parser@^0.1.2:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@^1.0.0, convert-source-map@^1.1.0, convert-source-map@^1.1.1, convert-source-map@^1.3.0, convert-source-map@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+convert-source-map@^1.1.1, convert-source-map@^1.3.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
 convert-source-map@~1.1.0:
   version "1.1.3"
@@ -2586,6 +2499,17 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -2594,15 +2518,11 @@ core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.0.0, core-js@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
-
-core-js@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+core-js@^2.0.0, core-js@^2.4.0, core-js@^2.5.0:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
-core-util-is@~1.0.0:
+core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
@@ -2615,9 +2535,9 @@ cosmiconfig@^3.1.0:
     parse-json "^3.0.0"
     require-from-string "^2.0.1"
 
-coveralls@^2.11.2, coveralls@^2.11.8:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.1.tgz#d70bb9acc1835ec4f063ff9dac5423c17b11f178"
+coveralls@^2.11.8, coveralls@^2.13.3:
+  version "2.13.3"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.3.tgz#9ad7c2ae527417f361e8b626483f48ee92dd2bc7"
   dependencies:
     js-yaml "3.6.1"
     lcov-parse "0.0.10"
@@ -2657,7 +2577,7 @@ create-error-class@^3.0.0:
   dependencies:
     capture-stack-trace "^1.0.0"
 
-create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2:
+create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
   dependencies:
@@ -2677,14 +2597,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^4, cross-spawn@^4.0.0:
+cross-spawn@^4:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1:
+cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -2704,24 +2624,9 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
-crypto-browserify@^3.0.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-
-crypto-browserify@^3.11.0:
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f"
+crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2733,6 +2638,7 @@ crypto-browserify@^3.11.0:
     pbkdf2 "^3.0.3"
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
+    randomfill "^1.0.3"
 
 crypto-random-string@^1.0.0:
   version "1.0.0"
@@ -2778,7 +2684,7 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
-cuint@latest:
+cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
 
@@ -2788,6 +2694,10 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+
 d3-array@1, d3-array@1.2.1, d3-array@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc"
@@ -2853,13 +2763,13 @@ d3-force@1.1.0:
     d3-quadtree "1"
     d3-timer "1"
 
-d3-format@1, d3-format@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.1.tgz#4e19ecdb081a341dafaf5f555ee956bcfdbf167f"
+d3-format@1, d3-format@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz#1a39c479c8a57fe5051b2e67a3bee27061a74e7a"
 
-d3-geo@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.0.tgz#15c7d7a8ea9346e59ed150dc7b1f7f95479056e9"
+d3-geo@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.1.tgz#157e3b0f917379d0f73bebfff3be537f49fa7356"
   dependencies:
     d3-array "1"
 
@@ -2914,9 +2824,9 @@ d3-scale@1.0.7:
     d3-time "1"
     d3-time-format "2"
 
-d3-selection@1, d3-selection@1.2.0, d3-selection@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.2.0.tgz#1b8ec1c7cedadfb691f2ba20a4a3cfbeb71bbc88"
+d3-selection@1, d3-selection@1.3.0, d3-selection@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.0.tgz#d53772382d3dc4f7507bfb28bcd2d6aed2a0ad6d"
 
 d3-shape@1.2.0:
   version "1.2.0"
@@ -2964,8 +2874,8 @@ d3-zoom@1.7.1:
     d3-transition "1"
 
 d3@^4.12.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-4.12.0.tgz#75eccb39ea40f6018de8cfa2752905bee7daa46f"
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-4.13.0.tgz#ab236ff8cf0cfc27a81e69bf2fb7518bc9b4f33d"
   dependencies:
     d3-array "1.2.1"
     d3-axis "1.0.8"
@@ -2978,8 +2888,8 @@ d3@^4.12.0:
     d3-dsv "1.0.8"
     d3-ease "1.0.3"
     d3-force "1.1.0"
-    d3-format "1.2.1"
-    d3-geo "1.9.0"
+    d3-format "1.2.2"
+    d3-geo "1.9.1"
     d3-hierarchy "1.1.5"
     d3-interpolate "1.1.6"
     d3-path "1.0.5"
@@ -2989,7 +2899,7 @@ d3@^4.12.0:
     d3-random "1.1.0"
     d3-request "1.0.6"
     d3-scale "1.0.7"
-    d3-selection "1.2.0"
+    d3-selection "1.3.0"
     d3-shape "1.2.0"
     d3-time "1.0.8"
     d3-time-format "2.1.1"
@@ -3028,49 +2938,43 @@ dateformat@^1.0.11, dateformat@^1.0.12:
     meow "^3.3.0"
 
 debounce@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.0.2.tgz#503cc674d8d7f737099664fb75ddbd36b9626dc6"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.1.0.tgz#6a1a4ee2a9dc4b7c24bb012558dbcdb05b37f408"
 
 debug-log@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@2.2.0, debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
-debug@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
-  dependencies:
-    ms "0.7.2"
-
 debug@2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
   dependencies:
     ms "0.7.3"
 
-debug@2.6.8, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
+debug@2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
-debug@^2.3.3, debug@~2.6.7:
+debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9, debug@~2.6.4, debug@~2.6.6, debug@~2.6.7:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0:
+debug@^3.0.0, debug@^3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
     ms "2.0.0"
 
+debug@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -3086,7 +2990,7 @@ decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
-decompress-response@^3.2.0:
+decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
   dependencies:
@@ -3129,6 +3033,13 @@ define-property@^1.0.0:
   dependencies:
     is-descriptor "^1.0.0"
 
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -3169,8 +3080,8 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
 delegate@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.1.3.tgz#9a8251a777d7025faa55737bc3b071742127a9fd"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
 
 delegates@^1.0.0:
   version "1.0.0"
@@ -3181,8 +3092,8 @@ depd@1.1.1:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
 depd@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
 deps-sort@^2.0.0:
   version "2.0.0"
@@ -3193,16 +3104,6 @@ deps-sort@^2.0.0:
     subarg "^1.0.0"
     through2 "^2.0.0"
 
-derequire@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/derequire/-/derequire-2.0.6.tgz#31a414bb7ca176239fa78b116636ef77d517e768"
-  dependencies:
-    acorn "^4.0.3"
-    concat-stream "^1.4.6"
-    escope "^3.6.0"
-    through2 "^2.0.0"
-    yargs "^6.5.0"
-
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -3215,8 +3116,8 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
 detab@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.0.tgz#485bd7954d2348092e998f7ff1a79fd9869d9b50"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.1.tgz#531f5e326620e2fd4f03264a905fb3bcc8af4df4"
   dependencies:
     repeat-string "^1.5.4"
 
@@ -3226,12 +3127,24 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
+detect-libc@^1.0.2, detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
 detective@^4.0.0, detective@^4.3.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
   dependencies:
-    acorn "^4.0.3"
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
+detective@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb"
+  dependencies:
+    acorn-node "^1.3.0"
     defined "^1.0.0"
+    minimist "^1.1.1"
 
 dev-ip@^1.0.1:
   version "1.0.1"
@@ -3242,8 +3155,8 @@ diff@^1.3.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
 
 diff@^3.0.0, diff@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
 
 diffie-hellman@^5.0.0:
   version "5.0.2"
@@ -3268,15 +3181,15 @@ disparity@^2.0.0:
     diff "^1.3.2"
 
 dns-packet@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz#a8a26bec7646438963fc86e06f8f8b16d6c8bf7a"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
 
-dns-socket@^1.6.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/dns-socket/-/dns-socket-1.6.2.tgz#c234432288c3c76cc131f4157faf7423a662304c"
+dns-socket@^1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/dns-socket/-/dns-socket-1.6.3.tgz#5268724fad4aa46ad9c5ca4ffcd16e1de5342aab"
   dependencies:
     dns-packet "^1.1.0"
 
@@ -3287,13 +3200,19 @@ doctrine-temporary-fork@2.0.0-alpha-allowarrayindex:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+doctrine@^2.0.0, doctrine@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  dependencies:
+    esutils "^2.0.2"
+
 documentation@5.3.3:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/documentation/-/documentation-5.3.3.tgz#a4ab1e2f0b3bcd928a6b723dfa20894e1945523a"
@@ -3360,9 +3279,9 @@ dom-serializer@0, dom-serializer@~0.1.0:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
-domain-browser@^1.1.1, domain-browser@~1.1.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+domain-browser@^1.1.1, domain-browser@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
@@ -3373,8 +3292,10 @@ domelementtype@~1.1.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
 domexception@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.0.tgz#81fe5df81b3f057052cde3a9fa9bf536a85b9ab0"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  dependencies:
+    webidl-conversions "^4.0.2"
 
 domhandler@2.1:
   version "2.1.0"
@@ -3402,8 +3323,8 @@ domutils@1.5.1:
     domelementtype "1"
 
 domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3426,12 +3347,6 @@ duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2, duplexer2@~0.1.4:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer2@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
-
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -3440,11 +3355,11 @@ duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
-duplexify@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.0.tgz#1aa773002e1578457e9d9d4a50b0ccaaebcbd604"
+duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
   dependencies:
-    end-of-stream "1.0.0"
+    end-of-stream "^1.0.0"
     inherits "^2.0.1"
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
@@ -3483,13 +3398,13 @@ ejs@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
-electron-to-chromium@^1.3.24:
-  version "1.3.25"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.25.tgz#453b21009836d0997d86035601ff6cae4791c460"
-
 electron-to-chromium@^1.3.30:
-  version "1.3.31"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz#00d832cba9fe2358652b0c48a8816c8e3a037e9f"
+  version "1.3.33"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545"
+
+electron-to-chromium@^1.3.33:
+  version "1.3.34"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz#d93498f40391bb0c16a603d8241b9951404157ed"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -3516,8 +3431,8 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
 encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
 encoding@^0.1.11:
   version "0.1.12"
@@ -3525,56 +3440,50 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-end-of-stream@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
-  dependencies:
-    once "~1.3.0"
-
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   dependencies:
     once "^1.4.0"
 
-engine.io-client@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.0.tgz#7b730e4127414087596d9be3c88d2bc5fdb6cf5c"
+engine.io-client@~3.1.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.5.tgz#85de17666560327ef1817978f6e3f8101ded2c47"
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
-    debug "2.3.3"
-    engine.io-parser "1.3.1"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
     has-cors "1.1.0"
     indexof "0.0.1"
-    parsejson "0.0.3"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    ws "1.1.1"
-    xmlhttprequest-ssl "1.5.3"
+    ws "~3.3.1"
+    xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.1.tgz#9554f1ae33107d6fbd170ca5466d2f833f6a07cf"
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
   dependencies:
-    after "0.8.1"
-    arraybuffer.slice "0.0.6"
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
     blob "0.0.4"
-    has-binary "0.1.6"
-    wtf-8 "1.0.0"
+    has-binary2 "~1.0.2"
 
-engine.io@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.0.tgz#3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"
+engine.io@~3.1.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
   dependencies:
-    accepts "1.3.3"
-    base64id "0.1.0"
+    accepts "~1.3.4"
+    base64id "1.0.0"
     cookie "0.3.1"
-    debug "2.3.3"
-    engine.io-parser "1.3.1"
-    ws "1.1.1"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~3.3.1"
+  optionalDependencies:
+    uws "~9.14.0"
 
 enhanced-resolve@^3.4.0:
   version "3.4.1"
@@ -3596,18 +3505,11 @@ envify@^3.0.0:
     jstransform "^11.0.3"
     through "~2.3.4"
 
-envify@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/envify/-/envify-4.0.0.tgz#f791343e3d11cc29cce41150300a8af61c66cab0"
-  dependencies:
-    esprima "~3.1.0"
-    through "~2.3.4"
-
 errno@^0.1.3, errno@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   dependencies:
-    prr "~0.0.0"
+    prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
@@ -3622,28 +3524,9 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.4.3, es-abstract@^1.5.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.0"
-    is-callable "^1.1.3"
-    is-regex "^1.0.3"
-
-es-abstract@^1.6.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-abstract@^1.7.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee"
+es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.6.1, es-abstract@^1.7.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -3659,20 +3542,20 @@ es-to-primitive@^1.1.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.1"
 
-es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.23"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.39"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87"
   dependencies:
-    es6-iterator "2"
-    es6-symbol "~3.1"
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
 
-es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   dependencies:
     d "1"
-    es5-ext "^0.10.14"
-    es6-symbol "^3.1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
 
 es6-map@^0.1.3:
   version "0.1.5"
@@ -3685,9 +3568,9 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-es6-promise@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
+es6-promise@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
 
 es6-set@~0.1.5:
   version "0.1.5"
@@ -3699,7 +3582,7 @@ es6-set@~0.1.5:
     es6-symbol "3.1.1"
     event-emitter "~0.3.5"
 
-es6-symbol@3.1.1, es6-symbol@^3.0.2, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -3723,17 +3606,6 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@^1.6.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-  dependencies:
-    esprima "^2.7.1"
-    estraverse "^1.9.1"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.2.0"
-
 escodegen@^1.8.1, escodegen@^1.9.0, escodegen@~1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
@@ -3755,38 +3627,68 @@ escope@^3.6.0:
     estraverse "^4.1.1"
 
 eslint-config-mourner@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-mourner/-/eslint-config-mourner-2.0.1.tgz#84e00f44ca373248b4d8d87fc3bbaa3b2a769a9d"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-config-mourner/-/eslint-config-mourner-2.0.3.tgz#c858a7bdd03ceb5c124bc307af1270bb054f6c0c"
+
+eslint-import-resolver-node@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.5.0"
+
+eslint-module-utils@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+  dependencies:
+    debug "^2.6.8"
+    pkg-dir "^1.0.0"
 
 eslint-plugin-flowtype@^2.34.0:
-  version "2.34.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.34.1.tgz#ea109175645b05d37baeac53b9b65066d79b9446"
+  version "2.45.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.45.0.tgz#20d8b15d1e1e71ea4e9498e8be3fc62c0752fcbf"
   dependencies:
     lodash "^4.15.0"
 
 eslint-plugin-html@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.0.0.tgz#2c982a71b9d965654f0f3a52358735821a1a4239"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.2.2.tgz#ef7093621d3a93de3206fd1f92f347ea9a1a4dfa"
   dependencies:
     htmlparser2 "^3.8.2"
+    semver "^5.4.1"
+
+eslint-plugin-import@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.9.0.tgz#26002efbfca5989b7288ac047508bd24f217b169"
+  dependencies:
+    builtin-modules "^1.1.1"
+    contains-path "^0.1.0"
+    debug "^2.6.8"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.1"
+    eslint-module-utils "^2.1.1"
+    has "^1.0.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.3"
+    read-pkg-up "^2.0.0"
 
 eslint-plugin-node@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.1.1.tgz#a7ed956e780c22aef6afd1116005acd82f26eac6"
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz#80df3253c4d7901045ec87fa660a284e32bdca29"
   dependencies:
-    ignore "^3.3.3"
+    ignore "^3.3.6"
     minimatch "^3.0.4"
     resolve "^1.3.3"
     semver "5.3.0"
 
 eslint-plugin-react@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.3.0.tgz#ca9368da36f733fbdc05718ae4e91f778f38e344"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
   dependencies:
-    doctrine "^2.0.0"
+    doctrine "^2.0.2"
     has "^1.0.1"
-    jsx-ast-utils "^2.0.0"
-    prop-types "^15.5.10"
+    jsx-ast-utils "^2.0.1"
+    prop-types "^15.6.0"
 
 eslint-scope@^3.7.1:
   version "3.7.1"
@@ -3834,21 +3736,21 @@ eslint@4.1.1:
     text-table "~0.2.0"
 
 espree@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.3.tgz#931e0af64e7fbbed26b050a29daad1fc64799fa6"
   dependencies:
-    acorn "^5.0.1"
+    acorn "^5.4.0"
     acorn-jsx "^3.0.0"
 
 esprima-fb@^15001.1.0-dev-harmony-fb:
   version "15001.1.0-dev-harmony-fb"
   resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz#30a947303c6b8d5e955bee2b99b1d233206a6901"
 
-esprima@^2.6.0, esprima@^2.7.1:
+esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1, esprima@^3.1.3, esprima@~3.1.0:
+esprima@^3.1.3, esprima@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
@@ -3875,19 +3777,23 @@ esrecurse@^4.1.0:
     estraverse "^4.1.0"
     object-assign "^4.0.1"
 
-estraverse@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
-esutils@^2.0.0, esutils@^2.0.2:
+estree-walker@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+
+estree-walker@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854"
+
+esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
-etag@^1.7.0, etag@~1.8.0:
+etag@^1.8.1, etag@~1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
 
@@ -3918,27 +3824,20 @@ events-to-array@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
 
-events@^1.0.0, events@~1.1.0:
+events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
-evp_bytestokey@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
-  dependencies:
-    create-hash "^1.1.1"
+events@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-2.0.0.tgz#cbbb56bf3ab1ac18d71c43bb32c86255062769f2"
 
-execa@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
   dependencies:
-    cross-spawn "^4.0.0"
-    get-stream "^2.2.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
 
 execa@^0.7.0:
   version "0.7.0"
@@ -3962,12 +3861,6 @@ execcommand-copy@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/execcommand-copy/-/execcommand-copy-1.1.0.tgz#36c159936560d81c4fe447043a473e5e09478989"
 
-execspawn@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6"
-  dependencies:
-    util-extend "^1.0.1"
-
 exenv@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
@@ -3996,18 +3889,9 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expand-template@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.0.3.tgz#6c303323177a62b1b22c070279f7861287b69b1a"
-
-express@2.5.x:
-  version "2.5.11"
-  resolved "https://registry.yarnpkg.com/express/-/express-2.5.11.tgz#4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"
-  dependencies:
-    connect "1.x"
-    mime "1.2.4"
-    mkdirp "0.3.0"
-    qs "0.4.x"
+expand-template@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.0.tgz#e09efba977bf98f9ee0ed25abd0c692e02aec3fc"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -4015,17 +3899,24 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
 external-editor@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
   dependencies:
+    chardet "^0.4.0"
     iconv-lite "^0.4.17"
-    jschardet "^1.4.2"
-    tmp "^0.0.31"
+    tmp "^0.0.33"
 
 extglob@^0.3.1:
   version "0.3.2"
@@ -4033,9 +3924,9 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extglob@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -4046,9 +3937,13 @@ extglob@^2.0.2:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
 falafel@^2.1.0:
   version "2.1.0"
@@ -4063,6 +3958,20 @@ fast-deep-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
 
+fast-glob@^2.0.2:
+  version "2.1.0"
+  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"
+    is-glob "^4.0.0"
+    merge2 "^1.2.1"
+    micromatch "^3.1.8"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -4087,7 +3996,7 @@ fbjs@^0.6.1:
     ua-parser-js "^0.7.9"
     whatwg-fetch "^0.9.0"
 
-fbjs@^0.8.16:
+fbjs@^0.8.16, fbjs@^0.8.4:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -4099,30 +4008,6 @@ fbjs@^0.8.16:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
 
-fbjs@^0.8.4:
-  version "0.8.14"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
-
-fbjs@^0.8.9:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9"
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
-
 fd@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/fd/-/fd-0.0.2.tgz#e0edb2bd7a88cc86dd9f16391cba832418fd87ee"
@@ -4140,24 +4025,17 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.5.tgz#91c25b6b6fbe56dae99f10a425fd64933b5c9daa"
+file-loader@^1.1.8:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.10.tgz#77e97dfeab13da64c7085ab3e3887e29ae588aea"
   dependencies:
     loader-utils "^1.0.2"
-    schema-utils "^0.3.0"
+    schema-utils "^0.4.5"
 
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
-fill-keys@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fill-keys/-/fill-keys-1.0.2.tgz#9a8fa36f4e8ad634e3bf6b4f3c8882551452eb20"
-  dependencies:
-    is-object "~1.0.1"
-    merge-descriptors "~1.0.0"
-
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -4225,8 +4103,8 @@ first-chunk-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
 
 flat-cache@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
   dependencies:
     circular-json "^0.3.1"
     del "^2.0.2"
@@ -4258,13 +4136,20 @@ flow-coverage-report@^0.3.0:
     terminal-table "0.0.12"
     yargs "5.0.0"
 
-flow-remove-types@^1.0.4, flow-remove-types@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-1.2.1.tgz#58e261bf8b842bd234c86cafb982a1213aff0edb"
+flow-remove-types@^1.0.4:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-1.2.3.tgz#6131aefc7da43364bb8b479758c9dec7735d1a18"
   dependencies:
     babylon "^6.15.0"
     vlq "^0.2.1"
 
+flush-write-stream@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.4"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4299,11 +4184,11 @@ form-data@~2.1.1:
     mime-types "^2.1.12"
 
 form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.5"
+    combined-stream "1.0.6"
     mime-types "^2.1.12"
 
 formatio@1.2.0:
@@ -4312,10 +4197,6 @@ formatio@1.2.0:
   dependencies:
     samsam "1.x"
 
-formidable@1.0.x:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.0.17.tgz#ef5491490f9433b705faa77249c99029ae348559"
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -4326,19 +4207,26 @@ fresh@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
-fresh@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
+fresh@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+
+from2@^2.1.0, from2@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
 
 from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
 
 front-matter@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.2.0.tgz#35205f67522430b1213ef26149ecb068579fe38a"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.3.0.tgz#7203af896ce357ee04e2aa45169ea91ed7f67504"
   dependencies:
-    js-yaml "^3.4.6"
+    js-yaml "^3.10.0"
 
 fs-exists-cached@^1.0.0:
   version "1.0.0"
@@ -4352,16 +4240,25 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
   dependencies:
     nan "^2.3.0"
-    node-pre-gyp "^0.6.36"
+    node-pre-gyp "^0.6.39"
 
 fstream-ignore@^1.0.5:
   version "1.0.5"
@@ -4380,28 +4277,14 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.0.2, function-bind@^1.1.1:
+function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
-function-bind@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
-
 function-loop@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/function-loop/-/function-loop-1.0.1.tgz#8076bb305e8e6a3cceee2920765f330d190f340c"
 
-gauge@~1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
-  dependencies:
-    ansi "^0.3.0"
-    has-unicode "^2.0.0"
-    lodash.pad "^4.1.0"
-    lodash.padend "^4.1.0"
-    lodash.padstart "^4.1.0"
-
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4466,14 +4349,7 @@ get-stdin@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
 
-get-stream@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-  dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
-
-get-stream@^3.0.0:
+get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
@@ -4487,30 +4363,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-ghreleases@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-1.0.5.tgz#a20f8194074311e19d84ccba7a6e08c4b434fd80"
-  dependencies:
-    after "~0.8.1"
-    ghrepos "~2.0.0"
-    ghutils "~3.2.0"
-    simple-mime "~0.1.0"
-    url-template "~2.0.6"
-    xtend "~4.0.0"
-
-ghrepos@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.0.0.tgz#d66eae9d98a3b5398e460d6db7e10a742692e81b"
-  dependencies:
-    ghutils "~3.2.0"
-
-ghutils@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.1.tgz#4fcedffac935fcace06e12a17c6174e2c29ffe4f"
-  dependencies:
-    jsonist "~1.3.0"
-    xtend "~4.0.1"
-
 git-raw-commits@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-0.1.2.tgz#2becbdcd3f96ef0b19f16863f7a2f6d9d8ab8369"
@@ -4522,15 +4374,15 @@ git-raw-commits@^0.1.2:
     through2 "^2.0.0"
 
 git-semver-tags@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.2.tgz#a2139be1bf6e337e125f3eb8bb8fc6f5d4d6445f"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.3.tgz#0b0416c43285adfdc93a8038ea25502a09319245"
   dependencies:
     meow "^3.3.0"
     semver "^5.0.1"
 
 git-up@^2.0.0:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.0.8.tgz#24be049c9f0b193481d2df4e016a16530a5f4ef4"
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.0.10.tgz#20fe6bafbef4384cae253dc4f463c49a0c3bd2ec"
   dependencies:
     is-ssh "^1.3.0"
     parse-url "^1.3.0"
@@ -4545,28 +4397,22 @@ github-from-package@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
 
-github-slugger@1.2.0:
+github-slugger@1.2.0, github-slugger@^1.0.0, github-slugger@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz#8ada3286fd046d8951c3c952a8d7854cfd90fd9a"
   dependencies:
     emoji-regex ">=6.0.0 <=6.1.1"
 
-github-slugger@^1.0.0, github-slugger@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.1.3.tgz#314a6e759a18c2b0cc5760d512ccbab549c549a7"
-  dependencies:
-    emoji-regex ">=6.0.0 <=6.1.1"
-
 gl@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/gl/-/gl-4.0.3.tgz#277f8bd542c84f99fa5bf98821b32d7b27a05627"
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gl/-/gl-4.0.4.tgz#46745f365a230672b2f988d85018f737e64c3343"
   dependencies:
     bindings "^1.2.1"
     bit-twiddle "^1.0.2"
     glsl-tokenizer "^2.0.2"
-    nan "^2.3.3"
-    node-gyp "^3.3.1"
-    prebuild "^5.1.2"
+    nan "^2.6.2"
+    node-gyp "^3.6.2"
+    prebuild-install "^2.1.1"
 
 glob-base@^0.3.0:
   version "0.3.0"
@@ -4581,7 +4427,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob-parent@^3.0.0:
+glob-parent@^3.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:
@@ -4601,16 +4447,9 @@ glob-stream@^5.3.2:
     to-absolute-glob "^0.1.1"
     unique-stream "^2.0.2"
 
-"glob@3 || 4 || 5 || 6 || 7", glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^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"
 
 glob@7.0.5:
   version "7.0.5"
@@ -4633,17 +4472,28 @@ glob@^5.0.14, glob@^5.0.15, glob@^5.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.0.tgz#10d34039e0df04272e262cf24224f7209434df4f"
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
   dependencies:
     ini "^1.3.4"
 
 globals-docs@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.3.0.tgz#dca4088af196f7800f4eba783eaeff335cb6759c"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz#f2c647544eb6161c7c38452808e16e693c2dafbb"
 
-globals@^9.0.0, globals@^9.17.0, globals@^9.18.0:
+globals@^9.17.0, globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -4679,6 +4529,18 @@ globby@^7.0.0:
     pify "^3.0.0"
     slash "^1.0.0"
 
+globby@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
@@ -4717,32 +4579,35 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-got@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
+got@^8.0.0, got@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.2.0.tgz#0d11a071d05046348a2f5c0a5fa047fb687fdfc6"
   dependencies:
-    decompress-response "^3.2.0"
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
     duplexer3 "^0.1.4"
     get-stream "^3.0.0"
-    is-plain-obj "^1.1.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
     isurl "^1.0.0-alpha5"
     lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
     p-cancelable "^0.3.0"
-    p-timeout "^1.1.1"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    url-parse-lax "^1.0.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@~4.1.4:
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@~4.1.11:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-gray-matter@^3.0.7, gray-matter@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-3.0.8.tgz#44bdaff586ab4e61e3fe2d30d577da0e502afb93"
+gray-matter@^3.0.8, gray-matter@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-3.1.1.tgz#101f80d9e69eeca6765cdce437705b18f40876ac"
   dependencies:
     extend-shallow "^2.0.1"
     js-yaml "^3.10.0"
@@ -4763,7 +4628,7 @@ gulp-sourcemaps@1.6.0:
     through2 "^2.0.0"
     vinyl "^1.0.0"
 
-handlebars@^4.0.2:
+handlebars@^4.0.2, handlebars@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
   dependencies:
@@ -4773,16 +4638,6 @@ handlebars@^4.0.2:
   optionalDependencies:
     uglify-js "^2.6"
 
-handlebars@^4.0.3:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
-
 har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
@@ -4820,17 +4675,11 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-binary@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.6.tgz#25326f39cfa4f616ad8787894e3af2cfbc7b6e10"
-  dependencies:
-    isarray "0.0.1"
-
-has-binary@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
+has-binary2@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz#e83dba49f0b9be4d026d27365350d9f03f54be98"
   dependencies:
-    isarray "0.0.1"
+    isarray "2.0.1"
 
 has-color@~0.1.0:
   version "0.1.7"
@@ -4848,6 +4697,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-symbol-support-x@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz#66ec2e377e0c7d7ccedb07a3a84d77510ff1bc4c"
@@ -4901,6 +4754,13 @@ hash-base@^2.0.0:
   dependencies:
     inherits "^2.0.1"
 
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
@@ -4915,8 +4775,8 @@ hasha@^3.0.0:
     is-stream "^1.0.1"
 
 hast-to-hyperscript@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-3.0.2.tgz#8468ed08b8382f130e003a38ef735bcf29737336"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-3.1.0.tgz#58ef4af5344f4da22f0622e072a8d5fa062693d3"
   dependencies:
     comma-separated-tokens "^1.0.0"
     is-nan "^1.2.1"
@@ -4944,26 +4804,26 @@ hast-util-parse-selector@^2.0.0:
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.1.0.tgz#b55c0f4bb7bb2040c889c325ef87ab29c38102b4"
 
 hast-util-raw@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-2.0.1.tgz#a46d65bc38f17f74e23a6e0a73ecdde77ecfdead"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-2.0.2.tgz#20674cfb45428213917a54ec929e6774df0642d8"
   dependencies:
     hast-util-from-parse5 "^2.0.0"
     hast-util-to-parse5 "^2.0.0"
     html-void-elements "^1.0.1"
-    parse5 "^3.0.0"
+    parse5 "^3.0.3"
     unist-util-position "^3.0.0"
     web-namespaces "^1.0.0"
     zwitch "^1.0.0"
 
 hast-util-sanitize@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.1.1.tgz#c439852d9db7ff554ecd6be96435a6a8274ade32"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.1.2.tgz#d10bd6757a21e59c13abc8ae3530dd3b6d7d679e"
   dependencies:
     xtend "^4.0.1"
 
 hast-util-to-html@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-3.0.1.tgz#9cdefb69772888db5f4253d08e1fcd533b716ba8"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-3.1.0.tgz#882c99849e40130e991c042e456d453d95c36cff"
   dependencies:
     ccount "^1.0.0"
     comma-separated-tokens "^1.0.1"
@@ -5001,7 +4861,7 @@ hastscript@^3.0.0:
     property-information "^3.0.0"
     space-separated-tokens "^1.0.0"
 
-hawk@~3.1.3:
+hawk@3.1.3, hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
@@ -5040,8 +4900,8 @@ hoek@2.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
 hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
@@ -5061,17 +4921,17 @@ html-encoding-sniffer@^1.0.2:
     whatwg-encoding "^1.0.1"
 
 html-minifier@^3.2.3:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.5.tgz#3bdc9427e638bbe3dbde96c0eb988b044f02739e"
+  version "3.5.9"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.9.tgz#74424014b872598d4bb0e20ac420926ec61024b6"
   dependencies:
     camel-case "3.0.x"
     clean-css "4.1.x"
-    commander "2.11.x"
+    commander "2.14.x"
     he "1.1.x"
     ncname "1.0.x"
     param-case "2.1.x"
     relateurl "0.2.x"
-    uglify-js "3.1.x"
+    uglify-js "3.3.x"
 
 html-tags@^2.0.0:
   version "2.0.0"
@@ -5124,6 +4984,10 @@ htmltojsx@^0.2.6:
     react "~0.14.6"
     yargs "~4.6.0"
 
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+
 http-errors@~1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
@@ -5141,6 +5005,10 @@ http-errors@~1.6.1:
     setprototypeof "1.0.3"
     statuses ">= 1.3.1 < 2"
 
+http-parser-js@>=0.4.0:
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+
 http-proxy@1.15.2:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.15.2.tgz#642fdcaffe52d3448d2bda3b0079e9409064da31"
@@ -5164,54 +5032,31 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
-
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-hyperquest@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-1.2.0.tgz#39e1fef66888dc7ce0dec6c0dd814f6fc8944ad5"
-  dependencies:
-    duplexer2 "~0.0.2"
-    through2 "~0.6.3"
-
-iconv-lite@0.4, iconv-lite@0.4.19, iconv-lite@^0.4.5:
+iconv-lite@0.4, iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
-iconv-lite@^0.4.17, iconv-lite@~0.4.13:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
-
 ieee754@^1.1.4, ieee754@^1.1.6:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+
 ignore-loader@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ignore-loader/-/ignore-loader-0.1.2.tgz#d81f240376d0ba4f0d778972c3ad25874117a463"
 
-ignore@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
-
-ignore@^3.3.5:
+ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
-immutable@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"
-
-immutable@^3.7.6:
+immutable@3.8.2, immutable@^3.7.6:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
 
@@ -5227,9 +5072,9 @@ in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
 
-indefinite@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indefinite/-/indefinite-1.0.1.tgz#40b1e0692fe7963106a9824f867ec8a481fbe863"
+indefinite@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/indefinite/-/indefinite-2.1.1.tgz#c51fbfdf6f857bbad7a9e36f2bb9296ccc3c6d6a"
 
 indent-string@^2.1.0:
   version "2.1.0"
@@ -5265,8 +5110,8 @@ inherits@2.0.1:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
 ini@^1.3.3, ini@^1.3.4, ini@~1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
 inline-source-map@~0.6.0:
   version "0.6.2"
@@ -5275,11 +5120,11 @@ inline-source-map@~0.6.0:
     source-map "~0.5.3"
 
 inquirer@^3.0.6:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.1.1.tgz#87621c4fba4072f48a8dd71c9f9df6f100b2d534"
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
-    ansi-escapes "^2.0.0"
-    chalk "^1.0.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
     external-editor "^2.0.4"
@@ -5289,13 +5134,13 @@ inquirer@^3.0.6:
     run-async "^2.2.0"
     rx-lite "^4.0.8"
     rx-lite-aggregates "^4.0.8"
-    string-width "^2.0.0"
-    strip-ansi "^3.0.0"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
     through "^2.3.6"
 
 insert-module-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.1.tgz#c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.2.tgz#012c56baa7d3307a8b417d4ec5270cf9741c18f4"
   dependencies:
     JSONStream "^1.0.3"
     combine-source-map "~0.7.1"
@@ -5307,12 +5152,19 @@ insert-module-globals@^7.0.0:
     xtend "^4.0.0"
 
 interpret@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.2.0, invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
+invariant@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688"
   dependencies:
     loose-envify "^1.0.0"
 
@@ -5332,12 +5184,12 @@ is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
 
-is-absolute@^0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
   dependencies:
-    is-relative "^0.2.1"
-    is-windows "^0.2.0"
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -5345,6 +5197,12 @@ is-accessor-descriptor@^0.1.6:
   dependencies:
     kind-of "^3.0.2"
 
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-alphabetical@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.1.tgz#c77079cc91d4efac775be1034bf2d243f95e6f08"
@@ -5371,8 +5229,8 @@ is-binary-path@^1.0.0:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.0, is-buffer@^1.1.4, is-buffer@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
@@ -5390,6 +5248,12 @@ is-data-descriptor@^0.1.4:
   dependencies:
     kind-of "^3.0.2"
 
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
@@ -5406,13 +5270,13 @@ is-descriptor@^0.1.0:
     is-data-descriptor "^0.1.4"
     kind-of "^5.0.0"
 
-is-descriptor@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.1.tgz#2c6023599bde2de9d5d2c8b9a9d94082036b6ef2"
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
   dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
 
 is-directory@^0.3.1:
   version "0.3.1"
@@ -5432,6 +5296,12 @@ is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
@@ -5491,12 +5361,21 @@ is-ip@^2.0.0:
   dependencies:
     ip-regex "^2.0.0"
 
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+
 is-my-json-valid@^2.12.4, is-my-json-valid@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+  version "2.17.2"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
@@ -5528,19 +5407,23 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
-is-object@^1.0.1, is-object@~1.0.1:
+is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
 
-is-odd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
   dependencies:
-    is-number "^3.0.0"
+    is-number "^4.0.0"
 
 is-online@^7.0.0:
   version "7.0.0"
@@ -5562,16 +5445,16 @@ is-path-in-cwd@^1.0.0:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.1.0:
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3:
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   dependencies:
@@ -5597,7 +5480,7 @@ is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
-is-regex@^1.0.3, is-regex@^1.0.4:
+is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
@@ -5613,19 +5496,17 @@ is-relative-url@^2.0.0:
   dependencies:
     is-absolute-url "^2.0.0"
 
-is-relative@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
   dependencies:
-    is-unc-path "^0.1.1"
+    is-unc-path "^1.0.0"
 
 is-resolvable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
-  dependencies:
-    tryit "^1.0.1"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
-is-retry-allowed@^1.0.0:
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
 
@@ -5661,11 +5542,11 @@ is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
-is-unc-path@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
   dependencies:
-    unc-path-regex "^0.1.0"
+    unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
@@ -5679,9 +5560,9 @@ is-whitespace-character@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz#9ae0176f3282b65457a1992cdb084f8a5f833e3b"
 
-is-windows@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
 is-word-character@^1.0.0:
   version "1.0.1"
@@ -5695,9 +5576,13 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+
 isemail@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.0.0.tgz#c89a46bb7a3361e1759f8028f9082488ecce3dff"
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.1.1.tgz#e8450fe78ff1b48347db599122adcd0668bd92b5"
   dependencies:
     punycode "2.x.x"
 
@@ -5726,50 +5611,50 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-lib-coverage@^1.1.0, istanbul-lib-coverage@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+istanbul-lib-coverage@^1.1.0, istanbul-lib-coverage@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14"
 
-istanbul-lib-hook@^1.0.6, istanbul-lib-hook@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc"
+istanbul-lib-hook@^1.0.6, istanbul-lib-hook@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.7.1, istanbul-lib-instrument@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.3.tgz#925b239163eabdd68cc4048f52c2fa4f899ecfa7"
+istanbul-lib-instrument@^1.7.1, istanbul-lib-instrument@^1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz#84905bf47f7e0b401d6b840da7bad67086b4aab6"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
-    babylon "^6.17.4"
-    istanbul-lib-coverage "^1.1.1"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.1.2"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.1.0, istanbul-lib-report@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#f0e55f56655ffa34222080b7a0cd4760e1405fc9"
+istanbul-lib-report@^1.1.0, istanbul-lib-report@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz#2df12188c0fa77990c0d2176d2d0ba3394188259"
   dependencies:
-    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-coverage "^1.1.2"
     mkdirp "^0.5.1"
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.2.0, istanbul-lib-source-maps@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c"
+istanbul-lib-source-maps@^1.2.0, istanbul-lib-source-maps@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6"
   dependencies:
-    debug "^2.6.3"
-    istanbul-lib-coverage "^1.1.1"
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.1.2"
     mkdirp "^0.5.1"
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-reports@^1.1.0, istanbul-reports@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e"
+istanbul-reports@^1.1.0, istanbul-reports@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.4.tgz#5ccba5e22b7b5a5d91d5e0a830f89be334bf97bd"
   dependencies:
     handlebars "^4.0.3"
 
@@ -5781,42 +5666,31 @@ isurl@^1.0.0-alpha5:
     is-object "^1.0.1"
 
 js-base64@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
 
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.6.1, js-yaml@^3.3.1:
+js-yaml@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@^3.10.0, js-yaml@^3.4.6, js-yaml@^3.9.0:
+js-yaml@^3.10.0, js-yaml@^3.2.7, js-yaml@^3.3.1, js-yaml@^3.8.4, js-yaml@^3.9.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.2.7, js-yaml@^3.8.4:
-  version "3.8.4"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^3.1.1"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jschardet@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
-
 jsdom-no-contextify@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jsdom-no-contextify/-/jsdom-no-contextify-3.1.0.tgz#0d8beaf610c2ff23894f54dfa7f89dd22fd0f7ab"
@@ -5870,7 +5744,11 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
-json-loader@^0.5.4:
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+
+json-loader@^0.5.4, json-loader@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
@@ -5899,17 +5777,13 @@ json-stable-stringify@~0.0.0:
     jsonify "~0.0.0"
 
 json-stringify-pretty-compact@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.0.4.tgz#d5161131be27fd9748391360597fcca250c6c5ce"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.1.0.tgz#4fa5b898f61a287d64828691baa822a41f3ad5ab"
 
-json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
+json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -5924,15 +5798,6 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
-jsonist@~1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-1.3.0.tgz#c0c74b95ef1c952038619b29efa520b1cc987556"
-  dependencies:
-    bl "~1.0.0"
-    hyperquest "~1.2.0"
-    json-stringify-safe "~5.0.0"
-    xtend "~4.0.0"
-
 jsonlint-lines-primitives@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/jsonlint-lines-primitives/-/jsonlint-lines-primitives-1.6.0.tgz#bb89f60c8b9b612fd913ddaa236649b840d86611"
@@ -5949,13 +5814,13 @@ jsonpointer@^4.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
   dependencies:
     assert-plus "1.0.0"
-    extsprintf "1.0.2"
+    extsprintf "1.3.0"
     json-schema "0.2.3"
-    verror "1.3.6"
+    verror "1.10.0"
 
 jstransform@^11.0.3:
   version "11.0.3"
@@ -5967,7 +5832,7 @@ jstransform@^11.0.3:
     object-assign "^2.0.0"
     source-map "^0.4.2"
 
-jsx-ast-utils@^2.0.0:
+jsx-ast-utils@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
   dependencies:
@@ -5981,6 +5846,12 @@ kebab-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/kebab-case/-/kebab-case-1.0.0.tgz#3f9e4990adcad0c686c0e701f7645868f75f91eb"
 
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  dependencies:
+    json-buffer "3.0.0"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -5993,17 +5864,13 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
+kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
 
-kind-of@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.0.2.tgz#f57bec933d9a2209ffa96c5c08343607b7035fda"
-
-kind-of@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.0.tgz#3606e9e2fa960e7ddaa8898c03804e47e5d66644"
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
 known-css-properties@^0.5.0:
   version "0.5.0"
@@ -6078,17 +5945,17 @@ line-column@^1.0.2:
     isobject "^2.0.0"
 
 link-check@^4.1.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/link-check/-/link-check-4.3.2.tgz#73a15da2c2c8fe04dbc905b7a48a1447981a4054"
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/link-check/-/link-check-4.3.3.tgz#c132453e89f6d9cbb36a114e6c28f3e16e42cf34"
   dependencies:
     is-relative-url "^2.0.0"
     isemail "^3.0.0"
     ms "^2.0.0"
     request "^2.83.0"
 
-livereload-js@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.2.2.tgz#6c87257e648ab475bc24ea257457edcc1f8d0bc2"
+livereload-js@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
 
 load-json-file@^1.0.0, load-json-file@^1.1.0:
   version "1.1.0"
@@ -6222,17 +6089,13 @@ lodash.assign@^3.2.0:
     lodash._createassigner "^3.0.0"
     lodash.keys "^3.0.0"
 
-lodash.assign@^4.0.0, lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.1.0, lodash.assign@^4.2.0:
+lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.1.0, lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
-lodash.bind@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
-
-lodash.defaults@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
 lodash.escape@^3.0.0:
   version "3.2.0"
@@ -6240,10 +6103,6 @@ lodash.escape@^3.0.0:
   dependencies:
     lodash._root "^3.0.0"
 
-lodash.foreach@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -6307,18 +6166,6 @@ lodash.merge@^3.3.2:
     lodash.keysin "^3.0.0"
     lodash.toplainobject "^3.0.0"
 
-lodash.pad@^4.1.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
-
-lodash.padend@^4.1.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
-
-lodash.padstart@^4.1.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
-
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
@@ -6372,9 +6219,9 @@ lodash@^3.10.1, lodash@^3.3.1:
   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.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+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.16.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
 log-driver@1.2.5:
   version "1.2.5"
@@ -6391,8 +6238,8 @@ lolex@^1.6.0:
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
 
 longest-streak@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.1.tgz#42d291b5411e40365c00e63193497e2247316e35"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -6415,28 +6262,28 @@ lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lowercase-keys@^1.0.0:
+lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
-lru-cache@^4.0.0, lru-cache@^4.0.1:
+lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-magic-string@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.14.0.tgz#57224aef1701caeed273b17a39a956e72b172462"
+magic-string@^0.22.4:
+  version "0.22.4"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
   dependencies:
     vlq "^0.2.1"
 
 make-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
   dependencies:
-    pify "^2.3.0"
+    pify "^3.0.0"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
@@ -6494,6 +6341,13 @@ md5-o-matic@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
 
+md5.js@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
 mdast-util-compact@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz#cdb5f84e2b6a2d3114df33bd05d9cb32e3c4083a"
@@ -6513,7 +6367,7 @@ mdast-util-inject@^1.1.0:
   dependencies:
     mdast-util-to-string "^1.0.0"
 
-mdast-util-to-hast@^2.0.0, mdast-util-to-hast@^2.2.0:
+mdast-util-to-hast@^2.0.0, mdast-util-to-hast@^2.1.1, mdast-util-to-hast@^2.2.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-2.5.0.tgz#f087844d255c7540f36906da30ba106c0ee5ee2f"
   dependencies:
@@ -6529,22 +6383,6 @@ mdast-util-to-hast@^2.0.0, mdast-util-to-hast@^2.2.0:
     unist-util-visit "^1.1.0"
     xtend "^4.0.1"
 
-mdast-util-to-hast@^2.1.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-2.4.2.tgz#f116e8bf3da772ba5a397a92dab090f5ba91caa0"
-  dependencies:
-    collapse-white-space "^1.0.0"
-    detab "^2.0.0"
-    mdast-util-definitions "^1.2.0"
-    normalize-uri "^1.0.0"
-    trim "0.0.1"
-    trim-lines "^1.0.0"
-    unist-builder "^1.0.1"
-    unist-util-generated "^1.1.0"
-    unist-util-position "^3.0.0"
-    unist-util-visit "^1.1.0"
-    xtend "^4.0.1"
-
 mdast-util-to-string@^1.0.0, mdast-util-to-string@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz#5c455c878c9355f0c1e7f3e8b719cf583691acfb"
@@ -6558,8 +6396,8 @@ mdast-util-toc@^2.0.0:
     unist-util-visit "^1.1.0"
 
 mdn-data@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.0.0.tgz#a69d9da76847b4d5834c1465ea25c0653a1fbf66"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.0.tgz#a7056319da95a2d0881267d7263075042eb061e2"
 
 mdurl@^1.0.1:
   version "1.0.1"
@@ -6578,6 +6416,10 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+
 meow@^3.1.0, meow@^3.3.0, meow@^3.6.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -6607,15 +6449,11 @@ meow@^4.0.0:
     redent "^2.0.0"
     trim-newlines "^2.0.0"
 
-merge-descriptors@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-
 merge-source-map@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
   dependencies:
-    source-map "^0.5.6"
+    source-map "^0.6.1"
 
 merge-stream@^1.0.0:
   version "1.0.1"
@@ -6623,6 +6461,10 @@ merge-stream@^1.0.0:
   dependencies:
     readable-stream "^2.0.1"
 
+merge2@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.1.tgz#271d2516ff52d4af7f7b710b8bf3e16e183fef66"
+
 micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -6642,95 +6484,78 @@ micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     regex-cache "^0.4.2"
 
 micromatch@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.3.tgz#ae1ee52aff9c990a83ff8fb69891aeba2847c85f"
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.6.tgz#8d7c043b48156f408ca07a4715182b79b99420bf"
   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"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
     fragment-cache "^0.2.1"
-    kind-of "^6.0.0"
-    nanomatch "^1.2.5"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
     object.pick "^1.3.0"
     regex-not "^1.0.0"
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
 miller-rabin@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.15"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
-  dependencies:
-    mime-db "~1.27.0"
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@~2.1.11, mime-types@~2.1.16, mime-types@~2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
-    mime-db "~1.30.0"
-
-mime@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.4.tgz#11b5fdaf29c2509255176b80ad520294f5de92b7"
+    mime-db "~1.33.0"
 
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-"mime@>= 0.0.1":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b"
+mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
-mime@^1.2.11, mime@^1.4.1:
+mime@~1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
-mime@~1.3.4:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
-
 mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
 mimic-response@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
 
-minifyify@^7.0.1:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/minifyify/-/minifyify-7.3.5.tgz#9f4bb0c8692502478d8ee85b10bd7248570629ae"
-  dependencies:
-    concat-stream "^1.4.7"
-    convert-source-map "^1.0.0"
-    lodash.assign "^4.0.0"
-    lodash.bind "^4.0.0"
-    lodash.defaults "^4.0.0"
-    lodash.foreach "^4.0.0"
-    mkdirp "^0.5.0"
-    source-map "^0.5.3"
-    through "^2.3.6"
-    tmp "0.0.28"
-    transform-filter "^0.1.1"
-    uglify-js "^2.6.1"
-
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
@@ -6739,7 +6564,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@3, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -6758,7 +6583,7 @@ minimist-options@^3.0.1:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
-minimist@0.0.8, minimist@~0.0.1:
+minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -6766,20 +6591,35 @@ minimist@1.1.x:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.2, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+mississippi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^2.0.1"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mixin-deep@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.2.0.tgz#d02b8c6f8b6d4b8f5982d3fd009c4919851c3fe2"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
   dependencies:
     for-in "^1.0.2"
-    is-extendable "^0.1.1"
-
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+    is-extendable "^1.0.1"
 
 mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
@@ -6814,38 +6654,41 @@ module-deps-sortable@4.0.6:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-module-deps@^4.0.8:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
+module-deps@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.0.0.tgz#4417b49a4f4d7af79b104186e5389ea99b1dc837"
   dependencies:
     JSONStream "^1.0.3"
     browser-resolve "^1.7.0"
     cached-path-relative "^1.0.0"
-    concat-stream "~1.5.0"
+    concat-stream "~1.6.0"
     defined "^1.0.0"
-    detective "^4.0.0"
+    detective "^5.0.2"
     duplexer2 "^0.1.2"
     inherits "^2.0.1"
     parents "^1.0.0"
     readable-stream "^2.0.2"
-    resolve "^1.1.3"
+    resolve "^1.4.0"
     stream-combiner2 "^1.1.1"
     subarg "^1.0.0"
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-module-not-found-error@^1.0.0:
+move-concurrently@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
 
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
-ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 ms@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
@@ -6854,44 +6697,40 @@ ms@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-1.0.0.tgz#59adcd22edc543f7b5381862d31387b1f4bc9473"
 
-ms@2.0.0, ms@^2.0.0:
+ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
 multi-stage-sourcemap@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz#b09fc8586eaa17f81d575c4ad02e0f7a3f6b1105"
   dependencies:
     source-map "^0.1.34"
 
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0, nan@^2.3.3:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+nan@^2.3.0, nan@^2.6.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
-nanomatch@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.5.tgz#5c9ab02475c76676275731b0bf0a7395c624a9c4"
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
     fragment-cache "^0.2.1"
-    is-odd "^1.0.0"
-    kind-of "^5.0.2"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
     object.pick "^1.3.0"
     regex-not "^1.0.0"
     snapdragon "^0.8.1"
@@ -6927,18 +6766,20 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-node-abi@^1.0.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-1.3.3.tgz#0f06f2815deba26107959d2213b36ce97437e6e2"
+node-abi@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.2.0.tgz#e802ac7a2408e2c0593fb3176ffdf8a99a9b4dec"
+  dependencies:
+    semver "^5.4.1"
 
 node-fetch@^1.0.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.1.tgz#899cb3d0a3c92f952c47f1b876f4c8aeabd400d5"
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-gyp@^3.0.3, node-gyp@^3.3.1:
+node-gyp@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
   dependencies:
@@ -6957,61 +6798,48 @@ node-gyp@^3.0.3, node-gyp@^3.3.1:
     which "1"
 
 node-libs-browser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
   dependencies:
     assert "^1.1.1"
-    browserify-zlib "^0.1.4"
+    browserify-zlib "^0.2.0"
     buffer "^4.3.0"
     console-browserify "^1.1.0"
     constants-browserify "^1.0.0"
     crypto-browserify "^3.11.0"
     domain-browser "^1.1.1"
     events "^1.0.0"
-    https-browserify "0.0.1"
-    os-browserify "^0.2.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
     path-browserify "0.0.0"
-    process "^0.11.0"
+    process "^0.11.10"
     punycode "^1.2.4"
     querystring-es3 "^0.2.0"
-    readable-stream "^2.0.5"
+    readable-stream "^2.3.3"
     stream-browserify "^2.0.1"
-    stream-http "^2.3.1"
-    string_decoder "^0.10.25"
-    timers-browserify "^2.0.2"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-ninja@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6"
-  dependencies:
-    fstream "^1.0.0"
-    glob "3 || 4 || 5 || 6 || 7"
-    graceful-fs "^4.1.2"
-    minimatch "3"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2"
-    osenv "0"
-    path-array "^1.0.0"
-    request "2"
-    rimraf "2"
-    semver "2.x || 3.x || 4 || 5"
-    tar "^2.0.0"
-    which "1"
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
 
-node-pre-gyp@^0.6.36:
-  version "0.6.36"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
+node-pre-gyp@^0.6.39:
+  version "0.6.39"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
   dependencies:
+    detect-libc "^1.0.2"
+    hawk "3.1.3"
     mkdirp "^0.5.1"
     nopt "^4.0.1"
     npmlog "^4.0.2"
     rc "^1.1.7"
-    request "^2.81.0"
+    request "2.81.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
     tar "^2.2.1"
@@ -7024,11 +6852,11 @@ node-pre-gyp@^0.6.36:
     chalk "~0.4.0"
     underscore "~1.6.0"
 
-noop-logger@^0.1.0:
+noop-logger@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
 
-"nopt@2 || 3", nopt@3.0.x:
+"nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -7050,7 +6878,7 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1:
+normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -7064,19 +6892,25 @@ normalize-selector@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
 
-normalize-uri@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-uri/-/normalize-uri-1.1.0.tgz#01fb440c7fd059b9d9be8645aac14341efd059dd"
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
 
 npm-run-all@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.0.2.tgz#a84669348e6db6ccbe052200b4cdb6bfe034a4fe"
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056"
   dependencies:
-    chalk "^1.1.3"
-    cross-spawn "^5.0.1"
-    minimatch "^3.0.2"
-    ps-tree "^1.0.1"
-    read-pkg "^2.0.0"
+    ansi-styles "^3.2.0"
+    chalk "^2.1.0"
+    cross-spawn "^5.1.0"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    ps-tree "^1.1.0"
+    read-pkg "^3.0.0"
     shell-quote "^1.6.1"
     string.prototype.padend "^3.0.0"
 
@@ -7086,14 +6920,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
-  dependencies:
-    ansi "~0.3.1"
-    are-we-there-yet "~1.1.2"
-    gauge "~1.2.5"
-
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -7117,11 +6943,7 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-"nwmatcher@>= 1.3.4 < 2.0.0":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.2.tgz#c5e545ab40d22a56b0326531c4beaed7a888b3ea"
-
-nwmatcher@^1.4.3:
+"nwmatcher@>= 1.3.4 < 2.0.0", nwmatcher@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
@@ -7157,26 +6979,26 @@ nyc@^10.1.2:
     yargs "^7.1.0"
     yargs-parser "^5.0.0"
 
-nyc@^11.0.2-candidate.0:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.0.3.tgz#0c28bc669a851621709bf7a08503034bee3812b6"
+nyc@^11.3.0:
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.5.0.tgz#29795d8217885e8b384d849fbe74956d58be2252"
   dependencies:
     archy "^1.0.0"
     arrify "^1.0.1"
     caching-transform "^1.0.0"
-    convert-source-map "^1.3.0"
+    convert-source-map "^1.5.1"
     debug-log "^1.0.1"
     default-require-extensions "^1.0.0"
     find-cache-dir "^0.1.1"
     find-up "^2.1.0"
     foreground-child "^1.5.3"
     glob "^7.0.6"
-    istanbul-lib-coverage "^1.1.1"
-    istanbul-lib-hook "^1.0.7"
-    istanbul-lib-instrument "^1.7.3"
-    istanbul-lib-report "^1.1.1"
-    istanbul-lib-source-maps "^1.2.1"
-    istanbul-reports "^1.1.1"
+    istanbul-lib-coverage "^1.1.2"
+    istanbul-lib-hook "^1.1.0"
+    istanbul-lib-instrument "^1.9.2"
+    istanbul-lib-report "^1.1.3"
+    istanbul-lib-source-maps "^1.2.3"
+    istanbul-reports "^1.1.4"
     md5-hex "^1.2.0"
     merge-source-map "^1.0.2"
     micromatch "^2.3.11"
@@ -7184,19 +7006,15 @@ nyc@^11.0.2-candidate.0:
     resolve-from "^2.0.0"
     rimraf "^2.5.4"
     signal-exit "^3.0.1"
-    spawn-wrap "^1.3.7"
-    test-exclude "^4.1.1"
-    yargs "^8.0.1"
-    yargs-parser "^5.0.0"
+    spawn-wrap "^1.4.2"
+    test-exclude "^4.2.0"
+    yargs "^10.0.3"
+    yargs-parser "^8.0.0"
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object-assign@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
@@ -7269,12 +7087,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-once@~1.3.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
-  dependencies:
-    wrappy "1"
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -7314,10 +7126,6 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
-
 ordered-read-streams@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
@@ -7325,13 +7133,9 @@ ordered-read-streams@^0.3.0:
     is-stream "^1.0.1"
     readable-stream "^2.0.1"
 
-os-browserify@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
-
-os-browserify@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54"
+os-browserify@^0.3.0, os-browserify@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
 os-homedir@^1.0.0, os-homedir@^1.0.1, os-homedir@^1.0.2:
   version "1.0.2"
@@ -7344,33 +7148,29 @@ os-locale@^1.4.0:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.0.0.tgz#15918ded510522b81ee7ae5a309d54f639fc39a4"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
   dependencies:
-    execa "^0.5.0"
+    execa "^0.7.0"
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
 osenv@0, osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-outpipe@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2"
-  dependencies:
-    shell-quote "^1.4.2"
-
 own-or-env@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/own-or-env/-/own-or-env-1.0.0.tgz#9ef920fc81e2e63cf59d41101258368cf4fca4fb"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/own-or-env/-/own-or-env-1.0.1.tgz#54ce601d3bf78236c5c65633aa1c8ec03f8007e4"
+  dependencies:
+    own-or "^1.0.0"
 
 own-or@^1.0.0:
   version "1.0.0"
@@ -7390,9 +7190,15 @@ p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
-p-limit@^1.1.0:
+p-is-promise@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+
+p-limit@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  dependencies:
+    p-try "^1.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -7405,14 +7211,20 @@ p-map@^1.1.1:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
 
 p-some@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-some/-/p-some-2.0.0.tgz#60b408e21f5da11a417fad13740bf20f9024ab3b"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-some/-/p-some-2.0.1.tgz#65d87c8b154edbcf5221d167778b6d2e150f6f06"
   dependencies:
     aggregate-error "^1.0.0"
 
-p-timeout@^1.0.0, p-timeout@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.0.tgz#9820f99434c5817868b4f34809ee5291660d5b6c"
+p-timeout@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
+  dependencies:
+    p-finally "^1.0.0"
+
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
   dependencies:
     p-finally "^1.0.0"
 
@@ -7420,12 +7232,6 @@ p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
-package-json-versionify@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/package-json-versionify/-/package-json-versionify-1.0.4.tgz#5860587a944873a6b7e6d26e8e51ffb22315bf17"
-  dependencies:
-    browserify-package-json "^1.0.0"
-
 package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
@@ -7435,9 +7241,17 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pako@~0.2.0:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+pako@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
 
 param-case@2.1.x:
   version "2.1.1"
@@ -7473,10 +7287,10 @@ parse-entities@^1.0.2:
     is-hexadecimal "^1.0.0"
 
 parse-filepath@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
   dependencies:
-    is-absolute "^0.2.3"
+    is-absolute "^1.0.0"
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
@@ -7529,17 +7343,11 @@ parse5@4.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
 
-parse5@^3.0.0, parse5@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
-  dependencies:
-    "@types/node" "^6.0.46"
-
-parsejson@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
+parse5@^3.0.1, parse5@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
   dependencies:
-    better-assert "~1.0.0"
+    "@types/node" "*"
 
 parseqs@0.0.5:
   version "0.0.5"
@@ -7568,12 +7376,6 @@ pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
 
-path-array@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271"
-  dependencies:
-    array-index "^1.0.0"
-
 path-browserify@0.0.0, path-browserify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
@@ -7655,15 +7457,15 @@ pause-stream@0.0.11:
     through "~2.3"
 
 pbf@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.0.5.tgz#24f0fa2cbeb16e5c56a5901bb7e9c2ac0c8059be"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.1.0.tgz#f70004badcb281761eabb1e76c92f179f08189e9"
   dependencies:
     ieee754 "^1.1.6"
     resolve-protobuf-schema "^2.0.0"
 
 pbkdf2@^3.0.3:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2"
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7679,7 +7481,7 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
-pify@^2.0.0, pify@^2.3.0:
+pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -7697,6 +7499,12 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pirates@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-3.0.2.tgz#7e6f85413fd9161ab4e12b539b06010d85954bb9"
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
 pixelmatch@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854"
@@ -7725,8 +7533,8 @@ pkg-dir@^2.0.0:
     find-up "^2.1.0"
 
 platform@^1.3.3:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
 
 pluralize@^4.0.0:
   version "4.0.0"
@@ -7737,8 +7545,8 @@ pn@^1.1.0:
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
 
 pngjs@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.2.0.tgz#fc9fcea1a8a375da54a51148019d5abd41dbabde"
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.2.tgz#097c3c2a75feb223eadddea6bc9f0050cf830bc3"
 
 portscanner@2.1.1:
   version "2.1.1"
@@ -7829,12 +7637,12 @@ postcss-selector-parser@^3.1.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-url@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.1.2.tgz#e04ae386af7ea6ef5df51c5b449d6b9502cd99b2"
+postcss-url@^7.3.0:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.1.tgz#b43ae0f0dae4cd06c831fa3aeac2d7a5b73754ed"
   dependencies:
-    mime "^1.2.11"
-    minimatch "^3.0.0"
+    mime "^1.4.1"
+    minimatch "^3.0.4"
     mkdirp "^0.5.0"
     postcss "^6.0.1"
     xxhashjs "^0.2.1"
@@ -7843,15 +7651,15 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
-postcss-values-parser@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-1.3.1.tgz#2a6ceb39cecbbacd1d060f3b16f4c52dd6720c96"
+postcss-values-parser@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-1.3.2.tgz#051aa9619e15fa1b672aaf0f6c1398be961f17fd"
   dependencies:
     flatten "^1.0.2"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@^5.0.14:
+postcss@^5.0.14, postcss@^5.2.16:
   version "5.2.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
   dependencies:
@@ -7860,54 +7668,33 @@ postcss@^5.0.14:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^5.2.16:
-  version "5.2.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.15, postcss@^6.0.17, postcss@^6.0.19, postcss@^6.0.6, postcss@^6.0.8:
+  version "6.0.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
   dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.12, postcss@^6.0.13:
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
-  dependencies:
-    chalk "^2.1.0"
-    source-map "^0.6.1"
-    supports-color "^4.4.0"
-
-postcss@^6.0.14, postcss@^6.0.15, postcss@^6.0.16, postcss@^6.0.6, postcss@^6.0.8:
-  version "6.0.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
-  dependencies:
-    chalk "^2.3.0"
+    chalk "^2.3.1"
     source-map "^0.6.1"
-    supports-color "^5.1.0"
+    supports-color "^5.2.0"
 
-prebuild@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-5.1.2.tgz#d2b59d2d9cc4dc8c646da4336d827d47f5b0f411"
+prebuild-install@^2.1.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.1.tgz#0f234140a73760813657c413cdccdda58296b1da"
   dependencies:
-    async "^2.1.4"
-    execspawn "^1.0.1"
-    expand-template "^1.0.0"
-    ghreleases "^1.0.2"
+    detect-libc "^1.0.3"
+    expand-template "^1.0.2"
     github-from-package "0.0.0"
-    minimist "^1.1.2"
+    minimist "^1.2.0"
     mkdirp "^0.5.1"
-    node-abi "^1.0.3"
-    node-gyp "^3.0.3"
-    node-ninja "^1.0.1"
-    noop-logger "^0.1.0"
+    node-abi "^2.2.0"
+    noop-logger "^0.1.1"
     npmlog "^4.0.1"
     os-homedir "^1.0.1"
-    pump "^1.0.0"
-    rc "^1.0.3"
-    simple-get "^1.4.2"
-    tar-fs "^1.7.0"
-    tar-stream "^1.2.1"
-    xtend "^4.0.1"
+    pump "^2.0.1"
+    rc "^1.1.6"
+    simple-get "^2.7.0"
+    tar-fs "^1.13.0"
+    tunnel-agent "^0.6.0"
+    which-pm-runs "^1.0.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
@@ -7917,13 +7704,21 @@ prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.4.tgz#5e8624ae9363c80f95ec644584ecdf55d74f93fa"
+prettier@^1.10.2:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.0.tgz#c024f70cab158c993f50fc0c25ffe738cb8b0f85"
+
+prettier@^1.5.3:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
 
 pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
@@ -7933,14 +7728,14 @@ pretty-error@^2.0.2, pretty-error@^2.1.1:
     utila "~0.4"
 
 prismjs@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.8.1.tgz#bd0cdc32e9a561c1c8c3c9733765a7f1ec3b54ee"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.11.0.tgz#297aef33eb79421bfdb19273a5092ca515970d29"
   optionalDependencies:
-    clipboard "^1.5.5"
+    clipboard "^1.7.1"
 
 private@^0.1.6, private@^0.1.7, private@~0.1.5:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
 process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -7950,7 +7745,7 @@ process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
-process@^0.11.0, process@~0.11.0:
+process@^0.11.10, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
@@ -7958,19 +7753,16 @@ progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
 
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+
 promise@^7.0.3, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.10:
-  version "15.5.10"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
-  dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-
 prop-types@^15.5.4, prop-types@^15.6.0:
   version "15.6.0"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
@@ -7992,22 +7784,14 @@ protocol-buffers-schema@^3.3.1:
   resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz#00434f608b4e8df54c59e070efeefc37fb4bb859"
 
 protocols@^1.1.0, protocols@^1.4.0:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.5.tgz#21de1f441c4ef7094408ed9f1c94f7a114b87557"
-
-proxyquire@^1.7.9:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/proxyquire/-/proxyquire-1.8.0.tgz#02d514a5bed986f04cbb2093af16741535f79edc"
-  dependencies:
-    fill-keys "^1.0.2"
-    module-not-found-error "^1.0.0"
-    resolve "~1.1.7"
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.6.tgz#f8bb263ea1b5fd7a7604d26b8be39bd77678bf8a"
 
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
 
-ps-tree@^1.0.1:
+ps-tree@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
   dependencies:
@@ -8028,21 +7812,36 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
 
 public-ip@^2.3.0:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/public-ip/-/public-ip-2.3.5.tgz#7d7847625881576ba7a1fa410b0978df239bdf75"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/public-ip/-/public-ip-2.4.0.tgz#f00c028a15366d8c798e47efab6acd09a17666da"
   dependencies:
-    dns-socket "^1.6.1"
-    got "^6.7.1"
+    dns-socket "^1.6.2"
+    got "^8.0.0"
     is-ip "^2.0.0"
-    pify "^2.3.0"
+    pify "^3.0.0"
 
 pump@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+pump@^2.0.0, pump@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
+  dependencies:
+    duplexify "^3.5.3"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
@@ -8055,23 +7854,15 @@ punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@^1.1.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
-q@^1.4.1:
+q@^1.1.2, q@^1.4.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
-qs@0.4.x:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-0.4.2.tgz#3cac4c861e371a8c9c4770ac23cda8de639b8e5f"
-
 qs@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"
 
-"qs@>= 0.4.0", qs@^6.4.0, qs@~6.5.1:
+qs@^6.4.0, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
@@ -8083,6 +7874,14 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+query-string@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.0.tgz#9583b15fd1307f899e973ed418886426a9976469"
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 querystring-es3@^0.2.0, querystring-es3@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -8096,8 +7895,8 @@ quick-lru@^1.0.0:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
 
 quickselect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.0.0.tgz#02630818f9aae4ecab26f0103f98d061c17c58f3"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.0.1.tgz#1e6ceaa9db1ca7c75aafcc863c7bef2037ca62a1"
 
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
@@ -8114,10 +7913,17 @@ randomatic@^1.1.3:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-randombytes@^2.0.0, randombytes@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
   dependencies:
+    randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
 range-parser@~1.2.0:
@@ -8135,9 +7941,9 @@ raw-loader@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
 
-rc@^1.0.1, rc@^1.0.3, rc@^1.1.6, rc@^1.1.7:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -8149,8 +7955,8 @@ react-dom@15.3.1:
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.1.tgz#6d42cd2b64c8c5e0b693f3ffaec301e6e627e24e"
 
 react-dom@^16.0.0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -8182,8 +7988,8 @@ react@15.3.1:
     object-assign "^4.1.0"
 
 react@^16.0.0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -8248,28 +8054,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.6, readable-stream@^2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@^2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.2, readable-stream@^2.3.3, readable-stream@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
   dependencies:
@@ -8281,16 +8066,16 @@ readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@~2.3.3:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.0, readable-stream@~2.0.5:
+readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -8352,29 +8137,17 @@ redent@^2.0.0:
     strip-indent "^2.0.0"
 
 regenerate@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
-
-regenerator-runtime@^0.10.0:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
 
 regenerator-runtime@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
 regenerator-runtime@^0.9.5:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
 
-regenerator-transform@0.9.11:
-  version "0.9.11"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
-  dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
-    private "^0.1.6"
-
 regenerator-transform@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
@@ -8384,17 +8157,17 @@ regenerator-transform@^0.10.0:
     private "^0.1.6"
 
 regex-cache@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
   dependencies:
     is-equal-shallow "^0.1.3"
-    is-primitive "^2.0.0"
 
 regex-not@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   dependencies:
-    extend-shallow "^2.0.1"
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
 
 regexpu-core@^2.0.0:
   version "2.0.0"
@@ -8405,8 +8178,8 @@ regexpu-core@^2.0.0:
     regjsparser "^0.1.4"
 
 registry-auth-token@^3.0.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -8516,6 +8289,14 @@ remark-slug@^4.0.0:
     mdast-util-to-string "^1.0.0"
     unist-util-visit "^1.0.0"
 
+remark-slug@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.0.0.tgz#9de71fcdc2bfae33ebb4a41eb83035288a829980"
+  dependencies:
+    github-slugger "^1.0.0"
+    mdast-util-to-string "^1.0.0"
+    unist-util-visit "^1.0.0"
+
 remark-stringify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-4.0.0.tgz#4431884c0418f112da44991b4e356cfe37facd87"
@@ -8535,13 +8316,20 @@ remark-stringify@^4.0.0:
     unherit "^1.0.4"
     xtend "^4.0.1"
 
-remark-toc@^4.0.0, remark-toc@^4.0.1:
+remark-toc@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/remark-toc/-/remark-toc-4.0.1.tgz#ff36ff6de54ea07dd59e3f5334a4a3aac1e93185"
   dependencies:
     mdast-util-toc "^2.0.0"
     remark-slug "^4.0.0"
 
+remark-toc@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.0.0.tgz#f1e13ed11062ad4d102b02e70168bd85015bf129"
+  dependencies:
+    mdast-util-toc "^2.0.0"
+    remark-slug "^5.0.0"
+
 remark@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/remark/-/remark-8.0.0.tgz#287b6df2fe1190e263c1d15e486d3fa835594d6d"
@@ -8557,8 +8345,8 @@ remote-origin-url@0.4.0:
     parse-git-config "^0.2.0"
 
 remove-trailing-separator@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
 
 renderkid@^2.0.1:
   version "2.0.1"
@@ -8606,32 +8394,32 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2, request@2.81.0, request@^2.79.0, request@^2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+request@2, "request@>= 2.44.0 < 3.0.0", request@^2.79.0, request@^2.83.0:
+  version "2.83.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
     caseless "~0.12.0"
     combined-stream "~1.0.5"
-    extend "~3.0.0"
+    extend "~3.0.1"
     forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
     tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
+    uuid "^3.1.0"
 
 request@2.79.0:
   version "2.79.0"
@@ -8658,32 +8446,32 @@ request@2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
-"request@>= 2.44.0 < 3.0.0", request@^2.83.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+request@2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
     caseless "~0.12.0"
     combined-stream "~1.0.5"
-    extend "~3.0.1"
+    extend "~3.0.0"
     forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
     tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
+    uuid "^3.0.0"
 
 require-directory@^2.1.1:
   version "2.1.1"
@@ -8730,17 +8518,11 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@1.1.7, resolve@~1.1.7:
+resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@^1.1.5:
+resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
@@ -8753,6 +8535,12 @@ resp-modifier@6.0.2:
     debug "^2.2.0"
     minimatch "^3.0.2"
 
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -8760,15 +8548,19 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
@@ -8783,12 +8575,98 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
+rollup-plugin-browserify-transform@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-browserify-transform/-/rollup-plugin-browserify-transform-1.0.1.tgz#97cd596d5cb14d7fdb43da970b6c3a309a6d81e9"
+  dependencies:
+    concat-stream "^1.5.1"
+    object-assign "^4.0.1"
+    rollup-pluginutils "^2.0.1"
+    source-map-url "^0.4.0"
+
+rollup-plugin-buble@^0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.18.0.tgz#6e20d1b2840c59eb496b9f954f75243e51786ac1"
+  dependencies:
+    buble "^0.18.0"
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-commonjs@^8.2.6:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.3.0.tgz#91b4ba18f340951e39ed7b1901f377a80ab3f9c3"
+  dependencies:
+    acorn "^5.2.1"
+    estree-walker "^0.5.0"
+    magic-string "^0.22.4"
+    resolve "^1.4.0"
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-json@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-2.3.0.tgz#3c07a452c1b5391be28006fbfff3644056ce0add"
+  dependencies:
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-node-resolve@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
+  dependencies:
+    browser-resolve "^1.11.0"
+    builtin-modules "^1.1.0"
+    is-module "^1.0.0"
+    resolve "^1.1.6"
+
+rollup-plugin-replace@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.0.0.tgz#19074089c8ed57184b8cc64e967a03d095119277"
+  dependencies:
+    magic-string "^0.22.4"
+    minimatch "^3.0.2"
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-sourcemaps@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
+  dependencies:
+    rollup-pluginutils "^2.0.1"
+    source-map-resolve "^0.5.0"
+
+rollup-plugin-uglify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-3.0.0.tgz#a34eca24617709c6bf1778e9653baafa06099b86"
+  dependencies:
+    uglify-es "^3.3.7"
+
+rollup-plugin-unassert@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-unassert/-/rollup-plugin-unassert-0.2.0.tgz#856a1513982a9ff9dcc7cfa6a436be8fe1b6696f"
+  dependencies:
+    acorn "^4.0.4"
+    convert-source-map "^1.5.1"
+    escodegen "^1.8.1"
+    multi-stage-sourcemap "^0.2.1"
+    rollup-pluginutils "^2.0.1"
+    unassert "^1.5.1"
+
+rollup-pluginutils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+  dependencies:
+    estree-walker "^0.3.0"
+    micromatch "^2.3.11"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
   dependencies:
     is-promise "^2.1.0"
 
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  dependencies:
+    aproba "^1.1.1"
+
 rw@1, rw@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
@@ -8815,19 +8693,26 @@ safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
 
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
 samsam@1.x, samsam@^1.1.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
 sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-schema-utils@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+schema-utils@^0.4.2, schema-utils@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
   dependencies:
-    ajv "^5.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
 
 seedrandom@^2.4.2:
   version "2.4.3"
@@ -8843,14 +8728,14 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@5.3.0, semver@^5.3.0, semver@~5.3.0:
+"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:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
+semver@5.3.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-semver@^5.0.1, semver@^5.0.3, semver@^5.1.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
 send@0.15.2:
   version "0.15.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.15.2.tgz#f91fab4403bcf87e716f70ceb5db2f578bdc17d6"
@@ -8869,6 +8754,10 @@ send@0.15.2:
     range-parser "~1.2.0"
     statuses "~1.3.1"
 
+serialize-javascript@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
+
 serve-index@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b"
@@ -8939,10 +8828,11 @@ setprototypeof@1.0.3:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
 sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
+  version "2.4.10"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
   dependencies:
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 shallow-copy@~0.0.1:
   version "0.0.1"
@@ -8969,7 +8859,7 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shell-quote@^1.4.2, shell-quote@^1.6.1:
+shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
   dependencies:
@@ -9000,21 +8890,21 @@ signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-simple-get@^1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-1.4.3.tgz#e9755eda407e96da40c5e5158c9ea37b33becbeb"
+simple-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
+
+simple-get@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.7.0.tgz#ad37f926d08129237ff08c4f2edfd6f10e0380b5"
   dependencies:
+    decompress-response "^3.3.0"
     once "^1.3.1"
-    unzip-response "^1.0.0"
-    xtend "^4.0.0"
-
-simple-mime@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e"
+    simple-concat "^1.0.0"
 
 sinon@^2.1.0:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.6.tgz#95378e7e0f976a9712e9b4591ff5b39e73dc3dde"
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.4.1.tgz#021fd64b54cb77d9d2fb0d43cdedfae7629c3a36"
   dependencies:
     diff "^3.1.0"
     formatio "1.2.0"
@@ -9036,9 +8926,11 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
 
 sliced@^1.0.1:
   version "1.0.1"
@@ -9086,54 +8978,51 @@ sntp@1.x.x:
     hoek "2.x.x"
 
 sntp@2.x.x:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.0.2.tgz#5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
   dependencies:
     hoek "4.x.x"
 
-socket.io-adapter@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
-  dependencies:
-    debug "2.3.3"
-    socket.io-parser "2.3.1"
+socket.io-adapter@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
 
-socket.io-client@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.6.0.tgz#5b668f4f771304dfeed179064708386fa6717853"
+socket.io-client@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
   dependencies:
     backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
     component-bind "1.0.0"
     component-emitter "1.2.1"
-    debug "2.3.3"
-    engine.io-client "1.8.0"
-    has-binary "0.1.7"
+    debug "~2.6.4"
+    engine.io-client "~3.1.0"
+    has-cors "1.1.0"
     indexof "0.0.1"
     object-component "0.0.3"
+    parseqs "0.0.5"
     parseuri "0.0.5"
-    socket.io-parser "2.3.1"
+    socket.io-parser "~3.1.1"
     to-array "0.1.4"
 
-socket.io-parser@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
+socket.io-parser@~3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.2.tgz#dbc2282151fc4faebbe40aeedc0772eba619f7f2"
   dependencies:
-    component-emitter "1.1.2"
-    debug "2.2.0"
-    isarray "0.0.1"
-    json3 "3.3.2"
+    component-emitter "1.2.1"
+    debug "~2.6.4"
+    has-binary2 "~1.0.2"
+    isarray "2.0.1"
 
-socket.io@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.6.0.tgz#3e40d932637e6bd923981b25caf7c53e83b6e2e1"
+socket.io@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
   dependencies:
-    debug "2.3.3"
-    engine.io "1.8.0"
-    has-binary "0.1.7"
-    object-assign "4.1.0"
-    socket.io-adapter "0.5.0"
-    socket.io-client "1.6.0"
-    socket.io-parser "2.3.1"
+    debug "~2.6.6"
+    engine.io "~3.1.0"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.0.4"
+    socket.io-parser "~3.1.1"
 
 sort-asc@^0.1.0:
   version "0.1.0"
@@ -9143,6 +9032,12 @@ sort-desc@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/sort-desc/-/sort-desc-0.1.1.tgz#198b8c0cdeb095c463341861e3925d4ee359a9ee"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 sort-object@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/sort-object/-/sort-object-0.3.2.tgz#98e0d199ede40e07c61a84403c61d6c3b290f9e2"
@@ -9164,21 +9059,15 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.15:
+source-map-support@^0.4.15, source-map-support@^0.4.18:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.4.2, source-map-support@^0.4.3:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
-  dependencies:
-    source-map "^0.5.6"
-
-source-map-support@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
+source-map-support@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
   dependencies:
     source-map "^0.6.0"
 
@@ -9186,7 +9075,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@0.5.x, source-map@^0.5.1, source-map@~0.5.0, source-map@~0.5.6:
+source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -9202,20 +9091,10 @@ source-map@^0.4.2, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
-source-map@^0.6.0, source-map@^0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-source-map@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
-  dependencies:
-    amdefine ">=0.0.4"
-
 space-separated-tokens@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.1.tgz#9695b9df9e65aec1811d4c3f9ce52520bc2f7e4d"
@@ -9233,16 +9112,16 @@ spawn-wrap@1.2.4:
     signal-exit "^2.0.0"
     which "^1.2.4"
 
-spawn-wrap@^1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.7.tgz#beb8bf4426d64b2b06871e0d7dee2643f1f8d1bc"
+spawn-wrap@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c"
   dependencies:
     foreground-child "^1.5.6"
     mkdirp "^0.5.0"
     os-homedir "^1.0.1"
-    rimraf "^2.3.3"
+    rimraf "^2.6.2"
     signal-exit "^3.0.2"
-    which "^1.2.4"
+    which "^1.3.0"
 
 spdx-correct@~1.0.0:
   version "1.0.2"
@@ -9263,10 +9142,10 @@ specificity@^0.3.1:
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42"
 
 split-string@^3.0.1, split-string@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.0.2.tgz#6129bc92731716e5aa1fb73c333078f0b7c114c8"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
   dependencies:
-    extend-shallow "^2.0.1"
+    extend-shallow "^3.0.0"
 
 split2@^1.0.0:
   version "1.1.1"
@@ -9304,17 +9183,23 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+ssri@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.2.4.tgz#9985e14041e65fc397af96542be35724ac11da52"
+  dependencies:
+    safe-buffer "^5.1.1"
+
 st@^1.1.0, st@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/st/-/st-1.2.0.tgz#e6313c1836a0889e8507be5bb189b2245266c2df"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/st/-/st-1.2.2.tgz#b95554f41b457bf0ed1c48f2bad8fccff894b14f"
   dependencies:
     async-cache "~1.1.0"
-    bl "~1.1.2"
+    bl "~1.2.1"
     fd "~0.0.2"
-    mime "~1.3.4"
+    mime "~1.4.1"
     negotiator "~0.6.1"
   optionalDependencies:
-    graceful-fs "~4.1.4"
+    graceful-fs "~4.1.11"
 
 stack-utils@^1.0.0:
   version "1.0.1"
@@ -9364,7 +9249,11 @@ static-module@^2.1.1:
     static-eval "^2.0.0"
     through2 "~2.0.3"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.3.0, statuses@~1.3.1:
+"statuses@>= 1.3.1 < 2":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+
+statuses@~1.3.0, statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
@@ -9398,13 +9287,20 @@ stream-combiner@~0.0.4:
   dependencies:
     duplexer "~0.1.1"
 
-stream-http@^2.0.0, stream-http@^2.3.1:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
+stream-each@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.0.0, stream-http@^2.7.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
-    readable-stream "^2.2.6"
+    readable-stream "^2.3.3"
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
@@ -9426,6 +9322,10 @@ stream-throttle@^0.1.3:
     commander "^2.2.0"
     limiter "^1.0.5"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -9438,14 +9338,7 @@ string-width@^1.0.0, string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.0.tgz#030664561fc146c9423ec7d978fe2457437fe6d0"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^2.1.0:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -9460,11 +9353,11 @@ string.prototype.padend@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@0.10, string_decoder@^0.10.25, string_decoder@~0.10.x:
+string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.0, string_decoder@~1.0.3:
+string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
@@ -9480,8 +9373,8 @@ stringify-entities@^1.0.1:
     is-hexadecimal "^1.0.0"
 
 stringify-object@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.1.tgz#2720c2eff940854c819f6ee252aaeb581f30624d"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
   dependencies:
     get-own-enumerable-property-symbols "^2.0.1"
     is-obj "^1.0.1"
@@ -9551,12 +9444,12 @@ style-search@^0.1.0:
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
 
 stylelint-config-recommended@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.0.1.tgz#4746119ec85f5f4663c7b5107c05c13ed0e2ab0d"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz#f526d5c771c6811186d9eaedbed02195fee30858"
 
 stylelint-config-standard@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-18.0.0.tgz#0d872b40fafdcddcf4188fb5b64ddb3887e8aefc"
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-18.1.0.tgz#e4d977063f5bca77970033d2f76941c3cc19fd9c"
   dependencies:
     stylelint-config-recommended "^2.0.0"
 
@@ -9632,23 +9525,17 @@ supports-color@^3.1.2, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^4.1.0:
+supports-color@^4.1.0, supports-color@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+supports-color@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
   dependencies:
-    has-flag "^2.0.0"
+    has-flag "^3.0.0"
 
 svg-tags@^1.0.0:
   version "1.0.0"
@@ -9663,21 +9550,21 @@ symbol@^0.2.1:
   resolved "https://registry.yarnpkg.com/symbol/-/symbol-0.2.3.tgz#3b9873b8a901e47c6efe21526a3ac372ef28bbc7"
 
 syntax-error@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.3.0.tgz#1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
   dependencies:
-    acorn "^4.0.3"
+    acorn-node "^1.2.0"
 
 table@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
 
 tap-mocha-reporter@^3.0.6:
   version "3.0.6"
@@ -9704,28 +9591,28 @@ tap-parser@^5.1.0, tap-parser@^5.3.1:
     readable-stream "^2"
 
 tap@^10.3.0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/tap/-/tap-10.7.0.tgz#ecde1ebd2b86981f741ae089f1448c9f294ac548"
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/tap/-/tap-10.7.3.tgz#f5c20c072151a8b6877e78112714a07007b97e4f"
   dependencies:
     bind-obj-methods "^1.0.0"
-    bluebird "^3.3.1"
+    bluebird "^3.5.1"
     clean-yaml-object "^0.1.0"
     color-support "^1.1.0"
-    coveralls "^2.11.2"
+    coveralls "^2.13.3"
     foreground-child "^1.3.3"
     fs-exists-cached "^1.0.0"
     function-loop "^1.0.1"
     glob "^7.0.0"
     isexe "^2.0.0"
-    js-yaml "^3.3.1"
-    nyc "^11.0.2-candidate.0"
+    js-yaml "^3.10.0"
+    nyc "^11.3.0"
     opener "^1.4.1"
     os-homedir "^1.0.2"
     own-or "^1.0.0"
     own-or-env "^1.0.0"
     readable-stream "^2.3.2"
     signal-exit "^3.0.0"
-    source-map-support "^0.4.3"
+    source-map-support "^0.4.18"
     stack-utils "^1.0.0"
     tap-mocha-reporter "^3.0.6"
     tap-parser "^5.3.1"
@@ -9738,9 +9625,9 @@ tapable@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
 
-tar-fs@^1.7.0:
-  version "1.15.3"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.15.3.tgz#eccf935e941493d8151028e636e51ce4c3ca7f20"
+tar-fs@^1.13.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896"
   dependencies:
     chownr "^1.0.1"
     mkdirp "^0.5.1"
@@ -9748,8 +9635,8 @@ tar-fs@^1.7.0:
     tar-stream "^1.1.2"
 
 tar-pack@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
   dependencies:
     debug "^2.2.0"
     fstream "^1.0.10"
@@ -9760,9 +9647,9 @@ tar-pack@^3.4.0:
     tar "^2.2.1"
     uid-number "^0.0.6"
 
-tar-stream@^1.1.2, tar-stream@^1.2.1:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.4.tgz#36549cf04ed1aee9b2a30c0143252238daf94016"
+tar-stream@^1.1.2:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
   dependencies:
     bl "^1.0.0"
     end-of-stream "^1.0.0"
@@ -9815,9 +9702,9 @@ terminal-table@0.0.12:
     colors "^1.0.3"
     eastasianwidth "^0.1.0"
 
-test-exclude@^4.1.0, test-exclude@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
+test-exclude@^4.1.0, test-exclude@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.0.tgz#07e3613609a362c74516a717515e13322ab45b3c"
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -9851,7 +9738,7 @@ through2-filter@^2.0.0:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
-through2@^0.6.0, through2@^0.6.3, through2@~0.6.3:
+through2@^0.6.0, through2@^0.6.3:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
   dependencies:
@@ -9865,7 +9752,7 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0, through2@~2.
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.7, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
+through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -9873,7 +9760,7 @@ time-stamp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
 
-timed-out@^4.0.0:
+timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
 
@@ -9883,52 +9770,40 @@ timers-browserify@^1.0.1:
   dependencies:
     process "~0.11.0"
 
-timers-browserify@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
+timers-browserify@^2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
   dependencies:
     setimmediate "^1.0.4"
 
 tiny-emitter@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.1.tgz#e65919d91e488e2a78f7ebe827a56c6b188d51af"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
 
 tiny-lr@^1.0.3:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.0.5.tgz#21f40bf84ebd1f853056680375eef1670c334112"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.0.tgz#a373bce2a4b58cef9a64433360ba593155f4cd45"
   dependencies:
     body "^5.1.0"
     debug "~2.6.7"
     faye-websocket "~0.10.0"
-    livereload-js "^2.2.2"
+    livereload-js "^2.3.0"
     object-assign "^4.1.0"
     qs "^6.4.0"
 
 tinyqueue@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-1.2.2.tgz#947229e5e4197aba988acd27751dcc582e6728ff"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-1.2.3.tgz#b6a61de23060584da29f82362e45df1ec7353f3d"
 
 tmatch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-3.1.0.tgz#701264fd7582d0144a80c85af3358cca269c71e3"
 
-tmp@0.0.28:
-  version "0.0.28"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-tmp@0.0.29:
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-tmp@^0.0.31:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
-    os-tmpdir "~1.0.1"
+    os-tmpdir "~1.0.2"
 
 to-absolute-glob@^0.1.1:
   version "0.1.1"
@@ -9944,7 +9819,7 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
-to-fast-properties@^1.0.1, to-fast-properties@^1.0.3:
+to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
@@ -9973,31 +9848,18 @@ toposort@^1.0.0:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.3:
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
     punycode "^1.4.1"
 
-tough-cookie@~2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
-  dependencies:
-    punycode "^1.4.1"
-
 tr46@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   dependencies:
     punycode "^2.1.0"
 
-transform-filter@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/transform-filter/-/transform-filter-0.1.1.tgz#806f851b6e440b23788fd38ca0431b502025ba59"
-  dependencies:
-    multimatch "^2.0.0"
-    through "^2.3.6"
-
 trim-lines@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.0.tgz#9926d03ede13ba18f7d42222631fb04c79ff26fe"
@@ -10034,18 +9896,18 @@ trough@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.1.tgz#a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"
 
-tryit@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
-
 tsame@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/tsame/-/tsame-1.1.2.tgz#5ce0002acf685942789c63018797a2aa5e6b03c5"
 
-tty-browserify@0.0.0, tty-browserify@~0.0.0:
+tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
+tty-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -10067,8 +9929,8 @@ type-check@~0.3.2:
     prelude-ls "~1.1.2"
 
 type-detect@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
 
 typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
@@ -10079,24 +9941,24 @@ ua-parser-js@0.7.12:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
 
 ua-parser-js@^0.7.9:
-  version "0.7.14"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca"
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
 
-uglify-es@^3.0.26:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.3.tgz#a21eeb149cb120a1f8302563689e19496550780b"
+uglify-es@^3.3.4, uglify-es@^3.3.7:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.10.tgz#8b0b7992cebe20edc26de1bf325cef797b8f3fa5"
   dependencies:
-    commander "~2.11.0"
-    source-map "~0.5.1"
+    commander "~2.14.1"
+    source-map "~0.6.1"
 
-uglify-js@3.1.x, uglify-js@^3.0.21, uglify-js@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.3.tgz#d61f0453b4718cab01581f3162aa90bab7520b42"
+uglify-js@3.3.x:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.11.tgz#e9d058b20715138bb4e8e5cae2ea581686bdaae3"
   dependencies:
-    commander "~2.11.0"
-    source-map "~0.5.1"
+    commander "~2.14.1"
+    source-map "~0.6.1"
 
-uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.29:
+uglify-js@^2.6, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -10105,6 +9967,13 @@ uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.29:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@^3.3.11:
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.12.tgz#efd87c16a1f4c674a8a5ede571001ef634dcc883"
+  dependencies:
+    commander "~2.14.1"
+    source-map "~0.6.1"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -10117,14 +9986,23 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
+uglifyjs-webpack-plugin@^1.2.0:
+  version "1.2.2"
+  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"
+    schema-utils "^0.4.2"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
-
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -10133,7 +10011,7 @@ umd@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
 
-unassert@^1.3.1:
+unassert@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/unassert/-/unassert-1.5.1.tgz#cbc88ec387417c5a5e4c02d3cd07be98bd75ff76"
   dependencies:
@@ -10145,36 +10023,14 @@ unassert@^1.3.1:
     esutils "^2.0.2"
     object-assign "^4.1.0"
 
-unassertify@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/unassertify/-/unassertify-2.0.4.tgz#b3ca2ba5f29b4836e35a6dd77e5b20f6dbbf8e52"
-  dependencies:
-    acorn "^4.0.0"
-    convert-source-map "^1.1.1"
-    escodegen "^1.6.1"
-    multi-stage-sourcemap "^0.2.1"
-    through "^2.3.7"
-    unassert "^1.3.1"
-
-unc-path-regex@^0.1.0:
+unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
-underscore@1.7.x:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-
 underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
-unflowify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unflowify/-/unflowify-1.0.1.tgz#a2ea0d25c0affcc46955e6473575f7c5a1f4a696"
-  dependencies:
-    flow-remove-types "^1.1.2"
-    through "^2.3.8"
-
 unherit@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d"
@@ -10196,8 +10052,8 @@ unified-lint-rule@^1.0.1:
     wrapped "^1.0.1"
 
 unified@^6.0.0, unified@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.5.tgz#716937872621a63135e62ced2f3ac6a063c6fb87"
+  version "6.1.6"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1"
   dependencies:
     bail "^1.0.0"
     extend "^3.0.0"
@@ -10224,6 +10080,18 @@ uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
+unique-filename@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+  dependencies:
+    imurmurhash "^0.1.4"
+
 unique-stream@^2.0.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
@@ -10253,7 +10121,7 @@ unist-util-generated@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.1.tgz#99f16c78959ac854dee7c615c291924c8bf4de7f"
 
-unist-util-is@^2.0.0:
+unist-util-is@^2.0.0, unist-util-is@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b"
 
@@ -10273,13 +10141,15 @@ unist-util-remove-position@^1.0.0:
   dependencies:
     unist-util-visit "^1.1.0"
 
-unist-util-stringify-position@^1.0.0:
+unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c"
 
 unist-util-visit@^1.0.0, unist-util-visit@^1.0.1, unist-util-visit@^1.1.0, unist-util-visit@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.1.3.tgz#ec268e731b9d277a79a5b5aa0643990e405d600b"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.3.0.tgz#41ca7c82981fd1ce6c762aac397fc24e35711444"
+  dependencies:
+    unist-util-is "^2.1.1"
 
 universalify@^0.1.0:
   version "0.1.1"
@@ -10296,14 +10166,14 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
-
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
+upath@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
+
 update-notifier@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
@@ -10338,9 +10208,11 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
-url-template@~2.0.6:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  dependencies:
+    prepend-http "^2.0.0"
 
 url-to-options@^1.0.1:
   version "1.0.1"
@@ -10365,10 +10237,6 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util-extend@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-
 util@0.10.3, util@^0.10.3, util@~0.10.1:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -10392,8 +10260,12 @@ uuid@^2.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
 uuid@^3.0.0, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
+uws@~9.14.0:
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
 
 vali-date@^1.0.0:
   version "1.0.0"
@@ -10406,16 +10278,24 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
   dependencies:
-    extsprintf "1.0.2"
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
 
 vfile-location@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.2.tgz#d3675c59c877498e492b4756ff65e4af1a752255"
 
+vfile-message@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.0.tgz#a6adb0474ea400fa25d929f1d673abea6a17e359"
+  dependencies:
+    unist-util-stringify-position "^1.1.1"
+
 vfile-reporter@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-4.0.0.tgz#ea6f0ae1342f4841573985e05f941736f27de9da"
@@ -10427,20 +10307,21 @@ vfile-reporter@^4.0.0:
     vfile-statistics "^1.1.0"
 
 vfile-sort@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.0.0.tgz#7279458d111a9ba3b18effd9f8a0169bb7c5112b"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.1.0.tgz#49501c9e8bbe5adff2e9b3a7671ee1b1e20c5210"
 
 vfile-statistics@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.0.tgz#02104c60fdeed1d11b1f73ad65330b7634b3d895"
 
 vfile@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.2.0.tgz#ce47a4fb335922b233e535db0f7d8121d8fced4e"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"
   dependencies:
     is-buffer "^1.1.4"
     replace-ext "1.0.0"
     unist-util-stringify-position "^1.0.0"
+    vfile-message "^1.0.0"
 
 vinyl-fs@^2.3.1:
   version "2.4.4"
@@ -10483,9 +10364,9 @@ vinyl@^2.0.0:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vlq@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
+vlq@^0.2.1, vlq@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
 
 vm-browserify@0.0.4, vm-browserify@~0.0.1:
   version "0.0.4"
@@ -10494,8 +10375,8 @@ vm-browserify@0.0.4, vm-browserify@~0.0.1:
     indexof "0.0.1"
 
 vt-pbf@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.0.1.tgz#ff7ef598464da443a03dece7b6bca12998a64338"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.0.tgz#d7e63f585b362cbff6b84fcd052c159112e0acc7"
   dependencies:
     "@mapbox/point-geometry" "0.1.0"
     "@mapbox/vector-tile" "^1.3.0"
@@ -10507,18 +10388,6 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
-watchify@^3.7.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.9.0.tgz#f075fd2e8a86acde84cedba6e5c2a0bedd523d9e"
-  dependencies:
-    anymatch "^1.3.0"
-    browserify "^14.0.0"
-    chokidar "^1.0.0"
-    defined "^1.0.0"
-    outpipe "^1.1.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
-
 watchpack@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
@@ -10547,40 +10416,27 @@ webpack-format-messages@^1.0.1:
   dependencies:
     chalk "^2.0.1"
 
-webpack-merge@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.0.tgz#6ad72223b3e0b837e531e4597c199f909361511e"
-  dependencies:
-    lodash "^4.17.4"
-
-webpack-parallel-uglify-plugin@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-parallel-uglify-plugin/-/webpack-parallel-uglify-plugin-1.0.0.tgz#9775d32e2b57ee8e1d402d55b759c3ddd4d174bf"
+webpack-merge@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216"
   dependencies:
-    glob "^7.0.5"
-    mkdirp "^0.5.1"
-    pify "^3.0.0"
-    tmp "0.0.29"
-    uglify-es "^3.0.26"
-    uglify-js "^3.0.21"
-    webpack-sources "^1.0.0"
-    worker-farm "^1.3.1"
+    lodash "^4.17.5"
 
-webpack-sources@^1.0.0, webpack-sources@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
   dependencies:
     source-list-map "^2.0.0"
-    source-map "~0.5.3"
+    source-map "~0.6.1"
 
-webpack@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.7.1.tgz#6046b5c415ff7df7a0dc54c5b6b86098e8b952da"
+webpack@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.11.0.tgz#77da451b1d7b4b117adaf41a1a93b5742f24d894"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
-    ajv "^5.1.5"
-    ajv-keywords "^2.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
     async "^2.1.2"
     enhanced-resolve "^3.4.0"
     escope "^3.6.0"
@@ -10601,38 +10457,21 @@ webpack@^3.6.0:
     yargs "^8.0.2"
 
 websocket-driver@>=0.5.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
   dependencies:
+    http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
-
-webworkify@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/webworkify/-/webworkify-1.5.0.tgz#734ad87a774de6ebdd546e1d3e027da5b8f4a42c"
-
-weinre@^2.0.0-pre-I0Z7U9OV:
-  version "2.0.0-pre-I0Z7U9OV"
-  resolved "https://registry.yarnpkg.com/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz#fef8aa223921f7b40bbbbd4c3ed4302f6fd0a813"
-  dependencies:
-    express "2.5.x"
-    nopt "3.0.x"
-    underscore "1.7.x"
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
 
 wgs84@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/wgs84/-/wgs84-0.0.0.tgz#34fdc555917b6e57cf2a282ed043710c049cdc76"
 
-whatwg-encoding@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
-  dependencies:
-    iconv-lite "0.4.13"
-
-whatwg-encoding@^1.0.3:
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
   dependencies:
@@ -10662,9 +10501,13 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.2.4, which@^1.2.9:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+which-pm-runs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
+
+which@1, which@^1.2.4, which@^1.2.9, which@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
     isexe "^2.0.0"
 
@@ -10674,11 +10517,11 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
-widest-line@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
+widest-line@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
   dependencies:
-    string-width "^1.0.1"
+    string-width "^2.1.1"
 
 window-size@0.1.0:
   version "0.1.0"
@@ -10692,17 +10535,21 @@ window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
-wordwrap@0.0.2, wordwrap@~0.0.2:
+wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
-worker-farm@^1.3.1, worker-farm@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.0.tgz#adfdf0cd40581465ed0a1f648f9735722afd5c8d"
+worker-farm@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae"
   dependencies:
     errno "^0.1.4"
     xtend "^4.0.1"
@@ -10747,13 +10594,6 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
 ws@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-4.0.0.tgz#bfe1da4c08eeb9780b986e0e4d10eccd7345999f"
@@ -10762,9 +10602,13 @@ ws@^4.0.0:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
-wtf-8@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
+ws@~3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
 
 x-is-array@^0.1.0:
   version "0.1.0"
@@ -10794,9 +10638,9 @@ xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
-xmlhttprequest-ssl@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
 
 xmlhttprequest@1, "xmlhttprequest@>= 1.6.0 < 2.0.0":
   version "1.8.0"
@@ -10807,15 +10651,19 @@ xmlhttprequest@1, "xmlhttprequest@>= 1.6.0 < 2.0.0":
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
 xxhashjs@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.1.tgz#9bbe9be896142976dfa34c061b2d068c43d30de0"
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
   dependencies:
-    cuint latest
+    cuint "^0.2.2"
 
 y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -10838,7 +10686,7 @@ yargs-parser@^3.2.0:
     camelcase "^3.0.0"
     lodash.assign "^4.1.0"
 
-yargs-parser@^4.1.0, yargs-parser@^4.2.0:
+yargs-parser@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
   dependencies:
@@ -10856,6 +10704,12 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^8.0.0, yargs-parser@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs@3.29.0:
   version "3.29.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c"
@@ -10905,23 +10759,22 @@ yargs@6.4.0:
     y18n "^3.2.1"
     yargs-parser "^4.1.0"
 
-yargs@^6.5.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+yargs@^10.0.3:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
   dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
+    cliui "^4.0.0"
     decamelize "^1.1.1"
+    find-up "^2.1.0"
     get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+    os-locale "^2.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
     y18n "^3.2.1"
-    yargs-parser "^4.2.0"
+    yargs-parser "^8.1.0"
 
 yargs@^7.1.0:
   version "7.1.0"
@@ -10941,7 +10794,7 @@ yargs@^7.1.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yargs@^8.0.1, yargs@^8.0.2:
+yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
   dependencies: